物联设备信息模块,设备类型下拉框查询列表接口修改

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/iot/BaseDeviceTypeEnum.java

@@ -52,22 +52,6 @@ public enum BaseDeviceTypeEnum {
     AlarmHostInput_IMDualIdentification("IMDualIdentification","红外微波双鉴传感器"),
     AlarmHostInput_Microwave("Microwave","微波传感器"),
     AlarmHostInput_EmergencyButton("EmergencyButton","紧急按钮传感器"),
-
-//    AlarmHostInput_Humidity("23","湿度传感器"),
-//    AlarmHostInput_Temperature("24","温度传感器"),
-//    AlarmHostInput_Smoke("25","烟感传感器"),
-//    AlarmHostInput_Infrared("26","红外传感器"),
-//    AlarmHostInput_Soaking("27","水浸传感器"),
-//    AlarmHostInput_DoorSensor("28","门磁传感器"),
-//    AlarmHostInput_Other("29","其他传感器"),
-//    AlarmHostInput_Displacement("30","位移传感器"),
-//    AlarmHostInput_Broken("31","破碎传感器"),
-//    AlarmHostInput_Shock("32","震动传感器"),
-//    AlarmHostInput_Tamper("33","防拆传感器"),
-//    AlarmHostInput_Intrusion("34","入侵传感器"),
-//    AlarmHostInput_IMDualIdentification("35","红外微波双鉴传感器"),
-//    AlarmHostInput_Microwave("36","微波传感器"),
-//    AlarmHostInput_EmergencyButton("37","紧急按钮传感器"),
     ;
     private String code;
     private String desc;
@@ -104,13 +88,4 @@ public enum BaseDeviceTypeEnum {
         return e != null ? e.getDesc() : "";
     }
 
-    public static String getNameByCode(String code) {
-        String name = null ;
-        for (BaseDeviceTypeEnum enumNode : BaseDeviceTypeEnum.values()) {
-            if(code.equals(enumNode.getCode())){
-                name = enumNode.name();
-            }
-        }
-        return name;
-    }
 }

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/protection/service/impl/IotAlarmHostServiceImpl.java

@@ -445,6 +445,9 @@ public class IotAlarmHostServiceImpl implements IIotAlarmHostService, RouterServ
             status.setCreateTime(now);
             status.setUpdateTime(now);
             status.setOrgId(input.getOrgId());
+            status.setOrgName(input.getOrgName());
+            status.setOrgPath(input.getOrgPath());
+            status.setIotToken(input.getIotToken());
             iotDeviceStatusMapper.insert(status);
         } else {
             status.setInfo(arrInfo);
@@ -454,7 +457,8 @@ public class IotAlarmHostServiceImpl implements IIotAlarmHostService, RouterServ
         }
         IotDeviceStatusLog log = new IotDeviceStatusLog();
         BeanUtils.copyProperties(status,log);
-        log.setDeviceStatusId(id);
+        log.setDeviceStatusId(status.getId());
+        log.setId(null);
         iotDeviceStatusLogMapper.insert(log);
 
         boolean isAlarm = false;

soc-modules/soc-modules-host/src/main/resources/bootstrap.yml

@@ -1,6 +1,6 @@
 # Tomcat
 server:
-  port: 9006
+  port: 9910
 
 # Spring
 spring: 
@@ -13,13 +13,13 @@ spring:
   cloud:
     nacos:
       discovery:
-        namespace: c2fe98f1-97c0-4c1a-9df8-4d63e5b625de
+        namespace: 117e3851-20f9-45a6-ad96-3413975db93c
         # 服务注册地址
-        server-addr: 10.87.23.39:8848
+        server-addr: 10.87.21.103:8847
       config:
-        namespace: c2fe98f1-97c0-4c1a-9df8-4d63e5b625de
+        namespace: 117e3851-20f9-45a6-ad96-3413975db93c
         # 配置中心地址
-        server-addr: 10.87.23.39:8848
+        server-addr: 10.87.21.103:8847
         # 配置文件格式
         file-extension: yml
         # 共享配置

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/service/impl/IotCommonSensorServiceImpl.java

@@ -106,21 +106,21 @@ public class IotCommonSensorServiceImpl extends ServiceImpl<IotCommonSensorMappe
             );
 
             List<String> inputList = Lists.newArrayList(
-                    BaseDeviceTypeEnum.AlarmHostInput_Humidity.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Temperature.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Smoke.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Infrared.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Soaking.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_DoorSensor.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Other.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Displacement.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Broken.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Shock.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Tamper.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Intrusion.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_IMDualIdentification.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_Microwave.name().split("_")[1],
-                    BaseDeviceTypeEnum.AlarmHostInput_EmergencyButton.name().split("_")[1]
+                    BaseDeviceTypeEnum.AlarmHostInput_Humidity.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Temperature.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Smoke.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Infrared.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Soaking.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_DoorSensor.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Other.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Displacement.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Broken.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Shock.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Tamper.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Intrusion.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_IMDualIdentification.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_Microwave.getCode(),
+                    BaseDeviceTypeEnum.AlarmHostInput_EmergencyButton.getCode()
 
             );
             request.setDeviceTypeList(list);
@@ -131,19 +131,19 @@ public class IotCommonSensorServiceImpl extends ServiceImpl<IotCommonSensorMappe
             for(String code:request.getDeviceTypeList()){
                 String typeCode = null;
                 if(code.equals(BaseDeviceTypeEnum.FSU_TemperatureAndHumidity.getCode())){
-                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Humidity.name().split("_")[1];
+                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Humidity.getCode();
                     inputList.add(typeCode);
-                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Temperature.name().split("_")[1];
+                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Temperature.getCode();
                 }else  if(code.equals(BaseDeviceTypeEnum.FSU_Smoke.getCode())){
-                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Smoke.name().split("_")[1];
+                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Smoke.getCode();
                 }else  if(code.equals(BaseDeviceTypeEnum.FSU_Infrared.getCode())){
-                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Infrared.name().split("_")[1];
+                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Infrared.getCode();
                 }else  if(code.equals(BaseDeviceTypeEnum.FSU_Water.getCode())){
-                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Soaking.name().split("_")[1];
+                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_Soaking.getCode();
                 }else  if(code.equals(BaseDeviceTypeEnum.FSU_DoorMagnetic.getCode())){
-                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_DoorSensor.name().split("_")[1];
+                    typeCode = BaseDeviceTypeEnum.AlarmHostInput_DoorSensor.getCode();
                 }else if(!NumberUtil.isNumber(code)){
-                    typeCode = BaseDeviceTypeEnum.getNameByCode(code).split("_")[1];
+                    typeCode = code;
                 }
 
                 if(StringUtils.isNotEmpty(typeCode)){
@@ -395,8 +395,20 @@ public class IotCommonSensorServiceImpl extends ServiceImpl<IotCommonSensorMappe
 
         if ("FSU".equals(type)) {
             for (BaseDeviceTypeEnum value : BaseDeviceTypeEnum.values()) {
+                Map<String, String> map = new HashMap<String, String>();
                 if (value.name().contains(type) && !value.name().equals(type)) {
-                    Map<String, String> map = new HashMap<String, String>();
+                    map.put("code", value.getCode());
+                    map.put("name", value.getDesc());
+                    list.add(map);
+                }else if(value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_Other.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_Displacement.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_Broken.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_Shock.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_Tamper.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_Intrusion.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_IMDualIdentification.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_Microwave.getCode())
+                        ||value.getCode().equals(BaseDeviceTypeEnum.AlarmHostInput_EmergencyButton.getCode())){
                     map.put("code", value.getCode());
                     map.put("name", value.getDesc());
                     list.add(map);