host模块 基础设备同步代码提交

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/util/LogUtils.java

@@ -137,4 +137,5 @@ public class LogUtils {
      * websocket日志
      */
     public  static  final Logger WEBSOCKET_MSG=LoggerFactory.getLogger("websocketMsgLog");
+    public  static  final Logger SOCKET_BASE_DEVICE_INFO=LoggerFactory.getLogger("socketBaseDeviceInfo");
 }

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

@@ -1,74 +0,0 @@
-package com.xunmei.common.core.domain.mediator.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-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 oygj
- * @since 2024-01-25
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("mediator_category")
-@ApiModel(value = "MediatorCategory对象", description = "")
-public class MediatorCategory implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId(value = "id", type = IdType.AUTO)
-    private Long id;
-
-    @TableField("name")
-    private String name;
-
-    @ApiModelProperty(value = "上级分类")
-    @TableField("parent_id")
-    private Long parentId;
-
-    @ApiModelProperty(value = "创建人")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "创建人名称")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "修改人名称")
-    @TableField("update_by")
-    private String updateBy;
-
-    @ApiModelProperty(value = "修改时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "code")
-    @TableField("code")
-    private String code;
-
-    @ApiModelProperty(value = "删除")
-    @TableField("deleted")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "层级")
-    @TableField("level")
-    private Integer level;
-
-    @ApiModelProperty(value = "0:消防,1:安防")
-    @TableField("type")
-    private Boolean type;
-
-
-}

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

@@ -13,7 +13,6 @@ import org.apache.ibatis.annotations.Mapper;
  * @author oygj
  * @since 2024-02-20
  */
-@Mapper
 public interface IotDeviceMapper extends BaseMapper<IotDevice> {
 
 }

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

@@ -1,11 +0,0 @@
-package com.xunmei.host.host.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
-
-/**
- * @author jingyuanchao
- * @date 2024/1/24 17:50
- */
-public interface MediatorCategoryMapper extends BaseMapper<MediatorCategory> {
-}

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

@@ -13,6 +13,7 @@ import com.xunmei.common.core.domain.iot.domain.IotAlarmSubsystem;
 import com.xunmei.common.core.domain.iot.domain.IotServerInfo;
 import com.xunmei.common.core.enums.iot.BaseDeviceTypeEnum;
 import com.xunmei.common.core.enums.iot.DefenceAreaType;
+import com.xunmei.common.core.utils.JacksonUtils;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.host.iot.mapper.IotDeviceInfoMapper;
 import com.xunmei.host.iot.service.IIotDeviceInfoExtendService;
@@ -30,6 +31,7 @@ import com.xunmei.host.websocket.enums.ProductEnums;
 import com.xunmei.host.websocket.service.RouterService;
 import com.xunmei.system.api.domain.iot.IotDeviceInfo;
 import com.xunmei.system.api.domain.iot.IotDeviceInfoExtend;
+import com.xunmei.system.api.util.LogUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.redisson.api.RLock;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,10 +40,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.StringJoiner;
+import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -257,13 +256,16 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
 
     @Override
     public ProductEnums product() {
-        return null;
+        return ProductEnums.IOT_SERVER;
     }
 
     @Override
     public String routerKey() {
         StringJoiner result = new StringJoiner(",");
+        //设备基础数据
         result.add(WebSocketConstants.DEVICES_EVENT);
+        //设备状态数据
+        result.add(WebSocketConstants.DEVICES_STATUS_EVENT);
         return result.toString();
     }
 
@@ -276,6 +278,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Object execute(WebsocketExecuteReq req) {
+        LogUtils.SOCKET_BASE_DEVICE_INFO.info("收到消息:{}", JacksonUtils.toJSONString(req));
         Object data = req.getData();
         JSONArray dataArray = (JSONArray) data;
         if (ObjectUtil.isEmpty(dataArray)) {
@@ -286,9 +289,18 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         List<DvsBaseInfo> dataList = dataArray.toJavaList(DvsBaseInfo.class);
         String lockKey = LOCK_DEVICE_BASE_INFO + token;
         String key = LOCK_ALARM_HOST_BASE_INFO + token;
+        String event = req.getEvent();
+        switch (event) {
+            case WebSocketConstants.DEVICES_EVENT:
+                lockAndExecute(lockKey, () -> handleDvsAndFSUDeviceInfo(dataList, serverInfo));
+                lockAndExecute(key, () -> handleAlarmHostDeviceInfo(dataList, serverInfo));
+                break;
+            case WebSocketConstants.DEVICES_STATUS_EVENT:
+                break;
+            default:
+                break;
+        }
 
-        lockAndExecute(lockKey, () -> handleDvsAndFSUDeviceInfo(dataList, serverInfo));
-        lockAndExecute(key, () -> handleAlarmHostDeviceInfo(dataList, serverInfo));
         return null;
     }
 
@@ -322,6 +334,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         List<IotAlarmDefenceArea> updateDefenceAreaList = new ArrayList();
 
         for (DvsBaseInfo dvsBaseInfo : alarmHostList) {
+
             //处理报警主机信息
             IotDeviceInfo hostInfo = selectByTypeAndCode(serverInfo.getIotCode(), BaseDeviceTypeEnum.AlarmHost.getCode(), dvsBaseInfo.getProductName(), dvsBaseInfo.getDeviceName());
 
@@ -410,10 +423,12 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         deleteDeviceByToken(serverInfo.getIotCode());
         //逻辑删除Dvs扩展信息
         iIotDeviceInfoExtendService.deleteDeviceExtendByTokenAndDeviceType(serverInfo.getIotCode(), BaseDeviceTypeEnum.Dvs.getCode());
+        iIotDeviceInfoExtendService.deleteDeviceExtendByTokenAndDeviceType(serverInfo.getIotCode(), BaseDeviceTypeEnum.FSU.getCode());
         //逻辑删除所有硬盘信息
         iIotDvrDiskService.deleteByToken(serverInfo.getIotCode());
 
-        List<DvsBaseInfo> dvsBaseInfoList = dataList.stream().filter(r -> ObjectUtil.equal(r.getType(), BaseDeviceTypeEnum.Dvs.name())).collect(Collectors.toList());
+        List<DvsBaseInfo> dvsBaseInfoList = dataList.stream().filter(r -> ObjectUtil.equal(r.getType(), BaseDeviceTypeEnum.Dvs.name())
+                || ObjectUtil.equal(r.getType(), BaseDeviceTypeEnum.FSU.name())).collect(Collectors.toList());
         if (ObjectUtil.isEmpty(dvsBaseInfoList)) {
             return;
         }
@@ -431,15 +446,15 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         List<IotDeviceInfo> updateChnnelList = new ArrayList();
 
         for (DvsBaseInfo dvsBaseInfo : dvsBaseInfoList) {
-
+            String code = BaseDeviceTypeEnum.valueOf(dvsBaseInfo.getType()).getCode();
             //处理主机信息
-            IotDeviceInfo hostInfo = selectByTypeAndCode(serverInfo.getIotCode(), BaseDeviceTypeEnum.Dvs.getCode(), dvsBaseInfo.getProductName(), dvsBaseInfo.getDeviceName());
+            IotDeviceInfo hostInfo = selectByTypeAndCode(serverInfo.getIotCode(), code, dvsBaseInfo.getProductName(), dvsBaseInfo.getDeviceName());
 
             if (ObjectUtil.isNull(hostInfo)) {
-                hostInfo = createHostInfo(dvsBaseInfo, serverInfo, BaseDeviceTypeEnum.Dvs.getCode());
+                hostInfo = createHostInfo(dvsBaseInfo, serverInfo, code);
                 addHostList.add(hostInfo);
             } else {
-                updateHostInfo(dvsBaseInfo, hostInfo, BaseDeviceTypeEnum.Dvs.getCode());
+                updateHostInfo(dvsBaseInfo, hostInfo, code);
                 updateHostList.add(hostInfo);
             }
             if (BaseDeviceTypeEnum.Dvs.name().equals(dvsBaseInfo.getType())) {
@@ -478,7 +493,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         updateChannelCache(addChnnelList, updateChnnelList);
 
         iIotDeviceInfoExtendService.updateIotDeviceExtends(updateListExtend);
-        iIotDeviceInfoExtendService.saveIotDeviceExtends(updateListExtend);
+        iIotDeviceInfoExtendService.saveIotDeviceExtends(addListExtend);
 
     }
 
@@ -487,7 +502,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         IotDeviceInfo info = new IotDeviceInfo();
         long id = IdWorker.getId(info);
         info.setDeleted(0);
-        info.setDeviceCode(baseInfo.getDeviceName());
+        info.setDeviceCode(baseInfo.getDeviceCode());
         info.setDeviceProduct(baseInfo.getProductName());
         info.setDeviceType(type);
         info.setNetStatus("0");
@@ -520,10 +535,11 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         IotDeviceInfo info = new IotDeviceInfo();
         info.setDeleted(0);
         info.setDeviceCode(subDeviceInfo.getDeviceCode());
-        info.setDeviceType(BaseDeviceTypeEnum.monitor_camera.name().equals(subDeviceInfo.getType()) ? BaseDeviceTypeEnum.monitor_camera.getCode() : BaseDeviceTypeEnum.number_camera.getCode());
+        BaseDeviceTypeEnum baseDeviceTypeEnum = BaseDeviceTypeEnum.valueOf(subDeviceInfo.getSubType());
+        info.setDeviceType(baseDeviceTypeEnum.getCode());
         info.setIotToken(serverInfo.getIotCode());
         info.setDeviceProduct(hostDevice.getDeviceProduct());
-        info.setDeviceName(subDeviceInfo.getDeviceCode());
+        info.setDeviceName(subDeviceInfo.getDeviceName());
         info.setHostCode(subDeviceInfo.getParentCode());
         info.setOrgId(serverInfo.getOrgId());
         info.setOrgName(serverInfo.getOrgName());
@@ -539,8 +555,8 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
     private void updateChannelInfo(SubDeviceInfo subDeviceInfo, IotDeviceInfo channelInfo, IotDeviceInfo hostInfo) {
         channelInfo.setDeleted(0);
         channelInfo.setDeviceName(subDeviceInfo.getDeviceName());
-        channelInfo.setDeviceType(BaseDeviceTypeEnum.monitor_camera.name().equals(subDeviceInfo.getType()) ? BaseDeviceTypeEnum.monitor_camera.getCode() : BaseDeviceTypeEnum.number_camera.getCode());
-    }
+        BaseDeviceTypeEnum baseDeviceTypeEnum = BaseDeviceTypeEnum.valueOf(subDeviceInfo.getSubType());
+        channelInfo.setDeviceType(baseDeviceTypeEnum.getCode());    }
 
     private IotDeviceInfoExtend createIotDeviceInfoExtend(DvsBaseInfo dvsInfo, Long deviceId, String token) {
         IotDeviceInfoExtend extend = new IotDeviceInfoExtend();

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/video/service/impl/VideoIntegrityCheckServiceImpl.java

@@ -94,6 +94,7 @@ public class VideoIntegrityCheckServiceImpl extends ServiceImpl<VideoIntegrityCh
 
     @Override
     public Object execute(WebsocketExecuteReq req) {
+        LogUtils.SOCKET_BASE_DEVICE_INFO.info("收到消息:{}", JacksonUtils.toJSONString(req));
         if (WebSocketConstants.GET_RECORD_INFOS_SERVICES.equals(req.getEvent())) {
             final JSONArray array = (JSONArray) req.getData();
             for (Object o : array) {

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/constant/WebSocketConstants.java

@@ -157,6 +157,7 @@ public interface WebSocketConstants {
      * 主机主动上报 设备基础信息 事件名称
      */
     String DEVICES_EVENT = "devices";
+    String DEVICES_STATUS_EVENT = "deviceStatus";
 
 
 

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/websocket/handler/RouterServiceHandler.java

@@ -26,15 +26,6 @@ public class RouterServiceHandler {
         });
     }
 
-    public static RouterService getRouteService(String routerKey) {
-        for (String key : CONCURRENT_HASH_MAP.keySet()) {
-            if (key.contains(routerKey)) {
-                return CONCURRENT_HASH_MAP.get(key);
-            }
-        }
-        throw new RuntimeException("未找到对应的处理类");
-    }
-
     public static RouterService getRouteService(String productName, String routerKey) {
         ProductEnums enums = ProductEnums.getByProductName(productName);
         if (enums == null) {

soc-modules/soc-modules-host/src/main/resources/logback.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration debug="false">
     <!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径-->
-   <property value="logs/soc-mediator" name="LOG_HOME"/>
-   <!-- <property name="log.path" value="logs/soc-mediator" />-->
+   <property value="logs/soc-host" name="LOG_HOME"/>
     <!-- 活动文件的大小 -->
     <property name="max.file.size" value="50MB"/>
     <!-- 保留的归档文件的最大数量 -->
@@ -17,369 +16,32 @@
             <pattern>%d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{50} - %msg%n</pattern>
         </encoder>
     </appender>
-
-    <!-- websocket日志  -->
-    <appender name="websocketMsgLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/websocketMsg/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
+    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <encoder>
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
-    </appender>
-
-    <!-- equipmentList 基础信息，基础设备同步接口   -->
-    <appender name="equipmentListLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>warn</level>
+        </filter>
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_equipment/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
+            <fileNamePattern>${LOG_HOME}/error/%d{yyyy-MM-dd}-%i.log</fileNamePattern>
             <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="channelListLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_channel/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
             <totalSizeCap>${total.size.cap}</totalSizeCap>
             <cleanHistoryOnStart>true</cleanHistoryOnStart>
         </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
     </appender>
 
-    <appender name="bluetoothLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_bluetooth/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
 
-    <appender name="deviceDataLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_device_data/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="doorDataLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_door_data/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
 
-    <appender name="ruleDataLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_rule_data/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
 
-    <appender name="batchProductLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_product/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
 
-    <appender name="syncProductFieldLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_product_field/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="batchDeviceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_device/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="doorDeviceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_door_device/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="statusDefenceareaLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_defencearea/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="statusDisksLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_disks/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="statusNetworkLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_network/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="baseDefenceareaLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_defencearea/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="statusSensorLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_sensor/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="videoCompleteLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_video_complete/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="videoDaysInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_video_days/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="videoDiagnosisLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_video_diagnosis/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="videoPlanLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/status_info_video_plan/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="upsDeviceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_ups_device/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="upsDeviceDataLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_ups_device_data/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-
-    <appender name="breakerDeviceLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_breaker_device/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="breakerDeviceDataLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- websocket日志  -->
+    <appender name="websocketMsgLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <maxFileSize>${max.file.size}</maxFileSize>
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_breaker_device_data/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/websocketMsg/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>${max.history}</maxHistory>
             <totalSizeCap>${total.size.cap}</totalSizeCap>
@@ -391,41 +53,12 @@
         </encoder>
     </appender>
 
-    <appender name="notifyInfoLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_notify_info/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="dvrDiskLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_info_dvr_disk/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
-            <!--日志文件保留天数-->
-            <maxHistory>${max.history}</maxHistory>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-        <encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
-            <!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符-->
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-    </appender>
-    <appender name="behaviorAnalysisAlarmLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <!-- websocket日志  -->
+    <appender name="socketBaseDeviceInfo" class="ch.qos.logback.core.rolling.RollingFileAppender">
         <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
             <maxFileSize>${max.file.size}</maxFileSize>
             <!--日志文件输出的文件名-->
-            <FileNamePattern>${LOG_HOME}/base_behavior_analysis_alarm/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
+            <FileNamePattern>${LOG_HOME}/socketBaseDeviceInfo/%d{yyyy-MM-dd}-%i.log</FileNamePattern>
             <!--日志文件保留天数-->
             <maxHistory>${max.history}</maxHistory>
             <totalSizeCap>${total.size.cap}</totalSizeCap>
@@ -436,199 +69,18 @@
             <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
         </encoder>
     </appender>
-    <appender name="error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>warn</level>
-        </filter>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/error/%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <maxHistory>${max.history}</maxHistory>
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-    </appender>
 
-    <appender name="directHostSensor" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/base_direct_host_sensor/%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <maxHistory>${max.history}</maxHistory>
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-    </appender>
-    <appender name="directHostSensorStatus" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/status_direct_host_sensor/%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <maxHistory>${max.history}</maxHistory>
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-    </appender>
-    <appender name="airConditionerDataLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/base_air_conditioner/%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <maxHistory>${max.history}</maxHistory>
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-    </appender>
-    <appender name="airConditionerStatusLog" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <encoder>
-            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
-        </encoder>
-        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-            <fileNamePattern>${LOG_HOME}/status_air_conditioner/%d{yyyy-MM-dd}-%i.log</fileNamePattern>
-            <maxHistory>${max.history}</maxHistory>
-            <maxFileSize>${max.file.size}</maxFileSize>
-            <totalSizeCap>${total.size.cap}</totalSizeCap>
-            <cleanHistoryOnStart>true</cleanHistoryOnStart>
-        </rollingPolicy>
-    </appender>
-    <!--name属性是代码里创建日志用的（例如：Logger clog = LoggerFactory.getLogger("createLog");）-->
-    <logger name="equipmentLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="equipmentListLog"/>
-    </logger>
 
-    <logger name="channelLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="channelListLog"/>
-    </logger>
 
-    <logger name="bluetoothLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="bluetoothLog"/>
-    </logger>
 
-    <logger name="deviceDataLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="deviceDataLog"/>
-    </logger>
-    <logger name="doorDataLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="doorDataLog"/>
-    </logger>
-    <logger name="ruleDataLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="ruleDataLog"/>
-    </logger>
-    <logger name="batchProductLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="batchProductLog"/>
-    </logger>
-    <logger name="syncProductFieldLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="syncProductFieldLog"/>
-    </logger>
-    <logger name="batchDeviceLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="batchDeviceLog"/>
-    </logger>
-    <logger name="doorDeviceLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="doorDeviceLog"/>
-    </logger>
-    <logger name="statusDefenceareaLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="statusDefenceareaLog"/>
-    </logger>
-    <logger name="statusDisksLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="statusDisksLog"/>
-    </logger>
-    <logger name="statusNetworkLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="statusNetworkLog"/>
-    </logger>
-    <logger name="baseDefenceareaLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="baseDefenceareaLog"/>
-    </logger>
-    <logger name="statusSensorLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="statusSensorLog"/>
-    </logger>
-    <logger name="videoCompleteLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="videoCompleteLog"/>
-    </logger>
-    <logger name="videoDaysInfoLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="videoDaysInfoLog"/>
-    </logger>
-    <logger name="videoDiagnosisLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="videoDiagnosisLog"/>
-    </logger>
-    <logger name="videoPlanLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="videoPlanLog"/>
-    </logger>
-
-    <logger name="upsDeviceLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="upsDeviceLog"/>
-    </logger>
-    <logger name="upsDeviceDataLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="upsDeviceDataLog"/>
-    </logger>
-    <logger name="breakerDeviceLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="breakerDeviceLog"/>
-    </logger>
-    <logger name="breakerDeviceDataLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="breakerDeviceDataLog"/>
-    </logger>
-    <logger name="notifyInfoLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="notifyInfoLog"/>
-    </logger>
-    <logger name="dvrDiskLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="dvrDiskLog"/>
-    </logger>
-    <logger name="behaviorAnalysisAlarmLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="behaviorAnalysisAlarmLog"/>
-    </logger>
-    <logger name="directHostSensor" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="directHostSensor"/>
-    </logger>
-    <logger name="directHostSensorStatus" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="directHostSensorStatus"/>
-    </logger>
-    <logger name="airConditionerDataLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="airConditionerDataLog"/>
-    </logger>
-    <logger name="airConditionerStatusLog" additivity="false" level="info">
-        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
-        <appender-ref ref="airConditionerStatusLog"/>
-    </logger>
     <logger name="websocketMsgLog" additivity="false" level="info">
         <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
         <appender-ref ref="websocketMsgLog"/>
     </logger>
+    <logger name="socketBaseDeviceInfo" additivity="false" level="info">
+        <!--上面appender元素的name值。为了和logger的name属性做区分，我故意写的不一样-->
+        <appender-ref ref="socketBaseDeviceInfo"/>
+    </logger>
 
     <!-- 日志输出级别 -->
     <root level="INFO">

soc-modules/soc-modules-host/src/main/resources/mapper/IotAirConditionerLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.airconditioner.mapper.IotAirConditionerLogMapper">
+<mapper namespace="com.xunmei.host.airconditioner.mapper.IotAirConditionerLogMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotAirConditionerMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.airconditioner.mapper.IotAirConditionerMapper">
+<mapper namespace="com.xunmei.host.airconditioner.mapper.IotAirConditionerMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotAlarmDataMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.alarm.mapper.IotAlarmDataMapper">
+<mapper namespace="com.xunmei.host.alarm.mapper.IotAlarmDataMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotAlarmDefenceAreaMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.protection.mapper.IotAlarmDefenceAreaMapper">
+<mapper namespace="com.xunmei.host.protection.mapper.IotAlarmDefenceAreaMapper">
 
     <select id="getBySubSystemCodeAndDeviceName"
             resultType="com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea">

soc-modules/soc-modules-host/src/main/resources/mapper/IotAlarmSubsystemMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.protection.mapper.IotAlarmSubsystemMapper">
+<mapper namespace="com.xunmei.host.protection.mapper.IotAlarmSubsystemMapper">
 
     <update id="updateAllDelete">
         update iot_alarm_subsystem set deleted=1;

soc-modules/soc-modules-host/src/main/resources/mapper/IotBreakerDataLogMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.breaker.mapper.IotBreakerDataLogMapper">
+<mapper namespace="com.xunmei.host.breaker.mapper.IotBreakerDataLogMapper">
 
     <insert id="insertDataLog">
         insert into iot_breaker_data_log(id,unique_code,status,update_time,create_time) values(#{breakerData.id},#{breakerData.uniqueCode},#{breakerData.status},#{breakerData.updateTime},now())

soc-modules/soc-modules-host/src/main/resources/mapper/IotBreakerDataMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.breaker.mapper.IotBreakerDataMapper">
+<mapper namespace="com.xunmei.host.breaker.mapper.IotBreakerDataMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotBreakerDeviceDataMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.breaker.mapper.IotBreakerDeviceDataMapper">
+<mapper namespace="com.xunmei.host.breaker.mapper.IotBreakerDeviceDataMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotBreakerDeviceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.breaker.mapper.IotBreakerDeviceMapper">
+<mapper namespace="com.xunmei.host.breaker.mapper.IotBreakerDeviceMapper">
 
     <update id="updateAllDel">
         update iot_breaker_device set deleted = 1

soc-modules/soc-modules-host/src/main/resources/mapper/IotBreakerDeviceToAreaMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.breaker.mapper.IotBreakerDeviceToAreaMapper">
+<mapper namespace="com.xunmei.host.breaker.mapper.IotBreakerDeviceToAreaMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotBreakerMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.breaker.mapper.IotBreakerMapper">
+<mapper namespace="com.xunmei.host.breaker.mapper.IotBreakerMapper">
 
     <update id="updateAllDel">
 

soc-modules/soc-modules-host/src/main/resources/mapper/IotDefenceAreaAlarmDataMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.protection.mapper.IotDefenceAreaAlarmDataMapper">
+<mapper namespace="com.xunmei.host.protection.mapper.IotDefenceAreaAlarmDataMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDefenceAreaDataLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.protection.mapper.IotDefenceAreaDataLogMapper">
+<mapper namespace="com.xunmei.host.protection.mapper.IotDefenceAreaDataLogMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDefenceAreaDataMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.protection.mapper.IotDefenceAreaDataMapper">
+<mapper namespace="com.xunmei.host.protection.mapper.IotDefenceAreaDataMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDeviceDetectionLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.video.mapper.IotDeviceDetectionLogMapper">
+<mapper namespace="com.xunmei.host.video.mapper.IotDeviceDetectionLogMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDeviceDetectionMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.video.mapper.IotDeviceDetectionMapper">
+<mapper namespace="com.xunmei.host.video.mapper.IotDeviceDetectionMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDeviceMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.host.api.host.mapper.IotDeviceMapper">
+<mapper namespace="com.xunmei.host.host.mapper.IotDeviceMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDeviceStatusMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.iot.mapper.IotDeviceStatusMapper">
+<mapper namespace="com.xunmei.host.iot.mapper.IotDeviceStatusMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDvrChannelMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.host.mapper.IotDvrChannelMapper">
+<mapper namespace="com.xunmei.host.host.mapper.IotDvrChannelMapper">
 
     <update id="batchUpdateDel">
         <foreach collection="list" item="item" index="index" open="" close="" separator=";">

soc-modules/soc-modules-host/src/main/resources/mapper/IotDvrDiskLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.video.mapper.IotDvrDiskLogMapper">
+<mapper namespace="com.xunmei.host.video.mapper.IotDvrDiskLogMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDvrDiskMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.video.mapper.IotDvrDiskMapper">
+<mapper namespace="com.xunmei.host.video.mapper.IotDvrDiskMapper">
 
     <select id="selectByEquipmentCode" resultType="com.xunmei.common.core.domain.iot.domain.IotDvrDisk">
         select * from iot_dvr_disk where host_code in

soc-modules/soc-modules-host/src/main/resources/mapper/IotDvrHardDiskDetectionLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.video.mapper.IotDvrHardDiskDetectionLogMapper">
+<mapper namespace="com.xunmei.host.video.mapper.IotDvrHardDiskDetectionLogMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotDvrHardDiskDetectionMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.video.mapper.IotDvrHardDiskDetectionMapper">
+<mapper namespace="com.xunmei.host.video.mapper.IotDvrHardDiskDetectionMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotPowerOffAlarmMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.breaker.mapper.IotPowerOffAlarmMapper">
+<mapper namespace="com.xunmei.host.breaker.mapper.IotPowerOffAlarmMapper">
 
     <update id="saveOrUpdateOtherPower">
         update iot_power_off_alarm set recovery_time=#{recoveryTime},description=#{description},type=#{type}

soc-modules/soc-modules-host/src/main/resources/mapper/IotSensorLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.sensor.mapper.IotSensorLogMapper">
+<mapper namespace="com.xunmei.host.sensor.mapper.IotSensorLogMapper">
 
 </mapper>

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

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.sensor.mapper.IotSensorMapper">
+<mapper namespace="com.xunmei.host.sensor.mapper.IotSensorMapper">
     <update id="updateDelByOrgId">
         update iot_sensor
         set deleted=1

soc-modules/soc-modules-host/src/main/resources/mapper/IotServerInfoMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.server.mapper.IotServerInfoMapper">
+<mapper namespace="com.xunmei.host.server.mapper.IotServerInfoMapper">
 
     <select id="selectOrgByToken" resultType="com.xunmei.system.api.domain.SysOrg">
         select o.* from iot_server_info i inner join sys_org o on o.id=i.org_id  where i.iot_code=#{token}

soc-modules/soc-modules-host/src/main/resources/mapper/IotUpsDataLogMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.ups.mapper.IotUpsDataLogMapper">
+<mapper namespace="com.xunmei.host.ups.mapper.IotUpsDataLogMapper">
 
 </mapper>

soc-modules/soc-modules-host/src/main/resources/mapper/IotUpsMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.ups.mapper.IotUpsMapper">
+<mapper namespace="com.xunmei.host.ups.mapper.IotUpsMapper">
 
     <insert id="batchInsert" parameterType="java.util.List">
         INSERT INTO iot_ups (

soc-modules/soc-modules-host/src/main/resources/mapper/MediatorCategoryMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.host.mapper.MediatorCategoryMapper">
-
-</mapper>

soc-modules/soc-modules-iot/src/main/java/com/xunmei/iot/mapper/MediatorCategoryMapper.java

@@ -1,11 +0,0 @@
-package com.xunmei.iot.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
-
-/**
- * @author jingyuanchao
- * @date 2024/1/24 17:50
- */
-public interface MediatorCategoryMapper extends BaseMapper<MediatorCategory> {
-}

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

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.iot.mapper.MediatorCategoryMapper">
-
-</mapper>

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

@@ -1,11 +0,0 @@
-package com.xunmei.mediator.api.host.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
-
-/**
- * @author jingyuanchao
- * @date 2024/1/24 17:50
- */
-public interface MediatorCategoryMapper extends BaseMapper<MediatorCategory> {
-}

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

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

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

@@ -1,26 +0,0 @@
-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.host.mapper.MediatorCategoryMapper;
-import com.xunmei.mediator.api.host.service.IMediatorCategoryService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author oygj
- * @since 2024-01-25
- */
-@Service
-public class MediatorCategoryServiceImpl extends ServiceImpl<MediatorCategoryMapper, MediatorCategory> implements IMediatorCategoryService {
-
-
-    @Override
-    public MediatorCategory findCategoryByCodeAndParentId(String categoryCode, long parentId) {
-        return lambdaQuery().eq(MediatorCategory::getCode, categoryCode).eq(MediatorCategory::getParentId, parentId).last(Constants.LIMIT1).one();
-    }
-}

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

@@ -18,13 +18,12 @@ 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.host.service.IIotDeviceService;
-import com.xunmei.mediator.api.host.service.IMediatorCategoryService;
 import com.xunmei.mediator.api.north.service.NorthErrorService;
+import com.xunmei.mediator.api.north.service.impl.NorthStatisticsSyncService;
 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.mediator.websocket.enums.DeviceCacheEnum;
@@ -75,8 +74,6 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
     @Resource
     NorthStatisticsSyncService northStatisticsSyncService;
     @Resource
-    IMediatorCategoryService categoryService;
-    @Resource
     IIotDeviceService iotDeviceService;
     @Resource
     private IotAlarmDefenceAreaService defenceAreService;

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

@@ -10,9 +10,8 @@ import com.xunmei.common.core.domain.iot.domain.IotDeviceDetectionLog;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
-import com.xunmei.mediator.api.video.mapper.IotDeviceDetectionMapper;
 import com.xunmei.mediator.api.host.service.IIotDeviceService;
-import com.xunmei.mediator.api.host.service.IMediatorCategoryService;
+import com.xunmei.mediator.api.video.mapper.IotDeviceDetectionMapper;
 import com.xunmei.mediator.api.video.service.IotDeviceDetectionLogService;
 import com.xunmei.mediator.api.video.service.IotDeviceDetectionService;
 import com.xunmei.mediator.util.CheckDataUtil;
@@ -41,8 +40,6 @@ import java.util.*;
 public class IotDeviceDetectionServiceImpl extends ServiceImpl<IotDeviceDetectionMapper, IotDeviceDetection> implements IotDeviceDetectionService {
 
     @Resource
-    IMediatorCategoryService categoryService;
-    @Resource
     IotDeviceDetectionLogService networkDeviceDetectionLogService;
     @Resource
     RemoteOrgService orgService;

soc-modules/soc-modules-mediator/src/main/resources/mapper/MediatorCategoryMapper.xml

@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.xunmei.mediator.api.host.mapper.MediatorCategoryMapper">
-
-</mapper>