北向 布撤防代码状态同步代码提交

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

@@ -1,8 +1,12 @@
 package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,62 +15,64 @@ import lombok.EqualsAndHashCode;
  * 防区传感器报警信息报警表，记录报警
  * </p>
  *
- * @author test
- * @since 2024-02-20
+ * @author oygj
+ * @since 2024-02-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("iot_alarm_defence_area_alarm_data")
+@ApiModel(value="IotAlarmDefenceAreaAlarmData对象", description="防区传感器报警信息报警表，记录报警")
 public class IotAlarmDefenceAreaAlarmData implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId("id")
     private Long id;
+
+    @TableField("org_id")
     private Long orgId;
 
+    @TableField("org_name")
     private String orgName;
 
+    @TableField("org_path")
     private String orgPath;
 
-    /**
-     * 设备id
-     */
+    @ApiModelProperty(value = "设备id")
+    @TableField("defence_area_id")
     private Long defenceAreaId;
 
-    /**
-     * 报警主机子系统唯一标识
-     */
-    private String defenceareaCode;
-
-    /**
-     * 报警主机唯一标识
-     */
+    @ApiModelProperty(value = "报警主机唯一标识")
+    @TableField("alarm_host_code")
     private String alarmHostCode;
 
-    /**
-     * 输入标识
-     */
-    private Integer inputIndex;
+    @ApiModelProperty(value = "报警主机子系统唯一标识")
+    @TableField("sub_system_code")
+    private String subSystemCode;
+
+    @ApiModelProperty(value = "防区名称")
+    @TableField("defence_area_name")
+    private String defenceAreaName;
+
+    @ApiModelProperty(value = "输入标识")
+    @TableField("defence_area_index")
+    private Integer defenceAreaIndex;
 
-    /**
-     * alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
-     */
-    private String inputState;
+    @ApiModelProperty(value = "alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知")
+    @TableField("defence_area_status")
+    private String defenceAreaStatus;
 
-    /**
-     * 修改时间
-     */
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
     private LocalDateTime updateTime;
 
-    /**
-     * 报警主机过来的设备id
-     */
-    private String strDeviceId;
+    @ApiModelProperty(value = "处理状态 0:未处理,1:已处理(误报),2:已处理(无需处理),3:已处理(运维单)")
+    @TableField("isdo")
+    private Integer isdo;
 
-    /**
-     * 处理状态 0:未处理,1:已处理(误报),2:已处理(无需处理),3:已处理(运维单)
-     */
-    private Integer isDo;
+    @ApiModelProperty(value = "机构guid")
+    @TableField("organization_guid")
+    private String organizationGuid;
 
 
 }

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

@@ -29,50 +29,50 @@ public class IotAlarmDefenceAreaData implements Serializable {
     @TableId("id")
     private Long id;
 
-    @ApiModelProperty(value = "报警主机子系统唯一标识")
-    @TableField("defencearea_code")
-    private String defenceAreaCode;
+    @ApiModelProperty(value = "机构guid")
+    @TableField("organization_guid")
+    private String organizationGuid;
+
+    @TableField("org_id")
+    private Long orgId;
+
+    @TableField("org_name")
+    private String orgName;
+
+    @TableField("org_path")
+    private String orgPath;
 
     @ApiModelProperty(value = "报警主机唯一标识")
     @TableField("alarm_host_code")
     private String alarmHostCode;
 
+    @ApiModelProperty(value = "报警主机子系统唯一标识")
+    @TableField("defence_area_code")
+    private String defenceAreaCode;
+
     @ApiModelProperty(value = "传感器名称")
-    @TableField("input_name")
-    private String inputName;
+    @TableField("defence_area_name")
+    private String defenceAreaName;
 
     @ApiModelProperty(value = "输入标识")
-    @TableField("input_index")
-    private Integer inputIndex;
+    @TableField("defence_area_index")
+    private Integer defenceAreaIndex;
 
     @ApiModelProperty(value = "alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知")
-    @TableField("input_state")
-    private String inputState;
+    @TableField("defence_area_status")
+    private String defenceAreaStatus;
 
     @ApiModelProperty(value = "修改时间")
     @TableField("update_time")
     private LocalDateTime updateTime;
 
-    @TableField("org_id")
-    private Long orgId;
-
-    @TableField("org_name")
-    private String orgName;
-
-    @TableField("org_path")
-    private String orgPath;
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
+    private LocalDateTime createTime;
 
     @ApiModelProperty(value = "设备id")
     @TableField("device_id")
     private Long deviceId;
 
-    @ApiModelProperty(value = "设备id")
-    @TableField("sensor_data")
-    private Long sensorData;
-
-    @ApiModelProperty(value = "报警主机过来的设备id")
-    @TableField("str_device_id")
-    private String strDeviceId;
-
 
 }

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

@@ -1,8 +1,12 @@
 package com.xunmei.common.core.domain.iot.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
+import com.baomidou.mybatisplus.annotation.TableField;
 import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -11,69 +15,64 @@ import lombok.EqualsAndHashCode;
  * 防区传感器报警信息，日志
  * </p>
  *
- * @author test
- * @since 2024-02-20
+ * @author oygj
+ * @since 2024-02-23
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("iot_alarm_defence_area_data_log")
+@ApiModel(value="IotAlarmDefenceAreaDataLog对象", description="防区传感器报警信息，日志")
 public class IotAlarmDefenceAreaDataLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-
+    @TableId("id")
     private Long id;
 
-    /**
-     * 报警主机子系统唯一标识
-     */
-    private String defenceareaCode;
+    @ApiModelProperty(value = "机构guid")
+    @TableField("organization_guid")
+    private String organizationGuid;
 
-    /**
-     * 报警主机唯一标识
-     */
-    private String alarmHostCode;
+    @TableField("org_id")
+    private Long orgId;
 
-    /**
-     * 传感器名称
-     */
-    private String inputName;
+    @TableField("org_name")
+    private String orgName;
 
-    /**
-     * 输入标识
-     */
-    private Integer inputIndex;
+    @TableField("org_path")
+    private String orgPath;
 
-    /**
-     * alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知
-     */
-    private String inputState;
+    @ApiModelProperty(value = "报警主机唯一标识")
+    @TableField("alarm_host_code")
+    private String alarmHostCode;
 
-    /**
-     * 修改时间
-     */
-    private LocalDateTime updateTime;
+    @ApiModelProperty(value = "报警主机子系统唯一标识")
+    @TableField("defence_area_code")
+    private String defenceAreaCode;
 
-    private Long orgId;
+    @ApiModelProperty(value = "传感器名称")
+    @TableField("defence_area_name")
+    private String defenceAreaName;
 
-    private String orgName;
+    @ApiModelProperty(value = "输入标识")
+    @TableField("defence_area_index")
+    private Integer defenceAreaIndex;
 
-    private String orgPath;
+    @ApiModelProperty(value = "alarm:报警，bypass:旁路，normal:正常，activity：活动，unKnown：未知")
+    @TableField("defence_area_status")
+    private String defenceAreaStatus;
 
-    /**
-     * 设备id
-     */
-    private Long deviceId;
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
+    private LocalDateTime updateTime;
 
-    /**
-     * 设备id
-     */
-    private Long sensorData;
+    @ApiModelProperty(value = "设备id")
+    @TableField("device_id")
+    private Long deviceId;
 
-    /**
-     * 报警主机过来的设备id
-     */
-    private String strDeviceId;
+    @ApiModelProperty(value = "防区数据表id")
+    @TableField("defence_area_data_id")
+    private Long defenceAreaDataId;
 
 
 }

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_alarm_defence_area_data";
+    public static final String tableNames="iot_alarm_defence_area_data_log";
 
     public static void main(String[] args) {
         // 代码生成器

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

@@ -171,34 +171,40 @@ public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceA
         IotAlarmDefenceAreaData data = new IotAlarmDefenceAreaData();
         data.setAlarmHostCode(sensorData.getAlarmHostCode());
         data.setDefenceAreaCode(sensorData.getDefenceareaCode());
-        data.setInputIndex(sensorData.getInputIndex());
-        data.setInputName(sensorData.getInputName());
-        data.setInputState(sensorData.getInputState());
+        data.setDefenceAreaIndex(sensorData.getInputIndex());
+        data.setDefenceAreaName(sensorData.getInputName());
+        data.setDefenceAreaStatus(sensorData.getInputState());
         data.setUpdateTime(LocalDateTime.parse(sensorData.getUpdateTime(),DateTimeFormatter.ISO_DATE_TIME));
         data.setOrgId(org.getId());
+        data.setOrganizationGuid(sensorData.getOrganizationGuid());
         data.setOrgName(org.getName());
         data.setOrgPath(org.getPath());
 
         IotAlarmDefenceAreaData dataOld = defenceAreaDataService.findByCodeAndIdx(sensorData.getDefenceareaCode(), sensorData.getInputIndex(),data.getOrgId());
         if (dataOld != null) {
             BeanHelper.copyProperties(dataOld, data);
-            data = dataOld;
+            data.setUpdateTime(LocalDateTime.now());
         } else {
             data.setId(IDHelper.id());
+            data.setCreateTime(LocalDateTime.now());
         }
         IotAlarmDefenceAreaDataLog dataLog = new IotAlarmDefenceAreaDataLog();
         BeanHelper.copyProperties(dataLog, data);
         dataLog.setId(IDHelper.id());
-        dataLog.setSensorData(data.getId());
+        dataLog.setDefenceAreaDataId(data.getId());
 
         //报警是报警状态
-        if (data.getInputState().equalsIgnoreCase("alarm")) {
+        if (data.getDefenceAreaStatus().equalsIgnoreCase("alarm")) {
             //把对应设备修改为告警,并且记录告警记录
             IotAlarmDefenceAreaAlarmData dataAlarm = new IotAlarmDefenceAreaAlarmData();
             BeanHelper.copyProperties(dataAlarm, data);
             dataAlarm.setId(IDHelper.id());
-            dataAlarm.setIsDo(0);
-            defenceAreAlarmDataService.updateById(dataAlarm);
+            dataAlarm.setIsdo(0);
+            dataAlarm.setDefenceAreaName(sensor.getDefenceAreaName());
+            dataAlarm.setDefenceAreaStatus(data.getDefenceAreaStatus());
+            dataAlarm.setDefenceAreaIndex(data.getDefenceAreaIndex());
+            dataAlarm.setDefenceAreaId(sensor.getId());
+            defenceAreAlarmDataService.save(dataAlarm);
         }
 
         defenceAreaDataService.saveOrUpdate(data);

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

@@ -30,7 +30,7 @@ public class IotDefenceAreaDataServiceImpl extends ServiceImpl<IotDefenceAreaDat
         return lambdaQuery()
                 .eq(IotAlarmDefenceAreaData::getOrgId,orgId)
                 .eq(IotAlarmDefenceAreaData::getDefenceAreaCode,defenceAreaCode)
-                .eq(IotAlarmDefenceAreaData::getInputIndex,inputIndex)
+                .eq(IotAlarmDefenceAreaData::getDefenceAreaIndex,inputIndex)
                 .eq(IotAlarmDefenceAreaData::getOrgId,orgId)
                 .last(Constants.LIMIT1)
                 .one();