服务号、小程序过滤正常和异常

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

@@ -5,16 +5,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import com.gic.api.base.commons.ServiceResponse;
-import com.gic.enterprise.dto.data.*;
-import com.gic.enterprise.web.vo.MemberCardVO;
-import com.gic.enterprise.web.vo.data.*;
-import com.gic.member.config.api.dto.DigitalConfigDTO;
-import com.gic.member.config.api.dto.OwnerMemberCardDTO;
-import com.gic.member.config.api.service.AppletsConfigApiService;
-import com.gic.member.config.api.service.EnterpriseConfigApiService;
-import com.gic.member.config.api.service.MemberCardApiService;
-import com.gic.member.config.api.service.ServiceConfigApiService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -25,13 +15,25 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.StringUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.download.utils.OperationResultUtils;
+import com.gic.enterprise.dto.data.*;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.DataConfigApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
 import com.gic.enterprise.utils.UserDetailUtils;
+import com.gic.enterprise.web.vo.MemberCardVO;
+import com.gic.enterprise.web.vo.data.*;
+import com.gic.member.config.api.dto.AppletsConfigSimpleOutputDTO;
+import com.gic.member.config.api.dto.DigitalConfigDTO;
+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.EnterpriseConfigApiService;
+import com.gic.member.config.api.service.MemberCardApiService;
+import com.gic.member.config.api.service.ServiceConfigApiService;
 
 @RestController
 @RequestMapping("/data-config")
@@ -52,14 +54,34 @@ public class DataConfigController {
 
     @RequestMapping("list-all-applet")
     public RestResponse listAllApplet() {
-        return ResultControllerUtils.commonResult(appletsConfigApiService
-                .listAppletConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId()));
+        ServiceResponse<List<AppletsConfigSimpleOutputDTO>> result = appletsConfigApiService
+                .listAppletConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (result.isSuccess()) {
+            List<AppletsConfigSimpleOutputDTO> list = result.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                return RestResponse.success(list.stream()
+                        //3：正常 5：异常
+                        .filter(e -> e.getStatusFlag() != null && (e.getStatusFlag() == 3 || e.getStatusFlag() == 5))
+                        .collect(Collectors.toList()));
+            }
+        }
+        return ResultControllerUtils.commonResult(result);
     }
 
     @RequestMapping("list-all-service")
     public RestResponse listAllService() {
-        return ResultControllerUtils.commonResult(serviceConfigApiService
-                .listServiceConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId()));
+        ServiceResponse<List<ServiceConfigSimpleOutputDTO>> result = serviceConfigApiService
+                .listServiceConfigAppIdContainDel(UserDetailUtils.getUserDetail().getEnterpriseId());
+        if (result.isSuccess()) {
+            List<ServiceConfigSimpleOutputDTO> list = result.getResult();
+            if (CollectionUtils.isNotEmpty(list)) {
+                return RestResponse.success(list.stream()
+                        //3：正常 5：异常
+                        .filter(e -> e.getStatusFlag() != null && (e.getStatusFlag() == 3 || e.getStatusFlag() == 5))
+                        .collect(Collectors.toList()));
+            }
+        }
+        return ResultControllerUtils.commonResult(result);
     }
 
     @RequestMapping("/list-all-member-card")