应用策略编辑接口修改

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

@@ -645,7 +645,7 @@ public class UnionEnterpriseAuthController {
                 //用户域
                 String authData = temp.getAuthData();
                 if (StringUtils.isNotBlank(authData)) {
-                    Map<String, Long[]> authDataArr = new HashMap<>();
+                    Map<String, List<String>> authDataArr = new HashMap<>();
                     authDataArr = JSON.parseObject(authData, authDataArr.getClass());
 
                     vo.setMemberArea(UserAeaUtils.getUserArea(CuTypeEnum.MCU.getType(), areaMap, authDataArr));

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/union/AppletAreaData.java

@@ -16,17 +16,17 @@ import java.util.stream.Collectors;
  */
 public class AppletAreaData implements IUserAreaData<AppletsConfigSimpleOutputVO>{
     @Override
-    public List<AppletsConfigSimpleOutputVO> getUserArea(Map<Integer, Object> areaMap, Map<String, Long[]> authDataArr) {
+    public List<AppletsConfigSimpleOutputVO> getUserArea(Map<Integer, Object> areaMap, Map<String, List<String>> authDataArr) {
         //小程序域
         List<AppletsConfigSimpleOutputVO> appletAreaVoList = new ArrayList<>();
         List<AppletsConfigSimpleOutputVO> appletArea = (List<AppletsConfigSimpleOutputVO>) areaMap.get(CuTypeEnum.ACU.getType());
-        Long[] appletAreaArr = authDataArr.get(CuTypeEnum.ACU.getType());
+        List<String> appletAreaArr = authDataArr.get(String.valueOf(CuTypeEnum.ACU.getType()));
         if (appletAreaArr != null) {
             Map<Long, AppletsConfigSimpleOutputVO> appletAreaMap = appletArea.stream().collect(Collectors.toMap(AppletsConfigSimpleOutputVO::getAppletConfigId, e -> e));
             if (appletArea != null) {
-                for (Long cu : appletAreaArr) {
-                    if (appletAreaMap.containsKey(cu)) {
-                        appletAreaVoList.add(appletAreaMap.get(cu));
+                for (String cu : appletAreaArr) {
+                    if (appletAreaMap.containsKey(Long.valueOf(cu))) {
+                        appletAreaVoList.add(appletAreaMap.get(Long.valueOf(cu)));
                     }
                 }
             }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/union/IUserAreaData.java

@@ -18,5 +18,5 @@ public interface IUserAreaData<T> {
      * @param authDataArr 联合商户应用策略数据
      * @return
      */
-    public List<T> getUserArea(Map<Integer, Object> areaMap, Map<String, Long[]> authDataArr);
+    public List<T> getUserArea(Map<Integer, Object> areaMap, Map<String, List<String>> authDataArr);
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/union/MemberAreaData.java

@@ -17,17 +17,17 @@ import java.util.stream.Collectors;
  */
 public class MemberAreaData implements IUserAreaData<OwnerMemberCardVO>{
     @Override
-    public List<OwnerMemberCardVO> getUserArea(Map<Integer, Object> areaMap, Map<String, Long[]> authDataArr) {
+    public List<OwnerMemberCardVO> getUserArea(Map<Integer, Object> areaMap, Map<String, List<String>> authDataArr) {
         //会员卡域
         List<OwnerMemberCardVO> memberAreaVoList = new ArrayList<>();
         List<OwnerMemberCardVO> memberArea = (List<OwnerMemberCardVO>) areaMap.get(CuTypeEnum.MCU.getType());
-        Long[] memberCardIdArr = authDataArr.get(CuTypeEnum.MCU.getType());
+        List<String> memberCardIdArr = authDataArr.get(String.valueOf(CuTypeEnum.MCU.getType()));
         if (memberCardIdArr != null) {
             Map<Long, OwnerMemberCardVO> memberCardMap = memberArea.stream().collect(Collectors.toMap(OwnerMemberCardVO::getCardConfigId, e -> e));
             if (memberArea != null) {
-                for (Long cu : memberCardIdArr) {
-                    if (memberCardMap.containsKey(cu)) {
-                        memberAreaVoList.add(memberCardMap.get(cu));
+                for (String cu : memberCardIdArr) {
+                    if (memberCardMap.containsKey(Long.valueOf(cu))) {
+                        memberAreaVoList.add(memberCardMap.get(Long.valueOf(cu)));
                     }
                 }
             }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/union/ServiceAreaData.java

@@ -17,16 +17,16 @@ import com.gic.platform.member.constant.enums.CuTypeEnum;
  */
 public class ServiceAreaData implements IUserAreaData<ServiceConfigSimpleOutputVO>{
     @Override
-    public List<ServiceConfigSimpleOutputVO> getUserArea(Map<Integer, Object> areaMap, Map<String, Long[]> authDataArr) {
+    public List<ServiceConfigSimpleOutputVO> getUserArea(Map<Integer, Object> areaMap, Map<String, List<String>> authDataArr) {
         List<ServiceConfigSimpleOutputVO> areaVoList = new ArrayList<>();
         List<ServiceConfigSimpleOutputVO> area = (List<ServiceConfigSimpleOutputVO>) areaMap.get(CuTypeEnum.SCU.getType());
-        Long[] areaArr = authDataArr.get(CuTypeEnum.SCU.getType());
+        List<String> areaArr = authDataArr.get(String.valueOf(CuTypeEnum.SCU.getType()));
         if (areaArr != null) {
             Map<Long, ServiceConfigSimpleOutputVO> serviceMap = area.stream().collect(Collectors.toMap(ServiceConfigSimpleOutputVO::getServiceConfigId, e -> e));
             if (area != null) {
-                for (Long cu : areaArr) {
-                    if (serviceMap.containsKey(cu)) {
-                        areaVoList.add(serviceMap.get(cu));
+                for (String cu : areaArr) {
+                    if (serviceMap.containsKey(Long.valueOf(cu))) {
+                        areaVoList.add(serviceMap.get(Long.valueOf(cu)));
                     }
                 }
             }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/utils/union/UserAeaUtils.java

@@ -28,7 +28,7 @@ public class UserAeaUtils {
      * @param authDataArr
      * @return
      */
-    public static List getUserArea(Integer userAreaType, Map<Integer, Object> areaMap, Map<String, Long[]> authDataArr) {
+    public static List getUserArea(Integer userAreaType, Map<Integer, Object> areaMap, Map<String, List<String>> authDataArr) {
         return map.get(userAreaType).getUserArea(areaMap, authDataArr);
     }
 }