代码优化

1.推送消息屏蔽，只推送治理设备信息；
2.文件下载优化
3.公共方法提取

iot-access/access-api/src/main/java/com/njcn/access/api/AskDeviceDataFeignClient.java

@@ -0,0 +1,44 @@
+package com.njcn.access.api;
+
+import com.njcn.access.api.fallback.AskDeviceDataClientFallbackFactory;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.ACCESS_BOOT, path = "/askDeviceData", fallbackFactory = AskDeviceDataClientFallbackFactory.class,contextId = "askDeviceData")
+public interface AskDeviceDataFeignClient {
+
+    @PostMapping("/askDeviceRootPath")
+    HttpResult<String> askDeviceRootPath(@RequestParam("nDid") String nDid);
+
+    @PostMapping("/askDeviceFileOrDir")
+    HttpResult<String> askDeviceFileOrDir(@RequestParam("nDid") String nDid, @RequestParam("name") String name);
+
+    @PostMapping("/downloadFile")
+    HttpResult<Boolean> downloadFile(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("size") Integer size, @RequestParam("fileCheck") String fileCheck);
+
+    @PostMapping("/rebootDevice")
+    HttpResult<String> rebootDevice(@RequestParam("nDid") String nDid);
+
+    @PostMapping("/createFolder")
+    HttpResult<String> createFolder(@RequestParam("nDid") String nDid, @RequestParam("path") String path);
+
+    @PostMapping("/deleteFolder")
+    HttpResult<String> deleteFolder(@RequestParam("nDid") String nDid, @RequestParam("path") String path);
+
+    @PostMapping("/askRealData")
+    HttpResult<String> askRealData(@RequestParam("nDid") String nDid, @RequestParam("idx") Integer idx, @RequestParam("clDId") Integer clDId);
+
+}

iot-access/access-api/src/main/java/com/njcn/access/api/fallback/AskDeviceDataClientFallbackFactory.java

@@ -0,0 +1,78 @@
+package com.njcn.access.api.fallback;
+
+import com.njcn.access.api.AskDeviceDataFeignClient;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.redis.utils.RedisUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class AskDeviceDataClientFallbackFactory implements FallbackFactory<AskDeviceDataFeignClient> {
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    @Override
+    public AskDeviceDataFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new AskDeviceDataFeignClient() {
+            @Override
+            public HttpResult<String> askDeviceRootPath(String nDid) {
+                log.error("{}异常，降级处理，异常为：{}","平台询问装置报文",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> askDeviceFileOrDir(String nDid, String name) {
+                log.error("{}异常，降级处理，异常为：{}","设备文件/目录信息询问",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<Boolean> downloadFile(String nDid, String name, Integer size, String fileCheck) {
+                log.error("{}异常，降级处理，异常为：{}","文件下载",cause.toString());
+                redisUtil.delete("fileDowning:" + nDid);
+                redisUtil.delete("fileCheck"+nDid+name);
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> rebootDevice(String nDid) {
+                log.error("{}异常，降级处理，异常为：{}","设备重启",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> createFolder(String nDid, String path) {
+                log.error("{}异常，降级处理，异常为：{}","创建文件夹",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> deleteFolder(String nDid, String path) {
+                log.error("{}异常，降级处理，异常为：{}","删除文件夹",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<String> askRealData(String nDid, Integer idx, Integer clDid) {
+                log.error("{}异常，降级处理，异常为：{}","询问装置实时数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

iot-access/access-api/src/main/java/com/njcn/access/enums/AccessResponseEnum.java

@@ -14,11 +14,13 @@ public enum AccessResponseEnum {
      * A0301 ~ A0399 用于用户模块的枚举
      * <p>
      */
-    NDID_NO_FIND("A0301", "此设备未录入或已注册!"),
+    NDID_NO_FIND("A0301", "此装置未录入!"),
+    NDID_SAME_STEP("A0301", "此装置已注册!"),
 
-    MISSING_CLIENT("A0302","设备客户端不在线!"),
+    MISSING_CLIENT("A0302","装置端不在线!"),
     MODEL_REPEAT("A0302", "模板存在,请勿重复录入!"),
     MODEL_NO_FIND("A0302", "模板不存在,请先录入模板数据!"),
+    MODEL_ERROR("A0302", "模板未找到,生成监测点失败!"),
 
     DICT_ANALYSIS_ERROR("A0303","字典解析错误!"),
     MODEL_ANALYSIS_ERROR("A0303","模板解析错误!"),
@@ -28,6 +30,7 @@ public enum AccessResponseEnum {
     DEV_MODEL_NOT_FIND("A0303","装置型号未找到!"),
     DEV_IS_NOT_ZL("A0303","注册装置不是直连装置!"),
     DEV_IS_NOT_WG("A0303","注册装置不是网关!"),
+    DEV_IS_NOT_PORTABLE("A0303","注册装置不是便携式装置!"),
 
     REGISTER_RESPONSE_ERROR("A0304","装置注册,装置侧应答失败!"),
     ACCESS_RESPONSE_ERROR("A0304","装置注册,装置侧应答失败!"),
@@ -55,9 +58,11 @@ public enum AccessResponseEnum {
 
     MODEL_MISS("A0308","模板信息缺失!"),
     MODEL_VERSION_ERROR("A0308","询问装置模板信息错误"),
+    UPLOAD_ERROR("A0308","平台上送文件异常"),
+    RELOAD_UPLOAD_ERROR("A0308","平台重新上送文件异常"),
 
     CLDID_IS_NULL("A0309","逻辑子设备标识为空"),
-    MODULE_NUMBER_IS_NULL("A0309","设备子模块个数为空"),
+    MODULE_NUMBER_IS_NULL("A0309","装置子模块个数为空"),
     LDEVINFO_IS_NULL("A0309","逻辑设备信息为空"),
     SOFTINFO_IS_NULL("A0309","软件信息为空"),
 
@@ -65,6 +70,9 @@ public enum AccessResponseEnum {
 
     PROCESS_SAME_ERROR("A0311","当前调试已完成,请勿重复调试"),
     PROCESS_MISSING_ERROR("A0311","调试流程缺失,请核查功能调试、出厂调试"),
+    PROCESS_ERROR("A0311","调试流程异常,请先进行功能调试、出厂调试!"),
+
+    FILE_CHECK_ERROR("A0312","文件校验码不一致!"),
     ;
 
     private final String code;

iot-access/access-api/src/main/java/com/njcn/access/enums/TypeEnum.java

@@ -44,6 +44,7 @@ public enum TypeEnum {
     TYPE_28("4662","设备根目录查询应答"),
     TYPE_29("9217","设备心跳请求"),
     TYPE_30("4865","设备数据主动上送"),
+    TYPE_31("8503","设备控制命令"),
 
     /**
      * 数据类型
@@ -63,6 +64,7 @@ public enum TypeEnum {
     DATA_13("13","内部定值InSet"),
     DATA_14("14","控制Ctrl"),
     DATA_16("16","波形文件"),
+    DATA_48("48","工程信息"),
 
     /**
      * 数据模型列表

iot-access/access-api/src/main/java/com/njcn/access/pojo/RspDataDto.java

@@ -84,4 +84,83 @@ public class RspDataDto {
         private Double capacityA;
     }
 
+    /**
+     * 工程信息
+     */
+    @Data
+    public static class ProjectInfo {
+
+        @SerializedName("PrjName")
+        @ApiModelProperty("项目名称")
+        private String prjName;
+
+        @SerializedName("PrjTimeStart")
+        @ApiModelProperty("项目起始时间")
+        private Long prjTimeStart;
+
+        @SerializedName("PrjTimeEnd")
+        @ApiModelProperty("项目结束时间")
+        private Long prjTimeEnd;
+
+        @SerializedName("PrjDataPath")
+        @ApiModelProperty("文件路径")
+        private String prjDataPath;
+
+        @SerializedName("DevType")
+        @ApiModelProperty("装置型号")
+        private String devType;
+
+        @SerializedName("DevMac")
+        @ApiModelProperty("装置mac")
+        private String devMac;
+
+        @SerializedName("AppVersion")
+        @ApiModelProperty("设备应用程序版本信息")
+        private String appVersion;
+
+        @SerializedName("Cldid")
+        @ApiModelProperty("逻辑子设备ID（0-逻辑设备本身）")
+        private Integer clDid;
+
+        @SerializedName("StatCycle")
+        @ApiModelProperty("分钟数据统计时间间隔（1~10分钟）")
+        private Integer statCycle;
+
+        @SerializedName("VolGrade")
+        @ApiModelProperty("电压等级（kV）")
+        private Double volGrade;
+
+        @SerializedName("VolConType")
+        @ApiModelProperty("电压接线方式 （0-星型, 1-角型, 2-V型）")
+        private Integer volConType;
+
+        @SerializedName("CurConSel")
+        @ApiModelProperty("电流接线方式 （0-正常, 1-合成IB, 2-合成IC）")
+        private Integer curConSel;
+
+        @SerializedName("PtRatio")
+        @ApiModelProperty("PT变比")
+        private Integer ptRatio;
+
+        @SerializedName("CtRatio")
+        @ApiModelProperty("CT变比")
+        private Integer ctRatio;
+
+        @SerializedName("CapacitySscb")
+        @ApiModelProperty("基准短路容量（MVA）")
+        private Double capacitySscb;
+
+        @SerializedName("CapacitySscmin")
+        @ApiModelProperty("最小短路容量（MVA）")
+        private Double capacitySscmin;
+
+        @SerializedName("CapacitySt")
+        @ApiModelProperty("供电设备容量（MVA）")
+        private Double capacitySt;
+
+        @SerializedName("CapacitySi")
+        @ApiModelProperty("用户协议容量（MVA）")
+        private Double capacitySi;
+    }
+
 }

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AskDataDto.java

@@ -32,6 +32,12 @@ public class AskDataDto {
     @ParamName("EndTime")
     private Integer EndTime;
 
+    @ParamName("RtDuration")
+    private Integer RtDuration;
+
+    @ParamName("DsNameIdx")
+    private Integer DsNameIdx;
+
     @ParamName("DataArray")
     private DataArrayDto DataArray;
 }

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/AutoDataDto.java

@@ -70,8 +70,84 @@ public class AutoDataDto {
         @ApiModelProperty("数据是否参与合格率统计")
         private Integer dataTag;
 
+        @SerializedName("Code")
+        @ApiModelProperty("事件码")
+        private Integer code;
+
         @SerializedName("Data")
         private String data;
+
+        @SerializedName("PrjName")
+        @ApiModelProperty("工程名称")
+        private String prjName;
+
+        @SerializedName("PrjTimeStart")
+        @ApiModelProperty("装置启动时间")
+        private Long prjTimeStart;
+
+        @SerializedName("PrjTimeEnd")
+        @ApiModelProperty("装置结束时间")
+        private Long prjTimeEnd;
+
+        @SerializedName("PrjDataPath")
+        @ApiModelProperty("装置数据路径")
+        private String prjDataPath;
+
+        @SerializedName("DevType")
+        @ApiModelProperty("装置型号")
+        private String devType;
+
+        @SerializedName("DevMac")
+        @ApiModelProperty("装置mac地址")
+        private String devMac;
+
+        @SerializedName("AppVersion")
+        @ApiModelProperty("装置程序版本")
+        private String appVersion;
+
+        @SerializedName("Cldid")
+        @ApiModelProperty("逻辑子设备id")
+        private Integer clDid;
+
+        @SerializedName("StatCycle")
+        @ApiModelProperty("统计间隔")
+        private Integer statCycle;
+
+        @SerializedName("VolGrade")
+        @ApiModelProperty("电压等级")
+        private Float volGrade;
+
+        @SerializedName("VolConType")
+        @ApiModelProperty("电压接线方式（0-星型, 1-角型, 2-V型）")
+        private Integer volConType;
+
+        @SerializedName("CurConSel")
+        @ApiModelProperty("电流接线方式（0-正常, 1-合成IB, 2-合成IC）")
+        private Integer curConSel;
+
+        @SerializedName("PtRatio")
+        @ApiModelProperty("PT变比")
+        private Integer ptRatio;
+
+        @SerializedName("CtRatio")
+        @ApiModelProperty("ct变比")
+        private Integer ctRatio;
+
+        @SerializedName("CapacitySscb")
+        @ApiModelProperty("基准短路容量")
+        private Float capacitySscb;
+
+        @SerializedName("CapacitySscmin")
+        @ApiModelProperty("最小短路容量")
+        private Float capacitySscmin;
+
+        @SerializedName("CapacitySt")
+        @ApiModelProperty("供电设备容量")
+        private Float capacitySt;
+
+        @SerializedName("CapacitySi")
+        @ApiModelProperty("用户协议容量")
+        private Float capacitySi;
     }
 
 }

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/ControlDto.java

@@ -0,0 +1,22 @@
+package com.njcn.access.pojo.dto;
+
+import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class ControlDto implements Serializable {
+
+    @SerializedName("Cldid")
+    private Integer clDid;
+
+    @SerializedName("CmdType")
+    private String cmdType;
+
+    @SerializedName("CmdParm")
+    private String cmdParm;
+}

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/DeviceRedisInfoDto.java

@@ -0,0 +1,52 @@
+package com.njcn.access.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author xy
+ * 装置缓存信息
+ */
+@Data
+public class DeviceRedisInfoDto {
+
+    @ApiModelProperty("装置id")
+    private String deviceId;
+
+    @ApiModelProperty("装置nDid")
+    private String nDid;
+
+    @ApiModelProperty("装置类型")
+    private String deviceType;
+
+    @ApiModelProperty("装置模板id")
+    private String modelId;
+
+    @ApiModelProperty("模板名称")
+    private String modelName;
+
+    @ApiModelProperty("模板版本")
+    private String modelVersion;
+
+    @ApiModelProperty("模板类型 0:治理模板 1:电能质量模板")
+    private Integer modelType;
+
+    @ApiModelProperty("监测点信息")
+    private List<LineRedisInfo> lineList;
+
+    @Data
+    public static class LineRedisInfo {
+
+        @ApiModelProperty("监测点id")
+        private String lineId;
+
+        @ApiModelProperty("监测点位置")
+        private String location;
+
+        @ApiModelProperty("逻辑设备编码")
+        private Integer clDid;
+    }
+
+}

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/EventDto.java

@@ -76,8 +76,85 @@ public class EventDto {
         @ApiModelProperty("告警故障编码（一般显示为Hex）")
         private String code;
 
+        @SerializedName("DataTag")
+        @ApiModelProperty("数据标识，1-标识数据异常")
+        private Integer dataTag;
+
         @SerializedName("Parm")
         private List<Param> param;
+
+
+        @SerializedName("PrjName")
+        @ApiModelProperty("工程名称")
+        private String prjName;
+
+        @SerializedName("PrjTimeStart")
+        @ApiModelProperty("装置启动时间")
+        private Long prjTimeStart;
+
+        @SerializedName("PrjTimeEnd")
+        @ApiModelProperty("装置结束时间")
+        private Long prjTimeEnd;
+
+        @SerializedName("PrjDataPath")
+        @ApiModelProperty("装置数据路径")
+        private String prjDataPath;
+
+        @SerializedName("DevType")
+        @ApiModelProperty("装置型号")
+        private String devType;
+
+        @SerializedName("DevMac")
+        @ApiModelProperty("装置mac地址")
+        private String devMac;
+
+        @SerializedName("AppVersion")
+        @ApiModelProperty("装置程序版本")
+        private String appVersion;
+
+        @SerializedName("Cldid")
+        @ApiModelProperty("逻辑子设备id")
+        private Integer clDid;
+
+        @SerializedName("StatCycle")
+        @ApiModelProperty("统计间隔")
+        private Integer statCycle;
+
+        @SerializedName("VolGrade")
+        @ApiModelProperty("电压等级")
+        private Float volGrade;
+
+        @SerializedName("VolConType")
+        @ApiModelProperty("电压接线方式（0-星型, 1-角型, 2-V型）")
+        private Integer volConType;
+
+        @SerializedName("CurConSel")
+        @ApiModelProperty("电流接线方式（0-正常, 1-合成IB, 2-合成IC）")
+        private Integer curConSel;
+
+        @SerializedName("PtRatio")
+        @ApiModelProperty("PT变比")
+        private Integer ptRatio;
+
+        @SerializedName("CtRatio")
+        @ApiModelProperty("ct变比")
+        private Integer ctRatio;
+
+        @SerializedName("CapacitySscb")
+        @ApiModelProperty("基准短路容量")
+        private Float capacitySscb;
+
+        @SerializedName("CapacitySscmin")
+        @ApiModelProperty("最小短路容量")
+        private Float capacitySscmin;
+
+        @SerializedName("CapacitySt")
+        @ApiModelProperty("供电设备容量")
+        private Float capacitySt;
+
+        @SerializedName("CapacitySi")
+        @ApiModelProperty("用户协议容量")
+        private Float capacitySi;
     }
 
     @Data

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/ModelRedisInfoDto.java

@@ -0,0 +1,63 @@
+package com.njcn.access.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.util.List;
+
+/**
+ * @author xy
+ * 模板缓存信息
+ */
+@Data
+public class ModelRedisInfoDto {
+
+    @ApiModelProperty("模板id")
+    private String modelId;
+
+    @ApiModelProperty("模板名称")
+    private String modelName;
+
+    @ApiModelProperty("模板时间")
+    private LocalDate versionDate;
+
+    @ApiModelProperty("模板版本")
+    private String version;
+
+    @ApiModelProperty("数据集集合")
+    private List<DataSet> dataSetList;
+
+    @Data
+    public static class DataSet {
+
+        @ApiModelProperty("数据集id")
+        private String dataSetId;
+
+        @ApiModelProperty("数据集名称")
+        private String dataSetName;
+
+        @ApiModelProperty("数据指标集合")
+        private List<DataArray> dataArrayList;
+    }
+
+    @Data
+    public static class DataArray {
+
+        @ApiModelProperty("数据指标id")
+        private String dataArrayId;
+
+        @ApiModelProperty("数据指标名称")
+        private String dataArrayName;
+
+        @ApiModelProperty("数据指标别名")
+        private String anotherName;
+
+        @ApiModelProperty("数据指标统计方式")
+        private String statMethod;
+
+        @ApiModelProperty("数据指标相别")
+        private String phase;
+    }
+
+}

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/NoticeUserDto.java

@@ -1,4 +1,4 @@
-package com.njcn.zlevent.pojo.dto;
+package com.njcn.access.pojo.dto;
 
 import com.njcn.access.annotation.ParamName;
 import io.swagger.annotations.ApiModelProperty;

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/UploadFileDto.java

@@ -0,0 +1,41 @@
+package com.njcn.access.pojo.dto;
+
+import com.alibaba.nacos.shaded.com.google.gson.annotations.SerializedName;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author xy
+ */
+@Data
+public class UploadFileDto {
+
+    @SerializedName("Name")
+    @ApiModelProperty("文件名称，全路径")
+    private String name;
+
+    @SerializedName("FileSize")
+    @ApiModelProperty("文件总大小（单位字节）")
+    private Integer fileSize;
+
+    @SerializedName("Offset")
+    @ApiModelProperty("当前上送数据包在文件中偏移位置")
+    private Integer offset;
+
+    @SerializedName("Len")
+    @ApiModelProperty("当前上送数据包长度")
+    private Integer len;
+
+    @SerializedName("Data")
+    @ApiModelProperty("文件包数据")
+    private String data;
+
+    @SerializedName("FileCheck")
+    @ApiModelProperty("文件校验码")
+    private String fileCheck;
+
+    @SerializedName("StepFileCheck")
+    @ApiModelProperty("当前帧文件校验码")
+    private String stepFileCheck;
+
+}

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/devModel/DataSetDto.java

@@ -36,6 +36,16 @@ public class DataSetDto implements Serializable {
     @ApiModelProperty("0-不存储;1-存储")
     private Integer storeFlag;
 
+    @SerializedName("DataAttr")
+    @NotNull(message = "数据集类型")
+    @ApiModelProperty("Stat-统计数据 Rt-实时数据")
+    private String dataAttr;
+
+    @SerializedName("DataLevel")
+    @NotNull(message = "数据标识(一次值、二次值)，不可为空")
+    @ApiModelProperty("Primary-一次值;Secondary-二次值")
+    private String dataLevel;
+
     @SerializedName("DataArray")
     @NotEmpty(message = "数据集合描述,不可为空")
     private List<DataArrayDto> dataArrayDtoList;

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/file/FileDto.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * 类的介绍：
@@ -42,7 +43,10 @@ public class FileDto implements Serializable {
         private String type;
 
         @SerializedName("FileInfo")
-        private FileDto.FileInfo fileInfo;
+        private FileInfo fileInfo;
+
+        @SerializedName("DirInfo")
+        private List<DirInfo> dirInfo;
 
         @SerializedName("Data")
         private String data;
@@ -86,4 +90,22 @@ public class FileDto implements Serializable {
         private String fileChkType;
     }
 
+    @Data
+    public static class DirInfo{
+
+        @SerializedName("Name")
+        private String name;
+
+        @SerializedName("Type")
+        private String type;
+
+        @SerializedName("Size")
+        @ApiModelProperty("文件大小，单位KB")
+        private Integer size;
+
+        @SerializedName("Time")
+        @ApiModelProperty("时间")
+        private Long time;
+    }
+
 }

iot-access/access-api/src/main/java/com/njcn/access/pojo/dto/file/FileRedisDto.java

@@ -0,0 +1,22 @@
+package com.njcn.access.pojo.dto.file;
+
+import lombok.Data;
+
+/**
+ * @author xy
+ */
+@Data
+public class FileRedisDto {
+
+    private String name;
+
+    private Integer allStep;
+
+    private Integer nowStep;
+
+    private Integer retry = 0;
+
+    private Integer code;
+
+
+}

iot-access/access-api/src/main/java/com/njcn/access/pojo/po/CsSoftInfoPO.java

@@ -1,63 +0,0 @@
-package com.njcn.access.pojo.po;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.njcn.db.bo.BaseEntity;
-import lombok.Data;
-
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.util.Date;
-
-/**
- * <p>
- * 系统软件表
- * </p>
- *
- * @author xuyang
- * @since 2023-05-17
- */
-@Data
-@TableName("cs_soft_info")
-public class CsSoftInfoPO {
-
-    private static final long serialVersionUID = 1L;
-
-    private String id;
-
-    /**
-     * 读写操作属性：“r”
-     */
-    private String opAttr;
-
-    /**
-     * 操作系统名称，裸机系统填Null
-     */
-    private String osName;
-
-    /**
-     * 操作系统版本，裸机系统填Null
-     */
-    private String osVersion;
-
-    /**
-     * 应用程序版本号
-     */
-    private String appVersion;
-
-    /**
-     * 应用程序发布日期
-     */
-    private Date appDate;
-
-    /**
-     * 应用程序校验码
-     */
-    private String appCheck;
-
-    /**
-     * 是否支持远程升级程序
-     */
-    private String softUpdate;
-
-
-}

iot-access/access-api/src/main/java/com/njcn/access/utils/CRC32Utils.java

@@ -0,0 +1,55 @@
+package com.njcn.access.utils;
+
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Component
+public class CRC32Utils {
+
+    // CRC-32/MPEG-2 多项式, x^32 + x^26 + x^23 + x^22 + x^16 + x^12 + x^11 + x^10 + x^8 + x^7 + x^5 + x^4 + x^2 + x + 1
+    private static final int POLYNOMIAL = 0x04C11DB7;
+
+    public static int calculateCRC32(byte[] buf, int len, int seed) {
+        if (buf == null || len <= 0) {
+            return seed;
+        }
+
+        int crc = seed;
+        int count = 0;
+        // 对长度进行填充以适应32位整数
+        int rem = len % Integer.BYTES;
+        if (rem > 0) {
+            int n = Integer.BYTES - rem;
+            byte[] newBuf = new byte[len + n];
+            System.arraycopy(buf, 0, newBuf, 0, len);
+            // 填充字节用0xFF
+            for (int i = len; i < len + n; i++) {
+                newBuf[i] = (byte) 0xFF;
+            }
+            buf = newBuf;
+            len += n;
+        }
+
+        int uiCount = len / Integer.BYTES;
+        for (int k = 0; k < uiCount; k++) {
+            int uiTemp = 0;
+            for (int i = 0; i < Integer.BYTES; i++) {
+                uiTemp |= (buf[k * Integer.BYTES + i] & 0xFF) << (8 * (3 - i));
+            }
+            for (int j = 0; j < 32; j++) {
+                // 检查最高位是否为1
+                if ((crc ^ uiTemp) < 0) {
+                    crc = 0x04C11DB7 ^ (crc << 1);
+                    count ++;
+                } else {
+                    crc <<= 1;
+                }
+                uiTemp <<= 1;
+            }
+        }
+        return crc;
+    }
+
+}

iot-access/access-api/src/main/java/com/njcn/access/utils/ChannelObjectUtil.java

@@ -0,0 +1,55 @@
+package com.njcn.access.utils;
+
+import com.njcn.redis.pojo.enums.AppRedisKey;
+import com.njcn.redis.utils.RedisUtil;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Component
+public class ChannelObjectUtil {
+
+    @Resource
+    private RedisUtil redisUtil;
+
+    /**
+     * 将list转成对应实体
+     * @param object
+     * @param clazz
+     * @return
+     * @param <T>
+     */
+    public <T> List<T> objectToList(Object object, Class<T> clazz) {
+        List<T> resultList = new ArrayList<>();
+        if (object instanceof List<?>) {
+            for (Object o : (List<?>) object) {
+                resultList.add(clazz.cast(o));
+            }
+        }
+        return resultList;
+    }
+
+    /**
+     * 将object转成对应实体
+     * @param object
+     * @param clazz
+     * @return
+     * @param <T>
+     */
+    public <T> T objectToSingleObject(Object object, Class<T> clazz) {
+        if (clazz.isInstance(object)) {
+            return clazz.cast(object);
+        }
+        // 或者抛出异常，根据您的需求
+        return null;
+    }
+
+    public Object getDeviceMid(String nDid) {
+        return redisUtil.getObjectByKey(AppRedisKey.DEVICE_MID + nDid);
+    }
+}

iot-access/access-api/src/main/java/com/njcn/access/utils/SendMessageUtil.java

@@ -0,0 +1,63 @@
+package com.njcn.access.utils;
+
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.njcn.access.pojo.dto.NoticeUserDto;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+
+/**
+ * 推送消息
+ * @author xy
+ */
+@Component
+@Slf4j
+@AllArgsConstructor
+public class SendMessageUtil {
+
+    public void sendEventToUser(NoticeUserDto noticeUserDto) {
+        try {
+            // 创建一个URL对象，指定目标HTTPS接口地址
+            URL url = new URL("https://fc-mp-ff7b310f-94c9-4468-8260-109111c0a6b2.next.bspapp.com/push");
+            // 打开HTTPS连接
+            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+            // 设置请求方法为POST
+            connection.setRequestMethod("POST");
+            // 设置请求头，指定Content-Type为application/json
+            connection.setRequestProperty("Content-Type", "application/json");
+            // 启用输出流以发送JSON数据
+            connection.setDoOutput(true);
+            // 将JSON数据写入输出流
+            OutputStream outputStream = connection.getOutputStream();
+            log.info(new Gson().toJson(noticeUserDto).replace("pushClientId", "push_clientid"));
+            outputStream.write(new Gson().toJson(noticeUserDto).replace("pushClientId", "push_clientid").getBytes(StandardCharsets.UTF_8));
+            outputStream.flush();
+            outputStream.close();
+            // 获取响应代码
+            int responseCode = connection.getResponseCode();
+            log.info("Response Code: " + responseCode);
+            // 读取响应数据
+            BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
+            String inputLine;
+            StringBuilder response = new StringBuilder();
+            while ((inputLine = reader.readLine()) != null) {
+                response.append(inputLine);
+            }
+            reader.close();
+            // 打印响应内容
+            log.info("Response Content: " + response.toString());
+            // 关闭连接
+            connection.disconnect();
+        } catch (IOException e) {
+            e.getMessage();
+        }
+    }
+}

iot-access/access-boot/pom.xml

@@ -63,7 +63,22 @@
             <artifactId>common-mq</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>zl-event-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>common-device-biz</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>rt-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

iot-access/access-boot/src/main/java/com/njcn/access/AccessBootApplication.java

@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.DependsOn;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 
@@ -14,6 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @date 2021年12月09日 20:59
  */
 @Slf4j
+@DependsOn("proxyMapperRegister")
 @MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")

iot-access/access-boot/src/main/java/com/njcn/access/controller/AskDeviceDataController.java

@@ -0,0 +1,127 @@
+package com.njcn.access.controller;
+
+import com.njcn.access.service.AskDeviceDataService;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@RestController
+@RequestMapping("/askDeviceData")
+@Api(tags = "平台操作装置报文")
+@AllArgsConstructor
+//@ApiIgnore
+public class AskDeviceDataController extends BaseController {
+
+    private final AskDeviceDataService askDeviceDataService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/askDeviceRootPath")
+    @ApiOperation("设备根目录询问")
+    @ApiImplicitParam(name = "nDid", value = "nDid", required = true)
+    public HttpResult<String> askDeviceRootPath(@RequestParam("nDid") String nDid){
+        String methodDescribe = getMethodDescribe("askDeviceRootPath");
+        askDeviceDataService.askDeviceRootPath(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/askDeviceFileOrDir")
+    @ApiOperation("设备文件/目录信息询问")
+    @ApiImplicitParams({
+        @ApiImplicitParam(name = "nDid", value = "nDid", required = true),
+        @ApiImplicitParam(name = "name", value = "name", required = true)
+    })
+    public HttpResult<String> askDeviceFileOrDir(@RequestParam("nDid") String nDid, @RequestParam("name") String name){
+        String methodDescribe = getMethodDescribe("askDeviceFileOrDir");
+        askDeviceDataService.askDeviceFileOrDir(nDid,name);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/downloadFile")
+    @ApiOperation("设备文件下载")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "nDid", required = true),
+            @ApiImplicitParam(name = "name", value = "文件路径名", required = true),
+            @ApiImplicitParam(name = "size", value = "文件大小(单位byte)", required = true),
+            @ApiImplicitParam(name = "fileCheck", value = "文件校验码", required = true)
+    })
+    public HttpResult<Boolean> downloadFile(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("size") Integer size, @RequestParam("fileCheck") String fileCheck){
+        String methodDescribe = getMethodDescribe("downloadFile");
+        boolean result = askDeviceDataService.downloadFile(nDid,name,size,fileCheck);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, false, methodDescribe);
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/rebootDevice")
+    @ApiOperation("重启设备")
+    @ApiImplicitParam(name = "nDid", value = "nDid", required = true)
+    public HttpResult<String> rebootDevice(@RequestParam("nDid") String nDid){
+        String methodDescribe = getMethodDescribe("rebootDevice");
+        askDeviceDataService.rebootDevice(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/createFolder")
+    @ApiOperation("创建文件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "nDid", required = true),
+            @ApiImplicitParam(name = "path", value = "文件路径", required = true)
+    })
+    public HttpResult<String> createFolder(@RequestParam("nDid") String nDid, @RequestParam("path") String path){
+        String methodDescribe = getMethodDescribe("createFolder");
+        askDeviceDataService.createFolder(nDid,path);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/deleteFolder")
+    @ApiOperation("删除文件")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "nDid", required = true),
+            @ApiImplicitParam(name = "path", value = "文件路径", required = true)
+    })
+    public HttpResult<String> deleteFolder(@RequestParam("nDid") String nDid, @RequestParam("path") String path){
+        String methodDescribe = getMethodDescribe("deleteFolder");
+        askDeviceDataService.deleteFolder(nDid,path);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/askRealData")
+    @ApiOperation("询问装置实时数据")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "装置nDid"),
+            @ApiImplicitParam(name = "idx", value = "数据集编号"),
+            @ApiImplicitParam(name = "clDId", value = "逻辑子设备id")
+    })
+    public HttpResult<String> askRealData(@RequestParam("nDid") String nDid, @RequestParam("idx") Integer idx, @RequestParam("clDId") Integer clDId){
+        String methodDescribe = getMethodDescribe("askRealData");
+        askDeviceDataService.askRealData(nDid,idx,clDId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+}

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDevModelController.java

@@ -13,10 +13,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestPart;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -48,5 +45,14 @@ public class CsDevModelController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/uploadDevFile")
+    @ApiOperation("上传文件至装置")
+    @Transactional(rollbackFor = {Exception.class})
+    public HttpResult<String> uploadDevFile(@RequestPart("file") @Validated MultipartFile file, @RequestParam("id") @Validated String id, @RequestParam("filePath") @Validated String path){
+        String methodDescribe = getMethodDescribe("uploadDevFile");
+        csDevModelService.uploadDevFile(file,id,path);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
 
 }

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsDeviceController.java

@@ -37,15 +37,16 @@ public class CsDeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/register")
-    @ApiOperation("直连设备状态判断")
+    @ApiOperation("直连设备注册")
     @ApiImplicitParams({
         @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true),
         @ApiImplicitParam(name = "type", value = "流程标识(2:功能调试 3:出厂调试 4:设备注册)", required = true)
     })
     @ReturnMsg
     public HttpResult<String> devRegister(@RequestParam String nDid,@RequestParam Integer type){
+        String methodDescribe = getMethodDescribe("devRegister");
         csDeviceService.devRegister(nDid,type);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, "设备MQTT通讯状态!");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@@ -61,7 +62,7 @@ public class CsDeviceController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/access")
-    @ApiOperation("直连设备注册")
+    @ApiOperation("直连设备接入")
     @ApiImplicitParam(name = "devAccessParam", value = "接入参数", required = true)
     public HttpResult<String> devAccess(@RequestBody @Validated DevAccessParam devAccessParam){
         String methodDescribe = getMethodDescribe("devAccess");
@@ -78,4 +79,45 @@ public class CsDeviceController extends BaseController {
         csDeviceService.resetFactory(nDid);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/manualAccess")
+    @ApiOperation("手动发起接入")
+    @ApiImplicitParam(name = "nDid", value = "设备id", required = true)
+    public HttpResult<String> manualAccess(@RequestParam String nDid){
+        String methodDescribe = getMethodDescribe("manualAccess");
+        boolean result = csDeviceService.manualAccess(nDid);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "成功", methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "失败", methodDescribe);
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/wlRegister")
+    @ApiOperation("便携式设备接入")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
+    })
+    @ReturnMsg
+    public HttpResult<String> wlRegister(@RequestParam String nDid){
+        String methodDescribe = getMethodDescribe("wlRegister");
+        String result = csDeviceService.wlDevRegister(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/wlAccess")
+    @ApiOperation("便携式设备手动接入")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "nDid", value = "设备识别码", required = true)
+    })
+    @ReturnMsg
+    public HttpResult<String> wlAccess(@RequestParam String nDid){
+        String methodDescribe = getMethodDescribe("wlAccess");
+        csDeviceService.wlAccess(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "success", methodDescribe);
+    }
+
 }

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsSoftInfoController.java

@@ -1,22 +0,0 @@
-package com.njcn.access.controller;
-
-
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
-import com.njcn.web.controller.BaseController;
-
-/**
- * <p>
- * 系统软件表 前端控制器
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-@RestController
-@RequestMapping("/csSoftInfo")
-public class CsSoftInfoController extends BaseController {
-
-}
-

iot-access/access-boot/src/main/java/com/njcn/access/controller/CsTopicController.java

@@ -1,6 +1,5 @@
 package com.njcn.access.controller;
 
-import com.njcn.access.pojo.po.CsLineModel;
 import com.njcn.access.service.ICsTopicService;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -13,7 +12,10 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
 /**

iot-access/access-boot/src/main/java/com/njcn/access/handler/MqttMessageHandler.java

@@ -14,23 +14,27 @@ import com.github.tocrhz.mqtt.publisher.MqttPublisher;
 import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.AccessResponseEnum;
 import com.njcn.access.enums.TypeEnum;
+import com.njcn.access.mapper.OverlimitMapper;
 import com.njcn.access.pojo.RspDataDto;
 import com.njcn.access.pojo.dto.*;
 import com.njcn.access.pojo.dto.file.FileDto;
+import com.njcn.access.pojo.dto.file.FileRedisDto;
 import com.njcn.access.pojo.param.ReqAndResParam;
 import com.njcn.access.pojo.po.CsDeviceOnlineLogs;
 import com.njcn.access.pojo.po.CsLineModel;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
 import com.njcn.access.pojo.po.CsTopic;
-import com.njcn.access.service.*;
+import com.njcn.access.service.ICsDeviceOnlineLogsService;
+import com.njcn.access.service.ICsEquipmentDeliveryService;
+import com.njcn.access.service.ICsLineModelService;
+import com.njcn.access.service.ICsTopicService;
+import com.njcn.access.utils.ChannelObjectUtil;
 import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.*;
 import com.njcn.csdevice.pojo.param.CsLineParam;
-import com.njcn.csdevice.pojo.po.CsDataSet;
-import com.njcn.csdevice.pojo.po.CsDevCapacityPO;
-import com.njcn.csdevice.pojo.po.CsDevModelPO;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.po.*;
+import com.njcn.device.biz.pojo.po.Overlimit;
+import com.njcn.device.biz.utils.COverlimitUtil;
 import com.njcn.mq.message.AppAutoDataMessage;
 import com.njcn.mq.message.AppEventMessage;
 import com.njcn.mq.message.AppFileMessage;
@@ -40,7 +44,9 @@ import com.njcn.mq.template.AppFileMessageTemplate;
 import com.njcn.mq.template.AppFileStreamMessageTemplate;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
-import com.njcn.web.utils.RequestUtil;
+import com.njcn.rt.api.RtFeignClient;
+import com.njcn.zlevent.api.WaveFeignClient;
+import com.njcn.zlevent.pojo.dto.WaveTimeDto;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.MqttMessage;
@@ -52,14 +58,16 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.validation.ConstraintViolation;
 import javax.validation.Validator;
 import java.nio.charset.StandardCharsets;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.temporal.ChronoField;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+
 /**
  * @author hongawen
  * @version 1.0.0
@@ -71,39 +79,26 @@ import java.util.stream.Collectors;
 public class MqttMessageHandler {
 
     private final DevModelFeignClient devModelFeignClient;
-
     private final ICsLineModelService csLineModelService;
-
     private final ICsTopicService csTopicService;
-
     private final MqttPublisher publisher;
-
     private final RedisUtil redisUtil;
-
     private final ICsEquipmentDeliveryService csEquipmentDeliveryService;
-
     private final DataSetFeignClient dataSetFeignClient;
-
     private final AppAutoDataMessageTemplate appAutoDataMessageTemplate;
-
     private final AppEventMessageTemplate appEventMessageTemplate;
-
     private final CsLogsFeignClient csLogsFeignClient;
-
     private final AppFileMessageTemplate appFileMessageTemplate;
-
     private final AppFileStreamMessageTemplate appFileStreamMessageTemplate;
-
     private final ICsDeviceOnlineLogsService onlineLogsService;
-
-    private final ICsSoftInfoService csSoftInfoService;
-
+    private final CsSoftInfoFeignClient csSoftInfoFeignClient;
     private final CsLineFeignClient csLineFeignClient;
-
     private final DevCapacityFeignClient devCapacityFeignClient;
-
     private final EquipmentFeignClient equipmentFeignClient;
-
+    private final OverlimitMapper overlimitMapper;
+    private final ChannelObjectUtil channelObjectUtil;
+    private final WaveFeignClient waveFeignClient;
+    private final RtFeignClient rtFeignClient;
     @Autowired
     Validator validator;
 
@@ -113,11 +108,11 @@ public class MqttMessageHandler {
         //日志记录
         DeviceLogDTO logDto = new DeviceLogDTO();
         try{
-            logDto.setUserName(RequestUtil.getUsername());
-            logDto.setLoginName(RequestUtil.getLoginName());
+            logDto.setUserName("运维管理员");
+            logDto.setLoginName("njcnyw");
         } catch (Exception e) {
-            logDto.setUserName("设备主题录入");
-            logDto.setLoginName(null);
+            logDto.setUserName("运维管理员");
+            logDto.setLoginName("njcnyw");
         }
         logDto.setOperate(nDid + "设备主题录入");
         logDto.setResult(1);
@@ -175,11 +170,11 @@ public class MqttMessageHandler {
         //日志记录
         DeviceLogDTO logDto = new DeviceLogDTO();
         try{
-            logDto.setUserName(RequestUtil.getUsername());
-            logDto.setLoginName(RequestUtil.getLoginName());
+            logDto.setUserName("运维管理员");
+            logDto.setLoginName("njcnyw");
         } catch (Exception e) {
-            logDto.setUserName("设备注册应答响应");
-            logDto.setLoginName(null);
+            logDto.setUserName("运维管理员");
+            logDto.setLoginName("njcnyw");
         }
         logDto.setOperate("收到设备"+nDid+"注册应答响应");
         logDto.setResult(1);
@@ -213,89 +208,7 @@ public class MqttMessageHandler {
     }
 
     /**
-     * 装置类型模板应答
-     * 1.判断网关的类型
-     * 2.直联设备的DevCfg和DevMod是以直联设备为准，上送平台端，平台端保存。通过校验DevMod模板信息来从平台端模板池中选取对应的模板，如果找不到匹配模板需告警提示人工干预处理。
-     * 3.平台端需读取装置的DevMod来判断网关支持的设备模板（包含设备型号和模板版本），根据app提交的接入子设备DID匹配数据模板（型号及版本），生成DevCfg下发给网关，网关根据下发信息生成就地设备点表。
-     * @param topic
-     * @param message
-     * @param nDid
-     * @param payload
-     */
-    @MqttSubscribe(value = "/Pfm/DevRsp/{version}/{edgeId}",qos = 1)
-    @Transactional(rollbackFor = Exception.class)
-    public void devModelOperation(String topic, MqttMessage message,  @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload){
-        DeviceLogDTO logDto = new DeviceLogDTO();
-        try{
-            logDto.setUserName(RequestUtil.getUsername());
-            logDto.setLoginName(RequestUtil.getLoginName());
-        } catch (Exception e) {
-            logDto.setUserName("系统重启或定时任务创建");
-            logDto.setLoginName(null);
-        }
-        logDto.setOperate(nDid + "设备类型模板应答");
-        logDto.setResult(1);
-        //业务处理
-        Gson gson = new Gson();
-        ModelDto modelDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), ModelDto.class);
-        if (Objects.equals(modelDto.getType(),Integer.parseInt(TypeEnum.TYPE_18.getCode()))){
-            List<DevModInfoDto> list = modelDto.getMsg().getDevMod();
-            List<DevCfgDto> list2 = modelDto.getMsg().getDevCfg();
-            if (CollectionUtils.isEmpty(list)){
-                log.error(AccessResponseEnum.MODEL_VERSION_ERROR.getMessage());
-                logDto.setResult(0);
-                logDto.setFailReason(AccessResponseEnum.MODEL_VERSION_ERROR.getMessage());
-                csLogsFeignClient.addUserLog(logDto);
-                throw new BusinessException(AccessResponseEnum.MODEL_VERSION_ERROR);
-            }
-            //校验前置传递的装置模板库中是否存在
-            List<CsModelDto> modelList = new ArrayList<>();
-            list.forEach(item->{
-                Integer did = null;
-                for (DevCfgDto item2 : list2) {
-                    if (Objects.equals(item.getDevType(),item2.getDevType())){
-                        did = item2.getDid();
-                    }
-                }
-                CsModelDto csModelDto = new CsModelDto();
-                CsDevModelPO po = devModelFeignClient.findModel(item.getDevType(),item.getVersionNo(),item.getVersionDate()).getData();
-                if (Objects.isNull(po)){
-                    log.error(AccessResponseEnum.MODEL_NO_FIND.getMessage());
-                    logDto.setResult(0);
-                    logDto.setFailReason(AccessResponseEnum.MODEL_NO_FIND.getMessage());
-                    csLogsFeignClient.addUserLog(logDto);
-                    throw new BusinessException(AccessResponseEnum.MODEL_NO_FIND);
-                }
-                if (Objects.equals(po.getType(),0)){
-                    List<CsDataSet> dataSetList = dataSetFeignClient.getModuleDataSet(po.getId()).getData();
-                    if (CollectionUtils.isEmpty(dataSetList)){
-                        logDto.setResult(0);
-                        logDto.setFailReason(AccessResponseEnum.MODULE_NUMBER_IS_NULL.getMessage());
-                        csLogsFeignClient.addUserLog(logDto);
-                        throw new BusinessException(AccessResponseEnum.MODULE_NUMBER_IS_NULL);
-                    }
-                    csModelDto.setModuleNumber(dataSetList.size());
-                }
-                csModelDto.setDevType(po.getDevTypeName());
-                csModelDto.setModelId(po.getId());
-                csModelDto.setDid(did);
-                csModelDto.setType(po.getType());
-                modelList.add(csModelDto);
-            });
-            //存储模板id
-            String key2 = AppRedisKey.MODEL + nDid;
-            redisUtil.saveByKeyWithExpire(key2,modelList,600L);
-            //存储监测点模板信息，用于界面回显
-            List<String> modelId = modelList.stream().map(CsModelDto::getModelId).collect(Collectors.toList());
-            List<CsLineModel> lineList = csLineModelService.getMonitorNumByModelId(modelId);
-            String key = AppRedisKey.LINE + nDid;
-            redisUtil.saveByKeyWithExpire(key,lineList,600L);
-            csLogsFeignClient.addUserLog(logDto);
-        }
-    }
-
-    /**
-     * 设备接入平台应答
+     * 设备响应
      * @param topic
      * @param message
      * @param version
@@ -308,21 +221,89 @@ public class MqttMessageHandler {
         //日志实体
         DeviceLogDTO logDto = new DeviceLogDTO();
         try{
-            logDto.setUserName(RequestUtil.getUsername());
-            logDto.setLoginName(RequestUtil.getLoginName());
+            logDto.setUserName("运维管理员");
+            logDto.setLoginName("njcnyw");
         } catch (Exception e) {
-            logDto.setUserName("系统重启或定时任务创建");
-            logDto.setLoginName(null);
+            logDto.setUserName("运维管理员");
+            logDto.setLoginName("njcnyw");
         }
         logDto.setResult(1);
         //业务处理
         Gson gson = new Gson();
         ReqAndResDto.Res res = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), ReqAndResDto.Res.class);
+        redisUtil.saveByKeyWithExpire("devResponse",res.getCode(),5L);
         if (Objects.equals(res.getCode(),AccessEnum.SUCCESS.getCode())){
             switch (res.getType()){
+                /**
+                 * 装置类型模板应答
+                 * 1.判断网关的类型
+                 * 2.直联设备的DevCfg和DevMod是以直联设备为准，上送平台端，平台端保存。通过校验DevMod模板信息来从平台端模板池中选取对应的模板，如果找不到匹配模板需告警提示人工干预处理。
+                 * 3.平台端需读取装置的DevMod来判断网关支持的设备模板（包含设备型号和模板版本），根据app提交的接入子设备DID匹配数据模板（型号及版本），生成DevCfg下发给网关，网关根据下发信息生成就地设备点表。
+                 */
+                case 4611:
+                    log.info("{},装置模板应答,应答code {}",nDid,res.getCode());
+                    ModelDto modelDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), ModelDto.class);
+                    List<DevModInfoDto> list = modelDto.getMsg().getDevMod();
+                    List<DevCfgDto> list2 = modelDto.getMsg().getDevCfg();
+                    if (CollectionUtils.isEmpty(list)){
+                        log.error(AccessResponseEnum.MODEL_VERSION_ERROR.getMessage());
+                        logDto.setResult(0);
+                        logDto.setFailReason(AccessResponseEnum.MODEL_VERSION_ERROR.getMessage());
+                        csLogsFeignClient.addUserLog(logDto);
+                        //有异常删除缓存的模板信息
+                        redisUtil.delete(AppRedisKey.MODEL + nDid);
+                        throw new BusinessException(AccessResponseEnum.MODEL_VERSION_ERROR);
+                    }
+                    //校验前置传递的装置模板库中是否存在
+                    List<CsModelDto> modelList = new ArrayList<>();
+                    list.forEach(item->{
+                        Integer did = null;
+                        for (DevCfgDto item2 : list2) {
+                            if (Objects.equals(item.getDevType(),item2.getDevType())){
+                                did = item2.getDid();
+                            }
+                        }
+                        CsModelDto csModelDto = new CsModelDto();
+                        CsDevModelPO po = devModelFeignClient.findModel(item.getDevType(),item.getVersionNo(),item.getVersionDate()).getData();
+                        if (Objects.isNull(po)){
+                            log.error(AccessResponseEnum.MODEL_NO_FIND.getMessage());
+                            logDto.setResult(0);
+                            logDto.setFailReason(AccessResponseEnum.MODEL_NO_FIND.getMessage());
+                            csLogsFeignClient.addUserLog(logDto);
+                            //有异常删除缓存的模板信息
+                            redisUtil.delete(AppRedisKey.MODEL + nDid);
+                            throw new BusinessException(AccessResponseEnum.MODEL_NO_FIND);
+                        }
+                        if (Objects.equals(po.getType(),0)){
+                            List<CsDataSet> dataSetList = dataSetFeignClient.getModuleDataSet(po.getId()).getData();
+                            if (CollectionUtils.isEmpty(dataSetList)){
+                                logDto.setResult(0);
+                                logDto.setFailReason(AccessResponseEnum.MODULE_NUMBER_IS_NULL.getMessage());
+                                csLogsFeignClient.addUserLog(logDto);
+                                //有异常删除缓存的模板信息
+                                redisUtil.delete(AppRedisKey.MODEL + nDid);
+                                throw new BusinessException(AccessResponseEnum.MODULE_NUMBER_IS_NULL);
+                            }
+                            csModelDto.setModuleNumber(dataSetList.size());
+                        }
+                        csModelDto.setDevType(po.getDevTypeName());
+                        csModelDto.setModelId(po.getId());
+                        csModelDto.setDid(did);
+                        csModelDto.setType(po.getType());
+                        modelList.add(csModelDto);
+                    });
+                    //存储模板id
+                    String key2 = AppRedisKey.MODEL + nDid;
+                    redisUtil.saveByKeyWithExpire(key2,modelList,600L);
+                    //存储监测点模板信息，用于界面回显
+                    List<String> modelId = modelList.stream().map(CsModelDto::getModelId).collect(Collectors.toList());
+                    List<CsLineModel> lineList = csLineModelService.getMonitorNumByModelId(modelId);
+                    String key = AppRedisKey.LINE + nDid;
+                    redisUtil.saveByKeyWithExpire(key,lineList,600L);
+                    break;
                 case 4613:
                     logDto.setOperate(nDid + "设备接入");
-                    log.info("{}收到接入应答响应,应答code {}",nDid,res.getCode());
+                    log.info("{},收到接入应答响应,应答code {}",nDid,res.getCode());
                     if (Objects.equals(res.getCode(),AccessEnum.SUCCESS.getCode())){
                         int mid = 1;
                         //修改装置状态
@@ -338,13 +319,27 @@ public class MqttMessageHandler {
                         } else {
                             LocalDateTime time = record.getOfflineTime();
                             if (!Objects.isNull(time)){
-                                csDeviceOnlineLogs.setNdid(nDid);
+                               csDeviceOnlineLogs.setNdid(nDid);
                                 csDeviceOnlineLogs.setOnlineTime(LocalDateTime.now());
                                 onlineLogsService.save(csDeviceOnlineLogs);
+                           } else {
+                                record.setOnlineTime(LocalDateTime.now());
+                                onlineLogsService.updateById(record);
                             }
                         }
+                        //接入后系统重置装置心跳
+                        redisUtil.saveByKeyWithExpire("MQTT:" + nDid, Instant.now().toEpochMilli(),180L);
+                        //修改redis的mid
+                        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
+                        redisUtil.saveByKeyWithExpire("online" + nDid,"online",10L);
                         //询问设备软件信息
                         askDevData(nDid,version,1,mid);
+                        //更新治理监测点信息和设备容量
+                        askDevData(nDid,version,2,(res.getMid()+1));
+                        //更新电网侧、负载侧监测点信息
+                        askDevData(nDid,version,3,(res.getMid()+1));
+                        //录波任务倒计时
+                        redisUtil.saveByKeyWithExpire("startFile:" + nDid,null,60L);
                     } else {
                         log.info(AccessResponseEnum.ACCESS_RESPONSE_ERROR.getMessage());
                         logDto.setResult(0);
@@ -352,90 +347,116 @@ public class MqttMessageHandler {
                         csLogsFeignClient.addUserLog(logDto);
                         throw new BusinessException(AccessResponseEnum.ACCESS_RESPONSE_ERROR);
                     }
+                    csLogsFeignClient.addUserLog(logDto);
                     break;
                 case 4614:
-                    log.info("设备数据应答--->" + nDid);
                     RspDataDto rspDataDto = JSON.parseObject(JSON.toJSONString(res.getMsg()), RspDataDto.class);
-                    switch (rspDataDto.getDataType()){
-                        case 1:
-                            log.info("{} 更新设备软件信息",nDid);
-                            logDto.setOperate(nDid + "更新设备软件信息");
-                            RspDataDto.SoftInfo softInfo = JSON.parseObject(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.SoftInfo.class);
-                            //记录设备软件信息
-                            CsSoftInfoPO csSoftInfoPo = new CsSoftInfoPO();
-                            BeanUtils.copyProperties(softInfo,csSoftInfoPo);
-                            try {
+                    if (!Objects.isNull(rspDataDto.getDataType())) {
+                        switch (rspDataDto.getDataType()){
+                            case 1:
+                                log.info("{},设备数据应答--->更新设备软件信息", nDid);
+                                logDto.setOperate(nDid + "更新设备软件信息");
+                                RspDataDto.SoftInfo softInfo = JSON.parseObject(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.SoftInfo.class);
+                                //记录设备软件信息
+                                CsSoftInfoPO csSoftInfoPo = new CsSoftInfoPO();
+                                BeanUtils.copyProperties(softInfo,csSoftInfoPo);
                                 String id = IdUtil.fastSimpleUUID();
                                 csSoftInfoPo.setId(id);
-                                csSoftInfoPo.setAppDate(new SimpleDateFormat("yyyy-MM-dd").parse(softInfo.getAppDate()));
-                                csSoftInfoService.save(csSoftInfoPo);
+                                DateTimeFormatter formatter = new DateTimeFormatterBuilder()
+                                        .appendPattern("yyyy-MM-dd[[HH][:mm][:ss]]")
+                                        .parseDefaulting(ChronoField.HOUR_OF_DAY, 0)
+                                        .parseDefaulting(ChronoField.MINUTE_OF_HOUR, 0)
+                                        .parseDefaulting(ChronoField.SECOND_OF_MINUTE, 0)
+                                        .parseDefaulting(ChronoField.MILLI_OF_SECOND, 0)
+                                        .toFormatter();
+                                LocalDateTime localDateTime = LocalDateTime.parse(softInfo.getAppDate(), formatter);
+                                assertThat(localDateTime).isNotNull();
+                                csSoftInfoPo.setAppDate(localDateTime);
+                                csSoftInfoFeignClient.saveSoftInfo(csSoftInfoPo);
                                 //更新设备软件id  先看是否存在软件信息,删除 然后在录入
                                 CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(nDid).getData();
                                 String soft = po.getSoftinfoId();
                                 if (StringUtil.isNotBlank(soft)){
-                                    csSoftInfoService.removeById(soft);
+                                    csSoftInfoFeignClient.removeSoftInfo(soft);
                                 }
                                 equipmentFeignClient.updateSoftInfo(nDid,csSoftInfoPo.getId());
-                                //询问设备容量信息
-                                askDevData(nDid,version,2,(res.getMid()+1));
-                            } catch (ParseException e) {
-                                e.printStackTrace();
-                            }
-                            break;
-                        case 2:
-                            List<RspDataDto.LdevInfo> devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class);
-                            if (CollectionUtil.isNotEmpty(devInfo)){
-                                if (Objects.equals(res.getDid(),1)){
-                                    log.info("{} 更新治理监测点信息和设备容量",nDid);
-                                    logDto.setOperate(nDid + "更新治理监测点信息和设备容量");
-                                    List<CsDevCapacityPO> list = new ArrayList<>();
-                                    devInfo.forEach(item->{
-                                        //1.更新治理监测点信息
-                                        if (Objects.equals(item.getClDid(),0)){
+                                break;
+                            case 2:
+                                List<RspDataDto.LdevInfo> devInfo = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.LdevInfo.class);
+                                if (CollectionUtil.isNotEmpty(devInfo)){
+                                    if (Objects.equals(res.getDid(),1)){
+                                        log.info("{},设备数据应答--->更新治理监测点信息和设备容量", nDid);
+                                        List<CsDevCapacityPO> list3 = new ArrayList<>();
+                                        devInfo.forEach(item->{
+                                            //1.更新治理监测点信息
                                             CsLineParam csLineParam = new CsLineParam();
-                                            csLineParam.setLineId(nDid.concat("0"));
+                                            if (Objects.equals(item.getClDid(),0)){
+                                                csLineParam.setLineId(nDid.concat("0"));
+                                                //2.录入各个模块设备容量
+                                                CsDevCapacityPO csDevCapacity = new CsDevCapacityPO();
+                                                csDevCapacity.setLineId(nDid.concat("0"));
+                                                csDevCapacity.setCldid(item.getClDid());
+                                                csDevCapacity.setCapacity(Objects.isNull(item.getCapacityA())?0.0:item.getCapacityA());
+                                                list3.add(csDevCapacity);
+                                            } else {
+                                                csLineParam.setLineId(nDid.concat(item.getClDid().toString()));
+                                            }
                                             csLineParam.setVolGrade(item.getVolGrade());
                                             csLineParam.setPtRatio(item.getPtRatio());
                                             csLineParam.setCtRatio(item.getCtRatio());
                                             csLineParam.setConType(item.getConType());
                                             csLineFeignClient.updateLine(csLineParam);
+                                            //生成监测点限值
+                                            Overlimit overlimit = COverlimitUtil.globalAssemble(item.getVolGrade().floatValue(),10f,10f,10f,0,0);
+                                            overlimit.setId(nDid.concat(item.getClDid().toString()));
+                                            overlimitMapper.deleteById(nDid.concat(item.getClDid().toString()));
+                                            overlimitMapper.insert(overlimit);
+                                        });
+                                        if (CollectionUtil.isNotEmpty(list3)) {
+                                            devCapacityFeignClient.addList(list3);
+                                            //3.更新设备模块个数
+                                            equipmentFeignClient.updateModuleNumber(nDid,(devInfo.size()-1));
                                         }
-                                        //2.录入各个模块设备容量
-                                        CsDevCapacityPO csDevCapacity = new CsDevCapacityPO();
-                                        csDevCapacity.setLineId(nDid.concat("0"));
-                                        csDevCapacity.setCldid(item.getClDid());
-                                        csDevCapacity.setCapacity(item.getCapacityA());
-                                        list.add(csDevCapacity);
-                                    });
-                                    devCapacityFeignClient.addList(list);
-                                    //3.更新设备模块个数
-                                    equipmentFeignClient.updateModuleNumber(nDid,(devInfo.size()-1));
-                                    //4.询问监测点pt/ct信息
-                                    askDevData(nDid,version,3,(res.getMid()+1));
-                                } else if (Objects.equals(res.getDid(),2)) {
-                                    log.info("{} 更新电网侧、负载侧监测点信息",nDid);
-                                    logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息");
-                                    //1.更新电网侧、负载侧监测点相关信息
-                                    devInfo.forEach(item->{
-                                        CsLineParam csLineParam = new CsLineParam();
-                                        csLineParam.setLineId(nDid.concat(item.getClDid().toString()));
-                                        csLineParam.setVolGrade(item.getVolGrade());
-                                        csLineParam.setPtRatio(item.getPtRatio());
-                                        csLineParam.setCtRatio(item.getCtRatio());
-                                        csLineParam.setConType(item.getConType());
-                                        csLineFeignClient.updateLine(csLineParam);
-                                    });
+                                    } else if (Objects.equals(res.getDid(),2)) {
+                                        log.info("{},设备数据应答--->更新电网侧、负载侧监测点信息", nDid);
+                                        logDto.setOperate(nDid + "更新电网侧、负载侧监测点信息");
+                                        //1.更新电网侧、负载侧监测点相关信息
+                                        devInfo.forEach(item->{
+                                            CsLineParam csLineParam = new CsLineParam();
+                                            csLineParam.setLineId(nDid.concat(item.getClDid().toString()));
+                                            csLineParam.setVolGrade(item.getVolGrade());
+                                            csLineParam.setPtRatio(item.getPtRatio());
+                                            csLineParam.setCtRatio(item.getCtRatio());
+                                            csLineParam.setConType(item.getConType());
+                                            csLineFeignClient.updateLine(csLineParam);
+                                        });
+                                    }
                                 }
-                            }
-                            break;
-                        default:
-                            break;
+                                break;
+                            case 48:
+                                log.info("询问装置项目列表");
+                                logDto.setUserName("运维管理员");
+                                logDto.setOperate("监测点:" + (nDid + rspDataDto.getClDid()) + "询问项目列表");
+                                List<RspDataDto.ProjectInfo> projectInfoList = JSON.parseArray(JSON.toJSONString(rspDataDto.getDataArray()), RspDataDto.ProjectInfo.class);
+                                String key3 = AppRedisKey.PROJECT_INFO + nDid + rspDataDto.getClDid();
+                                redisUtil.saveByKeyWithExpire(key3,projectInfoList,60L);
+                                break;
+                            default:
+                                break;
+                        }
+                    }
+                    break;
+                case 4663:
+                    log.info("装置操作应答");
+                    if (Objects.equals(res.getCode(),AccessEnum.SUCCESS.getCode())){
+                        String key4 = AppRedisKey.CONTROL + nDid;
+                        redisUtil.saveByKeyWithExpire(key4,"success",10L);
                     }
                     break;
                 default:
                     break;
             }
-            csLogsFeignClient.addUserLog(logDto);
+            //csLogsFeignClient.addUserLog(logDto);
         }
     }
 
@@ -460,8 +481,8 @@ public class MqttMessageHandler {
             case 4865:
                 //设置心跳时间，超时改为掉线
                 redisUtil.saveByKeyWithExpire("MQTT:" + nDid, Instant.now().toEpochMilli(),180L);
-                //装置改成在线
-                csEquipmentDeliveryService.updateRunStatusBynDid(nDid,AccessEnum.ONLINE.getCode());
+                //有心跳，则将装置改成在线
+                //csEquipmentDeliveryService.updateRunStatusBynDid(nDid,AccessEnum.ONLINE.getCode());
                 //处理心跳
                 ReqAndResDto.Res reqAndResParam = new ReqAndResDto.Res();
                 reqAndResParam.setMid(res.getMid());
@@ -502,10 +523,10 @@ public class MqttMessageHandler {
                 }
                 //判断事件类型
                 switch (dataDto.getMsg().getDataAttr()) {
-                    //暂态事件、录波处理
+                    //暂态事件、录波处理、工程信息
                     case 0:
-                        log.info("处理事件");
-                        log.info("事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
+                        log.info(nDid + "处理事件");
+                        //log.info(nDid + "事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
                         EventDto eventDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), EventDto.class);
                         JSONObject jsonObject0 = JSONObject.parseObject(JSON.toJSONString(eventDto));
                         AppEventMessage appEventMessage = JSONObject.toJavaObject(jsonObject0, AppEventMessage.class);
@@ -514,15 +535,21 @@ public class MqttMessageHandler {
                         break;
                     //实时数据
                     case 1:
-                        log.info("处理实时数据");
-                        break;
-                    //处理主动上送的统计数据
-                    case 2:
-                        log.info("处理统计数据");
+                        log.info(nDid + "处理实时数据");
                         JSONObject jsonObject2 = JSONObject.parseObject(JSON.toJSONString(dataDto));
                         AppAutoDataMessage appAutoDataMessage = JSONObject.toJavaObject(jsonObject2, AppAutoDataMessage.class);
                         appAutoDataMessage.setId(nDid);
-                        appAutoDataMessageTemplate.sendMember(appAutoDataMessage);
+                        rtFeignClient.analysis(appAutoDataMessage);
+                        break;
+                    //处理主动上送的统计数据
+                    case 2:
+                        JSONObject jsonObject3 = JSONObject.parseObject(JSON.toJSONString(dataDto));
+                        AppAutoDataMessage appAutoDataMessage2 = JSONObject.toJavaObject(jsonObject3, AppAutoDataMessage.class);
+                        appAutoDataMessage2.setId(nDid);
+                        appAutoDataMessage2.getMsg().getDataArray().forEach(item->{
+                            log.info(nDid + "处理统计数据" + item.getDataAttr());
+                        });
+                        appAutoDataMessageTemplate.sendMember(appAutoDataMessage2);
                         break;
                     default:
                         break;
@@ -553,12 +580,43 @@ public class MqttMessageHandler {
         //响应请求
         switch (fileDto.getType()){
             case 4657:
-                log.info("获取文件信息");
-                log.info("文件信息响应:" + fileDto);
-                appFileMessageTemplate.sendMember(appFileMessage);
+                log.info("获取文件信息" + fileDto);
+                if (Objects.equals(fileDto.getCode(),AccessEnum.SUCCESS.getCode())) {
+                    String key = AppRedisKey.PROJECT_INFO + nDid;
+                    if (Objects.isNull(fileDto.getMsg().getType())) {
+                        handleDefaultCase(fileDto, nDid);
+                    } else {
+                        if (Objects.equals("dir", fileDto.getMsg().getType())) {
+                            saveDirectoryInfo(fileDto.getMsg().getDirInfo(), key);
+                        } else if (Objects.equals("file", fileDto.getMsg().getType())){
+                            saveFileInfo(fileDto.getMsg().getFileInfo(), key);
+                            appFileMessageTemplate.sendMember(appFileMessage);
+                        }
+                    }
+                } else if (Objects.equals(fileDto.getCode(),AccessEnum.NOT_FIND.getCode())) {
+                    Object object = redisUtil.getObjectByKey("fileMid:" + nDid);
+                    if (Objects.nonNull(object)) {
+                        String data = redisUtil.getObjectByKey("fileMid:" + nDid).toString();
+                        String [] arr = data.split("concat");
+                        Integer mid = Integer.parseInt(arr[0]);
+                        String fileName = arr[1];
+                        if (Objects.equals(mid,fileDto.getMid())) {
+                            List<WaveTimeDto> list = channelObjectUtil.objectToList( redisUtil.getObjectByKey("eventFile:" + nDid),WaveTimeDto.class);
+                            list.removeIf(item -> item.getFileName().equals(fileName));
+                            redisUtil.saveByKey("eventFile:" + nDid, list);
+                            if (CollectionUtil.isNotEmpty(list)) {
+                                redisUtil.delete("handleEvent:" + nDid);
+                                waveFeignClient.channelWave(nDid);
+                            }
+                        }
+                    }
+                }
                 break;
             case 4658:
                 log.info("获取文件流信息");
+                FileRedisDto dto = new FileRedisDto();
+                dto.setCode(fileDto.getCode());
+                redisUtil.saveByKeyWithExpire(AppRedisKey.DOWNLOAD + fileDto.getMsg().getName() + fileDto.getMid(),dto,60L);
                 if (Objects.equals(fileDto.getCode(),AccessEnum.SUCCESS.getCode())){
                     appFileStreamMessageTemplate.sendMember(appFileMessage);
                 }
@@ -567,11 +625,71 @@ public class MqttMessageHandler {
                     log.info("需要缓存请求的文件信息");
                 }
                 break;
+            case 4659:
+                log.info("装置收到系统上传的文件");
+                FileRedisDto fileRedisDto = new FileRedisDto();
+                fileRedisDto.setCode(fileDto.getCode());
+                redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD.concat(nDid).concat(String.valueOf(fileDto.getMid())),fileRedisDto,10L);
+                redisUtil.saveByKeyWithExpire("uploading","uploading",20L);
+                break;
+            case 4660:
+                log.info("设备目录/文件删除应答");
+                redisUtil.saveByKeyWithExpire( "deleteDir"+ nDid,fileDto.getCode(),10L);
+                break;
+            case 4661:
+                log.info("设备目录创建应答");
+                redisUtil.saveByKeyWithExpire( "createDir"+ nDid,fileDto.getCode(),10L);
+                break;
+            case 4662:
+                log.info("装置根目录应答");
+                redisUtil.saveByKeyWithExpire(AppRedisKey.DEVICE_ROOT_PATH + nDid,fileDto.getMsg().getName(),10L);
             default:
                 break;
         }
     }
 
+    /**
+     * 装置异常事件记录
+     * @param topic
+     * @param message
+     * @param version
+     * @param nDid
+     * @param payload
+     */
+    @MqttSubscribe(value = "/Dev/Error/{edgeId}",qos = 1)
+    @Transactional(rollbackFor = Exception.class)
+    public void devErrorInfo(String topic, MqttMessage message,  @NamedValue("version") String version, @NamedValue("edgeId") String nDid, @Payload String payload) {
+        //解析数据
+        Gson gson = new Gson();
+        //log.info(nDid + "事件报文为:" + new String(message.getPayload(), StandardCharsets.UTF_8));
+        EventDto eventDto = gson.fromJson(new String(message.getPayload(), StandardCharsets.UTF_8), EventDto.class);
+        JSONObject jsonObject0 = JSONObject.parseObject(JSON.toJSONString(eventDto));
+        AppEventMessage appEventMessage = JSONObject.toJavaObject(jsonObject0, AppEventMessage.class);
+        appEventMessage.setId(nDid);
+        appEventMessageTemplate.sendMember(appEventMessage);
+    }
+
+    private void saveDirectoryInfo(List<FileDto.DirInfo> dirInfo, String key) {
+        if (!CollectionUtil.isEmpty(dirInfo)) {
+            redisUtil.saveByKeyWithExpire(key, dirInfo, 60L);
+        }
+    }
+
+    private void saveFileInfo(FileDto.FileInfo fileInfo, String key) {
+        if (!Objects.isNull(fileInfo)) {
+            redisUtil.saveByKeyWithExpire(key, fileInfo, 60L);
+        }
+    }
+
+    private void handleDefaultCase(FileDto fileDto, String nDid) {
+        List<FileDto.DirInfo> list = fileDto.getMsg().getDirInfo();
+        String keyDir = AppRedisKey.PROJECT_INFO + nDid;
+        saveDirectoryInfo(list, keyDir);
+
+        FileDto.FileInfo fileInfo = fileDto.getMsg().getFileInfo();
+        String keyFile = AppRedisKey.FILE_INFO + nDid;
+        saveFileInfo(fileInfo, keyFile);
+    }
 
     /**
      * type含义
@@ -584,7 +702,7 @@ public class MqttMessageHandler {
         reqAndResParam.setMid(mid);
         reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
         reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_6.getCode()));
-        reqAndResParam.setExpire(1);
+        reqAndResParam.setExpire(-1);
         AskDataDto askDataDto = new AskDataDto();
         askDataDto.setDataAttr(0);
         askDataDto.setOperate(1);
@@ -592,7 +710,7 @@ public class MqttMessageHandler {
         askDataDto.setEndTime(-1);
         switch (type) {
             case 1:
-                reqAndResParam.setDid(2);
+                reqAndResParam.setDid(0);
                 askDataDto.setCldid(0);
                 askDataDto.setDataType(1);
                 break;
@@ -606,13 +724,18 @@ public class MqttMessageHandler {
                 askDataDto.setCldid(-1);
                 askDataDto.setDataType(2);
                 break;
+            //询问工程信息
+            case 48:
+                reqAndResParam.setDid(1);
+                askDataDto.setCldid(1);
+                askDataDto.setDataType(48);
+                break;
             default:
                 break;
         }
         reqAndResParam.setMsg(askDataDto);
-        log.info("askDevData的请求报文:" + new Gson().toJson(reqAndResParam));
+        //log.info("askDevData的请求报文:" + new Gson().toJson(reqAndResParam));
         publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false);
     }
 
-
 }

iot-access/access-boot/src/main/java/com/njcn/access/listener/RedisKeyExpirationListener.java

@@ -1,16 +1,26 @@
 package com.njcn.access.listener;
 
 import com.njcn.access.enums.AccessEnum;
+import com.njcn.access.pojo.dto.NoticeUserDto;
 import com.njcn.access.pojo.po.CsDeviceOnlineLogs;
 import com.njcn.access.service.ICsDeviceOnlineLogsService;
 import com.njcn.access.service.ICsEquipmentDeliveryService;
 import com.njcn.access.service.ICsTopicService;
 import com.njcn.access.service.impl.CsDeviceServiceImpl;
+import com.njcn.access.utils.MqttUtil;
+import com.njcn.access.utils.SendMessageUtil;
 import com.njcn.common.pojo.dto.DeviceLogDTO;
-import com.njcn.common.pojo.enums.response.CommonResponseEnum;
-import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.api.CsDeviceUserFeignClient;
+import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.api.CsLogsFeignClient;
-import com.njcn.web.utils.RequestUtil;
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.pojo.dto.DevDetailDTO;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.redis.pojo.enums.AppRedisKey;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.user.api.AppUserFeignClient;
+import com.njcn.user.api.UserFeignClient;
+import com.njcn.user.pojo.po.User;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.redis.connection.Message;
@@ -20,10 +30,14 @@ import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
-import java.util.concurrent.ScheduledThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 /**
  * @author xy
@@ -36,23 +50,39 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private ICsTopicService csTopicService;
-
     @Resource
     private ICsEquipmentDeliveryService csEquipmentDeliveryService;
-
     @Resource
     private CsDeviceServiceImpl csDeviceService;
-
     @Resource
     private CsLogsFeignClient csLogsFeignClient;
-
     @Resource
     private ICsDeviceOnlineLogsService onlineLogsService;
+    @Resource
+    private MqttUtil mqttUtil;
+    @Resource
+    private CsLedgerFeignClient csLedgerFeignclient;
+    @Resource
+    private EquipmentFeignClient equipmentFeignClient;
+    @Resource
+    private AppUserFeignClient appUserFeignClient;
+    @Resource
+    private CsDeviceUserFeignClient csDeviceUserFeignClient;
+    @Resource
+    private UserFeignClient userFeignClient;
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private SendMessageUtil sendMessageUtil;
+    private final Object lock = new Object();
 
     public RedisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
         super(listenerContainer);
     }
 
+    //最大告警次数
+    private static int MAX_WARNING_TIMES = 0;
+
     /**
      * 针对redis数据失效事件，进行数据处理
      * 注意message.toString()可以获取失效的key
@@ -62,58 +92,167 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
         if (StringUtils.isBlank(message.toString())) {
             return;
         }
-        //日志实体
-        DeviceLogDTO logDto = new DeviceLogDTO();
-        try{
-            logDto.setUserName(RequestUtil.getUsername());
-            logDto.setLoginName(RequestUtil.getLoginName());
-        } catch (Exception e) {
-            logDto.setUserName("redis失效存储");
-            logDto.setLoginName(null);
-        }
-        logDto.setResult(1);
         //判断失效的key是否为MQTT消费端存入的
         String expiredKey = message.toString();
         if(expiredKey.startsWith("MQTT:")){
-
             String nDid = expiredKey.split(":")[1];
-            //装置下线
-            csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
-            logDto.setOperate("装置掉线,装置为:" + nDid);
-            csLogsFeignClient.addUserLog(logDto);
-            //记录装置下线日志
-            CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
-            record.setOfflineTime(LocalDateTime.now());
-            onlineLogsService.updateById(record);
-            try {
-                //装置掉线等待10分钟,发起接入请求
-                String version = csTopicService.getVersion(nDid);
-                log.info("装置掉线10分钟发送接入请求，接入失败则进入定时接入任务");
-                Thread.sleep(600000);
-                csDeviceService.devAccess(nDid,version);
-                //接入再次失败，则定时发起接入请求
-                Thread.sleep(1000);
-                Integer status = csEquipmentDeliveryService.queryEquipmentBynDid(nDid).getRunStatus();
-                if (!Objects.isNull(status) && Objects.equals(status,AccessEnum.OFFLINE.getCode())){
-                    final int[] mid = {2};
-                    ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2);
-                    ScheduledFuture<?> runnableFuture = executor.scheduleAtFixedRate(() -> {
-                        log.info("定时发送接入请求...");
-                        csDeviceService.devAccessMid(nDid,version, mid[0]);
-                        Integer status2 = csEquipmentDeliveryService.queryEquipmentBynDid(nDid).getRunStatus();
-                        if (Objects.equals(status2,AccessEnum.ONLINE.getCode())){
-                            throw new BusinessException(CommonResponseEnum.SUCCESS);
-                        } else {
-                            mid[0] = mid[0] + 1;
-                        }
-                        //记录日志
-                        logDto.setOperate("装置掉线,定时发送接入请求，装置为:" + nDid + ",请求的时间戳为:" + System.currentTimeMillis());
-                        csLogsFeignClient.addUserLog(logDto);
-                    }, 1, 600, TimeUnit.SECONDS);
-                }
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
+            String version = csTopicService.getVersion(nDid);
+            ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+            executeMainTask(scheduler,nDid,version);
         }
     }
+
+    //主任务
+    //1.装置心跳断连
+    //2.MQTT客户端不在线
+    private void executeMainTask(ScheduledExecutorService scheduler, String nDid, String version) {
+        log.info("正在执行主任务...");
+        DeviceLogDTO logDto = new DeviceLogDTO();
+        logDto.setUserName("运维管理员");
+        logDto.setLoginName("njcnyw");
+        //判断mqtt
+        String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+        boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+        //心跳异常，但是客户端在线，则发送接入请求
+        if (mqttClient) {
+            csDeviceService.devAccessAskTemplate(nDid,version,1);
+            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
+            try {
+                Thread.sleep(5000);
+                Object object = redisUtil.getObjectByKey("online" + nDid);
+                if (Objects.nonNull(object)) {
+                    scheduler.shutdown();
+                    logDto.setOperate(nDid + "客户端在线重连成功");
+                } else {
+                    //装置下线
+                    csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
+                    startScheduledTask(scheduler,nDid,version);
+                    logDto.setOperate(nDid +"客户端离线进入定时任务");
+                }
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+            csLogsFeignClient.addUserLog(logDto);
+        }
+        //客户端不在线则修改装置状态，进入定时任务
+        else {
+            //装置下线
+            csEquipmentDeliveryService.updateRunStatusBynDid(nDid, AccessEnum.OFFLINE.getCode());
+            logDto.setOperate(nDid +"主任务执行失败，装置下线，进入定时任务");
+            csLogsFeignClient.addUserLog(logDto);
+            log.info("客户端离线进入定时任务...");
+            startScheduledTask(scheduler,nDid,version);
+        }
+    }
+
+    private void startScheduledTask(ScheduledExecutorService scheduler, String nDid, String version) {
+        synchronized (lock) {
+            NoticeUserDto dto = sendOffLine(nDid);
+            sendMessageUtil.sendEventToUser(dto);
+            addLogs(dto);
+            String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+            ScheduledFuture<?> future = scheduler.scheduleAtFixedRate(() -> {
+                log.info(nDid + "执行重连定时任务...");
+                DeviceLogDTO logDto = new DeviceLogDTO();
+                logDto.setOperate(nDid + "重连定时任务");
+                //判断客户端
+                boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+                if (mqttClient) {
+                    csDeviceService.devAccessAskTemplate(nDid,version,1);
+                    try {
+                        Thread.sleep(5000);
+                        Integer status  = csEquipmentDeliveryService.queryEquipmentBynDid(nDid).getRunStatus();
+                        if (Objects.equals(status,AccessEnum.ONLINE.getCode())){
+                            logDto.setResult(1);
+                            scheduler.shutdown();
+                            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,1);
+                            return;
+                        } else {
+                            logDto.setResult(0);
+                            //一个小时未连接上，则推送告警消息
+                            MAX_WARNING_TIMES++;
+                            if (MAX_WARNING_TIMES == 30) {
+                                NoticeUserDto dto2 = sendConnectFail(nDid);
+                                sendMessageUtil.sendEventToUser(dto2);
+                                addLogs(dto2);
+                            }
+                            //记录装置掉线时间
+                            CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
+                            record.setOfflineTime(LocalDateTime.now());
+                            onlineLogsService.updateById(record);
+                        }
+                    } catch (InterruptedException e) {
+                        throw new RuntimeException(e);
+                    }
+                } else {
+                    //一个小时未连接上，则推送告警消息
+                    MAX_WARNING_TIMES++;
+                    if (MAX_WARNING_TIMES == 30) {
+                        NoticeUserDto dto2 = sendConnectFail(nDid);
+                        sendMessageUtil.sendEventToUser(dto2);
+                        addLogs(dto2);
+                    }
+                    logDto.setResult(0);
+                    //记录装置掉线时间
+                    CsDeviceOnlineLogs record = onlineLogsService.findLastData(nDid);
+                    record.setOfflineTime(LocalDateTime.now());
+                    onlineLogsService.updateById(record);
+                }
+                csLogsFeignClient.addUserLog(logDto);
+            }, 0, 2, TimeUnit.MINUTES);
+        }
+    }
+
+    //掉线通知
+    private NoticeUserDto sendOffLine(String nDid) {
+        NoticeUserDto dto = new NoticeUserDto();
+        dto.setTitle("设备离线");
+        CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(nDid).getData();
+        DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(po.getId()).getData();
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime localDateTime = LocalDateTime.now();
+        String dateStr = localDateTime.format(fmt);
+        String content = String.format(devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + dateStr + "离线");
+        dto.setContent(content);
+        dto.setPushClientId(getEventUser(po.getId(),true));
+        return dto;
+    }
+
+    //重连失败通知
+    private NoticeUserDto sendConnectFail(String nDid) {
+        NoticeUserDto dto = new NoticeUserDto();
+        dto.setTitle("设备接入失败");
+        CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(nDid).getData();
+        DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(po.getId()).getData();
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime localDateTime = LocalDateTime.now();
+        String dateStr = localDateTime.format(fmt);
+        String content = String.format(devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + dateStr + "多次接入失败");
+        dto.setContent(content);
+        dto.setPushClientId(getEventUser(po.getId(),false));
+        return dto;
+    }
+
+    //日志记录
+    private void addLogs(NoticeUserDto noticeUserDto) {
+        DeviceLogDTO dto = new DeviceLogDTO();
+        dto.setUserName("运维管理员");
+        dto.setLoginName("njcnyw");
+        dto.setOperate(noticeUserDto.getContent());
+        csLogsFeignClient.addUserLog(dto);
+    }
+
+    /**
+     * 获取所有需要推送的用户id
+     */
+    public List<String> getEventUser(String devId, boolean isAdmin) {
+        List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
+        List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList());
+        if (isAdmin) {
+            List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
+            adminList.addAll(list);
+        }
+        List<User> users = userFeignClient.appuserByIdList(adminList).getData();
+        return users.stream().map(User::getDevCode).filter(Objects::nonNull).filter(StringUtils::isNotBlank).distinct().collect(Collectors.toList());
+    }
 }

iot-access/access-boot/src/main/java/com/njcn/access/mapper/CsSoftInfoMapper.java

@@ -1,16 +0,0 @@
-package com.njcn.access.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
-
-/**
- * <p>
- * 系统软件表 Mapper 接口
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-public interface CsSoftInfoMapper extends BaseMapper<CsSoftInfoPO> {
-
-}

iot-access/access-boot/src/main/java/com/njcn/access/mapper/OverlimitMapper.java

@@ -0,0 +1,21 @@
+package com.njcn.access.mapper;
+
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.biz.pojo.po.Overlimit;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xy
+ */
+@DS("sjzx")
+@Mapper
+public interface OverlimitMapper extends BaseMapper<Overlimit> {
+
+}

iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessApplicationRunner.java

@@ -4,6 +4,8 @@ import com.njcn.access.service.ICsEquipmentDeliveryService;
 import com.njcn.access.service.ICsTopicService;
 import com.njcn.access.service.impl.CsDeviceServiceImpl;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.redis.pojo.enums.AppRedisKey;
+import com.njcn.redis.utils.RedisUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -12,6 +14,9 @@ import org.springframework.stereotype.Component;
 import javax.annotation.Resource;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 类的介绍：用来重新发起设备的接入，存在程序意外停止了，缓存失效导致无法更新装置的状态，所以需要在程序启动时发起设备的接入
@@ -25,23 +30,31 @@ import java.util.Objects;
 public class AccessApplicationRunner implements ApplicationRunner {
 
     @Resource
-    private CsDeviceServiceImpl csDeviceService;
-
-    @Resource
-    private ICsTopicService csTopicService;
-
+    private RedisUtil redisUtil;
     @Resource
     private ICsEquipmentDeliveryService csEquipmentDeliveryService;
+    @Resource
+    private ICsTopicService csTopicService;
+    @Resource
+    private CsDeviceServiceImpl csDeviceService;
+    ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+    private static final long ACCESS_TIME = 60L;
 
     @Override
-    public void run(ApplicationArguments args){
-        List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
-        list.forEach(item->{
-            String version = csTopicService.getVersion(item.getNdid());
-            if (!Objects.isNull(version)){
-                csDeviceService.devAccess(item.getNdid(),version);
-            }
-        });
+    public void run(ApplicationArguments args) {
+        //项目启动60s后发起自动接入
+        Runnable task = () -> {
+            List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
+            list.forEach(item->{
+                String version = csTopicService.getVersion(item.getNdid());
+                if (!Objects.isNull(version)){
+                    csDeviceService.devAccessAskTemplate(item.getNdid(),version,1);
+                    redisUtil.saveByKey(AppRedisKey.DEVICE_MID + item.getNdid(),1);
+                }
+            });
+        };
+        scheduler.schedule(task, ACCESS_TIME, TimeUnit.SECONDS);
+        // 关闭调度程序
+        scheduler.shutdown();
     }
-
 }

iot-access/access-boot/src/main/java/com/njcn/access/runner/AccessScheduledTask.java

@@ -1,50 +0,0 @@
-package com.njcn.access.runner;
-
-import com.njcn.access.service.ICsEquipmentDeliveryService;
-import com.njcn.access.service.ICsTopicService;
-import com.njcn.access.service.impl.CsDeviceServiceImpl;
-import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.List;
-import java.util.Objects;
-
-/**
- * 类的介绍：防止设备掉线 系统未能调整，做一个定时任务，每天凌晨将所有设备重新接入
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/8/28 14:21
- */
-@Component
-@Slf4j
-public class AccessScheduledTask {
-
-    @Resource
-    private CsDeviceServiceImpl csDeviceService;
-
-    @Resource
-    private ICsTopicService csTopicService;
-
-    @Resource
-    private ICsEquipmentDeliveryService csEquipmentDeliveryService;
-
-    /**
-     * {秒数} {分钟} {小时} {日期} {月份} {星期} {年份(可为空)}
-     */
-    @Scheduled(cron = "0 0 0 * * ?")
-    public void executeTask() {
-        log.info("每日凌晨定时任务执行");
-        List<CsEquipmentDeliveryPO> list = csEquipmentDeliveryService.getAll();
-        list.forEach(item->{
-            String version = csTopicService.getVersion(item.getNdid());
-            if (!Objects.isNull(version)){
-                csDeviceService.devAccess(item.getNdid(),version);
-            }
-        });
-    }
-
-}

iot-access/access-boot/src/main/java/com/njcn/access/service/AskDeviceDataService.java

@@ -0,0 +1,24 @@
+package com.njcn.access.service;
+
+/**
+ * @author xy
+ */
+public interface AskDeviceDataService {
+
+    void askDeviceRootPath(String nDid);
+
+    void askDeviceFileOrDir(String nDid, String name);
+
+    boolean downloadFile(String nDid, String name, Integer size, String fileCheck);
+
+    void rebootDevice(String nDid);
+
+    void createFolder(String nDid, String path);
+
+    void deleteFolder(String nDid, String path);
+
+    /**
+     * 实时数据请求报文
+     */
+    void askRealData(String nDid, Integer idx, Integer size);
+}

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsDataSetService.java

@@ -26,4 +26,10 @@ public interface ICsDataSetService extends IService<CsDataSet> {
      */
     void addList(List<CsDataSet> list);
 
+    /**
+     * 根据模板id获取模板的数据集
+     * @param modelId 模板ID
+     */
+    List<CsDataSet> getDataSetData(String modelId);
+
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsDevModelRelationService.java

@@ -27,5 +27,12 @@ public interface ICsDevModelRelationService extends IService<CsDevModelRelationP
          */
         CsDevModelRelationPO addDevModelRelation(CsDevModelRelationAddParm addParm);
 
+        /**
+         * 根据装置id删除模板信息
+         */
+        void deleteByDeviceId(String deviceId);
+
+        void addRelation(CsDevModelRelationPO po);
+
 
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsDevModelService.java

@@ -26,4 +26,11 @@ public interface ICsDevModelService {
      */
     void addDict(MultipartFile file);
 
+    /**
+     * 上传文件至装置
+     * 更新程序、更新模板
+     */
+    void uploadDevFile(MultipartFile file, String id, String path);
+
+
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsDeviceService.java

@@ -26,7 +26,7 @@ public interface ICsDeviceService {
     Object getModel(String nDid);
 
     /**
-     * MQTT连接成功，获取装置所用的模板信息
+     * 直连设备接入
      * @param devAccessParam
      */
     void devAccess(DevAccessParam devAccessParam);
@@ -36,4 +36,22 @@ public interface ICsDeviceService {
      * @param nDid
      */
     void resetFactory(String nDid);
+
+    /**
+     * 手动发起接入
+     * @param nDid
+     */
+    boolean manualAccess(String nDid);
+
+    /**
+     * 直连设备注册
+     * @param nDid 设备识别码
+     */
+    String wlDevRegister(String nDid);
+
+    /**
+     * 直连设备接入
+     * @param nDid 设备识别码
+     */
+    void wlAccess(String nDid);
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsEquipmentDeliveryService.java

@@ -1,17 +1,9 @@
 package com.njcn.access.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.access.pojo.param.DeviceStatusParam;
-import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAddParm;
-import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryAuditParm;
-import com.njcn.csdevice.pojo.param.CsEquipmentDeliveryQueryParm;
-import com.njcn.csdevice.pojo.param.ProjectEquipmentQueryParm;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
-import com.njcn.csdevice.pojo.vo.DeviceManagerVO;
-import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
 
 import java.util.List;
 
@@ -44,6 +36,12 @@ public interface ICsEquipmentDeliveryService extends IService<CsEquipmentDeliver
      */
     void updateRunStatusBynDid(String nDid,Integer id);
 
+    /**
+     * 根据网关id修改设备当前流程
+     * @param nDid 网关id
+     */
+    void updateProcessBynDid(String nDid,Integer processId);
+
     /**
      * 根据ndid查询装置信息
      * @param nDid

iot-access/access-boot/src/main/java/com/njcn/access/service/ICsSoftInfoService.java

@@ -1,16 +0,0 @@
-package com.njcn.access.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
-
-/**
- * <p>
- * 系统软件表 服务类
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-public interface ICsSoftInfoService extends IService<CsSoftInfoPO> {
-
-}

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/AskDeviceDataServiceImpl.java

@@ -0,0 +1,254 @@
+package com.njcn.access.service.impl;
+
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.github.tocrhz.mqtt.publisher.MqttPublisher;
+import com.njcn.access.api.CsTopicFeignClient;
+import com.njcn.access.enums.AccessEnum;
+import com.njcn.access.enums.TypeEnum;
+import com.njcn.access.pojo.dto.AskDataDto;
+import com.njcn.access.pojo.dto.ControlDto;
+import com.njcn.access.pojo.dto.ReqAndResDto;
+import com.njcn.access.service.AskDeviceDataService;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.enums.AlgorithmResponseEnum;
+import com.njcn.redis.pojo.enums.AppRedisKey;
+import com.njcn.redis.utils.RedisUtil;
+import lombok.RequiredArgsConstructor;
+import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import java.util.Objects;
+
+/**
+ * @author xy
+ */
+@Service
+@RequiredArgsConstructor
+public class AskDeviceDataServiceImpl implements AskDeviceDataService {
+
+    private static final Logger log = LoggerFactory.getLogger(AskDeviceDataServiceImpl.class);
+    private final MqttPublisher publisher;
+    private final CsTopicFeignClient csTopicFeignClient;
+    private final RedisUtil redisUtil;
+    private static Integer mid = 1;
+    private static Integer range = 51200;
+
+    @Override
+    public void askDeviceRootPath(String nDid) {
+        Object object = getDeviceMid(nDid);
+        if (!Objects.isNull(object)) {
+            mid = (Integer) object;
+        }
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(1);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setExpire(-1);
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_13.getCode()));
+        String version = getVersion(nDid);
+        publisher.send("/Pfm/DevFileCmd/" + version + "/" + nDid, new Gson().toJson(reqAndResParam), 1, false);
+        mid = mid + 1;
+        if (mid > 10000) {
+            mid = 1;
+        }
+        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+    }
+
+    @Override
+    public void askDeviceFileOrDir(String nDid, String name) {
+        Object object = getDeviceMid(nDid);
+        if (!Objects.isNull(object)) {
+            mid = (Integer) object;
+        }
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(1);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setExpire(-1);
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_8.getCode()));
+        String json = String.format("{\"Name\":\"%s\"}", name);
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        reqAndResParam.setMsg(jsonObject);
+        String version = getVersion(nDid);
+        publisher.send("/Pfm/DevFileCmd/" + version + "/" + nDid, new Gson().toJson(reqAndResParam), 1, false);
+        mid = mid + 1;
+        if (mid > 10000) {
+            mid = 1;
+        }
+        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+    }
+
+    @Override
+    public boolean downloadFile(String nDid, String name, Integer size, String fileCheck) {
+        boolean result = true;
+        try {
+            redisUtil.saveByKeyWithExpire("fileDowning:"+nDid,"fileDowning",120L);
+            redisUtil.saveByKeyWithExpire("fileCheck"+nDid+name,fileCheck,120L);
+            Object object = getDeviceMid(nDid);
+            if (!Objects.isNull(object)) {
+                mid = (Integer) object;
+            }
+            ReqAndResDto.Req reqAndResParam = getAllPojo(mid,name);
+            publisher.send("/Pfm/DevFileCmd/V1/"+nDid,new Gson().toJson(reqAndResParam),1,false);
+            mid = mid + 1;
+            if (mid > 10000) {
+                mid = 1;
+            }
+            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+        } catch (Exception e) {
+            redisUtil.delete("fileDowning:"+nDid);
+            redisUtil.delete("fileCheck"+nDid+name);
+            throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR);
+        }
+        return result;
+    }
+
+    @Override
+    public void rebootDevice(String nDid) {
+        Object object = getDeviceMid(nDid);
+        if (!Objects.isNull(object)) {
+            mid = (Integer) object;
+        }
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(0);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setExpire(-1);
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_31.getCode()));
+        ControlDto controlDto = new ControlDto();
+        controlDto.setClDid(-1);
+        controlDto.setCmdType("reboot");
+        controlDto.setCmdParm("on");
+        reqAndResParam.setMsg(controlDto);
+        publisher.send("/Pfm/DevCmd/V1/" + nDid, new Gson().toJson(reqAndResParam), 1, false);
+        mid = mid + 1;
+        if (mid > 10000) {
+            mid = 1;
+        }
+        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+    }
+
+    @Override
+    public void createFolder(String nDid, String path) {
+        Object object = getDeviceMid(nDid);
+        if (!Objects.isNull(object)) {
+            mid = (Integer) object;
+        }
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(0);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setExpire(-1);
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_12.getCode()));
+        String json = String.format("{\"Name\":\"%s\"}", path);
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        reqAndResParam.setMsg(jsonObject);
+        publisher.send("/Pfm/DevFileCmd/V1/" + nDid, new Gson().toJson(reqAndResParam), 1, false);
+        mid = mid + 1;
+        if (mid > 10000) {
+            mid = 1;
+        }
+        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+    }
+
+    @Override
+    public void deleteFolder(String nDid, String path) {
+        Object object = getDeviceMid(nDid);
+        if (!Objects.isNull(object)) {
+            mid = (Integer) object;
+        }
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(0);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setExpire(-1);
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_11.getCode()));
+        String json = String.format("{\"Name\":\"%s\"}", path);
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        reqAndResParam.setMsg(jsonObject);
+        publisher.send("/Pfm/DevFileCmd/V1/" + nDid, new Gson().toJson(reqAndResParam), 1, false);
+        mid = mid + 1;
+        if (mid > 10000) {
+            mid = 1;
+        }
+        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+    }
+
+    @Override
+    public void askRealData(String nDid, Integer idx, Integer clDId) {
+        Object object = getDeviceMid(nDid);
+        if (!Objects.isNull(object)) {
+            mid = (Integer) object;
+        }
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_6.getCode()));
+        reqAndResParam.setExpire(-1);
+        //fixme 目前设备都是直连设备，因此did就是其本身，默认为1，后期涉及网关，此did是需要动态变化的
+        reqAndResParam.setDid(1);
+        AskDataDto askDataDto = new AskDataDto();
+        askDataDto.setCldid(clDId);
+        askDataDto.setDataAttr(1);
+        askDataDto.setDataType(4);
+        askDataDto.setOperate(1);
+        askDataDto.setStartTime(-1);
+        askDataDto.setEndTime(-1);
+        askDataDto.setRtDuration(30);
+        askDataDto.setDsNameIdx(idx);
+        reqAndResParam.setMsg(askDataDto);
+        log.info("askDevData的请求报文:" + new Gson().toJson(reqAndResParam));
+        publisher.send("/Pfm/DevCmd/V1/"+nDid, new Gson().toJson(reqAndResParam),1,false);
+        mid = mid + 1;
+        if (mid > 10000) {
+            mid = 1;
+        }
+        redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+    }
+
+
+    public Object getDeviceMid(String nDid) {
+        return redisUtil.getObjectByKey(AppRedisKey.DEVICE_MID + nDid);
+    }
+
+    public String getVersion(String nDid) {
+        return csTopicFeignClient.find(nDid).getData();
+    }
+
+    /**
+     * 全文件下载请求报文
+     */
+    public ReqAndResDto.Req getAllPojo(Integer mid, String fileName) {
+        String json;
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(0);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_9.getCode()));
+        reqAndResParam.setExpire(-1);
+        json = "{Name:\""+fileName+"\",TransferMode:"+(-1)+",Offset:"+(-1)+",Len:"+range+"}";
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        reqAndResParam.setMsg(jsonObject);
+        return reqAndResParam;
+    }
+
+
+    /**
+     * 文件下载请求报文
+     */
+    public ReqAndResDto.Req getPojo(Integer mid, String fileName, Integer step) {
+        String json;
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(0);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_9.getCode()));
+        reqAndResParam.setExpire(-1);
+        json = "{Name:\""+fileName+"\",TransferMode:"+1+",Offset:"+(step*range)+",Len:"+range+"}";
+        JSONObject jsonObject = JSONObject.fromObject(json);
+        reqAndResParam.setMsg(jsonObject);
+        return reqAndResParam;
+    }
+}

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDataSetServiceImpl.java

@@ -28,4 +28,12 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
     public void addList(List<CsDataSet> list) {
         this.saveBatch(list,1000);
     }
+
+    @Override
+    public List<CsDataSet> getDataSetData(String modelId) {
+        return this.lambdaQuery()
+                .eq(CsDataSet::getPid, modelId)
+                .and(item->item.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
+                .list();
+    }
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelRelationServiceImpl.java

@@ -1,6 +1,9 @@
 package com.njcn.access.service.impl;
 
+import cn.hutool.core.util.IdUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.access.mapper.CsDevModelRelationMapper;
 import com.njcn.access.service.ICsDevModelRelationService;
@@ -12,10 +15,13 @@ import com.njcn.csdevice.pojo.po.CsDevModelRelationPO;
 import com.njcn.csdevice.pojo.vo.CsDevModelRelationVO;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.BeanUtils;
+import org.springframework.cloud.commons.util.IdUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.time.LocalDateTime;
 import java.util.List;
+import java.util.UUID;
 import java.util.stream.Collectors;
 
 /**
@@ -38,7 +44,7 @@ public class CsDevModelRelationServiceImpl extends ServiceImpl<CsDevModelRelatio
         queryParm.setModelId (addParm.getModelId ());
         queryParm.setStatus ("1");
         List<CsDevModelRelationVO> csDevModelRelationVOS = this.queryDevModelRelation (queryParm);
-        if(csDevModelRelationVOS.size ()>0){
+        if(!csDevModelRelationVOS.isEmpty()){
             throw new BusinessException (AlgorithmResponseEnum.DATA_ERROR);
         }
         CsDevModelRelationPO csDevModelRelationPO = new CsDevModelRelationPO();
@@ -48,6 +54,25 @@ public class CsDevModelRelationServiceImpl extends ServiceImpl<CsDevModelRelatio
         return csDevModelRelationPO;
     }
 
+    @Override
+    public void deleteByDeviceId(String deviceId) {
+        LambdaQueryWrapper<CsDevModelRelationPO> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(CsDevModelRelationPO::getDevId, deviceId)
+                .eq (CsDevModelRelationPO::getStatus, 1);
+        this.baseMapper.delete(wrapper);
+    }
+
+    @Override
+    public void addRelation(CsDevModelRelationPO po) {
+        LambdaUpdateWrapper<CsDevModelRelationPO> wrapper = new LambdaUpdateWrapper<>();
+        wrapper.eq(CsDevModelRelationPO::getDevId, po.getDevId())
+                .eq(CsDevModelRelationPO::getDid, po.getDid())
+                .eq(CsDevModelRelationPO::getStatus, 1)
+                .set(CsDevModelRelationPO::getModelId,po.getModelId())
+                .set(CsDevModelRelationPO::getUpdateTime,po.getUpdateTime());
+        this.update(wrapper);
+    }
+
     public List<CsDevModelRelationVO> queryDevModelRelation(CsDevModelRelationQueryParm queryParm) {
         QueryWrapper<CsDevModelRelationPO> queryWrapper = new QueryWrapper<> ();
         queryWrapper.eq (StringUtils.isNotBlank (queryParm.getId ()),"id",queryParm.getId ()).

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDevModelServiceImpl.java

@@ -3,31 +3,39 @@ package com.njcn.access.service.impl;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.github.tocrhz.mqtt.publisher.MqttPublisher;
+import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.AccessResponseEnum;
 import com.njcn.access.enums.DataModel;
 import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.mapper.CsDevModelMapper;
+import com.njcn.access.pojo.dto.ReqAndResDto;
+import com.njcn.access.pojo.dto.UploadFileDto;
 import com.njcn.access.pojo.dto.data.*;
 import com.njcn.access.pojo.dto.devModel.*;
+import com.njcn.access.pojo.dto.file.FileRedisDto;
 import com.njcn.access.pojo.po.CsLineModel;
 import com.njcn.access.service.*;
+import com.njcn.access.utils.CRC32Utils;
 import com.njcn.access.utils.JsonUtil;
 import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLogsFeignClient;
 import com.njcn.csdevice.api.DevModelFeignClient;
+import com.njcn.csdevice.enums.AlgorithmResponseEnum;
+import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
-import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.api.EleEvtFeignClient;
-import com.njcn.system.api.EleWaveFeignClient;
-import com.njcn.system.api.EpdFeignClient;
+import com.njcn.redis.pojo.enums.AppRedisKey;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.system.api.*;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.param.CsWaveParam;
 import com.njcn.system.pojo.param.EleEpdPqdParam;
 import com.njcn.system.pojo.param.EleEvtParam;
 import com.njcn.system.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -53,30 +61,22 @@ import java.util.stream.Collectors;
 public class CsDevModelServiceImpl implements ICsDevModelService {
 
     private final FileStorageUtil fileStorageUtil;
-
     private final DevModelFeignClient devModelFeignClient;
-
     private final EpdFeignClient epdFeignClient;
-
     private final DicDataFeignClient dicDataFeignClient;
-
     private final EleEvtFeignClient eleEvtFeignClient;
-
     private final ICsDataSetService csDataSetService;
-
     private final ICsDataArrayService csDataArrayService;
-
     private final CsDevModelMapper csDevModelMapper;
-
     private final ICsLineModelService csLineModelService;
-
     private final ICsGroupService csGroupService;
-
     private final ICsGroArrService csGroArrService;
-
     private final CsLogsFeignClient csLogsFeignClient;
-
     private final EleWaveFeignClient waveFeignClient;
+    private final DictTreeFeignClient dictTreeFeignClient;
+    private final MqttPublisher publisher;
+    private final ICsTopicService csTopicService;
+    private final RedisUtil redisUtil;
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -96,7 +96,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
             String filePath = fileStorageUtil.uploadMultipart(file, OssPath.DEV_MODEL + templateDto.getDevType() + "_");
             //1.录入cs_dev_model表，记录装置型号和模板记录
             CsDevModelPO csDevModelPo = addCsDevModel(templateDto,filePath);
-            //2.录入数据集、详细数据(主设备、模块、监测设备)
+            //2.录入数据集、详细数据(主设备、模块、监测设备、便携式设备...)
             analysisDataSet(templateDto,csDevModelPo.getId());
             //3.录入监测点模板表(记录当前模板有几个监测点，治理类型的模板目前规定1个监测点，电能质量模板根据逻辑子设备来)
             addCsLineModel(templateDto,csDevModelPo.getId());
@@ -133,6 +133,151 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
         }
     }
 
+    @Override
+    public void uploadDevFile(MultipartFile file,String id,String path) {
+        Object object = redisUtil.getObjectByKey("uploading");
+        if (Objects.nonNull(object)) {
+            throw new BusinessException(AlgorithmResponseEnum.FILE_UPLOADING);
+        }
+        Object object2 = redisUtil.getObjectByKey("fileDowning:" + id);
+        if (Objects.nonNull(object2)) {
+            throw new BusinessException(AlgorithmResponseEnum.FILE_BUSY);
+        }
+        try {
+            byte[] bytes = file.getBytes();
+            int length = bytes.length;
+            //生成文件校验码
+            int crc = CRC32Utils.calculateCRC32(bytes,length,0xffffffff);
+            String hexString = String.format("%08X", crc);
+            //存储文件至文件服务器
+            fileStorageUtil.uploadMultipart(file, OssPath.SYSTEM_TO_DEV + file.getOriginalFilename() + "_");
+            //获取版本
+            String version = csTopicService.getVersion(id);
+            int cap = 50 * 1024;
+            //需要分片处理 一帧按50k大小传递
+            if (length > cap){
+                //需要循环的次数
+                int times = bytes.length / cap + 1;
+                for (int i = 1; i <= times; i++) {
+                    //发送数据给前端
+                    String json = "{fileName:"+file.getOriginalFilename()+",allStep:"+times+",nowStep:"+i+"}";
+                    publisher.send("/Web/Progress/" + id, new Gson().toJson(json), 1, false);
+                    DeviceLogDTO logDto = new DeviceLogDTO();
+                    byte[] lsBytes;
+                    if (length > 50*1024) {
+                        lsBytes = Arrays.copyOfRange(bytes, (i - 1) * cap, i * cap);
+                        ReqAndResDto.Req req = getPojo(i,path,file,bytes.length,lsBytes,(i-1)*cap,hexString);
+                        publisher.send("/Pfm/DevFileCmd/" + version + "/" + id, new Gson().toJson(req), 1, false);
+                        logDto.setOperate(id + "设备上送文件,这是第" + i + "帧");
+                        logDto.setResult(1);
+                        length = length - cap;
+                        //判断是否重发
+                        sendNextStep(logDto,path,file,bytes.length,lsBytes,(i-1)*cap,version,id,i,hexString,false);
+                        FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(i)));
+                        //重发之后判断继续循环还是跳出循环
+                        if (!Objects.isNull(fileRedisDto) && !Objects.equals(fileRedisDto.getCode(),200)) {
+                            redisUtil.delete("uploading");
+                            break;
+                        }
+                    } else {
+                        lsBytes = Arrays.copyOfRange(bytes, (i - 1) * cap, bytes.length);
+                        ReqAndResDto.Req req = getPojo(i,path,file,bytes.length,lsBytes,(i-1)*cap,hexString);
+                        publisher.send("/Pfm/DevFileCmd/" + version + "/" + id, new Gson().toJson(req), 1, false);
+                        logDto.setOperate(id + "设备上送文件，这是最后一帧，为第" + i + "帧");
+                        logDto.setResult(1);
+                        //判断是否重发
+                        sendNextStep(logDto,path,file,bytes.length,lsBytes,(i-1)*cap,version,id,i,hexString,true);
+                    }
+                    csLogsFeignClient.addUserLog(logDto);
+                }
+            } else {
+                String json = "{fileName:"+file.getOriginalFilename()+",allStep:\""+1+"\",nowStep:"+1+"}";
+                publisher.send("/Web/Progress", new Gson().toJson(json), 1, false);
+                ReqAndResDto.Req req = getPojo(1,path,file,length,bytes,0,hexString);
+                publisher.send("/Pfm/DevFileCmd/" + version + "/" + id, new Gson().toJson(req), 1, false);
+                DeviceLogDTO logDto = new DeviceLogDTO();
+                logDto.setOperate(id + "系统上送文件,当前文件只有1帧");
+                logDto.setResult(1);
+                csLogsFeignClient.addUserLog(logDto);
+                //判断是否重发
+                sendNextStep(logDto,path,file,length,bytes,0,version,id,1,hexString,false);
+            }
+        } catch (Exception e) {
+            DeviceLogDTO logDto = new DeviceLogDTO();
+            logDto.setResult(0);
+            logDto.setFailReason(AccessResponseEnum.UPLOAD_ERROR.getMessage());
+            csLogsFeignClient.addUserLog(logDto);
+            throw new BusinessException(AccessResponseEnum.UPLOAD_ERROR);
+        }
+    }
+
+    /**
+     * 上送文件至装置
+     */
+    public ReqAndResDto.Req getPojo(Integer mid, String path, MultipartFile file, Integer allLength, byte[] bytes, Integer offset, String fileCheck) {
+        //组装报文
+        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
+        reqAndResParam.setMid(mid);
+        reqAndResParam.setDid(0);
+        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
+        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_10.getCode()));
+        reqAndResParam.setExpire(-1);
+        UploadFileDto uploadFileDto = new UploadFileDto();
+        uploadFileDto.setName(path + "/" + file.getOriginalFilename());
+        uploadFileDto.setFileSize(allLength);
+        uploadFileDto.setOffset(offset);
+        uploadFileDto.setLen(bytes.length);
+        uploadFileDto.setData(Base64.getEncoder().encodeToString(bytes));
+        uploadFileDto.setFileCheck(fileCheck);
+        //生成当前帧文件校验码
+        int crc = CRC32Utils.calculateCRC32(bytes,bytes.length,0xffffffff);
+        String hexString = String.format("%08X", crc);
+        uploadFileDto.setStepFileCheck(hexString);
+        reqAndResParam.setMsg(uploadFileDto);
+        return reqAndResParam;
+    }
+
+    /**
+     * 根据装置响应来判断发送的内容
+     */
+    public void sendNextStep(DeviceLogDTO logDto, String path, MultipartFile file, int length, byte[] bytes, Integer offset, String version, String id, int mid, String fileCheck, boolean result) {
+        try {
+            for (int i = 0; i < 30; i++) {
+                if (result) {
+                    Thread.sleep(10000);
+                } else {
+                    Thread.sleep(1000);
+                }
+                FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(mid)));
+                if (Objects.isNull(fileRedisDto)) {
+                    FileRedisDto fileRedis = new FileRedisDto();
+                    fileRedis.setCode(400);
+                    redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(mid)),fileRedis,10L);
+                } else {
+                    if (Objects.equals(fileRedisDto.getCode(),200)) {
+                        break;
+                    } else {
+                        FileRedisDto fileRedis = new FileRedisDto();
+                        fileRedis.setCode(400);
+                        redisUtil.saveByKeyWithExpire(AppRedisKey.UPLOAD.concat(id).concat(String.valueOf(mid)),fileRedis,10L);
+                        ReqAndResDto.Req req = getPojo(mid,path,file,length,bytes,offset,fileCheck);
+                        publisher.send("/Pfm/DevFileCmd/" + version + "/" + id, new Gson().toJson(req), 1, false);
+                        logDto.setOperate(id + "系统上送文件,装置响应失败，重新发送，这是第" + (i+1) + "次");
+                        logDto.setResult(1);
+                        csLogsFeignClient.addUserLog(logDto);
+                    }
+                }
+            }
+        } catch (InterruptedException e) {
+            assert logDto != null;
+            logDto.setResult(0);
+            logDto.setFailReason(AccessResponseEnum.RELOAD_UPLOAD_ERROR.getMessage());
+            csLogsFeignClient.addUserLog(logDto);
+            throw new RuntimeException(e);
+        }
+    }
+
+
     /**
      * 新增cs_dev_model数据
      */
@@ -150,20 +295,33 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
             csLogsFeignClient.addUserLog(logDto);
             throw new BusinessException(AccessResponseEnum.MODEL_REPEAT);
         }
-        CsDevModelPO model = new CsDevModelPO();
-        model.setDevTypeName(templateDto.getDevType());
-        model.setName(templateDto.getDevType());
-        model.setVersionNo(templateDto.getVersion());
-        model.setVersionDate(Date.valueOf(templateDto.getTime()));
-        model.setFilePath(filePath);
-        model.setStatus ("1");
+//        CsDevModelPO model = new CsDevModelPO();
+//        model.setDevTypeName(templateDto.getDevType());
+//        model.setName(templateDto.getDevType());
+//        model.setVersionNo(templateDto.getVersion());
+//        model.setVersionDate(Date.valueOf(templateDto.getTime()));
+//        model.setFilePath(filePath);
+//        model.setStatus ("1");
+//        //fixme 先用数据类型来区分模板的类型
+//        if (templateDto.getDataList().contains("Apf") || templateDto.getDataList().contains("Dvr")){
+//            model.setType(0);
+//        } else {
+//            model.setType(1);
+//        }
+//        csDevModelMapper.insert(model);
+        CsDevModelAddParm csDevModelAddParm = new CsDevModelAddParm();
+        csDevModelAddParm.setDevTypeName(templateDto.getDevType());
+        csDevModelAddParm.setName(templateDto.getDevType());
+        csDevModelAddParm.setVersionNo(templateDto.getVersion());
+        csDevModelAddParm.setVersionDate(Date.valueOf(templateDto.getTime()));
+        csDevModelAddParm.setFilePath(filePath);
         //fixme 先用数据类型来区分模板的类型
         if (templateDto.getDataList().contains("Apf") || templateDto.getDataList().contains("Dvr")){
-            model.setType(0);
+            csDevModelAddParm.setType(0);
         } else {
-            model.setType(1);
+            csDevModelAddParm.setType(1);
         }
-        csDevModelMapper.insert(model);
+        CsDevModelPO model = devModelFeignClient.addDevModel(csDevModelAddParm).getData();
         csLogsFeignClient.addUserLog(logDto);
         return model;
     }
@@ -267,7 +425,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                                         eleEvtParam.setPid(dictId);
                                         eleEvtParam.setData(param.getData());
                                         eleEvtParam.setName(param.getName());
-                                        String showName = dataSetName(param.getName());
+                                        String showName = dataSetName(param.getName(),null);
                                         if (Objects.isNull(showName)){
                                             eleEvtParam.setShowName(param.getName());
                                         } else {
@@ -647,7 +805,7 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                                         CsWaveParam csWaveParam = new CsWaveParam();
                                         csWaveParam.setPid(dictId);
                                         csWaveParam.setName(param.getName());
-                                        String showName = dataSetName(param.getName());
+                                        String showName = dataSetName(param.getName(),null);
                                         if (Objects.isNull(showName)){
                                             csWaveParam.setShowName(param.getName());
                                         } else {
@@ -678,22 +836,30 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
         List<CsDataSet> setList = new ArrayList<>();
         List<CsDataArray> arrayList = new ArrayList<>();
         List<DataSetDto> dataSetList = templateDto.getDataSet();
+        String devType = templateDto.getDevType();
+        DictTreeVO dictTreeVO = dictTreeFeignClient.queryByCode(devType).getData();
+        if (Objects.isNull(dictTreeVO)){
+            throw new BusinessException(AccessResponseEnum.DEV_TYPE_NOT_FIND);
+        }
+        String code = dictTreeFeignClient.queryById(dictTreeVO.getPid()).getData().getCode();
         //逻辑设备录入
         if (CollectionUtil.isNotEmpty(dataSetList)){
             dataSetList.forEach(item1->{
                 String id = IdUtil.fastSimpleUUID();
-                CsDataSet CsDataSet = new CsDataSet();
-                CsDataSet.setId(id);
-                CsDataSet.setPid(pId);
-                CsDataSet.setName(item1.getName());
-                CsDataSet.setAnotherName(dataSetName(item1.getName()));
-                CsDataSet.setIdx(item1.getIdx());
-                CsDataSet.setPeriod(item1.getPeriod());
-                CsDataSet.setStoreFlag(item1.getStoreFlag());
-                CsDataSet.setDataList(String.join(",",templateDto.getDataList()));
-                CsDataSet.setType(0);
-                CsDataSet.setClDev(0);
-                setList.add(CsDataSet);
+                CsDataSet csDataSet = new CsDataSet();
+                csDataSet.setId(id);
+                csDataSet.setPid(pId);
+                csDataSet.setName(item1.getName());
+                csDataSet.setAnotherName(dataSetName(item1.getName(),code));
+                csDataSet.setIdx(item1.getIdx());
+                csDataSet.setPeriod(item1.getPeriod());
+                csDataSet.setStoreFlag(item1.getStoreFlag());
+                csDataSet.setDataList(String.join(",",templateDto.getDataList()));
+                csDataSet.setDataType(item1.getDataAttr());
+                csDataSet.setType(0);
+                csDataSet.setClDev(0);
+                csDataSet.setDataLevel(item1.getDataLevel());
+                setList.add(csDataSet);
                 List<DataArrayDto> list = item1.getDataArrayDtoList();
                 if(CollectionUtil.isNotEmpty(list)) {
                     int i = 0;
@@ -717,23 +883,25 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
                 if (CollectionUtil.isNotEmpty(clDataSetList)){
                     clDataSetList.forEach(item4->{
                         String id = IdUtil.fastSimpleUUID();
-                        CsDataSet CsDataSet = new CsDataSet();
-                        CsDataSet.setId(id);
-                        CsDataSet.setPid(pId);
-                        CsDataSet.setName(item4.getName());
-                        CsDataSet.setAnotherName(dataSetName(item4.getName()));
-                        CsDataSet.setIdx(item4.getIdx());
-                        CsDataSet.setPeriod(item4.getPeriod());
-                        CsDataSet.setStoreFlag(item4.getStoreFlag());
-                        CsDataSet.setDataList(String.join(",",item3.getDataList()));
+                        CsDataSet csDataSet = new CsDataSet();
+                        csDataSet.setId(id);
+                        csDataSet.setPid(pId);
+                        csDataSet.setName(item4.getName());
+                        csDataSet.setAnotherName(dataSetName(item4.getName(),code));
+                        csDataSet.setIdx(item4.getIdx());
+                        csDataSet.setPeriod(item4.getPeriod());
+                        csDataSet.setStoreFlag(item4.getStoreFlag());
+                        csDataSet.setDataList(String.join(",",item3.getDataList()));
+                        csDataSet.setDataLevel(item4.getDataLevel());
+                        csDataSet.setDataType(item4.getDataAttr());
                         //fixme 先用数据类型来区分模板的类型
                         if (item3.getDataList().contains("Apf") || item3.getDataList().contains("Dvr")){
-                            CsDataSet.setType(1);
+                            csDataSet.setType(1);
                         } else {
-                            CsDataSet.setType(2);
+                            csDataSet.setType(2);
                         }
-                        CsDataSet.setClDev(item3.getClDid());
-                        setList.add(CsDataSet);
+                        csDataSet.setClDev(item3.getClDid());
+                        setList.add(csDataSet);
 
                         List<DataArrayDto> list = item4.getDataArrayDtoList();
                         if(CollectionUtil.isNotEmpty(list)) {
@@ -1024,42 +1192,50 @@ public class CsDevModelServiceImpl implements ICsDevModelService {
     /**
      * 数据集名称调整
      */
-    public String dataSetName(String name){
-        String showName = null;
+    public String dataSetName(String name,String code){
+        String showName = name;
         switch (name) {
             //数据集
             case "Ds$Apf$Master$01":
-                showName = "APF模块数据";
+                showName = "APF模块数据模板";
                 break;
             case "Ds$Apf$module$01":
-                showName = "APF模块1数据";
+                showName = "APF模块1数据模板";
                 break;
             case "Ds$Apf$module$02":
-                showName = "APF模块2数据";
+                showName = "APF模块2数据模板";
                 break;
             case "Ds$Apf$module$03":
-                showName = "APF模块3数据";
+                showName = "APF模块3数据模板";
                 break;
             case "Ds$Apf$module$04":
-                showName = "APF模块4数据";
+                showName = "APF模块4数据模板";
                 break;
             case "Ds$Apf$module$05":
-                showName = "APF模块5数据";
+                showName = "APF模块5数据模板";
                 break;
             case "Ds$Apf$module$06":
-                showName = "APF模块6数据";
+                showName = "APF模块6数据模板";
                 break;
             case "Ds$Apf$module$07":
-                showName = "APF模块7数据";
+                showName = "APF模块7数据模板";
                 break;
             case "Ds$Apf$module$08":
-                showName = "APF模块8数据";
+                showName = "APF模块8数据模板";
                 break;
             case "Ds$Pqd$Stat$01":
-                showName = "电网侧数据";
+                if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode()) || Objects.isNull(code)){
+                    showName = "电网侧数据模板";
+                } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
+                    showName = "监测1#数据模板";
+                }
                 break;
             case "Ds$Pqd$Stat$02":
-                showName = "负载侧数据";
+                if (Objects.equals(code, DicDataEnum.CONNECT_DEV.getCode()) || Objects.isNull(code)){
+                    showName = "负载侧数据模板";
+                } else if (Objects.equals(code, DicDataEnum.PORTABLE.getCode())){
+                    showName = "监测2#数据模板";
+                }
                 break;
             //波形参数名称
             case "Wave_Param_Position":

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsDeviceServiceImpl.java

@@ -1,8 +1,7 @@
 package com.njcn.access.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.util.IdUtil;
-import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,23 +10,20 @@ import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.AccessResponseEnum;
 import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.param.DevAccessParam;
-import com.njcn.access.pojo.RspDataDto;
 import com.njcn.access.pojo.dto.AccessDto;
-import com.njcn.access.pojo.dto.AskDataDto;
 import com.njcn.access.pojo.dto.CsModelDto;
 import com.njcn.access.pojo.dto.ReqAndResDto;
 import com.njcn.access.pojo.param.DeviceStatusParam;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
 import com.njcn.access.service.*;
+import com.njcn.access.utils.ChannelObjectUtil;
 import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.csdevice.api.CsLogsFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
-import com.njcn.csdevice.api.ProcessFeignClient;
+import com.njcn.csdevice.api.*;
 import com.njcn.csdevice.pojo.param.CsDevModelRelationAddParm;
 import com.njcn.csdevice.pojo.param.CsLedgerParam;
+import com.njcn.csdevice.pojo.param.CsLineParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.redis.pojo.enums.AppRedisKey;
@@ -38,20 +34,14 @@ import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.pojo.po.SysDicTreePO;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
-import org.springframework.test.annotation.Rollback;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -63,43 +53,32 @@ import java.util.stream.Collectors;
  */
 @Service
 @AllArgsConstructor
+@Slf4j
 public class CsDeviceServiceImpl implements ICsDeviceService {
 
     private static final Logger logger = LoggerFactory.getLogger(CsDeviceServiceImpl.class);
 
     private final EquipmentFeignClient equipmentFeignClient;
-
     private final ICsEquipmentDeliveryService csEquipmentDeliveryService;
-
     private final DictTreeFeignClient dictTreeFeignClient;
-
     private final ICsLedgerService csLedgerService;
-
     private final ICsDevModelRelationService csDevModelRelationService;
-
     private final ICsLineService csLineService;
-
     private final  IAppLineTopologyDiagramService appLineTopologyDiagramService;
-
     private final ICsDeviceUserService csDeviceUserService;
-
     private final MqttPublisher publisher;
-
     private final RedisUtil redisUtil;
-
     private final MqttUtil mqttUtil;
-
     private final ICsTopicService csTopicService;
-
     private final DicDataFeignClient dicDataFeignClient;
-
     private final CsLogsFeignClient csLogsFeignClient;
-
     private final ProcessFeignClient processFeignClient;
-
     private final CsLinePOService csLinePOService;
-
     private final CsDeviceUserPOService csDeviceUserPOService;
+    private final ICsDataSetService csDataSetService;
+    private final ChannelObjectUtil channelObjectUtil;
+    private final CsLineFeignClient csLineFeignClient;
+    private final DataSetFeignClient dataSetFeignClient;
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
@@ -108,7 +87,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         DeviceLogDTO logDto = new DeviceLogDTO();
         logDto.setUserName(RequestUtil.getUserNickname());
         logDto.setLoginName(RequestUtil.getUsername());
-        logDto.setOperate("当前设备"+nDid+"状态判断");
+        logDto.setOperate("直连设备"+nDid+"注册");
         logDto.setResult(1);
         //1.判断nDid是否存在
         CsEquipmentDeliveryVO csEquipmentDeliveryVO = csEquipmentDeliveryService.queryEquipmentBynDid(nDid);
@@ -133,7 +112,14 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csLogsFeignClient.addUserLog(logDto);
             throw new BusinessException(AccessResponseEnum.DEV_IS_NOT_ZL);
         }
-        //3.判断客户端是否在线
+        //3.判断是否已经注册过
+        if (!Objects.isNull(csEquipmentDeliveryVO.getNdid()) && Objects.equals(type,csEquipmentDeliveryVO.getProcess()) && Objects.equals(AccessEnum.ACCESS.getCode(),csEquipmentDeliveryVO.getStatus())){
+            logDto.setResult(0);
+            logDto.setFailReason(AccessResponseEnum.NDID_SAME_STEP.getMessage());
+            csLogsFeignClient.addUserLog(logDto);
+            throw new BusinessException(AccessResponseEnum.NDID_SAME_STEP);
+        }
+        //4.判断客户端是否在线
         String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
         boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
         if (!mqttClient){
@@ -142,7 +128,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csLogsFeignClient.addUserLog(logDto);
             throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
         }
-        //4.判断当前流程是否是合法的
+        //5.判断当前流程是否是合法的
         if (csEquipmentDeliveryVO.getProcess() > type){
             logDto.setResult(0);
             logDto.setFailReason(AccessResponseEnum.PROCESS_SAME_ERROR.getMessage());
@@ -152,10 +138,10 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             logDto.setFailReason(AccessResponseEnum.PROCESS_MISSING_ERROR.getMessage());
             throw new BusinessException(AccessResponseEnum.PROCESS_MISSING_ERROR);
         }
-        //5.询问设备支持的主题信息
+        //6.询问设备支持的主题信息
         //将支持的主题入库
         askTopic(nDid);
-        //6.MQTT询问装置用的模板，并判断库中是否存在模板
+        //7.MQTT询问装置用的模板，并判断库中是否存在模板
         //存在则建立关系;不存在则告警出来
         SysDicTreePO dictData = dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevModel()).getData();
         if (Objects.isNull(dictData)){
@@ -179,7 +165,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         logDto.setResult(1);
         Object model = null;
         try {
-            Thread.sleep(1500);
+            Thread.sleep(3000);
             String key = AppRedisKey.LINE + nDid;
             model = redisUtil.getObjectByKey(key);
             if (Objects.isNull(model)){
@@ -202,7 +188,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         DeviceLogDTO logDto = new DeviceLogDTO();
         logDto.setUserName(RequestUtil.getUserNickname());
         logDto.setLoginName(RequestUtil.getUsername());
-        logDto.setOperate("设备"+devAccessParam.getNDid()+"注册");
+        logDto.setOperate("设备"+devAccessParam.getNDid()+"接入");
         logDto.setResult(1);
         try {
             //获取版本
@@ -218,7 +204,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             csLedgerParam.setLevel(2);
             csLedgerParam.setSort(0);
             csLedgerService.addLedgerTree(csLedgerParam);
-            List<CsModelDto> modelId = objectToList(redisUtil.getObjectByKey(AppRedisKey.MODEL + devAccessParam.getNDid()));
+            List<CsModelDto> modelId = channelObjectUtil.objectToList(redisUtil.getObjectByKey(AppRedisKey.MODEL + devAccessParam.getNDid()),CsModelDto.class);
             //2.新增装置-模板关系、获取电能质量的逻辑设备id
             for (CsModelDto item : modelId) {
                 CsDevModelRelationAddParm csDevModelRelationAddParm = new CsDevModelRelationAddParm();
@@ -234,20 +220,39 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                 CsLedgerParam param = new CsLedgerParam();
                 AppLineTopologyDiagramPO appLineTopologyDiagramPo = new AppLineTopologyDiagramPO();
                 po.setName(item.getName());
+                po.setDeviceId(vo.getId());
                 po.setPosition(item.getPosition());
                 po.setClDid(0);
                 if (Objects.equals(DicDataEnum.GRID_SIDE.getCode(),location)){
                     po.setLineId(devAccessParam.getNDid() + "1");
+                    String id = Objects.requireNonNull(modelId.stream().filter(it -> Objects.equals(it.getDid(), 2)).findFirst().orElse(null)).getModelId();
+                    po.setDataModelId(id);
+                    //获取模板下数据集
+                    List<CsDataSet> dataSets = csDataSetService.getDataSetData(id);
+                    String dataSetId = Objects.requireNonNull(dataSets.stream().filter(it -> Objects.equals(it.getClDev(), 1)&&Objects.equals(it.getType(), 2)).findFirst().orElse(null)).getId();
+                    po.setDataSetId(dataSetId);
                     param.setId(devAccessParam.getNDid() + "1");
                     appLineTopologyDiagramPo.setLineId(devAccessParam.getNDid() + "1");
                     po.setClDid(1);
                 } else if (Objects.equals(DicDataEnum.LOAD_SIDE.getCode(),location)){
                     po.setLineId(devAccessParam.getNDid() + "2");
+                    String id = Objects.requireNonNull(modelId.stream().filter(it -> Objects.equals(it.getDid(), 2)).findFirst().orElse(null)).getModelId();
+                    po.setDataModelId(id);
+                    //获取模板下数据集
+                    List<CsDataSet> dataSets = csDataSetService.getDataSetData(id);
+                    String dataSetId = Objects.requireNonNull(dataSets.stream().filter(it -> Objects.equals(it.getClDev(), 2)&&Objects.equals(it.getType(), 2)).findFirst().orElse(null)).getId();
+                    po.setDataSetId(dataSetId);
                     param.setId(devAccessParam.getNDid() + "2");
                     appLineTopologyDiagramPo.setLineId(devAccessParam.getNDid() + "2");
                     po.setClDid(2);
                 } else {
                     po.setLineId(devAccessParam.getNDid() + "0");
+                    String id = Objects.requireNonNull(modelId.stream().filter(it -> Objects.equals(it.getDid(), 1)).findFirst().orElse(null)).getModelId();
+                    po.setDataModelId(id);
+                    //获取模板下数据集
+                    List<CsDataSet> dataSets = csDataSetService.getDataSetData(id);
+                    String dataSetId = Objects.requireNonNull(dataSets.stream().filter(it -> Objects.equals(it.getClDev(), 0)&&Objects.equals(it.getType(), 0)).findFirst().orElse(null)).getId();
+                    po.setDataSetId(dataSetId);
                     param.setId(devAccessParam.getNDid() + "0");
                     appLineTopologyDiagramPo.setLineId(devAccessParam.getNDid() + "0");
                 }
@@ -273,6 +278,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
                 throw new BusinessException(AccessResponseEnum.LINE_POSITION_REPEAT);
             }
             csLineService.saveBatch(csLinePoList);
+            redisUtil.saveByKeyWithExpire("accessLineInfo:" + devAccessParam.getNDid(),csLinePoList,30L);
             //4.监测点拓扑图表录入关系
             appLineTopologyDiagramService.saveBatch(appLineTopologyDiagramPoList);
             //5.绑定装置和人的关系
@@ -285,8 +291,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
             //6.修改装置状态
             csEquipmentDeliveryService.updateStatusBynDid(devAccessParam.getNDid(), AccessEnum.REGISTERED.getCode());
             //7.发起自动接入请求
-            devAccess(devAccessParam.getNDid(),version);
-
+            devAccessAskTemplate(devAccessParam.getNDid(),version,1);
             //8.删除redis监测点模板信息
             redisUtil.delete(AppRedisKey.MODEL + devAccessParam.getNDid());
             redisUtil.delete(AppRedisKey.LINE + devAccessParam.getNDid());
@@ -356,26 +361,254 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         }
     }
 
-    public void devAccess(String nDid,String version) {
-        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
-        reqAndResParam.setMid(1);
-        reqAndResParam.setDid(0);
-        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
-        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_5.getCode()));
-        reqAndResParam.setExpire(-1);
-        logger.info("设备接入报文为:" + new Gson().toJson(reqAndResParam));
-        publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false);
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean manualAccess(String nDid) {
+        String version = csTopicService.getVersion(nDid);
+        return devAccessAskTemplate(nDid,version,1);
     }
 
-    public void devAccessMid(String nDid,String version,Integer mid) {
+    @Override
+    @Transactional(rollbackFor = {Exception.class})
+    public String wlDevRegister(String nDid) {
+        String result = "fail";
+        // 设备状态判断
+        checkDeviceStatus(nDid);
+        // 询问设备支持的主题信息，并将支持的主题入库
+        askAndStoreTopics(nDid);
+        // MQTT询问装置用的模板，并判断库中是否存在模板
+        checkDeviceModel(nDid);
+        // 根据模板接入设备
+        DeviceLogDTO logDto = new DeviceLogDTO();
+        logDto.setUserName(RequestUtil.getUserNickname());
+        logDto.setLoginName(RequestUtil.getUsername());
+        logDto.setOperate("便携式设备"+nDid+"注册、接入");
+        logDto.setResult(1);
+        try {
+            Thread.sleep(2000);
+            //获取版本
+            String version = csTopicService.getVersion(nDid);
+            CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
+            List<CsLinePO> csLinePoList = new ArrayList<>();
+            //1.录入装置台账信息
+            CsLedgerParam csLedgerParam = new CsLedgerParam();
+            csLedgerParam.setId(vo.getId());
+            csLedgerParam.setPid("0");
+            csLedgerParam.setName(vo.getName());
+            csLedgerParam.setLevel(2);
+            csLedgerParam.setSort(0);
+            csLedgerService.addLedgerTree(csLedgerParam);
+            //2.根据模板获取监测点个数，插入监测点表
+            Thread.sleep(2000);
+            List<CsModelDto> modelList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(AppRedisKey.MODEL + nDid),CsModelDto.class);
+            if (CollUtil.isEmpty(modelList)) {
+                throwExceptionAndLog(AccessResponseEnum.MODEL_ERROR, logDto);
+            }
+            List<CsDataSet> list = csDataSetService.getDataSetData(modelList.get(0).getModelId());
+            list.forEach(item->{
+                CsLinePO po = new CsLinePO();
+                po.setLineId(nDid + item.getClDev().toString());
+                po.setName(item.getClDev().toString() + "#监测点");
+                po.setStatus(1);
+                po.setClDid(item.getClDev());
+                po.setDeviceId(vo.getId());
+                po.setDataSetId(item.getId());
+                po.setDataModelId(item.getPid());
+                //防止主键重复
+                QueryWrapper<CsLinePO> qw = new QueryWrapper<>();
+                qw.eq("line_id",po.getLineId());
+                if(csLineService.getBaseMapper().selectList(qw).isEmpty()){
+                    csLinePoList.add(po);
+                }
+                //3.生成台账树监测点数据
+                CsLedgerParam param = new CsLedgerParam();
+                param.setId(nDid + item.getClDev().toString());
+                param.setPid(vo.getId());
+                param.setName(item.getClDev().toString() + "#监测点");
+                param.setLevel(3);
+                param.setSort(0);
+                csLedgerService.addLedgerTree(param);
+            });
+            csLineService.saveBatch(csLinePoList);
+            redisUtil.saveByKeyWithExpire("accessLineInfo:" + nDid,csLinePoList,30L);
+            //4.生成装置和模板的关系表
+            CsDevModelRelationAddParm csDevModelRelationAddParm = new CsDevModelRelationAddParm();
+            csDevModelRelationAddParm.setDevId(vo.getId());
+            csDevModelRelationAddParm.setModelId(modelList.get(0).getModelId());
+            csDevModelRelationAddParm.setDid(modelList.get(0).getDid());
+            csDevModelRelationService.addDevModelRelation(csDevModelRelationAddParm);
+            //5.发起自动接入请求
+            devAccessAskTemplate(nDid,version,1);
+            //6.修改流程,便携式设备接入成功即为实际环境
+            csEquipmentDeliveryService.updateProcessBynDid(nDid,4);
+            //7.存储日志
+            csLogsFeignClient.addUserLog(logDto);
+            //8.存储设备调试日志表
+            CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
+            csEquipmentProcess.setDevId(nDid);
+            csEquipmentProcess.setOperator(RequestUtil.getUserIndex());
+            csEquipmentProcess.setStartTime(LocalDateTime.now());
+            csEquipmentProcess.setEndTime(LocalDateTime.now());
+            csEquipmentProcess.setProcess(4);
+            csEquipmentProcess.setStatus(1);
+            processFeignClient.add(csEquipmentProcess);
+            //9.删除redis监测点模板信息
+            redisUtil.delete(AppRedisKey.MODEL + nDid);
+            redisUtil.delete(AppRedisKey.LINE + nDid);
+            //判断接入状态
+            Thread.sleep(5000);
+            Object object = redisUtil.getObjectByKey("online" + nDid);
+            if (Objects.nonNull(object)) {
+                result = "success";
+            }
+        } catch (Exception e) {
+            logDto.setResult(0);
+            logDto.setFailReason(e.getMessage());
+            csLogsFeignClient.addUserLog(logDto);
+            throw new BusinessException(AccessResponseEnum.ACCESS_ERROR);
+        }
+        return result;
+    }
+
+    @Override
+    public void wlAccess(String nDid) {
+        //设备状态判断
+        checkDeviceStatus(nDid);
+        //获取版本
+        String version = csTopicService.getVersion(nDid);
+        //发起接入请求
+        this.devAccessAskTemplate(nDid,version,1);
+    }
+
+    private void checkDeviceStatus(String nDid) {
+        DeviceLogDTO logDto = createLogDto("当前设备"+nDid+"状态判断");
+        CsEquipmentDeliveryVO csEquipmentDeliveryVO = csEquipmentDeliveryService.queryEquipmentBynDid(nDid);
+        if (Objects.isNull(csEquipmentDeliveryVO.getNdid())) {
+            throwExceptionAndLog(AccessResponseEnum.NDID_NO_FIND, logDto);
+        }
+        SysDicTreePO sysDicTreePo = dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevType()).getData();
+        if (Objects.isNull(sysDicTreePo)) {
+            throwExceptionAndLog(AccessResponseEnum.DEV_NOT_FIND, logDto);
+        }
+        String code = sysDicTreePo.getCode();
+        if (!Objects.equals(code, DicDataEnum.PORTABLE.getCode())) {
+            throwExceptionAndLog(AccessResponseEnum.DEV_IS_NOT_PORTABLE, logDto);
+        }
+        if (!mqttUtil.judgeClientOnline("NJCN-" + nDid.substring(nDid.length() - 6))) {
+            throwExceptionAndLog(AccessResponseEnum.MISSING_CLIENT, logDto);
+        }
+    }
+
+    private void askAndStoreTopics(String nDid) {
+        // 询问设备支持的主题信息
+        this.askTopic(nDid);
+    }
+
+    private void checkDeviceModel(String nDid) {
+        DeviceLogDTO logDto = createLogDto("MQTT询问装置用的模板，并判断库中是否存在模板");
+        CsEquipmentDeliveryVO csEquipmentDeliveryVO = csEquipmentDeliveryService.queryEquipmentBynDid(nDid);
+        SysDicTreePO dictData = dictTreeFeignClient.queryById(csEquipmentDeliveryVO.getDevModel()).getData();
+        if (Objects.isNull(dictData)) {
+            throwExceptionAndLog(AccessResponseEnum.DEV_MODEL_NOT_FIND, logDto);
+        }
+        String devModel = dictData.getCode();
+        zhiLianRegister(nDid,devModel);
+    }
+
+    private DeviceLogDTO createLogDto(String operate) {
+        DeviceLogDTO logDto = new DeviceLogDTO();
+        logDto.setUserName("运维管理员");
+        logDto.setLoginName("njcnyw");
+        logDto.setOperate(operate);
+        logDto.setResult(1);
+        return logDto;
+    }
+
+    private void throwExceptionAndLog(AccessResponseEnum responseEnum, DeviceLogDTO logDto) {
+        logDto.setResult(0);
+        logDto.setFailReason(responseEnum.getMessage());
+        csLogsFeignClient.addUserLog(logDto);
+        throw new BusinessException(responseEnum);
+    }
+
+    /**
+     * 装置重新接入系统，需要校验所用的模板
+     * @param nDid
+     * @param version
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public boolean devAccessAskTemplate(String nDid,String version,Integer mid) {
+        boolean result = false;
+        Map<Integer,String> modelMap = new HashMap<>();
+        try {
+            //删除缓存数据
+            redisUtil.delete(AppRedisKey.MODEL + nDid);
+            redisUtil.deleteKeysByString(AppRedisKey.DEV_MODEL);
+            //询问装置当前所用模板
+            publisher.send("/Pfm/DevCmd/"+version+"/"+nDid,new Gson().toJson(getJson(mid,TypeEnum.TYPE_3.getCode())),1,false);
+            //接收到模板，判断模板是否存在，替换模板，发起接入
+            Thread.sleep(2000);
+            List<CsModelDto> modelId = channelObjectUtil.objectToList(redisUtil.getObjectByKey(AppRedisKey.MODEL + nDid),CsModelDto.class);
+            if (CollUtil.isNotEmpty(modelId)) {
+                CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(nDid).getData();
+                //重新录入装置和模板关系信息
+                for (CsModelDto item : modelId) {
+                    CsDevModelRelationPO po = new CsDevModelRelationPO();
+                    po.setDevId(vo.getId());
+                    po.setModelId(item.getModelId());
+                    po.setDid(item.getDid());
+                    po.setUpdateTime(LocalDateTime.now());
+                    csDevModelRelationService.addRelation(po);
+                    modelMap.put(item.getType(),item.getModelId());
+                }
+                //修改监测点使用的模板和数据集
+                List<CsLinePO> lineList;
+                Object object = redisUtil.getObjectByKey("accessLineInfo:" + nDid);
+                if (Objects.isNull(object)) {
+                    lineList = csLineFeignClient.findByNdid(nDid).getData();
+                    for (CsLinePO item : lineList) {
+                        if (item.getClDid() == 0) {
+                            updateLineIds(modelMap.get(0),item.getClDid(),nDid);
+                        } else {
+                            updateLineIds(modelMap.get(1),item.getClDid(),nDid);
+                        }
+                    }
+                }
+                //发起接入
+                publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(getJson(mid,TypeEnum.TYPE_5.getCode())),1,false);
+                //录波任务倒计时
+                redisUtil.saveByKeyWithExpire("startFile:" + nDid,null,60L);
+                result = true;
+            }
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+        return result;
+    }
+
+    /**
+     * 组装报文
+     */
+    public ReqAndResDto.Req getJson(Integer mid, String code) {
         ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
         reqAndResParam.setMid(mid);
         reqAndResParam.setDid(0);
         reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
-        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_5.getCode()));
         reqAndResParam.setExpire(-1);
-        logger.info("设备接入报文为:" + new Gson().toJson(reqAndResParam));
-        publisher.send("/Pfm/DevCmd/"+version+"/"+nDid, new Gson().toJson(reqAndResParam),1,false);
+        reqAndResParam.setType(Integer.parseInt(code));
+        return reqAndResParam;
+    }
+
+    /**
+     * 修改监测点的模板id和数据集id
+     */
+    public void updateLineIds(String modelId, Integer clDid, String nDid) {
+        CsDataSet dataSet = dataSetFeignClient.getSetByModelId(modelId,clDid).getData().get(0);
+        CsLineParam csLineParam = new CsLineParam();
+        csLineParam.setLineId(nDid + clDid);
+        csLineParam.setDataSetId(dataSet.getId());
+        csLineParam.setModelId(modelId);
+        csLineFeignClient.updateIds(csLineParam);
     }
 
     /**
@@ -388,7 +621,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
         reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_1.getCode()));
         reqAndResParam.setExpire(-1);
-        logger.info("询问主题报文为:" + new Gson().toJson(reqAndResParam));
+        logger.info("询问主题报文为:{}", new Gson().toJson(reqAndResParam));
         publisher.send("/Pfm/DevTopic/"+nDid, new Gson().toJson(reqAndResParam),1,false);
     }
 
@@ -408,31 +641,7 @@ public class CsDeviceServiceImpl implements ICsDeviceService {
         accessDto.setNdid(nDid);
         accessDto.setDevType(devType);
         reqAndResParam.setMsg(accessDto);
-        logger.info("注册报文为:" + new Gson().toJson(reqAndResParam));
+        logger.info("注册报文为:{}", new Gson().toJson(reqAndResParam));
         publisher.send("/Pfm/DevReg/"+nDid, new Gson().toJson(reqAndResParam),1,false);
     }
-
-    public List<CsModelDto> objectToList(Object object) {
-        List<CsModelDto> urlList = new ArrayList<>();
-        if (object != null) {
-            if (object instanceof ArrayList<?>) {
-                for (Object o : (List<?>) object) {
-                    urlList.add((CsModelDto) o);
-                }
-            }
-        }
-        return urlList;
-    }
-
-    public List<RspDataDto.LdevInfo> objectToList2(Object object) {
-        List<RspDataDto.LdevInfo> urlList = new ArrayList<>();
-        if (object != null) {
-            if (object instanceof ArrayList<?>) {
-                for (Object o : (List<?>) object) {
-                    urlList.add((RspDataDto.LdevInfo) o);
-                }
-            }
-        }
-        return urlList;
-    }
 }

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -28,9 +28,9 @@ import java.util.Objects;
 public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliveryMapper, CsEquipmentDeliveryPO> implements ICsEquipmentDeliveryService {
 
     @Override
-    public void updateStatusBynDid(String nDId,Integer status) {
+    public void updateStatusBynDid(String nDid,Integer status) {
         LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
-        lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getStatus,status).eq(CsEquipmentDeliveryPO::getNdid,nDId);
+        lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getStatus,status).eq(CsEquipmentDeliveryPO::getNdid,nDid);
         this.update(lambdaUpdateWrapper);
     }
 
@@ -48,6 +48,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         this.update(lambdaUpdateWrapper);
     }
 
+    @Override
+    public void updateProcessBynDid(String nDid, Integer processId) {
+        LambdaUpdateWrapper<CsEquipmentDeliveryPO> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.set(CsEquipmentDeliveryPO::getProcess,processId).eq(CsEquipmentDeliveryPO::getNdid,nDid);
+        this.update(lambdaUpdateWrapper);
+    }
+
     @Override
     public CsEquipmentDeliveryVO queryEquipmentBynDid(String nDid) {
         CsEquipmentDeliveryVO result = new CsEquipmentDeliveryVO();

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsLedgerServiceImpl.java

@@ -33,7 +33,11 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
             csLedger.setPid("0");
             csLedger.setPids("0");
         } else {
-            csLedger.setPids(fatherCsLedger.getPids() + "," + csLedgerParam.getPid());
+            if (Objects.isNull(fatherCsLedger)) {
+                csLedger.setPids("0");
+            } else {
+                csLedger.setPids(fatherCsLedger.getPids() + "," + csLedgerParam.getPid());
+            }
         }
         this.save(csLedger);
         return csLedger;

iot-access/access-boot/src/main/java/com/njcn/access/service/impl/CsSoftInfoServiceImpl.java

@@ -1,20 +0,0 @@
-package com.njcn.access.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.njcn.access.mapper.CsSoftInfoMapper;
-import com.njcn.access.pojo.po.CsSoftInfoPO;
-import com.njcn.access.service.ICsSoftInfoService;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 系统软件表 服务实现类
- * </p>
- *
- * @author xuyang
- * @since 2023-08-09
- */
-@Service
-public class CsSoftInfoServiceImpl extends ServiceImpl<CsSoftInfoMapper, CsSoftInfoPO> implements ICsSoftInfoService {
-
-}

iot-access/access-boot/src/main/resources/bootstrap.yml

@@ -35,6 +35,10 @@ spring:
             refresh: true
   main:
     allow-bean-definition-overriding: true
+  servlet:
+    multipart:
+      max-file-size: 100MB
+      max-request-size: 100MB
 
 #项目日志的配置
 logging:

iot-access/access-boot/src/test/java/com/njcn/AppTest.java

@@ -14,6 +14,7 @@ import com.njcn.access.pojo.dto.ReqAndResDto;
 import com.njcn.access.pojo.dto.mqtt.MqttClientDto;
 import com.njcn.access.service.ICsEquipmentDeliveryService;
 import com.njcn.access.service.impl.CsDeviceServiceImpl;
+import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
@@ -74,23 +75,25 @@ public class AppTest
     @Resource
     private CsDeviceServiceImpl csDeviceService;
 
-    @Resource
     private RedisUtil redisUtil;
 
+    @Resource
+    private MqttUtil mqttUtil;
+
     @Test
     public void lossTest() {
-        String nDid = "0008C0A801C8";
-        Integer status = csEquipmentDeliveryService.queryEquipmentByndid(nDid).getRunStatus();
-        if (!Objects.isNull(status) && Objects.equals(status,AccessEnum.ONLINE.getCode())){
-            ScheduledThreadPoolExecutor executor = new ScheduledThreadPoolExecutor(2);
-            ScheduledFuture<?> runnableFuture = executor.scheduleAtFixedRate(() -> {
-                log.info("定时发送接入请求...");
-                Integer status2 = csEquipmentDeliveryService.queryEquipmentByndid(nDid).getRunStatus();
-                if (Objects.equals(status2,AccessEnum.OFFLINE.getCode())){
-                    throw new BusinessException(CommonResponseEnum.SUCCESS);
-                }
-            }, 1, 5, TimeUnit.SECONDS);
+        final int[] mid = {2};
+        for (int i = 0; i < 2; i++) {
+            mid[0] = mid[0] + 1;
         }
+        System.out.println("mid==:" + mid[0]);
+    }
+
+    @Test
+    public void test1() {
+        String clientName = "NJCN-A801C8";
+        boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+        System.out.println("mqttClient==:" + mqttClient);
     }
 
 

iot-analysis/analysis-rt/rt-api/pom.xml

@@ -8,11 +8,36 @@
     <version>1.0.0</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
-
+  <name>rt-api</name>
   <artifactId>rt-api</artifactId>
   <version>1.0.0</version>
 
-  <name>rt-api</name>
+  <dependencies>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-core</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-db</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.projectlombok</groupId>
+      <artifactId>lombok</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-microservice</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-mq</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/api/RtFeignClient.java

@@ -0,0 +1,18 @@
+package com.njcn.rt.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.mq.message.AppAutoDataMessage;
+import com.njcn.rt.api.fallback.RtClientFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_RT_BOOT, path = "/rtData", fallbackFactory = RtClientFallbackFactory.class,contextId = "rtData")
+public interface RtFeignClient {
+
+    @PostMapping("/rtAnalysis")
+    HttpResult<String> analysis(AppAutoDataMessage appAutoDataMessage);
+}

iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/api/fallback/RtClientFallbackFactory.java

@@ -0,0 +1,35 @@
+package com.njcn.rt.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.mq.message.AppAutoDataMessage;
+import com.njcn.rt.api.RtFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class RtClientFallbackFactory implements FallbackFactory<RtFeignClient> {
+    @Override
+    public RtFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new RtFeignClient() {
+
+            @Override
+            public HttpResult<String> analysis(AppAutoDataMessage appAutoDataMessage) {
+                log.error("{}异常，降级处理，异常为：{}","实时数据解析",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/enums/RtResponseEnum.java

@@ -0,0 +1,37 @@
+package com.njcn.rt.enums;
+
+import lombok.Getter;
+
+/**
+ * @author xuyang
+ * @version 1.0.0
+ * @date 2023年04月17日 10:50
+ */
+@Getter
+public enum RtResponseEnum {
+
+    /**
+     * A1001 ~ A1099 用于实时数据模块的枚举
+     * <p>
+     */
+    RT_ERROR("A10001","实时数据模块错误"),
+
+    DATA_ARRAY_NULL("A10002","详细数据为空"),
+    AUTO_DATA_NULL("A10002","上送数据为空"),
+    DICT_NULL("A10002","字典数据为空"),
+    LINE_NULL("A10002","监测点为空"),
+
+    ARRAY_DATA_NOT_MATCH("A10003","上送数据与模板匹配失败"),
+
+    ;
+
+    private final String code;
+
+    private final String message;
+
+    RtResponseEnum(String code, String message) {
+        this.code = code;
+        this.message = message;
+    }
+
+}

iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/BaseRealDataSet.java

@@ -0,0 +1,200 @@
+package com.njcn.rt.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 实时数据-基础数据
+ */
+@Data
+public class BaseRealDataSet implements Serializable {
+
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
+    @ApiModelProperty("数据时间")
+    private String dataTime;
+
+    @ApiModelProperty("pt")
+    private Float pt;
+
+    @ApiModelProperty("ct")
+    private Float ct;
+
+    @ApiModelProperty("数据类型 Primary-一次值 Secondary-二次值")
+    private String dataLevel;
+
+    @ApiModelProperty("频率")
+    private Float freq;
+
+    @ApiModelProperty("频率偏差")
+    private Float freqDev;
+
+    @ApiModelProperty("A相-电压有效值")
+    private Float vRmsA;
+
+    @ApiModelProperty("B相-电压有效值")
+    private Float vRmsB;
+
+    @ApiModelProperty("C相-电压有效值")
+    private Float vRmsC;
+
+//    @ApiModelProperty("A相-相电压有效值")
+//    private Float vuRmsA;
+//
+//    @ApiModelProperty("B相-相电压有效值")
+//    private Float vuRmsB;
+//
+//    @ApiModelProperty("C相-相电压有效值")
+//    private Float vuRmsC;
+//
+//    @ApiModelProperty("A相-线电压有效值")
+//    private Float vlRmsA;
+//
+//    @ApiModelProperty("B相-线电压有效值")
+//    private Float vlRmsB;
+//
+//    @ApiModelProperty("C相-线电压有效值")
+//    private Float vlRmsC;
+
+    @ApiModelProperty("A相-基波电压幅值")
+    private Float v1A;
+
+    @ApiModelProperty("B相-基波电压幅值")
+    private Float v1B;
+
+    @ApiModelProperty("C相-基波电压幅值")
+    private Float v1C;
+
+    @ApiModelProperty("A相-电流有效值")
+    private Float iRmsA;
+
+    @ApiModelProperty("B相-电流有效值")
+    private Float iRmsB;
+
+    @ApiModelProperty("C相-电流有效值")
+    private Float iRmsC;
+
+    @ApiModelProperty("A相-基波电流幅值")
+    private Float i1A;
+
+    @ApiModelProperty("B相-基波电流幅值")
+    private Float i1B;
+
+    @ApiModelProperty("C相-基波电流幅值")
+    private Float i1C;
+
+    @ApiModelProperty("A相-电压偏差")
+    private Float vDevA;
+
+    @ApiModelProperty("B相-电压偏差")
+    private Float vDevB;
+
+    @ApiModelProperty("C相-电压偏差")
+    private Float vDevC;
+
+    @ApiModelProperty("A相-基波电压相位")
+    private Float v1AngA;
+
+    @ApiModelProperty("B相-基波电压相位")
+    private Float v1AngB;
+
+    @ApiModelProperty("C相-基波电压相位")
+    private Float v1AngC;
+
+    @ApiModelProperty("A相-基波电流相位")
+    private Float i1AngA;
+
+    @ApiModelProperty("B相-基波电流相位")
+    private Float i1AngB;
+
+    @ApiModelProperty("C相-基波电流相位")
+    private Float i1AngC;
+
+    @ApiModelProperty("A相-电压总谐波畸变率")
+    private Float vThdA;
+
+    @ApiModelProperty("B相-电压总谐波畸变率")
+    private Float vThdB;
+
+    @ApiModelProperty("C相-电压总谐波畸变率")
+    private Float vThdC;
+
+    @ApiModelProperty("A相-电流总谐波畸变率")
+    private Float iThdA;
+
+    @ApiModelProperty("B相-电流总谐波畸变率")
+    private Float iThdB;
+
+    @ApiModelProperty("C相-电流总谐波畸变率")
+    private Float iThdC;
+
+    @ApiModelProperty("电压不平衡度")
+    private Float vUnbalance;
+
+    @ApiModelProperty("电流不平衡度")
+    private Float iUnbalance;
+
+    @ApiModelProperty("A相-有功功率")
+    private Float pA;
+
+    @ApiModelProperty("B相-有功功率")
+    private Float pB;
+
+    @ApiModelProperty("C相-有功功率")
+    private Float pC;
+
+    @ApiModelProperty("A相-无功功率")
+    private Float qA;
+
+    @ApiModelProperty("B相-无功功率")
+    private Float qB;
+
+    @ApiModelProperty("C相-无功功率")
+    private Float qC;
+
+    @ApiModelProperty("A相-视在功率")
+    private Float sA;
+
+    @ApiModelProperty("B相-视在功率")
+    private Float sB;
+
+    @ApiModelProperty("C相-视在功率")
+    private Float sC;
+
+    @ApiModelProperty("A相-功率因数")
+    private Float pfA;
+
+    @ApiModelProperty("B相-功率因数")
+    private Float pfB;
+
+    @ApiModelProperty("C相-功率因数")
+    private Float pfC;
+
+    @ApiModelProperty("A相-基波功率因数")
+    private Float dpfA;
+
+    @ApiModelProperty("B相-基波功率因数")
+    private Float dpfB;
+
+    @ApiModelProperty("C相-基波功率因数")
+    private Float dpfC;
+
+    @ApiModelProperty("总-有功功率")
+    private Float pTot;
+
+    @ApiModelProperty("总-无功功率")
+    private Float qTot;
+
+    @ApiModelProperty("总-视在功率")
+    private Float sTot;
+
+    @ApiModelProperty("总-功率因数")
+    private Float pfTot;
+
+    @ApiModelProperty("总-基波功率因数")
+    private Float dpfTot;
+
+}

iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/HarmData.java

@@ -0,0 +1,25 @@
+package com.njcn.rt.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class HarmData implements Serializable {
+
+    @ApiModelProperty("指标名称")
+    private String harmName;
+
+    @ApiModelProperty("相别")
+    private String phase;
+
+    @ApiModelProperty("数据")
+    private Float data;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+}

iot-analysis/analysis-rt/rt-api/src/main/java/com/njcn/rt/pojo/dto/HarmRealDataSet.java

@@ -0,0 +1,81 @@
+package com.njcn.rt.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 实时数据-谐波数据
+ * @author xy
+ */
+@Data
+public class HarmRealDataSet implements Serializable {
+
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
+    @ApiModelProperty("数据时间")
+    private String dataTime;
+
+    @ApiModelProperty("pt")
+    private Float pt;
+
+    @ApiModelProperty("ct")
+    private Float ct;
+
+    @ApiModelProperty("数据类型 Primary-一次值 Secondary-二次值")
+    private String dataLevel;
+
+    private Float data1;
+    private Float data2;
+    private Float data3;
+    private Float data4;
+    private Float data5;
+    private Float data6;
+    private Float data7;
+    private Float data8;
+    private Float data9;
+    private Float data10;
+    private Float data11;
+    private Float data12;
+    private Float data13;
+    private Float data14;
+    private Float data15;
+    private Float data16;
+    private Float data17;
+    private Float data18;
+    private Float data19;
+    private Float data20;
+    private Float data21;
+    private Float data22;
+    private Float data23;
+    private Float data24;
+    private Float data25;
+    private Float data26;
+    private Float data27;
+    private Float data28;
+    private Float data29;
+    private Float data30;
+    private Float data31;
+    private Float data32;
+    private Float data33;
+    private Float data34;
+    private Float data35;
+    private Float data36;
+    private Float data37;
+    private Float data38;
+    private Float data39;
+    private Float data40;
+    private Float data41;
+    private Float data42;
+    private Float data43;
+    private Float data44;
+    private Float data45;
+    private Float data46;
+    private Float data47;
+    private Float data48;
+    private Float data49;
+    private Float data50;
+
+}

iot-analysis/analysis-rt/rt-boot/pom.xml

@@ -40,6 +40,27 @@
       <artifactId>common-db</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>common-mq</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>rt-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>com.njcn</groupId>
+      <artifactId>cs-device-api</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+      <dependency>
+          <groupId>com.njcn</groupId>
+          <artifactId>access-api</artifactId>
+          <version>1.0.0</version>
+          <scope>compile</scope>
+      </dependency>
   </dependencies>
 
   <build>

iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/RtBootApplication.java

@@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.DependsOn;
 
 
 /**
@@ -13,6 +14,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @date 2021年12月09日 20:59
  */
 @Slf4j
+@DependsOn("proxyMapperRegister")
 @MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")

iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/controller/RtController.java

@@ -5,6 +5,8 @@ import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.mq.message.AppAutoDataMessage;
+import com.njcn.rt.service.IRtService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -31,16 +33,17 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 public class RtController extends BaseController {
 
-//    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
-//    @PostMapping("/analysis")
-//    @ApiOperation("数据解析")
-//    @ApiImplicitParam(name = "csDataEffectiveAddParm", value = "新增app数据有效性表参数", required = true)
-//    public HttpResult<Boolean> addDataEffective(@RequestBody @Validated CsDataEffectiveAddParm csDataEffectiveAddParm){
-//        String methodDescribe = getMethodDescribe("addDataEffective");
-//
-//        boolean save = csDataEffectiveService.add (csDataEffectiveAddParm);
-//        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, save, methodDescribe);
-//    }
+    private final IRtService rtService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/rtAnalysis")
+    @ApiOperation("实时数据解析")
+    @ApiImplicitParam(name = "appAutoDataMessage", value = "数据实体", required = true)
+    public HttpResult<String> analysis(@RequestBody @Validated AppAutoDataMessage appAutoDataMessage){
+        String methodDescribe = getMethodDescribe("analysis");
+        rtService.analysis(appAutoDataMessage);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
 
 
 }

iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/IRtService.java

@@ -0,0 +1,11 @@
+package com.njcn.rt.service;
+
+import com.njcn.mq.message.AppAutoDataMessage;
+
+/**
+ * @author xy
+ */
+public interface IRtService {
+
+    void analysis(AppAutoDataMessage appAutoDataMessage);
+}

iot-analysis/analysis-rt/rt-boot/src/main/java/com/njcn/rt/service/impl/RtServiceImpl.java

@@ -0,0 +1,275 @@
+package com.njcn.rt.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.github.tocrhz.mqtt.publisher.MqttPublisher;
+import com.njcn.access.utils.ChannelObjectUtil;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.utils.PubUtils;
+import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.api.DataArrayFeignClient;
+import com.njcn.csdevice.api.DataSetFeignClient;
+import com.njcn.csdevice.pojo.po.CsDataArray;
+import com.njcn.csdevice.pojo.po.CsDataSet;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.mq.message.AppAutoDataMessage;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.rt.enums.RtResponseEnum;
+import com.njcn.rt.pojo.dto.BaseRealDataSet;
+import com.njcn.rt.pojo.dto.HarmData;
+import com.njcn.rt.pojo.dto.HarmRealDataSet;
+import com.njcn.rt.service.IRtService;
+import com.njcn.web.utils.FloatUtils;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.lang.reflect.Field;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+import java.util.function.BinaryOperator;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author xy
+ */
+@Service
+@RequiredArgsConstructor
+public class RtServiceImpl implements IRtService {
+
+    private final CsLineFeignClient csLineFeignClient;
+    private final DataSetFeignClient dataSetFeignClient;
+    private final DataArrayFeignClient dataArrayFeignClient;
+    private final RedisUtil redisUtil;
+    private final ChannelObjectUtil channelObjectUtil;
+    private final MqttPublisher publisher;
+
+    @Override
+    public void analysis(AppAutoDataMessage appAutoDataMessage) {
+        List<CsDataArray> dataArrayList;
+        //监测点id
+        String lineId = appAutoDataMessage.getId() + appAutoDataMessage.getMsg().getClDid();
+        //获取监测点基础信息
+        CsLinePO po = csLineFeignClient.getById(lineId).getData();
+        //获取数据集 dataSet
+        Integer idx = appAutoDataMessage.getMsg().getDsNameIdx();
+        CsDataSet dataSet = dataSetFeignClient.getDataSetByIdx(po.getDataModelId(),idx).getData();
+        //根据数据集获取指标 dataArray
+        //实时数据数据集不区分最大最小类型，因此数据集取平均值用于解析
+        String key = "BaseRealData:" + lineId + idx;
+        Object object = redisUtil.getObjectByKey(key);
+        if (Objects.isNull(object)){
+            dataArrayList = saveBaseRealDataSet(key,dataSet.getId());
+        } else {
+            dataArrayList = channelObjectUtil.objectToList(object,CsDataArray.class);
+        }
+        //根据dataArray解析数据
+        AppAutoDataMessage.DataArray item = appAutoDataMessage.getMsg().getDataArray().get(0);
+        //fixme 这边先根据数据集的名称来返回对应实体，这边感觉不太合适，后期有好方案再调整
+        //基础数据
+        if (dataSet.getName().contains("Ds$Pqd$Rt$Basic$")) {
+            BaseRealDataSet baseRealDataSet = assembleData(dataArrayList,item,po.getConType());
+            baseRealDataSet.setLineId(lineId);
+            baseRealDataSet.setPt(po.getPtRatio().floatValue());
+            baseRealDataSet.setCt(po.getCtRatio().floatValue());
+            baseRealDataSet.setDataLevel(dataSet.getDataLevel());
+            long timestamp = item.getDataTimeSec() - 8*3600;
+            baseRealDataSet.setDataTime(getTime(timestamp));
+            publisher.send("/Web/RealData/" + lineId, new Gson().toJson(baseRealDataSet), 1, false);
+        }
+        //fixme 目前实时数据只有基础数据和谐波数据，后期拓展，这边需要再判断
+        else {
+            HarmRealDataSet harmRealDataSet = harmData(dataArrayList,item);
+            harmRealDataSet.setLineId(lineId);
+            harmRealDataSet.setPt(po.getPtRatio().floatValue());
+            harmRealDataSet.setCt(po.getCtRatio().floatValue());
+            harmRealDataSet.setDataLevel(dataSet.getDataLevel());
+            long timestamp = item.getDataTimeSec() - 8*3600;
+            harmRealDataSet.setDataTime(getTime(timestamp));
+            publisher.send("/Web/RealData/" + lineId, new Gson().toJson(harmRealDataSet), 1, false);
+        }
+    }
+
+    /**
+     * 时间处理
+     */
+    public String getTime(long timestamp) {
+        Instant instant = Instant.ofEpochSecond(timestamp);
+        LocalDateTime dateTime = LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return dateTime.format(formatter);
+    }
+
+    /**
+     * 缓存实时数据数据集
+     * @param key
+     * @param dataSetId
+     * @return
+     */
+    public List<CsDataArray> saveBaseRealDataSet(String key, String dataSetId) {
+        List<CsDataArray> dataArrays = dataArrayFeignClient.getArrayBySet(dataSetId).getData();
+        List<CsDataArray> dataArrayList = dataArrays.stream().filter(item->Objects.equals(item.getStatMethod(),"avg")).collect(Collectors.toList());
+        redisUtil.saveByKeyWithExpire(key,dataArrayList,600L);
+        return dataArrayList;
+    }
+
+    /**
+     * 数据解码
+     * @return
+     */
+    public Map<String,Float> getData(List<CsDataArray> dataArrayList,AppAutoDataMessage.DataArray dataArray) {
+        Map<String,Float> dataMap = new LinkedHashMap<>();
+        //解码
+        List<Float> floats = PubUtils.byteArrayToFloatList(Base64.getDecoder().decode(dataArray.getData()));
+        if (CollectionUtil.isEmpty(floats)){
+            throw new BusinessException(RtResponseEnum.AUTO_DATA_NULL);
+        }
+        //校验模板和解码数据数量能否对应上
+        if (!Objects.equals(dataArrayList.size(),floats.size())){
+            throw new BusinessException(RtResponseEnum.ARRAY_DATA_NOT_MATCH);
+        }
+        for (int i = 0; i < dataArrayList.size(); i++) {
+            dataMap.put(dataArrayList.get(i).getName() + dataArrayList.get(i).getPhase(),floats.get(i));
+        }
+        return dataMap;
+    }
+
+    public BaseRealDataSet assembleData(List<CsDataArray> dataArrayList,AppAutoDataMessage.DataArray dataArray,Integer conType) {
+        Map<String,Float> dataMap = getData(dataArrayList,dataArray);
+        return channelData(dataMap,conType);
+    }
+
+    public BaseRealDataSet channelData(Map<String,Float> map,Integer conType) {
+        BaseRealDataSet baseRealDataSet = new BaseRealDataSet();
+        //频率
+        baseRealDataSet.setFreq(FloatUtils.get2Float(map.get("Pq_FreqM")));
+        //频率偏差
+        baseRealDataSet.setFreqDev(FloatUtils.get2Float(map.get("Pq_FreqDevM")));
+        //判断监测点的接线方式，不同接线方式电压有效值取值不同
+        //星型-相电压  角形、V型-线电压
+        //电压有效值
+        if (conType == 0) {
+            baseRealDataSet.setVRmsA(FloatUtils.get2Float(map.get("Pq_RmsUA")));
+            baseRealDataSet.setVRmsB(FloatUtils.get2Float(map.get("Pq_RmsUB")));
+            baseRealDataSet.setVRmsC(FloatUtils.get2Float(map.get("Pq_RmsUC")));
+        } else {
+            baseRealDataSet.setVRmsA(FloatUtils.get2Float(map.get("Pq_RmsLUAB")));
+            baseRealDataSet.setVRmsB(FloatUtils.get2Float(map.get("Pq_RmsLUBC")));
+            baseRealDataSet.setVRmsC(FloatUtils.get2Float(map.get("Pq_RmsLUCA")));
+        }
+        //基波电压幅值
+        baseRealDataSet.setV1A(FloatUtils.get2Float(map.get("Pq_RmsFundUA")));
+        baseRealDataSet.setV1B(FloatUtils.get2Float(map.get("Pq_RmsFundUB")));
+        baseRealDataSet.setV1C(FloatUtils.get2Float(map.get("Pq_RmsFundUC")));
+        //电流有效值
+        baseRealDataSet.setIRmsA(FloatUtils.get2Float(map.get("Pq_RmsIA")));
+        baseRealDataSet.setIRmsB(FloatUtils.get2Float(map.get("Pq_RmsIB")));
+        baseRealDataSet.setIRmsC(FloatUtils.get2Float(map.get("Pq_RmsIC")));
+        //基波电流幅值
+        baseRealDataSet.setI1A(FloatUtils.get2Float(map.get("Pq_RmsFundIA")));
+        baseRealDataSet.setI1B(FloatUtils.get2Float(map.get("Pq_RmsFundIB")));
+        baseRealDataSet.setI1C(FloatUtils.get2Float(map.get("Pq_RmsFundIC")));
+        //电压偏差
+        baseRealDataSet.setVDevA(FloatUtils.get2Float(map.get("Pq_UDevA")));
+        baseRealDataSet.setVDevB(FloatUtils.get2Float(map.get("Pq_UDevB")));
+        baseRealDataSet.setVDevC(FloatUtils.get2Float(map.get("Pq_UDevC")));
+        //基波电压相位
+        baseRealDataSet.setV1AngA(FloatUtils.get2Float(map.get("Pq_FundUAngA")));
+        baseRealDataSet.setV1AngB(FloatUtils.get2Float(map.get("Pq_FundUAngB")));
+        baseRealDataSet.setV1AngC(FloatUtils.get2Float(map.get("Pq_FundUAngC")));
+        //基波电流相位
+        baseRealDataSet.setI1AngA(FloatUtils.get2Float(map.get("Pq_FundIAngA")));
+        baseRealDataSet.setI1AngB(FloatUtils.get2Float(map.get("Pq_FundIAngB")));
+        baseRealDataSet.setI1AngC(FloatUtils.get2Float(map.get("Pq_FundIAngC")));
+        //电压总谐波畸变率
+        baseRealDataSet.setVThdA(FloatUtils.get2Float(map.get("Pq_ThdUA")));
+        baseRealDataSet.setVThdB(FloatUtils.get2Float(map.get("Pq_ThdUB")));
+        baseRealDataSet.setVThdC(FloatUtils.get2Float(map.get("Pq_ThdUC")));
+        //电流总谐波畸变率
+        baseRealDataSet.setIThdA(FloatUtils.get2Float(map.get("Pq_ThdIA")));
+        baseRealDataSet.setIThdB(FloatUtils.get2Float(map.get("Pq_ThdIB")));
+        baseRealDataSet.setIThdC(FloatUtils.get2Float(map.get("Pq_ThdIC")));
+        //电压不平衡度
+        baseRealDataSet.setVUnbalance(FloatUtils.get2Float(map.get("Pq_UnbalNegUM")));
+        //电流不平衡度
+        baseRealDataSet.setIUnbalance(FloatUtils.get2Float(map.get("Pq_UnbalNegIM")));
+        //有功功率
+        baseRealDataSet.setPA(FloatUtils.get2Float(map.get("Pq_PA")));
+        baseRealDataSet.setPB(FloatUtils.get2Float(map.get("Pq_PB")));
+        baseRealDataSet.setPC(FloatUtils.get2Float(map.get("Pq_PC")));
+        baseRealDataSet.setPTot(FloatUtils.get2Float(map.get("Pq_TotPM")));
+        //无功功率
+        baseRealDataSet.setQA(FloatUtils.get2Float(map.get("Pq_QA")));
+        baseRealDataSet.setQB(FloatUtils.get2Float(map.get("Pq_QB")));
+        baseRealDataSet.setQC(FloatUtils.get2Float(map.get("Pq_QC")));
+        baseRealDataSet.setQTot(FloatUtils.get2Float(map.get("Pq_TotQM")));
+        //视在功率
+        baseRealDataSet.setSA(FloatUtils.get2Float(map.get("Pq_SA")));
+        baseRealDataSet.setSB(FloatUtils.get2Float(map.get("Pq_SB")));
+        baseRealDataSet.setSC(FloatUtils.get2Float(map.get("Pq_SC")));
+        baseRealDataSet.setSTot(FloatUtils.get2Float(map.get("Pq_TotSM")));
+        //功率因数
+        baseRealDataSet.setPfA(FloatUtils.get2Float(map.get("Pq_PFA")));
+        baseRealDataSet.setPfB(FloatUtils.get2Float(map.get("Pq_PFB")));
+        baseRealDataSet.setPfC(FloatUtils.get2Float(map.get("Pq_PFC")));
+        baseRealDataSet.setPfTot(FloatUtils.get2Float(map.get("Pq_TotPFM")));
+        //基波功率因数
+        baseRealDataSet.setDpfA(FloatUtils.get2Float(map.get("Pq_DPFA")));
+        baseRealDataSet.setDpfB(FloatUtils.get2Float(map.get("Pq_DPFB")));
+        baseRealDataSet.setDpfC(FloatUtils.get2Float(map.get("Pq_DPFC")));
+        baseRealDataSet.setDpfTot(FloatUtils.get2Float(map.get("Pq_TotDPFM")));
+        return baseRealDataSet;
+    }
+
+    public HarmRealDataSet harmData(List<CsDataArray> dataArrayList, AppAutoDataMessage.DataArray dataArray) {
+        HarmRealDataSet harmRealDataSet = new HarmRealDataSet();
+        List<HarmData> harmDataList = new ArrayList<>();
+        //解码
+        List<Float> floats = PubUtils.byteArrayToFloatList(Base64.getDecoder().decode(dataArray.getData()));
+        if (CollectionUtil.isEmpty(floats)){
+            throw new BusinessException(RtResponseEnum.AUTO_DATA_NULL);
+        }
+        //校验模板和解码数据数量能否对应上
+        if (!Objects.equals(dataArrayList.size(),floats.size())){
+            throw new BusinessException(RtResponseEnum.ARRAY_DATA_NOT_MATCH);
+        }
+        for (int i = 0; i < dataArrayList.size(); i++) {
+            HarmData harmData = new HarmData();
+            harmData.setHarmName(dataArrayList.get(i).getName());
+            harmData.setPhase(dataArrayList.get(i).getPhase());
+            harmData.setSort(dataArrayList.get(i).getSort());
+            harmData.setData(floats.get(i));
+            harmDataList.add(harmData);
+        }
+        //根据名称分组，然后在不同相别的数据中取最大值
+        List<HarmData> maxDataList = new ArrayList<>(harmDataList.stream()
+                .collect(Collectors.toMap(
+                        HarmData::getHarmName,
+                        Function.identity(),
+                        BinaryOperator.maxBy(Comparator.comparingDouble(HarmData::getData))
+                ))
+                .values());
+        //通过反射将数据赋值
+        Class<?> clazz = HarmRealDataSet.class;
+        maxDataList.forEach(item->{
+            if (Objects.equals(item.getHarmName(),"Pq_RmsFundI") || Objects.equals(item.getHarmName(),"Pq_RmsFundU")) {
+                harmRealDataSet.setData1(FloatUtils.get2Float(item.getData()));
+            } else {
+                String numberStr = item.getHarmName().substring(item.getHarmName().lastIndexOf('_') + 1);
+                String fieldName = "data" + numberStr;
+                try {
+                    Field field = clazz.getDeclaredField(fieldName);
+                    field.setAccessible(true);
+                    field.set(harmRealDataSet,FloatUtils.get2Float(item.getData()));
+                } catch (Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        });
+        return harmRealDataSet;
+    }
+
+}

iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/listener/RedisKeyExpirationListener.java

@@ -1,67 +1,67 @@
-package com.njcn.stat.listener;
-
-import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.redis.pojo.enums.AppRedisKey;
-import com.njcn.redis.utils.RedisUtil;
-import com.njcn.stat.enums.StatResponseEnum;
-import com.njcn.system.api.EpdFeignClient;
-import com.njcn.system.pojo.dto.EpdDTO;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.core.annotation.Order;
-import org.springframework.data.redis.connection.Message;
-import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
-import org.springframework.data.redis.listener.RedisMessageListenerContainer;
-import org.springframework.stereotype.Component;
-
-import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * @author hongawen
- * @version 1.0.0
- * @date 2022年04月02日 14:31
- */
-@Slf4j
-@Component
-public class RedisKeyExpirationListener extends KeyExpirationEventMessageListener {
-
-    @Resource
-    private EpdFeignClient epdFeignClient;
-
-    @Resource
-    private RedisUtil redisUtil;
-
-    public RedisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
-        super(listenerContainer);
-    }
-
-
-    /**
-     * 针对redis数据失效事件，进行数据处理
-     * 注意message.toString()可以获取失效的key
-     */
-    @Override
-    @Order(0)
-    public void onMessage(Message message, byte[] pattern) {
-        if (StringUtils.isBlank(message.toString())) {
-            return;
-        }
-        //判断失效的key
-        String expiredKey = message.toString();
-        if(expiredKey.equals(AppRedisKey.ELE_EPD_PQD)){
-            Map<String,String> map = new HashMap<>();
-            List<EpdDTO> list = epdFeignClient.findAll().getData();
-            if (CollectionUtil.isEmpty(list)){
-                throw new BusinessException(StatResponseEnum.DICT_NULL);
-            }
-            list.forEach(item->{
-                map.put(item.getDictName(),item.getTableName());
-            });
-            redisUtil.saveByKeyWithExpire(AppRedisKey.ELE_EPD_PQD,map,3600L);
-        }
-    }
-}
+//package com.njcn.stat.listener;
+//
+//import cn.hutool.core.collection.CollectionUtil;
+//import com.njcn.common.pojo.exception.BusinessException;
+//import com.njcn.redis.pojo.enums.AppRedisKey;
+//import com.njcn.redis.utils.RedisUtil;
+//import com.njcn.stat.enums.StatResponseEnum;
+//import com.njcn.system.api.EpdFeignClient;
+//import com.njcn.system.pojo.dto.EpdDTO;
+//import lombok.extern.slf4j.Slf4j;
+//import org.apache.commons.lang3.StringUtils;
+//import org.springframework.core.annotation.Order;
+//import org.springframework.data.redis.connection.Message;
+//import org.springframework.data.redis.listener.KeyExpirationEventMessageListener;
+//import org.springframework.data.redis.listener.RedisMessageListenerContainer;
+//import org.springframework.stereotype.Component;
+//
+//import javax.annotation.Resource;
+//import java.util.HashMap;
+//import java.util.List;
+//import java.util.Map;
+//
+///**
+// * @author hongawen
+// * @version 1.0.0
+// * @date 2022年04月02日 14:31
+// */
+//@Slf4j
+//@Component
+//public class RedisKeyExpirationListener extends KeyExpirationEventMessageListener {
+//
+//    @Resource
+//    private EpdFeignClient epdFeignClient;
+//
+//    @Resource
+//    private RedisUtil redisUtil;
+//
+//    public RedisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
+//        super(listenerContainer);
+//    }
+//
+//
+//    /**
+//     * 针对redis数据失效事件，进行数据处理
+//     * 注意message.toString()可以获取失效的key
+//     */
+//    @Override
+//    @Order(0)
+//    public void onMessage(Message message, byte[] pattern) {
+//        if (StringUtils.isBlank(message.toString())) {
+//            return;
+//        }
+//        //判断失效的key
+//        String expiredKey = message.toString();
+//        if(expiredKey.equals(AppRedisKey.ELE_EPD_PQD)){
+//            Map<String,String> map = new HashMap<>();
+//            List<EpdDTO> list = epdFeignClient.findAll().getData();
+//            if (CollectionUtil.isEmpty(list)){
+//                throw new BusinessException(StatResponseEnum.DICT_NULL);
+//            }
+//            list.forEach(item->{
+//                map.put(item.getDictName(),item.getTableName());
+//            });
+//            redisUtil.saveByKeyWithExpire(AppRedisKey.ELE_EPD_PQD,map,3600L);
+//        }
+//    }
+//}

iot-analysis/analysis-stat/stat-boot/src/main/java/com/njcn/stat/service/impl/StatServiceImpl.java

@@ -2,17 +2,15 @@ package com.njcn.stat.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.njcn.access.utils.ChannelObjectUtil;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.utils.PubUtils;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.DataArrayFeignClient;
-import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.pojo.param.DataArrayParam;
 import com.njcn.csdevice.pojo.po.CsDataArray;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
-import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
-import com.njcn.cswarn.api.CsEquipmentAlarmFeignClient;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import com.njcn.influx.utils.InfluxDbUtils;
 import com.njcn.mq.message.AppAutoDataMessage;
@@ -21,10 +19,9 @@ import com.njcn.redis.utils.RedisUtil;
 import com.njcn.stat.enums.StatResponseEnum;
 import com.njcn.stat.service.IStatService;
 import com.njcn.system.api.DicDataFeignClient;
-import com.njcn.system.api.EpdFeignClient;
 import com.njcn.system.enums.DicDataEnum;
-import com.njcn.system.pojo.dto.EpdDTO;
 import com.njcn.system.pojo.po.DictData;
+import com.njcn.system.pojo.po.SysDicTreePO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.influxdb.InfluxDB;
@@ -49,18 +46,11 @@ import java.util.concurrent.TimeUnit;
 public class StatServiceImpl implements IStatService {
 
     private final DataArrayFeignClient dataArrayFeignClient;
-
-    private final EpdFeignClient epdFeignClient;
-
     private final DicDataFeignClient dicDataFeignClient;
-
     private final InfluxDbUtils influxDbUtils;
-
     private final CsLineFeignClient csLineFeignClient;
-
     private final RedisUtil redisUtil;
-
-    private final EquipmentFeignClient equipmentFeignClient;
+    private final ChannelObjectUtil channelObjectUtil;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -82,45 +72,52 @@ public class StatServiceImpl implements IStatService {
         if (Objects.isNull(object1)){
             lineInfo(appAutoDataMessage.getId());
         }
-        if (Objects.equals(appAutoDataMessage.getDid(),1)){
-            lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appAutoDataMessage.getId())), Map.class).get("0").toString();
-        } else if (Objects.equals(appAutoDataMessage.getDid(),2)){
+        //获取当前设备信息判断装置型号，来筛选监测点
+        List<CsEquipmentDeliveryPO> poList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(AppRedisKey.DEVICE_LIST),CsEquipmentDeliveryPO.class);
+        CsEquipmentDeliveryPO po = poList.stream().filter(item->Objects.equals(item.getNdid(),appAutoDataMessage.getId())).findFirst().orElse(null);
+        List<SysDicTreePO> dictTreeList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(AppRedisKey.DICT_TREE),SysDicTreePO.class);
+        String code = dictTreeList.stream().filter(item->Objects.equals(item.getId(),po.getDevType())).findFirst().orElse(null).getCode();
+
+        //便携式设备
+        if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
             lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appAutoDataMessage.getId())), Map.class).get(appAutoDataMessage.getMsg().getClDid().toString()).toString();
         }
-        //缓存指标和influxDB表关系
-        Object object2 = redisUtil.getObjectByKey(AppRedisKey.ELE_EPD_PQD);
-        if(Objects.isNull(object2)) {
-            saveData();
+        //直连设备
+        else if (Objects.equals(DicDataEnum.CONNECT_DEV.getCode(),code)) {
+            if (Objects.equals(appAutoDataMessage.getDid(),1)){lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appAutoDataMessage.getId())), Map.class).get("0").toString();
+            } else if (Objects.equals(appAutoDataMessage.getDid(),2)){
+                lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appAutoDataMessage.getId())), Map.class).get(appAutoDataMessage.getMsg().getClDid().toString()).toString();
+            }
         }
         //获取当前设备信息
-        CsEquipmentDeliveryPO po = equipmentFeignClient.findDevByNDid(appAutoDataMessage.getId()).getData();
         if (CollectionUtil.isNotEmpty(list)){
             List<String> recordList = new ArrayList<>();
             for (AppAutoDataMessage.DataArray item : list) {
                 switch (item.getDataAttr()) {
                     case 1:
-                        log.info("处理最大值");
+                        log.info("{}-->处理最大值", po.getNdid() + appAutoDataMessage.getDid() + appAutoDataMessage.getMsg().getClDid());
                         dataArrayParam.setStatMethod("max");
                         break;
                     case 2:
-                        log.info("处理最小值");
+                        log.info("{}-->处理最小值", po.getNdid() + appAutoDataMessage.getDid() + appAutoDataMessage.getMsg().getClDid());
                         dataArrayParam.setStatMethod("min");
                         break;
                     case 3:
-                        log.info("处理avg");
+                        log.info("{}-->处理avg", po.getNdid() + appAutoDataMessage.getDid() + appAutoDataMessage.getMsg().getClDid());
                         dataArrayParam.setStatMethod("avg");
                         break;
                     case 4:
-                        log.info("处理cp95");
+                        log.info("{}-->处理cp95", po.getNdid() + appAutoDataMessage.getDid() + appAutoDataMessage.getMsg().getClDid());
                         dataArrayParam.setStatMethod("cp95");
                         break;
                     default:
                         break;
                 }
-                Object object = redisUtil.getObjectByKey(appAutoDataMessage.getId() + appAutoDataMessage.getDid() + appAutoDataMessage.getMsg().getClDid());
+                String key = AppRedisKey.DEV_MODEL.concat(dataArrayParam.getId() + dataArrayParam.getDid() + dataArrayParam.getCldId() + dataArrayParam.getStatMethod());
+                Object object = redisUtil.getObjectByKey(key);
                 List<CsDataArray> dataArrayList;
                 if (Objects.isNull(object)){
-                    dataArrayList = saveModelData(dataArrayParam);
+                    dataArrayList = saveModelData(dataArrayParam,key);
                 } else {
                     dataArrayList = objectToList(object);
                 }
@@ -144,46 +141,31 @@ public class StatServiceImpl implements IStatService {
             throw new BusinessException(StatResponseEnum.LINE_NULL);
         }
         for (CsLinePO item : lineList) {
-            DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData();
-            if (Objects.isNull(dictData)){
-                throw new BusinessException(StatResponseEnum.DICT_NULL);
-            }
-            if (Objects.equals(dictData.getCode(), DicDataEnum.OUTPUT_SIDE.getCode())){
-                map.put(0,item.getLineId());
-            } else if (Objects.equals(dictData.getCode(), DicDataEnum.GRID_SIDE.getCode())){
-                map.put(1,item.getLineId());
-            } else if (Objects.equals(dictData.getCode(), DicDataEnum.LOAD_SIDE.getCode())){
-                map.put(2,item.getLineId());
+            if (Objects.isNull(item.getPosition())){
+                map.put(item.getClDid(),item.getLineId());
+            } else {
+                DictData dictData = dicDataFeignClient.getDicDataById(item.getPosition()).getData();
+                if (Objects.equals(dictData.getCode(), DicDataEnum.OUTPUT_SIDE.getCode())){
+                    map.put(0,item.getLineId());
+                } else if (Objects.equals(dictData.getCode(), DicDataEnum.GRID_SIDE.getCode())){
+                    map.put(1,item.getLineId());
+                } else if (Objects.equals(dictData.getCode(), DicDataEnum.LOAD_SIDE.getCode())){
+                    map.put(2,item.getLineId());
+                }
             }
         }
-        redisUtil.saveByKeyWithExpire(AppRedisKey.LINE_POSITION+id,map,600L);
-    }
-
-    /**
-     * 缓存字典和influxDB表关系
-     */
-    public void saveData() {
-        Map<String,String> map = new HashMap<>();
-        List<EpdDTO> list = epdFeignClient.findAll().getData();
-        if (CollectionUtil.isEmpty(list)){
-            throw new BusinessException(StatResponseEnum.DICT_NULL);
-        }
-        list.forEach(item->{
-            map.put(item.getDictName(),item.getTableName());
-        });
-        redisUtil.saveByKeyWithExpire(AppRedisKey.ELE_EPD_PQD,map,3600L);
+        redisUtil.saveByKey(AppRedisKey.LINE_POSITION+id,map);
     }
 
     /**
      * 缓存设备模板信息
      */
-    public List<CsDataArray> saveModelData(DataArrayParam dataArrayParam) {
-        String key = dataArrayParam.getId() + dataArrayParam.getDid() + dataArrayParam.getCldId();
+    public List<CsDataArray> saveModelData(DataArrayParam dataArrayParam,String key) {
         List<CsDataArray> dataArrayList = dataArrayFeignClient.findListByParam(dataArrayParam).getData();
         if (CollectionUtil.isEmpty(dataArrayList)){
             throw new BusinessException(StatResponseEnum.DATA_ARRAY_NULL);
         }
-        redisUtil.saveByKeyWithExpire(key,dataArrayList,600L);
+        redisUtil.saveByKey(key,dataArrayList);
         return dataArrayList;
     }
 
@@ -202,10 +184,6 @@ public class StatServiceImpl implements IStatService {
         if (!Objects.equals(dataArrayList.size(),floats.size())){
             throw new BusinessException(StatResponseEnum.ARRAY_DATA_NOT_MATCH);
         }
-        //判断字典数据是否存在
-        if (Objects.isNull(redisUtil.getObjectByKey(AppRedisKey.ELE_EPD_PQD))){
-            saveData();
-        }
         Map<String,String> map = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.ELE_EPD_PQD)), Map.class);
         for (int i = 0; i < dataArrayList.size(); i++) {
             String tableName = map.get(dataArrayList.get(i).getName());

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/api/EventFeignClient.java

@@ -6,6 +6,7 @@ import com.njcn.mq.message.AppEventMessage;
 import com.njcn.zlevent.api.fallback.EventClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @author xy
@@ -15,4 +16,8 @@ public interface EventFeignClient {
 
     @PostMapping("/analysis")
     HttpResult<String> analysis(AppEventMessage appEventMessage);
+
+    @PostMapping("/portableData")
+    HttpResult<String> getPortableData(@RequestBody AppEventMessage appEventMessage);
+
 }

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/api/EvtErrorFeignClient.java

@@ -0,0 +1,19 @@
+package com.njcn.zlevent.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.mq.message.AppEventMessage;
+import com.njcn.zlevent.api.fallback.EvtErrorClientFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+
+/**
+ * @author xy
+ */
+@FeignClient(value = ServerInfo.CS_ZL_EVENT_BOOT, path = "/csDevErrEvt", fallbackFactory = EvtErrorClientFallbackFactory.class,contextId = "csDevErrEvt")
+public interface EvtErrorFeignClient {
+
+    @PostMapping("/errorEvent")
+    HttpResult<String> insertErrorEvent(AppEventMessage appEventMessage);
+
+}

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/api/WaveFeignClient.java

@@ -3,16 +3,20 @@ package com.njcn.zlevent.api;
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.mq.message.AppEventMessage;
-import com.njcn.zlevent.api.fallback.EventClientFallbackFactory;
+import com.njcn.zlevent.api.fallback.WaveClientFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author xy
  */
-@FeignClient(value = ServerInfo.CS_ZL_EVENT_BOOT, path = "/wave", fallbackFactory = EventClientFallbackFactory.class,contextId = "wave")
+@FeignClient(value = ServerInfo.CS_ZL_EVENT_BOOT, path = "/wave", fallbackFactory = WaveClientFallbackFactory.class,contextId = "wave")
 public interface WaveFeignClient {
 
     @PostMapping("/analysis")
     HttpResult<String> analysis(AppEventMessage appEventMessage);
+
+    @PostMapping("/channelWave")
+    HttpResult<String> channelWave(@RequestParam("nDid") String nDid);
 }

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/api/fallback/EventClientFallbackFactory.java

@@ -30,6 +30,13 @@ public class EventClientFallbackFactory implements FallbackFactory<EventFeignCli
                 log.error("{}异常，降级处理，异常为：{}","数据解析",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<String> getPortableData(AppEventMessage appEventMessage) {
+                log.error("{}异常，降级处理，异常为：{}","便携式设备数据记录动作",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
         };
     }
 }

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/api/fallback/EvtErrorClientFallbackFactory.java

@@ -0,0 +1,35 @@
+package com.njcn.zlevent.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.mq.message.AppEventMessage;
+import com.njcn.zlevent.api.EvtErrorFeignClient;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@Component
+public class EvtErrorClientFallbackFactory implements FallbackFactory<EvtErrorFeignClient> {
+    @Override
+    public EvtErrorFeignClient create(Throwable cause) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (cause.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) cause.getCause();
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new EvtErrorFeignClient() {
+
+            @Override
+            public HttpResult<String> insertErrorEvent(AppEventMessage appEventMessage) {
+                log.error("{}异常，降级处理，异常为：{}","异常事件统计",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/api/fallback/WaveClientFallbackFactory.java

@@ -4,7 +4,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.mq.message.AppEventMessage;
-import com.njcn.zlevent.api.EventFeignClient;
+import com.njcn.zlevent.api.WaveFeignClient;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -14,22 +14,28 @@ import org.springframework.stereotype.Component;
  */
 @Slf4j
 @Component
-public class WaveClientFallbackFactory implements FallbackFactory<EventFeignClient> {
+public class WaveClientFallbackFactory implements FallbackFactory<WaveFeignClient> {
     @Override
-    public EventFeignClient create(Throwable cause) {
+    public WaveFeignClient create(Throwable cause) {
         //判断抛出异常是否为解码器抛出的业务异常
         Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
         if (cause.getCause() instanceof BusinessException) {
             BusinessException businessException = (BusinessException) cause.getCause();
         }
         Enum<?> finalExceptionEnum = exceptionEnum;
-        return new EventFeignClient() {
+        return new WaveFeignClient() {
 
             @Override
             public HttpResult<String> analysis(AppEventMessage appEventMessage) {
                 log.error("{}异常，降级处理，异常为：{}","波形报文解析",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<String> channelWave(String nDid) {
+                log.error("{}异常，降级处理，异常为：{}","处理录波事件",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/dto/FileStreamDto.java

@@ -1,10 +1,12 @@
 package com.njcn.zlevent.pojo.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 /**
  * 类的介绍：
@@ -16,12 +18,16 @@ import java.util.List;
 @Data
 public class FileStreamDto implements Serializable {
 
+    @ApiModelProperty("总帧")
     private Integer total;
 
+    @ApiModelProperty("nDid")
     private String nDid;
 
+    @ApiModelProperty("帧大小")
     private Integer frameLen;
 
-    private List<Integer> list;
+    @ApiModelProperty("帧集合")
+    private Set<Integer> list;
 
 }

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/dto/WaveTimeDto.java

@@ -12,8 +12,15 @@ import lombok.Data;
 @Data
 public class WaveTimeDto {
 
+    /**
+     * 文件名
+     */
+    private String fileName;
+
     private String deviceId;
 
+    private String nDid;
+
     private String lineId;
 
     private String startTime;
@@ -22,4 +29,9 @@ public class WaveTimeDto {
 
     private String location;
 
+    /**
+     * 等级
+     */
+    private String level;
+
 }

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/param/ErrorEventParam.java

@@ -0,0 +1,18 @@
+package com.njcn.zlevent.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.Data;
+
+/**
+ * @author xy
+ */
+@Data
+public class ErrorEventParam extends BaseParam {
+
+    private String nDid;
+
+    private String startTime;
+
+    private String endTime;
+
+}

iot-analysis/analysis-zl-event/zl-event-api/src/main/java/com/njcn/zlevent/pojo/po/CsDevErrEvt.java

@@ -0,0 +1,46 @@
+package com.njcn.zlevent.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 装置异常事件统计
+ * </p>
+ *
+ * @author xy
+ * @since 2024-09-12
+ */
+@Data
+@TableName("cs_dev_err_evt")
+public class CsDevErrEvt implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 设备识别码
+     */
+    private String ndid;
+
+    /**
+     * 事件发生时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime evtTime;
+
+    /**
+     * 事件code编码
+     */
+    private String code;
+
+
+}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/controller/CsDevErrEvtController.java

@@ -0,0 +1,66 @@
+package com.njcn.zlevent.controller;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.common.utils.LogUtil;
+import com.njcn.mq.message.AppEventMessage;
+import com.njcn.web.controller.BaseController;
+import com.njcn.zlevent.pojo.param.ErrorEventParam;
+import com.njcn.zlevent.pojo.po.CsDevErrEvt;
+import com.njcn.zlevent.service.ICsDevErrEvtService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 装置异常事件统计 前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2024-09-12
+ */
+@RestController
+@Slf4j
+@RequestMapping("/csDevErrEvt")
+@Api(tags = "装置异常事件处理")
+@AllArgsConstructor
+public class CsDevErrEvtController extends BaseController {
+
+    private final ICsDevErrEvtService csDevErrEvtService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/errorEvent")
+    @ApiOperation("异常事件统计")
+    @ApiImplicitParam(name = "appEventMessage", value = "数据实体", required = true)
+    public HttpResult<String> insertErrorEvent(@RequestBody AppEventMessage appEventMessage){
+        String methodDescribe = getMethodDescribe("insertErrorEvent");
+        csDevErrEvtService.insertErrorEvent(appEventMessage);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @PostMapping("/list")
+    @ApiOperation("查询异常事件列表分页")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<Page<CsDevErrEvt>> getList(@RequestBody @Validated ErrorEventParam param) {
+        String methodDescribe = getMethodDescribe("getList");
+        LogUtil.njcnDebug(log, "{}，查询数据为：{}", methodDescribe, param);
+        Page<CsDevErrEvt> list = csDevErrEvtService.getList(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}
+

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/controller/EventController.java

@@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.RestController;
 @Slf4j
 @RestController
 @RequestMapping("/event")
-@Api(tags = "暂态事件处理")
+@Api(tags = "事件处理")
 @AllArgsConstructor
 public class EventController extends BaseController {
 
@@ -44,4 +44,14 @@ public class EventController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/portableData")
+    @ApiOperation("便携式数据事件")
+    @ApiImplicitParam(name = "appEventMessage", value = "数据实体", required = true)
+    public HttpResult<String> getPortableData(@RequestBody AppEventMessage appEventMessage){
+        String methodDescribe = getMethodDescribe("getPortableData");
+        eventService.getPortableData(appEventMessage);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
 }

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/controller/WaveController.java

@@ -13,10 +13,7 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * 类的介绍：
@@ -36,7 +33,7 @@ public class WaveController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/analysis")
-    @ApiOperation("录波解析")
+    @ApiOperation("录波事件")
     @ApiImplicitParam(name = "appEventMessage", value = "数据实体", required = true)
     public HttpResult<String> analysis(@RequestBody AppEventMessage appEventMessage){
         String methodDescribe = getMethodDescribe("analysis");
@@ -44,4 +41,14 @@ public class WaveController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/channelWave")
+    @ApiOperation("处理录波事件")
+    @ApiImplicitParam(name = "nDid", value = "nDid", required = true)
+    public HttpResult<String> channelWave(@RequestParam("nDid") String nDid){
+        String methodDescribe = getMethodDescribe("channelWave");
+        csWaveService.channelWave(nDid);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
 }

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/init/InitEventFiles.java

@@ -0,0 +1,26 @@
+//package com.njcn.zlevent.init;
+//
+//import com.njcn.redis.utils.RedisUtil;
+//import lombok.AllArgsConstructor;
+//import lombok.extern.slf4j.Slf4j;
+//import org.springframework.boot.CommandLineRunner;
+//import org.springframework.stereotype.Component;
+//
+//
+///**
+// * @author xy
+// *
+// * 程序重启设置任务，消费历史录波文件
+// */
+//@Slf4j
+//@Component
+//@AllArgsConstructor
+//public class InitEventFiles implements CommandLineRunner {
+//
+//    private final RedisUtil redisUtil;
+//
+//    @Override
+//    public void run(String... args) {
+//        redisUtil.saveByKeyWithExpire("startFile",null,120L);
+//    }
+//}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/listener/RedisKeyExpirationListener.java

@@ -4,18 +4,21 @@ import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
-import com.njcn.access.api.CsTopicFeignClient;
 import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.pojo.dto.ReqAndResDto;
+import com.njcn.access.pojo.dto.file.FileRedisDto;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.stat.enums.StatResponseEnum;
 import com.njcn.system.api.EpdFeignClient;
 import com.njcn.system.pojo.dto.EpdDTO;
 import com.njcn.zlevent.pojo.dto.FileStreamDto;
-import com.sun.scenario.effect.impl.sw.sse.SSEBlend_SRC_OUTPeer;
+import com.njcn.zlevent.service.ICsWaveAnalysisService;
+import com.njcn.zlevent.utils.RemoveInfoUtils;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
@@ -26,10 +29,7 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.IntStream;
 
 /**
@@ -43,21 +43,23 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
 
     @Resource
     private EpdFeignClient epdFeignClient;
-
     @Resource
     private RedisUtil redisUtil;
-
-    @Resource
-    private CsTopicFeignClient csTopicFeignClient;
-
     @Resource
     private MqttPublisher publisher;
+    @Resource
+    private RemoveInfoUtils removeInfoUtils;
+    @Resource
+    private ICsWaveAnalysisService csWaveAnalysisService;
+    @Resource
+    private EquipmentFeignClient equipmentFeignClient;
+    private static Integer mid = 1;
+    private static Integer range = 51200;
 
     public RedisKeyExpirationListener(RedisMessageListenerContainer listenerContainer) {
         super(listenerContainer);
     }
 
-
     /**
      * 针对redis数据失效事件，进行数据处理
      * 注意message.toString()可以获取失效的key
@@ -91,35 +93,175 @@ public class RedisKeyExpirationListener extends KeyExpirationEventMessageListene
             int end = dto.getTotal();
             IntStream.rangeClosed(start, end)
                     .filter(i -> !dto.getList().contains(i))
-                    .forEach(missingNumber -> {
-                        log.info("缺失的数字:{}",missingNumber);
-                        missingList.add(missingNumber);
-                    });
-            redisUtil.saveByKey(AppRedisKey.FILE_PART_MISSING.concat(fileName), missingList);
-            Integer offset = (missingList.get(0) - 1) * dto.getFrameLen();
-            askMissingFileStream(dto.getNDid(),missingList.get(0),fileName,offset,dto.getFrameLen());
+                    .forEach(missingList::add);
+            if (CollectionUtil.isNotEmpty(missingList)) {
+                downloadFile(missingList,dto.getNDid(),fileName);
+            }
+        }
+        //重新接入之后,装置60s后开始消费缓存的录波文件
+        else if (expiredKey.startsWith("startFile:")) {
+            String nDid = expiredKey.split(":")[1];
+            //处理缓存数据
+            csWaveAnalysisService.channelWave(nDid);
+        }
+        //手动文件下载
+        else if (expiredKey.startsWith(AppRedisKey.FILE_DOWN_TIME)) {
+            List<Integer> missingList = new ArrayList<>();
+            String fileName = expiredKey.split(AppRedisKey.FILE_DOWN_TIME)[1];
+            Object object1 = redisUtil.getObjectByKey(AppRedisKey.FILE_PART.concat(fileName));
+            FileStreamDto dto = JSON.parseObject(JSON.toJSONString(object1), FileStreamDto.class);
+            int start = 1;
+            int end = dto.getTotal();
+            IntStream.rangeClosed(start, end)
+                    .filter(i -> !dto.getList().contains(i))
+                    .forEach(missingList::add);
+            if (CollectionUtil.isNotEmpty(missingList)) {
+                webDownloadFile(missingList,dto.getNDid(),fileName);
+            }
         }
     }
 
+    //界面请求缺失的数据
+    public void webDownloadFile( List<Integer> missingList, String nDid, String name) {
+        for (Integer missingNumber : missingList) {
+            int i = missingNumber - 1;
+            Object object = getDeviceMid(nDid);
+            if (!Objects.isNull(object)) {
+                mid = (Integer) object;
+            }
+            ReqAndResDto.Req reqAndResParam = getPojo(mid,name,i);
+            publisher.send("/Pfm/DevFileCmd/V1/"+nDid,new Gson().toJson(reqAndResParam),1,false);
+            //判断是否重发
+            webSendNextStep(name,nDid,mid,i);
+            FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.DOWNLOAD + name + mid);
+            //重发之后判断继续循环还是跳出循环
+            if (!Objects.isNull(fileRedisDto) && !Objects.equals(fileRedisDto.getCode(),200)) {
+                break;
+            }
+            mid = mid + 1;
+            if (mid > 10000) {
+                mid = 1;
+            }
+            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+        }
+    }
 
-    public void askMissingFileStream(String nDid, Integer mid, String fileName, Integer offset, Integer len) {
-        String version = csTopicFeignClient.find(nDid).getData();
+    //录波文件请求缺失的数据
+    public void downloadFile( List<Integer> missingList, String nDid, String name) {
+        for (Integer missingNumber : missingList) {
+            int i = missingNumber - 1;
+            Object object = getDeviceMid(nDid);
+            if (!Objects.isNull(object)) {
+                mid = (Integer) object;
+            }
+            ReqAndResDto.Req reqAndResParam = getPojo(mid,name,i);
+            publisher.send("/Pfm/DevFileCmd/V1/"+nDid,new Gson().toJson(reqAndResParam),1,false);
+            //判断是否重发
+            sendNextStep(name,nDid,mid,i);
+            FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.DOWNLOAD + name + mid);
+            //重发之后判断继续循环还是跳出循环
+            if (!Objects.isNull(fileRedisDto) && !Objects.equals(fileRedisDto.getCode(),200)) {
+                //判断重读还是丢弃
+                removeInfoUtils.retryEventInfo(nDid,name);
+                break;
+            }
+            mid = mid + 1;
+            if (mid > 10000) {
+                mid = 1;
+            }
+            redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+        }
+    }
+
+    public Object getDeviceMid(String nDid) {
+        return redisUtil.getObjectByKey(AppRedisKey.DEVICE_MID + nDid);
+    }
+
+    /**
+     * 文件下载请求报文
+     */
+    public ReqAndResDto.Req getPojo(Integer mid, String fileName, Integer step) {
+        String json;
         ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
         reqAndResParam.setMid(mid);
         reqAndResParam.setDid(0);
         reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
         reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_9.getCode()));
         reqAndResParam.setExpire(-1);
-        String json = "{Name:\""+fileName+"\",Offset:"+offset+",Len:"+len+"}";
+        json = "{Name:\""+fileName+"\",TransferMode:"+1+",Offset:"+(step*range)+",Len:"+range+"}";
         JSONObject jsonObject = JSONObject.fromObject(json);
         reqAndResParam.setMsg(jsonObject);
-        publisher.send("/Pfm/DevFileCmd/"+version+"/"+nDid,new Gson().toJson(reqAndResParam),1,false);
-        log.info("请求文件流报文:" + new Gson().toJson(reqAndResParam));
+        return reqAndResParam;
     }
 
+    /**
+     * web端根据装置响应来判断是否询问下一帧数据
+     */
+    public void webSendNextStep(String fileName, String id, int mid,int step) {
+        try {
+            for (int i = 1; i <= 15; i++) {
+                if (step == 0 ){
+                    Thread.sleep(8000);
+                } else {
+                    Thread.sleep(4000);
+                }
+                FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.DOWNLOAD + fileName + mid);
+                if (Objects.isNull(fileRedisDto)) {
+                    FileRedisDto failDto = new FileRedisDto();
+                    failDto.setCode(400);
+                    redisUtil.saveByKeyWithExpire(AppRedisKey.DOWNLOAD + fileName + mid,failDto,10L);
+                } else {
+                    if (Objects.equals(fileRedisDto.getCode(),200)) {
+                        break;
+                    } else {
+                        log.info("第" +i+"次尝试");
+                        //尝试失败则设置code为400，如果装置响应了，则会将code置为200
+                        FileRedisDto failDto = new FileRedisDto();
+                        failDto.setCode(400);
+                        redisUtil.saveByKeyWithExpire(AppRedisKey.DOWNLOAD + fileName + mid,failDto,10L);
+                        ReqAndResDto.Req req = getPojo(mid,fileName,step);
+                        publisher.send("/Pfm/DevFileCmd/V1/" + id, new Gson().toJson(req), 1, false);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR);
+        }
+    }
 
-
-
-
+    /**
+     * 根据装置响应来判断是否询问下一帧数据
+     */
+    public void sendNextStep(String fileName, String id, int mid,int step) {
+        try {
+            for (int i = 1; i <= 11; i++) {
+                if (step == 0 ){
+                    Thread.sleep(5000 * i);
+                } else {
+                    Thread.sleep(2000 * i);
+                }
+                FileRedisDto fileRedisDto = (FileRedisDto) redisUtil.getObjectByKey(AppRedisKey.DOWNLOAD + fileName + mid);
+                if (Objects.isNull(fileRedisDto)) {
+                    FileRedisDto failDto = new FileRedisDto();
+                    failDto.setCode(400);
+                    redisUtil.saveByKeyWithExpire(AppRedisKey.DOWNLOAD + fileName + mid,failDto,10L);
+                } else {
+                    if (Objects.equals(fileRedisDto.getCode(),200)) {
+                        break;
+                    } else {
+                        log.info("第" +i+"次尝试");
+                        //尝试失败则设置code为400，如果装置响应了，则会将code置为200
+                        FileRedisDto failDto = new FileRedisDto();
+                        failDto.setCode(400);
+                        redisUtil.saveByKeyWithExpire(AppRedisKey.DOWNLOAD + fileName + mid,failDto,4L*i);
+                        ReqAndResDto.Req req = getPojo(mid,fileName,step);
+                        publisher.send("/Pfm/DevFileCmd/V1/" + id, new Gson().toJson(req), 1, false);
+                    }
+                }
+            }
+        } catch (Exception e) {
+            throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOAD_ERROR);
+        }
+    }
 
 }

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/CsDevErrEvtMapper.java

@@ -0,0 +1,22 @@
+package com.njcn.zlevent.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.user.pojo.vo.RoleVO;
+import com.njcn.zlevent.pojo.po.CsDevErrEvt;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * <p>
+ * 装置异常事件统计 Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2024-09-12
+ */
+public interface CsDevErrEvtMapper extends BaseMapper<CsDevErrEvt> {
+
+    Page<CsDevErrEvt> page(@Param("page")Page<CsDevErrEvt> page, @Param("ew") QueryWrapper<CsDevErrEvt> queryWrapper);
+
+}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/mapper/mapping/CsDevErrEvtMapper.xml

@@ -0,0 +1,10 @@
+<?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.njcn.zlevent.mapper.CsDevErrEvtMapper">
+    <select id="page" resultType="CsDevErrEvt">
+        SELECT
+            evt.*
+        FROM cs_dev_err_evt evt
+        WHERE ${ew.sqlSegment}
+    </select>
+</mapper>

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/runner/ZlEventApplicationRunner.java

@@ -0,0 +1,57 @@
+package com.njcn.zlevent.runner;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.zlevent.service.ICsWaveAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 类的介绍：项目重启或者接入，经过120s开始处理历史录波文件
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2024/9/18 13:57
+ */
+@Component
+@Slf4j
+public class ZlEventApplicationRunner implements ApplicationRunner {
+
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private EquipmentFeignClient equipmentFeignClient;
+    @Resource
+    private ICsWaveAnalysisService csWaveAnalysisService;
+    ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
+    private static final long EVENT_TIME = 120L;
+
+    @Override
+    public void run(ApplicationArguments args) {
+        //项目启动120s后开始消费缓存的波形文件
+        Runnable task = () -> {
+            log.info("开始消费缓存的波形文件");
+            List<CsEquipmentDeliveryPO> list = equipmentFeignClient.getAll().getData();
+            if (CollectionUtil.isNotEmpty(list)) {
+                list.forEach(item->{
+                    redisUtil.delete("handleEvent:" + item.getNdid());
+                    //处理缓存数据
+                    csWaveAnalysisService.channelWave(item.getNdid());
+                });
+            }
+        };
+        scheduler.schedule(task, EVENT_TIME, TimeUnit.SECONDS);
+        // 关闭调度程序
+        scheduler.shutdown();
+    }
+}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/ICsDevErrEvtService.java

@@ -0,0 +1,27 @@
+package com.njcn.zlevent.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.mq.message.AppEventMessage;
+import com.njcn.zlevent.pojo.param.ErrorEventParam;
+import com.njcn.zlevent.pojo.po.CsDevErrEvt;
+
+/**
+ * <p>
+ * 装置异常事件统计 服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2024-09-12
+ */
+public interface ICsDevErrEvtService extends IService<CsDevErrEvt> {
+
+    /**
+     * 将装置推送的异常事件统计，目前先入库
+     * @param appEventMessage
+     */
+    void insertErrorEvent(AppEventMessage appEventMessage);
+
+    Page<CsDevErrEvt> getList(ErrorEventParam param);
+
+}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/ICsWaveAnalysisService.java

@@ -20,4 +20,6 @@ public interface ICsWaveAnalysisService {
      */
     void analysis(AppEventMessage appEventMessage);
 
+    void channelWave(String nDid);
+
 }

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/ICsWaveService.java

@@ -18,7 +18,7 @@ public interface ICsWaveService extends IService<CsWave> {
      * @param fileName 文件名称
      * @return
      */
-    int findCountByName(String fileName);
+    boolean findCountByName(String fileName);
 
     /**
      * 修改文件状态

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/IEventService.java

@@ -17,4 +17,12 @@ public interface IEventService {
      */
     void analysis(AppEventMessage appEventMessage);
 
+    /**
+     * 便携式设备基础数据
+     * 1.装置发起数据记录开始动作，库中新增数据；
+     * 2.装置发起数据记录结束动作，库中更新数据；
+     * @param appEventMessage
+     */
+    void getPortableData(AppEventMessage appEventMessage);
+
 }

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsAlarmServiceImpl.java

@@ -56,13 +56,13 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsEventMapper, CsEventPO> im
         try {
             List<AppEventMessage.DataArray> dataArray = appEventMessage.getMsg().getDataArray();
             for (AppEventMessage.DataArray item : dataArray) {
+                eventTime = eventService.timeFormat(item.getDataTimeSec(),item.getDataTimeUSec());
                 //事件入库
                 CsEventPO csEvent = new CsEventPO();
                 csEvent.setId(id);
                 csEvent.setDeviceId(po.getId());
                 csEvent.setProcess(po.getProcess());
                 csEvent.setCode(item.getCode());
-                eventTime = eventService.timeFormat(item.getDataTimeSec(),item.getDataTimeUSec());
                 csEvent.setStartTime(eventTime);
                 tag = item.getName();
                 csEvent.setTag(tag);
@@ -74,19 +74,19 @@ public class CsAlarmServiceImpl extends ServiceImpl<CsEventMapper, CsEventPO> im
             }
             if (CollectionUtil.isNotEmpty(list1)){
                 csEventService.saveBatch(list1);
-            }
-            //推送事件逻辑处理 && cs_event_user入库 && 修改字典中告警事件的编码
-            for (AppEventMessage.DataArray item : dataArray) {
-                if (Objects.isNull(item.getCode())){
-                    sendEventUtils.sendUser(2,item.getType(),po.getId(),item.getName(),eventTime,id);
-                } else {
-                    sendEventUtils.sendUser(2,item.getType(),po.getId(),item.getCode(),eventTime,id);
-                    //更新字典信息
-                    EleEpdPqd eleEpdPqd = epdFeignClient.findByName(item.getName()).getData();
-                    EleEpdPqdParam.EleEpdPqdUpdateParam updateParam = new EleEpdPqdParam.EleEpdPqdUpdateParam();
-                    BeanUtils.copyProperties(eleEpdPqd,updateParam);
-                    updateParam.setDefaultValue(item.getCode());
-                    epdFeignClient.update(updateParam);
+                //推送事件逻辑处理 && cs_event_user入库 && 修改字典中告警事件的编码
+                for (AppEventMessage.DataArray item : dataArray) {
+                    if (Objects.isNull(item.getCode())){
+                        sendEventUtils.sendUser(2,item.getType(),po.getId(),item.getName(),eventTime,id,po.getNdid());
+                    } else {
+                        sendEventUtils.sendUser(2,item.getType(),po.getId(),item.getCode(),eventTime,id,po.getNdid());
+                        //更新字典信息
+                        EleEpdPqd eleEpdPqd = epdFeignClient.findByName(item.getName()).getData();
+                        EleEpdPqdParam.EleEpdPqdUpdateParam updateParam = new EleEpdPqdParam.EleEpdPqdUpdateParam();
+                        BeanUtils.copyProperties(eleEpdPqd,updateParam);
+                        updateParam.setDefaultValue(item.getCode());
+                        epdFeignClient.update(updateParam);
+                    }
                 }
             }
         } catch (Exception e) {

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsDevErrEvtServiceImpl.java

@@ -0,0 +1,88 @@
+package com.njcn.zlevent.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.db.constant.DbConstant;
+import com.njcn.mq.message.AppEventMessage;
+import com.njcn.user.pojo.vo.RoleVO;
+import com.njcn.web.factory.PageFactory;
+import com.njcn.zlevent.mapper.CsDevErrEvtMapper;
+import com.njcn.zlevent.pojo.param.ErrorEventParam;
+import com.njcn.zlevent.pojo.po.CsDevErrEvt;
+import com.njcn.zlevent.service.ICsDevErrEvtService;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ * 装置异常事件统计 服务实现类
+ * </p>
+ *
+ * @author xy
+ * @since 2024-09-12
+ */
+@Service
+public class CsDevErrEvtServiceImpl extends ServiceImpl<CsDevErrEvtMapper, CsDevErrEvt> implements ICsDevErrEvtService {
+
+    @Override
+    public void insertErrorEvent(AppEventMessage appEventMessage) {
+        List<CsDevErrEvt> list = new ArrayList<>();
+        List<AppEventMessage.DataArray>  dataArrayList = appEventMessage.getMsg().getDataArray();
+        for (AppEventMessage.DataArray dataArray : dataArrayList) {
+            CsDevErrEvt evt = new CsDevErrEvt();
+            evt.setNdid(appEventMessage.getId());
+            evt.setEvtTime(timeFormat(dataArray.getDataTimeSec(),dataArray.getDataTimeUSec()));
+            evt.setCode(dataArray.getCode());
+            list.add(evt);
+        }
+        this.saveBatch(list);
+    }
+
+    @Override
+    public Page<CsDevErrEvt> getList(ErrorEventParam param) {
+        // 构造时间字符串
+        QueryWrapper<CsDevErrEvt> queryWrapper = new QueryWrapper<>();
+        queryWrapper.between("evt.evt_time",param.getStartTime() + " 00:00:00",param.getEndTime() + " 23:59:59");
+        queryWrapper.orderBy(true, false, "evt.evt_time");
+        if (ObjectUtil.isNotNull(param)) {
+            //查询参数不为空，进行条件填充
+            if (StrUtil.isNotBlank(param.getSearchValue())) {
+                //用户表提供用户名、登录名 模糊查询
+                queryWrapper
+                        .and(par -> par.like("evt.ndid", param.getSearchValue()));
+            }
+        }
+        return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
+    }
+
+    /**
+     * 时间转换
+     */
+    public LocalDateTime timeFormat(Long time1, Long time2) {
+        String time;
+        SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        time1 = time1 - 8*3600;
+        long t1 = time1 * 1000000 + time2;
+        String time1String = String.valueOf(t1);
+        String time11 = time1String.substring(time1String.length() - 6);
+        String time111 = time1String.substring(0,time1String.length() - 6);
+        String formatTime1 = format.format(Long.parseLong(time111) * 1000);
+        if (time2 == 0){
+            time = formatTime1 + ".000000";
+        } else {
+            time = formatTime1 + "." + time11;
+        }
+        DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
+        return LocalDateTime.parse(time, fmt);
+    }
+}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsEventServiceImpl.java

@@ -14,6 +14,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -37,8 +38,10 @@ public class CsEventServiceImpl extends ServiceImpl<CsEventMapper, CsEventPO> im
         lambdaUpdateWrapper.set(CsEventPO::getWavePath,csEventParam.getPath()).eq(CsEventPO::getLineId,csEventParam.getLineId())
                           .eq(CsEventPO::getDeviceId,csEventParam.getDeviceId())
                           .in(CsEventPO::getType, Arrays.asList(0,1))
-                          .eq(CsEventPO::getLocation,csEventParam.getLocation())
                           .between(CsEventPO::getStartTime,csEventParam.getStartTime(),csEventParam.getEndTime());
+        if (Objects.nonNull(csEventParam.getLocation())) {
+            lambdaUpdateWrapper.eq(CsEventPO::getLocation, csEventParam.getLocation());
+        }
         this.update(lambdaUpdateWrapper);
         List<CsEventPO> list = this.baseMapper.selectList(lambdaUpdateWrapper);
         if (CollectionUtil.isNotEmpty(list)){

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsWaveAnalysisServiceImpl.java

@@ -7,9 +7,12 @@ import com.njcn.access.api.CsTopicFeignClient;
 import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.pojo.dto.ReqAndResDto;
+import com.njcn.access.utils.ChannelObjectUtil;
+import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.mq.message.AppEventMessage;
 import com.njcn.redis.pojo.enums.AppRedisKey;
@@ -24,6 +27,7 @@ import com.njcn.zlevent.service.ICsWaveAnalysisService;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
+import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
 import java.text.SimpleDateFormat;
@@ -43,56 +47,90 @@ import java.util.stream.Collectors;
 public class CsWaveAnalysisServiceImpl implements ICsWaveAnalysisService {
 
     private final EquipmentFeignClient equipmentFeignClient;
-
     private final MqttPublisher publisher;
-
     private final CsTopicFeignClient csTopicFeignClient;
-
     private final RedisUtil redisUtil;
-
     private final CsLineFeignClient csLineFeignClient;
-
     private final DicDataFeignClient dicDataFeignClient;
+    private final ChannelObjectUtil channelObjectUtil;
+    private final MqttUtil mqttUtil;
+    private static Integer mid = 1;
 
     @Override
     public void analysis(AppEventMessage appEventMessage) {
-        int mid = 1;
-        //获取监测点
-        String lineId = null;
-        Object object1 = redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId());
-        if (Objects.isNull(object1)){
-            lineInfo(appEventMessage.getId());
-        }
-        //获取装置id
-        String deviceId = equipmentFeignClient.findDevByNDid(appEventMessage.getId()).getData().getId();
-        //获取波形文件名称
-        List<AppEventMessage.DataArray> dataArrayList = appEventMessage.getMsg().getDataArray();
-        if (CollectionUtil.isNotEmpty(dataArrayList)){
-            for (AppEventMessage.DataArray item : dataArrayList) {
-                //处理mid
-                if (Objects.equals(mid,10000)){
-                    mid = 1;
-                }
-                List<AppEventMessage.Param> paramList = item.getParam();
-                Object object = paramList.stream().filter(item2 -> ZlConstant.WAVE_NAME.equals(item2.getName())).findFirst().get().getData();
-                Object object2 = paramList.stream().filter(item2 -> ZlConstant.WAVE_PARAM_RCDKEEPTIME.equals(item2.getName())).findFirst().get().getData();
-                Object object3 = paramList.stream().filter(item2 -> ZlConstant.WAVE_POSITION.equals(item2.getName())).findFirst().get().getData();
-                if (Objects.equals(object3.toString(),ZlConstant.GRID)){
-                    lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("1").toString();
-                } else if (Objects.equals(object3.toString(),ZlConstant.LOAD)){
-                    lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("2").toString();
-                } else {
-                    lineId = new Gson().fromJson(String.valueOf(redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId())), Map.class).get("0").toString();
-                }
-                String fileName = object.toString().replaceAll("\\[","").replaceAll("]","");
-                List<String> fileList = Arrays.stream(fileName.split(",")).collect(Collectors.toList());
-                for (String file : fileList) {
-                    file = file.trim();
-                    askFileInfo(appEventMessage.getId(),mid,file);
-                    mid++;
-                    channelTimeRange(file,item.getDataTimeSec(),item.getDataTimeUSec(),(Double)object2,deviceId,lineId,object3.toString());
-                }
+        try {
+            List<WaveTimeDto> list = new ArrayList<>();
+            Object object1 = redisUtil.getObjectByKey(AppRedisKey.LINE_POSITION+appEventMessage.getId());
+            if (Objects.isNull(object1)){
+                lineInfo(appEventMessage.getId());
             }
+            //获取装置id
+            String deviceId = equipmentFeignClient.findDevByNDid(appEventMessage.getId()).getData().getId();
+            //获取波形文件名称
+            List<AppEventMessage.DataArray> dataArrayList = appEventMessage.getMsg().getDataArray();
+            if (CollectionUtil.isNotEmpty(dataArrayList)){
+                for (AppEventMessage.DataArray item : dataArrayList) {
+                    List<AppEventMessage.Param> paramList = item.getParam();
+                    Object object = paramList.stream().filter(item2 -> ZlConstant.WAVE_NAME.equals(item2.getName())).findFirst().map(AppEventMessage.Param::getData).orElse(null);
+                    Object object2 = paramList.stream().filter(item2 -> ZlConstant.WAVE_PARAM_RCDKEEPTIME.equals(item2.getName())).findFirst().map(AppEventMessage.Param::getData).orElse(null);
+                    Object object3 = paramList.stream().filter(item2->ZlConstant.WAVE_POSITION.equals(item2.getName())).findFirst().map(AppEventMessage.Param::getData).orElse(null);
+                    String lineId = appEventMessage.getId() + appEventMessage.getMsg().getClDid();
+                    String fileName = object.toString().replaceAll("\\[","").replaceAll("]","");
+                    List<String> fileList = Arrays.stream(fileName.split(",")).collect(Collectors.toList());
+                    //获取到录波文件，将文件信息存储起来
+                    for (String file : fileList) {
+                        file = file.trim();
+                        WaveTimeDto dto = channelTimeRange(file,appEventMessage.getId(),item.getDataTimeSec(),item.getDataTimeUSec(),(Double)object2,deviceId,lineId,Objects.isNull(object3)?null:object3.toString());
+                        list.add(dto);
+                    }
+                    Object obj = redisUtil.getObjectByKey("eventFile:" + appEventMessage.getId());
+                    if (!Objects.isNull(obj)) {
+                        List<WaveTimeDto> oldList = channelObjectUtil.objectToList(obj,WaveTimeDto.class);
+                        oldList.addAll(list);
+                        redisUtil.saveByKey("eventFile:" + appEventMessage.getId(), oldList);
+                    } else {
+                        redisUtil.saveByKey("eventFile:" + appEventMessage.getId(), list);
+                    }
+                }
+                //处理缓存数据
+                channelWave(appEventMessage.getId());
+            }
+        } catch (Exception e) {
+            //发生异常，清理标识
+            redisUtil.delete("handleEvent:" + appEventMessage.getId());
+        }
+    }
+
+    @Override
+    @Async("asyncExecutor")
+    public void channelWave(String nDid) {
+        //判断客户端是否在线，在线再处理文件
+        String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+        boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+        if (mqttClient){
+            //有相同文件处理时，则不进行数据处理
+            Object obj = redisUtil.getObjectByKey("handleEvent:" + nDid);
+            if (Objects.isNull(obj)) {
+                List<WaveTimeDto> list = channelObjectUtil.objectToList( redisUtil.getObjectByKey("eventFile:" + nDid),WaveTimeDto.class);
+                if (CollectionUtil.isNotEmpty(list)) {
+                    Object object = channelObjectUtil.getDeviceMid(nDid);
+                    if (!Objects.isNull(object)) {
+                        mid = (Integer) object;
+                    }
+                    WaveTimeDto dto = list.get(0);
+                    redisUtil.saveByKeyWithExpire("fileMid:" + nDid,mid + "concat" +dto.getFileName(),60L);
+                    askFileInfo(nDid,mid,dto.getFileName());
+                    mid = mid + 1;
+                    if (mid > 10000) {
+                        mid = 1;
+                    }
+                    redisUtil.saveByKey(AppRedisKey.DEVICE_MID + nDid,mid);
+                }
+            } else {
+                throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING);
+            }
+        } else {
+            throw new BusinessException(AlgorithmResponseEnum.DEV_OFFLINE);
         }
     }
 
@@ -114,10 +152,11 @@ public class CsWaveAnalysisServiceImpl implements ICsWaveAnalysisService {
         publisher.send("/Pfm/DevFileCmd/"+version+"/"+nDid,new Gson().toJson(reqAndResParam),1,false);
     }
 
+
     /**
      * 时间处理
      */
-    public void channelTimeRange(String fileName, long time, long subtleTime, Double millisecond, String deviceId, String lineId, String location) {
+    public WaveTimeDto channelTimeRange(String fileName,String nDid, long time, long subtleTime, Double millisecond, String deviceId, String lineId, String location) {
         SimpleDateFormat format =  new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         time = time - 8*3600;
         // 将millisecond转换为长整型，并乘以1000以获取微秒
@@ -136,12 +175,14 @@ public class CsWaveAnalysisServiceImpl implements ICsWaveAnalysisService {
         String formatTime2 = format.format(Long.parseLong(time222) * 1000);
 
         WaveTimeDto waveTimeDto = new WaveTimeDto();
+        waveTimeDto.setFileName(fileName);
         waveTimeDto.setStartTime(formatTime1 + "." + time11);
         waveTimeDto.setEndTime(formatTime2 + "." + time22);
         waveTimeDto.setDeviceId(deviceId);
+        waveTimeDto.setNDid(nDid);
         waveTimeDto.setLineId(lineId);
         waveTimeDto.setLocation(location);
-        redisUtil.saveByKeyWithExpire(AppRedisKey.TIME+fileName,waveTimeDto,600L);
+        return  waveTimeDto;
     }
 
     /**

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/CsWaveServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.zlevent.service.impl;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,6 +9,9 @@ import com.njcn.zlevent.pojo.po.CsWave;
 import com.njcn.zlevent.service.ICsWaveService;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+import java.util.Objects;
+
 /**
  * <p>
  * 治理波形文件记录表 服务实现类
@@ -20,10 +24,11 @@ import org.springframework.stereotype.Service;
 public class CsWaveServiceImpl extends ServiceImpl<CsWaveMapper, CsWave> implements ICsWaveService {
 
     @Override
-    public int findCountByName(String fileName) {
-        LambdaQueryWrapper<CsWave> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.like(CsWave::getRcdName,fileName).eq(CsWave::getStatus,1);
-        return this.baseMapper.selectCount(lambdaQueryWrapper);
+    public boolean findCountByName(String fileName) {
+        List<CsWave> csWaveDat = selectCsWave(".dat",fileName);
+        List<CsWave> csWaveCfg = selectCsWave(".cfg",fileName);
+        // 判断两个查询结果是否都不为空
+        return CollectionUtil.isNotEmpty(csWaveDat) && CollectionUtil.isNotEmpty(csWaveCfg);
     }
 
     @Override
@@ -32,4 +37,11 @@ public class CsWaveServiceImpl extends ServiceImpl<CsWaveMapper, CsWave> impleme
         lambdaQueryWrapper.eq(CsWave::getRcdName,fileName).set(CsWave::getStatus,1);
         this.update(lambdaQueryWrapper);
     }
+
+    public List<CsWave> selectCsWave(String suffix, String fileName) {
+        LambdaQueryWrapper<CsWave> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.like(CsWave::getRcdName, fileName.concat(suffix)).eq(CsWave::getStatus, 1);
+        return this.baseMapper.selectList(lambdaQueryWrapper);
+    }
+
 }

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/EventServiceImpl.java

@@ -6,8 +6,12 @@ import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.api.WlRecordFeignClient;
+import com.njcn.csdevice.pojo.param.WlRecordParam;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.po.WlRecord;
+import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.csharmonic.pojo.po.CsEventPO;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
 import com.njcn.influx.utils.InfluxDbUtils;
@@ -34,8 +38,11 @@ import org.influxdb.dto.Point;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
@@ -53,22 +60,15 @@ import java.util.concurrent.TimeUnit;
 public class EventServiceImpl implements IEventService {
 
     private final CsLineFeignClient csLineFeignClient;
-
     private final DicDataFeignClient dicDataFeignClient;
-
     private final EpdFeignClient epdFeignClient;
-
     private final RedisUtil redisUtil;
-
     private final ICsEventService csEventService;
-
     private final EquipmentFeignClient equipmentFeignClient;
-
     private final InfluxDbUtils influxDbUtils;
-
     private final ICsEventLogsService csEventLogsService;
-
     private final SendEventUtils sendEventUtils;
+    private final WlRecordFeignClient wlRecordFeignClient;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -92,6 +92,7 @@ public class EventServiceImpl implements IEventService {
             //处理事件数据
             List<AppEventMessage.DataArray> dataArray = appEventMessage.getMsg().getDataArray();
             for (AppEventMessage.DataArray item : dataArray) {
+                eventTime = timeFormat(item.getDataTimeSec(),item.getDataTimeUSec());
                 id = IdUtil.fastSimpleUUID();
                 //事件入库
                 CsEventPO csEvent = new CsEventPO();
@@ -122,6 +123,7 @@ public class EventServiceImpl implements IEventService {
                         Map<String, String> tags = new HashMap<>();
                         tags.put(InfluxDBTableConstant.UUID,id);
                         Map<String,Object> fields = new HashMap<>();
+                        //只有治理型号的设备有监测位置
                         if (Objects.equals(ZlConstant.EVENT_POSITION,param.getName())){
                             if (Objects.equals(param.getData(),ZlConstant.GRID)){
                                 fields.put(param.getName(),"电网侧");
@@ -137,6 +139,10 @@ public class EventServiceImpl implements IEventService {
                             if (Objects.equals(param.getName(),ZlConstant.EVT_PARAM_TM)){
                                 csEvent.setPersistTime(Double.parseDouble(param.getData().toString()));
                             }
+                            lineId = appEventMessage.getId() + appEventMessage.getMsg().getClDid();
+                            fields.put(param.getName(),null);
+                            csEvent.setLocation(null);
+                            csEvent.setClDid(appEventMessage.getMsg().getClDid());
                             fields.put(param.getName(),param.getData());
                         }
                         //fixme 这边前置传递的应该是UTC时间,但是前置说是传递的北京时间,讨论了一下没太理解。这边暂时先这样处理,influx入库处理成北京时间,减去8小时。
@@ -161,15 +167,15 @@ public class EventServiceImpl implements IEventService {
             //cs_event入库
             if (CollectionUtil.isNotEmpty(list1)){
                 csEventService.saveBatch(list1);
+                //推送事件逻辑处理 && cs_event_user入库
+                for (AppEventMessage.DataArray item : dataArray) {
+                    sendEventUtils.sendUser(1,item.getType(),po.getId(),item.getName(),eventTime,id,po.getNdid());
+                }
             }
             //evt_data入库
             if (CollectionUtil.isNotEmpty(records)) {
                 influxDbUtils.batchInsert(influxDbUtils.getDbName(), "", InfluxDB.ConsistencyLevel.ALL, TimeUnit.MILLISECONDS, records);
             }
-            //推送事件逻辑处理 && cs_event_user入库
-            for (AppEventMessage.DataArray item : dataArray) {
-                sendEventUtils.sendUser(1,item.getType(),po.getId(),item.getName(),eventTime,id);
-            }
         } catch (Exception e) {
             CsEventLogs csEventLogs = new CsEventLogs();
             csEventLogs.setLineId(lineId);
@@ -183,6 +189,93 @@ public class EventServiceImpl implements IEventService {
         }
     }
 
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void getPortableData(AppEventMessage appEventMessage) {
+        CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(appEventMessage.getId()).getData();
+        //根据报文判断是新增还是更新
+        List<AppEventMessage.DataArray> dataArrays = appEventMessage.getMsg().getDataArray();
+        dataArrays.forEach(item->{
+            WlRecordParam.Record param = new WlRecordParam.Record();
+            param.setDevId(vo.getId());
+            param.setLineId(appEventMessage.getId() + item.getClDid().toString());
+            param.setProName(item.getPrjName());
+            param.setProStartTime(timestampToDatetime((item.getPrjTimeStart() - 8*3600)));
+            WlRecord record = wlRecordFeignClient.findDevBaseData(param).getData();
+            if (!Objects.isNull(record)) {
+                if (!Objects.equals(item.getPrjTimeEnd(),-1L)) {
+                    WlRecordParam.UpdateRecord wlRecord = new WlRecordParam.UpdateRecord();
+                    wlRecord.setId(record.getId());
+                    wlRecord.setProEndTime(timestampToDatetime((item.getPrjTimeEnd() - 8*3600)));
+                    wlRecordFeignClient.updateTestRecord(wlRecord);
+                }
+            } else {
+                //新项目入库
+                WlRecord wlRecord = new WlRecord();
+                wlRecord.setId(IdUtil.simpleUUID());
+                wlRecord.setItemName("基础数据");
+                wlRecord.setGcName(item.getPrjName());
+                wlRecord.setDevId(vo.getId());
+                wlRecord.setLineId(appEventMessage.getId() + item.getClDid().toString());
+                wlRecord.setStatisticalInterval(item.getStatCycle());
+                wlRecord.setPt(item.getPtRatio());
+                wlRecord.setCt(item.getCtRatio());
+                //电压等级
+                DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(channelVol(item.getVolGrade()) + "kV","Dev_Voltage_Stand").getData();
+                wlRecord.setVoltageLevel(Objects.isNull(dictData)?null:dictData.getId());
+                wlRecord.setCapacitySscb(item.getCapacitySscb());
+                wlRecord.setCapacitySscmin(item.getCapacitySscmin());
+                wlRecord.setCapacitySt(item.getCapacitySt());
+                wlRecord.setCapacitySi(item.getCapacitySi());
+                //电压接线方式
+                wlRecord.setVolConType(getVolConType(item.getVolConType()));
+                //fixme 电流接线方式 这边系统没有字典，录入字典通用性不强，采用装置上送值存储
+                wlRecord.setCurConSel(item.getCurConSel().toString());
+                wlRecord.setStartTime(timestampToDatetime((item.getPrjTimeStart() - 8*3600)));
+                wlRecord.setType(1);
+                wlRecord.setState(1);
+                wlRecord.setGcDataPath(item.getPrjDataPath());
+                wlRecordFeignClient.addBaseData(wlRecord);
+            }
+        });
+    }
+
+    /**
+     * 处理电压
+     * @param vol
+     * @return
+     */
+    public String channelVol(Float vol) {
+        BigDecimal value = new BigDecimal(vol);
+        BigDecimal noZeros = value.stripTrailingZeros();
+        return noZeros.toPlainString();
+    }
+
+    // 0-星型, 1-角型, 2-V型
+    // star-星型、Star_Triangle-星三角、Open_Delta-开口三角
+    public String getVolConType(Integer volConType) {
+        String result = null;
+        String dictDataCode = null;
+        switch (volConType) {
+            case 0:
+                dictDataCode = "star";
+                break;
+            case 1:
+                dictDataCode = "Star_Triangle";
+                break;
+            case 2:
+                dictDataCode = "Open_Delta";
+                break;
+            default:
+                break;
+        }
+        if (!Objects.isNull(dictDataCode)) {
+            DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(dictDataCode,"Dev_Connect").getData();
+            result = dictData.getId();
+        }
+        return Objects.isNull(result)?null:result;
+    }
+
     /**
      * 缓存监测点相关信息
      */
@@ -243,4 +336,9 @@ public class EventServiceImpl implements IEventService {
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
         return LocalDateTime.parse(time, fmt);
     }
+
+    public LocalDateTime timestampToDatetime(long timestamp){
+        Instant instant = Instant.ofEpochSecond(timestamp);
+        return LocalDateTime.ofInstant(instant, ZoneId.systemDefault());
+    }
 }

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/service/impl/FileServiceImpl.java

@@ -4,17 +4,18 @@ import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.text.StrPool;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
-import com.alibaba.nacos.common.utils.ConcurrentHashSet;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
-import com.alibaba.nacos.shaded.com.google.gson.GsonBuilder;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
 import com.njcn.access.api.CsTopicFeignClient;
 import com.njcn.access.enums.AccessEnum;
 import com.njcn.access.enums.AccessResponseEnum;
 import com.njcn.access.enums.TypeEnum;
 import com.njcn.access.pojo.dto.ReqAndResDto;
+import com.njcn.access.utils.CRC32Utils;
+import com.njcn.access.utils.ChannelObjectUtil;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csharmonic.api.WavePicFeignClient;
 import com.njcn.mq.message.AppFileMessage;
 import com.njcn.oss.constant.GeneralConstant;
@@ -32,6 +33,7 @@ import com.njcn.zlevent.service.ICsEventFileLogsService;
 import com.njcn.zlevent.service.ICsEventService;
 import com.njcn.zlevent.service.ICsWaveService;
 import com.njcn.zlevent.service.IFileService;
+import com.njcn.zlevent.utils.RemoveInfoUtils;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONObject;
@@ -41,7 +43,6 @@ import java.io.*;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 类的介绍：
@@ -56,65 +57,68 @@ import java.util.concurrent.TimeUnit;
 public class FileServiceImpl implements IFileService {
 
     private final RedisUtil redisUtil;
-
     private final CsTopicFeignClient csTopicFeignClient;
-
     private final MqttPublisher publisher;
-
     private final FileStorageUtil fileStorageUtil;
-
     private final ICsEventService csEventService;
-
     private final ICsEventFileLogsService csEventLogsService;
-
     private final WavePicFeignClient wavePicFeignClient;
-
     private final ICsWaveService csWaveService;
-
     private final GeneralInfo generalInfo;
+    private final ChannelObjectUtil channelObjectUtil;
+    private final RemoveInfoUtils removeInfoUtils;
+    private static Integer mid = 1;
+    private final EquipmentFeignClient equipmentFeignClient;
 
     @Override
     public void analysisFileInfo(AppFileMessage appFileMessage) {
         if (Objects.equals(appFileMessage.getCode(), AccessEnum.SUCCESS.getCode())){
             DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
-            int mid = 1;
             int range = 51200;
             String fileName = appFileMessage.getMsg().getFileInfo().getName();
             //缓存文件信息用于文件流拼接
             FileInfoDto fileInfoDto = new FileInfoDto();
-            //获取波形文件起始结束时间
-            Object fileInfo = redisUtil.getObjectByKey(AppRedisKey.TIME+fileName);
-            if (Objects.isNull(fileInfo)){
-                throw new BusinessException(AccessResponseEnum.WAVE_INFO_MISSING);
+            List<WaveTimeDto> list = channelObjectUtil.objectToList(redisUtil.getObjectByKey("eventFile:" + appFileMessage.getId()),WaveTimeDto.class);
+            if (CollectionUtil.isNotEmpty(list)) {
+                WaveTimeDto waveTimeDto = channelObjectUtil.objectToList(redisUtil.getObjectByKey("eventFile:" + appFileMessage.getId()),WaveTimeDto.class).get(0);
+                fileInfoDto.setStartTime(waveTimeDto.getStartTime());
+                fileInfoDto.setEndTime(waveTimeDto.getEndTime());
+                fileInfoDto.setDeviceId(waveTimeDto.getDeviceId());
+                fileInfoDto.setLineId(waveTimeDto.getLineId());
+                fileInfoDto.setName(appFileMessage.getMsg().getFileInfo().getName());
+                fileInfoDto.setFileTime(appFileMessage.getMsg().getFileInfo().getFileTime());
+                fileInfoDto.setFileSize(appFileMessage.getMsg().getFileInfo().getFileSize());
+                fileInfoDto.setFileCheck(appFileMessage.getMsg().getFileInfo().getFileCheck());
+                fileInfoDto.setFileChkType(appFileMessage.getMsg().getFileInfo().getFileChkType());
+                fileInfoDto.setLocation(waveTimeDto.getLocation());
+                //存储波形文件
+                CsWave csWave = new CsWave();
+                csWave.setNdid(appFileMessage.getId());
+                csWave.setCreateTime(LocalDateTime.now());
+                csWave.setStartTime(LocalDateTime.parse(waveTimeDto.getStartTime(), fmt));
+                csWave.setEndTime(LocalDateTime.parse(waveTimeDto.getEndTime(), fmt));
+                csWave.setRcdName(fileName);
+                csWave.setLocation(waveTimeDto.getLocation());
+                csWave.setFileSize(appFileMessage.getMsg().getFileInfo().getFileSize());
+                csWave.setCheckType(appFileMessage.getMsg().getFileInfo().getFileChkType());
+                csWave.setCheckNumber(appFileMessage.getMsg().getFileInfo().getFileCheck());
+                csWave.setStatus(0);
+                csWaveService.save(csWave);
+                //获取mid
+                Object object = channelObjectUtil.getDeviceMid(appFileMessage.getId());
+                if (!Objects.isNull(object)) {
+                    mid = (Integer) object;
+                }
+                //请求当前文件的数据
+                askFileStream(appFileMessage.getId(),mid,fileName,-1,range);
+                redisUtil.saveByKey(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileInfoDto.getName()), fileInfoDto);
+                redisUtil.delete(AppRedisKey.TIME+fileName);
+                mid = mid + 1;
+                if (mid > 10000) {
+                    mid = 1;
+                }
+                redisUtil.saveByKey(AppRedisKey.DEVICE_MID + appFileMessage.getId(),mid);
             }
-            WaveTimeDto waveTimeDto = JSON.parseObject(JSON.toJSONString(fileInfo), WaveTimeDto.class);
-            fileInfoDto.setStartTime(waveTimeDto.getStartTime());
-            fileInfoDto.setEndTime(waveTimeDto.getEndTime());
-            fileInfoDto.setDeviceId(waveTimeDto.getDeviceId());
-            fileInfoDto.setLineId(waveTimeDto.getLineId());
-            fileInfoDto.setName(appFileMessage.getMsg().getFileInfo().getName());
-            fileInfoDto.setFileTime(appFileMessage.getMsg().getFileInfo().getFileTime());
-            fileInfoDto.setFileSize(appFileMessage.getMsg().getFileInfo().getFileSize());
-            fileInfoDto.setFileCheck(appFileMessage.getMsg().getFileInfo().getFileCheck());
-            fileInfoDto.setFileChkType(appFileMessage.getMsg().getFileInfo().getFileChkType());
-            fileInfoDto.setLocation(waveTimeDto.getLocation());
-            //存储波形文件
-            CsWave csWave = new CsWave();
-            csWave.setNdid(appFileMessage.getId());
-            csWave.setCreateTime(LocalDateTime.now());
-            csWave.setStartTime(LocalDateTime.parse(waveTimeDto.getStartTime(), fmt));
-            csWave.setEndTime(LocalDateTime.parse(waveTimeDto.getEndTime(), fmt));
-            csWave.setRcdName(fileName);
-            csWave.setLocation(waveTimeDto.getLocation());
-            csWave.setFileSize(appFileMessage.getMsg().getFileInfo().getFileSize());
-            csWave.setCheckType(appFileMessage.getMsg().getFileInfo().getFileChkType());
-            csWave.setCheckNumber(appFileMessage.getMsg().getFileInfo().getFileCheck());
-            csWave.setStatus(0);
-            csWaveService.save(csWave);
-            //请求当前文件的数据
-            askFileStream(appFileMessage.getId(),mid,fileName,-1,range);
-            redisUtil.saveByKey(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileInfoDto.getName()), fileInfoDto);
-            redisUtil.delete(AppRedisKey.TIME+fileName);
         } else {
             throw new BusinessException(AccessResponseEnum.RESPONSE_ERROR);
         }
@@ -123,8 +127,8 @@ public class FileServiceImpl implements IFileService {
     @Override
     public void analysisFileStream(AppFileMessage appFileMessage) {
         DateTimeFormatter fmt = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSSSSS");
-        String filePath;
-        List<Integer> list = new ArrayList<>();
+        String filePath = null;
+        Set<Integer> list = new HashSet<>();
         FileStreamDto fileStreamDto = new FileStreamDto();
         //波形文件上传成功后，将文件信息存储一下，方便后期查看
         CsWave csWave = new CsWave();
@@ -135,37 +139,137 @@ public class FileServiceImpl implements IFileService {
         csEventLogs.setNdid(appFileMessage.getId());
         csEventLogs.setFileName(appFileMessage.getMsg().getName());
         csEventLogs.setStatus(0);
+        //判断设备类型 true:治理设备 false:其他设备
+        boolean devModel = equipmentFeignClient.judgeDevModel(appFileMessage.getId()).getData();
         try {
             //todo 目前文件先只处理波形事件的，后续有其他文件再做处理
             String fileName = appFileMessage.getMsg().getName();
-            //String lsFileName =fileName.split(StrUtil.SLASH)[fileName.split(StrUtil.SLASH).length - 1];
             String lsFileName = generalInfo.getBusinessTempPath() + File.separator + fileName.split(StrUtil.SLASH)[fileName.split(StrUtil.SLASH).length - 1];
+            File lsFile = new File(generalInfo.getBusinessTempPath());
+            //如果文件夹不存在则创建
+            if (!lsFile.exists() && !lsFile.isDirectory()) {
+                lsFile .mkdirs();
+            }
             //获取缓存的文件信息
             Object fileInfo = redisUtil.getObjectByKey(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileName));
             FileInfoDto fileInfoDto = JSON.parseObject(JSON.toJSONString(fileInfo), FileInfoDto.class);
-            //1.判断当前文件是否之前缓存过，没缓存，则先缓存(这边缓存两条记录，一条是用来判断超时的，还有一条记录文件数据，文件数据目前没有过期时间，文件数据收完才会删除)
-            //2.缓存了判断收到的报文个数是否和总个数一致，一致则解析文件；不一致则更新缓存
-            //3.超时判断: 30s分钟未收到相关文件信息，核查文件个数，看丢失哪些帧，重新请求
-            if(fileName.contains(".cfg") || fileName.contains(".dat")) {
-                if (appFileMessage.getMsg().getFrameTotal() == 1){
+            if (Objects.isNull(fileInfoDto)) {
+                String fileCheck = redisUtil.getObjectByKey("fileCheck"+appFileMessage.getId()+fileName).toString();
+                if (appFileMessage.getMsg().getFrameTotal() == 1) {
                     //解析文件入库
-                    filePath = fileStream(1,null,appFileMessage.getMsg().getData(),fileName,appFileMessage.getId());
+                    filePath = fileStream(1,null,appFileMessage.getMsg().getData(),fileName,appFileMessage.getId(),fileCheck,"download");
                     csEventLogs.setStatus(1);
                     csEventLogs.setRemark("当前文件1帧,全部收到,解析成功!");
                     csEventLogs.setNowStep(1);
                     csEventLogs.setAllStep(1);
                     csEventLogs.setIsAll(1);
-                    //更新文件信息
-                    csWaveService.updateCsWave(fileName);
-                    //波形文件关联事件
-                    filePath = filePath.replaceAll(GeneralConstant.CFG,"").replaceAll(GeneralConstant.DAT,"");
-                    List<String> eventList = correlateEvents(fileInfoDto,filePath,fileName);
-                    //波形文件解析成图片
-                    if (CollectionUtil.isNotEmpty(eventList)){
-                        eventList.forEach(wavePicFeignClient::getWavePics);
-                    }
-                    redisUtil.delete(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileInfoDto.getName()));
+                    redisUtil.delete(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()));
+                    redisUtil.delete(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileName));
+                    //存储文件信息
+                    fileStreamDto.setTotal(appFileMessage.getMsg().getFrameTotal());
+                    fileStreamDto.setNDid(appFileMessage.getId());
+                    fileStreamDto.setFrameLen(appFileMessage.getMsg().getFrameLen());
+                    list.add(appFileMessage.getMsg().getFrameCurr());
+                    fileStreamDto.setList(list);
+                    redisUtil.saveByKey(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()), fileStreamDto);
                 } else {
+                    //收到数据就刷新缓存值
+                    redisUtil.saveByKeyWithExpire(AppRedisKey.FILE_DOWN_TIME.concat(appFileMessage.getMsg().getName()), null, 60L);
+                    Object object1 = redisUtil.getObjectByKey(AppRedisKey.FILE_PART.concat(fileName));
+                    if (Objects.isNull(object1)){
+                        fileStreamDto.setTotal(appFileMessage.getMsg().getFrameTotal());
+                        fileStreamDto.setNDid(appFileMessage.getId());
+                        fileStreamDto.setFrameLen(appFileMessage.getMsg().getFrameLen());
+                        list.add(appFileMessage.getMsg().getFrameCurr());
+                        fileStreamDto.setList(list);
+                        csEventLogs.setStatus(1);
+                        csEventLogs.setRemark("当前文件"+appFileMessage.getMsg().getFrameTotal()+"帧,这是第"+appFileMessage.getMsg().getFrameCurr()+"帧,记录成功!");
+                        csEventLogs.setNowStep(appFileMessage.getMsg().getFrameCurr());
+                        csEventLogs.setAllStep(appFileMessage.getMsg().getFrameTotal());
+                        csEventLogs.setIsAll(0);
+                        redisUtil.saveByKey(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()), fileStreamDto);
+                        //将数据写入临时文件
+                        appendFile(lsFileName,appFileMessage.getMsg().getFrameCurr(),appFileMessage.getMsg().getData());
+                        log.info("当前文件 {} 帧,这是第 {} 帧报文,记录成功", appFileMessage.getMsg().getFrameTotal(), appFileMessage.getMsg().getFrameCurr());
+                    } else {
+                        FileStreamDto dto = JSON.parseObject(JSON.toJSONString(object1), FileStreamDto.class);
+                        //防止出现录入重复数据，做个判断
+                        if (!dto.getList().contains(appFileMessage.getMsg().getFrameCurr())) {
+                            dto.getList().add(appFileMessage.getMsg().getFrameCurr());
+                            if (Objects.equals(dto.getTotal(), dto.getList().size())) {
+                                Map<Integer, String> filePartMap = readFile(lsFileName);
+                                filePartMap.put(appFileMessage.getMsg().getFrameCurr(), appFileMessage.getMsg().getData());
+                                //解析文件入库
+                                filePath = fileStream(dto.getTotal(), filePartMap, null, fileName, appFileMessage.getId(),fileCheck,"download");
+                                csEventLogs.setStatus(1);
+                                csEventLogs.setRemark("当前文件" + appFileMessage.getMsg().getFrameTotal() + "帧,这是第" + appFileMessage.getMsg().getFrameCurr() + "帧,全部收到,解析成功!");
+                                csEventLogs.setNowStep(appFileMessage.getMsg().getFrameCurr());
+                                csEventLogs.setAllStep(appFileMessage.getMsg().getFrameTotal());
+                                csEventLogs.setIsAll(1);
+                                log.info("当前文件 {} 帧,这是第 {} 帧报文,全部收到,解析成功!", appFileMessage.getMsg().getFrameTotal(), appFileMessage.getMsg().getFrameCurr());
+                                //删除临时文件
+                                File file = new File(lsFileName);
+                                if (file.exists()) {
+                                    file.delete();
+                                }
+                                redisUtil.delete(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()));
+                                redisUtil.delete(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileName));
+                                redisUtil.delete(AppRedisKey.FILE_DOWN_TIME.concat(appFileMessage.getMsg().getName()));
+                            } else {
+                                csEventLogs.setStatus(1);
+                                csEventLogs.setRemark("当前文件" + appFileMessage.getMsg().getFrameTotal() + "帧,这是第" + appFileMessage.getMsg().getFrameCurr() + "帧,记录成功!");
+                                csEventLogs.setNowStep(appFileMessage.getMsg().getFrameCurr());
+                                csEventLogs.setAllStep(appFileMessage.getMsg().getFrameTotal());
+                                csEventLogs.setIsAll(0);
+                                redisUtil.saveByKey(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()), dto);
+                                //将数据写入临时文件
+                                appendFile(lsFileName, appFileMessage.getMsg().getFrameCurr(), appFileMessage.getMsg().getData());
+                                log.info("当前文件 {} 帧,这是第 {} 帧报文,记录成功", appFileMessage.getMsg().getFrameTotal(), appFileMessage.getMsg().getFrameCurr());
+                            }
+                        } else {
+                            csEventLogs.setStatus(1);
+                            csEventLogs.setRemark("当前文件为重复帧,这是第" + appFileMessage.getMsg().getFrameCurr() + "帧,不做记录!");
+                            csEventLogs.setNowStep(appFileMessage.getMsg().getFrameCurr());
+                            csEventLogs.setAllStep(appFileMessage.getMsg().getFrameTotal());
+                            csEventLogs.setIsAll(0);
+                        }
+                    }
+                }
+                //推送mqtt
+                String json = "{fileName:"+appFileMessage.getMsg().getName()+",allStep:"+appFileMessage.getMsg().getFrameTotal()+",nowStep:"+ appFileMessage.getMsg().getFrameCurr() +"}";
+                publisher.send("/Web/Progress/" + appFileMessage.getId(), new Gson().toJson(json), 1, false);
+                if (!Objects.isNull(filePath)){
+                    redisUtil.saveByKey("downloadFilePath:" + appFileMessage.getId() + appFileMessage.getMsg().getName(),filePath);
+                }
+            }
+            //录波文件下载
+            //1.判断当前文件是否之前缓存过，没缓存，则先缓存(这边缓存两条记录，一条是用来判断超时的，还有一条记录文件数据，文件数据目前没有过期时间，文件数据收完才会删除)
+            //2.缓存了判断收到的报文个数是否和总个数一致，一致则解析文件；不一致则更新缓存
+            //3.超时判断: 30s未收到相关文件信息，核查文件个数，看丢失哪些帧，重新请求
+            else {
+                redisUtil.saveByKey("handleEvent:" + appFileMessage.getId(),"doing");
+                if (appFileMessage.getMsg().getFrameTotal() == 1){
+                    //解析文件入库
+                    filePath = fileStream(1,null,appFileMessage.getMsg().getData(),fileName,appFileMessage.getId(),fileInfoDto.getFileCheck(),"event");
+                    csEventLogs.setStatus(1);
+                    csEventLogs.setRemark("当前文件1帧,全部收到,解析成功!");
+                    csEventLogs.setNowStep(1);
+                    csEventLogs.setAllStep(1);
+                    csEventLogs.setIsAll(1);
+                    //更新文件信息
+                    csWaveService.updateCsWave(fileName);
+                    //波形文件关联事件
+                    filePath = filePath.replaceAll(GeneralConstant.CFG,"").replaceAll(GeneralConstant.DAT,"");
+                    List<String> eventList = correlateEvents(fileInfoDto,filePath,fileName);
+                    //波形文件解析成图片
+                    if (CollectionUtil.isNotEmpty(eventList) && devModel){
+                        eventList.forEach(wavePicFeignClient::getWavePics);
+                    }
+                    //解析完删除、处理缓存
+                    removeInfoUtils.deleteEventInfo(appFileMessage.getId(),fileName);
+                } else {
+                    //收到数据就刷新缓存值
+                    redisUtil.saveByKeyWithExpire(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()), null, 60L);
                     Object object1 = redisUtil.getObjectByKey(AppRedisKey.FILE_PART.concat(fileName));
                     if (Objects.isNull(object1)){
                         fileStreamDto.setTotal(appFileMessage.getMsg().getFrameTotal());
@@ -178,7 +282,6 @@ public class FileServiceImpl implements IFileService {
                         csEventLogs.setNowStep(appFileMessage.getMsg().getFrameCurr());
                         csEventLogs.setAllStep(appFileMessage.getMsg().getFrameTotal());
                         csEventLogs.setIsAll(0);
-                        redisUtil.saveByKeyWithExpire(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()), null, 30L);
                         redisUtil.saveByKey(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()), fileStreamDto);
                         //将数据写入临时文件
                         appendFile(lsFileName,appFileMessage.getMsg().getFrameCurr(),appFileMessage.getMsg().getData());
@@ -192,7 +295,7 @@ public class FileServiceImpl implements IFileService {
                                 Map<Integer, String> filePartMap = readFile(lsFileName);
                                 filePartMap.put(appFileMessage.getMsg().getFrameCurr(), appFileMessage.getMsg().getData());
                                 //解析文件
-                                filePath = fileStream(appFileMessage.getMsg().getFrameTotal(), filePartMap, null, fileName, appFileMessage.getId());
+                                filePath = fileStream(appFileMessage.getMsg().getFrameTotal(), filePartMap, null, fileName, appFileMessage.getId(),fileInfoDto.getFileCheck(),"event");
                                 csEventLogs.setStatus(1);
                                 csEventLogs.setRemark("当前文件" + appFileMessage.getMsg().getFrameTotal() + "帧,这是第" + appFileMessage.getMsg().getFrameCurr() + "帧,全部收到,解析成功!");
                                 csEventLogs.setNowStep(appFileMessage.getMsg().getFrameCurr());
@@ -205,30 +308,24 @@ public class FileServiceImpl implements IFileService {
                                 filePath = filePath.replaceAll(GeneralConstant.CFG, "").replaceAll(GeneralConstant.DAT, "");
                                 List<String> eventList = correlateEvents(fileInfoDto, filePath, fileName);
                                 //波形文件解析成图片
-                                if (CollectionUtil.isNotEmpty(eventList)) {
+                                if (CollectionUtil.isNotEmpty(eventList) && devModel) {
                                     eventList.forEach(wavePicFeignClient::getWavePics);
                                 }
-                                redisUtil.delete(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileInfoDto.getName()));
                                 redisUtil.delete(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()));
                                 redisUtil.delete(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()));
-                                redisUtil.delete(AppRedisKey.FILE_PART_MISSING.concat(appFileMessage.getMsg().getName()));
+                                //解析完删除、处理缓存
+                                removeInfoUtils.deleteEventInfo(appFileMessage.getId(),fileName);
                                 //删除临时文件
                                 File file = new File(lsFileName);
                                 if (file.exists()) {
                                     file.delete();
                                 }
                             } else {
-                                Object object2 = redisUtil.getObjectByKey(AppRedisKey.FILE_PART_MISSING.concat(fileName));
                                 csEventLogs.setStatus(1);
                                 csEventLogs.setRemark("当前文件" + appFileMessage.getMsg().getFrameTotal() + "帧,这是第" + appFileMessage.getMsg().getFrameCurr() + "帧,记录成功!");
                                 csEventLogs.setNowStep(appFileMessage.getMsg().getFrameCurr());
                                 csEventLogs.setAllStep(appFileMessage.getMsg().getFrameTotal());
                                 csEventLogs.setIsAll(0);
-                                if (Objects.isNull(object2)) {
-                                    redisUtil.saveByKeyWithExpire(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()), null, 30L);
-                                } else {
-                                    redisUtil.saveByKeyWithExpire(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()), null, 1L);
-                                }
                                 redisUtil.saveByKey(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()), dto);
                                 //将数据写入临时文件
                                 appendFile(lsFileName, appFileMessage.getMsg().getFrameCurr(), appFileMessage.getMsg().getData());
@@ -249,9 +346,6 @@ public class FileServiceImpl implements IFileService {
                 csEventLogs.setLocation(fileInfoDto.getLocation());
                 //记录日志
                 csEventLogsService.save(csEventLogs);
-            } else {
-                //todo 处理其他文件
-                log.info("暂未做其他文件处理");
             }
         } catch (Exception e){
             csEventLogs.setStatus(0);
@@ -259,6 +353,18 @@ public class FileServiceImpl implements IFileService {
             csEventLogs.setCompleteTime(LocalDateTime.now());
             //记录日志
             csEventLogsService.save(csEventLogs);
+            //清空缓存
+            redisUtil.delete(AppRedisKey.FILE_PART_TIME.concat(appFileMessage.getMsg().getName()));
+            redisUtil.delete(AppRedisKey.FILE_PART.concat(appFileMessage.getMsg().getName()));
+            //删除临时文件
+            String fileName = appFileMessage.getMsg().getName();
+            String lsFileName = generalInfo.getBusinessTempPath() + File.separator + fileName.split(StrUtil.SLASH)[fileName.split(StrUtil.SLASH).length - 1];
+            File file = new File(lsFileName);
+            if (file.exists()) {
+                file.delete();
+            }
+            //继续消费
+            removeInfoUtils.deleteEventInfo(appFileMessage.getId(),appFileMessage.getMsg().getName());
         }
     }
 
@@ -283,10 +389,10 @@ public class FileServiceImpl implements IFileService {
     /**
      * 组装文件
      */
-    public String fileStream(Integer number, Map<Integer,String> map, String data, String fileName, String nDid) {
+    public String fileStream(Integer number, Map<Integer,String> map, String data, String fileName, String nDid, String fileCheck,String type) {
         String filePath;
         if (number == 1){
-            filePath = stream(true,data,nDid,fileName,null);
+            filePath = stream(true,data,nDid,fileName,null,fileCheck,type);
         } else {
             int lengthByte = 0;
             for (int i = 1; i <= number; i++) {
@@ -300,7 +406,7 @@ public class FileServiceImpl implements IFileService {
                 System.arraycopy(byteArray, 0, allByte, countLength, byteArray.length);
                 countLength += byteArray.length;
             }
-            filePath = stream(false,null,nDid,fileName,allByte);
+            filePath = stream(false,null,nDid,fileName,allByte,fileCheck,type);
         }
         return filePath;
     }
@@ -308,7 +414,8 @@ public class FileServiceImpl implements IFileService {
     /**
      *  解析存储文件信息
      */
-    public String stream(boolean bool, String stream, String folder, String fileName, byte[] bytes) {
+    public String stream(boolean bool, String stream, String folder, String fileName, byte[] bytes, String fileCheck, String type) {
+        String path;
         byte[] byteArray = null;
         //将文件后缀替换成大写
         String[] parts = fileName.split(StrUtil.SLASH);
@@ -321,9 +428,18 @@ public class FileServiceImpl implements IFileService {
         } else {
             byteArray = bytes;
         }
-        //todo 此处需要做文件crc校验或者md5校验，目前不知道怎么处理，先放一下
+        //文件校验
+        int crc = CRC32Utils.calculateCRC32(byteArray,byteArray.length,0xffffffff);
+        String hexString = String.format("%08X", crc);
+        if (!Objects.equals(hexString,fileCheck)) {
+            throw new BusinessException(AccessResponseEnum.FILE_CHECK_ERROR);
+        }
         InputStream inputStream = new ByteArrayInputStream(byteArray);
-        String path = fileStorageUtil.uploadStreamSpecifyName(inputStream, OssPath.WAVE_DIR + folder + StrUtil.SLASH,fileName);
+        if (Objects.equals(type,"download")) {
+            path = fileStorageUtil.uploadStreamSpecifyName(inputStream, OssPath.DOWNLOAD_DIR + folder + StrUtil.SLASH,fileName);
+        } else {
+            path = fileStorageUtil.uploadStreamSpecifyName(inputStream, OssPath.WAVE_DIR + folder + StrUtil.SLASH,fileName);
+        }
         try {
             inputStream.close();
         } catch (IOException e) {
@@ -363,8 +479,8 @@ public class FileServiceImpl implements IFileService {
         List<String> list = new ArrayList<>();
         String[] parts = fileName.split(StrUtil.SLASH);
         fileName = parts[parts.length - 1].split("\\.")[0];
-        int fileCounts = csWaveService.findCountByName(fileName);
-        if (fileCounts >= 2){
+        boolean result = csWaveService.findCountByName(fileName);
+        if (result){
             CsEventParam csEventParam = new CsEventParam();
             csEventParam.setLineId(fileInfoDto.getLineId());
             csEventParam.setDeviceId(fileInfoDto.getDeviceId());

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/FileCheckUtils.java

@@ -1,59 +0,0 @@
-package com.njcn.zlevent.utils;
-
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.zip.CRC32;
-
-/**
- * 类的介绍：用于文件校验
- *
- * @author xuyang
- * @version 1.0.0
- * @createTime 2023/9/8 13:32
- */
-
-public class FileCheckUtils {
-
-    /**
-     * 32位CRC检验
-     * @param inputStream 文件流
-     * @return
-     * @throws IOException
-     */
-    public static long calculateCRC32Checksum(InputStream inputStream) throws IOException {
-        CRC32 crc32 = new CRC32();
-        // 用于读取文件内容的缓冲区
-        byte[] buffer = new byte[1024];
-        int bytesRead;
-        while ((bytesRead = inputStream.read(buffer)) != -1) {
-            crc32.update(buffer, 0, bytesRead);
-        }
-        return crc32.getValue();
-    }
-
-    /**
-     * MD5检验
-     * @param inputStream 文件流
-     * @return
-     * @throws IOException
-     */
-    public static String calculateMD5Checksum(InputStream inputStream) throws IOException, NoSuchAlgorithmException {
-        MessageDigest md5 = MessageDigest.getInstance("MD5");
-        // 用于读取文件内容的缓冲区
-        byte[] buffer = new byte[8192];
-        int bytesRead;
-        while ((bytesRead = inputStream.read(buffer)) != -1) {
-            md5.update(buffer, 0, bytesRead);
-        }
-        byte[] digest = md5.digest();
-        // 将MD5摘要转换为十六进制字符串
-        StringBuilder md5Checksum = new StringBuilder();
-        for (byte b : digest) {
-            md5Checksum.append(String.format("%02x", b));
-        }
-        return md5Checksum.toString();
-    }
-}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/RemoveInfoUtils.java

@@ -0,0 +1,92 @@
+package com.njcn.zlevent.utils;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.access.utils.ChannelObjectUtil;
+import com.njcn.redis.pojo.enums.AppRedisKey;
+import com.njcn.redis.utils.RedisUtil;
+import com.njcn.zlevent.pojo.dto.WaveTimeDto;
+import com.njcn.zlevent.service.ICsWaveAnalysisService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 类的介绍：
+ * @author xuyang
+ */
+@Slf4j
+@Component
+public class RemoveInfoUtils {
+
+    @Resource
+    private RedisUtil redisUtil;
+    @Resource
+    private ChannelObjectUtil channelObjectUtil;
+    @Resource
+    private ICsWaveAnalysisService iCsWaveAnalysisService;
+
+    public void deleteEventInfo(String nDid, String fileName) {
+        redisUtil.delete("handleEvent:" + nDid);
+        redisUtil.delete(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileName));
+        //删除已经处理完的文件，之后再判断还有是否需要下载的文件
+        List<WaveTimeDto> fileDto = channelObjectUtil.objectToList(redisUtil.getObjectByKey("eventFile:" + nDid),WaveTimeDto.class);
+        fileDto.removeIf(item -> item.getFileName().equals(fileName));
+        redisUtil.saveByKey("eventFile:" + nDid, fileDto);
+        if (CollectionUtil.isNotEmpty(fileDto)) {
+            iCsWaveAnalysisService.channelWave(nDid);
+        }
+    }
+
+    public void retryEventInfo(String nDid, String fileName) {
+        // 尝试获取重试次数
+        Object retryObject = redisUtil.getObjectByKey("retryEvent:" + nDid + fileName);
+        int retryTimes = retryObject != null ? Integer.parseInt(retryObject.toString()) : 0;
+        // 删除相关的 Redis 键
+        deleteRelatedKeys(nDid, fileName);
+        // 处理重试逻辑
+        if (retryTimes < 4) {
+            // 增加重试次数并保存
+            redisUtil.saveByKey(("retryEvent:" + nDid + fileName), retryTimes + 1);
+            // 重排文件列表
+            //updateFileList(nDid, fileName);
+        } else {
+            // 从列表中移除文件
+            removeFileFromList(nDid, fileName);
+            // 清空计数
+            redisUtil.delete(("retryEvent:" + nDid + fileName));
+        }
+        // 检查是否还有其他文件需要处理
+        List<WaveTimeDto> fileDto = channelObjectUtil.objectToList(redisUtil.getObjectByKey("eventFile:" + nDid), WaveTimeDto.class);
+        if (CollectionUtil.isNotEmpty(fileDto)) {
+            iCsWaveAnalysisService.channelWave(nDid);
+        }
+    }
+
+    private void deleteRelatedKeys(String nDid, String fileName) {
+        redisUtil.delete("handleEvent:" + nDid);
+        redisUtil.delete(AppRedisKey.RMQ_FILE_CONSUME_KEY.concat(fileName));
+    }
+
+    private void updateFileList(String nDid, String fileName) {
+        List<WaveTimeDto> fileDto = channelObjectUtil.objectToList(redisUtil.getObjectByKey("eventFile:" + nDid), WaveTimeDto.class);
+        WaveTimeDto dto = fileDto.stream()
+                .filter(item -> item.getFileName().equals(fileName))
+                .findFirst()
+                .orElse(null);
+        if (dto != null) {
+            fileDto.removeIf(item -> item.getFileName().equals(fileName));
+            fileDto.add(dto);
+        }
+        redisUtil.saveByKey("eventFile:" + nDid, fileDto);
+    }
+
+    private void removeFileFromList(String nDid, String fileName) {
+        List<WaveTimeDto> fileDto = channelObjectUtil.objectToList(redisUtil.getObjectByKey("eventFile:" + nDid), WaveTimeDto.class);
+        fileDto.removeIf(item -> item.getFileName().equals(fileName));
+        redisUtil.saveByKey("eventFile:" + nDid, fileDto);
+        redisUtil.delete(AppRedisKey.FILE_PART.concat(fileName));
+    }
+
+}

iot-analysis/analysis-zl-event/zl-event-boot/src/main/java/com/njcn/zlevent/utils/SendEventUtils.java

@@ -2,11 +2,11 @@ package com.njcn.zlevent.utils;
 
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DatePattern;
-import cn.hutool.core.date.DateUnit;
-import cn.hutool.core.date.DateUtil;
-import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.njcn.access.pojo.dto.NoticeUserDto;
+import com.njcn.access.utils.SendMessageUtil;
 import com.njcn.csdevice.api.CsDeviceUserFeignClient;
 import com.njcn.csdevice.api.CsLedgerFeignClient;
+import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.api.EventLogsFeignClient;
 import com.njcn.csdevice.pojo.dto.DevDetailDTO;
 import com.njcn.csdevice.pojo.po.CsEventSendMsg;
@@ -17,24 +17,14 @@ import com.njcn.user.api.AppUserFeignClient;
 import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.po.app.AppInfoSet;
-import com.njcn.zlevent.pojo.dto.NoticeUserDto;
 import com.njcn.zlevent.service.ICsEventUserService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
@@ -52,27 +42,24 @@ public class SendEventUtils {
 
     @Resource
     private UserFeignClient userFeignClient;
-
     @Resource
     private AppUserFeignClient appUserFeignClient;
-
     @Resource
     private CsDeviceUserFeignClient csDeviceUserFeignClient;
-
     @Resource
     private AppInfoSetFeignClient appInfoSetFeignClient;
-
     @Resource
     private EventLogsFeignClient eventLogsFeignClient;
-
     @Resource
     private EpdFeignClient epdFeignClient;
-
     @Resource
     private ICsEventUserService csEventUserService;
-
     @Resource
     private CsLedgerFeignClient csLedgerFeignclient;
+    @Resource
+    private SendMessageUtil sendMessageUtil;
+    @Resource
+    private EquipmentFeignClient equipmentFeignClient;
 
     /**
      * 事件推送给相关用户
@@ -84,244 +71,233 @@ public class SendEventUtils {
      * @param id        事件id
      */
     @Transactional(rollbackFor = Exception.class)
-    public void sendUser(Integer eventType,String type,String devId, String eventName, LocalDateTime eventTime, String id) {
+    public void sendUser(Integer eventType,String type,String devId, String eventName, LocalDateTime eventTime, String id, String nDid) {
         int code;
         List<User> users = new ArrayList<>();
-
+        List<String> eventUser;
         List<String> devCodeList;
+        List<String> userList = new ArrayList<>();
         List<CsEventSendMsg> csEventSendMsgList = new ArrayList<>();
         NoticeUserDto noticeUserDto = new NoticeUserDto();
         NoticeUserDto.Payload payload = new NoticeUserDto.Payload();
         String content;
         List<CsEventUserPO> result = new ArrayList<>();
-        //事件处理
-        if (eventType == 1){
-            eventName = epdFeignClient.findByName(eventName).getData().getShowName();
-            switch (type) {
-                case "1":
-                    code = 2;
-                    //设备自身事件 不推送给用户，推送给业务管理
-                    users = getAdminUser();
-                    if (CollectionUtil.isNotEmpty(users)){
-                        noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode()));
-                        noticeUserDto.setTitle("设备事件");
-                        //记录需要通知的用户和事件关系
-                        CsEventUserPO csEventUser = new CsEventUserPO();
-                        csEventUser.setUserId(users.get(0).getId());
-                        csEventUser.setStatus(0);
-                        csEventUser.setEventId(id);
-                        result.add(csEventUser);
-                    }
-                    break;
-                case "2":
-                    code = 0;
-                    //暂态事件
-                    users = getEventUser(devId,0);
-                    devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
-                    noticeUserDto.setPushClientId(devCodeList);
-                    noticeUserDto.setTitle("暂态事件");
-                    //记录需要通知的用户和事件关系
-                    List<String> list2 = users.stream().map(User::getId).collect(Collectors.toList());
-                    list2.forEach(item->{
-                        CsEventUserPO csEventUser2 = new CsEventUserPO();
-                        csEventUser2.setUserId(item);
-                        csEventUser2.setStatus(0);
-                        csEventUser2.setEventId(id);
-                        result.add(csEventUser2);
-                    });
-                    break;
-                case "3":
-                    code = 1;
-                    //稳态事件
-                    users = getEventUser(devId,1);
-                    devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
-                    noticeUserDto.setPushClientId(devCodeList);
-                    noticeUserDto.setTitle("稳态事件");
-                    //记录需要通知的用户和事件关系
-                    List<String> list3 = users.stream().map(User::getId).collect(Collectors.toList());
-                    list3.forEach(item->{
-                        CsEventUserPO csEventUser3 = new CsEventUserPO();
-                        csEventUser3.setUserId(item);
-                        csEventUser3.setStatus(0);
-                        csEventUser3.setEventId(id);
-                        result.add(csEventUser3);
-                    });
-                    break;
-                default:
-                    code = 0;
-                    break;
+        //获取设备类型 true:治理设备 false:其他类型的设备
+        boolean devModel = equipmentFeignClient.judgeDevModel(nDid).getData();
+        if (devModel) {
+            //事件处理
+            if (eventType == 1){
+                eventName = epdFeignClient.findByName(eventName).getData().getShowName();
+                switch (type) {
+                    case "1":
+                        code = 2;
+                        //设备自身事件 不推送给用户，推送给业务管理
+                        eventUser = getEventUser(devId,false);
+                        if (CollectionUtil.isNotEmpty(eventUser)) {
+                            eventUser.forEach(item->{
+                                CsEventUserPO csEventUser = new CsEventUserPO();
+                                csEventUser.setUserId(item);
+                                csEventUser.setStatus(0);
+                                csEventUser.setEventId(id);
+                                result.add(csEventUser);
+                            });
+
+                            users = getSendUser(eventUser,2);
+                            if (CollectionUtil.isNotEmpty(users)){
+                                for (User user : users){
+                                    userList.add(user.getDevCode());
+                                }
+                                noticeUserDto.setPushClientId(userList);
+                                noticeUserDto.setTitle("设备事件");
+                            }
+                        }
+                        break;
+                    case "2":
+                        code = 0;
+                        //暂态事件
+                        eventUser = getEventUser(devId,true);
+                        if (CollectionUtil.isNotEmpty(eventUser)) {
+                            eventUser.forEach(item->{
+                                CsEventUserPO csEventUser = new CsEventUserPO();
+                                csEventUser.setUserId(item);
+                                csEventUser.setStatus(0);
+                                csEventUser.setEventId(id);
+                                result.add(csEventUser);
+                            });
+                            users = getSendUser(eventUser,0);
+                            if (CollectionUtil.isNotEmpty(users)){
+                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
+                                noticeUserDto.setPushClientId(devCodeList);
+                                noticeUserDto.setTitle("暂态事件");
+                            }
+                        }
+                        break;
+                    case "3":
+                        code = 1;
+                        //稳态事件
+                        eventUser = getEventUser(devId,true);
+                        if (CollectionUtil.isNotEmpty(eventUser)) {
+                            eventUser.forEach(item->{
+                                CsEventUserPO csEventUser = new CsEventUserPO();
+                                csEventUser.setUserId(item);
+                                csEventUser.setStatus(0);
+                                csEventUser.setEventId(id);
+                                result.add(csEventUser);
+                            });
+                            users = getSendUser(eventUser,1);
+                            if (CollectionUtil.isNotEmpty(users)){
+                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
+                                noticeUserDto.setPushClientId(devCodeList);
+                                noticeUserDto.setTitle("稳态事件");
+                            }
+                        }
+                        break;
+                    default:
+                        code = 0;
+                        break;
+                }
+                //获取台账信息
+                DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
+                content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生" + eventName;
+                noticeUserDto.setContent(content);
+                payload.setType(code);
+                payload.setPath("/pages/message/message?type="+payload.getType());
+                noticeUserDto.setPayload(payload);
             }
-            //获取台账信息
-            DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
-            content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生" + eventName;
-            noticeUserDto.setContent(content);
-            payload.setType(code);
-            payload.setPath("/pages/message/message?type="+payload.getType());
-            noticeUserDto.setPayload(payload);
-        }
-        //告警处理
-        else if (eventType == 2){
-            switch (type) {
-                case "1":
-                    //Ⅰ级告警 不推送给用户，推送给业务管理
-                    users = getAdminUser();
-                    if (CollectionUtil.isNotEmpty(users)){
+            //告警处理
+            else if (eventType == 2){
+                switch (type) {
+                    case "1":
+                        //Ⅰ级告警 不推送给用户，推送给业务管理
+                        eventUser = getEventUser(devId,false);
+                        if (CollectionUtil.isNotEmpty(eventUser)) {
+                            eventUser.forEach(item->{
+                                CsEventUserPO csEventUser = new CsEventUserPO();
+                                csEventUser.setUserId(item);
+                                csEventUser.setStatus(0);
+                                csEventUser.setEventId(id);
+                                result.add(csEventUser);
+                            });
+                            users = getSendUser(eventUser,3);
+                            if (CollectionUtil.isNotEmpty(users)){
+                                eventName = epdFeignClient.findByName(eventName).getData().getShowName();
+                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
+                                noticeUserDto.setPushClientId(devCodeList);
+                            }
+                        }
+                        break;
+                    case "2":
                         eventName = epdFeignClient.findByName(eventName).getData().getShowName();
-                        noticeUserDto.setPushClientId(Collections.singletonList(users.get(0).getDevCode()));
-                        //记录需要通知的用户和事件关系
-                        users.forEach(item->{
-                            CsEventUserPO csEventUser = new CsEventUserPO();
-                            csEventUser.setUserId(item.getId());
-                            csEventUser.setStatus(0);
-                            csEventUser.setEventId(id);
-                            result.add(csEventUser);
-                        });
-                    }
-                    break;
-                case "2":
-                    eventName = epdFeignClient.findByName(eventName).getData().getShowName();
-                case "3":
-                    //Ⅱ、Ⅲ级告警推送相关用户及业务管理员
-                    users = getEventUser(devId,3);
-                    devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
-                    noticeUserDto.setPushClientId(devCodeList);
-                    //记录需要通知的用户和事件关系
-                    List<String> list4 = users.stream().map(User::getId).collect(Collectors.toList());
-                    list4.forEach(item->{
-                        CsEventUserPO csEventUser4 = new CsEventUserPO();
-                        csEventUser4.setUserId(item);
-                        csEventUser4.setStatus(0);
-                        csEventUser4.setEventId(id);
-                        result.add(csEventUser4);
-                    });
-                    break;
-                default:
-                    break;
+                    case "3":
+                        //Ⅱ、Ⅲ级告警推送相关用户及业务管理员
+                        eventUser = getEventUser(devId,true);
+                        if (CollectionUtil.isNotEmpty(eventUser)) {
+                            eventUser.forEach(item->{
+                                CsEventUserPO csEventUser = new CsEventUserPO();
+                                csEventUser.setUserId(item);
+                                csEventUser.setStatus(0);
+                                csEventUser.setEventId(id);
+                                result.add(csEventUser);
+                            });
+                            users = getSendUser(eventUser,3);
+                            if (CollectionUtil.isNotEmpty(users)){
+                                devCodeList = users.stream().map(User::getDevCode).distinct().collect(Collectors.toList());
+                                noticeUserDto.setPushClientId(devCodeList);
+                            }
+                        }
+                        break;
+                    default:
+                        break;
+                }
+                noticeUserDto.setTitle("告警事件");
+                DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
+                content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生告警,告警信息:" + eventName;
+                noticeUserDto.setContent(content);
+                payload.setType(3);
+                payload.setPath("/pages/message/message?type="+payload.getType());
+                noticeUserDto.setPayload(payload);
             }
-            noticeUserDto.setTitle("告警事件");
-            DevDetailDTO devDetailDto = csLedgerFeignclient.queryDevDetail(devId).getData();
-            content = devDetailDto.getEngineeringName() + "-" + devDetailDto.getProjectName() + "-" + devDetailDto.getEquipmentName() + "于" + eventTime.format(DatePattern.NORM_DATETIME_MS_FORMATTER) + "发生告警,告警信息:" + eventName;
-            noticeUserDto.setContent(content);
-            payload.setType(3);
-            payload.setPath("/pages/message/message?type="+payload.getType());
-            noticeUserDto.setPayload(payload);
-        }
-        sendEventToUser(noticeUserDto);
-        //记录推送日志
-        for (User item : users) {
-            CsEventSendMsg csEventSendMsg = new CsEventSendMsg();
-            csEventSendMsg.setUserId(item.getId());
-            csEventSendMsg.setEventId(id);
-            csEventSendMsg.setSendTime(LocalDateTime.now());
-            if (Objects.isNull(item.getDevCode())){
-                csEventSendMsg.setStatus(0);
-                csEventSendMsg.setRemark("用户设备识别码为空");
-            } else {
-                csEventSendMsg.setDevCode(item.getDevCode());
-                csEventSendMsg.setStatus(1);
+            if (CollectionUtil.isNotEmpty(noticeUserDto.getPushClientId())) {
+                List<String> filteredList = noticeUserDto.getPushClientId().stream()
+                        .filter(Objects::nonNull)
+                        .distinct()
+                        .collect(Collectors.toList());
+                if (CollectionUtil.isNotEmpty(filteredList)) {
+                    noticeUserDto.setPushClientId(filteredList);
+                    sendMessageUtil.sendEventToUser(noticeUserDto);
+                }
+            }
+            //记录推送日志
+            for (User item : users) {
+                CsEventSendMsg csEventSendMsg = new CsEventSendMsg();
+                csEventSendMsg.setUserId(item.getId());
+                csEventSendMsg.setEventId(id);
+                csEventSendMsg.setSendTime(LocalDateTime.now());
+                if (Objects.isNull(item.getDevCode())){
+                    csEventSendMsg.setStatus(0);
+                    csEventSendMsg.setRemark("用户设备识别码为空");
+                } else {
+                    csEventSendMsg.setDevCode(item.getDevCode());
+                    csEventSendMsg.setStatus(1);
+                }
+                csEventSendMsgList.add(csEventSendMsg);
+            }
+            eventLogsFeignClient.addLogs(csEventSendMsgList);
+            //事件用户关系入库
+            if (CollectionUtil.isNotEmpty(result)){
+                csEventUserService.saveBatch(result);
             }
-            csEventSendMsgList.add(csEventSendMsg);
-        }
-        eventLogsFeignClient.addLogs(csEventSendMsgList);
-        //事件用户关系入库
-        if (CollectionUtil.isNotEmpty(result)){
-            csEventUserService.saveBatch(result);
         }
     }
 
     /**
-     * 发送通知消息
+     * 获取所有需要推送的用户id
      */
-    public void sendEventToUser(NoticeUserDto noticeUserDto) {
-        try {
-            // 创建一个URL对象，指定目标HTTPS接口地址
-            URL url = new URL("https://fc-mp-b46c4dff-7244-4f7c-ae8b-7c1194d8cce8.next.bspapp.com/push");
-            // 打开HTTPS连接
-            HttpURLConnection connection = (HttpURLConnection) url.openConnection();
-            // 设置请求方法为POST
-            connection.setRequestMethod("POST");
-            // 设置请求头，指定Content-Type为application/json
-            connection.setRequestProperty("Content-Type", "application/json");
-            // 启用输出流以发送JSON数据
-            connection.setDoOutput(true);
-            // 将JSON数据写入输出流
-            OutputStream outputStream = connection.getOutputStream();
-            log.info(new Gson().toJson(noticeUserDto).replace("pushClientId", "push_clientid"));
-            outputStream.write(new Gson().toJson(noticeUserDto).replace("pushClientId", "push_clientid").getBytes(StandardCharsets.UTF_8));
-            outputStream.flush();
-            outputStream.close();
-            // 获取响应代码
-            int responseCode = connection.getResponseCode();
-            log.info("Response Code: " + responseCode);
-            // 读取响应数据
-            BufferedReader reader = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-            String inputLine;
-            StringBuilder response = new StringBuilder();
-            while ((inputLine = reader.readLine()) != null) {
-                response.append(inputLine);
-            }
-            reader.close();
-            // 打印响应内容
-            log.info("Response Content: " + response.toString());
-            // 关闭连接
-            connection.disconnect();
-        } catch (IOException e) {
-            e.getMessage();
-        }
-    }
-
-    /**
-     * 获取需要通知事件的用户
-     */
-    public List<User> getEventUser(String devId,Integer type) {
-        List<User> users = new ArrayList<>();
-        List<String> result = new ArrayList<>();
-        //获取设备下主用户和子用户集合
-        List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
+    public List<String> getEventUser(String devId,boolean isAdmin) {
         List<User> adminUser = appUserFeignClient.getAdminInfo().getData();
         List<String> adminList = adminUser.stream().map(User::getId).collect(Collectors.toList());
-        list.addAll(adminList);
-        //查询哪些用户打开了事件提示
-        if (CollectionUtil.isNotEmpty(list)){
-            List<AppInfoSet> appInfoSet = appInfoSetFeignClient.getListById(list).getData();
-            switch (type) {
-                case 0:
-                    result = appInfoSet.stream()
-                            .filter(person -> person.getEventInfo() == 1)
-                            .map(AppInfoSet::getUserId).collect(Collectors.toList());
-                    break;
-                case 1:
-                    result = appInfoSet.stream()
-                            .filter(person -> person.getHarmonicInfo() == 1)
-                            .map(AppInfoSet::getUserId).collect(Collectors.toList());
-                    break;
-                case 3:
-                    result = appInfoSet.stream()
-                            .filter(person -> person.getAlarmInfo() == 1)
-                            .map(AppInfoSet::getUserId).collect(Collectors.toList());
-                    break;
-                default:
-                    break;
-            }
+        if (isAdmin) {
+            List<String> list = csDeviceUserFeignClient.findUserById(devId).getData();
+            adminList.addAll(list);
         }
-        if (CollectionUtil.isNotEmpty(result)){
-            users = userFeignClient.getUserByIdList(result).getData();
-        }
-        return users;
+        return adminList;
     }
 
-    public List<User> getAdminUser() {
-        List<User> users = appUserFeignClient.getAdminInfo().getData();
+
+    /**
+     * 获取所有打开推送的用户信息
+     */
+    public List<User> getSendUser(List<String> userList,Integer type) {
+        List<User> users = new ArrayList<>();
         List<String> result = new ArrayList<>();
-        List<String> adminList = users.stream().map(User::getId).collect(Collectors.toList());
-        if (CollectionUtil.isNotEmpty(adminList)){
-            List<AppInfoSet> appInfoSet = appInfoSetFeignClient.getListById(adminList).getData();
-            result = appInfoSet.stream()
-                    .filter(person -> person.getRunInfo() == 1)
-                    .map(AppInfoSet::getUserId).collect(Collectors.toList());
+        List<AppInfoSet> appInfoSet = appInfoSetFeignClient.getListById(userList).getData();
+
+        switch (type) {
+            case 0:
+                result = appInfoSet.stream()
+                        .filter(person -> person.getEventInfo() == 1)
+                        .map(AppInfoSet::getUserId).collect(Collectors.toList());
+                break;
+            case 1:
+                result = appInfoSet.stream()
+                        .filter(person -> person.getHarmonicInfo() == 1)
+                        .map(AppInfoSet::getUserId).collect(Collectors.toList());
+                break;
+            case 2:
+                result = appInfoSet.stream()
+                        .filter(person -> person.getRunInfo() == 1)
+                        .map(AppInfoSet::getUserId).collect(Collectors.toList());
+                break;
+            case 3:
+                result = appInfoSet.stream()
+                        .filter(person -> person.getAlarmInfo() == 1)
+                        .map(AppInfoSet::getUserId).collect(Collectors.toList());
+                break;
+            default:
+                break;
         }
         if (CollectionUtil.isNotEmpty(result)){
-            users = userFeignClient.getUserByIdList(result).getData();
+            users = userFeignClient.appuserByIdList(result).getData();
         }
         return users;
     }

iot-message/message-boot/pom.xml

@@ -61,6 +61,11 @@
             <artifactId>stat-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>rt-api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>system-api</artifactId>
@@ -71,6 +76,11 @@
             <artifactId>zl-event-api</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.baomidou</groupId>
+            <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
+            <version>3.5.1</version>
+        </dependency>
     </dependencies>
 
     <build>

iot-message/message-boot/src/main/java/com/njcn/message/MessageBootApplication.java

@@ -1,10 +1,10 @@
 package com.njcn.message;
 
 import lombok.extern.slf4j.Slf4j;
-import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.DependsOn;
 
 
 /**
@@ -13,9 +13,9 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
  * @date 2021年12月09日 20:59
  */
 @Slf4j
-//@MapperScan("com.njcn.**.mapper")
 @EnableFeignClients(basePackages = "com.njcn")
 @SpringBootApplication(scanBasePackages = "com.njcn")
+@DependsOn("proxyMapperRegister")
 public class MessageBootApplication {
 
     public static void main(String[] args)  {