Merge remote-tracking branch 'origin/developer' into developer

gic-platform-auth-web/src/main/java/com/gic/auth/web/controller/ResourceController.java

@@ -35,6 +35,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
@@ -62,17 +63,23 @@ public class ResourceController {
 
     @RequestMapping("/list-resource-app")
     public RestResponse listResourceApp() {
-        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
+        Integer enterpriseId = 100;
         ServiceResponse<List<ApplicationDTO>> appServiceResponse = appTokenApiService.listApplicationByEnterpriseId(Long.valueOf(enterpriseId), 0);
         if (!appServiceResponse.isSuccess()) {
             return ResultControllerUtils.commonResult(appServiceResponse);
         }
         List<ApplicationDTO> appDTOList = appServiceResponse.getResult();
-        List<ApplicationVO> appVOList = EntityUtil.changeEntityListByJSON(ApplicationVO.class, appDTOList);
-        for (ApplicationVO applicationVO : appVOList) {
-            ServiceResponse<List<ApplicationSubDTO>> subServiceResponse = applicationSubApiService.listSubApp(enterpriseId, applicationVO.getApplicationId());
+        List<ApplicationVO> appVOList = new ArrayList<>(appDTOList.size());
+        for (ApplicationDTO applicationDTO : appDTOList) {
+            ServiceResponse<List<ApplicationSubDTO>> subServiceResponse = applicationSubApiService.listSubApp(enterpriseId, applicationDTO.getApplicationId());
             if (subServiceResponse.isSuccess()) {
-                applicationVO.setChildList(subServiceResponse.getResult());
+                if (CollectionUtils.isNotEmpty(subServiceResponse.getResult())) {
+                    ApplicationVO applicationVO = new ApplicationVO();
+                    applicationVO.setApplicationId(applicationDTO.getApplicationId());
+                    applicationVO.setName(applicationDTO.getName());
+                    applicationVO.setChildren(EntityUtil.changeEntityListByJSON(ApplicationSubVO.class, subServiceResponse.getResult()));
+                    appVOList.add(applicationVO);
+                }
             }
         }
         return RestResponse.success(appVOList);
@@ -171,7 +178,7 @@ public class ResourceController {
                 vo.setOrderResourceJSON(orderResourceList);
             }
             if (StringUtils.isNotBlank(dto.getAppResourceJson())) {
-                List<AppResourceVO> appResourceList = JSON.parseArray(dto.getAppResourceJson(), AppResourceVO.class);
+                List<List> appResourceList = JSON.parseArray(dto.getAppResourceJson(), List.class);
                 vo.setAppResourceJSON(appResourceList);
             }
             ServiceResponse<GoodsRightsSelectorDTO> goodsResponse = this.goodsRightsSelectorApiService.getGoodsRightsSelector(response.getResult().getGoodsResourceId());

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/AppResourceQO.java

-package com.gic.auth.web.qo;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- *
- * @Description:
- * @author zhiwj
- * @date 2019-09-26 17:15
- */
-public class AppResourceQO implements Serializable {
-    private static final long serialVersionUID = 3106090790767253020L;
-
-    private Integer appId;
-    private String appName;
-    private List<AppResourceQO> child;
-
-    public Integer getAppId() {
-        return appId;
-    }
-
-    public void setAppId(Integer appId) {
-        this.appId = appId;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public List<AppResourceQO> getChild() {
-        return child;
-    }
-
-    public void setChild(List<AppResourceQO> child) {
-        this.child = child;
-    }
-}

gic-platform-auth-web/src/main/java/com/gic/auth/web/qo/ResourceQO.java

@@ -64,7 +64,7 @@ public class ResourceQO implements Serializable {
      */
     private List<OrderResourceQO> orderResourceJSON;
 
-    private List<AppResourceQO> appResourceJSON;
+    private List<List<Long>> appResourceJSON;
 
     private List<SmsSignResourceQO> smsSignResourceJSON;
 
@@ -132,15 +132,15 @@ public class ResourceQO implements Serializable {
         this.orderResourceJSON = orderResourceJSON;
     }
 
-    public List<AppResourceQO> getAppResourceJSON() {
+    public List<List<Long>> getAppResourceJSON() {
         return appResourceJSON;
     }
 
-    public void setAppResourceJSON(List<AppResourceQO> appResourceJSON) {
+    public void setAppResourceJSON(List<List<Long>> appResourceJSON) {
         this.appResourceJSON = appResourceJSON;
     }
 
-//    public Long getGoodsResourceId() {
+    //    public Long getGoodsResourceId() {
 //        return goodsResourceId;
 //    }
 //

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/AppResourceVO.java

-package com.gic.auth.web.vo;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- *
- * @Description:
- * @author zhiwj
- * @date 2019-09-27 10:23
- */
-public class AppResourceVO implements Serializable {
-    private static final long serialVersionUID = -495359852430529567L;
-
-    private Integer appId;
-    private String appName;
-    private List<AppResourceVO> child;
-
-    public Integer getAppId() {
-        return appId;
-    }
-
-    public void setAppId(Integer appId) {
-        this.appId = appId;
-    }
-
-    public String getAppName() {
-        return appName;
-    }
-
-    public void setAppName(String appName) {
-        this.appName = appName;
-    }
-
-    public List<AppResourceVO> getChild() {
-        return child;
-    }
-
-    public void setChild(List<AppResourceVO> child) {
-        this.child = child;
-    }
-}

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ApplicationSubVO.java

+package com.gic.auth.web.vo;
+
+import java.io.Serializable;
+
+/**
+ *
+ * @Description:
+ * @author zhiwj
+ * @date 2019-11-06 14:32
+ */
+public class ApplicationSubVO implements Serializable {
+    private static final long serialVersionUID = -4918329047567649472L;
+    private Long applicationId;
+    private String name;
+
+    public Long getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(Long applicationId) {
+        this.applicationId = applicationId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ApplicationVO.java

 package com.gic.auth.web.vo;
 
-import com.gic.open.api.dto.ApplicationDTO;
-import com.gic.open.api.dto.ApplicationSubDTO;
-
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -11,17 +9,35 @@ import java.util.List;
  * @author zhiwj
  * @date 2019-11-06 11:36
  */
-public class ApplicationVO extends ApplicationDTO {
+public class ApplicationVO implements Serializable {
 
     private static final long serialVersionUID = 4558390896804884123L;
 
-    private List<ApplicationSubDTO> childList;
+    private Long applicationId;
+    private String name;
+    private List<ApplicationSubVO> children;
+
+    public Long getApplicationId() {
+        return applicationId;
+    }
+
+    public void setApplicationId(Long applicationId) {
+        this.applicationId = applicationId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 
-    public List<ApplicationSubDTO> getChildList() {
-        return childList;
+    public List<ApplicationSubVO> getChildren() {
+        return children;
     }
 
-    public void setChildList(List<ApplicationSubDTO> childList) {
-        this.childList = childList;
+    public void setChildren(List<ApplicationSubVO> children) {
+        this.children = children;
     }
 }

gic-platform-auth-web/src/main/java/com/gic/auth/web/vo/ResourceVO.java

@@ -51,7 +51,7 @@ public class ResourceVO implements Serializable{
      */
     private List<OrderResourceVO> orderResourceJSON;
 
-    private List<AppResourceVO> appResourceJSON;
+    private List<List> appResourceJSON;
 
     private Integer userResourceCount;
     private StoreResouceVO storeResouce;
@@ -121,11 +121,11 @@ public class ResourceVO implements Serializable{
         this.orderResourceJSON = orderResourceJSON;
     }
 
-    public List<AppResourceVO> getAppResourceJSON() {
+    public List<List> getAppResourceJSON() {
         return appResourceJSON;
     }
 
-    public void setAppResourceJSON(List<AppResourceVO> appResourceJSON) {
+    public void setAppResourceJSON(List<List> appResourceJSON) {
         this.appResourceJSON = appResourceJSON;
     }