Merge branch 'V0.0.6-iot' of http://10.87.21.221:8000/jzyd_yyds/soc into V0.0.6-iot

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/north/NorthError.java

@@ -62,14 +62,12 @@ public class NorthError extends Model<NorthError> implements Serializable {
     /**
      * 构造函数
      * @param msgId
-     * @param branchId
      * @param interfacePath
      * @param data
      * @param errorMsg
      */
-    public NorthError(String msgId, String branchId, String interfacePath, Object data, String errorMsg) {
+    public NorthError(String msgId, String interfacePath, Object data, String errorMsg) {
         this.msgId = msgId;
-        this.branchId = branchId;
         this.interfacePath = interfacePath;
         this.errorData = JSON.toJSONString(data);
         this.errorMsg = errorMsg;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/mediator/domain/MediatorCategory.java

@@ -1,20 +1,17 @@
 package com.xunmei.common.core.domain.mediator.domain;
 
-import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-
-import java.time.LocalDateTime;
-
 import com.baomidou.mybatisplus.annotation.TableField;
-
-import java.io.Serializable;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  *
@@ -73,9 +70,5 @@ public class MediatorCategory implements Serializable {
     @TableField("type")
     private Boolean type;
 
-    @ApiModelProperty(value = "过期天数")
-    @TableField("expire_day")
-    private Integer expireDay;
-
 
 }

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

@@ -27,6 +27,8 @@ public enum CategoryDataEnum {
     SMOKE_SENSOR(3712194930442240L, "烟感"),
     WATER_SENSOR(3712196701503488L, "水浸"),
     AMMETER_SENSOR(3712198166114160L, "智能电表"),
+    GAS_ALARM(3712197694111744L, "燃气报警器"),
+    DOOR_WINDOW_SENSOR(3712197092999168L, "门磁、窗磁传感器"),
     ;
 
 

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/utils/JacksonUtils.java

@@ -0,0 +1,168 @@
+package com.xunmei.common.core.utils;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import lombok.extern.slf4j.Slf4j;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+
+/**
+ * @author jingyuanchao
+ * @date 2024/2/27 14:27
+ */
+@Slf4j
+public class JacksonUtils {
+
+
+    private static ObjectMapper objectMapper = new ObjectMapper();
+
+    // 时间日期格式
+    private static final String STANDARD_FORMAT = "yyyy-MM-dd HH:mm:ss";
+
+    //以静态代码块初始化
+    static {
+        //对象的所有字段全部列入序列化
+        objectMapper.setSerializationInclusion(JsonInclude.Include.ALWAYS);
+        //取消默认转换timestamps形式
+        objectMapper.configure(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS, false);
+        //忽略空Bean转json的错误
+        objectMapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
+        //所有的日期格式都统一为以下的格式，即yyyy-MM-dd HH:mm:ss
+        objectMapper.setDateFormat(new SimpleDateFormat(STANDARD_FORMAT));
+        //忽略 在json字符串中存在，但在java对象中不存在对应属性的情况。防止错误
+        objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    }
+
+
+    /**===========================以下是从JSON中获取对象====================================*/
+    public static <T> T parseObject(String jsonString, Class<T> object) {
+        T t = null;
+        try {
+            t = objectMapper.readValue(jsonString, object);
+        } catch (JsonProcessingException e) {
+            log.error("JsonString转为自定义对象失败：{}", e.getMessage());
+        }
+        return t;
+    }
+
+    public static <T> T parseObject(File file, Class<T> object) {
+        T t = null;
+        try {
+            t = objectMapper.readValue(file, object);
+        } catch (IOException e) {
+            log.error("从文件中读取json字符串转为自定义对象失败：{}", e.getMessage());
+        }
+        return t;
+    }
+
+    //将json数组字符串转为指定对象List列表或者Map集合
+    public static <T> T parseJSONArray(String jsonArray, TypeReference<T> reference) {
+        T t = null;
+        try {
+            t = objectMapper.readValue(jsonArray, reference);
+        } catch (JsonProcessingException e) {
+            log.error("JSONArray转为List列表或者Map集合失败：{}", e.getMessage());
+        }
+        return t;
+    }
+
+
+    /**=================================以下是将对象转为JSON=====================================*/
+    public static String toJSONString(Object object) {
+        String jsonString = null;
+        try {
+            jsonString = objectMapper.writeValueAsString(object);
+        } catch (JsonProcessingException e) {
+            log.error("Object转JSONString失败：{}", e.getMessage());
+        }
+        return jsonString;
+    }
+
+    public static byte[] toByteArray(Object object) {
+        byte[] bytes = null;
+        try {
+            bytes = objectMapper.writeValueAsBytes(object);
+        } catch (JsonProcessingException e) {
+            log.error("Object转ByteArray失败：{}", e.getMessage());
+        }
+        return bytes;
+    }
+
+    public static void objectToFile(File file, Object object) {
+        try {
+            objectMapper.writeValue(file, object);
+        } catch (JsonProcessingException e) {
+            log.error("Object写入文件失败：{}", e.getMessage());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**=============================以下是与JsonNode相关的=======================================*/
+    //JsonNode和JSONObject一样，都是JSON树形模型，只不过在jackson中，存在的是JsonNode
+    public static JsonNode parseJSONObject(String jsonString) {
+        JsonNode jsonNode = null;
+        try {
+            jsonNode = objectMapper.readTree(jsonString);
+        } catch (JsonProcessingException e) {
+            log.error("JSONString转为JsonNode失败：{}", e.getMessage());
+        }
+        return jsonNode;
+    }
+
+    public static JsonNode parseJSONObject(Object object) {
+        JsonNode jsonNode = objectMapper.valueToTree(object);
+        return jsonNode;
+    }
+
+    public static String toJSONString(JsonNode jsonNode) {
+        String jsonString = null;
+        try {
+            jsonString = objectMapper.writeValueAsString(jsonNode);
+        } catch (JsonProcessingException e) {
+            log.error("JsonNode转JSONString失败：{}", e.getMessage());
+        }
+        return jsonString;
+    }
+
+    //JsonNode是一个抽象类，不能实例化，创建JSON树形模型，得用JsonNode的子类ObjectNode，用法和JSONObject大同小异
+    public static ObjectNode newJSONObject() {
+       return  objectMapper.createObjectNode();
+    }
+
+    //创建JSON数组对象，就像JSONArray一样用
+    public static ArrayNode newJSONArray() {
+        return objectMapper.createArrayNode();
+    }
+
+
+    /**===========以下是从JsonNode对象中获取key值的方法，个人觉得有点多余，直接用JsonNode自带的取值方法会好点，出于纠结症，还是补充进来了*/
+    public static String getString(JsonNode jsonObject, String key) {
+        String s = jsonObject.get(key).asText();
+        return s;
+    }
+
+    public static Integer getInteger(JsonNode jsonObject, String key) {
+        Integer i = jsonObject.get(key).asInt();
+        return i;
+    }
+
+    public static Boolean getBoolean(JsonNode jsonObject, String key) {
+        Boolean bool = jsonObject.get(key).asBoolean();
+        return bool;
+    }
+
+    public static JsonNode getJSONObject(JsonNode jsonObject, String key) {
+        JsonNode json = jsonObject.get(key);
+        return json;
+    }
+}

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

@@ -14,6 +14,7 @@ import com.xunmei.iot.service.IIotCommonSensorService;
 import com.xunmei.iot.vo.sensor.SensorPageVo;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
+import io.netty.util.internal.StringUtil;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -51,6 +52,9 @@ public class IotCommonSensorServiceImpl extends ServiceImpl<IotCommonSensorMappe
     }
 
     private String dealInfoData(String info) {
+        if (ObjectUtil.isEmpty(info)){
+            return StringUtil.EMPTY_STRING;
+        }
         final List<Map> list = JSON.parseArray(info, Map.class);
         List<String> dataList = new ArrayList<>();
         for (Map map : list) {

soc-modules/soc-modules-iot/src/main/resources/mapper/IotSensorMapper.xml

@@ -3,24 +3,24 @@
 <mapper namespace="com.xunmei.iot.mapper.IotCommonSensorMapper">
 
     <select id="selectPageData" resultType="com.xunmei.iot.vo.sensor.SensorPageVo">
-        select s.id, org_id, org_name, device_name, category_id, infos as info,device_code, update_time from iot_sensor s
-        <where>
-            <if test="request.orgId!= null">
-                and s.org_id=#{request.orgId}
-            </if>
-            <if test="request.orgPath!= null">
-                and s.org_path like CONCAT(#{request.orgPath}, '%')
-            </if>
-            <if test="request.deviceName != null and request.deviceName!= ''">
-                and s.device_name like CONCAT('%',#{request.deviceName},'%')
-            </if>
-            <if test="request.startTime!= null">
-                and s.state_update_time >=#{request.startTime}
-            </if>
-            <if test="request.endTime!= null">
-                and s.state_update_time <![CDATA[<=]]>  #{request.endTime}
-            </if>
-        </where>
+        select s.id, org_id, org_name, device_name, category_id, infos as info,device_code, update_time
+        from iot_sensor s
+        where s.deleted=0
+        <if test="request.orgId!= null">
+            and s.org_id=#{request.orgId}
+        </if>
+        <if test="request.orgPath!= null">
+            and s.org_path like CONCAT(#{request.orgPath}, '%')
+        </if>
+        <if test="request.deviceName != null and request.deviceName!= ''">
+            and s.device_name like CONCAT('%',#{request.deviceName},'%')
+        </if>
+        <if test="request.startTime!= null">
+            and s.state_update_time >=#{request.startTime}
+        </if>
+        <if test="request.endTime!= null">
+            and s.state_update_time <![CDATA[<=]]>  #{request.endTime}
+        </if>
     </select>
 
     <select id="selectSensorLogDataPage" resultType="com.xunmei.iot.vo.sensor.SensorPageVo">

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/DataController.java

@@ -58,7 +58,6 @@ public class DataController {
      *  处理逻辑：
      *      先逻辑删除source = 1(北向接口同步过来的数据) deleted = 1
      *      然后更新接收到的数据 deleted = 0
-     * @param branchId
      * @param msgId
      * @param deviceReceivePageDto
      * @return ReceiveErrorDto
@@ -66,16 +65,16 @@ public class DataController {
      * @time 2022/8/17 17:05
      */
     @ApiOperation("设备信息同步")
-    @PostMapping({"/api/{branchId}/data/equipmentList"})
-    public ReceiveErrorDto equipmentList(@PathVariable String branchId, String msgId, @RequestBody DataPageDto<DeviceDto> deviceReceivePageDto) {
+    @PostMapping({"/api/data/equipmentList"})
+    public ReceiveErrorDto equipmentList(String msgId, @RequestBody DataPageDto<DeviceDto> deviceReceivePageDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/data/equipmentList", "设备信息同步");
-        LogUtils.BASE_INFO_EQUIPMENT.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "设备信息同步:/api/data/equipmentList/", branchId, msgId, JSON.toJSONString(deviceReceivePageDto));
+        LogUtils.BASE_INFO_EQUIPMENT.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "设备信息同步:/api/data/equipmentList/", msgId, JSON.toJSONString(deviceReceivePageDto));
         try {
-            ReceiveErrorDto errorDto = iotDeviceService.saveData(deviceReceivePageDto, msgId,branchId);
-            LogUtils.BASE_INFO_EQUIPMENT.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "设备信息同步:/api/data/equipmentList/", branchId, msgId, JSON.toJSONString(errorDto));
+            ReceiveErrorDto errorDto = iotDeviceService.saveData(deviceReceivePageDto, msgId);
+            LogUtils.BASE_INFO_EQUIPMENT.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "设备信息同步:/api/data/equipmentList/", msgId, JSON.toJSONString(errorDto));
             return errorDto;
         } catch (Exception e) {
-            LogUtils.BASE_INFO_EQUIPMENT.info("【北向接口-{}】【branchId:{}】【msgId:{}】【异常原因：{}】", "设备信息同步:/api/data/equipmentList/", branchId, msgId, e);
+            LogUtils.BASE_INFO_EQUIPMENT.info("【北向接口-{}】【msgId:{}】【异常原因：{}】", "设备信息同步:/api/data/equipmentList/", msgId, e);
             e.printStackTrace();
         }
         return ReceiveErrorDto.error("数据处理异常");
@@ -87,7 +86,6 @@ public class DataController {
      * 处理逻辑 ，
      * 1.逻辑删除录像机的摄像机数据 deleted = 1
      * 2.更新录像机的摄像机数据 deleted = 0
-     * @param branchId
      * @param msgId
      * @param deviceDtos
      * @return ReceiveErrorDto
@@ -95,18 +93,18 @@ public class DataController {
      * @time 2022/8/17 17:21
      */
     @ApiOperation("通道信息同步")
-    @PostMapping({"/api/{branchId}/data/channelList"})
-    public ReceiveErrorDto channelList(@PathVariable String branchId, String msgId, @RequestBody List<DeviceDto> deviceDtos) {
+    @PostMapping({"/api/data/channelList"})
+    public ReceiveErrorDto channelList(String msgId, @RequestBody List<DeviceDto> deviceDtos) {
         rabbitMsgIdService.sendMsgId(msgId, "/data/channelList", "通道信息同步");
-        LogUtils.BASE_INFO_CHANNEL.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "通道信息同步:/api/data/channelList", branchId, msgId, JSONArray.toJSONString(deviceDtos));
+        LogUtils.BASE_INFO_CHANNEL.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "通道信息同步:/api/data/channelList", msgId, JSONArray.toJSONString(deviceDtos));
         ReceiveErrorDto errorDto = new ReceiveErrorDto();
         try {
-            errorDto = this.iotDvrChannelService.saveChannel(deviceDtos, branchId, msgId, SecurityConstants.INNER);
-            LogUtils.BASE_INFO_CHANNEL.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "设备信息同步:/api/data/channelList", branchId, msgId, JSON.toJSONString(errorDto));
+            errorDto = this.iotDvrChannelService.saveChannel(deviceDtos, msgId);
+            LogUtils.BASE_INFO_CHANNEL.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "设备信息同步:/api/data/channelList", msgId, JSON.toJSONString(errorDto));
             return errorDto;
         } catch (Exception e) {
             e.printStackTrace();
-            LogUtils.BASE_INFO_CHANNEL.error("【北向接口-{}】【branchId:{}】【msgId:{}】【异常原因：{}】", "设备信息同步:/api/data/channelList", branchId, msgId, e);
+            LogUtils.BASE_INFO_CHANNEL.error("【北向接口-{}】【msgId:{}】【异常原因：{}】", "设备信息同步:/api/data/channelList", msgId, e);
             return ReceiveErrorDto.error("msgId 异常");
         }
 
@@ -121,35 +119,35 @@ public class DataController {
 
 
     @ApiOperation(value = "传感器通用设备信息同步", notes = "直连主机传感器")
-    @PostMapping({"/api/{branchId}/data/sensorCommonList"})
-    public ReceiveErrorDto sensor(@PathVariable String branchId, String msgId, @RequestBody DataPageDto<SensorDto> sensors) {
-        LogUtils.DIRECT_HOST_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接受传感器通用设备信息同步:/api/data/sensorCommonList", branchId, msgId, JSON.toJSONString(sensors));
+    @PostMapping({"/api/data/sensorCommonList"})
+    public ReceiveErrorDto sensor(String msgId, @RequestBody DataPageDto<SensorDto> sensors) {
+        LogUtils.DIRECT_HOST_SENSOR.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接受传感器通用设备信息同步:/api/data/sensorCommonList", msgId, JSON.toJSONString(sensors));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
-            errorDto = this.iotSensorService.saveDirectHost(sensors, branchId, msgId);
+            errorDto = this.iotSensorService.saveDirectHost(sensors, msgId);
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.DIRECT_HOST_SENSOR.error("保存失败，{}", e);
             return ReceiveErrorDto.error("保存失败:" + e);
         }
-        LogUtils.DIRECT_HOST_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备信息同步:/api/data/sensorCommonList", branchId, msgId, JSON.toJSONString(errorDto));
+        LogUtils.DIRECT_HOST_SENSOR.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备信息同步:/api/data/sensorCommonList", msgId, JSON.toJSONString(errorDto));
         return errorDto;
     }
 
 
     @ApiOperation("传感器通用设备实时状态")
-    @PostMapping({"/api/{branchId}/status/sensorCommon"})
-    public ReceiveErrorDto status(@PathVariable String branchId, String msgId, @RequestBody DataPageDto<SensorStatusDto> statuses) {
-        LogUtils.DIRECT_HOST_SENSOR_STATUS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接受传感器通用设备实时状态信息同步:/api/status/sensorCommon", branchId, msgId, JSON.toJSONString(statuses));
+    @PostMapping({"/api/status/sensorCommon"})
+    public ReceiveErrorDto status(String msgId, @RequestBody DataPageDto<SensorStatusDto> statuses) {
+        LogUtils.DIRECT_HOST_SENSOR_STATUS.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接受传感器通用设备实时状态信息同步:/api/status/sensorCommon", msgId, JSON.toJSONString(statuses));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
-            errorDto = this.iotSensorService.saveDirectHostStatus(statuses, branchId, msgId);
+            errorDto = this.iotSensorService.saveDirectHostStatus(statuses, msgId);
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.DIRECT_HOST_SENSOR_STATUS.error("保存失败，{}", e);
             return ReceiveErrorDto.error("保存失败:" + e);
         }
-        LogUtils.DIRECT_HOST_SENSOR_STATUS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备实时状态信息同步:/api/status/sensorCommon", branchId, msgId, JSON.toJSONString(errorDto));
+        LogUtils.DIRECT_HOST_SENSOR_STATUS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备实时状态信息同步:/api/status/sensorCommon", msgId, JSON.toJSONString(errorDto));
         return errorDto;
     }
 
@@ -158,24 +156,23 @@ public class DataController {
      * 主动上报一次恢复信息。
      * 粒度：每个录像机或网络设备网络情况为一个数据包
      *
-     * @param branchId
      * @param msgId
      * @param networkDeviceDetectionEditDto
      * @return
      */
     @ApiOperation("网络设备检测")
-    @PostMapping({"/api/{branchId}/status/network"})
-    ReceiveErrorDto network(@PathVariable String branchId, String msgId, @RequestBody NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto) {
+    @PostMapping({"/api/status/network"})
+    ReceiveErrorDto network(String msgId, @RequestBody NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/status/network", "网络设备检测");
-        LogUtils.STATUS_INFO_NETWORK.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "网络设备检测:/api/status/network", branchId, msgId, JSON.toJSONString(networkDeviceDetectionEditDto));
+        LogUtils.STATUS_INFO_NETWORK.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "网络设备检测:/api/status/network", msgId, JSON.toJSONString(networkDeviceDetectionEditDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         try {
-            result = this.networkDeviceDetectionService.saveData(networkDeviceDetectionEditDto, msgId, branchId);
+            result = this.networkDeviceDetectionService.saveData(networkDeviceDetectionEditDto, msgId);
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.STATUS_INFO_NETWORK.error("保存失败，{}", e);
         }
-        LogUtils.STATUS_INFO_NETWORK.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "网络设备检测:/api/status/network", branchId, msgId, JSON.toJSONString(result));
+        LogUtils.STATUS_INFO_NETWORK.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "网络设备检测:/api/status/network", msgId, JSON.toJSONString(result));
         return result;
 
     }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/ProtectionController.java

@@ -32,24 +32,25 @@ public class ProtectionController {
     private IotAlarmSubsystemService protectionService;
     @Resource
     private IotAlarmDefenceAreaService defenceAreService;
-    @ApiOperation("报警主机子系统及防区信息同步")
-    @PostMapping({"/api/{branchId}/data/defenceareaList"})
-    public ReceiveErrorDto defenceareaList(@PathVariable String branchId, String msgId, @RequestBody  DataPageDto<DefenceAreaDto> request) {
+
+    @ApiOperation(value = "报警主机子系统及防区信息同步",notes = "福建NX版本,不同步防区基础信息")
+    @PostMapping({"/api/data/defenceareaList"})
+    public ReceiveErrorDto defenceareaList(String msgId, @RequestBody DataPageDto<DefenceAreaDto> request) {
         rabbitMsgIdService.sendMsgId(msgId, "/data/defenceareaList", "报警主机子系统及防区信息同步");
-        LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", branchId, msgId, JSONArray.toJSONString(request));
+        LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, JSONArray.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
             try {
-                errorDto = this.protectionService.defenceAreaList(request, branchId, msgId);
+                errorDto = this.protectionService.defenceAreaList(request, msgId);
             } catch (Exception e) {
                 e.printStackTrace();
                 LogUtils.BASE_INFO_DEFENCEAREA.error("保存失败，{}", e);
             }
-            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", branchId, msgId, JSON.toJSONString(errorDto));
+            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, JSON.toJSONString(errorDto));
             return errorDto;
         } catch (Exception e) {
             e.printStackTrace();
-            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【异常原因：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", branchId, msgId, e.getMessage());
+            LogUtils.BASE_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【异常原因：{}】", "报警主机子系统及防区信息同步:/api/data/defenceareaList", msgId, e.getMessage());
             return ReceiveErrorDto.error("数据处理异常");
         }
     }
@@ -58,39 +59,38 @@ public class ProtectionController {
      * 频率：每次检查完成后，布防状态发生了改变，就上报推送一次。
      * 粒度：每个组织机构的每个防区为一个数据包
      *
-     * @param branchId
      * @param msgId
      * @param protectionEditDto
      * @return
      */
     @ApiOperation("接收报警主机-子系统布撤防数据")
-    @PostMapping({"/api/{branchId}/status/defencearea"})
-    ReceiveErrorDto info(@PathVariable String branchId, String msgId, @RequestBody ProtectionEditDto protectionEditDto) {
+    @PostMapping({"/api/status/defencearea"})
+    ReceiveErrorDto info(String msgId, @RequestBody ProtectionEditDto protectionEditDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/status/defencearea", "布撤防数据");
-        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接收布防数据:/api/status/defencearea", branchId, msgId, JSON.toJSONString(protectionEditDto));
+        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接收布防数据:/api/status/defencearea", msgId, JSON.toJSONString(protectionEditDto));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
-            errorDto = this.protectionService.saveData(protectionEditDto, msgId, branchId);
+            errorDto = this.protectionService.saveData(protectionEditDto, msgId);
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.STATUS_INFO_DEFENCEAREA.error("保存错误，{}", e);
         }
-        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接收布防数据:/api/status/defencearea", branchId, msgId, JSON.toJSONString(errorDto));
+        LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接收布防数据:/api/status/defencearea", msgId, JSON.toJSONString(errorDto));
         return errorDto;
     }
 
-    @ApiOperation("接收防区传感器报警信息")
-    @PostMapping({"/api/{branchId}/status/sensor"})
-    public ReceiveErrorDto sensor(@PathVariable String branchId, String msgId, @RequestBody  SensorDataDto request) {
+  /*  @ApiOperation(value = "接收防区传感器报警信息",notes = "因为福建NX版本不同步防区基础信息,所以状态数据也不接收")
+    @PostMapping({"/api/status/sensor"})
+    public ReceiveErrorDto sensor(String msgId, @RequestBody SensorDataDto request) {
         rabbitMsgIdService.sendMsgId(msgId, "/status/sensor", "接收防区传感器报警信息");
-        LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接收防区传感器报警信息:/api/status/sensor", branchId, msgId, JSON.toJSONString(request));
+        LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "接收防区传感器报警信息:/api/status/sensor", msgId, JSON.toJSONString(request));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
-            errorDto=  this.defenceAreService.saveData(branchId,msgId,request);
+            errorDto = this.defenceAreService.saveData(msgId, request);
         } catch (Exception e) {
-            LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接收防区传感器报警信息:/api/status/sensor", branchId, msgId, JSON.toJSONString(errorDto));
+            LogUtils.STATUS_INFO_DEFENCEAREA.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接收防区传感器报警信息:/api/status/sensor", msgId, JSON.toJSONString(errorDto));
             throw new RuntimeException(e);
         }
         return errorDto;
-    }
+    }*/
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/VideoDataController.java

@@ -40,25 +40,24 @@ public class VideoDataController {
     @Resource
     IotDvrDiskService dvrDiskService;
     @ApiOperation("录像完整性检查")
-    @PostMapping({"/api/{branchId}/video/complete"})
-    public ReceiveErrorDto complete(@PathVariable String branchId, String msgId, @RequestBody VideoIntegrityCheckDto videoIntegrityCheckDto) {
+    @PostMapping({"/api/video/complete"})
+    public ReceiveErrorDto complete( String msgId, @RequestBody VideoIntegrityCheckDto videoIntegrityCheckDto) {
         rabbitMsgIdService.sendMsgId(msgId,"/video/complete","录像完整性检查");
 
-        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "录像完整性检查:/api/video/complete", branchId, msgId, JSONArray.toJSONString(videoIntegrityCheckDto));
+        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "录像完整性检查:/api/video/complete", msgId, JSONArray.toJSONString(videoIntegrityCheckDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         try{
-            result = this.videoIntegrityCheckService.saveData(videoIntegrityCheckDto, msgId, branchId);
+            result = this.videoIntegrityCheckService.saveData(videoIntegrityCheckDto, msgId);
         }catch (Exception e){
             e.printStackTrace();
             LogUtils.STATUS_INFO_VIDEO_COMPLETE.error("保存失败，{}",e);
         }
-        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "录像完整性检查:/api/video/complete", branchId, msgId, JSONArray.toJSONString(result));
+        LogUtils.STATUS_INFO_VIDEO_COMPLETE.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "录像完整性检查:/api/video/complete", msgId, JSONArray.toJSONString(result));
         return result;
     }
 
     /***
      *
-     * @param branchId
      * @param msgId
      * @param videoDaysCheckDto
      * @return ReceiveErrorDto
@@ -66,40 +65,40 @@ public class VideoDataController {
      * @time 2022/8/18 rr
      */
     @ApiOperation("录像机天数检查")
-    @PostMapping({"/api/{branchId}/video/daysInfo"})
-    public ReceiveErrorDto daysInfo(@PathVariable String branchId, String msgId, @RequestBody VideoDaysCheckDto videoDaysCheckDto) {
+    @PostMapping({"/api/video/daysInfo"})
+    public ReceiveErrorDto daysInfo( String msgId, @RequestBody VideoDaysCheckDto videoDaysCheckDto) {
         rabbitMsgIdService.sendMsgId(msgId,"/video/daysInfo","录像机天数检查");
-        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "录像机天数检查:/api/video/daysInfo", branchId, msgId, JSONArray.toJSONString(videoDaysCheckDto));
+        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "录像机天数检查:/api/video/daysInfo", msgId, JSONArray.toJSONString(videoDaysCheckDto));
         ReceiveErrorDto errorDto = ReceiveErrorDto.success();
         try {
-            errorDto = this.videoDaysCheckService.saveData(videoDaysCheckDto, msgId, branchId);
+            errorDto = this.videoDaysCheckService.saveData(videoDaysCheckDto, msgId);
         }catch (Exception e){
             e.printStackTrace();
             LogUtils.STATUS_INFO_VIDEO_DAYS.error("保存失败，{}",e);
         }
-        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "录像机天数检查:/api/video/daysInfo", branchId, msgId, JSONArray.toJSONString(errorDto));
+        LogUtils.STATUS_INFO_VIDEO_DAYS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "录像机天数检查:/api/video/daysInfo", msgId, JSONArray.toJSONString(errorDto));
         return errorDto;
     }
 
 
     @ApiOperation("视频质量诊断结果")
-    @PostMapping({"/api/{branchId}/video/diagnosis"})
-    public ReceiveErrorDto plan(@PathVariable String branchId, String msgId, @RequestBody VideoDiagnosisDto videoDiagnosisDto) {
+    @PostMapping({"/api/video/diagnosis"})
+    public ReceiveErrorDto plan( String msgId, @RequestBody VideoDiagnosisDto videoDiagnosisDto) {
         rabbitMsgIdService.sendMsgId(msgId,"/video/diagnosis","视频质量诊断结果");
-        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "视频质量诊断结果:/api/video/diagnosis", branchId, msgId, JSONArray.toJSONString(videoDiagnosisDto));
+        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(videoDiagnosisDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         if (ObjectUtil.isEmpty(videoDiagnosisDto.getOrganizationGuid())) {
             result = ReceiveErrorDto.error("organizationGuid  为空");
-            LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", branchId, msgId, JSONArray.toJSONString(result));
+            LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(result));
             return result;
         }
         try{
-            result = videoDiagnosisRecordService.saveData(videoDiagnosisDto, msgId, branchId);
+            result = videoDiagnosisRecordService.saveData(videoDiagnosisDto, msgId);
         }catch (Exception e){
             e.printStackTrace();
             LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.error("保存失败，{}",e);
         }
-        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", branchId, msgId, JSONArray.toJSONString(result));
+        LogUtils.STATUS_INFO_VIDEO_DIAGNOSIS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "视频质量诊断结果:/api/video/diagnosis", msgId, JSONArray.toJSONString(result));
         return result;
     }
 
@@ -109,24 +108,23 @@ public class VideoDataController {
      * 不做推送，质量问题修复后，主动上报结束信息。
      * 粒度：每个硬盘录像机的硬盘情况为一个数据包
      *
-     * @param branchId
      * @param msgId
      * @param videoRecorderHardDiskDetectionEditDto
      * @return
      */
     @ApiOperation("录像机硬盘检测")
-    @PostMapping({"/api/{branchId}/status/disks"})
-    ReceiveErrorDto disks(@PathVariable String branchId, String msgId, @RequestBody VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) {
+    @PostMapping({"/api/status/disks"})
+    ReceiveErrorDto disks( String msgId, @RequestBody VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/status/disks", "录像机硬盘检测");
-        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "录像机硬盘检测:/api/status/disks", branchId, msgId, JSON.toJSONString(videoRecorderHardDiskDetectionEditDto));
+        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "录像机硬盘检测:/api/status/disks", msgId, JSON.toJSONString(videoRecorderHardDiskDetectionEditDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         try {
-            result = this.videoRecorderHardDiskDetectionService.saveData(videoRecorderHardDiskDetectionEditDto, msgId, branchId);
+            result = this.videoRecorderHardDiskDetectionService.saveData(videoRecorderHardDiskDetectionEditDto, msgId);
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.STATUS_INFO_DISKS.error("保存失败，{}", e);
         }
-        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "录像机硬盘检测:/api/status/disks", branchId, msgId, JSON.toJSONString(result));
+        LogUtils.STATUS_INFO_DISKS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "录像机硬盘检测:/api/status/disks", msgId, JSON.toJSONString(result));
         return result;
     }
 
@@ -141,18 +139,18 @@ public class VideoDataController {
      * @return
      */
     @ApiOperation("DVR硬盘空间信息同步")
-    @PostMapping({"/api/{branchId}/data/dvrDiskList"})
-    ReceiveErrorDto disksList(@PathVariable String branchId, String msgId, @RequestBody DataPageDto<DvrDiskPageDto> dataPageDto) {
+    @PostMapping({"/api/data/dvrDiskList"})
+    ReceiveErrorDto disksList( String msgId, @RequestBody DataPageDto<DvrDiskPageDto> dataPageDto) {
         rabbitMsgIdService.sendMsgId(msgId, "/api/data/dvrDiskList", "DVR硬盘空间信息同步");
-        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", branchId, msgId, JSON.toJSONString(dataPageDto));
+        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【msgId:{}】【接收参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", msgId, JSON.toJSONString(dataPageDto));
         ReceiveErrorDto result = ReceiveErrorDto.success();
         try {
-            result = this.dvrDiskService.saveData(dataPageDto, msgId, branchId);
+            result = this.dvrDiskService.saveData(dataPageDto, msgId);
         } catch (Exception e) {
             e.printStackTrace();
             LogUtils.BASE_INFO_DVR_DISK.error("保存失败，{}", e);
         }
-        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", branchId, msgId, JSON.toJSONString(result));
+        LogUtils.BASE_INFO_DVR_DISK.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "DVR硬盘空间信息同步:/api/data/dvrDiskList", msgId, JSON.toJSONString(result));
         return result;
     }
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmDefenceAreaMapper.java

@@ -1,5 +1,6 @@
 package com.xunmei.mediator.api.mapper;
 
+import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 
@@ -11,6 +12,7 @@ import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
  * @author oygj
  * @since 2024-01-29
  */
+@InterceptorIgnore(blockAttack = "true")
 public interface IotAlarmDefenceAreaMapper extends BaseMapper<IotAlarmDefenceArea> {
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/EquipmentSyncService.java

@@ -65,7 +65,7 @@ public class EquipmentSyncService {
      * @param
      */
     @Transactional(rollbackFor = Exception.class)
-    public void saveDeviceData( List<DeviceDto> pages,String msgId, String branchId) {
+    public void saveDeviceData( List<DeviceDto> pages,String msgId) {
 
         String key = "base_info_equipment_" + DateUtil.format(new Date(), "yyyy-MM-dd");
         /**
@@ -97,7 +97,7 @@ public class EquipmentSyncService {
         Map<String, MediatorCategory> categorys = new HashMap<>();
         List<IotDevice> olds = new ArrayList();
         List<IotDevice> list = new ArrayList<>();
-        Map<String, List<IotDevice>> rel = analysisDeviceList(pages, orgs, categorys,msgId,branchId);
+        Map<String, List<IotDevice>> rel = analysisDeviceList(pages, orgs, categorys,msgId);
         olds.addAll(rel.get("olds"));
         list.addAll(rel.get("list"));
         //第一步逻辑删除数据，逻辑删除
@@ -137,7 +137,7 @@ public class EquipmentSyncService {
      * @param
      * @return
      */
-    private Map<String, List<IotDevice>> analysisDeviceList(List<DeviceDto> dtos, Map<String, Map<String, Object>> orgs, Map<String, MediatorCategory> categorys,String msgId, String branchId) {
+    private Map<String, List<IotDevice>> analysisDeviceList(List<DeviceDto> dtos, Map<String, Map<String, Object>> orgs, Map<String, MediatorCategory> categorys,String msgId) {
         Map<String, List<IotDevice>> rel = new HashMap<>();
 
         /**
@@ -154,35 +154,35 @@ public class EquipmentSyncService {
         while (var2.hasNext()) {
             datum = (DeviceDto) var2.next();
             if (StringUtils.isEmpty(datum.getEquipmentCode())) {
-                error = new NorthError(msgId, branchId, "/data/equipmentList"
+                error = new NorthError(msgId, "/data/equipmentList"
                         , datum, "equipmentCode 为空");
                 errors.add(error);
                 continue;
             }
 
             if (StringUtils.isEmpty(datum.getOrganizationGuid())) {
-                error = new NorthError(msgId, branchId, "/data/equipmentList"
+                error = new NorthError(msgId, "/data/equipmentList"
                         , datum, "organizationGuid 为空");
                 errors.add(error);
                 continue;
             }
 
             if (StringUtils.isEmpty(datum.getEquipmentName())) {
-                error = new NorthError(msgId, branchId, "/data/equipmentList"
+                error = new NorthError(msgId, "/data/equipmentList"
                         , datum, "equipmentName 为空");
                 errors.add(error);
                 continue;
             }
 
             if (datum.getEquipmentType() == null || datum.getEquipmentType().equals(0)) {
-                error = new NorthError(msgId, branchId, "/data/equipmentList"
+                error = new NorthError(msgId, "/data/equipmentList"
                         , datum, "equipmentType 为空");
                 errors.add(error);
                 continue;
             }
 
             if (StringUtils.isEmpty(datum.getNetAddress())) {
-                error = new NorthError(msgId, branchId, "/data/equipmentList"
+                error = new NorthError(msgId, "/data/equipmentList"
                         , datum, "netAddress 为空");
                 errors.add(error);
                 continue;
@@ -194,7 +194,7 @@ public class EquipmentSyncService {
                 if (theOrg == null) {
                     org.put("isOk", "N");
                     org.put("msg", "organizationGuid：" + datum.getOrganizationGuid() + "不正确");
-                    error = new NorthError(msgId, branchId, "/data/equipmentList"
+                    error = new NorthError(msgId, "/data/equipmentList"
                             , datum, "orgGUID:" + datum.getOrganizationGuid() + "不正确");
                     errors.add(error);
                     continue;
@@ -208,7 +208,7 @@ public class EquipmentSyncService {
                 String isOk = obj.get("isOk").toString();
                 if (isOk.equals("N")) {
                     String msg = obj.get("msg").toString();
-                    error = new NorthError(msgId, branchId, "/data/equipmentList"
+                    error = new NorthError(msgId, "/data/equipmentList"
                             , datum, msg);
                     errors.add(error);
                     continue;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDeviceService.java

@@ -29,7 +29,7 @@ public interface IIotDeviceService extends IService<IotDevice> {
 
     void batchInsertDevice(List<IotDevice> list);
 
-    ReceiveErrorDto saveData(DataPageDto<DeviceDto> deviceReceivePageDto, String msgId, String branchId);
+    ReceiveErrorDto saveData(DataPageDto<DeviceDto> deviceReceivePageDto, String msgId);
 
     List<IotDevice> findByCategory(Long categoryId);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDvrChannelService.java

@@ -20,7 +20,7 @@ public interface IIotDvrChannelService extends IService<IotDvrChannel> {
 
     IotDvrChannel findChannel(String channelCode, String equipmentCode, Long orgId);
 
-    ReceiveErrorDto saveChannel(List<DeviceDto> deviceDtos, String branchId, String msgId, String inner);
+    ReceiveErrorDto saveChannel(List<DeviceDto> deviceDtos, String msgId);
 
     void channelCacheDeal();
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IVideoDaysCheckService.java

@@ -18,5 +18,5 @@ public interface IVideoDaysCheckService extends IService<MediatorVideoDaysCheck>
 
     MediatorVideoDaysCheck findByOrgIdAndEquipmentCodeAndChannelCode(Long orgId, String equipmentCode, String channelCode);
 
-    ReceiveErrorDto saveData(VideoDaysCheckDto videoDaysCheckDto, String msgId, String branchId);
+    ReceiveErrorDto saveData(VideoDaysCheckDto videoDaysCheckDto, String msgId);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IVideoDiagnosisRecordService.java

@@ -20,7 +20,7 @@ import java.util.Map;
  */
 public interface IVideoDiagnosisRecordService extends IService<MediatorVideoDiagnosisRecord> {
 
-    ReceiveErrorDto saveData(VideoDiagnosisDto videoDiagnosisDto, String msgId, String branchId) throws IllegalAccessException, ParseException;
+    ReceiveErrorDto saveData(VideoDiagnosisDto videoDiagnosisDto, String msgId) throws IllegalAccessException, ParseException;
 
     MediatorVideoDiagnosisRecord findByOrgIdAndEquipmentCodeAndChannelCode(Long orgId, String equipmentCode, String channelCode);
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IVideoIntegrityCheckService.java

@@ -17,7 +17,7 @@ import java.util.Date;
  */
 public interface IVideoIntegrityCheckService extends IService<MediatorVideoIntegrityCheck> {
 
-    ReceiveErrorDto saveData(VideoIntegrityCheckDto videoIntegrityCheckDto, String msgId, String branchId);
+    ReceiveErrorDto saveData(VideoIntegrityCheckDto videoIntegrityCheckDto, String msgId);
 
     MediatorVideoIntegrityCheck findByOrgIdAndEquipmentCodeAndAndChannelCodeAndRecordDate(Long orgId, String equipmentCode, String channelCode);
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotAlarmDefenceAreaService.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * <p>
- *  服务类
+ * 服务类
  * </p>
  *
  * @author oygj
@@ -19,9 +19,10 @@ import java.util.List;
 public interface IotAlarmDefenceAreaService extends IService<IotAlarmDefenceArea> {
 
     List<IotAlarmDefenceArea> findBySubSystemCode(String defenceAreaCode);
-    IotAlarmDefenceArea findBySubSystemCodeAndIdx(String defenceAreaCode, Integer idx,String orgGuid);
 
-    ReceiveErrorDto saveData(String branchId, String msgId, SensorDataDto request);
+    IotAlarmDefenceArea findBySubSystemCodeAndIdx(String defenceAreaCode, Integer idx, String orgGuid);
 
-    ReceiveErrorDto sensorData(SensorDataDto sensorData, String branchId, String msgId);
+    ReceiveErrorDto saveData(String msgId, SensorDataDto request);
+
+    ReceiveErrorDto sensorData(SensorDataDto sensorData, String msgId);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotAlarmSubsystemService.java

@@ -19,9 +19,9 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 public interface IotAlarmSubsystemService extends IService<IotAlarmSubsystem> {
 
 
-    ReceiveErrorDto defenceAreaList(DataPageDto<DefenceAreaDto> request, String branchId, String msgId);
+    ReceiveErrorDto defenceAreaList(DataPageDto<DefenceAreaDto> request, String msgId);
 
     IotAlarmSubsystem findByCodeAndOrgId(String defenceAreaCode, Long orgId);
 
-    ReceiveErrorDto saveData(ProtectionEditDto protectionEditDto, String msgId, String branchId);
+    ReceiveErrorDto saveData(ProtectionEditDto protectionEditDto, String msgId);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDeviceDetectionService.java

@@ -16,7 +16,7 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
  */
 public interface IotDeviceDetectionService extends IService<IotDeviceDetection> {
 
-    ReceiveErrorDto saveData(NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto, String msgId, String branchId) throws IllegalAccessException;
+    ReceiveErrorDto saveData(NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto, String msgId) throws IllegalAccessException;
 
     IotDeviceDetection findByEquipmentCodeAndOrgId(String equipmentCode, Long orgId);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDvrDiskService.java

@@ -16,6 +16,6 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
  */
 public interface IotDvrDiskService extends IService<IotDvrDisk> {
 
-    ReceiveErrorDto saveData(DataPageDto<DvrDiskPageDto> dataPageDto, String msgId, String branchId) throws Exception;
+    ReceiveErrorDto saveData(DataPageDto<DvrDiskPageDto> dataPageDto, String msgId) throws Exception;
 
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotDvrHardDiskDetectionService.java

@@ -18,7 +18,7 @@ import java.util.Map;
  */
 public interface IotDvrHardDiskDetectionService extends IService<IotDvrHardDiskDetection> {
 
-    ReceiveErrorDto saveData(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, String msgId, String branchId) throws IllegalAccessException;
+    ReceiveErrorDto saveData(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, String msgId) throws IllegalAccessException;
 
     Map<String, Object> checkVideoRecorderHardDiskDetectionEditDto(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto) throws IllegalAccessException;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotSensorService.java

@@ -17,7 +17,7 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
  */
 public interface IotSensorService extends IService<IotSensor> {
 
-    ReceiveErrorDto saveDirectHost(DataPageDto<SensorDto> sensors, String branchId, String msgId);
+    ReceiveErrorDto saveDirectHost(DataPageDto<SensorDto> sensors, String msgId);
 
-    ReceiveErrorDto saveDirectHostStatus(DataPageDto<SensorStatusDto> statuses, String branchId, String msgId);
+    ReceiveErrorDto saveDirectHostStatus(DataPageDto<SensorStatusDto> statuses, String msgId);
 }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmDefenceAreaServiceImpl.java

@@ -62,13 +62,14 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
     IIotDefenceAreaAlarmDataService defenceAreAlarmDataService;
     @Resource
     IIotDefenceAreaDataService defenceAreaDataService;
+
     @Override
     public List<IotAlarmDefenceArea> findBySubSystemCode(String defenceAreaCode) {
         return lambdaQuery().eq(IotAlarmDefenceArea::getSubSystemCode, defenceAreaCode).eq(IotAlarmDefenceArea::getDeleted, 0).list();
     }
 
     @Override
-    public IotAlarmDefenceArea findBySubSystemCodeAndIdx(String defenceAreaCode, Integer idx,String orgGuid) {
+    public IotAlarmDefenceArea findBySubSystemCodeAndIdx(String defenceAreaCode, Integer idx, String orgGuid) {
         return lambdaQuery()
                 .eq(IotAlarmDefenceArea::getOrganizationGuid, orgGuid)
                 .eq(IotAlarmDefenceArea::getSubSystemCode, defenceAreaCode)
@@ -80,7 +81,7 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
     }
 
     @Override
-    public ReceiveErrorDto sensorData(SensorDataDto sensorData, String branchId, String msgId) {
+    public ReceiveErrorDto sensorData(SensorDataDto sensorData, String msgId) {
         ReceiveErrorDto result = new ReceiveErrorDto();
         if (StringUtils.isEmpty(sensorData.getOrganizationGuid())) {
             result.setSuccess(false);
@@ -122,7 +123,7 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
 
         SysOrg org = orgService.findByCode(sensorData.getOrganizationGuid(), SecurityConstants.INNER);
         if (org == null) {
-            NorthError error = new NorthError(msgId, branchId, "/api/status/sensor"
+            NorthError error = new NorthError(msgId, "/api/status/sensor"
                     , sensorData, "orgGUID:" + sensorData.getOrganizationGuid() + "不正确");
             northErrorService.saveError(error);
             return result;
@@ -138,7 +139,7 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
         }
 
 
-        IotAlarmDefenceArea sensor = this.findBySubSystemCodeAndIdx(sensorData.getDefenceareaCode(),sensorData.getInputIndex(),sensorData.getOrganizationGuid());
+        IotAlarmDefenceArea sensor = this.findBySubSystemCodeAndIdx(sensorData.getDefenceareaCode(), sensorData.getInputIndex(), sensorData.getOrganizationGuid());
         if (sensor == null) {
             result.setSuccess(false);
             result.setErrorMsg("没有找到对应的设备");
@@ -172,13 +173,13 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
         data.setDefenceAreaIndex(sensorData.getInputIndex());
         data.setDefenceAreaName(sensorData.getInputName());
         data.setDefenceAreaStatus(sensorData.getInputState());
-        data.setUpdateTime(LocalDateTime.parse(sensorData.getUpdateTime(),DateTimeFormatter.ISO_DATE_TIME));
+        data.setUpdateTime(LocalDateTime.parse(sensorData.getUpdateTime(), DateTimeFormatter.ISO_DATE_TIME));
         data.setOrgId(org.getId());
         data.setOrganizationGuid(sensorData.getOrganizationGuid());
         data.setOrgName(org.getName());
         data.setOrgPath(org.getPath());
 
-        IotAlarmDefenceAreaData dataOld = defenceAreaDataService.findByCodeAndIdx(sensorData.getDefenceareaCode(), sensorData.getInputIndex(),data.getOrgId());
+        IotAlarmDefenceAreaData dataOld = defenceAreaDataService.findByCodeAndIdx(sensorData.getDefenceareaCode(), sensorData.getInputIndex(), data.getOrgId());
         if (dataOld != null) {
             BeanHelper.copyProperties(dataOld, data);
             data.setUpdateTime(LocalDateTime.now());
@@ -212,7 +213,7 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
     }
 
     @Override
-    public ReceiveErrorDto saveData(String branchId, String msgId, SensorDataDto sensorData) {
+    public ReceiveErrorDto saveData(String msgId, SensorDataDto sensorData) {
         ReceiveErrorDto errorDto = null;
         try {
             String value = sensorData.getInputState();
@@ -233,8 +234,8 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
                 this.redisTemplate.expire(key, 60, TimeUnit.MINUTES);
             }
             if (flag) {
-                errorDto = this.sensorData(sensorData, branchId, msgId);
-                LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "防区传感器报警信息:/api/status/sensor", branchId, msgId, JSON.toJSONString(errorDto));
+                errorDto = this.sensorData(sensorData, msgId);
+                LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "防区传感器报警信息:/api/status/sensor", msgId, JSON.toJSONString(errorDto));
                 return errorDto;
             } else {
                 ReceiveErrorDto dto = new ReceiveErrorDto();
@@ -245,7 +246,7 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
 
         } catch (Exception e) {
             e.printStackTrace();
-            LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【异常原因：{}】", "防区传感器报警信息:/api/status/sensor", branchId, msgId, e.getMessage());
+            LogUtils.STATUS_INFO_STATUS_SENSOR.info("【北向接口-{}】【branchId:{}】【msgId:{}】【异常原因：{}】", "防区传感器报警信息:/api/status/sensor", msgId, e.getMessage());
             return ReceiveErrorDto.error("数据处理异常");
         }
     }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmSubSystemServiceImpl.java

@@ -2,8 +2,6 @@ package com.xunmei.mediator.api.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
@@ -18,6 +16,7 @@ import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.redis.utils.RedisUtils;
+import com.xunmei.mediator.api.mapper.IotAlarmDefenceAreaMapper;
 import com.xunmei.mediator.api.mapper.IotAlarmSubsystemMapper;
 import com.xunmei.mediator.api.mapper.ProtectionLogMapper;
 import com.xunmei.mediator.api.service.*;
@@ -29,8 +28,6 @@ import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.protection.DefenceAreaDto;
 import com.xunmei.system.api.dto.protection.ProtectionEditDto;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
-import com.xunmei.system.api.dto.protection.SensorDto;
-import com.xunmei.system.api.enums.AlarmRuleExpressOperateEnum;
 import com.xunmei.system.api.enums.DataType;
 import com.xunmei.system.api.enums.ProtectionStatus;
 import com.xunmei.system.api.util.LogUtils;
@@ -43,7 +40,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -74,6 +70,8 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
     private IotAlarmDefenceAreaService defenceAreService;
     @Resource
     private NorthErrorService northErrorService;
+    @Resource
+    IotAlarmDefenceAreaMapper defenceAreaMapper;
 
     @Override
     public IotAlarmSubsystem findByCodeAndOrgId(String defenceAreaCode, Long orgId) {
@@ -84,7 +82,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
     }
 
     @Override
-    public ReceiveErrorDto saveData(ProtectionEditDto protectionEditDto, String msgId, String branchId) {
+    public ReceiveErrorDto saveData(ProtectionEditDto protectionEditDto, String msgId) {
 
         ReceiveErrorDto result = new ReceiveErrorDto();
         String organizationGuid = protectionEditDto.getOrganizationGuid();
@@ -125,7 +123,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
 
         SysOrg org = orgService.findByCode(organizationGuid, SecurityConstants.INNER);
         if (org == null) {
-            NorthError error = new NorthError(msgId, branchId, "/status/defencearea"
+            NorthError error = new NorthError(msgId, "/status/defencearea"
                     , protectionEditDto, "orgGUID:" + organizationGuid + "不正确");
             northErrorService.saveError(error);
             return result;
@@ -197,6 +195,8 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         protection.setOrgName(org.getShortName());
         protection.setOrgPath(org.getPath());
         protection.setAlarmHostCode(protectionEditDto.getAlarmHostCode());
+        protection.setStatusUpdatorId(null);
+        protection.setStatusUpdatorName(null);
         this.saveOrUpdate(protection);
         this.northStatisticsSyncService.saveOrUpdateBusinessCountByDateAndDataType(DateUtil.today(), DataType.protectionStatusCount.getIndex(), 1L);
         this.saveProtectionLog(protection);
@@ -255,7 +255,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
     }
 
     @Override
-    public ReceiveErrorDto defenceAreaList(DataPageDto<DefenceAreaDto> request, String branchId, String msgId) {
+    public ReceiveErrorDto defenceAreaList(DataPageDto<DefenceAreaDto> request, String msgId) {
         String packageGuid = request.getPackageGuid();
         if (StringUtils.isEmpty(packageGuid)) {
             return ReceiveErrorDto.error("packageGuid参数非法");
@@ -268,7 +268,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         if (CollectionUtils.isEmpty(request.getData())) {
             return ReceiveErrorDto.error("报警主机子系统及防区信息为空");
         }
-        final List<DefenceAreaDto> defenceareaList = RedisCheckRepeatDataUtil.isCompleted(request,DefenceAreaDto.class);
+        final List<DefenceAreaDto> defenceareaList = RedisCheckRepeatDataUtil.isCompleted(request, DefenceAreaDto.class);
         LogUtils.BASE_INFO_DEFENCEAREA.info("判断是否获取全部报警主机子系统及防区信息分页数据:{}", defenceareaList.size() > 0);
         if (ObjectUtil.isEmpty(defenceareaList)) {
             return ReceiveErrorDto.error("尚未获取全部报警主机子系统及防区信息分页数据,暂不处理!");
@@ -276,14 +276,15 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         LogUtils.BASE_INFO_DEFENCEAREA.info("获取全部的报警主机子系统及防区信息,开始数据处理界面！");
         this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.protectionCount.getIndex(), defenceareaList.size(), false);
         new Thread(() -> {
-            this.saveAndUpdate(defenceareaList, branchId, msgId);
+            this.saveAndUpdate(defenceareaList, msgId);
         }).start();
         return ReceiveErrorDto.success();
     }
 
-    public ReceiveErrorDto saveAndUpdate(List<DefenceAreaDto> defenceareaList, String branchId, String msgId) {
+    public void saveAndUpdate(List<DefenceAreaDto> defenceareaList, String msgId) {
         if (CollectionUtils.isEmpty(defenceareaList)) {
-            return ReceiveErrorDto.error("报警主机子系统及防区信息为空");
+            ReceiveErrorDto.error("报警主机子系统及防区信息为空");
+            return;
         }
         List<NorthError> errors = new ArrayList<>();
         List<IotAlarmSubsystem> protectionList = new ArrayList<>();
@@ -295,23 +296,22 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         List<MediatorCategory> categorys = categoryService.list();
         //查询报警主机主机设备列表
         List<IotDevice> devices = iotDeviceService.findByCategory(CategoryDataEnum.ALARM_HOST_DEVICE.getId());
-        checkParam(defenceareaList, branchId, msgId, errors, orgList, categorys, devices, deviceList, protectionList, sensorList);
-        return ReceiveErrorDto.success();
+        checkParam(defenceareaList, msgId, errors, orgList, categorys, devices, deviceList, protectionList, sensorList);
     }
 
-    private void checkParam(List<DefenceAreaDto> defenceareaList, String branchId, String msgId, List<NorthError> errors, List<SysOrgVO> orgList, List<MediatorCategory> categorys, List<IotDevice> devices, List<IotAlarmSubsystem> deviceList, List<IotAlarmSubsystem> protectionList, List<IotAlarmDefenceArea> sensorList) {
+    private void checkParam(List<DefenceAreaDto> defenceareaList, String msgId, List<NorthError> errors, List<SysOrgVO> orgList, List<MediatorCategory> categorys, List<IotDevice> devices, List<IotAlarmSubsystem> deviceList, List<IotAlarmSubsystem> protectionList, List<IotAlarmDefenceArea> sensorList) {
         NorthError error = null;
         for (DefenceAreaDto dto : defenceareaList) {
             SysOrgVO org = null;
             if (StringUtils.isEmpty(dto.getOrganizationGuid())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                error = new NorthError(msgId, "/api/data/defenceareaList"
                         , dto, "参数非法：未传organizationGuid");
                 errors.add(error);
                 continue;
             } else {
                 List<SysOrgVO> orgs = orgList.stream().filter(r -> r.getGuid().equals(dto.getOrganizationGuid())).collect(Collectors.toList()); //orgDao.findByGuid(dto.getOrganizationGuid());
                 if (orgs.size() == 0) {
-                    error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                    error = new NorthError(msgId, "/api/data/defenceareaList"
                             , dto, "orgGUID:" + dto.getOrganizationGuid() + "不正确");
                     errors.add(error);
                     continue;
@@ -321,28 +321,28 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
             }
 
             if (StringUtils.isEmpty(dto.getDefenceareaCode())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                error = new NorthError(msgId, "/api/data/defenceareaList"
                         , dto, "参数非法：未传defenceareaCode");
                 errors.add(error);
                 continue;
             }
 
             if (StringUtils.isEmpty(dto.getDefenceareaName())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                error = new NorthError(msgId, "/api/data/defenceareaList"
                         , dto, "参数非法：未传defenceareaName");
                 errors.add(error);
                 continue;
             }
 
             if (StringUtils.isEmpty(dto.getAlarmHostCode())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                error = new NorthError(msgId, "/api/data/defenceareaList"
                         , dto, "参数非法：未传alarmHostCode");
                 errors.add(error);
                 continue;
             }
 
-            if (dto.getSensorArray() == null || dto.getSensorArray().size() == 0) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+            /*if (dto.getSensorArray() == null || dto.getSensorArray().size() == 0) {
+                error = new NorthError(msgId, "/api/data/defenceareaList"
                         , dto, "参数非法：未传sensorArray");
                 errors.add(error);
                 //continue;
@@ -351,64 +351,65 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
 
                 for (SensorDto sensorDto : sensorArray) {
                     if (StringUtils.isEmpty(sensorDto.getInputName())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                        error = new NorthError(msgId, "/api/data/defenceareaList"
                                 , dto, "参数非法：未传InputName");
                         errors.add(error);
                         continue;
                     }
                     if (sensorDto.getInputIndex() == null) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                        error = new NorthError(msgId, "/api/data/defenceareaList"
                                 , dto, "参数非法：未传InputIndex");
                         errors.add(error);
                         continue;
                     }
                     if (StringUtils.isEmpty(sensorDto.getModuleAddress())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                        error = new NorthError(msgId, "/api/data/defenceareaList"
                                 , dto, "参数非法：未传ModuleAddress");
                         errors.add(error);
                         continue;
                     }
                     if (StringUtils.isEmpty(sensorDto.getSensorType())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                        error = new NorthError(msgId, "/api/data/defenceareaList"
                                 , dto, "参数非法：未传SensorType");
                         errors.add(error);
                         continue;
                     }
                     if (StringUtils.isEmpty(sensorDto.getSensorTypeName())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                        error = new NorthError(msgId, "/api/data/defenceareaList"
                                 , dto, "参数非法：未传SensorTypeName");
                         errors.add(error);
                     }
 
                     List<MediatorCategory> categorysa = categorys.stream().filter(r -> r.getName().equals(sensorDto.getSensorTypeName())).collect(Collectors.toList());//categoryDao.getOne(qw);
                     if (categorysa.size() == 0) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                        error = new NorthError(msgId, "/api/data/defenceareaList"
                                 , dto, "参数非法：没有找到设备类型,默认归到其他类型中");
                         errors.add(error);
                     }
                 }
-            }
+            }*/
             SysOrgVO finalOrg = org;
             List<IotDevice> devicesa = devices.stream().filter(r -> r.getEquipmentCode().equals(dto.getAlarmHostCode()) && r.getOrgId().equals(finalOrg.getId())).collect(Collectors.toList());
             if (devicesa.size() == 0) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
+                error = new NorthError(msgId, "/api/data/defenceareaList"
                         , dto, "参数非法：没有找到报警主机");
                 errors.add(error);
                 continue;
             }
             Map<String, Object> map = this.protectionBuild(dto, org);
             protectionList.add((IotAlarmSubsystem) map.get("protection"));
-            List<IotAlarmDefenceArea> list = (List<IotAlarmDefenceArea>) map.get("sensorList");
+            /*List<IotAlarmDefenceArea> list = (List<IotAlarmDefenceArea>) map.get("sensorList");
             if (ObjectUtil.isNotEmpty(list)) {
                 sensorList.addAll(list);
-            }
+            }*/
 
         }
-        defenceAreService.remove(new LambdaQueryWrapper<>());
+
         northErrorService.saveErrorData(errors);
         baseMapper.updateAllDelete();
         this.saveOrUpdateBatch(protectionList);
-        defenceAreService.saveOrUpdateBatch(sensorList);
+        /*defenceAreaMapper.delete(new LambdaQueryWrapper<>());
+        defenceAreService.saveOrUpdateBatch(sensorList);*/
         this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.protectionCount.getIndex(), defenceareaList.size(), true);
     }
 
@@ -436,7 +437,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         map.put("protection", protection);
 
 
-        List<SensorDto> sensorArray = dto.getSensorArray();
+       /* List<SensorDto> sensorArray = dto.getSensorArray();
         if (sensorArray != null && sensorArray.size() > 0) {
             List<IotAlarmDefenceArea> list = new ArrayList<>();
             List<IotAlarmDefenceArea> list1 = new ArrayList<>();
@@ -479,7 +480,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
 
             map.put("sensorList", list);
             map.put("deviceList", list1);
-        }
+        }*/
 
         return map;
     }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDeviceDetectionServiceImpl.java

@@ -62,7 +62,7 @@ public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectio
     }
 
     @Override
-    public ReceiveErrorDto saveData(NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto, String msgId, String branchId) throws IllegalAccessException {
+    public ReceiveErrorDto saveData(NetworkDeviceDetectionEditDto networkDeviceDetectionEditDto, String msgId) throws IllegalAccessException {
         ReceiveErrorDto error = new ReceiveErrorDto();
         Map<String, Object> map = this.checkNetworkDeviceDetectionEditDto(networkDeviceDetectionEditDto);
         error = (ReceiveErrorDto) map.get("error");

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDeviceServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.domain.iot.domain.IotDevice;
+import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.mediator.api.mapper.IotDeviceMapper;
 import com.xunmei.mediator.api.service.EquipmentSyncService;
 import com.xunmei.mediator.api.service.IIotDeviceService;
@@ -64,7 +65,11 @@ public class IotDeviceServiceImpl extends ServiceImpl<IotDeviceMapper, IotDevice
     public void updateDeviceDeleted() {
         final LambdaUpdateWrapper<IotDevice> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(IotDevice::getSource, 1);
-        wrapper.in(IotDevice::getCategoryId, 3713671510851584L, 3713671920926720L, 3713672073773056L, 3713672266842112L);
+        wrapper.in(IotDevice::getCategoryId,
+                CategoryDataEnum.MONITOR_HOST_DEVICE.getId(),
+                 CategoryDataEnum.ALARM_HOST_DEVICE.getId(),
+                CategoryDataEnum.TALK_HOST_DEVICE.getId(),
+                CategoryDataEnum.DOOR_HOST_DEVICE.getId());
         wrapper.set(IotDevice::getDeleted, 1);
         update(wrapper);
     }
@@ -81,7 +86,7 @@ public class IotDeviceServiceImpl extends ServiceImpl<IotDeviceMapper, IotDevice
     }
 
     @Override
-    public ReceiveErrorDto saveData(DataPageDto<DeviceDto> deviceReceivePageDto, String msgId, String branchId) {
+    public ReceiveErrorDto saveData(DataPageDto<DeviceDto> deviceReceivePageDto, String msgId) {
         String packageGuid = deviceReceivePageDto.getPackageGuid();
         if (StringUtils.isEmpty(packageGuid)) {
             return ReceiveErrorDto.error("packageGuid参数非法");
@@ -99,7 +104,7 @@ public class IotDeviceServiceImpl extends ServiceImpl<IotDeviceMapper, IotDevice
         if (ObjectUtil.isNotEmpty(list)) {
             LogUtils.BASE_INFO_EQUIPMENT.info("设备数据判断是否获取全部分页数据,开始数据处理界面！");
             northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.deviceCount.getIndex(), deviceReceivePageDto.getData().size(), false);
-            equipmentSyncService.saveDeviceData(list, msgId, branchId);
+            equipmentSyncService.saveDeviceData(list, msgId);
         }
         return ReceiveErrorDto.success();
     }

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDvrChannelServiceImpl.java

@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author oygj
@@ -61,15 +61,15 @@ public class IotDvrChannelServiceImpl extends ServiceImpl<IotDvrChannelMapper, I
     @Override
     public IotDvrChannel findChannel(String channelCode, String equipmentCode, Long orgId) {
         return lambdaQuery()
-                .eq(IotDvrChannel::getHostCode,equipmentCode)
-                .eq(IotDvrChannel::getOrgId,orgId)
-                .eq(IotDvrChannel::getChannelCode,channelCode)
+                .eq(IotDvrChannel::getHostCode, equipmentCode)
+                .eq(IotDvrChannel::getOrgId, orgId)
+                .eq(IotDvrChannel::getChannelCode, channelCode)
                 .last(Constants.LIMIT1)
                 .one();
     }
 
     @Override
-    public ReceiveErrorDto saveChannel(List<DeviceDto> deviceDtoList, String branchId, String msgId, String inner) {
+    public ReceiveErrorDto saveChannel(List<DeviceDto> deviceDtoList, String msgId) {
         if (org.apache.commons.collections4.CollectionUtils.isEmpty(deviceDtoList)) {
             return ReceiveErrorDto.error("通道数据为空");
         } else {
@@ -105,28 +105,28 @@ public class IotDvrChannelServiceImpl extends ServiceImpl<IotDvrChannelMapper, I
             for (int i = 0; i < deviceDtoList.size(); i++) {
                 deviceDto = deviceDtoList.get(i);
                 if (StringUtils.isEmpty(deviceDto.getEquipmentCode())) {
-                    NorthError error = new NorthError(msgId, branchId, "/data/channelList"
+                    NorthError error = new NorthError(msgId, "/data/channelList"
                             , deviceDto, "equipmentCode 为空");
                     errors.add(error);
                     continue;
                 }
 
                 if (StringUtils.isEmpty(deviceDto.getOrganizationGuid())) {
-                    NorthError error = new NorthError(msgId, branchId, "/data/channelList"
+                    NorthError error = new NorthError(msgId, "/data/channelList"
                             , deviceDto, "organizationGuid 为空");
                     errors.add(error);
                     continue;
                 }
 
                 if (StringUtils.isEmpty(deviceDto.getChannelCode())) {
-                    NorthError error = new NorthError(msgId, branchId, "/data/channelList"
+                    NorthError error = new NorthError(msgId, "/data/channelList"
                             , deviceDto, "channelCode 为空");
                     errors.add(error);
                     continue;
                 }
 
                 if (StringUtils.isEmpty(deviceDto.getChannelName())) {
-                    NorthError error = new NorthError(msgId, branchId, "/data/channelList"
+                    NorthError error = new NorthError(msgId, "/data/channelList"
                             , deviceDto, "channelName 为空");
                     errors.add(error);
                     continue;
@@ -134,7 +134,7 @@ public class IotDvrChannelServiceImpl extends ServiceImpl<IotDvrChannelMapper, I
 
 
                 if (org == null) {
-                    NorthError error = new NorthError(msgId, branchId, "/data/channelList"
+                    NorthError error = new NorthError(msgId, "/data/channelList"
                             , deviceDto, "orgGUID:" + deviceDto.getOrganizationGuid() + " 不正确");
                     errors.add(error);
                     continue;
@@ -149,7 +149,7 @@ public class IotDvrChannelServiceImpl extends ServiceImpl<IotDvrChannelMapper, I
                 deviceDto.setOrg(org);
                 IotDevice host = iIotDeviceService.findByHostCode(deviceDto.getEquipmentCode(), org.getId());
                 if (host == null) {
-                    NorthError error = new NorthError(msgId, branchId, "/data/channelList"
+                    NorthError error = new NorthError(msgId, "/data/channelList"
                             , deviceDto, "equipmentCode:" + deviceDto.getEquipmentCode() + "该主机code不存在");
                     errors.add(error);
                     continue;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDvrDiskServiceImpl.java

@@ -54,7 +54,7 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
     private IIotDeviceService iotDeviceService;
 
     @Override
-    public ReceiveErrorDto saveData(DataPageDto<DvrDiskPageDto> request, String msgId, String branchId) throws Exception {
+    public ReceiveErrorDto saveData(DataPageDto<DvrDiskPageDto> request, String msgId) throws Exception {
         //验证基础分页信息
         ReceiveErrorDto dto = CheckDataUtil.checkObjFieldIsNull(request);
         if (!dto.getSuccess()) {
@@ -65,14 +65,14 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
 
         LogUtils.BASE_INFO_DVR_DISK.info("判断是否获取DVR硬盘空间全部信息分页数据:{}", dvrDiskPageLists.size() > 0);
         if (ObjectUtil.isNotEmpty(dvrDiskPageLists)) {
-            Map<String, Object> map = this.checkDvrDiskPageDto(dvrDiskPageLists, branchId, msgId);
+            Map<String, Object> map = this.checkDvrDiskPageDto(dvrDiskPageLists, msgId);
             this.saveAll(map);
         }
         return dto;
     }
 
     @Transactional(rollbackFor = Exception.class)
-    public void saveAll(Map<String, Object> map) throws Exception {
+    public void saveAll(Map<String, Object> map) {
 
         List<NorthError> errors = (List<NorthError>) map.get("errors");
 
@@ -80,7 +80,7 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
 
         this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.dvrdiskCount.getIndex(), dvrdisks.size(), false);
 
-            northErrorService.saveErrorData(errors);
+        northErrorService.saveErrorData(errors);
         if (ObjectUtil.isNotEmpty(dvrdisks)) {
 
             try {
@@ -93,7 +93,7 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
         }
     }
 
-    private Map<String, Object> checkDvrDiskPageDto(List<DvrDiskPageDto> dvrdiskPageLists, String branchId, String msgId) throws IllegalAccessException {
+    private Map<String, Object> checkDvrDiskPageDto(List<DvrDiskPageDto> dvrdiskPageLists, String msgId) throws IllegalAccessException {
         //获取所有的监控主机
         final List<IotDevice> deviceListAll = iotDeviceService.findByCategory(CategoryDataEnum.MONITOR_HOST_DEVICE.getId());
 
@@ -108,9 +108,8 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
         for (DvrDiskPageDto pageDto : dvrdiskPageLists) {
             NorthError error = null;
             SysOrgVO org = null;
-            IotDevice device = null;
             //验证DvrdiskPageDto对象中是否有参数为null
-            error = CheckDataUtil.checkObjFieldIsNull(pageDto, branchId, msgId, "/api/data/dvrDiskList", null);
+            error = CheckDataUtil.checkObjFieldIsNull(pageDto, msgId, "/api/data/dvrDiskList", null);
             if (error != null) {
                 errors.add(error);
                 continue;
@@ -118,7 +117,7 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
             //验证机构是否存在
             final Optional<SysOrgVO> optional = orgList.stream().filter(r -> r.getCode().equals(pageDto.getOrganizationGuid())).findFirst();
             if (!optional.isPresent()) {
-                error = new NorthError(msgId, branchId, "/api/data/dvrDiskList"
+                error = new NorthError(msgId, "/api/data/dvrDiskList"
                         , pageDto, "OrganizationGuid:" + pageDto.getOrganizationGuid() + "不正确");
                 errors.add(error);
                 continue;
@@ -131,7 +130,7 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
                     && r.getOrgId().equals(finalOrg.getId())).collect(Collectors.toList());
 
             if (deviceList.size() == 0) {
-                error = new NorthError(msgId, branchId, "/api/data/dvrDiskList"
+                error = new NorthError(msgId, "/api/data/dvrDiskList"
                         , pageDto, "EquipmentCode：" + pageDto.getEquipmentCode() + "不正确");
                 errors.add(error);
                 continue;
@@ -145,7 +144,7 @@ public class IotDvrDiskServiceImpl extends ServiceImpl<IotDvrDiskMapper, IotDvrD
                 //验证DvrdiskDto是否有字段为null
                 List<String> fields = new ArrayList<>();
                 fields.add("name");
-                error = CheckDataUtil.checkObjFieldIsNull(dto, branchId, msgId, "/api/data/dvrDiskList", fields);
+                error = CheckDataUtil.checkObjFieldIsNull(dto, msgId, "/api/data/dvrDiskList", fields);
                 if (error != null) {
                     errors.add(error);
                     continue;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDvrHardDiskDetectionServiceImpl.java

@@ -159,7 +159,7 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
     }
 
     @Override
-    public ReceiveErrorDto saveData(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, String msgId, String branchId) throws IllegalAccessException {
+    public ReceiveErrorDto saveData(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, String msgId) throws IllegalAccessException {
         ReceiveErrorDto error = new ReceiveErrorDto();
         Map<String, Object> map = this.checkVideoRecorderHardDiskDetectionEditDto(videoRecorderHardDiskDetectionEditDto);
         error = (ReceiveErrorDto) map.get("error");

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotSensorServiceImpl.java

@@ -10,7 +10,6 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.domain.iot.domain.IotSensorLog;
 import com.xunmei.common.core.enums.CategoryDataEnum;
-import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.mediator.api.mapper.IotSensorMapper;
 import com.xunmei.mediator.api.service.EquipmentSyncService;
@@ -21,8 +20,6 @@ import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.domain.north.MediatorDeviceData;
-import com.xunmei.system.api.domain.north.MediatorDeviceDataLog;
 import com.xunmei.system.api.domain.north.NorthError;
 import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.SensorDto;
@@ -62,13 +59,13 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
     private EquipmentSyncService equipmentSyncService;
 
     @Override
-    public ReceiveErrorDto saveDirectHostStatus(DataPageDto<SensorStatusDto> request, String branchId, String msgId) {
+    public ReceiveErrorDto saveDirectHostStatus(DataPageDto<SensorStatusDto> request, String msgId) {
         ReceiveErrorDto dto = CheckDataUtil.checkObjFieldIsNull(request);
 
         if (dto.getSuccess() && ObjectUtil.isNotEmpty(request.getData())) {
             new Thread(() -> {
                 try {
-                    saveStatusAsync(request, msgId, branchId);
+                    saveStatusAsync(request, msgId);
                 } catch (ParseException e) {
                     throw new RuntimeException(e);
                 }
@@ -78,7 +75,7 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
         return dto;
     }
 
-    private void saveStatusAsync(DataPageDto<SensorStatusDto> request, String msgId, String branchId) throws ParseException {
+    private void saveStatusAsync(DataPageDto<SensorStatusDto> request, String msgId) throws ParseException {
         String path = "/api/{branchId}/status/sensorCommon";
         List<NorthError> errors = new ArrayList<>();
         Map<String, List<IotSensor>> productDeviceMap = getAllDevice();
@@ -86,20 +83,20 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
         List<IotSensorLog> sensorLogList = new ArrayList<>();
         for (SensorStatusDto status : request.getData()) {
             if (StringUtils.isEmpty(status.getOrgCode())) {
-                errors.add(new NorthError(msgId, branchId, path
+                errors.add(new NorthError(msgId, path
                         , status, "参数非法：未传orgCode"));
                 continue;
             }
             final SysOrg org = remoteOrgService.findByCode(status.getOrgCode(), SecurityConstants.INNER);
             if (org == null) {
-                errors.add(new NorthError(msgId, branchId, path
+                errors.add(new NorthError(msgId, path
                         , status, "参数非法：机构orgCode不存在:" + status.getOrgCode()));
                 continue;
             }
             final List<IotSensor> iotSensors = productDeviceMap.get(String.valueOf(org.getId()));
             final Optional<IotSensor> optional = iotSensors.stream().filter(sensor -> ObjectUtil.equal(sensor.getDeviceCode(), status.getDeviceCode())).findFirst();
             if (!optional.isPresent()) {
-                errors.add(new NorthError(msgId, branchId, path
+                errors.add(new NorthError(msgId, path
                         , status, "对应设备不存在:" + status.getDeviceCode()));
                 continue;
             }
@@ -151,7 +148,7 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
     }
 
     @Override
-    public ReceiveErrorDto saveDirectHost(DataPageDto<SensorDto> request, String branchId, String msgId) {
+    public ReceiveErrorDto saveDirectHost(DataPageDto<SensorDto> request, String msgId) {
         //验证基础分页信息
         ReceiveErrorDto dto = CheckDataUtil.checkObjFieldIsNull(request);
 
@@ -171,14 +168,14 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
             }).start();*/
 
             List<Long> deletedDeviceIds = new ArrayList<>();
-            List<IotSensor> devices = convertToDomain(data, msgId, branchId, deletedDeviceIds);
+            List<IotSensor> devices = convertToDomain(data, msgId, deletedDeviceIds);
             this.removeByIds(deletedDeviceIds);
             this.saveOrUpdateBatch(devices);
         }
         return dto;
     }
 
-    private List<IotSensor> convertToDomain(List<SensorDto> sensorDtos, String msgId, String branchId, List<Long> deletedDeviceIds) {
+    private List<IotSensor> convertToDomain(List<SensorDto> sensorDtos, String msgId,List<Long> deletedDeviceIds) {
         List<IotSensor> domains = new ArrayList<>();
         List<NorthError> errors = new ArrayList<>();
         String path = "/api/{branchId}/data/sensorCommonList";
@@ -189,7 +186,7 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
             IotSensor domain = new IotSensor();
 
             if (StringUtils.isEmpty(sensorDto.getOrgCode())) {
-                error = new NorthError(msgId, branchId, path
+                error = new NorthError(msgId, path
                         , sensorDto, "参数非法：未传orgCode");
                 errors.add(error);
                 continue;
@@ -197,20 +194,20 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
 
             SysOrg org = remoteOrgService.findByCode(sensorDto.getOrgCode(), SecurityConstants.INNER);
             if (org == null) {
-                error = new NorthError(msgId, branchId, path
+                error = new NorthError(msgId, path
                         , sensorDto, "参数非法：机构orgCode不存在:" + sensorDto.getOrgCode());
                 errors.add(error);
                 continue;
             }
             String key = org.getId() + sensorDto.getDeviceCode();
             if (uniqueSet.contains(key)) {
-                errors.add(new NorthError(msgId, branchId, path
+                errors.add(new NorthError(msgId, path
                         , sensorDto, "数据来源中，同机构中设备编号重复。"));
                 continue;
             }
             Long deviceType = convertDeviceType(sensorDto.getDeviceType());
             if (ObjectUtil.isNull(deviceType)) {
-                errors.add(new NorthError(msgId, branchId, path
+                errors.add(new NorthError(msgId, path
                         , sensorDto, "无法识别的设备类型"));
                 continue;
             }
@@ -223,7 +220,7 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
 
             if (ObjectUtil.isNotEmpty(exists)) {
                 if (exists.size() > 1) {
-                    errors.add(new NorthError(msgId, branchId, path, sensorDto, "同机构下设备编号重复，将取第一条"));
+                    errors.add(new NorthError(msgId, path, sensorDto, "同机构下设备编号重复，将取第一条"));
                 }
                 domain = exists.get(0);
             }
@@ -271,6 +268,13 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
                 break;
             case "4160"://智能电表
                 type = CategoryDataEnum.AMMETER_SENSOR.getId();
+                break;
+            case "4188"://门窗磁
+                type = CategoryDataEnum.DOOR_WINDOW_SENSOR.getId();
+                break;
+            case "41885"://燃气报警器
+                type = CategoryDataEnum.GAS_ALARM.getId();
+            default:break;
         }
 
         return type;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/VideoDaysCheckServiceImpl.java

@@ -58,7 +58,7 @@ public class VideoDaysCheckServiceImpl extends ServiceImpl<VideoDaysCheckMapper,
     IVideoDaysCheckLogService daysCheckLogService;
 
     @Override
-    public ReceiveErrorDto saveData(VideoDaysCheckDto videoDaysCheckDto, String msgId, String branchId) {
+    public ReceiveErrorDto saveData(VideoDaysCheckDto videoDaysCheckDto, String msgId) {
         if (null == videoDaysCheckDto) {
             return ReceiveErrorDto.error("未接收到数据");
         }
@@ -90,7 +90,7 @@ public class VideoDaysCheckServiceImpl extends ServiceImpl<VideoDaysCheckMapper,
         String organizationGuid = videoDaysCheckDto.getOrganizationGuid();
         SysOrg org = orgService.findByCode(organizationGuid, SecurityConstants.INNER);
         if (org == null) {
-            NorthError error = new NorthError(msgId, branchId, "/video/daysInfo"
+            NorthError error = new NorthError(msgId,"/video/daysInfo"
                     , videoDaysCheckDto, "参数非法：organizationGuid:" + organizationGuid + "不正确");
             northErrorService.saveError(error);
             return ReceiveErrorDto.success();
@@ -143,7 +143,7 @@ public class VideoDaysCheckServiceImpl extends ServiceImpl<VideoDaysCheckMapper,
 
         final IotDvrChannel channel = dvrChannelService.findChannel(videoDaysCheckDto.getChannelCode(), videoDaysCheckDto.getEquipmentCode(), org.getId());
         if (ObjectUtil.isNull(channel)) {
-            NorthError error = new NorthError(msgId, branchId, "/video/daysInfo"
+            NorthError error = new NorthError(msgId,"/video/daysInfo"
                     , videoDaysCheckDto, "通道/设备不存在!");
             northErrorService.saveError(error);
             return ReceiveErrorDto.success();

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/VideoDiagnosisRecordServiceImpl.java

@@ -19,7 +19,6 @@ import com.xunmei.mediator.api.service.IIotDvrChannelService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisLogService;
 import com.xunmei.mediator.api.service.IVideoDiagnosisRecordService;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
-import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDetailInfoVo;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
 import com.xunmei.mediator.util.CheckDataUtil;
@@ -58,7 +57,7 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
     @Resource
     IotAlarmCodeMapper alarmCodeMapper;
     @Override
-    public ReceiveErrorDto saveData(VideoDiagnosisDto videoDiagnosisDto, String msgId, String branchId) throws IllegalAccessException, ParseException {
+    public ReceiveErrorDto saveData(VideoDiagnosisDto videoDiagnosisDto, String msgId) throws IllegalAccessException, ParseException {
         ReceiveErrorDto error = new ReceiveErrorDto();
         //与上次接收到的数据进行比较，如果相同则不进行处理
         //这里要返回true，不然接口调用端会重复发送

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/VideoIntegrityCheckServiceImpl.java

@@ -68,7 +68,7 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
     IIotDvrChannelService dvrChannelService;
 
     @Override
-    public ReceiveErrorDto saveData(VideoIntegrityCheckDto videoIntegrityCheckDto, String msgId, String branchId) {
+    public ReceiveErrorDto saveData(VideoIntegrityCheckDto videoIntegrityCheckDto, String msgId) {
         String msg = this.checkParam(videoIntegrityCheckDto);
         if (ObjectUtil.isNotEmpty(msg)) {
             return ReceiveErrorDto.error(msg);
@@ -81,14 +81,14 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
         String organizationGuid = videoIntegrityCheckDto.getOrganizationGuid();
         SysOrg org = orgService.findByCode(organizationGuid, SecurityConstants.INNER);
         if (org == null) {
-            NorthError error = new NorthError(msgId, branchId, "/video/complete"
+            NorthError error = new NorthError(msgId, "/video/complete"
                     , videoIntegrityCheckDto, "参数非法：organizationGuid:" + organizationGuid + "不正确");
             northErrorService.saveError(error);
             return ReceiveErrorDto.success();
         }
         final IotDvrChannel channel = dvrChannelService.findChannel(videoIntegrityCheckDto.getChannelCode(), videoIntegrityCheckDto.getEquipmentCode(), org.getId());
         if (ObjectUtil.isNull(channel)) {
-            NorthError error = new NorthError(msgId, branchId, "/video/complete"
+            NorthError error = new NorthError(msgId, "/video/complete"
                     , videoIntegrityCheckDto, "通道/设备不存在");
             northErrorService.saveError(error);
             return ReceiveErrorDto.success();

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/util/CheckDataUtil.java

@@ -40,14 +40,13 @@ public class CheckDataUtil {
 
     /**
      * @param obj
-     * @param branchId
      * @param msgId
      * @param path
      * @param fields   允许为null的字段
      * @return NorthError
      * @throws IllegalAccessException
      */
-    public static NorthError checkObjFieldIsNull(Object obj, String branchId, String msgId, String path, List<String> fields) throws IllegalAccessException {
+    public static NorthError checkObjFieldIsNull(Object obj,String msgId, String path, List<String> fields) throws IllegalAccessException {
         NorthError error = null;
         for (Field f : obj.getClass().getDeclaredFields()) {
             f.setAccessible(true);
@@ -58,11 +57,11 @@ public class CheckDataUtil {
                 if (objects == null || objects.size() == 0) {
                     if (fields != null && fields.size() > 0) {
                         if (!fields.contains(f.getName())) {
-                            error = new NorthError(msgId, branchId, path, obj, "参数非法：未传" + f.getName());
+                            error = new NorthError(msgId,  path, obj, "参数非法：未传" + f.getName());
                             break;
                         }
                     } else {
-                        error = new NorthError(msgId, branchId, path, obj, "参数非法：未传" + f.getName());
+                        error = new NorthError(msgId,  path, obj, "参数非法：未传" + f.getName());
                         break;
                     }
                 }
@@ -70,11 +69,11 @@ public class CheckDataUtil {
                 if (f.get(obj) == null || (f.get(obj) != null && StringUtils.isEmpty(f.get(obj).toString().trim()))) {
                     if (fields != null && fields.size() > 0) {
                         if (!fields.contains(f.getName())) {
-                            error = new NorthError(msgId, branchId, path, obj, "参数非法：未传" + f.getName());
+                            error = new NorthError(msgId,  path, obj, "参数非法：未传" + f.getName());
                             break;
                         }
                     } else {
-                        error = new NorthError(msgId, branchId, path, obj, "参数非法：未传" + f.getName());
+                        error = new NorthError(msgId,  path, obj, "参数非法：未传" + f.getName());
                         break;
                     }
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/util/RedisCheckRepeatDataUtil.java

@@ -1,6 +1,5 @@
 package com.xunmei.mediator.util;
 
-import cn.hutool.core.collection.ListUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.xunmei.common.core.utils.SpringUtils;
@@ -109,7 +108,7 @@ public class RedisCheckRepeatDataUtil {
         //判断是否拿到所有的数据
         final List<Boolean> list = allPageKeyList.stream().map(key -> redisTemplate.hasKey(key)).distinct().collect(Collectors.toList());
         if (list.contains(Boolean.FALSE)) {
-             return ListUtil.empty();
+            // return ListUtil.empty();
         }
 
         return allPageKeyList.stream().map(k -> {