Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AppAuthServiceImpl.java

@@ -123,16 +123,16 @@ public class AppAuthServiceImpl implements AuthService {
     public ObjectRestResponse checkToken(String token) {
         try {
             if (StringUtils.isEmpty(token)){
-                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+                return ObjectRestResponse.createFailedResult(10003,"参数不能为空");
             }
             IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
             if (ijwtInfo==null){
-                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+                return ObjectRestResponse.createFailedResult(10009,"token失效");
             }
             return ObjectRestResponse.succ();
         }catch (Exception e){
             e.printStackTrace();
-            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            return ObjectRestResponse.createFailedResult(10009,"token失效");
         }
 
     }

ace-auth/ace-auth-server/src/main/java/com/github/wxiaoqi/security/auth/service/impl/AuthServiceImpl.java

@@ -120,16 +120,16 @@ public class AuthServiceImpl implements AuthService {
     public ObjectRestResponse checkToken(String token) {
         try {
             if (StringUtils.isEmpty(token)){
-                return ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
+                return ObjectRestResponse.createFailedResult(10003,"参数不能为空");
             }
             IJWTInfo ijwtInfo=jwtTokenUtil.getInfoFromToken(token);
             if (ijwtInfo==null){
-                return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+                return ObjectRestResponse.createFailedResult(10009,"token失效");
             }
             return ObjectRestResponse.succ();
         }catch (Exception e){
             e.printStackTrace();
-            return ObjectRestResponse.createFailedResult(ResultCode.NOTEXIST_CODE,"token失效");
+            return ObjectRestResponse.createFailedResult(10009,"token失效");
         }
 
     }

xx-campsite/xx-campsite-server/src/main/java/com/xxfc/platform/campsite/biz/CampsiteShopBiz.java

@@ -343,7 +343,7 @@ public class CampsiteShopBiz extends BaseBiz<CampsiteShopMapper, CampsiteShop> {
         List<GoodDataVO> list = mapper.findAll();
         Set<GoodDataVO> resultList = new HashSet<>();
         if(CollectionUtils.isNotEmpty(list)) {
-            if(number == list.size()) {
+            if(number >= list.size()) {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodBiz.java

@@ -334,7 +334,7 @@ public class TourGoodBiz extends BaseBiz<TourGoodMapper, TourGood> {
         List<TourGood> list = mapper.getCoordinateList(param);
         Set<TourGood> resultList = new HashSet<>();
         if(CollectionUtils.isNotEmpty(list)) {
-            if(number == list.size()) {
+            if(number >= list.size()) {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();

xx-uccn/xx-uccn-api/src/main/java/com/xxfc/platform/uccn/vo/TypeEnum.java

@@ -6,8 +6,8 @@ public enum TypeEnum {
     VEHICLE(1, "车型"),
     TOUR(2, "旅游"),
     CAMPSITE(3, "营地"),
-    ACTIVITY(4, "活动");
-
+    ACTIVITY(4, "活动"),
+    NEWS(5, "新闻");
     private Integer code;
 
     private String msg;

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/RandomListBiz.java

@@ -28,6 +28,9 @@ public class RandomListBiz {
     @Autowired
     SummitActivityBiz summitActivityBiz;
 
+    @Autowired
+    ArticleBiz articleBiz;
+
 
     /**
      * @param type 类型
@@ -46,6 +49,8 @@ public class RandomListBiz {
                     return campsiteFeign.findRandomVehicle(number);
                 case ACTIVITY:
                     return ObjectRestResponse.succ(summitActivityBiz.getHostWithSummitActivity(number, location));
+                case NEWS:
+
             }
         }
         return ObjectRestResponse.succ();

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleModelBiz.java

@@ -83,7 +83,7 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         List<VehicleModelVo> list = mapper.findVehicleModelPage(vmqc);
         Set<VehicleModelVo> resultList = new HashSet<>();
         if(CollectionUtils.isNotEmpty(list)) {
-            if(number == list.size()) {
+            if(number >= list.size()) {
                 return ObjectRestResponse.succ(list);
             }
             Set<Integer> set = new HashSet<>();