布撤防同步接口代码提交

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/DefenceAreaDto.java

@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.validator.constraints.Length;
 
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -18,8 +19,8 @@ import java.util.List;
 @NoArgsConstructor
 @Builder
 @ApiModel("报警主机子系统及防区信息")
-public class DefenceAreaDto {
-
+public class DefenceAreaDto implements Serializable {
+    private static final long serialVersionUID = 1L;
     @ApiModelProperty("编号")
     private Long id;
 
@@ -28,10 +29,10 @@ public class DefenceAreaDto {
     private String organizationGuid;
 
     @ApiModelProperty("子系统的唯一标识")
-    private String defenceAreaCode;
+    private String defenceareaCode;
 
     @ApiModelProperty("子系统的名称")
-    private String defenceAreaName;
+    private String defenceareaName;
 
     @ApiModelProperty("更新时间")
     @Length(max = 64, message = "更新时间长度不能超过64")

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

@@ -1,78 +1,112 @@
 package com.xunmei.common.core.domain.iot.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.xunmei.common.core.web.domain.BaseEntity;
-import io.swagger.annotations.ApiModel;
-import lombok.*;
-import lombok.experimental.Accessors;
-
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
+import java.io.Serializable;
 import java.util.Date;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 /**
- * 布防
+ * <p>
+ * 报警控制器（子系统）表
+ * </p>
+ *
+ * @author oygj
+ * @since 2024-02-22
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-@Accessors(chain = true)
 @TableName("iot_alarm_subsystem")
-@ApiModel(value = "防区对象", description = "【请填写功能名称】")
-public class IotAlarmSubsystem extends BaseEntity {
-    /**
-     * 编号
-     */
-    @TableId
+@ApiModel(value="IotAlarmSubsystem对象", description="报警控制器（子系统）表")
+public class IotAlarmSubsystem implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId("id")
     private Long id;
 
-    /**
-     * 设备
-     */
+    @ApiModelProperty(value = "设备ID")
+    @TableField("device_id")
     private Long deviceId;
 
-    /**
-     * 防区的唯一标识
-     */
+    @ApiModelProperty(value = "防区的唯一标识")
+    @TableField("code")
     private String code;
 
+    @ApiModelProperty(value = "防区的名称")
+    @TableField("name")
+    private String name;
+
+    @ApiModelProperty(value = "布防状态，0：撤防，1：布防")
+    @TableField("status")
+    private Integer status;
 
+    @ApiModelProperty(value = "机构")
+    @TableField("org_id")
+    private Long orgId;
+
+    @ApiModelProperty(value = "机构")
+    @TableField("org_path")
+    private String orgPath;
+
+    @ApiModelProperty(value = "机构名称")
+    @TableField("org_name")
+    private String orgName;
+
+    @ApiModelProperty(value = "报警主机id")
+    @TableField("alarm_host_code")
     private String alarmHostCode;
 
-    /**
-     * 防区的名称
-     */
-    private String name;
+    @ApiModelProperty(value = "是否为24小时防区，0：否，1：是")
+    @TableField("all_Hour")
+    private Integer allHour;
 
-    /**
-     * 布防状态
-     */
-    private Integer status;
+    @ApiModelProperty(value = "布撤防更新时间")
+    @TableField("status_update_time")
+    private LocalDateTime statusUpdateTime;
 
-    /**
-     * 布撤防时间
-     */
-    private Date statusUpdateTime;
+    @ApiModelProperty(value = "布撤防时间")
+    @TableField("status_change_time")
+    private LocalDateTime statusChangeTime;
 
-    /**
-     * 提交人id
-     */
+    @ApiModelProperty(value = "上报人id")
+    @TableField("status_updator_id")
     private Long statusUpdatorId;
 
-    /**
-     * 提交人姓名
-     */
+    @ApiModelProperty(value = "上报人姓名")
+    @TableField("status_updator_name")
     private String statusUpdatorName;
 
-    private Integer allHour;
+    @ApiModelProperty(value = "0正常1删除")
+    @TableField("deleted")
+    private Integer deleted;
 
-    private Long orgId;
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
+    private Date updateTime;
 
-    private String orgPath;
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private Date createTime;
 
-    private String orgName;
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
+    private String createBy;
 
+    @ApiModelProperty(value = "修改人")
+    @TableField("update_by")
+    private String updateBy;
+
+    @ApiModelProperty(value = "设备来源：0：设备登记；1：iot推送")
+    @TableField("source")
+    private Integer source;
 
-    private Integer deleted;
 
-    public IotAlarmSubsystem() {
-    }
 }

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

@@ -2,9 +2,12 @@ package com.xunmei.common.core.domain.mediator.vo;
 
 import lombok.Data;
 
+import java.io.Serializable;
+
 @Data
-public class EquipmentOrgVo {
+public class EquipmentOrgVo implements Serializable {
 
+    private static final long serialVersionUID = 1L;
     /**
      * 设备code
      */

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

@@ -30,7 +30,7 @@ public class CodeGenerators {
     }*/
 
     public static final String moduleName="com.xunmei.mediator";
-    public static final String tableNames="iot_sensor,iot_sensor_log";
+    public static final String tableNames="iot_alarm_subsystem";
 
     public static void main(String[] args) {
         // 代码生成器

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

@@ -15,10 +15,7 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
 import com.xunmei.system.api.util.LogUtils;
 import com.xunmei.system.api.RemoteDeviceService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.HashMap;
@@ -88,13 +85,6 @@ public class DataController {
         return ReceiveErrorDto.error("数据处理异常");
     }
 
-    @ApiOperation("设备信息同步")
-    @PostMapping({"/api/1"})
-    public ReceiveErrorDto equipmentLst(@PathVariable String branchId, String msgId, @RequestBody DeviceReceivePageDto deviceReceivePageDto) {
-
-        return ReceiveErrorDto.error("数据处理异常");
-    }
-
     /***
      * 频率：每日录像机信息同步完成后，同步正在使用的、全量的通道信息
      * 粒度：按每个录像机推送接入的通道记录为一个数据包
@@ -127,7 +117,7 @@ public class DataController {
     }
 
     @ApiOperation("处理缓存中的通道信息数据")
-    @PostMapping({"/mediator/channelCacheDeal"})
+    @GetMapping({"/mediator/channelCacheDeal"})
     public AjaxResult channelCacheDeal() {
         this.iotDvrChannelService.channelCacheDeal();
         return AjaxResult.success();

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

@@ -64,47 +64,26 @@ public class EquipmentSyncService {
 
     @Autowired
     private RedisTemplate redisTemplate;
-
-    @Autowired
-    private RedisUtil redisUtil;
-
-
     @Autowired
     private RemoteOrgService orgService;
-
-
     @Autowired
     private IMediatorCategoryService categoryService;
-
     @Autowired
     private NorthErrorService northErrorService;
-
-
     @Autowired
     private IIotDeviceService iIotDeviceService;
-
     @Autowired
     private IMediatorProductDeviceService productDeviceService;
-
-    @Autowired
-    private ObjectMapper objectMapper;
-
     @Resource
     private MediatorAlarmRuleMapper alarmRuleMapper;
-
     @Resource
     private MediatorTimeTemplateMapper timeTemplateMapper;
-
     @Resource
     private MediatorAlarmRuleExpressMapper alarmRuleExpressMapper;
-
     @Resource
     private MediatorAlarmSystemFieldMapper alarmSystemFieldMapper;
-
-
     @Autowired
     private IMediatorAlarmDataNewestService alarmDataNewestService;
-
     @Autowired
     private NorthStatisticsSyncService northStatisticsSyncService;
 
@@ -456,10 +435,12 @@ public class EquipmentSyncService {
         for (int i = 1; i <= totalPage; i++) {
             String ak = guid + "_" + i;
             Object obj = this.redisTemplate.opsForValue().get(ak);
+            if (ObjectUtil.isNotEmpty(obj)) {
                 DeviceReceivePageDto page = JSON.parseObject((String) obj, DeviceReceivePageDto.class);
                 pages.add(page);
-                this.redisUtil.removeByKey(ak);
+                this.redisTemplate.delete(ak);
             }
+        }
 
         return pages;
     }

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

@@ -1,6 +1,7 @@
 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;
@@ -386,27 +387,24 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         }
         boolean completed = this.isCompleted(request);
         LogUtils.BASE_INFO_DEFENCEAREA.info("判断是否获取全部报警主机子系统及防区信息分页数据:{}", completed);
-        if (completed) {
-            LogUtils.BASE_INFO_DEFENCEAREA.info("获取全部的报警主机子系统及防区信息,开始数据处理界面！");
-            List<DefenceAreaDto> defenceareaList = new ArrayList<>();
-            for (int i = 1; i <= totalPage; i++) {
-                String ak = packageGuid + "_" + i;
-                Object obj = this.redisTemplate.opsForValue().get(ak);
+        if (!completed) {
+            return ReceiveErrorDto.error("尚未获取全部报警主机子系统及防区信息分页数据,暂不处理!");
+        }
+        LogUtils.BASE_INFO_DEFENCEAREA.info("获取全部的报警主机子系统及防区信息,开始数据处理界面！");
+        List<DefenceAreaDto> defenceareaList = new ArrayList<>();
+        for (int i = 1; i <= totalPage; i++) {
+            String ak = packageGuid + "_" + i;
+            Object obj = this.redisTemplate.opsForValue().get(ak);
+            if (ObjectUtil.isNotEmpty(obj)){
                 List<DefenceAreaDto> defenceareaDtos = JSON.parseArray((String) obj, DefenceAreaDto.class);
-                if (defenceareaDtos != null) {
-                    defenceareaList.addAll(defenceareaDtos);
-                }
+                defenceareaList.addAll(defenceareaDtos);
+                redisTemplate.delete(ak);
             }
-            for (int i = 1; i <= totalPage; i++) {
-                String ak = packageGuid + "_" + i;
-                this.redisTemplate.delete(ak);
-            }
-            this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.protectionCount.getIndex(), defenceareaList.size(), false);
-            new Thread(() -> {
-                this.saveAndUpdate(defenceareaList, branchId, msgId);
-            }).start();
-
         }
+        this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.protectionCount.getIndex(), defenceareaList.size(), false);
+        new Thread(() -> {
+            this.saveAndUpdate(defenceareaList, branchId, msgId);
+        }).start();
         return ReceiveErrorDto.success();
     }
 
@@ -449,14 +447,14 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
                 }
             }
 
-            if (StringUtils.isEmpty(dto.getDefenceAreaCode())) {
+            if (StringUtils.isEmpty(dto.getDefenceareaCode())) {
                 error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
                         , dto, "参数非法：未传defenceareaCode");
                 errors.add(error);
                 continue;
             }
 
-            if (StringUtils.isEmpty(dto.getDefenceAreaName())) {
+            if (StringUtils.isEmpty(dto.getDefenceareaName())) {
                 error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
                         , dto, "参数非法：未传defenceareaName");
                 errors.add(error);
@@ -568,7 +566,7 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
     public Map<String, Object> protectionBuild(DefenceAreaDto dto, SysOrgVO org) {
         Map<String, Object> map = new HashMap<>();
         IotAlarmSubsystem protection = null;
-        IotAlarmSubsystem old = this.findByCodeAndOrgId(dto.getDefenceAreaCode(), org.getId());
+        IotAlarmSubsystem old = this.findByCodeAndOrgId(dto.getDefenceareaCode(), org.getId());
         if (old != null) {
             protection = old;
         } else {
@@ -579,8 +577,8 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         }
         protection.setDeleted(0);
         protection.setAlarmHostCode(dto.getAlarmHostCode());
-        protection.setCode(dto.getDefenceAreaCode());
-        protection.setName(dto.getDefenceAreaName());
+        protection.setCode(dto.getDefenceareaCode());
+        protection.setName(dto.getDefenceareaName());
         protection.setOrgId(org.getId());
         protection.setOrgName(org.getName());
         protection.setOrgPath(org.getPath());
@@ -591,12 +589,12 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
         if (sensorArray != null && sensorArray.size() > 0) {
             List<IotAlarmDefenceArea> list = new ArrayList<>();
             List<IotAlarmDefenceArea> list1 = new ArrayList<>();
-            List<IotAlarmDefenceArea> sensorList = defenceAreService.findBySubSystemCode(dto.getDefenceAreaCode());
+            List<IotAlarmDefenceArea> sensorList = defenceAreService.findBySubSystemCode(dto.getDefenceareaCode());
             for (SensorDto sensorDto : sensorArray) {
                 IotAlarmDefenceArea sensor = new IotAlarmDefenceArea();
                 sensor.setAlarmHostCode(dto.getAlarmHostCode());
-                sensor.setSubSystemCode(dto.getDefenceAreaCode());
-                sensor.setDefenceAreaName(dto.getDefenceAreaName());
+                sensor.setSubSystemCode(dto.getDefenceareaCode());
+                sensor.setDefenceAreaName(dto.getDefenceareaName());
                 sensor.setOrgId(org.getId());
                 sensor.setOrgName(org.getName());
                 sensor.setOrgPath(org.getPath());
@@ -606,11 +604,11 @@ public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemM
                 sensor.setSensorType(sensorDto.getSensorType());
                 sensor.setSensorTypeName(sensorDto.getSensorTypeName());
                 //sensor.setStrDeviceId(dto.getDefenceAreaCode() + sensorDto.getInputIndex());
-                String strDeviceId = dto.getDefenceAreaCode() + sensorDto.getInputIndex();
+                String strDeviceId = dto.getDefenceareaCode() + sensorDto.getInputIndex();
                 final Optional<IotAlarmDefenceArea> optional = sensorList.stream()
                         .filter(r -> r.getOrgId().equals(org.getId()))
                         .filter(r -> r.getAlarmHostCode().equals(dto.getAlarmHostCode()))
-                        .filter(r -> r.getSubSystemCode().equals(dto.getDefenceAreaCode()))
+                        .filter(r -> r.getSubSystemCode().equals(dto.getDefenceareaCode()))
                         .filter(r -> r.getDefenceAreaIndex().equals(sensorDto.getInputIndex()))
                         .max(Comparator.comparing(IotAlarmDefenceArea::getUpdateTime));
                 if (optional.isPresent()) {

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

@@ -47,9 +47,10 @@ public class RedisUtil {
 
     /**
      * 清除缓存数据
+     *
      * @param key
      */
-    public void removeByKey(String key){
-        this.redisTemplate.delete(key);
+    public Boolean removeByKey(String key) {
+        return this.redisTemplate.delete(key);
     }
 }