报警主机接收增量代码提交

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

@@ -450,8 +450,9 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
             if (ObjectUtil.isEmpty(inputData)) {
                 continue;
             }
-            final List<AlarmHostIncrementVo.InputData> dataList = inputData.stream().filter(r -> ObjectUtil.equal(r.getSubSystemId(), subSystemDatum.getSubSystemId())).collect(Collectors.toList());
+            iotAlarmDefenceAreaService.updateDeleted(deviceInfo.getIotToken(), deviceInfo.getDeviceCode(), subSystemDatum.getSubSystemId());
             final List<IotAlarmDefenceArea> defenceArea = iotAlarmDefenceAreaService.findDefenceArea(deviceInfo.getIotToken(), deviceInfo.getDeviceCode(), subSystemDatum.getSubSystemId());
+            final List<AlarmHostIncrementVo.InputData> dataList = inputData.stream().filter(r -> ObjectUtil.equal(r.getSubSystemId(), subSystemDatum.getSubSystemId())).collect(Collectors.toList());
 
             if (ObjectUtil.isEmpty(dataList)) {
                 continue;

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/protection/service/IotAlarmDefenceAreaService.java

@@ -21,6 +21,7 @@ public interface IotAlarmDefenceAreaService extends IService<IotAlarmDefenceArea
 
     List<IotAlarmDefenceArea> findDefenceArea(String iotCode,String alarmHostCode);
     List<IotAlarmDefenceArea> findDefenceArea(String iotCode,String alarmHostCode,String subSystemId);
+    void updateDeleted(String iotCode,String alarmHostCode,String subSystemId);
 
     IotAlarmDefenceArea findBySubSystemCodeAndIdx(String defenceAreaCode, Integer idx, String orgGuid);
 

soc-modules/soc-modules-host/src/main/java/com/xunmei/host/protection/service/impl/IotAlarmDefenceAreaServiceImpl.java

@@ -1,6 +1,7 @@
 package com.xunmei.host.protection.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.Constants;
@@ -88,11 +89,20 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
                 .eq(IotAlarmDefenceArea::getIotToken, iotCode)
                 .eq(IotAlarmDefenceArea::getAlarmHostCode, alarmHostCode)
                 .eq(IotAlarmDefenceArea::getSubSystemCode, subSystemId)
-                .eq(IotAlarmDefenceArea::getDeleted, 0)
                 .list();
     }
 
     @Override
+    public void updateDeleted(String iotCode, String alarmHostCode, String subSystemId) {
+        final LambdaUpdateWrapper<IotAlarmDefenceArea> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(IotAlarmDefenceArea::getIotToken, iotCode);
+        wrapper.eq(IotAlarmDefenceArea::getAlarmHostCode, alarmHostCode);
+        wrapper.eq(IotAlarmDefenceArea::getSubSystemCode, subSystemId);
+        wrapper.set(IotAlarmDefenceArea::getDeleted, 1);
+        update(wrapper);
+    }
+
+    @Override
     public IotAlarmDefenceArea findBySubSystemCodeAndIdx(String defenceAreaCode, Integer idx, String orgGuid) {
         return lambdaQuery()
                 .eq(IotAlarmDefenceArea::getOrganizationGuid, orgGuid)

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

@@ -287,7 +287,6 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         final LambdaQueryWrapper<IotAlarmSubsystem> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(IotAlarmSubsystem::getIotToken, iotCode);
         wrapper.eq(IotAlarmSubsystem::getAlarmHostCode, alarmHost);
-        wrapper.eq(IotAlarmSubsystem::getDeleted, 0);
         return list(wrapper);
     }
 

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

@@ -288,6 +288,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         resp.setServerPort(extend.getPort());
 
         final LambdaQueryWrapper<IotAlarmSubsystem> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IotAlarmSubsystem::getIotToken, deviceInfo.getIotToken());
         wrapper.eq(IotAlarmSubsystem::getAlarmHostCode, deviceInfo.getDeviceCode());
         wrapper.eq(IotAlarmSubsystem::getDeleted, 0);
         wrapper.select(IotAlarmSubsystem::getEnable, IotAlarmSubsystem::getCode, IotAlarmSubsystem::getName);
@@ -305,6 +306,7 @@ public class IotDeviceInfoServiceImpl extends ServiceImpl<IotDeviceInfoMapper, I
         }).collect(Collectors.toList()));
 
         final LambdaQueryWrapper<IotAlarmDefenceArea> defenceWrapper = new LambdaQueryWrapper<>();
+        defenceWrapper.eq(IotAlarmDefenceArea::getIotToken, deviceInfo.getIotToken());
         defenceWrapper.eq(IotAlarmDefenceArea::getAlarmHostCode, deviceInfo.getDeviceCode());
         defenceWrapper.eq(IotAlarmDefenceArea::getDeleted, 0);
         final List<IotAlarmDefenceArea> defenceAreaList = defenceAreaMapper.selectList(defenceWrapper);