解决冲突

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/KafkaAnalyseController.java

@@ -380,13 +380,14 @@ public class KafkaAnalyseController {
             if (rootNodeName.equals("all")) {
                 return fullViewRecallInfoDTOS;
             } else {
-                List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS1 = fullViewRecallInfoDTOS.get(0).getChildren().stream().filter(item -> item.getName().equals(rootNodeName)).collect(Collectors.toList());
+                List<String> stringList = Arrays.asList(rootNodeName,rootNodeName.replace("片区","区域"),rootNodeName.replace("区域","片区"),rootNodeName.replace("电站","电场"),rootNodeName.replace("电场","电站"));
+                List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS1 = fullViewRecallInfoDTOS.get(0).getChildren().stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList());
                 if (fullViewRecallInfoDTOS1.size() > 0) {
                     return fullViewRecallInfoDTOS1;
                 } else {
                  List<FullViewRecallInfoDTO> fullViewRecallInfoDTOS2 = fullViewRecallInfoDTOS.get(0).getChildren();
                     for (FullViewRecallInfoDTO fullViewRecallInfoDTO : fullViewRecallInfoDTOS2) {
-                       List<FullViewRecallInfoDTO>  fullViewRecallInfoDTOS3=fullViewRecallInfoDTO.getChildren().stream().filter(item -> item.getName().equals(rootNodeName)).collect(Collectors.toList());
+                       List<FullViewRecallInfoDTO>  fullViewRecallInfoDTOS3=fullViewRecallInfoDTO.getChildren().stream().filter(item -> stringList.contains(item.getName())).collect(Collectors.toList());
                        if (fullViewRecallInfoDTOS3.size()>0){
                            return fullViewRecallInfoDTOS3;
                        }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/emqx/WarningRecordStatusMessage.java

@@ -32,8 +32,7 @@ public class WarningRecordStatusMessage extends EmqxListener {
     /**
      * 预警状态修改消息 - 标准化
      */
-//    public static final String WARNING_CHANGE_MESSAGE = "+/warning/change";
-    public static final String WARNING_CHANGE_MESSAGE = "warningchangetest";
+    public static final String WARNING_CHANGE_MESSAGE = "+/warning/change";
     @Autowired
     protected EmqKeeper emqKeeper;
     @Autowired

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/IPermissionServiceImpl.java

@@ -106,7 +106,7 @@ public class IPermissionServiceImpl implements IPermissionService {
 		String userId = reginParams.getUserModel().getUserId();
 		StdUserEmpower stdUserEmpower = userEmpowerMapper.selectOne(new QueryWrapper<StdUserEmpower>().eq("amos_user_id", userId).eq("permission_type", "YTH"));
 		if (ObjectUtils.isEmpty(stdUserEmpower)) {
-			return rootNodeName;
+			return rootNodeName+"_111";
 		} else {
 			String permissionOrgCode = stdUserEmpower.getAmosOrgCode().get(0);
 			Map<String, String> companyInfo = userEmpowerMapper.getCompanyInfoByOrgCode(permissionOrgCode);