联调 代码修改提交

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

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

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

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

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

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

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

@@ -2,7 +2,6 @@ package com.xunmei.mediator.api.service.impl;
 
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.ObjectUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,6 +17,7 @@ import com.xunmei.common.core.enums.CategoryDataEnum;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.redis.utils.RedisUtils;
+import com.xunmei.mediator.api.mapper.IotAlarmDefenceAreaMapper;
 import com.xunmei.mediator.api.mapper.IotAlarmSubsystemMapper;
 import com.xunmei.mediator.api.mapper.ProtectionLogMapper;
 import com.xunmei.mediator.api.service.*;
@@ -30,7 +30,6 @@ import com.xunmei.system.api.dto.protection.DefenceAreaDto;
 import com.xunmei.system.api.dto.protection.ProtectionEditDto;
 import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.dto.protection.SensorDto;
-import com.xunmei.system.api.enums.AlarmRuleExpressOperateEnum;
 import com.xunmei.system.api.enums.DataType;
 import com.xunmei.system.api.enums.ProtectionStatus;
 import com.xunmei.system.api.util.LogUtils;
@@ -43,7 +42,6 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
@@ -74,6 +72,8 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
     private IotAlarmDefenceAreaService defenceAreService;
     @Resource
     private NorthErrorService northErrorService;
+    @Resource
+    IotAlarmDefenceAreaMapper defenceAreaMapper;
 
     @Override
     public IotAlarmSubsystem findByCodeAndOrgId(String defenceAreaCode, Long orgId) {
@@ -404,7 +404,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
             }
 
         }
-        defenceAreService.remove(new LambdaQueryWrapper<>());
+        defenceAreaMapper.delete(new LambdaQueryWrapper<>());
         northErrorService.saveErrorData(errors);
         baseMapper.updateAllDelete();
         this.saveOrUpdateBatch(protectionList);

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

@@ -10,7 +10,6 @@ import com.xunmei.common.core.constant.SecurityConstants;
 import com.xunmei.common.core.domain.iot.domain.IotSensor;
 import com.xunmei.common.core.domain.iot.domain.IotSensorLog;
 import com.xunmei.common.core.enums.CategoryDataEnum;
-import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.mediator.api.mapper.IotSensorMapper;
 import com.xunmei.mediator.api.service.EquipmentSyncService;
@@ -21,8 +20,6 @@ import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.mediator.util.RedisCheckRepeatDataUtil;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
-import com.xunmei.system.api.domain.north.MediatorDeviceData;
-import com.xunmei.system.api.domain.north.MediatorDeviceDataLog;
 import com.xunmei.system.api.domain.north.NorthError;
 import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.SensorDto;
@@ -271,6 +268,13 @@ public class IotSensorServiceImpl extends ServiceImpl<IotSensorMapper, IotSensor
                 break;
             case "4160"://智能电表
                 type = CategoryDataEnum.AMMETER_SENSOR.getId();
+                break;
+            case "4188"://门窗磁
+                type = CategoryDataEnum.DOOR_WINDOW_SENSOR.getId();
+                break;
+            case "41885"://燃气报警器
+                type = CategoryDataEnum.GAS_ALARM.getId();
+            default:break;
         }
 
         return type;

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

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