通知详情修改

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/IndexModuleController.java

@@ -16,6 +16,13 @@ import com.gic.enterprise.service.IndexModuleApiService;
 import com.gic.enterprise.service.PushMessageApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.enterprise.web.vo.ResouceVO;
+import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
+import com.gic.member.config.api.dto.OwnerMemberCardDTO;
+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.store.dto.CityDTO;
 import com.gic.store.dto.ProvinceDTO;
 import com.gic.store.dto.StoreSearchDTO;
@@ -65,6 +72,12 @@ public class IndexModuleController {
     private MemberDataApiService memberDataApiService;
     @Autowired
     private ResourceApiService resourceApiService;
+    @Autowired
+    private MemberCardApiService memberCardApiService;
+    @Autowired
+    private AppletsConfigApiService appletsConfigApiService;
+    @Autowired
+    private ServiceConfigApiService serviceConfigApiService;
 
     @RequestMapping("/list-index-module")
     public RestResponse listIndexModule() {
@@ -243,10 +256,10 @@ public class IndexModuleController {
     }
 
     @RequestMapping("list-member-channel-data")
-    public RestResponse listMemberChannelData(Integer type, Integer cuType, Long areaId){
+    public RestResponse listMemberChannelData(Integer type, Long cardConfigId, Long appletConfigId, Long serviceConfigId){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<List<MemberChannelDataDTO>> response = this.memberDataApiService.listMemberChannelData(type, cuType, areaId, enterpriseId, userId);
+        ServiceResponse<List<MemberChannelDataDTO>> response = this.memberDataApiService.listMemberChannelData(type,cardConfigId, appletConfigId, serviceConfigId, enterpriseId, userId);
         return RestResponse.success(response.getResult());
     }
 
@@ -259,10 +272,10 @@ public class IndexModuleController {
     }
 
     @RequestMapping("list-channel-data")
-    public RestResponse listChannelData(Integer type, Long cardConfigId, Long appletConfigId, Long serviceConfigId){
+    public RestResponse listChannelData(Integer type, Integer cuType){
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
-        ServiceResponse<List<MemberChannelDataDTO>> listServiceResponse = this.memberDataApiService.listChannelData(type, cardConfigId, appletConfigId, serviceConfigId, enterpriseId, userId);
+        ServiceResponse<List<MemberChannelDataDTO>> listServiceResponse = this.memberDataApiService.listChannelData(type, cuType, enterpriseId, userId);
         return RestResponse.success(listServiceResponse.getResult());
     }
 
@@ -277,9 +290,59 @@ public class IndexModuleController {
 
     @RequestMapping("list-resource")
     public RestResponse listResource(){
+        Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         Integer userId = UserDetailUtils.getUserDetail().getUserId();
         ServiceResponse<ChannelResourceDTO> response = this.resourceApiService.getChannelResourceByUserId(userId);
-        return RestResponse.success(response.getResult());
+        List<OwnerMemberCardDTO> memberCardList = memberCardApiService.getAll(enterpriseId).getResult();
+        List<AppletsConfigSimpleOutputDTO> appletList = appletsConfigApiService.listValidAppletConfigAppId(enterpriseId).getResult();
+        List<ServiceConfigSimpleOutputDTO> serviceList = serviceConfigApiService.listValidServiceConfigAppId(enterpriseId).getResult();
+        Map<String, Object> result = new HashMap<>();
+        List<Long> appletConfigIdList = response.getResult().getAppletConfigIdList();
+        List<Long> serviceConfigIdList = response.getResult().getServiceConfigIdList();
+        List<Long> cardConfigIdList = response.getResult().getCardConfigIdList();
+        List<ResouceVO> applet = new ArrayList<>();
+        List<ResouceVO> service = new ArrayList<>();
+        List<ResouceVO> card = new ArrayList<>();
+        if(CollectionUtils.isNotEmpty(appletConfigIdList)){
+            for(Long s : appletConfigIdList){
+                for(AppletsConfigSimpleOutputDTO dto : appletList){
+                    if(s == dto.getAppletConfigId()){
+                        ResouceVO vo = new ResouceVO();
+                        vo.setId(s);
+                        vo.setName(dto.getAppletConfigName());
+                        applet.add(vo);
+                    }
+                }
+            }
+        }
+        if(CollectionUtils.isNotEmpty(serviceConfigIdList)){
+            for(Long s : serviceConfigIdList){
+                for(ServiceConfigSimpleOutputDTO dto : serviceList){
+                    if(s == dto.getServiceConfigId()){
+                        ResouceVO vo = new ResouceVO();
+                        vo.setId(s);
+                        vo.setName(dto.getServiceConfigName());
+                        service.add(vo);
+                    }
+                }
+            }
+        }
+        if(CollectionUtils.isNotEmpty(cardConfigIdList)){
+            for(Long s : cardConfigIdList){
+                for(OwnerMemberCardDTO dto : memberCardList){
+                    if(s == dto.getCardConfigId()){
+                        ResouceVO vo = new ResouceVO();
+                        vo.setId(s);
+                        vo.setName(dto.getCardName());
+                        card.add(vo);
+                    }
+                }
+            }
+        }
+        result.put("card", card);
+        result.put("service", service);
+        result.put("applet", applet);
+        return RestResponse.success(result);
     }
 
 

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/vo/ResouceVO.java

+package com.gic.enterprise.web.vo;
+
+import java.io.Serializable;
+
+public class ResouceVO implements Serializable {
+    private Long id;
+    private String name;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+}