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

# Conflicts:
#	soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/MediatorTimeTemplateMapper.java

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmCode;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmCode;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmCode;
  * @author oygj
  * @since 2024-01-25
  */
-public interface MediatorAlarmCodeMapper extends BaseMapper<MediatorAlarmCode> {
+public interface IotAlarmCodeMapper extends BaseMapper<IotAlarmCode> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
  * @author oygj
  * @since 2024-01-26
  */
-public interface MediatorAlarmDataMapper extends BaseMapper<MediatorAlarmData> {
+public interface IotAlarmDataMapper extends BaseMapper<IotAlarmData> {
 
 }

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
 import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmDataNewest;
 import org.apache.ibatis.annotations.Param;
 
@@ -15,5 +15,5 @@ import org.apache.ibatis.annotations.Param;
  */
 public interface MediatorAlarmDataNewestMapper extends BaseMapper<MediatorAlarmDataNewest> {
 
-    void saveData(@Param("objectMap") MediatorAlarmData objectMap);
+    void saveData(@Param("objectMap") IotAlarmData objectMap);
 }

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

@@ -1,19 +0,0 @@
-package com.xunmei.mediator.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-
-/**
- * <p>
- * 时间模板表 Mapper 接口
- * </p>
- *
- * @author oygj
- * @since 2024-01-26
- */
-public interface MediatorTimeTemplateMapper extends BaseMapper<MediatorTimeTemplate> {
-
-
-    MediatorTimeTemplate findOneTemplate(@Param("timeTemplateId")Integer timeTemplateId);
-}

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

@@ -1,32 +1,20 @@
 package com.xunmei.mediator.api.service;
 
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 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.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
-import com.xunmei.mediator.api.mapper.MediatorTimeTemplateMapper;
-import com.xunmei.mediator.domain.dto.redis.RedisKey;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.north.MediatorDeviceData;
-import com.xunmei.system.api.domain.north.MediatorProductDevice;
 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.DeviceType;
-import com.xunmei.system.api.enums.ElectricityMeterAttributes;
 import com.xunmei.system.api.enums.ProductTypeEnum;
-import com.xunmei.system.api.util.LogUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +29,6 @@ import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * 重写设备equipment 分页同步逻辑
@@ -67,8 +54,6 @@ public class EquipmentSyncService {
     private IIotDeviceService iIotDeviceService;
     @Autowired
     private IMediatorProductDeviceService productDeviceService;
-    @Resource
-    private MediatorTimeTemplateMapper timeTemplateMapper;
     @Autowired
     private IMediatorAlarmDataNewestService alarmDataNewestService;
     @Autowired
@@ -371,10 +356,10 @@ public class EquipmentSyncService {
         return map;
     }
 
-    private MediatorAlarmData buildDeviceAlarm(String value, MediatorAlarmRuleExpress ruleExpress, MediatorDeviceData deviceData, ProductTypeEnum type, String content) throws ParseException {
+    private IotAlarmData buildDeviceAlarm(String value, IotAlarmRuleExpress ruleExpress, MediatorDeviceData deviceData, ProductTypeEnum type, String content) throws ParseException {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-        MediatorAlarmData alarm = new MediatorAlarmData();
+        IotAlarmData alarm = new IotAlarmData();
         alarm.setId(IDHelper.id());
         alarm.setContent(content);
         alarm.setFieldCode(ruleExpress.getFieldcode());

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

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

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
 import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmDataNewest;
 
 /**
@@ -14,6 +14,6 @@ import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmDataNewest;
  */
 public interface IMediatorAlarmDataNewestService extends IService<MediatorAlarmDataNewest> {
 
-    void saveData(MediatorAlarmData data);
+    void saveData(IotAlarmData data);
 
 }

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

@@ -1,16 +0,0 @@
-package com.xunmei.mediator.api.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.mediator.domain.MediatorTimeTemplate;
-
-/**
- * <p>
- * 时间模板表 服务类
- * </p>
- *
- * @author oygj
- * @since 2024-01-26
- */
-public interface IMediatorTimeTemplateService extends IService<MediatorTimeTemplate> {
-
-}

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

@@ -3,7 +3,6 @@ package com.xunmei.mediator.api.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisLog;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
-import com.xunmei.mediator.api.mapper.MediatorAlarmCodeMapper;
 
 /**
  * <p>

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

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
 
 /**
  * <p>
@@ -11,6 +11,6 @@ import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
  * @author oygj
  * @since 2024-01-26
  */
-public interface IMediatorAlarmDataService extends IService<MediatorAlarmData> {
+public interface IotAlarmDataService extends IService<IotAlarmData> {
 
 }

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

@@ -0,0 +1,21 @@
+package com.xunmei.mediator.api.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
+import com.xunmei.mediator.api.mapper.IotAlarmDataMapper;
+import com.xunmei.mediator.api.service.IotAlarmDataService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 告警数据表 服务实现类
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-01-26
+ */
+@Service
+public class IotAlarmDataServiceImpl extends ServiceImpl<IotAlarmDataMapper, IotAlarmData> implements IotAlarmDataService {
+
+}

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

@@ -13,16 +13,12 @@ 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.MediatorAlarmRuleExpress;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmRuleSource;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
-import com.xunmei.common.core.domain.mediator.domain.MediatorTimeTemplate;
 import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.mediator.api.mapper.IotAlarmSubsystemMapper;
-import com.xunmei.mediator.api.mapper.MediatorTimeTemplateMapper;
 import com.xunmei.mediator.api.mapper.ProtectionLogMapper;
 import com.xunmei.mediator.api.service.*;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
@@ -78,8 +74,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
     private IotAlarmDefenceAreaService defenceAreService;
     @Resource
     private NorthErrorService northErrorService;
-    @Resource
-    private MediatorTimeTemplateMapper timeTemplateMapper;
+
     @Override
     public IotAlarmSubsystem findByCodeAndOrgId(String defenceAreaCode, Long orgId) {
         return lambdaQuery()
@@ -261,113 +256,6 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         return "device_" + orgId + "_" + deviceType + "_data_map";
     }
 
-    private void dealAlarmDataByAllTimeTemplate(MediatorAlarmRuleExpress alarmRuleExpress, IotAlarmSubsystem protection) {
-        //全时段
-        MediatorTimeTemplate timeTemplate = timeTemplateMapper.selectById(alarmRuleExpress.getTimeTemplateId());
-        final List<Map> listMap = JSON.parseArray(timeTemplate.getTemplatecontent(), Map.class);
-        for (Map timeMap : listMap) {
-
-            Calendar calendar = Calendar.getInstance();
-            calendar.setTime(DateUtil.offsetDay(new Date(), -1));
-            calendar.setFirstDayOfWeek(Calendar.MONDAY);
-            int weekDay = calendar.get(Calendar.DAY_OF_WEEK);
-
-            String startTime = (String) timeMap.get("startTime");
-            String endTime = (String) timeMap.get("endTime");
-            final Object weekday = timeMap.get("weekday");
-
-            final String string = JSON.toJSONString(weekday);
-
-
-            final List<Integer> list = JSON.parseArray(string, Integer.class);
-            //如果时间模板中 不包含今天则返回
-            if (!list.contains(weekDay)) {
-                return;
-            }
-            final Date sTime = DateUtil.parse(startTime, "HH:mm");
-            final Date eTime = DateUtil.parse(endTime, "HH:mm");
-            final Date now = DateUtil.parse(DateUtil.format(new Date(), "HH:mm"), "HH:mm");
-
-            final boolean in = DateUtil.isIn(now, sTime, eTime);
-            if (!in) {
-                return;
-            }
-
-            boolean isAlarm = false;
-            final String operator = alarmRuleExpress.getOperator();
-            final String value = alarmRuleExpress.getValue();
-            if (AlarmRuleExpressOperateEnum.EQUALS.getText().equals(operator)) {
-                isAlarm = protection.getStatus() == Integer.parseInt(value);
-            }
-
-            if (isAlarm) {
-             /*   DeviceAlarm deviceAlarm = new DeviceAlarm();
-                deviceAlarm.setId(UUID.randomUUID().toString().replace("-", ""));
-                deviceAlarm.setContent(ProductTypeEnum.ALARM_ZONE + " 触发动环设备告警规则告警");
-                deviceAlarm.setImageList(null);
-                deviceAlarm.setDeviceId(protection.getDeviceId());
-                deviceAlarm.setIsRestore(0);
-                deviceAlarmDao.save(deviceAlarm);*/
-            }
-
-
-        }
-    }
-
-    private void dealAlarmDataByWorkTimeTemplate(MediatorAlarmRuleExpress alarmRuleExpress, IotAlarmSubsystem protection, MediatorAlarmRuleSource alarmRuleSource) {
-        //使用作息时间模板
-       /* final Long orgId = protection.getOrgId();
-        final int year = DateUtil.year(new Date());
-        WorkTimeSet weekday = objectMapper.selectWorkTimeSet(orgId, year);
-        if (weekday == null) {
-            return;
-        }
-        Calendar calendar = Calendar.getInstance();
-        calendar.setTime(DateUtil.offsetDay(new Date(), -1));
-        calendar.setFirstDayOfWeek(Calendar.MONDAY);
-        int weekDay = calendar.get(Calendar.DAY_OF_WEEK);
-        final List<Integer> weekDayList = getWeekDayList(weekday);
-        //如果作息时间模板中 不包含今天即今天任何情况都不报警,则返回
-        if (!weekDayList.contains(weekDay)) {
-            return;
-        }
-        boolean isAlarm = false;
-        //获取告警表达式内容
-        final String operator = alarmRuleExpress.getOperator();
-        final String value = alarmRuleExpress.getValue();
-        Date now = DateUtil.parse(DateUtil.format(new Date(), "HH:mm"), "HH:mm");
-        Date workOffTime = DateUtil.parse(weekday.getWorkOffTime(), "HH:mm");
-        //如果 作息中的下班时间早于当前时间,即当前时间 大于 作息中下班时间,即当前时间已经下班
-        //此处认定 如果当前时间小于下班时间,那么都属于上班时间,使用上班告警规则
-        final boolean isOffWork = workOffTime.before(now);
-        MediatorAlarmRule alarmRule = objectMapper.selectAlarmRuleById(alarmRuleSource.getRuleId());
-        if (isOffWork && ObjectUtil.equal("downinspection", alarmRule.getType())) {
-            //如果已经下班,使用下班巡检告警规则
-            //判断表达式的值 于当前布撤防状态值是否一致
-            if (AlarmRuleExpressOperateEnum.EQUALS.getText().equals(operator)) {
-                isAlarm = protection.getStatus() == Integer.parseInt(value);
-            }
-        }
-        if (!isOffWork && ObjectUtil.equal("upinspection", alarmRule.getType())) {
-            //如果还没下班,使用上班巡检告警规则
-            //判断表达式的值 于当前布撤防状态值是否一致
-            if (AlarmRuleExpressOperateEnum.EQUALS.getText().equals(operator)) {
-                isAlarm = protection.getStatus() == Integer.parseInt(value);
-            }
-        }
-        if (isAlarm) {
-            DeviceAlarm deviceAlarm = new DeviceAlarm();
-            deviceAlarm.setId(UUID.randomUUID().toString().replace("-", ""));
-            deviceAlarm.setContent(ProductTypeEnum.ALARM_ZONE + " 触发动环设备告警规则告警");
-            deviceAlarm.setImageList(null);
-            deviceAlarm.setDeviceId(protection.getDeviceId());
-            deviceAlarm.setIsRestore(0);
-            deviceAlarmDao.save(deviceAlarm);
-        }*/
-
-    }
-
-
     @Override
     public ReceiveErrorDto defenceAreaList(DataPageDto<DefenceAreaDto> request, String branchId, String msgId) {
         String packageGuid = request.getPackageGuid();

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 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.mediator.domain.MediatorAlarmCode;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmCode;
 import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
 import com.xunmei.common.core.domain.video.IotDvrHardDiskDetection;
 import com.xunmei.common.core.domain.video.IotDvrHardDiskDetectionLog;
@@ -125,7 +125,7 @@ public class IotDvrHardDiskDetectionServiceImpl extends ServiceImpl<IotDvrHardDi
     private Map<String, Object> buildEntityDto(VideoRecorderHardDiskDetectionEditDto videoRecorderHardDiskDetectionEditDto, SysOrg org) {
 
         Map<String, Object> map = new HashMap<>();
-        MediatorAlarmCode code = alarmCodeService.selectByCode("112");
+        IotAlarmCode code = alarmCodeService.selectByCode("112");
         map.put("code", code);
         IotDvrHardDiskDetection videoRecorderHardDiskDetection = new IotDvrHardDiskDetection();
         videoRecorderHardDiskDetection.setOrgId(org.getId());

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

@@ -2,8 +2,8 @@ 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.MediatorAlarmCode;
-import com.xunmei.mediator.api.mapper.MediatorAlarmCodeMapper;
+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;
 
@@ -16,10 +16,10 @@ import org.springframework.stereotype.Service;
  * @since 2024-01-25
  */
 @Service
-public class MediatorAlarmCodeServiceImpl extends ServiceImpl<MediatorAlarmCodeMapper, MediatorAlarmCode> implements IMediatorAlarmCodeService {
+public class MediatorAlarmCodeServiceImpl extends ServiceImpl<IotAlarmCodeMapper, IotAlarmCode> implements IMediatorAlarmCodeService {
 
     @Override
-    public MediatorAlarmCode selectByCode(String code) {
-        return lambdaQuery().eq(MediatorAlarmCode::getCode, code).last(Constants.LIMIT1).one();
+    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/service/impl/MediatorAlarmDataNewestServiceImpl.java

@@ -1,7 +1,7 @@
 package com.xunmei.mediator.api.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmData;
 import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmDataNewest;
 import com.xunmei.mediator.api.mapper.MediatorAlarmDataNewestMapper;
 import com.xunmei.mediator.api.service.IMediatorAlarmDataNewestService;
@@ -20,7 +20,7 @@ public class MediatorAlarmDataNewestServiceImpl extends ServiceImpl<MediatorAlar
 
 
     @Override
-    public void saveData(MediatorAlarmData data) {
+    public void saveData(IotAlarmData data) {
         baseMapper.saveData(data);
     }
 }

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

@@ -1,21 +0,0 @@
-package com.xunmei.mediator.api.service.impl;
-
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.domain.mediator.domain.MediatorAlarmData;
-import com.xunmei.mediator.api.mapper.MediatorAlarmDataMapper;
-import com.xunmei.mediator.api.service.IMediatorAlarmDataService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 告警数据表 服务实现类
- * </p>
- *
- * @author oygj
- * @since 2024-01-26
- */
-@Service
-public class MediatorAlarmDataServiceImpl extends ServiceImpl<MediatorAlarmDataMapper, MediatorAlarmData> implements IMediatorAlarmDataService {
-
-}

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

@@ -1,20 +0,0 @@
-package com.xunmei.mediator.api.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.xunmei.common.core.domain.mediator.domain.MediatorTimeTemplate;
-import com.xunmei.mediator.api.mapper.MediatorTimeTemplateMapper;
-import com.xunmei.mediator.api.service.IMediatorTimeTemplateService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 时间模板表 服务实现类
- * </p>
- *
- * @author oygj
- * @since 2024-01-26
- */
-@Service
-public class MediatorTimeTemplateServiceImpl extends ServiceImpl<MediatorTimeTemplateMapper, MediatorTimeTemplate> implements IMediatorTimeTemplateService {
-
-}

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

@@ -3,7 +3,6 @@ package com.xunmei.mediator.api.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisLog;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
-import com.xunmei.mediator.api.mapper.MediatorAlarmCodeMapper;
 import com.xunmei.mediator.api.mapper.VideoDiagnosisLogMapper;
 import com.xunmei.mediator.api.service.IVideoDiagnosisLogService;
 import org.springframework.stereotype.Service;

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

@@ -8,11 +8,10 @@ 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.MediatorAlarmCode;
-import com.xunmei.common.core.domain.mediator.domain.MediatorCategory;
+import com.xunmei.common.core.domain.mediator.domain.IotAlarmCode;
 import com.xunmei.common.core.domain.video.MediatorVideoDiagnosisRecord;
 import com.xunmei.common.core.utils.IDHelper;
-import com.xunmei.mediator.api.mapper.MediatorAlarmCodeMapper;
+import com.xunmei.mediator.api.mapper.IotAlarmCodeMapper;
 import com.xunmei.mediator.api.mapper.MediatorCategoryMapper;
 import com.xunmei.mediator.api.mapper.VideoDiagnosisRecordMapper;
 import com.xunmei.mediator.api.service.IIotDeviceService;
@@ -25,9 +24,7 @@ import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDetailInfoVo;
 import com.xunmei.mediator.domain.dto.videoDiagnosis.VideoDiagnosisDto;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisUtil;
-import com.xunmei.system.api.RemoteDeviceService;
 import com.xunmei.system.api.RemoteOrgService;
-import com.xunmei.system.api.domain.SysDevice;
 import com.xunmei.system.api.domain.SysOrg;
 import org.springframework.stereotype.Service;
 
@@ -59,7 +56,7 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
     @Resource
     IIotDvrChannelService dvrChannelService;
     @Resource
-    MediatorAlarmCodeMapper alarmCodeMapper;
+    IotAlarmCodeMapper alarmCodeMapper;
     @Override
     public ReceiveErrorDto saveData(VideoDiagnosisDto videoDiagnosisDto, String msgId, String branchId) throws IllegalAccessException, ParseException {
         ReceiveErrorDto error = new ReceiveErrorDto();
@@ -219,10 +216,10 @@ public class VideoDiagnosisRecordServiceImpl extends ServiceImpl<VideoDiagnosisR
         this.dealDetailInfo(videoDiagnosis);
         objectMap.put("videoDiagnosis", videoDiagnosis);
 
-        QueryWrapper<MediatorAlarmCode> qw = new QueryWrapper<>();
-        qw.lambda().eq(MediatorAlarmCode::getParentId, 6);
-        qw.lambda().eq(MediatorAlarmCode::getDeleted, 0);
-        List<MediatorAlarmCode> codes = alarmCodeMapper.selectList(qw);
+        QueryWrapper<IotAlarmCode> qw = new QueryWrapper<>();
+        qw.lambda().eq(IotAlarmCode::getParentId, 6);
+        qw.lambda().eq(IotAlarmCode::getDeleted, 0);
+        List<IotAlarmCode> codes = alarmCodeMapper.selectList(qw);
         objectMap.put("codes", codes);
 
        /* List<HostAlarmRecord> alarmRecords = this.buildHostAlarmRecord(videoDiagnosis, org, category, device, videoDiagnosisDto, codes);

soc-modules/soc-modules-mediator/src/main/resources/mapper/MediatorAlarmCodeMapper.xml → soc-modules/soc-modules-mediator/src/main/resources/mapper/IotAlarmCodeMapper.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.mapper.MediatorAlarmCodeMapper">
+<mapper namespace="com.xunmei.mediator.api.mapper.IotAlarmCodeMapper">
 
 </mapper>

soc-modules/soc-modules-mediator/src/main/resources/mapper/MediatorAlarmDataMapper.xml → soc-modules/soc-modules-mediator/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.mapper.MediatorAlarmDataMapper">
+<mapper namespace="com.xunmei.mediator.api.mapper.IotAlarmDataMapper">
 
 </mapper>

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

@@ -1,8 +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.mapper.MediatorTimeTemplateMapper">
-
-    <select id="findOneTemplate" resultType="com.xunmei.common.core.domain.mediator.domain.MediatorTimeTemplate">
-        select * from mediator_time_template a where a.enable = 0 and id=#{timeTemplateId}
-    </select>
-</mapper>