'优化统一告警表-分页接口，告警信息表中修改告警类型字段类型，同时修改告警信息表与告警类型表中关联字段接口逻辑'

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseAlarm.java

@@ -41,7 +41,7 @@ public class BaseAlarm implements Serializable {
     /**
      * 告警类型
      */
-    private Integer alarmType;
+    private String alarmType;
 
     /**
      * 告警对象

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseAlarmServiceImpl.java

@@ -102,10 +102,10 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
                 queryWrapper1.eq(BaseAlarmType::getDeleteFlag,0)
                         .eq(BaseAlarmType::getProductCode,list1.get(i).getProductCode());
                 List<BaseAlarmType> list2 = baseAlarmTypeService.list(queryWrapper1);
-                List<Integer> alarmTypeList = new ArrayList<>();
+                List<String> alarmTypeList = new ArrayList<>();
                 if(CollectionUtils.isNotEmpty(list2)){
                     for(int j=0;j<list2.size();j++){
-                        alarmTypeList.add(list2.get(j).getId());
+                        alarmTypeList.add(list2.get(j).getTypeCode());
                     }
                 }
                 //未处理
@@ -151,10 +151,10 @@ public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, B
         queryWrapper2.eq(BaseAlarmType::getDeleteFlag,0)
                 .eq(BaseAlarmType::getProductCode,baseAlarmListVO.getProductCode());
         List<BaseAlarmType> list2 = baseAlarmTypeService.list(queryWrapper2);
-        List<Integer> alarmTypeList = new ArrayList<>();
+        List<String> alarmTypeList = new ArrayList<>();
         if(CollectionUtils.isNotEmpty(list2)){
             for(int j=0;j<list2.size();j++){
-                alarmTypeList.add(list2.get(j).getId());
+                alarmTypeList.add(list2.get(j).getTypeCode());
             }
         }
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseAlarmListVO.java

@@ -31,7 +31,7 @@ public class BaseAlarmListVO {
     /**
      * 告警类型
      */
-    private Integer alarmType;
+    private String alarmType;
 
     /**
      * 开始时间