Merge branch 'developer' into 'master'

用户资源

See merge request !7

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

@@ -32,10 +32,8 @@ import com.gic.member.config.api.dto.ServiceConfigSimpleOutputDTO;
 import com.gic.member.config.api.service.AppletsConfigApiService;
 import com.gic.member.config.api.service.MemberCardApiService;
 import com.gic.member.config.api.service.ServiceConfigApiService;
-import com.gic.open.api.dto.ApplicationDTO;
-import com.gic.open.api.dto.ApplicationSubDTO;
+
 import com.gic.open.api.service.AppTokenApiService;
-import com.gic.open.api.service.ApplicationSubApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -66,8 +64,6 @@ public class ResourceController {
     @Autowired
     private AppTokenApiService appTokenApiService;
     @Autowired
-    private ApplicationSubApiService applicationSubApiService;
-    @Autowired
     private MemberCardApiService memberCardApiService;
     @Autowired
     private AppletsConfigApiService appletsConfigApiService;
@@ -76,32 +72,6 @@ public class ResourceController {
     @Autowired
     private ShopApiService shopApiService;
 
-    @RequestMapping("/list-resource-app")
-    public RestResponse listResourceApp() {
-        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 = new ArrayList<>(appDTOList.size());
-        for (ApplicationDTO applicationDTO : appDTOList) {
-            ServiceResponse<List<ApplicationSubDTO>> subServiceResponse = applicationSubApiService
-                    .listSubApp(enterpriseId, applicationDTO.getApplicationId());
-            if (subServiceResponse.isSuccess()) {
-                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);
-    }
 
         @RequestMapping("/list-sms-sign")
         public RestResponse listSmsSign(String search) {