北向模块按业务拆分代码

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

@@ -0,0 +1,84 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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>
+ * 
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker")
+@ApiModel(value="IotBreaker对象", description="")
+public class IotBreaker implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    @TableField("name")
+    private String name;
+
+    @TableField("org_id")
+    private Long orgId;
+
+    @TableField("org_path")
+    private String orgPath;
+
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "orgCode+hostCode+deviceCode组成设备唯一")
+    @TableField("unique_code")
+    private String uniqueCode;
+
+    @ApiModelProperty(value = "0正常1删除")
+    @TableField("deleted")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "0断电1通电2异常")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "1市电8小时回路2UPS8小时回路")
+    @TableField("type")
+    private Integer type;
+
+    @ApiModelProperty(value = "设备code07市电控制线08ups控制线")
+    @TableField("device_code")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "控制器名称")
+    @TableField("breaker_name")
+    private String breakerName;
+
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("update_by")
+    private String updateBy;
+}

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

@@ -0,0 +1,45 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker_data")
+@ApiModel(value="IotBreakerData对象", description="")
+public class IotBreakerData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "回路控制器的唯一标识")
+    @TableField("unique_code")
+    private String uniqueCode;
+
+    @ApiModelProperty(value = "0断电1通电2异常")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "数据上报时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+
+}

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

@@ -0,0 +1,49 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker_data_log")
+@ApiModel(value="IotBreakerDataLog对象", description="")
+public class IotBreakerDataLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "回路控制器的唯一标识")
+    @TableField("unique_code")
+    private String uniqueCode;
+
+    @ApiModelProperty(value = "0断电1通电2异常")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "数据上报时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+
+}

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

@@ -0,0 +1,101 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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>
+ *  8小时回路信息同步表
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker_device")
+@ApiModel(value="IotBreakerDevice对象", description=" 8小时回路信息同步表")
+public class IotBreakerDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    @TableField("org_id")
+    private Long orgId;
+
+    @TableField("org_path")
+    private String orgPath;
+
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "视频物联网检测主机唯一标识")
+    @TableField("host_code")
+    private String hostCode;
+
+    @ApiModelProperty(value = "设备名称")
+    @TableField("device_name")
+    private String deviceName;
+
+    @ApiModelProperty(value = "设备code（外网平台用于匹配8小时回路名称）")
+    @TableField("device_code")
+    private String deviceCode;
+
+    @ApiModelProperty(value = "设备类型编码: 4186")
+    @TableField("device_type")
+    private String deviceType;
+
+    @ApiModelProperty(value = "orgCode+hostCode+deviceCode组成设备唯一")
+    @TableField("device_unique_code")
+    private String deviceUniqueCode;
+
+    @ApiModelProperty(value = "状态标识（0/1）0：断电 | 1：通电")
+    @TableField("status")
+    private Integer status;
+
+    @ApiModelProperty(value = "0正常1删除")
+    @TableField("deleted")
+    private Integer deleted;
+
+    @ApiModelProperty(value = "回路电相名同步的名称")
+    @TableField("breaker_name")
+    private String breakerName;
+
+    @ApiModelProperty(value = "回路电相名用户取的名称")
+    @TableField("breaker_alias_name")
+    private String breakerAliasName;
+
+    @ApiModelProperty(value = "0启用1禁用")
+    @TableField("enable")
+    private Integer enable;
+
+    @ApiModelProperty(value = "控制器唯一标识")
+    @TableField("breaker_unique_code")
+    private String breakerUniqueCode;
+
+    @ApiModelProperty(value = "数据更新时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
+
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
+
+    @ApiModelProperty(value = "修改人")
+    @TableField("update_by")
+    private String updateBy;
+}

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

@@ -0,0 +1,46 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+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>
+ * 8小时回路信息同步数据表
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker_device_data")
+@ApiModel(value="IotBreakerDeviceData对象", description="8小时回路信息同步数据表")
+public class IotBreakerDeviceData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "orgCode+hostCode+deviceCode组成设备唯一")
+    @TableField("device_unique_code")
+    private String deviceUniqueCode;
+
+    @ApiModelProperty(value = "数据更新时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "状态标识（0/1）0：断电 | 1：通电")
+    @TableField("status")
+    private Integer status;
+
+
+}

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

@@ -0,0 +1,36 @@
+package com.xunmei.common.core.domain.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 回路绑定的区域
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("iot_breaker_device_to_area")
+@ApiModel(value="IotBreakerDeviceToArea对象", description="回路绑定的区域")
+public class IotBreakerDeviceToArea implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "回路的唯一标识")
+    @TableField("device_unique_code")
+    private String deviceUniqueCode;
+
+    @ApiModelProperty(value = "区域code")
+    @TableField("code")
+    private Integer code;
+
+
+}

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

@@ -1,81 +0,0 @@
-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 io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * <p>
- *
- * </p>
- *
- * @author oygj
- * @since 2024-01-25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("iot_alarm_code")
-@ApiModel(value = "IotAlarmCode对象", description = "")
-public class IotAlarmCode implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @TableField("parent_id")
-    private Long parentId;
-
-    @ApiModelProperty(value = "报警代码")
-    @TableField("code")
-    private String code;
-
-    @ApiModelProperty(value = "报警名称")
-    @TableField("name")
-    private String name;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("modified_name")
-    private String modifiedName;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "最后修改人id")
-    @TableField("modified_id")
-    private Long modifiedId;
-
-    @ApiModelProperty(value = "删除")
-    @TableField("deleted")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "是否自动生成运维单 1：是 0：否")
-    @TableField("auto_generate")
-    private Integer autoGenerate;
-
-    @ApiModelProperty(value = "声效告警提示次数")
-    @TableField("voice_alarm_times")
-    private Integer voiceAlarmTimes;
-
-    @ApiModelProperty(value = "光效告警提示次数")
-    @TableField("light_alarm_times")
-    private Integer lightAlarmTimes;
-
-
-}

soc-modules/soc-modules-gen/src/main/java/com/xunmei/gen/util/CodeGenerators.java

@@ -29,8 +29,8 @@ public class CodeGenerators {
         throw new MybatisPlusException("请输入正确的" + tip + "！");
     }*/
 
-    public static final String moduleName="com.xunmei.mediator.api";
-    public static final String tableNames="iot_ups_attr";
+    public static final String moduleName="com.xunmei.mediator";
+    public static final String tableNames="iot_breaker,iot_breaker_data,iot_breaker_data_log,iot_breaker_device,iot_breaker_device_data,iot_breaker_device_to_area";
 
     public static void main(String[] args) {
         // 代码生成器

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmDataMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/alarm/mapper/IotAlarmDataMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.alarm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmRuleExpressMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/alarm/mapper/IotAlarmRuleExpressMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.alarm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmRuleExpress;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmRuleSourceMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/alarm/mapper/IotAlarmRuleSourceMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.alarm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmRuleSource;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmSystemFieldMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/alarm/mapper/IotAlarmSystemFieldMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.alarm.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmSystemField;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotAlarmDataService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/alarm/service/IotAlarmDataService.java

@@ -1,7 +1,6 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.alarm.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.iot.domain.IotDvrDisk;
 import com.xunmei.common.core.domain.iot.domain.IotDvrHardDiskDetection;
 import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmDataServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/alarm/service/impl/IotAlarmDataServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.alarm.service.impl;
 
 
 import cn.hutool.core.date.DateUtil;
@@ -18,12 +18,16 @@ import com.xunmei.common.core.domain.mediator.domain.IotAlarmSystemField;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
+import com.xunmei.mediator.api.alarm.mapper.IotAlarmDataMapper;
+import com.xunmei.mediator.api.alarm.mapper.IotAlarmRuleExpressMapper;
+import com.xunmei.mediator.api.alarm.mapper.IotAlarmRuleSourceMapper;
+import com.xunmei.mediator.api.alarm.mapper.IotAlarmSystemFieldMapper;
 import com.xunmei.mediator.api.enums.AlarmDataTypeEnum;
 import com.xunmei.mediator.api.enums.AlarmRuleExpressOperateEnum;
 import com.xunmei.mediator.api.enums.AlarmVideoTypeEnum;
 import com.xunmei.mediator.api.enums.SmsNotifyType;
-import com.xunmei.mediator.api.mapper.*;
-import com.xunmei.mediator.api.service.IotAlarmDataService;
+import com.xunmei.mediator.api.sensor.mapper.IotSensorMapper;
+import com.xunmei.mediator.api.alarm.service.IotAlarmDataService;
 import com.xunmei.system.api.RemoteConfigService;
 import com.xunmei.system.api.RemoteSmsService;
 import com.xunmei.system.api.domain.SysConfig;

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

@@ -0,0 +1,90 @@
+/*
+package com.xunmei.mediator.api.controller;
+
+
+import com.alibaba.fastjson.JSON;
+import com.isp.mediator.api.dto.DataPageDto;
+import com.isp.mediator.api.dto.protection.ReceiveErrorDto;
+import com.isp.mediator.upsandloop.dto.BreakerDeviceDataDto;
+import com.isp.mediator.upsandloop.dto.BreakerDeviceDto;
+import com.isp.mediator.upsandloop.service.IBreakerDeviceService;
+import com.isp.mediator.utils.LogUtils;
+import com.isp.mediator.utils.RedisCheckRepeatDataUtil;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+
+*/
+/**
+ * <p>
+ * 8小时回路信息同步表 前端控制器
+ * </p>
+ *
+ * @author oygj
+ * @since 2022-11-28
+ *//*
+
+@RestController
+@RequestMapping
+public class BreakerController {
+    @Resource
+    IBreakerDeviceService breakerDeviceService;
+    @Autowired
+    private RedisTemplate redisTemplate;
+    @Resource
+    private RedisCheckRepeatDataUtil redisCheckRepeatDataUtil;
+
+    @ApiOperation("接受8小时回路信息同步")
+    @PostMapping({"/api/{branchId}/data/breakerDeviceList"})
+    public ReceiveErrorDto breakerDeviceList(@PathVariable String branchId, String msgId, @RequestBody DataPageDto<BreakerDeviceDto> request) {
+        LogUtils.BASE_INFO_BREAKER_DEVICE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "接受8小时回路信息同步:/api/data/breakerDeviceList", branchId, msgId, JSON.toJSONString(request));
+        ReceiveErrorDto errorDto = ReceiveErrorDto.success();
+        try {
+            errorDto = this.breakerDeviceService.saveBreakerDevice(request, msgId, branchId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            LogUtils.BASE_INFO_BREAKER_DEVICE.error("保存失败，{}", e);
+            return ReceiveErrorDto.error("保存失败:"+ e);
+        }
+        LogUtils.BASE_INFO_BREAKER_DEVICE.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "接受8小时回路信息同步:/api/data/breakerDeviceList", branchId, msgId, JSON.toJSONString(errorDto));
+        return errorDto;
+    }
+
+    @ApiOperation("8小时回路实时状态信息")
+    @PostMapping({"/api/{branchId}/status/breaker"})
+    public ReceiveErrorDto statusBreaker(@PathVariable String branchId, String msgId, @RequestBody BreakerDeviceDataDto request) {
+        LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【接收参数：{}】", "8小时回路实时状态信息:/api/status/breaker", branchId, msgId, JSON.toJSONString(request));
+        ReceiveErrorDto errorDto = ReceiveErrorDto.success();
+        String value = request.getStatus()+"";
+        //String key =request.getOrgCode()+request.getDeviceCode()+"breakerdata"+ DateUtil.format(new Date(),"yyyyMMdd");
+        String key =request.getOrgCode()+request.getDeviceCode()+"breakerdata";
+        try {
+            //目前对数据不做拦截
+             */
+/*if(redisCheckRepeatDataUtil.checkData(key,value,24*60*60*1000)){*//*
+
+            //修改为状态不变用不接受
+            if(redisCheckRepeatDataUtil.checkData(key,value,-1)){
+                 errorDto = this.breakerDeviceService.saveBreakerData(request, msgId, branchId);
+            }else{
+                 //保存拦截数据
+                 this.breakerDeviceService.saveBreakerDataLog(request, msgId, branchId);
+                errorDto.setSuccess(true);
+                errorDto.setErrorMsg("数据已接受，短时间内收到相同的回路数据，处理结果忽略：拒绝处理该数据");
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.error("保存失败，{}", e);
+            return ReceiveErrorDto.error("保存失败:"+ e);
+        }
+        LogUtils.BASE_INFO_BREAKER_DEVICE_DATA.info("【北向接口-{}】【branchId:{}】【msgId:{}】【返回参数：{}】", "8小时回路实时状态信息:/api/status/breaker", branchId, msgId, JSON.toJSONString(errorDto));
+        return errorDto;
+    }
+
+
+}
+
+*/

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDataLog;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDataLogMapper extends BaseMapper<IotBreakerDataLog> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerData;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDataMapper extends BaseMapper<IotBreakerData> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDeviceData;
+
+/**
+ * <p>
+ * 8小时回路信息同步数据表 Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDeviceDataMapper extends BaseMapper<IotBreakerDeviceData> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDevice;
+
+/**
+ * <p>
+ *  8小时回路信息同步表 Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDeviceMapper extends BaseMapper<IotBreakerDevice> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDeviceToArea;
+
+/**
+ * <p>
+ * 回路绑定的区域 Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDeviceToAreaMapper extends BaseMapper<IotBreakerDeviceToArea> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xunmei.common.core.domain.iot.domain.IotBreaker;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerMapper extends BaseMapper<IotBreaker> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDataLog;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDataLogService extends IService<IotBreakerDataLog> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerData;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDataService extends IService<IotBreakerData> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDeviceData;
+
+/**
+ * <p>
+ * 8小时回路信息同步数据表 服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDeviceDataService extends IService<IotBreakerDeviceData> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDevice;
+
+/**
+ * <p>
+ *  8小时回路信息同步表 服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDeviceService extends IService<IotBreakerDevice> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDeviceToArea;
+
+/**
+ * <p>
+ * 回路绑定的区域 服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerDeviceToAreaService extends IService<IotBreakerDeviceToArea> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.xunmei.mediator.api.breaker.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xunmei.common.core.domain.iot.domain.IotBreaker;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+public interface IotBreakerService extends IService<IotBreaker> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.breaker.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDataLog;
+import com.xunmei.mediator.api.breaker.mapper.IotBreakerDataLogMapper;
+import com.xunmei.mediator.api.breaker.service.IotBreakerDataLogService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Service
+public class IotBreakerDataLogServiceImpl extends ServiceImpl<IotBreakerDataLogMapper, IotBreakerDataLog> implements IotBreakerDataLogService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.breaker.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerData;
+import com.xunmei.mediator.api.breaker.mapper.IotBreakerDataMapper;
+import com.xunmei.mediator.api.breaker.service.IotBreakerDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Service
+public class IotBreakerDataServiceImpl extends ServiceImpl<IotBreakerDataMapper, IotBreakerData> implements IotBreakerDataService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.breaker.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDeviceData;
+import com.xunmei.mediator.api.breaker.mapper.IotBreakerDeviceDataMapper;
+import com.xunmei.mediator.api.breaker.service.IotBreakerDeviceDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 8小时回路信息同步数据表 服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Service
+public class IotBreakerDeviceDataServiceImpl extends ServiceImpl<IotBreakerDeviceDataMapper, IotBreakerDeviceData> implements IotBreakerDeviceDataService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.breaker.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDevice;
+import com.xunmei.mediator.api.breaker.mapper.IotBreakerDeviceMapper;
+import com.xunmei.mediator.api.breaker.service.IotBreakerDeviceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  8小时回路信息同步表 服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Service
+public class IotBreakerDeviceServiceImpl extends ServiceImpl<IotBreakerDeviceMapper, IotBreakerDevice> implements IotBreakerDeviceService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.breaker.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.iot.domain.IotBreakerDeviceToArea;
+import com.xunmei.mediator.api.breaker.mapper.IotBreakerDeviceToAreaMapper;
+import com.xunmei.mediator.api.breaker.service.IotBreakerDeviceToAreaService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 回路绑定的区域 服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Service
+public class IotBreakerDeviceToAreaServiceImpl extends ServiceImpl<IotBreakerDeviceToAreaMapper, IotBreakerDeviceToArea> implements IotBreakerDeviceToAreaService {
+
+}

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

@@ -0,0 +1,20 @@
+package com.xunmei.mediator.api.breaker.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.iot.domain.IotBreaker;
+import com.xunmei.mediator.api.breaker.mapper.IotBreakerMapper;
+import com.xunmei.mediator.api.breaker.service.IotBreakerService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author jingYuanChao
+ * @since 2024-06-20
+ */
+@Service
+public class IotBreakerServiceImpl extends ServiceImpl<IotBreakerMapper, IotBreaker> implements IotBreakerService {
+
+}

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

@@ -1,33 +1,20 @@
-package com.xunmei.mediator.api.controller;
+package com.xunmei.mediator.api.host.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.xunmei.mediator.api.service.IIotDeviceService;
-import com.xunmei.mediator.api.service.IIotDvrChannelService;
-import com.xunmei.mediator.api.service.IotDeviceDetectionService;
-import com.xunmei.mediator.api.service.IotSensorService;
-import com.xunmei.system.api.RemoteDeviceService;
-import com.xunmei.system.api.RemoteFileService;
+import com.xunmei.mediator.api.host.service.IIotDeviceService;
+import com.xunmei.mediator.api.host.service.IIotDvrChannelService;
 import com.xunmei.system.api.dto.DataPageDto;
-import com.xunmei.system.api.dto.SensorDto;
-import com.xunmei.system.api.dto.SensorStatusDto;
 import com.xunmei.system.api.dto.device.DeviceDto;
-import com.xunmei.system.api.dto.protection.NetworkDeviceDetectionEditDto;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.util.LogUtils;
-import feign.Response;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author jingyuanchao
@@ -41,12 +28,6 @@ public class DataController {
     private IIotDeviceService iotDeviceService;
     @Resource
     private IIotDvrChannelService iotDvrChannelService;
-    @Resource
-    private RemoteDeviceService remoteDeviceService;
-    @Resource
-    private IotDeviceDetectionService networkDeviceDetectionService;
-    @Resource
-    private IotSensorService iotSensorService;
 
 
     /***
@@ -117,66 +98,6 @@ public class DataController {
     }
 
 
-    @ApiOperation(value = "传感器通用设备信息同步", notes = "直连主机传感器,每个完整的包为一个机构机构数据,非所有机构数据")
-    @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, msgId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            LogUtils.DIRECT_HOST_SENSOR.error("保存失败，{}", e);
-            return ReceiveErrorDto.error("保存失败:" + e);
-        }
-        LogUtils.DIRECT_HOST_SENSOR.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备信息同步:/api/data/sensorCommonList", msgId, JSON.toJSONString(errorDto));
-        return errorDto;
-    }
-
-
-    @ApiOperation(value = "传感器通用设备状态同步", notes = "十分钟定时全量推送")
-    @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, msgId);
-        } catch (Exception e) {
-            e.printStackTrace();
-            LogUtils.DIRECT_HOST_SENSOR_STATUS.error("保存失败，{}", e);
-            return ReceiveErrorDto.error("保存失败:" + e);
-        }
-        LogUtils.DIRECT_HOST_SENSOR_STATUS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备实时状态信息同步:/api/status/sensorCommon", msgId, JSON.toJSONString(errorDto));
-        return errorDto;
-    }
-
-    /**
-     * 频率：每次检查完成后，如果有新产生的录像机或网络设备告警，上报一次报警信息。报警恢复后，
-     * 主动上报一次恢复信息。
-     * 粒度：每个录像机或网络设备网络情况为一个数据包
-     *
-     * @param msgId
-     * @param networkDeviceDetectionEditDto
-     * @return
-     */
-    @ApiOperation("网络设备检测")
-    @PostMapping({"/api/status/network"})
-    ReceiveErrorDto network(String msgId, @RequestBody NetworkDeviceDetectionEditDto 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);
-        } catch (Exception e) {
-            e.printStackTrace();
-            LogUtils.STATUS_INFO_NETWORK.error("保存失败，{}", e);
-        }
-        LogUtils.STATUS_INFO_NETWORK.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "网络设备检测:/api/status/network", msgId, JSON.toJSONString(result));
-        return result;
-
-    }
-
-    @Resource
-    private RemoteFileService fileService;
 
 //    @ApiOperation("传感器通用设备信息同步")
 //    @GetMapping({"/api/test"})

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDeviceMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/host/mapper/IotDeviceMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.host.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrChannelMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/host/mapper/IotDvrChannelMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.host.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorCategoryMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/host/mapper/MediatorCategoryMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.host.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.host.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotDevice;

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.host.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IMediatorCategoryService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/host/service/IMediatorCategoryService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.host.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;

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

@@ -1,32 +1,26 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.host.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDevice;
-import com.xunmei.common.core.domain.mediator.domain.*;
 import com.xunmei.common.core.enums.CategoryDataEnum;
-import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.common.core.utils.IDHelper;
+import com.xunmei.mediator.api.host.service.IIotDeviceService;
+import com.xunmei.mediator.api.north.service.NorthErrorService;
+import com.xunmei.mediator.api.north.service.impl.NorthStatisticsSyncService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.north.NorthError;
 import com.xunmei.system.api.dto.device.DeviceDto;
 import com.xunmei.system.api.enums.DataType;
 import com.xunmei.system.api.enums.DeviceOnlineStatus;
-import com.xunmei.system.api.enums.DeviceType;
-import com.xunmei.system.api.enums.ProductTypeEnum;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
-import javax.annotation.Resource;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.host.service.impl;
 
 
 import cn.hutool.core.util.ObjectUtil;
@@ -7,10 +7,9 @@ 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;
-import com.xunmei.mediator.api.service.NorthStatisticsSyncService;
+import com.xunmei.mediator.api.host.mapper.IotDeviceMapper;
+import com.xunmei.mediator.api.host.service.IIotDeviceService;
+import com.xunmei.mediator.api.north.service.impl.NorthStatisticsSyncService;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
 import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.device.DeviceDto;

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.host.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -8,13 +8,11 @@ import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotDevice;
 import com.xunmei.common.core.domain.iot.domain.IotDvrChannel;
-import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
 import com.xunmei.common.core.domain.mediator.vo.EquipmentOrgVo;
-import com.xunmei.mediator.api.mapper.IotDvrChannelMapper;
-import com.xunmei.mediator.api.service.IIotDeviceService;
-import com.xunmei.mediator.api.service.IIotDvrChannelService;
-import com.xunmei.mediator.api.service.IMediatorCategoryService;
-import com.xunmei.mediator.api.service.NorthErrorService;
+import com.xunmei.mediator.api.host.mapper.IotDvrChannelMapper;
+import com.xunmei.mediator.api.host.service.IIotDeviceService;
+import com.xunmei.mediator.api.host.service.IIotDvrChannelService;
+import com.xunmei.mediator.api.north.service.NorthErrorService;
 import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/MediatorCategoryServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/host/service/impl/MediatorCategoryServiceImpl.java

@@ -1,10 +1,10 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.host.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
-import com.xunmei.mediator.api.mapper.MediatorCategoryMapper;
-import com.xunmei.mediator.api.service.IMediatorCategoryService;
+import com.xunmei.mediator.api.host.mapper.MediatorCategoryMapper;
+import com.xunmei.mediator.api.host.service.IMediatorCategoryService;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,16 +0,0 @@
-package com.xunmei.mediator.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.IotAlarmCode;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author oygj
- * @since 2024-01-25
- */
-public interface IotAlarmCodeMapper extends BaseMapper<IotAlarmCode> {
-
-}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/MediatorController.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/controller/MediatorController.java

@@ -1,8 +1,8 @@
-package com.xunmei.mediator.api.controller;
+package com.xunmei.mediator.api.north.controller;
 
 
 import com.xunmei.common.core.web.domain.AjaxResult;
-import com.xunmei.mediator.api.service.*;
+import com.xunmei.mediator.api.host.service.IIotDvrChannelService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.web.bind.annotation.*;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/VersionController.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/controller/VersionController.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.controller;
+package com.xunmei.mediator.api.north.controller;
 
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorNorthBaseStatisticsMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/mapper/MediatorNorthBaseStatisticsMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.north.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.north.MediatorNorthBaseStatistics;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorNorthBusinessStatisticsMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/mapper/MediatorNorthBusinessStatisticsMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.north.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.north.MediatorNorthBusinessStatistics;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/NorthErrorMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/mapper/NorthErrorMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.north.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.north.NorthError;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/NorthMsgIdMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/mapper/NorthMsgIdMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.north.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.system.api.domain.north.NorthMsgId;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IMediatorNorthBaseStatisticsService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/IMediatorNorthBaseStatisticsService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.north.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.system.api.domain.north.MediatorNorthBaseStatistics;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IMediatorNorthBusinessStatisticsService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/IMediatorNorthBusinessStatisticsService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.north.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.system.api.domain.north.MediatorNorthBusinessStatistics;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/INorthMsgIdService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/INorthMsgIdService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.north.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/NorthErrorService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/NorthErrorService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.north.service;
 
 
 import com.xunmei.system.api.domain.north.NorthError;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/MediatorNorthBaseStatisticsServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/impl/MediatorNorthBaseStatisticsServiceImpl.java

@@ -1,8 +1,8 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.north.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.mediator.api.mapper.MediatorNorthBaseStatisticsMapper;
-import com.xunmei.mediator.api.service.IMediatorNorthBaseStatisticsService;
+import com.xunmei.mediator.api.north.mapper.MediatorNorthBaseStatisticsMapper;
+import com.xunmei.mediator.api.north.service.IMediatorNorthBaseStatisticsService;
 import com.xunmei.system.api.domain.north.MediatorNorthBaseStatistics;
 import org.springframework.stereotype.Service;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/MediatorNorthBusinessStatisticsServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/impl/MediatorNorthBusinessStatisticsServiceImpl.java

@@ -1,8 +1,8 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.north.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.mediator.api.mapper.MediatorNorthBusinessStatisticsMapper;
-import com.xunmei.mediator.api.service.IMediatorNorthBusinessStatisticsService;
+import com.xunmei.mediator.api.north.mapper.MediatorNorthBusinessStatisticsMapper;
+import com.xunmei.mediator.api.north.service.IMediatorNorthBusinessStatisticsService;
 import com.xunmei.system.api.domain.north.MediatorNorthBusinessStatistics;
 import org.springframework.stereotype.Service;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/NorthErrorServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/impl/NorthErrorServiceImpl.java

@@ -1,9 +1,9 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.north.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.mediator.api.mapper.NorthErrorMapper;
-import com.xunmei.mediator.api.service.NorthErrorService;
+import com.xunmei.mediator.api.north.mapper.NorthErrorMapper;
+import com.xunmei.mediator.api.north.service.NorthErrorService;
 import com.xunmei.system.api.domain.north.NorthError;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/NorthMsgIdServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/impl/NorthMsgIdServiceImpl.java

@@ -1,8 +1,8 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.north.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.mediator.api.mapper.NorthMsgIdMapper;
-import com.xunmei.mediator.api.service.INorthMsgIdService;
+import com.xunmei.mediator.api.north.mapper.NorthMsgIdMapper;
+import com.xunmei.mediator.api.north.service.INorthMsgIdService;
 import com.xunmei.system.api.domain.north.NorthMsgId;
 import org.springframework.stereotype.Service;
 

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/NorthStatisticsSyncService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/north/service/impl/NorthStatisticsSyncService.java

@@ -1,11 +1,13 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.north.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.utils.DateUtils;
-import com.xunmei.mediator.api.mapper.MediatorNorthBaseStatisticsMapper;
-import com.xunmei.mediator.api.mapper.MediatorNorthBusinessStatisticsMapper;
+import com.xunmei.mediator.api.north.mapper.MediatorNorthBaseStatisticsMapper;
+import com.xunmei.mediator.api.north.mapper.MediatorNorthBusinessStatisticsMapper;
+import com.xunmei.mediator.api.north.service.IMediatorNorthBaseStatisticsService;
+import com.xunmei.mediator.api.north.service.IMediatorNorthBusinessStatisticsService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.north.MediatorNorthBaseStatistics;
 import com.xunmei.system.api.domain.north.MediatorNorthBusinessStatistics;

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

@@ -1,9 +1,9 @@
-package com.xunmei.mediator.api.controller;
+package com.xunmei.mediator.api.protection.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.xunmei.mediator.api.service.IotAlarmDefenceAreaService;
-import com.xunmei.mediator.api.service.IotAlarmSubsystemService;
+import com.xunmei.mediator.api.protection.service.IotAlarmDefenceAreaService;
+import com.xunmei.mediator.api.protection.service.IotAlarmSubsystemService;
 import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.protection.DefenceAreaDto;
 import com.xunmei.system.api.dto.protection.ProtectionEditDto;

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.protection.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmSubsystemMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/mapper/IotAlarmSubsystemMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.protection.mapper;
 
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDefenceAreaAlarmDataMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/mapper/IotDefenceAreaAlarmDataMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.protection.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceAreaAlarmData;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDefenceAreaDataLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/mapper/IotDefenceAreaDataLogMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.protection.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDefenceAreaDataMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/mapper/IotDefenceAreaDataMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.protection.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/ProtectionLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/mapper/ProtectionLogMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.protection.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmSubsystemLog;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDefenceAreaAlarmDataService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/IIotDefenceAreaAlarmDataService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.protection.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDefenceAreaDataLogService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/IIotDefenceAreaDataLogService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.protection.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDefenceAreaDataService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/IIotDefenceAreaDataService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.protection.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -1,8 +1,7 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.protection.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
-import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.SensorDataDto;
 

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.protection.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;

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

@@ -1,45 +1,35 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.protection.service.impl;
 
-import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.Constants;
 import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.*;
 import com.xunmei.common.core.util.BeanHelper;
-import com.xunmei.common.core.utils.DateUtils;
 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.service.*;
-import com.xunmei.mediator.util.CheckDataUtil;
+import com.xunmei.mediator.api.north.service.NorthErrorService;
+import com.xunmei.mediator.api.protection.mapper.IotAlarmDefenceAreaMapper;
+import com.xunmei.mediator.api.protection.service.IIotDefenceAreaAlarmDataService;
+import com.xunmei.mediator.api.protection.service.IIotDefenceAreaDataLogService;
+import com.xunmei.mediator.api.protection.service.IIotDefenceAreaDataService;
+import com.xunmei.mediator.api.protection.service.IotAlarmDefenceAreaService;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.north.NorthError;
-import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.SensorDataDto;
 import com.xunmei.system.api.util.LogUtils;
-import com.xunmei.system.api.vo.SysOrgVO;
-import io.netty.util.internal.StringUtil;
-import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import sun.management.Sensor;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * <p>

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

@@ -1,10 +1,8 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.protection.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.Constants;
@@ -13,16 +11,19 @@ import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmSubsystem;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmSubsystemLog;
 import com.xunmei.common.core.domain.iot.domain.IotDevice;
-import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
 import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.thread.ThreadPoolConfig;
 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.*;
+import com.xunmei.mediator.api.host.service.IIotDeviceService;
+import com.xunmei.mediator.api.host.service.IMediatorCategoryService;
+import com.xunmei.mediator.api.north.service.NorthErrorService;
+import com.xunmei.mediator.api.protection.mapper.IotAlarmSubsystemMapper;
+import com.xunmei.mediator.api.protection.mapper.ProtectionLogMapper;
+import com.xunmei.mediator.api.protection.service.IotAlarmDefenceAreaService;
+import com.xunmei.mediator.api.protection.service.IotAlarmSubsystemService;
+import com.xunmei.mediator.api.north.service.impl.NorthStatisticsSyncService;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
 import com.xunmei.system.api.RemoteOrgService;
@@ -38,7 +39,6 @@ import com.xunmei.system.api.enums.ProtectionStatus;
 import com.xunmei.system.api.util.LogUtils;
 import com.xunmei.system.api.vo.SysOrgVO;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
@@ -52,7 +52,6 @@ import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
 
 
 /**

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDefenceAreaAlarmDataServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/impl/IotDefenceAreaAlarmDataServiceImpl.java

@@ -1,9 +1,9 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.protection.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceAreaAlarmData;
-import com.xunmei.mediator.api.mapper.IotDefenceAreaAlarmDataMapper;
-import com.xunmei.mediator.api.service.IIotDefenceAreaAlarmDataService;
+import com.xunmei.mediator.api.protection.mapper.IotDefenceAreaAlarmDataMapper;
+import com.xunmei.mediator.api.protection.service.IIotDefenceAreaAlarmDataService;
 import org.springframework.stereotype.Service;
 
 /**

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDefenceAreaDataLogServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/impl/IotDefenceAreaDataLogServiceImpl.java

@@ -1,9 +1,9 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.protection.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceAreaDataLog;
-import com.xunmei.mediator.api.mapper.IotDefenceAreaDataLogMapper;
-import com.xunmei.mediator.api.service.IIotDefenceAreaDataLogService;
+import com.xunmei.mediator.api.protection.mapper.IotDefenceAreaDataLogMapper;
+import com.xunmei.mediator.api.protection.service.IIotDefenceAreaDataLogService;
 import org.springframework.stereotype.Service;
 
 /**

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDefenceAreaDataServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/protection/service/impl/IotDefenceAreaDataServiceImpl.java

@@ -1,18 +1,12 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.protection.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.Constants;
-import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceAreaData;
-import com.xunmei.mediator.api.mapper.IotDefenceAreaDataMapper;
-import com.xunmei.mediator.api.service.IIotDefenceAreaDataService;
+import com.xunmei.mediator.api.protection.mapper.IotDefenceAreaDataMapper;
+import com.xunmei.mediator.api.protection.service.IIotDefenceAreaDataService;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
-
-import static com.baomidou.mybatisplus.core.toolkit.Constants.LIMIT;
-
 /**
  * <p>
  * 防区传感器报警信息，最新数据 服务实现类

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

@@ -0,0 +1,59 @@
+package com.xunmei.mediator.api.sensor.controller;
+
+import com.alibaba.fastjson.JSON;
+import com.xunmei.mediator.api.sensor.service.IotSensorService;
+import com.xunmei.system.api.dto.DataPageDto;
+import com.xunmei.system.api.dto.SensorDto;
+import com.xunmei.system.api.dto.SensorStatusDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
+import com.xunmei.system.api.util.LogUtils;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @author jingyuanchao
+ * @date 2024/1/25 10:23
+ */
+@RestController
+public class SensorController {
+    @Resource
+    private IotSensorService iotSensorService;
+
+    @ApiOperation(value = "传感器通用设备信息同步", notes = "直连主机传感器,每个完整的包为一个机构机构数据,非所有机构数据")
+    @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, msgId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            LogUtils.DIRECT_HOST_SENSOR.error("保存失败，{}", e);
+            return ReceiveErrorDto.error("保存失败:" + e);
+        }
+        LogUtils.DIRECT_HOST_SENSOR.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备信息同步:/api/data/sensorCommonList", msgId, JSON.toJSONString(errorDto));
+        return errorDto;
+    }
+
+
+    @ApiOperation(value = "传感器通用设备状态同步", notes = "十分钟定时全量推送")
+    @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, msgId);
+        } catch (Exception e) {
+            e.printStackTrace();
+            LogUtils.DIRECT_HOST_SENSOR_STATUS.error("保存失败，{}", e);
+            return ReceiveErrorDto.error("保存失败:" + e);
+        }
+        LogUtils.DIRECT_HOST_SENSOR_STATUS.info("【北向接口-{}】【msgId:{}】【返回参数：{}】", "接受传感器通用设备实时状态信息同步:/api/status/sensorCommon", msgId, JSON.toJSONString(errorDto));
+        return errorDto;
+    }
+
+}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotSensorLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/sensor/mapper/IotSensorLogMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.sensor.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotSensorMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/sensor/mapper/IotSensorMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.sensor.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotSensorLogService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/sensor/service/IotSensorLogService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.sensor.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotSensorLog;

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.sensor.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotSensor;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotSensorLogServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/sensor/service/impl/IotSensorLogServiceImpl.java

@@ -1,9 +1,9 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.sensor.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.iot.domain.IotSensorLog;
-import com.xunmei.mediator.api.mapper.IotSensorLogMapper;
-import com.xunmei.mediator.api.service.IotSensorLogService;
+import com.xunmei.mediator.api.sensor.mapper.IotSensorLogMapper;
+import com.xunmei.mediator.api.sensor.service.IotSensorLogService;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.sensor.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson2.JSON;
@@ -14,11 +14,11 @@ import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.domain.iot.domain.IotSensorLog;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.security.utils.DictUtils;
-import com.xunmei.mediator.api.mapper.IotSensorMapper;
-import com.xunmei.mediator.api.service.IotAlarmDataService;
-import com.xunmei.mediator.api.service.IotSensorLogService;
-import com.xunmei.mediator.api.service.IotSensorService;
-import com.xunmei.mediator.api.service.NorthErrorService;
+import com.xunmei.mediator.api.sensor.mapper.IotSensorMapper;
+import com.xunmei.mediator.api.alarm.service.IotAlarmDataService;
+import com.xunmei.mediator.api.sensor.service.IotSensorLogService;
+import com.xunmei.mediator.api.sensor.service.IotSensorService;
+import com.xunmei.mediator.api.north.service.NorthErrorService;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
 import com.xunmei.system.api.RemoteOrgService;

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

@@ -1,17 +0,0 @@
-package com.xunmei.mediator.api.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.mediator.domain.IotAlarmCode;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author oygj
- * @since 2024-01-25
- */
-public interface IMediatorAlarmCodeService extends IService<IotAlarmCode> {
-
-    IotAlarmCode selectByCode(String code);
-}

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

@@ -1,25 +0,0 @@
-package com.xunmei.mediator.api.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.constant.Constants;
-import com.xunmei.common.core.domain.mediator.domain.IotAlarmCode;
-import com.xunmei.mediator.api.mapper.IotAlarmCodeMapper;
-import com.xunmei.mediator.api.service.IMediatorAlarmCodeService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author oygj
- * @since 2024-01-25
- */
-@Service
-public class MediatorAlarmCodeServiceImpl extends ServiceImpl<IotAlarmCodeMapper, IotAlarmCode> implements IMediatorAlarmCodeService {
-
-    @Override
-    public IotAlarmCode selectByCode(String code) {
-        return lambdaQuery().eq(IotAlarmCode::getCode, code).last(Constants.LIMIT1).one();
-    }
-}

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/UpsController.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/controller/UpsController.java

@@ -1,8 +1,8 @@
-package com.xunmei.mediator.api.controller;
+package com.xunmei.mediator.api.ups.controller;
 
 
 import com.xunmei.common.core.utils.JacksonUtils;
-import com.xunmei.mediator.api.service.IIotUpsService;
+import com.xunmei.mediator.api.ups.service.IIotUpsService;
 import com.xunmei.mediator.domain.dto.ups.UpsDeviceDataDto;
 import com.xunmei.mediator.domain.dto.ups.UpsDeviceDto;
 import com.xunmei.system.api.dto.DataPageDto;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotUpsAttrMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/mapper/IotUpsAttrMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.ups.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotUpsAttr;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotUpsDataLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/mapper/IotUpsDataLogMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.ups.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotUpsDataLog;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotUpsMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/mapper/IotUpsMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.ups.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotUps;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotUpsDataLogService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/service/IIotUpsDataLogService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.ups.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotUpsDataLog;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotUpsService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/service/IIotUpsService.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service;
+package com.xunmei.mediator.api.ups.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.iot.domain.IotUps;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotUpsDataLogServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/service/impl/IotUpsDataLogServiceImpl.java

@@ -1,9 +1,9 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.ups.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.iot.domain.IotUpsDataLog;
-import com.xunmei.mediator.api.mapper.IotUpsDataLogMapper;
-import com.xunmei.mediator.api.service.IIotUpsDataLogService;
+import com.xunmei.mediator.api.ups.mapper.IotUpsDataLogMapper;
+import com.xunmei.mediator.api.ups.service.IIotUpsDataLogService;
 import org.springframework.stereotype.Service;
 
 /**

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotUpsServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/ups/service/impl/IotUpsServiceImpl.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.service.impl;
+package com.xunmei.mediator.api.ups.service.impl;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
@@ -12,11 +12,11 @@ import com.xunmei.common.core.enums.iot.UpsStatus;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.JacksonUtils;
 import com.xunmei.common.redis.utils.RedisUtils;
-import com.xunmei.mediator.api.mapper.IotUpsAttrMapper;
-import com.xunmei.mediator.api.mapper.IotUpsMapper;
-import com.xunmei.mediator.api.service.IIotUpsService;
-import com.xunmei.mediator.api.service.NorthErrorService;
-import com.xunmei.mediator.api.service.NorthStatisticsSyncService;
+import com.xunmei.mediator.api.ups.mapper.IotUpsAttrMapper;
+import com.xunmei.mediator.api.ups.mapper.IotUpsMapper;
+import com.xunmei.mediator.api.ups.service.IIotUpsService;
+import com.xunmei.mediator.api.north.service.NorthErrorService;
+import com.xunmei.mediator.api.north.service.impl.NorthStatisticsSyncService;
 import com.xunmei.mediator.domain.dto.ups.UpsDataVo;
 import com.xunmei.mediator.domain.dto.ups.UpsDeviceDataDto;
 import com.xunmei.mediator.domain.dto.ups.UpsDeviceDto;

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

@@ -1,21 +1,24 @@
-package com.xunmei.mediator.api.controller;
+package com.xunmei.mediator.api.video.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.xunmei.mediator.api.service.*;
-import com.xunmei.system.api.dto.DataPageDto;
-import com.xunmei.system.api.dto.DvrDiskPageDto;
-import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
+import com.xunmei.mediator.api.video.service.*;
 import com.xunmei.mediator.domain.dto.videoDaysCheck.VideoDaysCheckDto;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
 import com.xunmei.mediator.domain.dto.videoIntegrityCheck.VideoIntegrityCheckDto;
+import com.xunmei.system.api.dto.DataPageDto;
+import com.xunmei.system.api.dto.DvrDiskPageDto;
+import com.xunmei.system.api.dto.protection.NetworkDeviceDetectionEditDto;
+import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.VideoRecorderHardDiskDetectionEditDto;
 import com.xunmei.system.api.util.LogUtils;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 
@@ -37,6 +40,9 @@ public class VideoDataController {
     IotDvrHardDiskDetectionService videoRecorderHardDiskDetectionService;
     @Resource
     IotDvrDiskService dvrDiskService;
+
+    @Resource
+    private IotDeviceDetectionService networkDeviceDetectionService;
     @ApiOperation("录像完整性检查")
     @PostMapping({"/api/video/complete"})
     public ReceiveErrorDto complete( String msgId, @RequestBody VideoIntegrityCheckDto videoIntegrityCheckDto) {
@@ -130,4 +136,30 @@ public class VideoDataController {
     }
 
 
+
+    /**
+     * 频率：每次检查完成后，如果有新产生的录像机或网络设备告警，上报一次报警信息。报警恢复后，
+     * 主动上报一次恢复信息。
+     * 粒度：每个录像机或网络设备网络情况为一个数据包
+     *
+     * @param msgId
+     * @param networkDeviceDetectionEditDto
+     * @return
+     */
+    @ApiOperation("网络设备检测")
+    @PostMapping({"/api/status/network"})
+    ReceiveErrorDto network(String msgId, @RequestBody NetworkDeviceDetectionEditDto 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);
+        } catch (Exception e) {
+            e.printStackTrace();
+            LogUtils.STATUS_INFO_NETWORK.error("保存失败，{}", e);
+        }
+        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/mapper/IotDeviceDetectionLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/mapper/IotDeviceDetectionLogMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.video.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDeviceDetectionMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/mapper/IotDeviceDetectionMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.video.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrDiskLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/mapper/IotDvrDiskLogMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.video.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.xunmei.common.core.domain.iot.domain.IotDvrDiskLog;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrDiskMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/mapper/IotDvrDiskMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.video.mapper;
 
 import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;

soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDvrHardDiskDetectionLogMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/video/mapper/IotDvrHardDiskDetectionLogMapper.java

@@ -1,4 +1,4 @@
-package com.xunmei.mediator.api.mapper;
+package com.xunmei.mediator.api.video.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;