设备基础数据联调代码提交

project_data/sql/0.1.1/soc/soc.sql

@@ -120,6 +120,26 @@ BEGIN
     ALTER TABLE `mediator_video_diagnosis_log`
         MODIFY COLUMN `img_url` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '录像质量诊断图片' AFTER `detail_info`;
 
+    -- 防区表删除CategoryId字段
+    IF  EXISTS(SELECT *
+                  FROM information_schema.columns
+                  WHERE table_schema = DATABASE()
+                    AND table_name = 'iot_alarm_defence_area'
+                    AND column_name = 'category_id') THEN
+        ALTER TABLE `soc`.`iot_alarm_defence_area`
+            DROP COLUMN `category_id`;
+    END IF;
+
+    -- 防区表增加module_address字段
+    IF NOT EXISTS(SELECT *
+               FROM information_schema.columns
+               WHERE table_schema = DATABASE()
+                 AND table_name = 'iot_alarm_defence_area'
+                 AND column_name = 'module_address') THEN
+        ALTER TABLE   `iot_alarm_defence_area`
+            ADD COLUMN `module_address` varchar(12) NULL AFTER `iot_token`;
+    END IF;
+
 
 END ??
 DELIMITER ;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotAlarmDefenceArea.java

@@ -108,6 +108,9 @@ public class IotAlarmDefenceArea implements Serializable {
     @ApiModelProperty(value = "iot服务唯一编码")
     @TableField("iot_token")
     private String iotToken;
+    @ApiModelProperty(value = "模块地址")
+    @TableField("module_address")
+    private String moduleAddress;
 
 
 }

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

@@ -678,6 +678,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         info.setDefenceAreaIndex(Integer.parseInt(defenceAreaInfo.getDeviceCode()));
         info.setSensorType(defenceAreaInfo.getSubType());
         info.setSensorTypeName(DefenceAreaType.getName(defenceAreaInfo.getSubType()));
+        info.setModuleAddress(defenceAreaInfo.getModuleAddress());
         //info.setSensorTypeName();
         //alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
         info.setState("unKnown");
@@ -700,6 +701,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         info.setOrgName(serverInfo.getOrgName());
         info.setOrgPath(serverInfo.getOrgPath());
         info.setSensorType(alarmInputInfo.getSubType());
+        info.setModuleAddress(alarmInputInfo.getModuleAddress());
         info.setSensorTypeName(DefenceAreaType.getName(alarmInputInfo.getSubType()));
         info.setUpdateBy("system");
         info.setUpdateTime(LocalDateTime.now());

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/dto/dvs/SubDeviceInfo.java

@@ -10,4 +10,5 @@ public class SubDeviceInfo {
     private String type;
     private String parentCode;
     private String subType;//(枚举,防区枚举类型);
+    private String moduleAddress;
 }