Преглед изворни кода

布撤防:表名修改类名修改

jingyuanchao пре 1 година
родитељ
комит
c5856a51b2
24 измењених фајлова са 307 додато и 1095 уклоњено
  1. 1 1
      soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/SensorDataDto.java
  2. 50 50
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotAlarmDefenceArea.java
  3. 43 51
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDisk.java
  4. 39 44
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDiskLog.java
  5. 0 78
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/protect/domain/IotDefenceAreaData.java
  6. 0 85
      soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/protect/domain/IotSubSystem.java
  7. 5 1
      soc-modules/soc-modules-gen/pom.xml
  8. 120 0
      soc-modules/soc-modules-gen/src/main/java/com/xunmei/gen/util/CodeGenerators.java
  9. 4 7
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/ProtectionController.java
  10. 1 1
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmDefenceAreaMapper.java
  11. 1 1
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmSubsystemMapper.java
  12. 2 2
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDefenceAreaDataMapper.java
  13. 0 18
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotSubSystemMapper.java
  14. 3 3
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDefenceAreaDataService.java
  15. 0 25
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotSubSystemService.java
  16. 1 1
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotAlarmDefenceAreaService.java
  17. 1 1
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotAlarmSubsystemService.java
  18. 27 30
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmDefenceAreaServiceImpl.java
  19. 3 4
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmSubSystemServiceImpl.java
  20. 4 4
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDefenceAreaDataServiceImpl.java
  21. 0 678
      soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotSubSystemServiceImpl.java
  22. 1 1
      soc-modules/soc-modules-mediator/src/main/resources/mapper/IotAlarmDefenceAreaMapper.xml
  23. 1 1
      soc-modules/soc-modules-mediator/src/main/resources/mapper/IotAlarmSubsystemMapper.xml
  24. 0 8
      soc-modules/soc-modules-mediator/src/main/resources/mapper/IotSubSystemMapper.xml

+ 1 - 1
soc-api/soc-api-system/src/main/java/com/xunmei/system/api/dto/protection/SensorDataDto.java

@@ -19,7 +19,7 @@ public class SensorDataDto {
     @ApiModelProperty("组织机构的唯一标识")
     private String organizationGuid;
 
-    @ApiModelProperty("防区的唯一标识")
+    @ApiModelProperty("子系统的唯一标识")
     private String defenceareaCode;
 
     @ApiModelProperty("报警主机唯一标识")

+ 50 - 50
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotAlarmDefenceArea.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,98 +15,94 @@ import lombok.EqualsAndHashCode;
  * 报警防区
  * </p>
  *
- * @author test
- * @since 2024-02-20
+ * @author oygj
+ * @since 2024-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("iot_alarm_defence_area")
+@ApiModel(value="IotAlarmDefenceArea对象", description="报警防区")
 public class IotAlarmDefenceArea implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId("id")
     private Long id;
 
-    /**
-     * 机构id
-     */
+    @ApiModelProperty(value = "机构id")
+    @TableField("org_id")
     private Long orgId;
 
-    /**
-     * 机构名称
-     */
+    @ApiModelProperty(value = "机构名称")
+    @TableField("org_name")
     private String orgName;
 
-    /**
-     * 机构path
-     */
+    @ApiModelProperty(value = "机构path")
+    @TableField("org_path")
     private String orgPath;
 
-    /**
-     * 报警主机唯一标识
-     */
+    @ApiModelProperty("组织机构的唯一标识")
+    @TableField("organization_guid")
+    private String organizationGuid;
+
+    @ApiModelProperty(value = "报警主机唯一标识")
+    @TableField("alarm_host_code")
     private String alarmHostCode;
 
-    /**
-     * 子系统编号
-     */
+    @ApiModelProperty(value = "子系统编号")
+    @TableField("sub_system_code")
     private String subSystemCode;
 
-    /**
-     * 防区名称
-     */
+    @ApiModelProperty(value = "防区名称")
+    @TableField("defence_area_name")
     private String defenceAreaName;
 
-    /**
-     * 传感器类型
-     */
+    @ApiModelProperty(value = "设备分类")
+    @TableField("category_id")
+    private Long categoryId;
+
+    @ApiModelProperty(value = "传感器类型")
+    @TableField("sensor_type")
     private String sensorType;
 
-    /**
-     * 专感器类型名称
-     */
+    @ApiModelProperty(value = "专感器类型名称")
+    @TableField("sensor_type_name")
     private String sensorTypeName;
 
-    /**
-     * 防区序号(在子系统的编号)
-     */
+    @ApiModelProperty(value = "防区序号(在子系统的编号)")
+    @TableField("defence_area_index")
     private Integer defenceAreaIndex;
 
-    /**
-     * alarm:报警,bypass:旁路,normal:正常,activity:活动,unKnown:未知
-     */
+    @ApiModelProperty(value = "alarm:报警,bypass:旁路,normal:正常,activity:活动,unKnown:未知")
+    @TableField("state")
     private String state;
 
+    @ApiModelProperty(value = "状态描述")
+    @TableField("state_text")
     private String stateText;
 
-    /**
-     * 状态变更时间
-     */
+    @ApiModelProperty(value = "状态变更时间")
+    @TableField("state_update_time")
     private LocalDateTime stateUpdateTime;
 
-    /**
-     * 是否删除
-     */
+    @ApiModelProperty(value = "是否删除")
+    @TableField("deleted")
     private Integer deleted;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
     private LocalDateTime createTime;
 
-    /**
-     * 更新时间
-     */
+    @ApiModelProperty(value = "更新时间")
+    @TableField("update_time")
     private LocalDateTime updateTime;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
     private String createBy;
 
-    /**
-     * 更新人
-     */
+    @ApiModelProperty(value = "更新人")
+    @TableField("update_by")
     private String updateBy;
 
 

+ 43 - 51
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDisk.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,94 +15,82 @@ import lombok.EqualsAndHashCode;
  * 
  * </p>
  *
- * @author test
- * @since 2024-02-20
+ * @author oygj
+ * @since 2024-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("iot_dvr_disk")
+@ApiModel(value="IotDvrDisk对象", description="")
 public class IotDvrDisk implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 所属机构
-     */
+    @TableId("id")
+    private Long id;
+
+    @ApiModelProperty(value = "所属机构")
+    @TableField("org_id")
     private Long orgId;
 
-    /**
-     * 所属机构名称
-     */
+    @ApiModelProperty(value = "所属机构名称")
+    @TableField("org_name")
     private String orgName;
 
-    /**
-     * 所属机构path
-     */
+    @ApiModelProperty(value = "所属机构path")
+    @TableField("org_path")
     private String orgPath;
 
-    /**
-     * 监控主机唯一标识
-     */
+    @ApiModelProperty(value = "监控主机唯一标识")
+    @TableField("equipment_code")
     private String equipmentCode;
 
-    /**
-     * 硬盘名称
-     */
+    @ApiModelProperty(value = "硬盘名称")
+    @TableField("disk_name")
     private String diskName;
 
-    /**
-     * 硬盘序号
-     */
+    @ApiModelProperty(value = "硬盘序号")
+    @TableField("disk_index")
     private Integer diskIndex;
 
-    /**
-     * 硬盘总的空间大小(单位:MB)
-     */
+    @ApiModelProperty(value = "硬盘总的空间大小(单位:MB)")
+    @TableField("total")
     private String total;
 
-    /**
-     * 硬盘可用空间大小(单位:MB)
-     */
+    @ApiModelProperty(value = "硬盘可用空间大小(单位:MB)")
+    @TableField("available")
     private String available;
 
-    /**
-     * 硬盘状态。0:正常,1:异常
-     */
+    @ApiModelProperty(value = "硬盘状态。0:正常,1:异常")
+    @TableField("state")
     private Integer state;
 
-    /**
-     * 最后一次状态更新时间
-     */
-    private LocalDateTime statusUpdateTime;
+    @ApiModelProperty(value = "最后一次状态更新时间")
+    @TableField("state_update_time")
+    private LocalDateTime stateUpdateTime;
 
-    /**
-     * 0:未删除,1:删除
-     */
+    @ApiModelProperty(value = "0:未删除,1:删除")
+    @TableField("deleted")
     private Integer deleted;
 
-    /**
-     * 来源,0:资产设备,1:iot推送
-     */
+    @ApiModelProperty(value = "来源,0:资产设备,1:iot推送")
+    @TableField("source")
     private Integer source;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
     private LocalDateTime createTime;
 
-    /**
-     * 修改时间
-     */
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
     private LocalDateTime updateTime;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
     private String createBy;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
+    @TableField("update_by")
     private String updateBy;
 
 

+ 39 - 44
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/iot/domain/IotDvrDiskLog.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,86 +15,77 @@ import lombok.EqualsAndHashCode;
  * 
  * </p>
  *
- * @author test
- * @since 2024-02-20
+ * @author oygj
+ * @since 2024-02-21
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
 @TableName("iot_dvr_disk_log")
+@ApiModel(value="IotDvrDiskLog对象", description="")
 public class IotDvrDiskLog implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @TableId("id")
+    private Long id;
+
+    @TableField("iot_dvr_disk_id")
     private Long iotDvrDiskId;
 
-    /**
-     * 所属机构
-     */
+    @ApiModelProperty(value = "所属机构")
+    @TableField("org_id")
     private Long orgId;
 
-    /**
-     * 所属机构名称
-     */
+    @ApiModelProperty(value = "所属机构名称")
+    @TableField("org_name")
     private String orgName;
 
-    /**
-     * 所属机构path
-     */
+    @ApiModelProperty(value = "所属机构path")
+    @TableField("org_path")
     private String orgPath;
 
-    /**
-     * 监控主机唯一标识
-     */
+    @ApiModelProperty(value = "监控主机唯一标识")
+    @TableField("equipment_code")
     private String equipmentCode;
 
-    /**
-     * 硬盘名称
-     */
+    @ApiModelProperty(value = "硬盘名称")
+    @TableField("disk_name")
     private String diskName;
 
-    /**
-     * 硬盘序号
-     */
+    @ApiModelProperty(value = "硬盘序号")
+    @TableField("disk_index")
     private Integer diskIndex;
 
-    /**
-     * 硬盘状态。0:正常,1:异常
-     */
+    @ApiModelProperty(value = "硬盘状态。0:正常,1:异常")
+    @TableField("state")
     private Integer state;
 
-    /**
-     * 最后一次状态更新时间
-     */
+    @ApiModelProperty(value = "最后一次状态更新时间")
+    @TableField("status_update_time")
     private LocalDateTime statusUpdateTime;
 
-    /**
-     * 0:未删除,1:删除
-     */
+    @ApiModelProperty(value = "0:未删除,1:删除")
+    @TableField("deleted")
     private Integer deleted;
 
-    /**
-     * 来源,0:资产设备,1:iot推送
-     */
+    @ApiModelProperty(value = "来源,0:资产设备,1:iot推送")
+    @TableField("source")
     private Integer source;
 
-    /**
-     * 创建时间
-     */
+    @ApiModelProperty(value = "创建时间")
+    @TableField("create_time")
     private LocalDateTime createTime;
 
-    /**
-     * 修改时间
-     */
+    @ApiModelProperty(value = "修改时间")
+    @TableField("update_time")
     private LocalDateTime updateTime;
 
-    /**
-     * 创建人
-     */
+    @ApiModelProperty(value = "创建人")
+    @TableField("create_by")
     private String createBy;
 
-    /**
-     * 修改人
-     */
+    @ApiModelProperty(value = "修改人")
+    @TableField("update_by")
     private String updateBy;
 
 

+ 0 - 78
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/protect/domain/IotDefenceAreaData.java

@@ -1,78 +0,0 @@
-package com.xunmei.common.core.domain.protect.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;
-
-/**
- * <p>
- * 防区传感器报警信息,最新数据
- * </p>
- *
- * @author oygj
- * @since 2024-01-30
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("iot_defence_are_data")
-@ApiModel(value="IotDefenceAreData对象", description="防区传感器报警信息,最新数据")
-public class IotDefenceAreaData implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("id")
-    private Long id;
-
-    @ApiModelProperty(value = "组织机构唯一标识")
-    @TableField("organization_guid")
-    private String organizationGuid;
-
-    @ApiModelProperty(value = "报警主机子系统唯一标识")
-    @TableField("defencearea_code")
-    private String defenceareaCode;
-
-    @ApiModelProperty(value = "报警主机唯一标识")
-    @TableField("alarm_host_code")
-    private String alarmHostCode;
-
-    @ApiModelProperty(value = "传感器名称")
-    @TableField("input_name")
-    private String inputName;
-
-    @ApiModelProperty(value = "输入标识")
-    @TableField("input_index")
-    private Integer inputIndex;
-
-    @ApiModelProperty(value = "alarm:报警,bypass:旁路,normal:正常,activity:活动,unKnown:未知")
-    @TableField("input_state")
-    private String inputState;
-
-    @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 = "设备id")
-    @TableField("device_id")
-    private Long deviceId;
-
-    @ApiModelProperty(value = "报警主机过来的设备id")
-    @TableField("str_device_id")
-    private String strDeviceId;
-
-
-}

+ 0 - 85
soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/protect/domain/IotSubSystem.java

@@ -1,85 +0,0 @@
-package com.xunmei.common.core.domain.protect.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;
-
-/**
- * <p>
- * 
- * </p>
- *
- * @author oygj
- * @since 2024-01-29
- */
-@Data
-@EqualsAndHashCode(callSuper = false)
-@TableName("iot_sub_system")
-@ApiModel(value="IotSubSystem对象", description="")
-public class IotSubSystem implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-
-    @TableId("id")
-    private Long id;
-
-    @ApiModelProperty(value = "机构ID")
-    @TableField("org_id")
-    private Long orgId;
-
-    @ApiModelProperty(value = "机构名称")
-    @TableField("org_name")
-    private String orgName;
-
-    @ApiModelProperty(value = "机构路径")
-    @TableField("org_path")
-    private String orgPath;
-
-    @ApiModelProperty(value = "主机编码")
-    @TableField("host_code")
-    private String hostCode;
-
-    @ApiModelProperty(value = "子系统名称")
-    @TableField("sub_system_name")
-    private String subSystemName;
-
-    @ApiModelProperty(value = "子系统唯一标识")
-    @TableField("sub_system_code")
-    private String subSystemCode;
-
-    @ApiModelProperty(value = "报警主机唯一标识")
-    @TableField("alarm_host_code")
-    private String alarmHostCode;
-
-    @ApiModelProperty(value = "子系统状态:0:撤防,1:布防, 2:未知")
-    @TableField("status")
-    private Integer status;
-
-    @ApiModelProperty(value = "是否删除")
-    @TableField("deleted")
-    private Integer deleted;
-
-    @ApiModelProperty(value = "创建时间")
-    @TableField("create_time")
-    private LocalDateTime createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableField("update_time")
-    private LocalDateTime updateTime;
-
-    @ApiModelProperty(value = "创建人")
-    @TableField("create_by")
-    private String createBy;
-
-    @ApiModelProperty(value = "更新人")
-    @TableField("update_by")
-    private String updateBy;
-
-
-}

+ 5 - 1
soc-modules/soc-modules-gen/pom.xml

@@ -73,7 +73,11 @@
             <artifactId>soc-common-swagger</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>mybatis-plus-generator</artifactId>
+            <version>${generator.version}</version>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -0,0 +1,120 @@
+package com.xunmei.gen.util;
+
+
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class CodeGenerators {
+
+    /**
+     * 读取控制填的内容
+     * @param tip
+     * @return
+     */
+  /*  public static String scanner(String tip) {
+        Scanner scanner = new Scanner(System.in);
+        System.out.println("请输入" + tip + ":");
+        if (scanner.hasNext()) {
+            String ipt = scanner.next();
+            if (ObjectUtils.isNotEmpty(ipt)) {
+                return ipt;
+            }
+        }
+        throw new MybatisPlusException("请输入正确的" + tip + "!");
+    }*/
+
+    public static final String moduleName="com.xunmei.mediator";
+    public static final String tableNames="iot_alarm_defence_area";
+
+    public static void main(String[] args) {
+        // 代码生成器
+        AutoGenerator mpg = new AutoGenerator();
+        // 全局配置
+        GlobalConfig gc = new GlobalConfig();
+        // System.getProperty("user.dir");
+        String projectPath = "D:\\test";
+        //生成文件输出目录
+        gc.setOutputDir(projectPath + "/java");
+        gc.setAuthor("oygj");
+        //生成代码后,是否打开文件夹
+        gc.setOpen(true);
+        // 实体属性 Swagger2 注解
+        gc.setSwagger2(true);
+        mpg.setGlobalConfig(gc);
+        // 数据源配置
+        DataSourceConfig dsc = new DataSourceConfig();
+       /* dsc.setUrl("jdbc:mysql://39.103.229.41:3306/isp_ah?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&characterSetResults=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("jinJie@2021");*/
+        dsc.setUrl("jdbc:mysql://10.87.21.103:3306/soc_iot?serverTimezone=Asia/Shanghai&characterEncoding=UTF-8&characterSetResults=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true");
+        dsc.setDriverName("com.mysql.cj.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("XM_zm2019");
+        mpg.setDataSource(dsc);
+
+
+        // 包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setModuleName(moduleName);
+        pc.setEntity("domain");
+        pc.setMapper("mapper");
+        pc.setService("service");
+        pc.setController("controller");
+        mpg.setPackageInfo(pc);
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        // 如果模板引擎是 freemarker
+        //String templatePath = "/templates/mapper.xml.ftl";
+        // 自定义输出配置
+        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+//        focList.add(new FileOutConfig(templatePath) {
+//            @Override
+//            pub String outputFile(TableInfo tableInfo) {
+//                // 自定义输出文件名 , 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化!!
+//                return projectPath + "/src/main/resources/mapper/" + pc.getModuleName()
+//                        + "/" + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+//            }
+//        });
+        cfg.setFileOutConfigList(focList);
+        //这个必须要,需要提供一个默认的
+        mpg.setCfg(cfg);
+
+        // 策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        // 表名生成策略
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        // 实体字段生成策略
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        // 需要生成的表
+        strategy.setInclude(tableNames.split(","));
+        // 使用lombook
+        strategy.setEntityLombokModel(true);
+        strategy.setRestControllerStyle(true);
+        // 生成注解
+        strategy.setEntityTableFieldAnnotationEnable(true);
+        // 自动生成实体类继承基类(基类必须已存在)
+        strategy.setTablePrefix("t_","t_app_");
+        //strategy.setSuperEntityClass("com.isp.common.jpa.BaseEntity");
+        // 写于父类中的公共字段
+        //strategy.setSuperEntityColumns("create_time","update_time", "modified_id", "modified_name");
+        mpg.setStrategy(strategy);
+        //mpg.setTemplateEngine(new FreemarkerTemplateEngine());
+        mpg.execute();
+    }
+
+
+
+}

+ 4 - 7
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/controller/ProtectionController.java

@@ -2,9 +2,8 @@ package com.xunmei.mediator.api.controller;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
-import com.xunmei.mediator.api.service.IIotDefenceAreaService;
-import com.xunmei.mediator.api.service.IIotSubSystemService;
-import com.xunmei.mediator.api.service.IProtectionService;
+import com.xunmei.mediator.api.service.IotAlarmDefenceAreaService;
+import com.xunmei.mediator.api.service.IotAlarmSubsystemService;
 import com.xunmei.mediator.api.service.RabbitMsgIdService;
 import com.xunmei.system.api.dto.DataPageDto;
 import com.xunmei.system.api.dto.protection.DefenceareaPageDto;
@@ -30,11 +29,9 @@ public class ProtectionController {
     @Resource
     private RabbitMsgIdService rabbitMsgIdService;
     @Resource
-    private IIotSubSystemService subSystemService;
+    private IotAlarmSubsystemService protectionService;
     @Resource
-    private IProtectionService protectionService;
-    @Resource
-    private IIotDefenceAreaService defenceAreService;
+    private IotAlarmDefenceAreaService defenceAreService;
     @ApiOperation("报警主机子系统及防区信息同步")
     @PostMapping({"/api/{branchId}/data/defenceareaList"})
     public ReceiveErrorDto defenceareaList(@PathVariable String branchId, String msgId, @RequestBody DefenceareaPageDto request) {

+ 1 - 1
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDefenceAreaMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmDefenceAreaMapper.java

@@ -11,6 +11,6 @@ import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
  * @author oygj
  * @since 2024-01-29
  */
-public interface IotDefenceAreaMapper extends BaseMapper<IotAlarmDefenceArea> {
+public interface IotAlarmDefenceAreaMapper extends BaseMapper<IotAlarmDefenceArea> {
 
 }

+ 1 - 1
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/ProtectionMapper.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotAlarmSubsystemMapper.java

@@ -14,7 +14,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @since 2022-09-11
  */
 @Mapper
-public interface ProtectionMapper extends BaseMapper<IotAlarmSubsystem> {
+public interface IotAlarmSubsystemMapper extends BaseMapper<IotAlarmSubsystem> {
 
     void updateAllDelete();
 

+ 2 - 2
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotDefenceAreaDataMapper.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.protect.domain.IotDefenceAreaData;
+import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 
 /**
  * <p>
@@ -12,6 +12,6 @@ import com.xunmei.common.core.domain.protect.domain.IotDefenceAreaData;
  * @author oygj
  * @since 2024-01-30
  */
-public interface IotDefenceAreaDataMapper extends BaseMapper<IotDefenceAreaData> {
+public interface IotDefenceAreaDataMapper extends BaseMapper<IotAlarmDefenceArea> {
 
 }

+ 0 - 18
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/mapper/IotSubSystemMapper.java

@@ -1,18 +0,0 @@
-package com.xunmei.mediator.api.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.xunmei.common.core.domain.protect.domain.IotSubSystem;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author oygj
- * @since 2024-01-29
- */
-public interface IotSubSystemMapper extends BaseMapper<IotSubSystem> {
-
-    void updateAllDelete();
-
-}

+ 3 - 3
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDefenceAreaDataService.java

@@ -2,7 +2,7 @@ package com.xunmei.mediator.api.service;
 
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.protect.domain.IotDefenceAreaData;
+import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 
 import java.util.List;
 
@@ -14,8 +14,8 @@ import java.util.List;
  * @author oygj
  * @since 2024-01-30
  */
-public interface IIotDefenceAreaDataService extends IService<IotDefenceAreaData> {
+public interface IIotDefenceAreaDataService extends IService<IotAlarmDefenceArea> {
 
 
-    List<IotDefenceAreaData> findByOrgGuid(String guid);
+    List<IotAlarmDefenceArea> findByOrgGuid(String guid);
 }

+ 0 - 25
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotSubSystemService.java

@@ -1,25 +0,0 @@
-package com.xunmei.mediator.api.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.xunmei.common.core.domain.protect.domain.IotSubSystem;
-import com.xunmei.system.api.dto.protection.DefenceareaPageDto;
-import com.xunmei.system.api.dto.protection.ProtectionEditDto;
-import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author oygj
- * @since 2024-01-29
- */
-public interface IIotSubSystemService extends IService<IotSubSystem> {
-
-    ReceiveErrorDto defenceAreaList(DefenceareaPageDto request, String branchId, String msgId);
-
-    IotSubSystem findByCodeAndOrgId(String defenceAreaCode, Long orgId);
-
-
-    ReceiveErrorDto saveData(ProtectionEditDto protectionEditDto, String msgId, String branchId);
-}

+ 1 - 1
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IIotDefenceAreaService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotAlarmDefenceAreaService.java

@@ -16,7 +16,7 @@ import java.util.List;
  * @author oygj
  * @since 2024-01-29
  */
-public interface IIotDefenceAreaService extends IService<IotAlarmDefenceArea> {
+public interface IotAlarmDefenceAreaService extends IService<IotAlarmDefenceArea> {
 
     List<IotAlarmDefenceArea> findBySubSystemCode(String defenceAreaCode);
     IotAlarmDefenceArea findBySubSystemCodeAndIdx(String defenceAreaCode, Integer idx);

+ 1 - 1
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IProtectionService.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/IotAlarmSubsystemService.java

@@ -15,7 +15,7 @@ import com.xunmei.system.api.dto.protection.ReceiveErrorDto;
  * @author oygj
  * @since 2022-09-11
  */
-public interface IProtectionService extends IService<IotAlarmSubsystem> {
+public interface IotAlarmSubsystemService extends IService<IotAlarmSubsystem> {
 
 
     ReceiveErrorDto defenceAreaList(DefenceareaPageDto request, String branchId, String msgId);

+ 27 - 30
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDefenceAreaServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmDefenceAreaServiceImpl.java

@@ -9,12 +9,11 @@ import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceAreaAlarmData;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceAreaData;
 import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceAreaDataLog;
-import com.xunmei.common.core.domain.protect.domain.IotDefenceAreaData;
 import com.xunmei.common.core.util.BeanHelper;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.redis.utils.RedisUtils;
-import com.xunmei.mediator.api.mapper.IotDefenceAreaMapper;
+import com.xunmei.mediator.api.mapper.IotAlarmDefenceAreaMapper;
 import com.xunmei.mediator.api.service.*;
 import com.xunmei.mediator.util.CheckDataUtil;
 import com.xunmei.system.api.domain.north.NorthError;
@@ -47,14 +46,12 @@ import java.util.stream.Collectors;
  * @since 2024-01-29
  */
 @Service
-public class IotDefenceAreaServiceImpl extends ServiceImpl<IotDefenceAreaMapper, IotAlarmDefenceArea> implements IIotDefenceAreaService {
+public class IotAlarmDefenceAreaServiceImpl extends ServiceImpl<IotAlarmDefenceAreaMapper, IotAlarmDefenceArea> implements IotAlarmDefenceAreaService {
     @Autowired
     private RedisTemplate redisTemplate;
     @Resource
     NorthErrorService northErrorService;
     @Resource
-    IIotDefenceAreaDataService defenceAreDataService;
-    @Resource
     IIotDefenceAreaDataLogService defenceAreDataLogService;
     @Resource
     IIotDefenceAreaAlarmDataService defenceAreAlarmDataService;
@@ -113,7 +110,7 @@ public class IotDefenceAreaServiceImpl extends ServiceImpl<IotDefenceAreaMapper,
         if (CollectionUtils.isNotEmpty(DataDtos)) {
             Map<String, Object> map = checkSensor(DataDtos, branchId, msgId);
             List<NorthError> errors = (List<NorthError>) map.get("errors");
-            List<IotDefenceAreaData> sensorDatas = (List<IotDefenceAreaData>) map.get("sensorDatas");
+            List<IotAlarmDefenceArea> sensorDatas = (List<IotAlarmDefenceArea>) map.get("sensorDatas");
             List<IotAlarmDefenceAreaDataLog> sensorDataLogs = (List<IotAlarmDefenceAreaDataLog>) map.get("sensorDataLogs");
             List<IotAlarmDefenceArea> sensors = (List<IotAlarmDefenceArea>) map.get("sensors");
             //List<ProductDevice> productDevices = (List<ProductDevice>) map.get("productDevices");
@@ -127,7 +124,7 @@ public class IotDefenceAreaServiceImpl extends ServiceImpl<IotDefenceAreaMapper,
             }
             try {
                 if (CollectionUtils.isNotEmpty(sensorDatas)) {
-                    defenceAreDataService.saveOrUpdateBatch(sensorDatas);
+                    this.saveOrUpdateBatch(sensorDatas);
                 }
                 if (CollectionUtils.isNotEmpty(sensorDataLogs)) {
                     defenceAreDataLogService.saveBatch(sensorDataLogs);
@@ -165,7 +162,7 @@ public class IotDefenceAreaServiceImpl extends ServiceImpl<IotDefenceAreaMapper,
         //将数据进行分组并取出每个传感器最新的一条状态数据重新放到集合中
         Map<String, List<SensorDataDto>> mapa = dataDtos.stream().collect(Collectors.groupingBy(r -> r.getDefenceareaCode() + r.getInputIndex()));
         List<IotAlarmDefenceArea> sensorList = new ArrayList<>();
-        List<IotDefenceAreaData> dataOlds = new ArrayList<>();
+        List<IotAlarmDefenceArea> dataOlds = new ArrayList<>();
         for (String key : mapa.keySet()) {
             List<SensorDataDto> list = mapa.get(key);
             if (CollectionUtils.isNotEmpty(list)) {
@@ -250,7 +247,7 @@ public class IotDefenceAreaServiceImpl extends ServiceImpl<IotDefenceAreaMapper,
         return flag;
     }
 
-    private Map<String, Object> checkError(SensorDataDto sensorData, String branchId, String msgId, List<SysOrgVO> orgList, List<IotAlarmDefenceArea> sensorList, List<IotDefenceAreaData> dataOlds) {
+    private Map<String, Object> checkError(SensorDataDto sensorData, String branchId, String msgId, List<SysOrgVO> orgList, List<IotAlarmDefenceArea> sensorList, List<IotAlarmDefenceArea> dataOlds) {
         Map<String, Object> map = new HashMap<>();
         SysOrgVO org; //orgDao.findByGuid(sensorData.getOrganizationGuid());
         List<SysOrgVO> orgs = orgList.stream().filter(r -> r.getGuid().equals(sensorData.getOrganizationGuid())).collect(Collectors.toList());
@@ -311,30 +308,30 @@ public class IotDefenceAreaServiceImpl extends ServiceImpl<IotDefenceAreaMapper,
         }
 
 
-        IotDefenceAreaData data = new IotDefenceAreaData();
+        IotAlarmDefenceArea data = new IotAlarmDefenceArea();
         data.setAlarmHostCode(sensorData.getAlarmHostCode());
-        data.setDefenceareaCode(sensorData.getDefenceareaCode());
-        data.setOrganizationGuid(sensorData.getOrganizationGuid());
+        data.setSubSystemCode(sensorData.getDefenceareaCode());
+        //data.setOrganizationGuid(sensorData.getOrganizationGuid());
         //data.setDeviceId(productDevice.getDeviceId());
-        data.setStrDeviceId(sensorData.getDefenceareaCode() + sensorData.getInputIndex());
-        data.setInputIndex(sensorData.getInputIndex());
-        data.setInputName(sensorData.getInputName());
-        data.setInputState(sensorData.getInputState());
+        //data.setStrDeviceId(sensorData.getDefenceareaCode() + sensorData.getInputIndex());
+        data.setDefenceAreaIndex(sensorData.getInputIndex());
+        data.setDefenceAreaName(sensorData.getInputName());
+        data.setState(sensorData.getInputState());
         data.setUpdateTime(DateUtils.toLocalDateTime(updateTime));
         data.setOrgId(org.getId());
         data.setOrgName(org.getName());
         data.setOrgPath(org.getPath());
 
-        IotDefenceAreaData dataOld = null;
+        IotAlarmDefenceArea dataOld = null;
         if (CollectionUtils.isNotEmpty(dataOlds)) {
-            List<IotDefenceAreaData> dataList = dataOlds.stream().filter(r -> r.getStrDeviceId().equals(sensorData.getDefenceareaCode() + sensorData.getInputIndex())).collect(Collectors.toList());
+            List<IotAlarmDefenceArea> dataList = dataOlds.stream().filter(r -> r.getSubSystemCode().equals(sensorData.getDefenceareaCode())&&r.getDefenceAreaIndex().equals(sensorData.getInputIndex())).collect(Collectors.toList());
             if (CollectionUtils.isNotEmpty(dataList)) {
                 dataOld = dataList.get(0);
             }
         }
         if (dataOld != null) {
             //当传过来的状态数据和数据库中的状态不一样是才进行修改
-            if (!dataOld.getInputState().equals(data.getInputState())) {
+            if (!dataOld.getState().equals(data.getState())) {
                 BeanHelper.copyProperties(dataOld, data);
                 data = dataOld;
             } else {
@@ -353,18 +350,18 @@ public class IotDefenceAreaServiceImpl extends ServiceImpl<IotDefenceAreaMapper,
             dataLog.setSensorData(data.getId());
 
             //旁路、正常,活动,未知是正常状态
-            if (data.getInputState().equalsIgnoreCase("bypass")
-                    || data.getInputState().equalsIgnoreCase("normal")
-                    || data.getInputState().equalsIgnoreCase("unKnown")
-                    || data.getInputState().equalsIgnoreCase("activity")) {
-                //把设备修改wie正常
-                // productDevice.setDoStatus(0);
-                // productDevice.setCheckTime(updateTime);
-                // map.put("productDevice", productDevice);
-                // productDeviceDao.saveOrUpdate(productDevice);
-            }
+           /* if (data.getState().equalsIgnoreCase("bypass")
+                    || data.getState().equalsIgnoreCase("normal")
+                    || data.getState().equalsIgnoreCase("unKnown")
+                    || data.getState().equalsIgnoreCase("activity")) {
+                把设备修改wie正常
+                 productDevice.setDoStatus(0);
+                 productDevice.setCheckTime(updateTime);
+                 map.put("productDevice", productDevice);
+                 productDeviceDao.saveOrUpdate(productDevice);
+            }*/
             //报警是报警状态
-            if (data.getInputState().equalsIgnoreCase("alarm")) {
+            if (data.getState().equalsIgnoreCase("alarm")) {
                 //把对应设备修改为告警,并且记录告警记录
                 //  productDevice.setDoStatus(1);
                 //  productDevice.setCheckTime(updateTime);

+ 3 - 4
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/ProtectionServiceImpl.java → soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotAlarmSubSystemServiceImpl.java

@@ -1,7 +1,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;
@@ -23,7 +22,7 @@ import com.xunmei.common.core.utils.IDHelper;
 import com.xunmei.common.redis.utils.RedisUtils;
 import com.xunmei.mediator.api.mapper.MediatorTimeTemplateMapper;
 import com.xunmei.mediator.api.mapper.ProtectionLogMapper;
-import com.xunmei.mediator.api.mapper.ProtectionMapper;
+import com.xunmei.mediator.api.mapper.IotAlarmSubsystemMapper;
 import com.xunmei.mediator.api.service.*;
 import com.xunmei.system.api.RemoteOrgService;
 import com.xunmei.system.api.domain.SysOrg;
@@ -60,7 +59,7 @@ import java.util.stream.Collectors;
  */
 @Slf4j
 @Service
-public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlarmSubsystem> implements IProtectionService {
+public class IotAlarmSubSystemServiceImpl extends ServiceImpl<IotAlarmSubsystemMapper, IotAlarmSubsystem> implements IotAlarmSubsystemService {
     @Resource
     ProtectionLogMapper protectionLogMapper;
     @Resource
@@ -74,7 +73,7 @@ public class ProtectionServiceImpl extends ServiceImpl<ProtectionMapper, IotAlar
     @Resource
     IIotDeviceService iotDeviceService;
     @Resource
-    private IIotDefenceAreaService defenceAreService;
+    private IotAlarmDefenceAreaService defenceAreService;
     @Resource
     private NorthErrorService northErrorService;
     @Resource

+ 4 - 4
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotDefenceAreaDataServiceImpl.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.protect.domain.IotDefenceAreaData;
+import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
 import com.xunmei.mediator.api.mapper.IotDefenceAreaDataMapper;
 import com.xunmei.mediator.api.service.IIotDefenceAreaDataService;
 import org.springframework.stereotype.Service;
@@ -17,11 +17,11 @@ import java.util.List;
  * @since 2024-01-30
  */
 @Service
-public class IotDefenceAreaDataServiceImpl extends ServiceImpl<IotDefenceAreaDataMapper, IotDefenceAreaData> implements IIotDefenceAreaDataService {
+public class IotDefenceAreaDataServiceImpl extends ServiceImpl<IotDefenceAreaDataMapper, IotAlarmDefenceArea> implements IIotDefenceAreaDataService {
 
 
     @Override
-    public List<IotDefenceAreaData> findByOrgGuid(String guid) {
-        return lambdaQuery().eq(IotDefenceAreaData::getOrganizationGuid,guid).list();
+    public List<IotAlarmDefenceArea> findByOrgGuid(String guid) {
+        return lambdaQuery().eq(IotAlarmDefenceArea::getOrganizationGuid,guid).list();
     }
 }

+ 0 - 678
soc-modules/soc-modules-mediator/src/main/java/com/xunmei/mediator/api/service/impl/IotSubSystemServiceImpl.java

@@ -1,678 +0,0 @@
-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;
-import com.xunmei.common.core.constant.CacheConstants;
-import com.xunmei.common.core.constant.Constants;
-import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.iot.domain.IotAlarmDefenceArea;
-import com.xunmei.common.core.domain.mediator.domain.*;
-import com.xunmei.common.core.domain.protect.domain.IotSubSystem;
-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.common.redis.utils.RedisUtils;
-import com.xunmei.mediator.api.mapper.IotSubSystemMapper;
-import com.xunmei.mediator.api.mapper.MediatorTimeTemplateMapper;
-import com.xunmei.mediator.api.service.*;
-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 com.xunmei.system.api.domain.north.NorthError;
-import com.xunmei.system.api.dto.protection.*;
-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;
-import com.xunmei.system.api.vo.SysOrgVO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.stereotype.Service;
-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.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
-/**
- * <p>
- * 服务实现类
- * </p>
- *
- * @author oygj
- * @since 2024-01-29
- */
-@Slf4j
-@Service
-public class IotSubSystemServiceImpl extends ServiceImpl<IotSubSystemMapper, IotSubSystem> implements IIotSubSystemService {
-    @Resource
-    RemoteOrgService orgService;
-    @Resource
-    RedisTemplate redisTemplate;
-    @Resource
-    NorthStatisticsSyncService northStatisticsSyncService;
-    @Resource
-    IMediatorCategoryService categoryService;
-    @Resource
-    RemoteDeviceService deviceService;
-    @Resource
-    private IIotDefenceAreaService defenceAreService;
-    @Resource
-    private NorthErrorService northErrorService;
-    @Resource
-    private MediatorTimeTemplateMapper timeTemplateMapper;
-    @Resource
-    private IMediatorAlarmRuleSourceService alarmRuleSourceService;
-    @Resource
-    private IMediatorAlarmRuleExpressService alarmRuleExpressService;
-    @Override
-    public IotSubSystem findByCodeAndOrgId(String defenceAreaCode, Long orgId) {
-        return lambdaQuery()
-                .eq(IotSubSystem::getSubSystemCode, defenceAreaCode)
-                .eq(IotSubSystem::getOrgId, orgId)
-                .last(Constants.LIMIT1)
-                .one();
-
-    }
-
-    @Override
-    public ReceiveErrorDto saveData(ProtectionEditDto protectionEditDto, String msgId, String branchId) {
-
-        ReceiveErrorDto result = new ReceiveErrorDto();
-        String organizationGuid = protectionEditDto.getOrganizationGuid();
-        if (StringUtils.isEmpty(organizationGuid)) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:未传organizationGuid");
-            return result;
-        }
-
-        if (StringUtils.isEmpty(protectionEditDto.getDefenceareaCode())) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:未传defenceareaCode");
-            return result;
-        }
-
-        if (StringUtils.isEmpty(protectionEditDto.getDefenceareaName())) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:未传defenceareaName");
-            return result;
-        }
-
-        if (protectionEditDto.getDefenceStatus() == null) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:未传defenceStatus");
-            return result;
-        }
-
-        if (StringUtils.isEmpty(protectionEditDto.getUpdateTime())) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:未传updateTime");
-            return result;
-        }
-        if (StringUtils.isEmpty(protectionEditDto.getAlarmHostCode())) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:未传alarmHostCode");
-            return result;
-        }
-
-        SysOrg org = orgService.findByCode(organizationGuid, SecurityConstants.INNER);
-        if (org == null) {
-            NorthError error = new NorthError(msgId, branchId, "/status/defencearea"
-                    , protectionEditDto, "orgGUID:" + organizationGuid + "不正确");
-            northErrorService.saveError(error);
-            return result;
-        }
-
-        LocalDateTime dateTime = null;
-        try {
-            dateTime = LocalDateTime.parse(protectionEditDto.getUpdateTime(), DateTimeFormatter.ISO_DATE_TIME);
-        } catch (Exception e) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:updateTime不正确");
-            return result;
-        }
-
-
-        Date updateTime = Date.from(dateTime.atZone(ZoneId.systemDefault()).toInstant());
-        IotSubSystem protection = new IotSubSystem();
-        protection.setSubSystemCode(protectionEditDto.getDefenceareaCode());
-
-        IotSubSystem old = this.findByCodeAndOrgId(protectionEditDto.getDefenceareaCode(), org.getId());
-        if (old != null) {
-            Date oldUt = DateUtils.toDate(old.getUpdateTime());
-            long ot = oldUt.getTime();
-            long nt = updateTime.getTime();
-            if (ot - nt > 0) {
-                result.setSuccess(true);
-                result.setErrorMsg("历史更新时间大于当前消息,无需更新!");
-                return result;
-            }
-            protection = old;
-        } else {
-            protection.setId(IdWorker.getId());
-        }
-
-        protection.setSubSystemName(protectionEditDto.getDefenceareaName());
-        protection.setUpdateTime(DateUtils.toLocalDateTime(updateTime));
-        switch (protectionEditDto.getDefenceStatus()) {
-            case 0:
-                protection.setStatus(ProtectionStatus.REMOVAL.ordinal());
-                break;
-            case 1:
-                protection.setStatus(ProtectionStatus.PROTECTION.ordinal());
-                break;
-            case 2:
-                protection.setStatus(ProtectionStatus.UNKNOWN.ordinal());
-                break;
-            default:
-                result.setSuccess(false);
-                result.setErrorMsg("参数非法:defenceStatus不正确");
-                return result;
-        }
-        SysDevice device = deviceService.findByHostCode(protectionEditDto.getAlarmHostCode(),SecurityConstants.INNER);
-        if (device == null) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:没有找到报警主机");
-            return result;
-        }
-        IotSubSystem po = this.findByCodeAndOrgId(protectionEditDto.getDefenceareaCode(), org.getId());
-        if (po == null) {
-            result.setSuccess(false);
-            result.setErrorMsg("参数非法:没有找到子系统");
-            return result;
-        } else {
-            if (!po.getAlarmHostCode().equals(protectionEditDto.getAlarmHostCode())) {
-                result.setSuccess(false);
-                result.setErrorMsg("参数非法:该报警主机没有此子系统");
-                return result;
-            }
-        }
-        protection.setOrgId(org.getId());
-        protection.setOrgName(org.getName());
-        protection.setOrgPath(org.getPath());
-        protection.setAlarmHostCode(protectionEditDto.getAlarmHostCode());
-        this.saveOrUpdate(protection);
-        this.northStatisticsSyncService.saveOrUpdateBusinessCountByDateAndDataType(DateUtil.today(), DataType.protectionStatusCount.getIndex(), 1L);
-        this.saveProtectionLog(protection);
-        this.writeValue(device, protection);
-
-
-        //动环告警处理
-        List<MediatorAlarmRuleSource> alarmRuleSourceList = alarmRuleSourceService.selectByCode(protection.getSubSystemCode(), protection.getOrgId());
-        if (ObjectUtil.isNotEmpty(alarmRuleSourceList)) {
-            for (MediatorAlarmRuleSource alarmRuleSource : alarmRuleSourceList) {
-                final List<MediatorAlarmRuleExpress> appAlarmRuleExpressList = alarmRuleExpressService.selectRuleExpressByRuleIdAndType(alarmRuleSource.getRuleId(), alarmRuleSource.getSourceType());
-                if (ObjectUtil.isEmpty(appAlarmRuleExpressList)) {
-                    continue;
-                }
-                for (MediatorAlarmRuleExpress alarmRuleExpress : appAlarmRuleExpressList) {
-                    Integer timeTemplateId = alarmRuleExpress.getTimeTemplateId();
-                    //全时段
-                    if (timeTemplateId != null && 0 == alarmRuleExpress.getIsUseWorkTemplate()) {
-                        dealAlarmDataByAllTimeTemplate(alarmRuleExpress, protection);
-                    } else {
-                        dealAlarmDataByWorkTimeTemplate(alarmRuleExpress, protection, alarmRuleSource);
-                    }
-                }
-            }
-        }
-        return result;
-    }
-    private void dealAlarmDataByWorkTimeTemplate(MediatorAlarmRuleExpress alarmRuleExpress, IotSubSystem 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);
-        }*/
-
-    }
-    /*private List<Integer> getWeekDayList(WorkTimeSet weekday) {
-        List<Integer> list = new ArrayList<>();
-        if (weekday.getMonday()!=null&& weekday.getMonday() == 1) {
-            list.add(1);
-        }
-        if (weekday.getTuesday()!=null&&weekday.getTuesday() == 1) {
-            list.add(2);
-        }
-        if (weekday.getWednesday()!=null&&weekday.getWednesday() == 1) {
-            list.add(3);
-        }
-        if (weekday.getThursday()!=null&&weekday.getThursday() == 1) {
-            list.add(4);
-        }
-        if (weekday.getFriday()!=null&&weekday.getFriday() == 1) {
-            list.add(5);
-        }
-        if (weekday.getSaturday()!=null&&weekday.getSaturday() == 1) {
-            list.add(6);
-        }
-        if (weekday.getSunday()!=null&&weekday.getSunday() == 1) {
-            list.add(7);
-        }
-        return list;
-    }*/
-    private void dealAlarmDataByAllTimeTemplate(MediatorAlarmRuleExpress alarmRuleExpress, IotSubSystem 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);*/
-            }
-
-
-        }
-    }
-    @Transactional(rollbackFor = Exception.class)
-    public void saveProtectionLog(IotSubSystem protection) {
-       //todo 保存布撤防历史
-    }
-    public void writeValue(final SysDevice device, final IotSubSystem protection) {
-        Map data = null;
-
-        try {
-            data = JSON.parseObject(String.valueOf(protection),Map.class);
-        } catch (Exception var5) {
-            log.error("转换对象异常:{}",var5);
-        }
-
-        String key = this.toKey(device.getOrgId(), Integer.parseInt(device.getDeviceType()));
-        this.redisTemplate.boundHashOps(key).put(device.getId(), data);
-        log.info("[ {} ][ {} ][ {} ] 数据 ==> [ {} ]", new Object[]{device.getOrgId(), device.getDeviceType(), device.getId(), data});
-    }
-    private String toKey(final Long orgId, Integer deviceType) {
-        return "device_" + orgId + "_" + deviceType + "_data_map";
-    }
-    @Override
-    public ReceiveErrorDto defenceAreaList(DefenceareaPageDto request, String branchId, String msgId) {
-        String packageGuid = request.getPackageGuid();
-        if (StringUtils.isEmpty(packageGuid)) {
-            return ReceiveErrorDto.error("packageGuid参数非法");
-        }
-        Long totalPage = request.getTotalPage();
-        if (totalPage == null) {
-            return ReceiveErrorDto.error("totalPage参数非法");
-        }
-
-        if (CollectionUtils.isEmpty(request.getData())) {
-            return ReceiveErrorDto.error("报警主机子系统及防区信息为空");
-        }
-        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);
-                List<DefenceAreaDto> defenceareaDtos = JSON.parseArray((String) obj, DefenceAreaDto.class);
-                if (defenceareaDtos != null) {
-                    defenceareaList.addAll(defenceareaDtos);
-                }
-            }
-            for (int i = 1; i <= totalPage; i++) {
-                String ak = packageGuid + "_" + i;
-                this.redisTemplate.delete(ak);
-            }
-            //protectionDao.updateAllDelete();
-            this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.protectionCount.getIndex(), defenceareaList.size(), false);
-            new Thread(() -> {
-                this.saveAndUpdate(defenceareaList, branchId, msgId);
-            }).start();
-
-        }
-        return ReceiveErrorDto.success();
-    }
-
-    public ReceiveErrorDto saveAndUpdate(List<DefenceAreaDto> defenceareaList, String branchId, String msgId) {
-        if (CollectionUtils.isEmpty(defenceareaList)) {
-            return ReceiveErrorDto.error("报警主机子系统及防区信息为空");
-        }
-        List<NorthError> errors = new ArrayList<>();
-        List<IotSubSystem> protectionList = new ArrayList<>();
-        List<IotAlarmDefenceArea> sensorList = new ArrayList<>();
-        List<IotSubSystem> deviceList = new ArrayList<>();
-        //获取机构列表
-        final List<SysOrgVO> orgList = RedisUtils.getCacheList(CacheConstants.ORG_CACHE_LIST_KEY);
-        //获取category列表
-        List<MediatorCategory> categorys = categoryService.list();
-        //查询报警主机主机设备列表
-        List<SysDevice> devices = deviceService.findAlarmHostDevice(3713671920926720L, SecurityConstants.INNER);
-        checkParam(defenceareaList, branchId, msgId, errors, orgList, categorys, devices, deviceList, protectionList, sensorList);
-        return ReceiveErrorDto.success();
-    }
-
-    private void checkParam(List<DefenceAreaDto> defenceareaList, String branchId, String msgId, List<NorthError> errors, List<SysOrgVO> orgList, List<MediatorCategory> categorys, List<SysDevice> devices, List<IotSubSystem> deviceList, List<IotSubSystem> protectionList, List<IotAlarmDefenceArea> sensorList) {
-        NorthError error = null;
-        for (DefenceAreaDto dto : defenceareaList) {
-            SysOrgVO org = null;
-            if (StringUtils.isEmpty(dto.getOrganizationGuid())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                        , dto, "参数非法:未传organizationGuid");
-                errors.add(error);
-                continue;
-            } else {
-                List<SysOrgVO> orgs = orgList.stream().filter(r -> r.getGuid().equals(dto.getOrganizationGuid())).collect(Collectors.toList()); //orgDao.findByGuid(dto.getOrganizationGuid());
-                if (orgs.size() == 0) {
-                    error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                            , dto, "orgGUID:" + dto.getOrganizationGuid() + "不正确");
-                    errors.add(error);
-                    continue;
-                } else {
-                    org = orgs.get(0);
-                }
-            }
-
-            if (StringUtils.isEmpty(dto.getDefenceAreaCode())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                        , dto, "参数非法:未传defenceareaCode");
-                errors.add(error);
-                continue;
-            }
-
-            if (StringUtils.isEmpty(dto.getDefenceAreaName())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                        , dto, "参数非法:未传defenceareaName");
-                errors.add(error);
-                continue;
-            }
-
-            if (StringUtils.isEmpty(dto.getAlarmHostCode())) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                        , dto, "参数非法:未传alarmHostCode");
-                errors.add(error);
-                continue;
-            }
-
-            if (dto.getSensorArray() == null || dto.getSensorArray().size() == 0) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                        , dto, "参数非法:未传sensorArray");
-                errors.add(error);
-                //continue;
-            } else {
-                List<SensorDto> sensorArray = dto.getSensorArray();
-
-                for (SensorDto sensorDto : sensorArray) {
-                    if (StringUtils.isEmpty(sensorDto.getInputName())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                                , dto, "参数非法:未传InputName");
-                        errors.add(error);
-                        continue;
-                    }
-                    if (sensorDto.getInputIndex() == null) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                                , dto, "参数非法:未传InputIndex");
-                        errors.add(error);
-                        continue;
-                    }
-                    if (StringUtils.isEmpty(sensorDto.getModuleAddress())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                                , dto, "参数非法:未传ModuleAddress");
-                        errors.add(error);
-                        continue;
-                    }
-                    if (StringUtils.isEmpty(sensorDto.getSensorType())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                                , dto, "参数非法:未传SensorType");
-                        errors.add(error);
-                        continue;
-                    }
-                    if (StringUtils.isEmpty(sensorDto.getSensorTypeName())) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                                , dto, "参数非法:未传SensorTypeName");
-                        errors.add(error);
-                    }
-
-                    List<MediatorCategory> categorysa = categorys.stream().filter(r -> r.getName().equals(sensorDto.getSensorTypeName())).collect(Collectors.toList());//categoryDao.getOne(qw);
-                    if (categorysa.size() == 0) {
-                        error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                                , dto, "参数非法:没有找到设备类型,默认归到其他类型中");
-                        errors.add(error);
-                    }
-                }
-            }
-            SysOrgVO finalOrg = org;
-            SysDevice device = null;
-            List<SysDevice> devicesa = devices.stream().filter(r -> r.getHostCode().equals(dto.getAlarmHostCode()) && r.getOrgId().equals(finalOrg.getId())).collect(Collectors.toList());
-            if (devicesa == null || devicesa.size() == 0) {
-                error = new NorthError(msgId, branchId, "/api/data/defenceareaList"
-                        , dto, "参数非法:没有找到报警主机");
-                errors.add(error);
-                continue;
-            }
-            Map<String, Object> map = this.protectionBuild(dto, org);
-            if (map != null) {
-                protectionList.add((IotSubSystem) map.get("protection"));
-                List<IotAlarmDefenceArea> list = (List<IotAlarmDefenceArea>) map.get("sensorList");
-                if (list != null && list.size() > 0) {
-                    sensorList.addAll(list);
-                }
-            }
-
-        }
-        try {
-            //删除传感器表中的数据
-            defenceAreService.remove(new LambdaQueryWrapper<>());
-        } catch (Exception e) {
-            log.error("删除传感器表中的数据失败,失败原因:" + e.getMessage(), e);
-        }
-
-
-        if (errors.size() > 0) {
-            northErrorService.saveErrorData(errors);
-        }
-        try {
-            baseMapper.updateAllDelete();
-        } catch (Exception e) {
-            log.error("修改子系统为逻辑删除失败,失败原因:" + e.getMessage(), e);
-        }
-        try {
-            this.saveOrUpdateBatch(protectionList);
-        } catch (Exception e) {
-            log.error("更新子系统数据失败,失败原因:" + e.getMessage(), e);
-        }
-        try {
-            defenceAreService.saveOrUpdateBatch(sensorList);
-        } catch (Exception e) {
-            log.error("更新t_sensor表传感器数据失败,失败原因:" + e.getMessage(), e);
-        }
-        this.northStatisticsSyncService.saveOrUpdateBaseCountByDataType(DataType.protectionCount.getIndex(), defenceareaList.size(), true);
-    }
-
-    public Map<String, Object> protectionBuild(DefenceAreaDto dto, SysOrgVO org) {
-        Map<String, Object> map = new HashMap<>();
-        IotSubSystem protection = null;
-        IotSubSystem old = this.findByCodeAndOrgId(dto.getDefenceAreaCode(), org.getId());
-        if (old != null) {
-            protection = old;
-        } else {
-            protection = new IotSubSystem();
-            protection.setId(IDHelper.id());
-            protection.setCreateTime(DateUtils.toLocalDateTime(new Date()));
-            protection.setStatus(2);
-        }
-        protection.setDeleted(0);
-        protection.setAlarmHostCode(dto.getAlarmHostCode());
-        protection.setSubSystemCode(dto.getDefenceAreaCode());
-        protection.setSubSystemName(dto.getDefenceAreaName());
-        protection.setOrgId(org.getId());
-        protection.setOrgName(org.getName());
-        protection.setOrgPath(org.getPath());
-        map.put("protection", protection);
-
-
-        List<SensorDto> sensorArray = dto.getSensorArray();
-        if (sensorArray != null && sensorArray.size() > 0) {
-            List<IotAlarmDefenceArea> list = new ArrayList<>();
-            List<IotAlarmDefenceArea> list1 = new ArrayList<>();
-            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.setOrgId(org.getId());
-                sensor.setOrgName(org.getName());
-                sensor.setOrgPath(org.getPath());
-                sensor.setDefenceAreaIndex(sensorDto.getInputIndex());
-                sensor.setDefenceAreaName(sensorDto.getInputName());
-                //sensor.setModuleAddress(sensorDto.getModuleAddress());
-                sensor.setSensorType(sensorDto.getSensorType());
-                sensor.setSensorTypeName(sensorDto.getSensorTypeName());
-                //sensor.setStrDeviceId(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.getDefenceAreaIndex().equals(sensorDto.getInputIndex()))
-                        .max(Comparator.comparing(IotAlarmDefenceArea::getUpdateTime));
-                if (optional.isPresent()) {
-                    final IotAlarmDefenceArea iotDefenceAre = optional.get();
-                    BeanHelper.copyProperties(iotDefenceAre, sensor);
-                    list.add(iotDefenceAre);
-                } else {
-                    sensor.setId(IDHelper.id());
-                    sensor.setState("unKnown");
-                    sensor.setStateText("未知");
-                    list.add(sensor);
-                }
-            }
-
-            map.put("sensorList", list);
-            map.put("deviceList", list1);
-        }
-
-        return map;
-    }
-
-    public boolean isCompleted(DefenceareaPageDto request) {
-        String guid = request.getPackageGuid();
-        Long currPage = request.getCurrPage();
-        Long totalPage = request.getTotalPage();
-        List<DefenceAreaDto> defenceareaList = request.getData();
-
-        /**
-         * 生成每一页的redis key值
-         */
-        String key = guid + "_" + currPage;
-
-        /**
-         * 判断是否已经获取到该分页数据,如果已获取到,则直接返回
-         */
-        Boolean isExist = redisTemplate.hasKey(key);
-
-        if (!isExist) {
-            String data = JSON.toJSONString(defenceareaList);
-            this.redisTemplate.opsForValue().set(key, data);
-            this.redisTemplate.expire(key, 1, TimeUnit.DAYS);
-        }
-
-
-        //判断是否完整
-        for (int i = 1; i <= totalPage; i++) {
-            String ak = guid + "_" + i;
-            Boolean isOk = redisTemplate.hasKey(ak);
-            if (!isOk) {
-                return false;
-            }
-        }
-        return true;
-    }
-}

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

+ 1 - 1
soc-modules/soc-modules-mediator/src/main/resources/mapper/ProtectionMapper.xml → soc-modules/soc-modules-mediator/src/main/resources/mapper/IotAlarmSubsystemMapper.xml

@@ -1,6 +1,6 @@
 <?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.ProtectionMapper">
+<mapper namespace="com.xunmei.mediator.api.mapper.IotAlarmSubsystemMapper">
 
     <update id="updateAllDelete">
         update iot_alarm_subsystem set deleted=1;

+ 0 - 8
soc-modules/soc-modules-mediator/src/main/resources/mapper/IotSubSystemMapper.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.IotSubSystemMapper">
-
-    <update id="updateAllDelete">
-        update iot_sub_system set deleted=1;
-    </update>
-</mapper>