批量新增设备bug修改

1.优化界面描述显示;
2.新增测试项暂态事件

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/CsLineFeignClient.java

@@ -42,4 +42,7 @@ public interface CsLineFeignClient {
 
     @PostMapping("/getById")
     HttpResult<CsLinePO> getById(@RequestParam("lineId") String lineId);
+
+    @PostMapping("/getLinesByDevList")
+    HttpResult<List<CsLinePO>> getLinesByDevList(@RequestParam("ids") List<String> ids);
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/EquipmentFeignClient.java

@@ -1,16 +1,11 @@
 package com.njcn.csdevice.api;
 
-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 com.njcn.csdevice.api.fallback.EquipmentFeignClientFallbackFactory;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
 import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
 import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
-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;

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/WlRecordFeignClient.java

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.fallback.WlRecordClientFallbackFactory;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
 import com.njcn.csdevice.pojo.po.WlRecord;
+import com.njcn.csdevice.pojo.vo.RecordVo;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -45,6 +46,12 @@ public interface WlRecordFeignClient {
     HttpResult<Boolean> updateTestRecord(@RequestBody @Validated WlRecordParam.UpdateRecord record);
 
 
-    @GetMapping("/dayDealNoEndTimeEvent")
+    @PostMapping("/dayDealNoEndTimeEvent")
     void dayDealNoEndTimeEvent(@RequestParam("date") String date);
+
+    @GetMapping("/getWlAssByWlId")
+    HttpResult<List<WlRecord>> getWlAssByWlId(@RequestParam("wlId")String wlId);
+
+    @PostMapping("/findDevBaseDataByLineId")
+    HttpResult<List<RecordVo>> findDevBaseDataByLineId(@RequestBody @Validated WlRecordParam.lineRecord param);
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/CsLineClientFallbackFactory.java

@@ -74,6 +74,12 @@ public class CsLineClientFallbackFactory implements FallbackFactory<CsLineFeignC
                 log.error("{}异常，降级处理，异常为：{}","根据监测点id获取监测点详情",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<CsLinePO>> getLinesByDevList(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}","根据装置id集合获取监测点id集合",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/api/fallback/WlRecordClientFallbackFactory.java

@@ -6,6 +6,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.csdevice.api.WlRecordFeignClient;
 import com.njcn.csdevice.pojo.param.WlRecordParam;
 import com.njcn.csdevice.pojo.po.WlRecord;
+import com.njcn.csdevice.pojo.vo.RecordVo;
 import feign.hystrix.FallbackFactory;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -57,6 +58,18 @@ public class WlRecordClientFallbackFactory implements FallbackFactory<WlRecordFe
                 log.error("{}异常，降级处理，异常为：{}","每日处理没有结束时间的测试基础数据",cause.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<WlRecord>> getWlAssByWlId(String wlId) {
+                log.error("{}异常，降级处理，异常为：{}","根据测试项id获取测试项详细条目",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<RecordVo>> findDevBaseDataByLineId(WlRecordParam.lineRecord param) {
+                log.error("{}异常，降级处理，异常为：{}","根据监测点id查询装置基础数据",cause.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsDevModelQueryParm.java

@@ -47,7 +47,8 @@ public class CsDevModelQueryParm {
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private String versionEndDate;
-
+    @ApiModelProperty(value = "装置型号")
+    private String devType;
 
 
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAddParm.java

@@ -1,12 +1,10 @@
 package com.njcn.csdevice.pojo.param;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Pattern;
-import java.util.Date;
 
 /**
  * 
@@ -34,6 +32,7 @@ public class CsEquipmentDeliveryAddParm{
      */
     @ApiModelProperty(value="网络设备ID")
     @NotBlank(message="网络设备ID不能为空！")
+    @Pattern(regexp = "^[A-Za-z0-9]{6,32}$", message = "网络设备ID只可为数字或字母,长度至少为6位")
     private String ndid;
 
     /**
@@ -125,4 +124,7 @@ public class CsEquipmentDeliveryAddParm{
     @ApiModelProperty(value="模块个数")
     private Integer modelNumber;
 
+    @ApiModelProperty(value="排序")
+    private Integer sort;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsEquipmentDeliveryAuditParm.java

@@ -1,12 +1,11 @@
 package com.njcn.csdevice.pojo.param;
 
 import com.baomidou.mybatisplus.annotation.TableField;
-import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
-import java.util.Date;
+import javax.validation.constraints.Pattern;
 
 /**
  * 
@@ -34,6 +33,7 @@ public class CsEquipmentDeliveryAuditParm {
      * 网关识别码
      */
     @ApiModelProperty(value="网关识别码")
+    @Pattern(regexp = "^[A-Za-z0-9]{1,32}$", message = "网络设备ID只可为(数字,字母)")
     private String ndid;
 
     /**
@@ -60,51 +60,12 @@ public class CsEquipmentDeliveryAuditParm {
     @ApiModelProperty(value="装置接入方式")
     private String devAccessMethod;
 
-//    /**
-//     * 装置程序版本
-//     */
-//    @ApiModelProperty(value="装置程序版本")
-//    private String programVersion;
-
-//    /**
-//     * 调试人员
-//     */
-//    @ApiModelProperty(value="调试人员")
-//    private String debugPerson;
-//
-//    /**
-//     * 出厂日期
-//     */
-//    @ApiModelProperty(value="出厂日期")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date producteTime;
-//
-//    /**
-//     * 检修日期
-//     */
-//    @ApiModelProperty(value="检修日期")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date checkTime;
-//
-//    /**
-//     * 调试日期
-//     */
-//    @ApiModelProperty(value="调试日期")
-//    @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
-//    private Date debugTime;
-
     /**
      * 合同号
      */
     @ApiModelProperty(value="合同号")
     private String cntractNo;
 
-//    /**
-//     * 营销经理
-//     */
-//    @ApiModelProperty(value="营销经理")
-//    private String salesManager;
-
     /**
      * 状态
      */
@@ -128,4 +89,10 @@ public class CsEquipmentDeliveryAuditParm {
      */
     @ApiModelProperty(value="模块个数")
     private Integer modelNumber;
+
+    @ApiModelProperty(value="装置使用状态(0:停用 1:启用)")
+    private Integer usageStatus;
+
+    @ApiModelProperty(value="排序")
+    private Integer sort;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/CsLineParam.java

@@ -48,4 +48,9 @@ public class CsLineParam extends BaseEntity {
      */
     private String dataSetId;
 
+    /**
+     * 统计间隔
+     */
+    private Integer lineInterval;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/DataArrayParam.java

@@ -24,4 +24,7 @@ public class DataArrayParam {
 
     @ApiModelProperty("数据类型")
     private String statMethod;
+
+    @ApiModelProperty("数据集编号")
+    private Integer idx;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/param/WlRecordParam.java

@@ -1,5 +1,6 @@
 package com.njcn.csdevice.pojo.param;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -34,9 +35,11 @@ public class WlRecordParam {
         private String lineId;
 
         @ApiModelProperty("项目起始时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime proStartTime;
 
         @ApiModelProperty("项目结束时间")
+        @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
         private LocalDateTime proEndTime;
 
         @ApiModelProperty("测试项名称")
@@ -99,4 +102,23 @@ public class WlRecordParam {
         private String id;
     }
 
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class lineRecord extends WlRecordParam {
+
+        @ApiModelProperty("监测点id")
+        private String lineId;
+
+        @ApiModelProperty("测试项起始时间")
+        private String itemStartTime;
+
+        @ApiModelProperty("测试项结束时间")
+        private String itemEndTime;
+
+        @ApiModelProperty("数据来源 0:补召 1:在线监测 ")
+        private Integer dataSource;
+
+
+    }
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsDataSet.java

@@ -80,4 +80,8 @@ public class CsDataSet extends BaseEntity {
      */
     private String dataLevel;
 
+    /**
+     * 接线方式
+     */
+    private Integer conType;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsEquipmentDeliveryPO.java

@@ -108,4 +108,16 @@ public class CsEquipmentDeliveryPO extends BaseEntity {
     @TableField(value = "process")
     private Integer process;
 
+    /**
+     * 装置使用状态(0:停用 1:启用)
+     */
+    @TableField(value = "usage_status")
+    private Integer usageStatus;
+
+    /**
+     * 排序
+     */
+    @TableField(value = "sort")
+    private Integer sort;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java

@@ -95,4 +95,10 @@ public class CsLinePO  extends BaseEntity {
 
     @TableField(value = "device_id")
     private String deviceId;
+
+    /**
+     * 监测点统计间隔
+     */
+    @TableField(value = "line_interval")
+    private Integer lineInterval;
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/WlRecord.java

@@ -150,4 +150,10 @@ public class WlRecord extends BaseEntity {
      */
     private String gcDataPath;
 
+    /**
+     * 数据类型(Primary:一次值  Secondary:二次值)
+     */
+    @TableField(exist = false)
+    private String dataLevel;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsEquipmentDeliveryVO.java

@@ -83,4 +83,12 @@ public class CsEquipmentDeliveryVO extends BaseEntity {
     @ApiModelProperty(value="设备当前流程状态")
     private Integer process ;
 
+    @ApiModelProperty(value="装置使用状态(0:停用 1:启用)")
+    private Integer usageStatus ;
+
+    @ApiModelProperty(value="装置与MQTT服务器连接状态")
+    private String connectStatus ;
+
+    private Integer sort;
+
 }

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/CsLedgerVO.java

@@ -48,6 +48,12 @@ public class CsLedgerVO implements Serializable {
     @ApiModelProperty(name = "type",value = "类型 项目 工程 装置 监测点")
     private String type;
 
+    @ApiModelProperty(name = "lineType",value = "监测点类型 0:治理监测点 1:电能质量监测点")
+    private Integer lineType;
+
+    @ApiModelProperty(name = "conType",value = "接线方式 0-星型 1-角型 2-V型")
+    private Integer conType;
+
     @ApiModelProperty(name = "children",value = "子节点")
     private List<CsLedgerVO> children = new ArrayList<>();
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/DataGroupEventVO.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
+
 import java.time.LocalDateTime;
 
 /**
@@ -12,7 +13,7 @@ import java.time.LocalDateTime;
  * @date 2023/6/19
  */
 @Data
-public class DataGroupEventVO {
+public class    DataGroupEventVO {
 
     @ApiModelProperty("id")
     private String id;
@@ -26,6 +27,12 @@ public class DataGroupEventVO {
     @ApiModelProperty("监测点名称")
     private String lineName;
 
+    @ApiModelProperty("装置ID")
+    private String deviceId;
+
+    @ApiModelProperty("装置名称")
+    private String devName;
+
     @ApiModelProperty("项目名称")
     private String projectName;
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/vo/RecordVo.java

@@ -22,6 +22,9 @@ public class RecordVo {
     @ApiModelProperty("名称")
     private String itemName;
 
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
     @ApiModelProperty("数据起始时间")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime startTime;
@@ -30,6 +33,9 @@ public class RecordVo {
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime endTime;
 
+    @ApiModelProperty("持续时间")
+    private String lastTime;
+
     @ApiModelProperty("测试位置")
     private String location;
 

cs-device/cs-device-api/src/main/java/com/njcn/csdevice/utils/StringUtil.java

@@ -0,0 +1,30 @@
+package com.njcn.csdevice.utils;
+
+import com.njcn.common.pojo.exception.BusinessException;
+
+import java.util.regex.Pattern;
+
+/**
+ * Description:
+ * Date: 2024/12/17  14:29【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public class StringUtil {
+    public static void containsSpecialCharacters(String str) {
+        // 定义包含特殊字符的正则表达式
+        String specialChars = "[<>%'%;()&+/\\\\-\\\\\\\\_|@*?#$!,.]|html";
+        // 创建Pattern对象
+        Pattern pattern = Pattern.compile(specialChars);
+        // 使用Pattern对象的matcher方法检查字符串
+        if(pattern.matcher(str).find()){
+            throw new BusinessException("存在特殊字符[<>\"'%;()&+//\\-———|@*_?#$!,.html]");
+        }
+
+    }
+
+    public static void main(String[] args) {
+        StringUtil.containsSpecialCharacters("*");
+    }
+}

cs-device/cs-device-boot/pom.xml

@@ -76,8 +76,7 @@
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>user-api</artifactId>
-          <version>1.0.0</version>
+        <version>${project.version}</version>
-          <scope>compile</scope>
       </dependency>
       <dependency>
           <groupId>com.baomidou</groupId>
@@ -92,8 +91,7 @@
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>cs-warn-api</artifactId>
-          <version>1.0.0</version>
+        <version>${project.version}</version>
-          <scope>compile</scope>
       </dependency>
 
       <!-- zxing生成二维码 -->
@@ -107,9 +105,6 @@
       <groupId>com.njcn</groupId>
       <version>1.0.0</version>
     </dependency>
-
-
-
     <dependency>
       <groupId>org.apache.poi</groupId>
       <artifactId>poi</artifactId>
@@ -139,8 +134,7 @@
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>cs-harmonic-api</artifactId>
-          <version>1.0.0</version>
+        <version>${project.version}</version>
-          <scope>compile</scope>
         <exclusions>
           <exclusion>
             <groupId>com.njcn</groupId>
@@ -151,20 +145,14 @@
     <dependency>
       <groupId>com.njcn</groupId>
       <artifactId>cs-system-api</artifactId>
-      <version>1.0.0</version>
+      <version>${project.version}</version>
-      <scope>compile</scope>
     </dependency>
 
       <dependency>
           <groupId>com.njcn</groupId>
           <artifactId>access-api</artifactId>
-          <version>1.0.0</version>
+          <version>${project.version}</version>
-          <scope>compile</scope>
       </dependency>
-
-
-
-
   </dependencies>
 
   <build>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/DeviceFtpController.java

@@ -1,18 +1,16 @@
 package com.njcn.csdevice.controller.equipment;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
 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.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.service.DeviceFtpService;
 import com.njcn.csharmonic.pojo.vo.MakeUpVo;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -25,7 +23,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @author xy
@@ -63,9 +60,6 @@ public class DeviceFtpController extends BaseController {
     public HttpResult<List<MakeUpVo>> askDeviceFileOrDir(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("type") String type){
         String methodDescribe = getMethodDescribe("askDeviceFileOrDir");
         List<MakeUpVo> list = deviceFtpService.askDeviceFileOrDir(nDid,name,type);
-        if (CollectionUtil.isEmpty(list) && Objects.equals(type,"file")) {
-            throw new BusinessException(AlgorithmResponseEnum.ASK_DEVICE_DIR_ERROR);
-        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
 
@@ -79,7 +73,7 @@ public class DeviceFtpController extends BaseController {
             @ApiImplicitParam(name = "fileCheck", value = "文件校验码", required = true)
     })
     public HttpResult<String> downloadFile(@RequestParam("nDid") String nDid, @RequestParam("name") String name, @RequestParam("size") Integer size, @RequestParam("fileCheck") String fileCheck){
-        String methodDescribe = getMethodDescribe("downloadFile");
+        redisUtil.saveByKeyWithExpire("fileDownUserId"+nDid+name,RequestUtil.getUserIndex(),600L);
         deviceFtpService.downloadFile(nDid,name,size,fileCheck);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, "文件下载中,请稍等");
     }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/equipment/EquipmentDeliveryController.java

@@ -4,7 +4,9 @@ import cn.afterturn.easypoi.excel.ExcelExportUtil;
 import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.dto.DeviceLogDTO;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
@@ -23,6 +25,9 @@ import com.njcn.csdevice.service.IMqttUserService;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
+import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.enums.DicDataTypeEnum;
+import com.njcn.system.pojo.po.SysDicTreePO;
 import com.njcn.web.advice.DeviceLog;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
@@ -30,6 +35,7 @@ import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
+import org.springframework.util.CollectionUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -37,7 +43,9 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -57,19 +65,19 @@ import java.util.stream.Stream;
 public class EquipmentDeliveryController extends BaseController {
 
     private final CsEquipmentDeliveryService csEquipmentDeliveryService;
-
     private final IMqttUserService mqttUserService;
     private final CsDevModelRelationService csDevModelRelationService;
+    private  final DictTreeFeignClient dictTreeFeignClient;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/addEquipmentDelivery")
     @ApiOperation("新增出厂设备")
     @ApiImplicitParam(name = "csEquipmentDeliveryAddParm", value = "新增项目参数", required = true)
     @DeviceLog(operateType = DeviceOperate.ADD)
-    public HttpResult<Boolean> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm){
+    public HttpResult<CsEquipmentDeliveryPO> addEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm){
         String methodDescribe = getMethodDescribe("addEquipmentDelivery");
-        Boolean flag = csEquipmentDeliveryService.save(csEquipmentDeliveryAddParm);
+        CsEquipmentDeliveryPO po = csEquipmentDeliveryService.save(csEquipmentDeliveryAddParm);
-        if (flag){
+        if (Objects.nonNull(po)){
             //查询mqtt用户名和密码是否存在
             boolean result = mqttUserService.findMqttUser(csEquipmentDeliveryAddParm.getNdid());
             if (result){
@@ -77,7 +85,7 @@ public class EquipmentDeliveryController extends BaseController {
                 mqttUserService.insertMqttUser(csEquipmentDeliveryAddParm.getNdid());
             }
         }
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, po, methodDescribe);
     }
 
 
@@ -99,6 +107,14 @@ public class EquipmentDeliveryController extends BaseController {
     public HttpResult<Boolean> updateEquipmentDelivery(@RequestBody @Validated CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm ){
         String methodDescribe = getMethodDescribe("updateEquipmentDelivery");
         Boolean flag = csEquipmentDeliveryService.updateEquipmentDelivery(csEquipmentDeliveryAuditParm);
+        if (flag){
+            //查询mqtt用户名和密码是否存在
+            boolean result = mqttUserService.findMqttUser(csEquipmentDeliveryAuditParm.getNdid());
+            if (result){
+                //初始化装置mqtt连接信息(使用sha256加密)
+                mqttUserService.insertMqttUser(csEquipmentDeliveryAuditParm.getNdid());
+            }
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
     }
 
@@ -162,12 +178,6 @@ public class EquipmentDeliveryController extends BaseController {
     public HttpResult<Page<CsEquipmentDeliveryVO>> list(@RequestBody CsEquipmentDeliveryQueryParm param){
         String methodDescribe = getMethodDescribe("list");
         Page<CsEquipmentDeliveryVO> page = csEquipmentDeliveryService.list(param);
-        //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
-        for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
-            if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
-                csEquipmentDeliveryVO.setStatus(5);
-            }
-        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
     }
 
@@ -220,7 +230,13 @@ public class EquipmentDeliveryController extends BaseController {
         ExportParams exportParams = new ExportParams("批量导入模板（请严格按照模板标准填入数据）", "终端入网检测录入信息");
         exportParams.setStyle(ExcelStyleUtil.class);
         Workbook workbook = ExcelExportUtil.exportExcel(exportParams, DeviceExcelTemplete.class, new ArrayList<DeviceExcelTemplete>());
-        ExcelUtil.selectList(workbook, 2, 2, Stream.of("直连设备","网关设备").collect(Collectors.toList()).toArray(new String[]{}));
+        List<SysDicTreePO> deviceType = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.DEVICE_TYPE.getCode()).getData();
+        if(!CollectionUtils.isEmpty(deviceType)){
+            List<String> collect = deviceType.get(0).getChildren().stream().map(SysDicTreePO::getName).collect(Collectors.toList());
+            ExcelUtil.selectList(workbook, 2, 2, collect.toArray(new String[]{}));
+            List<String> collect2 = deviceType.get(0).getChildren().stream().map(SysDicTreePO::getChildren).flatMap(Collection::stream).map(SysDicTreePO::getName).collect(Collectors.toList());
+            ExcelUtil.selectList(workbook, 3, 3, collect2.toArray(new String[]{}));
+        }
         ExcelUtil.selectList(workbook, 4, 4, Stream.of("MQTT","CLD").collect(Collectors.toList()).toArray(new String[]{}));
         String fileName = "设备模板.xlsx";
         ExportParams exportExcel = new ExportParams("设备模板", "设备模板");
@@ -233,7 +249,18 @@ public class EquipmentDeliveryController extends BaseController {
     @PostMapping(value = "importEquipment")
     public HttpResult<String> importEquipment(@ApiParam(value = "文件", required = true) @RequestPart("file") MultipartFile file, HttpServletResponse response) {
         String methodDescribe = getMethodDescribe("importEquipment");
-        csEquipmentDeliveryService.importEquipment(file, response);
+        List<CsEquipmentDeliveryPO> csEquipmentDeliveryPOS = csEquipmentDeliveryService.importEquipment(file, response);
+        if (!CollectionUtils.isEmpty(csEquipmentDeliveryPOS)){
+            csEquipmentDeliveryPOS.forEach(temp->{
+                //查询mqtt用户名和密码是否存在
+                boolean result = mqttUserService.findMqttUser(temp.getNdid());
+                if (result){
+                    //初始化装置mqtt连接信息(使用sha256加密)
+                    mqttUserService.insertMqttUser(temp.getNdid());
+                }
+            });
+
+        }
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
     @ResponseBody

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/line/CslineController.java

@@ -139,7 +139,6 @@ public class CslineController extends BaseController {
     @PostMapping("/getById")
     @ApiOperation("根据监测点id获取监测点详情")
     @ApiImplicitParam(name = "lineId", value = "监测点id", required = true)
-    @ApiIgnore
     public HttpResult<CsLinePO> getById(@RequestParam String lineId) {
         String methodDescribe = getMethodDescribe("getById");
         LambdaQueryWrapper<CsLinePO> queryWrapper = new LambdaQueryWrapper<>();
@@ -158,4 +157,14 @@ public class CslineController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLinesByDevList")
+    @ApiOperation("根据装置id集合获取监测点id集合")
+    @ApiImplicitParam(name = "ids", value = "装置id集合", required = true)
+    public HttpResult<List<CsLinePO>> getLinesByDevList(@RequestParam("ids") List<String> ids) {
+        String methodDescribe = getMethodDescribe("getLinesByDevList");
+        List<CsLinePO> list = csLinePOService.getLinesByDevList(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/scheme/WlRecordController.java

@@ -127,6 +127,20 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 修改测试项日志
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/updateRecordData")
+    @ApiOperation("修改测试项日志")
+    @ApiImplicitParam(name = "record", value = "测试项日志信息", required = true)
+    public HttpResult<Boolean> updateRecordData(@RequestBody @Validated WlRecordParam.UpdateRecord record) {
+        String methodDescribe = getMethodDescribe("updateRecordData");
+        LogUtil.njcnDebug(log, "{}，修改的测试项日志信息：{}", methodDescribe, record);
+        wlRecordService.updateRecordData(record);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
     /**
      * 新增或修改方案
      */
@@ -168,6 +182,20 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
     }
 
+    /**
+     * 删除装置测试项
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.UPDATE)
+    @PostMapping("/deleteItem")
+    @ApiOperation("删除装置测试项")
+    @ApiImplicitParam(name = "id", value = "装置测试项Id", required = true)
+    public HttpResult<Boolean> deleteItem(@RequestParam @Validated String id) {
+        String methodDescribe = getMethodDescribe("deleteItem");
+        LogUtil.njcnDebug(log, "{}，装置测试项Id为：{}", methodDescribe, id);
+        wlRecordService.deleteItem(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
     /**
      * 查询测试项时间段实时数据
      */
@@ -195,6 +223,19 @@ public class WlRecordController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, record, methodDescribe);
     }
 
+    /**
+     * 根据监测点id查询装置基础数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON, operateType = OperateType.QUERY)
+    @PostMapping("/findDevBaseDataByLineId")
+    @ApiOperation("根据监测点id查询装置基础数据")
+    @ApiImplicitParam(name = "param", value = "查询条件", required = true)
+    public HttpResult<List<RecordVo>> findDevBaseDataByLineId(@RequestBody @Validated WlRecordParam.lineRecord param) {
+        String methodDescribe = getMethodDescribe("findDevBaseDataByLineId");
+        LogUtil.njcnDebug(log, "{}，查询对象为：{}", methodDescribe, param);
+        List<RecordVo> record = wlRecordService.findDevBaseDataByLineId(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, record, methodDescribe);
+    }
 
 
     /**
@@ -207,5 +248,17 @@ public class WlRecordController extends BaseController {
         String methodDescribe = getMethodDescribe("dayDealNoEndTimeEvent");
         wlRecordService.dayDealNoEndTimeEvent(date);
     }
+
+    /**
+     * 根据测试项获取测试项绑定测点数据
+     */
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @GetMapping("/getWlAssByWlId")
+    @ApiOperation("根据测试项获取测试项绑定测点数据")
+    public HttpResult<List<WlRecord>> getWlAssByWlId(@RequestParam("wlId") String wlId) {
+        String methodDescribe = getMethodDescribe("getWlAssByWlId");
+        List<WlRecord> result = wlRecordService.getWlAssByWlId(wlId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
 }
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/WlRecordMapper.java

@@ -48,4 +48,6 @@ public interface WlRecordMapper extends BaseMapper<WlRecord> {
     List<CsLedgerVO> getAll();
 
     List<CsLedgerVO> getAllLine(@Param("devId") String devId);
+
+    List<WlRecord> getWlAssByWlId(@Param("wlId") String wlId);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataArrayMapper.xml

@@ -106,6 +106,7 @@
             and t1.did = #{param.did}
             and t3.cl_dev = #{param.cldId}
             and (t3.data_type = 'Stat' or t3.data_type is NULL)
+            and t3.idx = #{param.idx}
             and t4.stat_method = #{param.statMethod}
         order by t4.sort
     </select>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDataSetMapper.xml

@@ -14,7 +14,7 @@
         where
             pid = #{modelId}
           and cl_dev = #{clDev}
-          and data_type in ('Stat',NULL)
+          and (data_type = 'Stat' or data_type IS NULL)
         order by type,cl_dev
     </select>
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/CsDevModelMapper.xml

@@ -19,28 +19,28 @@
     <!--@mbg.generated-->
     id, dev_type, version_no, version_date, file_path, create_by, create_time, update_by, 
     update_time, `status`
-  </sql><select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
+  </sql>
-   SELECT a.*
+    <select id="getPage" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
-        FROM cs_dev_model a
+       SELECT a.*
-                WHERE
+            FROM cs_dev_model a
-                1 = 1 And a.`status`='1'
+                    WHERE
-        <if test="csDevModelQueryParm.versionStartDate != null and csDevModelQueryParm.versionStartDate != ''">
+                    1 = 1 And a.`status`='1'
-            AND a.version_date &gt;= #{csDevModelQueryParm.versionStartDate }
+            <if test="csDevModelQueryParm.versionStartDate != null and csDevModelQueryParm.versionStartDate != ''">
-        </if>
+                AND a.version_date &gt;= #{csDevModelQueryParm.versionStartDate }
-        <if test="csDevModelQueryParm.versionEndDate != null and csDevModelQueryParm.versionEndDate != ''">
+            </if>
-            AND a.version_date &lt;= #{csDevModelQueryParm.versionEndDate }
+            <if test="csDevModelQueryParm.versionEndDate != null and csDevModelQueryParm.versionEndDate != ''">
-        </if>
+                AND a.version_date &lt;= #{csDevModelQueryParm.versionEndDate }
+            </if>
 
-        <if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
+            <if test="csDevModelQueryParm.devName != null and csDevModelQueryParm.devName != ''">
-            AND a.dev_type_name LIKE concat('%',#{csDevModelQueryParm.devName},'%')
+                AND a.dev_type_name = #{csDevModelQueryParm.devName}
-        </if>
+            </if>
-<!--        <if test="csDevModelQueryParm.devType != null and csDevModelQueryParm.devType != ''">-->
+             <if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
-<!--            AND a.dev_type = #{csDevModelQueryParm.devType}-->
+                AND a.name LIKE concat('%',#{csDevModelQueryParm.name},'%')
-<!--        </if>-->
+            </if>
-         <if test="csDevModelQueryParm.name != null and csDevModelQueryParm.name != ''">
+       order by a.version_date desc
-            AND a.name = #{csDevModelQueryParm.name}
+  </select>
-        </if>
+    <select id="queryOne" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
-  </select><select id="queryOne" resultType="com.njcn.csdevice.pojo.vo.CsDevModelPageVO">
    SELECT a.*
         FROM cs_dev_model a
                 WHERE

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/mapper/mapping/WlRecordMapper.xml

@@ -64,7 +64,7 @@
         </if>
          exists
         (select 1 from wl_record_test_data wd where wd.test_item_id = #{wlRecordPageParam.id} and wd.data_id = a.id)
-        order by a.start_time asc
+        order by a.start_time desc
     </select>
 
     <select id="getAll" resultType="com.njcn.csdevice.pojo.vo.CsLedgerVO">
@@ -93,4 +93,55 @@
         )
         order by start_time
     </select>
+
+    <select id="getWlAssByWlId" resultType="com.njcn.csdevice.pojo.po.WlRecord">
+        SELECT
+            a.id,
+            a.start_time,
+            a.end_time,
+            a.line_id,
+            a.type,
+            c.data_level AS dataLevel,
+            b.ct_ratio AS ct,
+            b.pt_ratio AS pt,
+            NULL AS itemName,
+            NULL AS voltageLevel,
+            NULL AS capacitySscb,
+            NULL AS capacitySscmin,
+            NULL AS capacitySt,
+            NULL AS capacitySi
+        FROM
+            wl_record a
+                INNER JOIN cs_line b ON a.line_id = b.line_id
+                INNER JOIN cs_data_set c ON b.data_set_id = c.id
+        WHERE
+            a.type = 1
+          AND a.id IN (
+            SELECT
+                data_id
+            FROM
+                wl_record_test_data
+            WHERE
+                test_item_id = #{wlId} )
+        UNION
+        SELECT
+            a.id,
+            a.start_time,
+            a.end_time,
+            a.line_id,
+            a.type,
+            NULL AS dataLevel,
+            (a.ct / a.ct1) AS ct,
+            (a.pt / a.pt1) AS pt,
+            a.item_name,
+            a.voltage_level,
+            a.capacity_sscb,
+            a.capacity_sscmin,
+            a.capacity_st,
+            a.capacity_si
+        FROM
+            wl_record a
+        WHERE
+            a.id = #{wlId}
+    </select>
 </mapper>

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsEquipmentDeliveryService.java

@@ -39,7 +39,7 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
         * @Author: clam
         * @Date: 2023/3/31
         */
-        Boolean save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm);
+        CsEquipmentDeliveryPO save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm);
         /** 
         * @Description: AuditEquipmentDelivery
         * @Param: [id] 
@@ -99,7 +99,7 @@ public interface CsEquipmentDeliveryService extends IService<CsEquipmentDelivery
      */
     CsEquipmentDeliveryPO findDevByNDid(String nDid);
 
-    void importEquipment(MultipartFile file, HttpServletResponse response);
+    List<CsEquipmentDeliveryPO> importEquipment(MultipartFile file, HttpServletResponse response);
 
     void delete(String devId);
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/CsLinePOService.java

@@ -45,4 +45,6 @@ public interface CsLinePOService extends IService<CsLinePO>{
      * @param csLineParam
      */
     void updateIds(CsLineParam csLineParam);
+
+    List<CsLinePO> getLinesByDevList(List<String> list);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/IWlRecordService.java

@@ -63,6 +63,8 @@ public interface IWlRecordService extends IService<WlRecord> {
      */
     void updateTestRecord(WlRecordParam.UpdateRecord record);
 
+    void updateRecordData(WlRecordParam.UpdateRecord record);
+
     /**
      * 新增或修改方案
      * @param record
@@ -102,10 +104,14 @@ public interface IWlRecordService extends IService<WlRecord> {
      */
     WlRecord findDevBaseData(WlRecordParam.Record param);
 
+    List<RecordVo> findDevBaseDataByLineId(WlRecordParam.lineRecord param);
 
     /**
      * 每日处理没有结束时间的测试基础数据
      */
     void dayDealNoEndTimeEvent(String date);
 
+    List<WlRecord> getWlAssByWlId(String wlId);
+
+    void deleteItem(String id);
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java

@@ -9,7 +9,6 @@ import com.njcn.csdevice.service.ICsDataSetService;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
@@ -40,7 +39,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
                 .in(CsDataSet::getType, Arrays.asList(0,2))
                 .eq(CsDataSet::getStoreFlag,1)
                 .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
-                .orderByAsc(CsDataSet::getType,CsDataSet::getClDev)
+                .orderByAsc(CsDataSet::getIdx)
                 .list();
     }
 
@@ -77,11 +76,11 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
                 .and(i->i.eq(CsDataSet::getDataType,"Rt").or().isNull(CsDataSet::getDataType));
         //谐波电压含有率
         if (target == 0) {
-            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$01");
+            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmV$0".concat(clDev.toString()));
         } else if (target == 1) {
-            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmI$01");
+            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$HarmI$0".concat(clDev.toString()));
         } else if (target == 2) {
-            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$InHarmV$01");
+            wrapper.eq(CsDataSet::getName,"Ds$Pqd$Rt$InHarmV$0".concat(clDev.toString()));
         }
         return this.baseMapper.selectOne(wrapper);
     }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDevModelServiceImpl.java

@@ -1,37 +1,32 @@
 package com.njcn.csdevice.service.impl;
 
-import cn.hutool.core.collection.CollUtil;
-import com.alibaba.nacos.shaded.com.google.gson.Gson;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.mapper.CsDevModelMapper;
-import com.njcn.csdevice.pojo.dto.CsDevModelDto;
 import com.njcn.csdevice.pojo.param.CsDevModelAddParm;
 import com.njcn.csdevice.pojo.param.CsDevModelAuditParm;
 import com.njcn.csdevice.pojo.param.CsDevModelQueryListParm;
 import com.njcn.csdevice.pojo.param.CsDevModelQueryParm;
-import com.njcn.csdevice.pojo.po.CsDataArray;
-import com.njcn.csdevice.pojo.po.CsDataSet;
 import com.njcn.csdevice.pojo.po.CsDevModelPO;
 import com.njcn.csdevice.pojo.vo.CsDevModelPageVO;
 import com.njcn.csdevice.service.CsDevModelService;
 import com.njcn.csdevice.service.ICsDataArrayService;
 import com.njcn.csdevice.service.ICsDataSetService;
-import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
+import com.njcn.system.api.DictTreeFeignClient;
+import com.njcn.system.pojo.po.SysDicTreePO;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.sql.Date;
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Objects;
-import java.util.stream.Collectors;
 
 /**
  * 
@@ -50,6 +45,7 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
     private final ICsDataSetService csDataSetService;
     private final ICsDataArrayService csDataArrayService;
     private final RedisUtil redisUtil;
+    private final DictTreeFeignClient dictTreeFeignClient;
 
     @Override
     public void refreshDevModelCache() {
@@ -128,7 +124,14 @@ public class CsDevModelServiceImpl extends ServiceImpl<CsDevModelMapper, CsDevMo
     @Override
     public IPage<CsDevModelPageVO> queryPage(CsDevModelQueryParm csDevModelQueryParm) {
         Page<CsDevModelPageVO> returnpage = new Page<> (csDevModelQueryParm.getPageNum ( ), csDevModelQueryParm.getPageSize ( ));
-
+        if (Objects.nonNull (csDevModelQueryParm.getDevType()) && StringUtils.isNotBlank(csDevModelQueryParm.getDevType())) {
+            SysDicTreePO po = dictTreeFeignClient.queryById(csDevModelQueryParm.getDevType()).getData();
+            if (Objects.isNull (po)) {
+                throw new BusinessException("装置型号字典缺失");
+            } else {
+                csDevModelQueryParm.setDevName(po.getName());
+            }
+        }
         returnpage = this.getBaseMapper ().getPage(returnpage,csDevModelQueryParm);
         return returnpage;
     }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsEquipmentDeliveryServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.access.api.AskDeviceDataFeignClient;
+import com.njcn.access.utils.MqttUtil;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
@@ -31,6 +32,7 @@ import com.njcn.csdevice.pojo.vo.ProjectEquipmentVO;
 import com.njcn.csdevice.service.*;
 import com.njcn.csdevice.util.QRCodeUtil;
 import com.njcn.csdevice.utils.ExcelStyleUtil;
+import com.njcn.csdevice.utils.StringUtil;
 import com.njcn.db.constant.DbConstant;
 import com.njcn.oss.constant.OssPath;
 import com.njcn.oss.utils.FileStorageUtil;
@@ -39,7 +41,9 @@ import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
+import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.enums.DicTreeEnum;
+import com.njcn.system.pojo.po.SysDicTreePO;
 import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.web.factory.PageFactory;
 import com.njcn.web.utils.RequestUtil;
@@ -90,7 +94,8 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private final AskDeviceDataFeignClient askDeviceDataFeignClient;
     private final RedisUtil redisUtil;
     private final CsSoftInfoMapper csSoftInfoMapper;
-
+    private final IMqttUserService mqttUserService;
+    private final MqttUtil mqttUtil;
     @Override
     public void refreshDeviceDataCache() {
         LambdaQueryWrapper<CsEquipmentDeliveryPO> queryWrapper = new LambdaQueryWrapper<>();
@@ -101,8 +106,13 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     @Transactional(rollbackFor = {Exception.class})
-    public Boolean  save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm) {
+    public CsEquipmentDeliveryPO save(CsEquipmentDeliveryAddParm csEquipmentDeliveryAddParm) {
         boolean result;
+        CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getName, csEquipmentDeliveryAddParm.getName()).ne(CsEquipmentDeliveryPO::getRunStatus, 0).one();
+        if(Objects.nonNull (one)){
+            throw new BusinessException ("设备名称不能重复");
+        }
+        StringUtil.containsSpecialCharacters(csEquipmentDeliveryAddParm.getNdid());
         CsEquipmentDeliveryPO po = this.queryEquipmentPOByndid (csEquipmentDeliveryAddParm.getNdid());
         if(!Objects.isNull (po)){
             throw new BusinessException (AlgorithmResponseEnum.NDID_ERROR);
@@ -111,6 +121,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         BeanUtils.copyProperties (csEquipmentDeliveryAddParm,csEquipmentDeliveryPo);
         csEquipmentDeliveryPo.setStatus (1);
         csEquipmentDeliveryPo.setRunStatus(1);
+        csEquipmentDeliveryPo.setUsageStatus(1);
         String code = dictTreeFeignClient.queryById(csEquipmentDeliveryAddParm.getDevType()).getData().getCode();
         if (Objects.equals(DicDataEnum.PORTABLE.getCode(),code)) {
             csEquipmentDeliveryPo.setProcess(4);
@@ -135,7 +146,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         if (result) {
             refreshDeviceDataCache();
         }
-        return result;
+        return csEquipmentDeliveryPo;
     }
 
     @Override
@@ -216,6 +227,9 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     public Boolean updateEquipmentDelivery(CsEquipmentDeliveryAuditParm csEquipmentDeliveryAuditParm) {
+        StringUtil.containsSpecialCharacters(csEquipmentDeliveryAuditParm.getNdid());
+
+
         boolean result;
         LambdaQueryWrapper<CsEquipmentDeliveryPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(CsEquipmentDeliveryPO::getNdid,csEquipmentDeliveryAuditParm.getNdid())
@@ -226,6 +240,14 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         if (countByAccount >= 1) {
             throw new BusinessException(AlgorithmResponseEnum.NDID_ERROR);
         }
+        List<CsEquipmentDeliveryPO> list = this.lambdaQuery()
+                .ne(CsEquipmentDeliveryPO::getId, csEquipmentDeliveryAuditParm.getId())
+                .ne(CsEquipmentDeliveryPO::getNdid, csEquipmentDeliveryAuditParm.getNdid())
+                .eq(CsEquipmentDeliveryPO::getName, csEquipmentDeliveryAuditParm.getName())
+                .ne(CsEquipmentDeliveryPO::getRunStatus, 0).list();
+        if(!CollectionUtils.isEmpty (list)){
+            throw new BusinessException ("设备名称不能重复");
+        }
         CsEquipmentDeliveryPO csEquipmentDeliveryPo = new CsEquipmentDeliveryPO();
         BeanUtils.copyProperties (csEquipmentDeliveryAuditParm, csEquipmentDeliveryPo);
         result = this.updateById(csEquipmentDeliveryPo);
@@ -291,6 +313,22 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 item.setQrPath(item.getQrPath());
             }
         });
+        //新增逻辑(只针对便携式设备):修改设备中的未注册状态(status = 1)改为5(前端定义的字典也即未接入)
+        for(CsEquipmentDeliveryVO csEquipmentDeliveryVO : page.getRecords()){
+            if(DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 1){
+                csEquipmentDeliveryVO.setStatus(5);
+            } else if (DataParam.portableDevType.equals(csEquipmentDeliveryVO.getDevType()) && csEquipmentDeliveryVO.getStatus() == 2) {
+                csEquipmentDeliveryVO.setStatus(6);
+            }
+            //判断装置是否已经连接上mqtt服务器
+            String clientName = "NJCN-" + csEquipmentDeliveryVO.getNdid().substring(csEquipmentDeliveryVO.getNdid().length() - 6);
+            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+            if (mqttClient) {
+                csEquipmentDeliveryVO.setConnectStatus("已连接");
+            } else {
+                csEquipmentDeliveryVO.setConnectStatus("未连接");
+            }
+        }
         return page;
     }
 
@@ -369,43 +407,28 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
     private void setDataSetValues(CsEquipmentDeliveryPO csEquipmentDeliveryPo, List<CsDataSet> dataSet, List<DeviceManagerVO.DataSetVO> dataSetList, String type, DeviceManagerVO deviceManagerVo) {
         BeanUtils.copyProperties(csEquipmentDeliveryPo, deviceManagerVo);
         if (CollUtil.isNotEmpty(dataSet)) {
-            for (CsDataSet item : dataSet) {
+            if (Objects.equals(type, "rt")) {
-                DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
+                for (CsDataSet item : dataSet) {
-                dataSetVO.setId(item.getId());
+                    DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
-                dataSetVO.setName("history".equals(type) ? "准实时数据":item.getAnotherName());
+                    dataSetVO.setId(item.getId());
-                dataSetVO.setType("rt");
+                    dataSetVO.setName(item.getAnotherName());
-                dataSetList.add(dataSetVO);
+                    dataSetVO.setType("rt");
-                deviceManagerVo.setDataLevel(item.getDataLevel());
+                    dataSetList.add(dataSetVO);
-                if (Objects.equals(type, "history")) {
-                    //历史数据tab
-                    DeviceManagerVO.DataSetVO dataSetVo2 = new DeviceManagerVO.DataSetVO();
-                    dataSetVo2.setId(item.getId());
-                    dataSetVo2.setName("历史统计数据");
-                    dataSetVo2.setType("history");
-                    dataSetList.add(dataSetVo2);
                     deviceManagerVo.setDataLevel(item.getDataLevel());
-                    //下面这些tab仅仅只限于设备监控的便携式设备才会有
-                    if(DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType())){
-                        //趋势数据tab
-                        DeviceManagerVO.DataSetVO dataSetVo3 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo3.setId(item.getId());
-                        dataSetVo3.setName("历史趋势");
-                        dataSetVo3.setType("trenddata");
-                        dataSetList.add(dataSetVo3);
-                        //实时数据tab
-                        DeviceManagerVO.DataSetVO dataSetVo4 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo4.setId(item.getId());
-                        dataSetVo4.setName("实时数据");
-                        dataSetVo4.setType("realtimedata");
-                        dataSetList.add(dataSetVo4);
-                        //暂态事件tab
-                        DeviceManagerVO.DataSetVO dataSetVo5 = new DeviceManagerVO.DataSetVO();
-                        dataSetVo5.setId(item.getId());
-                        dataSetVo5.setName("暂态事件");
-                        dataSetVo5.setType("event");
-                        dataSetList.add(dataSetVo5);
-                    }
                 }
+            } else {
+                CsDataSet item = dataSet.get(0);
+                boolean isPortableDevice = DataParam.portableDevType.equals(csEquipmentDeliveryPo.getDevType());
+                addDataSet(dataSetList, item, "最新数据", "rt");
+                addDataSet(dataSetList, item, "历史统计数据", "history");
+                addDataSet(dataSetList, item, "历史趋势", "trenddata");
+                if (isPortableDevice) {
+                    // 便携式设备特有的数据集
+                    addDataSet(dataSetList, item, "实时数据", "realtimedata");
+                    addDataSet(dataSetList, item, "暂态事件", "event");
+                    addDataSet(dataSetList, item, "测试项日志", "items");
+                }
+                deviceManagerVo.setDataLevel(item.getDataLevel());
             }
             deviceManagerVo.setDataSetList(dataSetList);
             List<CsLinePO> csLinePOS = csLinePOService.findByNdid(csEquipmentDeliveryPo.getNdid());
@@ -415,6 +438,14 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
         }
     }
 
+    private void addDataSet(List<DeviceManagerVO.DataSetVO> dataSetList, CsDataSet item, String name, String type) {
+        DeviceManagerVO.DataSetVO dataSetVO = new DeviceManagerVO.DataSetVO();
+        dataSetVO.setId(item.getId());
+        dataSetVO.setName(name);
+        dataSetVO.setType(type);
+        dataSetList.add(dataSetVO);
+    }
+
     @Override
     public void updateSoftInfoBynDid(String nDid, String id, Integer module) {
         boolean result;
@@ -433,13 +464,14 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void importEquipment(MultipartFile file, HttpServletResponse response) {
+    public List<CsEquipmentDeliveryPO> importEquipment(MultipartFile file, HttpServletResponse response) {
         ImportParams params = new ImportParams ( );
         params.setHeadRows(1);
         params.setTitleRows(1);
         //第一个sheet为台账信息
         params.setStartSheetIndex(0);
         params.setSheetNum(1);
+        String regex = "^[A-Za-z0-9]{6,32}$";
         try {
             ExcelImportResult<DeviceExcelTemplete> terminalBaseList = ExcelImportUtil.importExcelMore (file.getInputStream ( ), DeviceExcelTemplete.class, params);
             //如果存在非法数据，将不合格的数据导出
@@ -448,6 +480,15 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
 
             for (int i = 0; i < terminalBaseList.getList ( ).size ( ); i++) {
                 DeviceExcelTemplete deviceExcelTemplete = terminalBaseList.getList ( ).get (i);
+
+                if(!deviceExcelTemplete.getNdid().matches(regex)){
+                    DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
+                    BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
+                    idlegalityDeviceException.setMsg("网络设备ID只可为数字或字母,长度至少为6位");
+                    falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }
+
                 CsEquipmentDeliveryPO po = this.queryEquipmentPOByndid (deviceExcelTemplete.getNdid ( ));
                 if(!Objects.isNull (po)){
                     DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
@@ -456,39 +497,47 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     falseCollect.add(idlegalityDeviceException);
                     continue;
                 }
-                if(Objects.equals(deviceExcelTemplete.getDevType(),DicDataEnum.GATEWAY_DEV.getName())){
+                CsEquipmentDeliveryPO one = this.lambdaQuery().eq(CsEquipmentDeliveryPO::getName, deviceExcelTemplete.getName()).ne(CsEquipmentDeliveryPO::getRunStatus, 0).one();
-                    DictTreeVO data = dictTreeFeignClient.queryByCode(DicDataEnum.GATEWAY_DEV.getCode()).getData();
+                if(Objects.nonNull (one)){
-                    deviceExcelTemplete.setDevType(data.getId());
-                    List<DictTreeVO> data1 = dictTreeFeignClient.query(data.getId()).getData();
-                    Map<String, DictTreeVO> collect = data1.stream().collect(Collectors.toMap(DictTreeVO::getCode, dictTreeVO -> dictTreeVO));
-                    if(collect.containsKey(deviceExcelTemplete.getDevModel())){
-                        deviceExcelTemplete.setDevModel(collect.get(deviceExcelTemplete.getDevModel()).getId());
-                        trueCollect.add(deviceExcelTemplete);
-                    }else {
-                        DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
-                        BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
-                        idlegalityDeviceException.setMsg("装置型号不正确");
-                        falseCollect.add(idlegalityDeviceException);
-                    }
-                } else if (Objects.equals(deviceExcelTemplete.getDevType(),DicDataEnum.CONNECT_DEV.getName())) {
-                    DictTreeVO data = dictTreeFeignClient.queryByCode(DicDataEnum.CONNECT_DEV.getCode()).getData();
-                    deviceExcelTemplete.setDevType(data.getId());
-                    List<DictTreeVO> data1 = dictTreeFeignClient.query(data.getId()).getData();
-                    Map<String, DictTreeVO> collect = data1.stream().collect(Collectors.toMap(DictTreeVO::getCode, dictTreeVO -> dictTreeVO));
-                    if(collect.containsKey(deviceExcelTemplete.getDevModel())){
-                        deviceExcelTemplete.setDevModel(collect.get(deviceExcelTemplete.getDevModel()).getId());
-                        trueCollect.add(deviceExcelTemplete);
-                    }else {
-                        DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
-                        BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
-                        idlegalityDeviceException.setMsg("装置型号不正确");
-                        falseCollect.add(idlegalityDeviceException);
-                    }
-                }else {
                     DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
                     BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
-                    idlegalityDeviceException.setMsg("装置类型不正确");
+                    idlegalityDeviceException.setMsg("NDID重复");
                     falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }
+                List<SysDicTreePO> deviceType = dictTreeFeignClient.queryByCodeList(DicDataTypeEnum.DEVICE_TYPE.getCode()).getData();
+                //设备类型
+                List<SysDicTreePO> children = deviceType.get(0).getChildren();
+                Map<String, SysDicTreePO> map = children.stream().collect(Collectors.toMap(SysDicTreePO::getName, dictTreeVO -> dictTreeVO));
+
+                List<SysDicTreePO> collect = children.stream().filter(temp -> Objects.equals(temp.getName(), deviceExcelTemplete.getDevType())).collect(Collectors.toList());
+                SysDicTreePO sysDicTreePO = map.get(deviceExcelTemplete.getDevType());
+                if(CollectionUtils.isEmpty(collect)){
+                    DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
+                    BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
+                    idlegalityDeviceException.setMsg("设备类型不正确");
+                    falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }else {
+                    deviceExcelTemplete.setDevType(map.get(deviceExcelTemplete.getDevType()).getId());
+
+                }
+
+                //设备型号
+                List<SysDicTreePO> children1 = sysDicTreePO.getChildren();
+                Map<String, SysDicTreePO> map2 = children1.stream().collect(Collectors.toMap(SysDicTreePO::getName, dictTreeVO -> dictTreeVO));
+
+                List<SysDicTreePO> collect2 = children1.stream().filter(temp -> Objects.equals(temp.getName(), deviceExcelTemplete.getDevModel())).collect(Collectors.toList());
+
+                if(CollectionUtils.isEmpty(collect2)){
+                    DeviceExcelTemplete.IllegalityDeviceExcelTemplete idlegalityDeviceException = new DeviceExcelTemplete.IllegalityDeviceExcelTemplete();
+                    BeanUtils.copyProperties(deviceExcelTemplete,idlegalityDeviceException);
+                    idlegalityDeviceException.setMsg("设备类型与设备型号不匹配");
+                    falseCollect.add(idlegalityDeviceException);
+                    continue;
+                }else {
+                    deviceExcelTemplete.setDevModel(map2.get(deviceExcelTemplete.getDevModel()).getId());
+                    trueCollect.add(deviceExcelTemplete);
                 }
 
 
@@ -505,6 +554,7 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                     csEquipmentDeliveryPO.setRunStatus(1);
                     csEquipmentDeliveryPO.setStatus(1);
                     csEquipmentDeliveryPO.setProcess(2);
+                    csEquipmentDeliveryPO.setSort(100);
 
                     CsEquipmentProcessPO csEquipmentProcess = new CsEquipmentProcessPO();
                     csEquipmentProcess.setDevId(csEquipmentDeliveryPO.getNdid());
@@ -517,17 +567,20 @@ public class CsEquipmentDeliveryServiceImpl extends ServiceImpl<CsEquipmentDeliv
                 }).collect (Collectors.toList ( ));
                 csEquipmentProcessPOService.saveBatch(collect1,500);
                 this.saveOrUpdateBatch (collect, 500);
+
+                return collect;
             }
             if (!CollectionUtils.isEmpty (falseCollect)) {
                 ExportParams exportExcel = new ExportParams ("批量导入模板（请严格按照模板标准填入数据）", "非法设备信息");
                 Workbook workbook = ExcelExportUtil.exportExcel (exportExcel, DeviceExcelTemplete.IllegalityDeviceExcelTemplete.class, falseCollect);
                 ExcelStyleUtil.exportFileByWorkbook (workbook, "非法设备信息.xlsx", response);
-
+                return null;
             }
 
         } catch (Exception e) {
             e.printStackTrace ( );
         }
+        return null;
     }
     /*
     * 物理删除设备相关数据

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsGroupServiceImpl.java

@@ -323,6 +323,7 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                         }).collect(Collectors.toList());
                         List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
                         List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
+                            String unit;
                             ThdDataVO vo = new ThdDataVO();
                             vo.setLineId(temp.getLineId());
                             vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
@@ -332,38 +333,102 @@ public class CsGroupServiceImpl extends ServiceImpl<CsGroupMapper, CsGroup> impl
                             vo.setStatMethod(temp.getValueType());
                             vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
                             if(temp.getValue()!=null) {
-                                double re;
+                                double re = 0;
                                 if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
                                     if (Objects.equals("Primary",csDataSet.getDataLevel())) {
-                                        vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
-                                        vo.setUnit(epdPqd.getUnit());
-                                    } else {
                                         if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
-                                            re = DataChangeUtil.secondaryToPrimary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct) / 1000;
+                                            re = Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue() / 1000));
-                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                            vo.setStatisticalData(re);
-                                            vo.setUnit("k" + epdPqd.getUnit());
+                                            unit = "k" + epdPqd.getUnit();
                                         } else {
-                                            vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                            vo.setStatisticalData(Objects.isNull(temp.getValue()) ? 3.14159 : Double.parseDouble(df.format(temp.getValue())));
-                                            vo.setUnit(epdPqd.getUnit());
+                                            unit = epdPqd.getUnit();
                                         }
+                                    } else {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    re = temp.getValue() * pt / 1000;
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                case "*CT":
+                                                    re = temp.getValue() * ct;
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    re = temp.getValue() * pt * ct / 1000;
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                default:
+                                                    re = temp.getValue();
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                            }
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }else {
+                                            re = temp.getValue();
+                                            unit = epdPqd.getUnit();
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }
+
                                     }
                                 } else {
                                     if (Objects.equals("Primary",csDataSet.getDataLevel())) {
-                                        if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
-                                            re = DataChangeUtil.primaryToSecondary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct);
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    re = temp.getValue() / pt;
+                                                    break;
+                                                case "*CT":
+                                                    re = temp.getValue() / ct;
+                                                    break;
+                                                case "*PT*CT":
+                                                    re = temp.getValue() / pt / ct;
+                                                    break;
+                                                default:
+                                                    re = temp.getValue();
+                                                    break;
+                                            }
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }else {
+                                            re = temp.getValue();
                                             vo.setStatisticalData(Double.valueOf(df.format(re)));
-                                        } else {
-                                            vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
-                                            vo.setUnit(epdPqd.getUnit());
                                         }
                                     } else {
                                         vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
                                     }
-                                    vo.setUnit(epdPqd.getUnit());
+                                    unit = epdPqd.getUnit();
                                 }
                             } else {
                                 vo.setStatisticalData(null);
+                                if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
+                                    if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                        unit = epdPqd.getUnit();
+                                    } else {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                case "*CT":
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                default:
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                            }
+                                        }else {
+                                            unit = epdPqd.getUnit();
+                                        }
+                                    }
+                                } else {
+                                    unit = epdPqd.getUnit();
+                                }
                             }
+                            vo.setUnit(unit);
                             vo.setStatisticalIndex(epdPqd.getId());
                             vo.setStatisticalName(epdPqd.getName());
                             vo.setAnotherName(epdPqd.getShowName());

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLedgerServiceImpl.java

@@ -4,6 +4,7 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 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.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.constant.DataParam;
@@ -15,16 +16,15 @@ import com.njcn.csdevice.pojo.param.CsLedgerParam;
 import com.njcn.csdevice.pojo.po.*;
 import com.njcn.csdevice.pojo.vo.CsLedgerVO;
 import com.njcn.csdevice.service.*;
-import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.AreaFeignClient;
-import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.pojo.po.Area;
 import lombok.AllArgsConstructor;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 
 /**
@@ -39,15 +39,12 @@ import java.util.stream.Collectors;
 @AllArgsConstructor
 public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> implements ICsLedgerService {
 
-    private final ICsEngineeringUserService csEngineeringUserService;
     private final AreaFeignClient areaFeignClient;
     private final RedisUtil redisUtil;
     private final AppTopologyDiagramMapper appTopologyDiagramMapper;
     private final AppProjectMapper appProjectMapper;
     private final CsEngineeringMapper csEngineeringMapper;
     private final CsLinePOService csLinePOService;
-    private final DicDataFeignClient dicDataFeignClient;
-    private final FileStorageUtil fileStorageUtil;
     private final RoleEngineerDevService roleEngineerDevService;
     private final CsDevModelRelationService csDevModelRelationService;
     private final CsEquipmentDeliveryMapper csEquipmentDeliveryMapper;
@@ -76,21 +73,47 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         List<String> roleengineer = roleEngineerDevService.getRoleengineer();
         List<String> device = roleEngineerDevService.getDevice();
         engineeringList = allList.stream().filter(item->roleengineer.contains(item.getId())).collect(Collectors.toList());
-
         List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-        List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(),"0")).
+
-                peek(
+        Map<String, CsEquipmentDeliveryPO> poMap = allList.stream()
-                        temp->{
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
-                            CsEquipmentDeliveryPO csEquipmentDeliveryPO = csEquipmentDeliveryMapper.selectById(temp.getId());
+                .map(CsLedgerVO::getId)
-                            temp.setComFlag(csEquipmentDeliveryPO.getRunStatus());
+                .distinct()
-                            temp.setType("device");
+                .collect(Collectors.toMap(
-                        }
+                        Function.identity(),
-                ).
+                        csEquipmentDeliveryMapper::selectById
-                sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
+                ));
+
+        List<CsLedgerVO> deviceList = allList.stream()
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .peek(item -> {
+                    CsEquipmentDeliveryPO po = poMap.get(item.getId());
+                    item.setComFlag(po.getRunStatus());
+                    item.setNDId(po.getNdid());
+                    item.setType("device");
+                })
+                .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
+                .collect(Collectors.toList());
+
         List<CsLedgerVO> finalLineList = allList.stream()
                 .filter(item -> item.getLevel().equals(LineBaseEnum.LINE_LEVEL.getCode()))
                 .sorted(Comparator.comparing(CsLedgerVO::getSort))
-                .peek(item -> item.setType("line"))
+                .peek(
+                        item -> {
+                            item.setType("line");
+                            String index = item.getId().substring(item.getId().length()-1);
+                            if (Objects.equals(index,"0")) {
+                                item.setLineType(0);
+                            } else {
+                                item.setLineType(1);
+                            }
+                            LambdaQueryWrapper<CsLinePO> queryWrapper = new LambdaQueryWrapper<>();
+                            queryWrapper.eq(CsLinePO::getLineId,item.getId()).eq(CsLinePO::getStatus,1);
+                            CsLinePO po = csLinePOService.getOne(queryWrapper);
+                            item.setConType(po.getConType());
+                        }
+                )
                 .collect(Collectors.toList());
         checkDevSetData(deviceList);
         deviceList.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
@@ -102,14 +125,29 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setName(DataParam.portableDev);
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
-        List<CsLedgerVO> portables = allList.stream().filter(item->Objects.equals(item.getLevel(),2) && Objects.equals(item.getPid(),"0")).collect(Collectors.toList());
+        //针对未启用的装置判断
-        for(CsLedgerVO c : portables){
+        List<CsLedgerVO> ledger = allList.stream()
-            c.setPid(portable.getId());
+                .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
-            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
+                .collect(Collectors.toList());
-            c.setComFlag(po.getRunStatus());
+        Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
-            c.setNDId(po.getNdid());
+                .collect(Collectors.toMap(
-            c.setType("device");
+                        CsLedgerVO::getId,
-        }
+                        csEquipmentDeliveryMapper::selectById,
+                        (existing, replacement) -> existing
+                ));
+        List<CsLedgerVO> portables = ledger.stream()
+                .peek(c -> {
+                    CsEquipmentDeliveryPO po = poMap2.get(c.getId());
+                    c.setPid(portable.getId());
+                    c.setComFlag(po.getRunStatus());
+                    c.setNDId(po.getNdid());
+                    c.setType("device");
+                    c.setName(po.getName());
+                    c.setSort(po.getSort());
+                })
+                .filter(c -> poMap2.get(c.getId()).getUsageStatus() == 1)
+                .collect(Collectors.toList());
+        portables = portables.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         portables.forEach(dev -> dev.setChildren(getChildren(dev, finalLineList)));
         checkDevSetData(portables);
         portable.setChildren(portables);
@@ -167,17 +205,28 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         List<String> device = roleEngineerDevService.getDevice();
         engineeringList = allList.stream().filter(item->roleengineer.contains(item.getId())).collect(Collectors.toList());
         List<CsLedgerVO> projectList = allList.stream().filter(item -> item.getLevel().equals(LineBaseEnum.PROJECT_LEVEL.getCode())).sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
-        List<CsLedgerVO> deviceList = allList.stream().filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(),"0")).
+
-                peek(
+        Map<String, CsEquipmentDeliveryPO> poMap = allList.stream()
-                        temp->{
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
-                            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(temp.getId());
+                .map(CsLedgerVO::getId)
-                            temp.setComFlag(po.getRunStatus());
+                .distinct()
-                            temp.setNDId(po.getNdid());
+                .collect(Collectors.toMap(
-                            temp.setType("device");
+                        Function.identity(),
-                        }
+                        csEquipmentDeliveryMapper::selectById
-                ).
+                ));
-                sorted(Comparator.comparing(CsLedgerVO::getSort))
+
+        List<CsLedgerVO> deviceList = allList.stream()
+                .filter(item -> device.contains(item.getId()) && !Objects.equals(item.getPid(), "0"))
+                .peek(item -> {
+                    CsEquipmentDeliveryPO po = poMap.get(item.getId());
+                    item.setComFlag(po.getRunStatus());
+                    item.setNDId(po.getNdid());
+                    item.setType("device");
+                })
+                .filter(item -> Objects.equals(poMap.get(item.getId()).getUsageStatus(), 1))
+                .sorted(Comparator.comparing(CsLedgerVO::getSort))
                 .collect(Collectors.toList());
+
         checkDevSetData(deviceList);
         projectList.forEach(pro -> pro.setChildren(getChildren(pro, deviceList)));
         engineeringList.forEach(eng -> eng.setChildren(getChildren(eng, projectList)));
@@ -188,15 +237,31 @@ public class CsLedgerServiceImpl extends ServiceImpl<CsLedgerMapper, CsLedger> i
         portable.setName(DataParam.portableDev);
         portable.setPid("0");
         portable.setId(IdUtil.simpleUUID());
-        List<CsLedgerVO> portables = allList.stream().filter(item->Objects.equals(item.getLevel(),2) && Objects.equals(item.getPid(),"0")).collect(Collectors.toList());
+
-        checkDevSetData(portables);
+        //针对未启用的装置判断
-        for(CsLedgerVO c : portables){
+        List<CsLedgerVO> ledger = allList.stream()
-            c.setPid(portable.getId());
+                .filter(item -> Objects.equals(item.getLevel(), 2) && Objects.equals(item.getPid(), "0"))
-            CsEquipmentDeliveryPO po = csEquipmentDeliveryMapper.selectById(c.getId());
+                .collect(Collectors.toList());
-            c.setComFlag(po.getRunStatus());
+        Map<String, CsEquipmentDeliveryPO> poMap2 = ledger.stream()
-            c.setNDId(po.getNdid());
+                .collect(Collectors.toMap(
-            c.setType("device");
+                        CsLedgerVO::getId,
-        }
+                        csEquipmentDeliveryMapper::selectById,
+                        (existing, replacement) -> existing
+                ));
+        List<CsLedgerVO> portables = ledger.stream()
+                .peek(c -> {
+                    CsEquipmentDeliveryPO po = poMap2.get(c.getId());
+                    c.setPid(portable.getId());
+                    c.setComFlag(po.getRunStatus());
+                    c.setNDId(po.getNdid());
+                    c.setType("device");
+                    c.setName(po.getName());
+                    c.setSort(po.getSort());
+                })
+                .filter(c -> poMap2.get(c.getId()).getUsageStatus() == 1)
+                .collect(Collectors.toList());
+
+        portables = portables.stream().sorted(Comparator.comparing(CsLedgerVO::getSort)).collect(Collectors.toList());
         portable.setChildren(portables);
 
         CsLedgerVO government = new CsLedgerVO();

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java

@@ -14,6 +14,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -67,7 +68,8 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
                             .set(CsLinePO::getVolGrade,csLineParam.getVolGrade())
                             .set(CsLinePO::getPtRatio,csLineParam.getPtRatio())
                             .set(CsLinePO::getCtRatio,csLineParam.getCtRatio())
-                            .set(CsLinePO::getConType,csLineParam.getConType());
+                            .set(CsLinePO::getConType,csLineParam.getConType())
+                            .set(CsLinePO::getLineInterval,csLineParam.getLineInterval());
         this.update(lambdaUpdateWrapper);
     }
 
@@ -81,6 +83,11 @@ public class CsLinePOServiceImpl extends ServiceImpl<CsLinePOMapper, CsLinePO> i
         this.update(lambdaUpdateWrapper);
     }
 
+    @Override
+    public List<CsLinePO> getLinesByDevList(List<String> list) {
+        return this.lambdaQuery().in(CsLinePO::getDevId,list).eq(CsLinePO::getStatus,1).list();
+    }
+
 //    /**
 //     * 1.平台端默认配置拓扑图模板，包含拓扑图信息(cs_topology_diagram_template)和拓扑图上监测点的点位信息(cs_line_topology_template)
 //     *

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceFtpServiceImpl.java

@@ -45,7 +45,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
     public MakeUpVo askDeviceRootPath(String nDid) {
         MakeUpVo makeUpVo = new MakeUpVo();
         try {
-            judgeClientOnline(nDid);
+            boolean mqttClient = judgeClientOnline(nDid);
+            if (!mqttClient){
+                throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
+            }
             redisUtil.delete(AppRedisKey.DEVICE_ROOT_PATH + nDid);
             askDeviceDataFeignClient.askDeviceRootPath(nDid);
             Thread.sleep(3000);
@@ -55,7 +58,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
                 makeUpVo.setType("dir");
             }
         } catch (Exception e) {
-            throw new BusinessException(AlgorithmResponseEnum.ASK_DEVICE_DIR_ROOT_ERROR);
+            throw new BusinessException(e.getMessage());
         }
         return makeUpVo;
     }
@@ -64,7 +67,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
     public List<MakeUpVo> askDeviceFileOrDir(String nDid, String name, String type) {
         List<MakeUpVo> result = new ArrayList<>();
         try {
-            judgeClientOnline(nDid);
+            boolean mqttClient = judgeClientOnline(nDid);
+            if (!mqttClient){
+                throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
+            }
             // 删除旧的缓存信息
             redisUtil.delete(AppRedisKey.PROJECT_INFO + nDid);
             // 请求设备文件或目录信息
@@ -78,7 +84,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
             }
         } catch (Exception e) {
             // 捕获特定异常并抛出运行时异常
-            throw new BusinessException(AlgorithmResponseEnum.ASK_DEVICE_DIR_ERROR);
+            throw new BusinessException(e.getMessage());
         }
         if (CollUtil.isNotEmpty(result)) {
             result.stream().sorted(Comparator.comparing(MakeUpVo::getType)).collect(Collectors.toList());
@@ -89,7 +95,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
     @Override
     @Async
     public void downloadFile(String nDid, String name, Integer size, String fileCheck) {
-        judgeClientOnline(nDid);
+        boolean mqttClient = judgeClientOnline(nDid);
+        if (!mqttClient) {
+            throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
+        }
         Object task = redisUtil.getObjectByKey("fileDowning:"+nDid);
         if (Objects.nonNull(task)) {
             throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING);
@@ -104,7 +113,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
         } catch (Exception e) {
             redisUtil.delete("fileDowning:"+nDid);
             redisUtil.delete("fileCheck"+nDid+name);
-            throw new BusinessException(AlgorithmResponseEnum.FILE_DOWNLOADING);
+            throw new BusinessException(e.getMessage());
         }
     }
 
@@ -119,6 +128,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
         redisUtil.delete("fileCheck"+nDid+name);
         redisUtil.delete("fileDowning:"+nDid);
         redisUtil.delete(AppRedisKey.FILE_PART.concat(name));
+        redisUtil.delete("fileDownUserId"+nDid+name);
         return result;
     }
 
@@ -134,7 +144,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
                 result = true;
             }
         } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException(e.getMessage());
         }
         return result;
     }
@@ -151,7 +161,7 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
                 result = true;
             }
         } catch (InterruptedException e) {
-            throw new RuntimeException(e);
+            throw new RuntimeException(e.getMessage());
         }
         return result;
     }
@@ -198,13 +208,10 @@ public class DeviceFtpServiceImpl implements DeviceFtpService {
         return vo;
     }
 
-    public void judgeClientOnline(String nDid) {
+    public boolean judgeClientOnline(String nDid) {
         //判断客户端是否在线
         String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
-        boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+        return mqttUtil.judgeClientOnline(clientName);
-        if (!mqttClient){
-            throw new BusinessException(AccessResponseEnum.MISSING_CLIENT);
-        }
     }
 
 

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/PortableOfflLogServiceImpl.java

@@ -2,20 +2,26 @@ package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.util.IdUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.EquipmentFeignClient;
 import com.njcn.csdevice.constant.DataParam;
 import com.njcn.csdevice.enums.AlgorithmResponseEnum;
 import com.njcn.csdevice.mapper.PortableOfflLogMapper;
 import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
+import com.njcn.csdevice.pojo.po.CsLinePO;
 import com.njcn.csdevice.pojo.po.PortableOffMainLog;
 import com.njcn.csdevice.pojo.po.PortableOfflLog;
+import com.njcn.csdevice.pojo.po.WlRecord;
+import com.njcn.csdevice.service.CsLinePOService;
 import com.njcn.csdevice.service.IPortableOfflLogService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.csdevice.param.UploadDataParam;
+import com.njcn.csdevice.service.IWlRecordService;
 import com.njcn.csdevice.service.PortableOffMainLogService;
 import com.njcn.csdevice.util.InfluxDbParamUtil;
 import com.njcn.csharmonic.api.EventFeignClient;
@@ -50,9 +56,12 @@ import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 import java.io.*;
+import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
+import java.time.Instant;
 import java.time.LocalDateTime;
+import java.time.ZoneId;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -93,6 +102,8 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
 
     private final MqttPublisher publisher;
     private final PortableOffMainLogService portableOffMainLogService;
+    private final IWlRecordService wlRecordService;
+    private final CsLinePOService csLinePOService;
 
     @Override
     public Page<PortableOfflLog> queryPage(BaseParam baseParam) {
@@ -169,6 +180,10 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
     @Transactional(rollbackFor = {Exception.class})
     public void importEquipment(UploadDataParam uploadDataParam){
         String lineId = uploadDataParam.getLineId();
+        //获取监测点信息
+        LambdaQueryWrapper<CsLinePO> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(CsLinePO::getLineId,lineId).eq(CsLinePO::getStatus,1);
+        CsLinePO po = csLinePOService.getOne(queryWrapper);
         String cdid  = uploadDataParam.getLineId().substring(uploadDataParam.getLineId().length() - 1);
         //第一步解析redcord.bin文件获取监测点序号做校验
         List<MultipartFile> record = uploadDataParam.getFiles().stream().filter(
@@ -261,7 +276,7 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
         int successcCount = 0;
         portableOffMainLog.setStatus("1");
 
-        
+        List<PortableOfflLog> portableOfflLogs = new ArrayList<>();
         for(MultipartFile file : uploadDataParam.getFiles()){
 
             //初始上传日志基本信息
@@ -275,11 +290,16 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
             //默认总条数及入库数为0(防止解析的数据重复插入及上传的文件目录路径错误)
             portableOfflLog.setAllCount(0);
             portableOfflLog.setRealCount(0);
+            if(file.getOriginalFilename().contains("record.bin")){
+                portableOfflLog.setAllCount(1);
+                portableOfflLog.setState(1);
+            }
 
             //开始匹配解析的文件结果入库
             for(Response response : responses){
                 //min解析结果较为特殊所有的文件解析后只有一条结果
-                if(OfflineConstant.MIN.equals(response.getFilename()) && checkPrevsFolder(file.getOriginalFilename(),OfflineConstant.MIN)!=null){
+                if(OfflineConstant.MIN.equals(response.getFilename()) && checkPrevsFolder(file.getOriginalFilename(),OfflineConstant.MIN)!=null&&minFlag){
+
                     List<PqdData> pqdData = (List<PqdData>) response.getObj();
                     pqdData.forEach(temp->{
                         temp.setClDid(cdid);
@@ -287,6 +307,37 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                         temp.setProcess(data1.get(0).getProcess()+"");
                         temp.setLineId(uploadDataParam.getLineId());
                     });
+
+                    Instant instantMax = pqdData.stream().map(PqdData::getTime).max(Instant::compareTo).get();
+                    Instant instantMin = pqdData.stream().map(PqdData::getTime).min(Instant::compareTo).get();
+                    //插入测试项
+                    WlRecord wlRecord = new WlRecord();
+                    wlRecord.setId(IdUtil.fastSimpleUUID());
+                    wlRecord.setItemName("补召");
+                    wlRecord.setGcName("补召");
+                    wlRecord.setDevId(csEquipmentDeliveryDTO.getId());
+                    wlRecord.setLineId(lineId);
+
+                    wlRecord.setStatisticalInterval(po.getLineInterval());
+                    wlRecord.setPt(po.getPtRatio().intValue());
+                    wlRecord.setCt(po.getCtRatio().intValue());
+                    //电压等级
+                    DictData dictData = dicDataFeignClient.getDicDataByCodeAndType(channelVol(new Float(po.getVolGrade())) + "kV","Dev_Voltage_Stand").getData();
+                    wlRecord.setVoltageLevel(Objects.isNull(dictData)?null:dictData.getId());
+                    //电压接线方式
+                    wlRecord.setVolConType(getVolConType(po.getConType()));
+
+                    wlRecord.setStartTime(instantMin.atZone(ZoneId.systemDefault()).toLocalDateTime());
+                    wlRecord.setEndTime(instantMax.atZone(ZoneId.systemDefault()).toLocalDateTime());
+                    wlRecord.setType(1);
+                    wlRecord.setState(DataStateEnum.ENABLE.getCode());
+                    wlRecordService.lambdaUpdate().set(WlRecord::getState,DataStateEnum.DELETED.getCode())
+                            .eq(WlRecord::getLineId,lineId)
+                            .eq(WlRecord::getStartTime,wlRecord.getStartTime())
+                            .eq(WlRecord::getEndTime,wlRecord.getEndTime()).update();
+                    wlRecordService.save(wlRecord);
+
+
                     //如果明确返回了state 那么当前文件解析出错
                     if(response.getState() != null){
                         portableOfflLog.setState(response.getState());
@@ -294,6 +345,7 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                     if(pqdData != null && !pqdData.isEmpty()){
                         //否则正常标记为成功解析
                         portableOfflLog.setState(1);
+                        portableOfflLog.setName("min文件夹");
                         portableOfflLog.setAllCount(pqdData.size());
                         portableOfflLog.setRealCount(pqdData.size());
                         if(minFlag){
@@ -311,17 +363,16 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                     //判断当前解析的数据属于哪种结果(目前来说三种:comtrade、log、min(除外))
                     if(checkPrevsFolder(file.getOriginalFilename(),OfflineConstant.COMTRADE)!=null){    //cfg
                         //如果明确返回了state 那么当前文件解析出错
-                        if(response.getState() != null){
+                        //由于dat文件不解析但是日志需要记载所以都设为1
-                            portableOfflLog.setState(response.getState());
+
-                        }
                         TagComtradeCfg tagComtradeCfg = (TagComtradeCfg) response.getObj();
-                        if(tagComtradeCfg != null){
+
-                            //否则正常标记为成功解析
+                        //否则正常标记为成功解析
-                            portableOfflLog.setState(1);
+                        portableOfflLog.setState(1);
-                            portableOfflLog.setAllCount(1);
+                        portableOfflLog.setAllCount(1);
-                            portableOfflLog.setRealCount(1);
+                        portableOfflLog.setRealCount(1);
                             //cfg入库
-                        }
+
                     }
                     if(checkPrevsFolder(file.getOriginalFilename(),OfflineConstant.LOG)!=null){     //事件
                         //如果明确返回了state 那么当前文件解析出错
@@ -378,7 +429,7 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                                 for (Response res : cfgResponse) {
                                     String cfg = res.getFilename();
                                     String dat = cfg.substring(0,cfg.lastIndexOf("."))+OfflineConstant.DAT;
-                                    String sharPath = OfflineConstant.COMTRADE+"/"+csEquipmentDeliveryDTO.getMac()+"/";
+                                    String sharPath = OfflineConstant.COMTRADE+"/"+csEquipmentDeliveryDTO.getMac().replace(":", "-")+"/";
                                     TagComtradeCfg sing = (TagComtradeCfg) res.getObj();
                                     //如果匹配上则需要将当前cfg文件及对应的dat文件上传到comtrade文件夹中
                                     if (sing!= null && sing.getTimeStart()!= null && sing.getTimeTrigger().compareTo(csEventPO.getStartTime())<=0
@@ -471,7 +522,7 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
                 this.baseMapper.insert(portableOfflLog);
                 successcCount++;
             }
-
+            portableOfflLogs.add(portableOfflLog);
         }
         portableOffMainLog.setEndTime(LocalDateTime.now());
         portableOffMainLog.setSuccessCount(successcCount);
@@ -517,4 +568,40 @@ public class PortableOfflLogServiceImpl extends ServiceImpl<PortableOfflLogMappe
         }
         return s1;
     }
+
+    /**
+     * 处理电压
+     * @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;
+    }
 }

cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/WlRecordServiceImpl.java

@@ -33,6 +33,7 @@ import com.njcn.csdevice.pojo.vo.RecordVo;
 import com.njcn.csdevice.service.IWlRecordService;
 import com.njcn.csdevice.util.InfluxDbParamUtil;
 import com.njcn.csdevice.utils.DataChangeUtil;
+import com.njcn.csdevice.utils.StringUtil;
 import com.njcn.csharmonic.constant.HarmonicConstant;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
 import com.njcn.csharmonic.pojo.vo.ThdDataVO;
@@ -61,6 +62,7 @@ import java.time.LocalDateTime;
 import java.time.ZoneOffset;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
+import java.util.function.Function;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -102,6 +104,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
     @Override
 //    @Transactional(rollbackFor = Exception.class)
     public void addRecord(WlRecordParam.AddRecord records) {
+        checkRecord(records);
         //整理的方案下测试项集合(可能添加多个测试项)
         List<WlRecord> insertList = new ArrayList<>();
         //校验方案ID是否存在
@@ -142,6 +145,34 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         this.saveBatch(insertList);
     }
 
+    private void checkRecord(WlRecordParam record) {
+        if (record instanceof WlRecordParam.AddRecord) {
+            WlRecordParam.AddRecord temp =( WlRecordParam.AddRecord) record;
+            String itemName = temp.getRecords().get(0).getItemName();
+            StringUtil.containsSpecialCharacters(itemName);
+            if(StrUtil.isBlank(itemName)){
+                throw new BusinessException("测试项名称不能为空或空格");
+            }
+            List<WlRecord> list = this.lambdaQuery().eq(WlRecord::getPId, temp.getId()).eq(WlRecord::getState, 1).eq(WlRecord::getItemName, itemName).list();
+            if(!CollectionUtils.isEmpty(list)){
+                throw new BusinessException("数据列表中存在同名测试项");
+            }
+        }else if (record instanceof WlRecordParam.UpdateRecord) {
+            WlRecordParam.UpdateRecord temp =( WlRecordParam.UpdateRecord) record;
+            String itemName = temp.getItemName();
+            StringUtil.containsSpecialCharacters(itemName);
+            if(StrUtil.isBlank(itemName)){
+                throw new BusinessException("测试项名称不能为空或空格");
+            }
+            WlRecord one = this.lambdaQuery().eq(WlRecord::getId, temp.getId()).one();
+            List<WlRecord> list = this.lambdaQuery().eq(WlRecord::getPId, one.getPId()).ne(WlRecord::getId, temp.getId()).eq(WlRecord::getState, 1).eq(WlRecord::getItemName, itemName).list();
+            if(!CollectionUtils.isEmpty(list)){
+                throw new BusinessException("数据列表中存在同名测试项");
+            }
+        }
+
+    }
+
     @Override
     public void addBaseData(WlRecord wlRecord) {
         this.save(wlRecord);
@@ -155,6 +186,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
     @Override
 //    @Transactional(rollbackFor = Exception.class)
     public void updateTestRecord(WlRecordParam.UpdateRecord record) {
+        checkRecord(record);
         WlRecord wlRecord = new WlRecord();
         BeanUtils.copyProperties(record, wlRecord);
         wlRecord.setStartTime(record.getProStartTime());
@@ -174,15 +206,37 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         overlimitService.saveOrUpdate(overlimit);
     }
 
+    @Override
+    public void updateRecordData(WlRecordParam.UpdateRecord record) {
+        LambdaQueryWrapper<WlRecord> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(WlRecord::getId, record.getId());
+        WlRecord wlRecord = this.getOne(queryWrapper);
+        if (Objects.isNull(wlRecord)) {
+            throw new BusinessException("测试项缺失!");
+        } else {
+            wlRecord.setStartTime(record.getProStartTime());
+            wlRecord.setEndTime(record.getProEndTime());
+        }
+        this.updateById(wlRecord);
+    }
+
     @Override
     public void updateSchemeRecord(WlRecordParam.UpdateRecord record) {
         WlRecord wlRecord = new WlRecord();
+        checkString(record.getItemName());
         if(record.getId()!=null){
             BeanUtils.copyProperties(record, wlRecord);
+            LambdaQueryWrapper<WlRecord> qw = new LambdaQueryWrapper();
+            qw.eq(WlRecord::getItemName,record.getItemName()).isNull(WlRecord::getPId).eq(WlRecord::getType,0).eq(WlRecord::getState,1).ne(WlRecord::getId,record.getId());
+            List<WlRecord> wlRecordList = this.baseMapper.selectList(qw);
+            //方案名称重复校验
+            if(!wlRecordList.isEmpty()){
+                throw new BusinessException(LineBaseEnum.EXISTWLRECORD_FAIL.getMessage());
+            }
             this.updateById(wlRecord);
         }else{
             LambdaQueryWrapper<WlRecord> qw = new LambdaQueryWrapper();
-            qw.eq(WlRecord::getItemName,record.getItemName()).eq(WlRecord::getType,0).eq(WlRecord::getState,1);
+            qw.eq(WlRecord::getItemName,record.getItemName()).isNull(WlRecord::getPId).eq(WlRecord::getType,0).eq(WlRecord::getState,1);
             List<WlRecord> wlRecordList = this.baseMapper.selectList(qw);
             //方案名称重复校验
             if(!wlRecordList.isEmpty()){
@@ -196,6 +250,13 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         }
     }
 
+    private void checkString(String itemName) {
+        StringUtil.containsSpecialCharacters(itemName);
+        if(StrUtil.isBlank(itemName)){
+            throw new BusinessException("测试项名称不能为空或空格");
+        }
+    }
+
     @Override
     public RecordVo.RecordItemVo getTestRecordById(String testRecordId) {
         RecordVo.RecordItemVo recordItemVo = new RecordVo.RecordItemVo();
@@ -408,94 +469,154 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         //格式化前端参数
         formatQueryParamList(commonStatisticalQueryParam);
         if(commonStatisticalQueryParam.getList() != null && !commonStatisticalQueryParam.getList().isEmpty()){
-                for (CommonStatisticalQueryParam param : commonStatisticalQueryParam.getList()){
+            for (CommonStatisticalQueryParam param : commonStatisticalQueryParam.getList()){
-                    if(param.getStatisticalId() == null){
+                if(param.getStatisticalId() == null){
-                        continue;
+                    continue;
+                }
+                List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData();
+                for(WlRecord wl : data){
+                    List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(wl.getLineId())).getData();
+                    CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePOList.get(0).getDataSetId()));
+                    if(StrUtil.isBlank(csDataSet.getDataLevel())){
+                        throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
                     }
-                    List<EleEpdPqd> eleEpdPqds = csStatisticalSetFeignClient.queryStatisticalSelect(param.getStatisticalId()).getData();
+                    Double ct = Double.valueOf(wlRecord.getCt())/wlRecord.getCt1();
-                    for(WlRecord wl : data){
+                    Double pt =Double.valueOf(wlRecord.getPt())/wlRecord.getPt1();
-                        List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(wl.getLineId())).getData();
-                        CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePOList.get(0).getDataSetId()));
-                        if(StrUtil.isBlank(csDataSet.getDataLevel())){
-                            throw new BusinessException("当前测点数据集主要信息缺失,请联系管理员排查(测点表里面数据集id缺失)");
-                        }
-                        Double ct = Double.valueOf(wlRecord.getCt())/wlRecord.getCt1();
-                        Double pt =Double.valueOf(wlRecord.getPt())/wlRecord.getPt1();
 
-                        List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of(wl.getDevId()).collect(Collectors.toList())).getData();
+                    List<CsEquipmentDeliveryDTO> data1 = equipmentFeignClient.queryDeviceById(Stream.of(wl.getDevId()).collect(Collectors.toList())).getData();
-                        eleEpdPqds.forEach(epdPqd->{
+                    eleEpdPqds.forEach(epdPqd->{
-                            List<CommonQueryParam> commonQueryParams = finalCsLinePOList.stream().map(temp -> {
+                        List<CommonQueryParam> commonQueryParams = finalCsLinePOList.stream().map(temp -> {
-                                CommonQueryParam commonQueryParam = new CommonQueryParam();
+                            CommonQueryParam commonQueryParam = new CommonQueryParam();
-                                commonQueryParam.setLineId(temp.getLineId());
+                            commonQueryParam.setLineId(temp.getLineId());
-                                commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
+                            commonQueryParam.setTableName(influxDbParamUtil.getTableNameByClassId(epdPqd.getClassId()));
-                                commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency()));
+                            commonQueryParam.setColumnName(epdPqd.getName()+ (param.getFrequency() == null ? "":"_"+param.getFrequency()));
-                                commonQueryParam.setPhasic(epdPqd.getPhase());
+                            commonQueryParam.setPhasic(epdPqd.getPhase());
-                                commonQueryParam.setStartTime(LocalDateTimeUtil.format(wl.getStartTime(), DateTimeFormatter.ofPattern(DataParam.timeFormat)));
+                            commonQueryParam.setStartTime(LocalDateTimeUtil.format(wl.getStartTime(), DateTimeFormatter.ofPattern(DataParam.timeFormat)));
-                                commonQueryParam.setEndTime(LocalDateTimeUtil.format(wl.getEndTime(), DateTimeFormatter.ofPattern(DataParam.timeFormat)));
+                            commonQueryParam.setEndTime(LocalDateTimeUtil.format(wl.getEndTime(), DateTimeFormatter.ofPattern(DataParam.timeFormat)));
-                                commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType());
+                            commonQueryParam.setDataType(commonStatisticalQueryParam.getValueType());
-                                commonQueryParam.setProcess(data1.get(0).getProcess()+"");
+                            commonQueryParam.setProcess(data1.get(0).getProcess()+"");
-                                commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId()));
+                            commonQueryParam.setClDid(influxDbParamUtil.getClDidByLineId(temp.getLineId()));
-                                return commonQueryParam;
+                            return commonQueryParam;
-                            }).collect(Collectors.toList());
+                        }).collect(Collectors.toList());
-                            List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
+                        List<StatisticalDataDTO> deviceRtData = commonService.getDeviceRtDataByTime(commonQueryParams);
-                            //此处设空时为了有多段时将线条断开前端显示
+                        //此处设空时为了有多段时将线条断开前端显示
-                            if(!CollectionUtils.isEmpty(deviceRtData)){
+                        if(!CollectionUtils.isEmpty(deviceRtData)){
-                                deviceRtData.get(deviceRtData.size()-1).setValue(null);
+                            deviceRtData.get(deviceRtData.size()-1).setValue(null);
-                            }
+                        }
-                            List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
+                        List<ThdDataVO> collect1 = deviceRtData.stream().map(temp -> {
-                                ThdDataVO vo = new ThdDataVO();
+                            String unit;
-                                vo.setLineId(temp.getLineId());
+                            ThdDataVO vo = new ThdDataVO();
-                                vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
+                            vo.setLineId(temp.getLineId());
-                                String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
+                            vo.setPhase(Objects.equals("M",temp.getPhaseType())?null:temp.getPhaseType());
-                                vo.setPosition(position);
+                            String position = finalCsLinePOList.stream().filter(csLinePO -> Objects.equals(csLinePO.getLineId(), vo.getLineId())).collect(Collectors.toList()).get(0).getPosition();
-                                vo.setTime(temp.getTime());
+                            vo.setPosition(position);
-                                vo.setStatMethod(temp.getValueType());
+                            vo.setTime(temp.getTime());
-                                if(temp.getValue()!=null) {
+                            vo.setStatMethod(temp.getValueType());
-                                    double re;
+                            if(temp.getValue()!=null) {
-                                    if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
+                                double re = 0;
-                                        if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
-                                            vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                    if (Objects.equals("Primary",csDataSet.getDataLevel())) {
-                                            vo.setUnit(epdPqd.getUnit());
+                                        vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
-                                        } else {
+                                        unit = epdPqd.getUnit();
-                                            if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
-                                                re = DataChangeUtil.secondaryToPrimary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct) / 1000;
-                                                vo.setStatisticalData(Double.valueOf(df.format(re)));
-                                                vo.setUnit("k" + epdPqd.getUnit());
-                                            } else {
-                                                vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
-                                                vo.setUnit(epdPqd.getUnit());
-                                            }
-                                        }
                                     } else {
-                                        if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
-                                            if (HarmonicConstant.POWER_LIST.contains(epdPqd.getShowName())) {
+                                            switch (epdPqd.getPrimaryFormula()) {
-                                                re = DataChangeUtil.primaryToSecondary(epdPqd.getPrimaryFormula(), temp.getValue(), pt, ct);
+                                                case "*PT":
-                                                vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                                    re = temp.getValue() * pt / 1000;
-                                            } else {
+                                                    unit = "k" + epdPqd.getUnit();
-                                                vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                                    break;
-                                                vo.setUnit(epdPqd.getUnit());
+                                                case "*CT":
+                                                    re = temp.getValue() * ct;
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    re = temp.getValue() * pt * ct / 1000;
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                default:
+                                                    re = temp.getValue();
+                                                    unit = epdPqd.getUnit();
+                                                    break;
                                             }
-                                        } else {
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
-                                            vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                        }else {
+                                            re = temp.getValue();
+                                            unit = epdPqd.getUnit();
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
                                         }
-                                        vo.setUnit(epdPqd.getUnit());
+
                                     }
                                 } else {
-                                    vo.setStatisticalData(null);
+                                    if (Objects.equals("Primary",csDataSet.getDataLevel())) {
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    re = temp.getValue() / pt;
+                                                    break;
+                                                case "*CT":
+                                                    re = temp.getValue() / ct;
+                                                    break;
+                                                case "*PT*CT":
+                                                    re = temp.getValue() / pt / ct;
+                                                    break;
+                                                default:
+                                                    re = temp.getValue();
+                                                    break;
+                                            }
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }else {
+                                            re = temp.getValue();
+                                            vo.setStatisticalData(Double.valueOf(df.format(re)));
+                                        }
+                                    } else {
+                                        vo.setStatisticalData(Double.valueOf(df.format(temp.getValue())));
+                                    }
+                                    unit = epdPqd.getUnit();
                                 }
-                                vo.setStatisticalIndex(epdPqd.getId());
+                            } else {
-                                vo.setStatisticalName(epdPqd.getName());
+                                vo.setStatisticalData(null);
-                                vo.setAnotherName(epdPqd.getShowName());
+                                if (Objects.equals("Primary",commonStatisticalQueryParam.getDataLevel())) {
-                                return vo;
+                                    if (Objects.equals("Primary",csDataSet.getDataLevel())) {
-                            }).collect(Collectors.toList());
+                                        unit = epdPqd.getUnit();
-                            result.addAll(collect1);
+                                    } else {
-                        });
+                                        if(Objects.nonNull(epdPqd.getPrimaryFormula())){
-                    }
+                                            switch (epdPqd.getPrimaryFormula()) {
+                                                case "*PT":
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                case "*CT":
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                                case "*PT*CT":
+                                                    unit = "k" + epdPqd.getUnit();
+                                                    break;
+                                                default:
+                                                    unit = epdPqd.getUnit();
+                                                    break;
+                                            }
+                                        }else {
+                                            unit = epdPqd.getUnit();
+                                        }
+                                    }
+                                } else {
+                                    unit = epdPqd.getUnit();
+                                }
+                            }
+                            vo.setUnit(unit);
+                            vo.setStatisticalIndex(epdPqd.getId());
+                            vo.setStatisticalName(epdPqd.getName());
+                            vo.setAnotherName(epdPqd.getShowName());
+                            return vo;
+                        }).collect(Collectors.toList());
+                        result.addAll(collect1);
+                    });
                 }
+            }
         }
         return result;
     }
 
+
     @Override
     public WlRecord findDevBaseData(WlRecordParam.Record param) {
         LambdaQueryWrapper<WlRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -508,6 +629,31 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
         return this.getOne(lambdaQueryWrapper);
     }
 
+    @Override
+    public List<RecordVo> findDevBaseDataByLineId(WlRecordParam.lineRecord param) {
+        List<RecordVo> result = new ArrayList<>();
+        LambdaQueryWrapper<WlRecord> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(WlRecord::getLineId,param.getLineId())
+                .between(WlRecord::getStartTime,param.getItemStartTime(),param.getItemEndTime())
+                .eq(WlRecord::getType,1)
+                .eq(WlRecord::getState,1)
+                .orderByDesc(WlRecord::getStartTime);
+        if (Objects.equals(param.getDataSource(),0)) {
+            lambdaQueryWrapper.eq(WlRecord::getItemName,"补召");
+        } else if (Objects.equals(param.getDataSource(),1)) {
+            lambdaQueryWrapper.eq(WlRecord::getItemName,"在线监测");
+        }
+        List<WlRecord> list = this.list(lambdaQueryWrapper);
+        if (CollUtil.isNotEmpty(list)) {
+            list.forEach(item->{
+                RecordVo vo = new RecordVo();
+                BeanUtils.copyProperties(item,vo);
+                result.add(vo);
+            });
+        }
+        return result;
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void dayDealNoEndTimeEvent(String date) {
@@ -550,7 +696,7 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
                                 StatisticalDataDTO statisticalDataDTO = commonMapper.getLineRtData(influxQueryWrapper);
                                 if(Objects.nonNull(statisticalDataDTO)){
                                     LocalDateTime endTime = statisticalDataDTO.getTime().atOffset(ZoneOffset.ofHours(0)).toLocalDateTime();
-                                    Duration duration = Duration.between(now, endTime);
+                                    Duration duration = Duration.between(endTime,now);
                                     long hour = duration.toHours();
                                     if(hour>6){
                                         WlRecord wlRecord = new WlRecord();
@@ -601,6 +747,18 @@ public class WlRecordServiceImpl extends ServiceImpl<WlRecordMapper, WlRecord> i
 
     }
 
+    @Override
+    public List<WlRecord> getWlAssByWlId(String wlId) {
+        return this.baseMapper.getWlAssByWlId(wlId);
+    }
+
+    @Override
+    public void deleteItem(String id) {
+        LambdaUpdateWrapper<WlRecord> lambdaUpdateWrapper = new LambdaUpdateWrapper<>();
+        lambdaUpdateWrapper.eq(WlRecord::getId,id).set(WlRecord::getState,0);
+        this.update(lambdaUpdateWrapper);
+    }
+
     /**
      * 数据项内的时间进行覆盖:解决多个数据项的startTime及endTime之间存在时间冲突
      * @param data 数据项

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/offline/mincfg/AnalyseComtradeCfg.java

@@ -120,9 +120,9 @@ public class AnalyseComtradeCfg {
         hashMapA.put("pq_RmsI",rms[3]);
         hashMapB.put("pq_RmsI",rms[4]);
         hashMapC.put("pq_RmsI",rms[5]);
-        hashMapA.put("pq_RmsLU",rms[6]);
+        hashMapAB.put("pq_RmsLU",rms[6]);
-        hashMapB.put("pq_RmsLU",rms[7]);
+        hashMapBC.put("pq_RmsLU",rms[7]);
-        hashMapC.put("pq_RmsLU",rms[8]);
+        hashMapCA.put("pq_RmsLU",rms[8]);
 
 
 //        pqdDataA.setpq_RmsU(rms[0]);
@@ -239,6 +239,9 @@ public class AnalyseComtradeCfg {
 
         for (int i = 0; i < 50; i++) {
             //间谐波幅值
+            hashMapA.put("pq_InHarmUR_"+(i+1),inHarm[0][i]);
+            hashMapB.put("pq_InHarmUR_"+(i+1),inHarm[1][i]);
+            hashMapC.put("pq_InHarmUR_"+(i+1),inHarm[2][i]);
             hashMapA.put("pq_InHarmIAmp_"+(i+1),inHarm[3][i]);
             hashMapB.put("pq_InHarmIAmp_"+(i+1),inHarm[4][i]);
             hashMapC.put("pq_InHarmIAmp_"+(i+1),inHarm[5][i]);
@@ -260,9 +263,9 @@ public class AnalyseComtradeCfg {
         hashMapB.put("pq_S",totalPower[1][2]);
         hashMapC.put("pq_S",totalPower[2][2]);
 
-        hashMapM.put("pq_TotHarmP",totalPower[3][0]);
+        hashMapM.put("pq_TotP",totalPower[3][0]);
-        hashMapM.put("pq_TotHarmQ",totalPower[3][1]);
+        hashMapM.put("pq_TotQ",totalPower[3][1]);
-        hashMapM.put("pq_TotHarmS",totalPower[3][2]);
+        hashMapM.put("pq_TotS",totalPower[3][2]);
 
         /*todo 谐波畸变率,电压波动,电压闪变，电压长闪变会根据监测点接线方式是星型存A,B,C相，角型或者V型存AB，BC,CA相，目前全存在A，B,C相*/
         //谐波畸变率
@@ -294,9 +297,9 @@ public class AnalyseComtradeCfg {
         hashMapC.put("pq_Fluct",uFluctuation[2]);
         //电压闪变
         Float[] uFlicker = min.getU_Flicker();
-        hashMapA.put("pq_Plt",uFlicker[0]);
+        hashMapA.put("pq_Pst",uFlicker[0]);
-        hashMapB.put("pq_Plt",uFlicker[1]);
+        hashMapB.put("pq_Pst",uFlicker[1]);
-        hashMapC.put("pq_Plt",uFlicker[2]);
+        hashMapC.put("pq_Pst",uFlicker[2]);
         //电压长闪变
         Float[] ulFlicker = min.getUL_Flicker();
         hashMapA.put("pq_Plt",ulFlicker[0]);

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryPage.java

@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 
 import javax.validation.constraints.Min;
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 /**
  * 
@@ -46,7 +45,4 @@ public class CsEventUserQueryPage extends CsEventUserQueryParam{
 
     @ApiModelProperty(value = "测点id")
     private String lineId;
-
-
-
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/CsEventUserQueryParam.java

@@ -45,10 +45,14 @@ public class CsEventUserQueryParam {
 
     private String level;
     @ApiModelProperty(value="起始时间")
-//    @NotNull(message="起始时间不能为空！")
     private String startTime;
 
     @ApiModelProperty(value="结束时间")
-//    @NotNull(message="结束时间不能为空！")
     private String endTime;
+
+    @ApiModelProperty(value = "事件类型 Evt_Sys_DipStr:电压暂降 Evt_Sys_SwlStr:电压暂升 Evt_Sys_IntrStr:电压中断")
+    private String eventType;
+
+    @ApiModelProperty(value = "位置 grid:电网侧 load:负载侧")
+    private String location;
 }

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/param/DataParam.java

@@ -0,0 +1,32 @@
+package com.njcn.csharmonic.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class DataParam implements Serializable {
+
+    @ApiModelProperty("起始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
+    @ApiModelProperty("指标统计类型")
+    private String targetType;
+
+    @ApiModelProperty("数据标志")
+    private String dataLevel;
+
+    @ApiModelProperty("数据来源 0:补召 1:在线监测 ")
+    private Integer dataSource;
+
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/dto/DownloadMakeUpDto.java

@@ -0,0 +1,39 @@
+package com.njcn.csharmonic.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Data
+public class DownloadMakeUpDto implements Serializable {
+
+    /**
+     * 全文件大小
+     */
+    private Integer allStep;
+
+    /**
+     * 监测点id
+     */
+    private String lineId;
+
+    /**
+     * 装置id
+     */
+    private String devId;
+
+    /**
+     * 文件工程名称
+     */
+    private String engineeringName;
+
+    /**
+     * 需要补召的文件集合
+     */
+    private List<String> fileList;
+
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/param/StatisticsDataParam.java

@@ -0,0 +1,19 @@
+package com.njcn.csharmonic.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class StatisticsDataParam implements Serializable {
+
+    @ApiModelProperty("起始时间")
+    private String startTime;
+
+    @ApiModelProperty("结束时间")
+    private String endTime;
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/LineIntegrityVo.java

@@ -0,0 +1,33 @@
+package com.njcn.csharmonic.pojo.vo;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+
+@Data
+public class LineIntegrityVo implements Serializable {
+
+    @ApiModelProperty("装置id")
+    private String devId;
+
+    @ApiModelProperty("装置名称")
+    private String devName;
+
+    @ApiModelProperty("监测点id")
+    private String lineId;
+
+    @ApiModelProperty("监测点名称")
+    private String lineName;
+
+    @ApiModelProperty("监测点数据完整性")
+    private Double lineIntegrity;
+
+    @ApiModelProperty("终端在线率")
+    private Double devOnlineRate;
+}

cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/RealTimeDataVo.java

@@ -0,0 +1,53 @@
+package com.njcn.csharmonic.pojo.vo;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.njcn.influx.utils.InstantDateSerializer;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.Instant;
+
+/**
+ * @author xy
+ */
+@Data
+public class RealTimeDataVo implements Serializable {
+
+    @ApiModelProperty("数据时间")
+    @JsonSerialize(using = InstantDateSerializer.class)
+    private Instant time;
+
+    @ApiModelProperty("指标id")
+    private String id;
+
+    @ApiModelProperty("指标名称")
+    private String name;
+
+    @ApiModelProperty("指标别名")
+    private String otherName;
+
+    @ApiModelProperty("相别")
+    private String phase;
+
+    @ApiModelProperty("单位")
+    private String unit;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty("平均值")
+    private Double avgValue;
+
+    @ApiModelProperty("A相值")
+    private Double valueA;
+
+    @ApiModelProperty("B相值")
+    private Double valueB;
+
+    @ApiModelProperty("C相值")
+    private Double valueC;
+
+    @ApiModelProperty("无相值")
+    private Double valueM;
+}

cs-harmonic/cs-harmonic-boot/pom.xml

@@ -107,7 +107,12 @@
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>access-api</artifactId>
-            <version>1.0.0</version>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>zl-event-api</artifactId>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>com.baomidou</groupId>

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/DataController.java

@@ -0,0 +1,65 @@
+package com.njcn.csharmonic.controller;
+
+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.csdevice.pojo.vo.DataGroupEventVO;
+import com.njcn.csdevice.pojo.vo.RecordVo;
+import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.pojo.vo.RealTimeDataVo;
+import com.njcn.csharmonic.service.IDataService;
+import com.njcn.web.controller.BaseController;
+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.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@RestController
+@RequestMapping("/data")
+@Api(tags = "装置数据")
+@AllArgsConstructor
+public class DataController extends BaseController {
+
+    private final IDataService dataService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/realTimeData")
+    @ApiOperation("设备监控-》准实时数据")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<List<RealTimeDataVo>> realTimeData(@RequestBody DataParam param) {
+        String methodDescribe = getMethodDescribe("realTimeData");
+        List<RealTimeDataVo> list = dataService.getRealTimeData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getTestData")
+    @ApiOperation("设备监控-》测试项数据")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<List<RecordVo>> getTestData(@RequestBody DataParam param) {
+        String methodDescribe = getMethodDescribe("getTestData");
+        List<RecordVo> list = dataService.getTestData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getEventByItem")
+    @ApiOperation("方案数据-》根据测试项获取暂态事件")
+    @ApiImplicitParam(name = "id", value = "id", required = true)
+    public HttpResult<List<DataGroupEventVO>> getEventByItem(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getEventByItem");
+        List<DataGroupEventVO> list = dataService.getEventByItem(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/OfflineDataUploadController.java

@@ -74,12 +74,16 @@ public class OfflineDataUploadController extends BaseController {
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping(value = "/makeUp")
-    @ApiOperation("设备补招")
+    @ApiOperation("设备补召")
     @ApiImplicitParam(name = "param", value = "补招参数", required = true)
     public HttpResult<String> makeUp(@RequestBody MakeUpParam param) {
         String methodDescribe = getMethodDescribe("makeUp");
-        offlineDataUploadService.startMakeUpData(param);
+        boolean result = offlineDataUploadService.startMakeUpData(param);
-        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "文件补召中,请稍后", methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "文件补召失败", methodDescribe);
+        }
     }
 
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/RealDataController.java

@@ -6,7 +6,9 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csharmonic.service.RealDataService;
+import com.njcn.redis.utils.RedisUtil;
 import com.njcn.web.controller.BaseController;
+import com.njcn.web.utils.RequestUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -33,6 +35,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class RealDataController extends BaseController {
 
     private final RealDataService realDataService;
+    private final RedisUtil redisUtil;
 
     @OperateInfo(info = LogEnum.BUSINESS_COMMON)
     @PostMapping("/getBaseRealData")
@@ -41,6 +44,7 @@ public class RealDataController extends BaseController {
     public HttpResult<Boolean> getRealData(@RequestParam("lineId") String lineId) {
         String methodDescribe = getMethodDescribe("getRealData");
         boolean result = realDataService.getBaseRealData(lineId);
+        redisUtil.saveByKeyWithExpire("rtDataUserId:"+lineId, RequestUtil.getUserIndex(),600L);
         if (result) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
         } else {
@@ -57,6 +61,7 @@ public class RealDataController extends BaseController {
     })
     public HttpResult<Boolean> getHarmRealData(@RequestParam("lineId") String lineId, @RequestParam("target") Integer target) {
         String methodDescribe = getMethodDescribe("getHarmRealData");
+        redisUtil.saveByKeyWithExpire("rtDataUserId:"+lineId, RequestUtil.getUserIndex(),600L);
         boolean result = realDataService.getHarmRealData(lineId,target);
         if (result) {
             return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StatisticsDataDataController.java

@@ -0,0 +1,45 @@
+package com.njcn.csharmonic.controller;
+
+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.csharmonic.pojo.param.StatisticsDataParam;
+import com.njcn.csharmonic.pojo.vo.LineIntegrityVo;
+import com.njcn.csharmonic.service.IStatisticsDataDataService;
+import com.njcn.web.controller.BaseController;
+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.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 java.util.List;
+
+/**
+ * @author xy
+ */
+@Slf4j
+@RestController
+@RequestMapping("/statisticsData")
+@Api(tags = "统计数据")
+@AllArgsConstructor
+public class StatisticsDataDataController extends BaseController {
+
+    private final IStatisticsDataDataService statisticsDataDataService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/devData")
+    @ApiOperation("装置数据统计(监测点完整性、装置在线率)")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<List<LineIntegrityVo>> getDevData(@RequestBody StatisticsDataParam param) {
+        String methodDescribe = getMethodDescribe("getDevData");
+        List<LineIntegrityVo> list = statisticsDataDataService.getDevData(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java

@@ -2,11 +2,18 @@ package com.njcn.csharmonic.handler;
 
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.fasterxml.jackson.core.JsonProcessingException;
 import com.github.tocrhz.mqtt.annotation.MqttSubscribe;
 import com.github.tocrhz.mqtt.annotation.NamedValue;
 import com.github.tocrhz.mqtt.annotation.Payload;
 import com.github.tocrhz.mqtt.publisher.MqttPublisher;
+import com.njcn.access.api.CsTopicFeignClient;
+import com.njcn.access.utils.ChannelObjectUtil;
+import com.njcn.access.utils.FileCommonUtils;
 import com.njcn.csdevice.api.DevCapacityFeignClient;
+import com.njcn.csdevice.api.DeviceFtpFeignClient;
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.pojo.vo.CsEquipmentDeliveryVO;
 import com.njcn.csharmonic.param.CommonStatisticalQueryParam;
 import com.njcn.csharmonic.param.FrequencyStatisticalQueryParam;
 import com.njcn.csharmonic.pojo.vo.CsRtDataVO;
@@ -15,9 +22,12 @@ import com.njcn.csharmonic.service.ILineTargetService;
 import com.njcn.csharmonic.service.StableDataService;
 import com.njcn.csharmonic.service.TemperatureService;
 import com.njcn.influx.pojo.dto.StatisticalDataDTO;
+import com.njcn.oss.constant.OssPath;
+import com.njcn.redis.pojo.enums.AppRedisKey;
 import com.njcn.redis.utils.RedisUtil;
 import com.njcn.system.api.CsStatisticalSetFeignClient;
 import com.njcn.system.pojo.po.EleEpdPqd;
+import com.njcn.zlevent.api.FileFeignClient;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
@@ -44,7 +54,7 @@ import java.util.stream.Stream;
 public class MqttMessageHandler {
 
     private final MqttPublisher publisher;
-
+    private final FileCommonUtils fileCommonUtils;
     private final ILineTargetService lineTargetService;
     private final CsStatisticalSetFeignClient csStatisticalSetFeignClient;
     private final StableDataService stableDataService;
@@ -55,6 +65,13 @@ public class MqttMessageHandler {
 
     private final DevCapacityFeignClient devCapacityFeignClient;
     private final  DecimalFormat df = new DecimalFormat("#0.000");
+    private final ChannelObjectUtil channelObjectUtil;
+    private final EquipmentFeignClient equipmentFeignClient;
+    private final CsTopicFeignClient csTopicFeignClient;
+    private final DeviceFtpFeignClient deviceFtpFeignClient;
+    private static Integer mid = 1;
+    private final FileFeignClient fileFeignClient;
+
     /**
      * 实时数据应答
      */
@@ -78,233 +95,216 @@ public class MqttMessageHandler {
     /**
      * 实时数据应答
      */
-    @MqttSubscribe(value = "/zl/askDevData/{devId}",qos = 1)
+//    @MqttSubscribe(value = "/zl/askDevData/{devId}",qos = 1)
-    public void responseTopoData(String topic, @NamedValue("devId") String devId, MqttMessage message, @Payload String payload) {
+//    public void responseTopoData(String topic, @NamedValue("devId") String devId, MqttMessage message, @Payload String payload) {
-       String topoDataJson =redisUtil.getStringByKey (devId);
+//       String topoDataJson =redisUtil.getStringByKey (devId);
-       if(StringUtils.isEmpty(topoDataJson)){
+//       if(StringUtils.isEmpty(topoDataJson)){
-           List<ThdDataVO> result = new ArrayList<>();
+//           List<ThdDataVO> result = new ArrayList<>();
-           List<ThdDataVO> tempList = new ArrayList<>();
+//           List<ThdDataVO> tempList = new ArrayList<>();
+//
+//           //1.查询拓扑图配置的指标:拓扑图扑图配置：7677f94c749dedaff30f911949cbd724
+//           List<EleEpdPqd> data = csStatisticalSetFeignClient.queryStatisticalSelect("b934664f9592d1c5e92caa90695b7103").getData();
+//           data.forEach(temp->{
+//               if(Objects.nonNull(temp.getHarmStart())&&Objects.nonNull(temp.getHarmEnd())){
+//                       FrequencyStatisticalQueryParam frequencyStatisticalQueryParam = new FrequencyStatisticalQueryParam();
+//                       frequencyStatisticalQueryParam.setDevId(devId);
+//                       frequencyStatisticalQueryParam.setStatisticalId(temp.getId());
+//                       frequencyStatisticalQueryParam.setValueType("avg");
+//                       frequencyStatisticalQueryParam.setFrequencyStart(temp.getHarmStart());
+//                       frequencyStatisticalQueryParam.setFrequencyEnd(temp.getHarmEnd());
+//                       List<ThdDataVO> thdDataVOList = stableDataService.QuerySqlData(frequencyStatisticalQueryParam);
+//                       tempList.addAll(thdDataVOList);
+//
+//               }else {
+//                   CommonStatisticalQueryParam commonStatisticalQueryParam = new CommonStatisticalQueryParam();
+//                   commonStatisticalQueryParam.setDevId(devId);
+//                   commonStatisticalQueryParam.setStatisticalId(temp.getId());
+//                   commonStatisticalQueryParam.setValueType("avg");
+//                   List<ThdDataVO>  listFuture= stableDataService.queryFisrtCommonStatistical(commonStatisticalQueryParam);
+//                   tempList.addAll(listFuture);
+//               }
+//
+//           });
+//           //过滤M相
+//           List<ThdDataVO> m = tempList.stream().filter(temp -> Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
+//           m.stream().forEach(temp->{
+//               Stream.of("A","B","C").forEach(phase->{
+//                   ThdDataVO thdDataVO = new ThdDataVO();
+//                   BeanUtils.copyProperties(temp,thdDataVO);
+//                   thdDataVO.setPhase(phase);
+//                   result.add(thdDataVO);
+//               });
+//           });
+//           List<ThdDataVO> apfThdI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Load(%)")).collect(Collectors.toList());
+//           Map<String, List<ThdDataVO>> collect3 = apfThdI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
+//           collect3.forEach((k,v)->{
+//               if(!CollectionUtil.isEmpty(v)){
+//                   double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
+//                   ThdDataVO thdDataVO = new ThdDataVO();
+//                   BeanUtils.copyProperties(v.get(0),thdDataVO);
+//                   thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
+//                   thdDataVO.setPhase("avg");
+//                   result.add(thdDataVO);
+//               }
+//           });
+//           List<ThdDataVO> apfRmsI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_RmsI_TolOut(A)")).collect(Collectors.toList());
+//           Map<String, List<ThdDataVO>> collect2 = apfRmsI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
+//           collect2.forEach((k,v)->{
+//               if(!CollectionUtil.isEmpty(v)){
+//                   double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
+//                   ThdDataVO thdDataVO = new ThdDataVO();
+//                   BeanUtils.copyProperties(v.get(0),thdDataVO);
+//                   thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
+//                   thdDataVO.setPhase("avg");
+//                   result.add(thdDataVO);
+//               }
+//           });
+//           List<ThdDataVO> apfThdISys = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Sys(%)")).collect(Collectors.toList());
+//           Map<String, List<ThdDataVO>> collect4 = apfThdISys.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
+//           collect4.forEach((k,v)->{
+//               if(!CollectionUtil.isEmpty(v)){
+//                   double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
+//                   ThdDataVO thdDataVO = new ThdDataVO();
+//                   BeanUtils.copyProperties(v.get(0),thdDataVO);
+//                   thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
+//                   thdDataVO.setPhase("avg");
+//                   result.add(thdDataVO);
+//
+//               }
+//           });
+//           Double capacity = devCapacityFeignClient.getDevCapacity(devId).getData();
+//           apfRmsI.forEach(temp->{
+//               ThdDataVO thdDataVO = new ThdDataVO();
+//               BeanUtils.copyProperties(temp,thdDataVO);
+//               thdDataVO.setUnit("%");
+//               thdDataVO.setStatisticalName("load_Rate");
+//               thdDataVO.setAnotherName("负载率");
+//               if (capacity<=0){
+//                   thdDataVO.setStatisticalData(3.1415926);
+//               }else {
+//                   double v = temp.getStatisticalData()*100 / capacity;
+//                   thdDataVO.setStatisticalData(Double.valueOf(df.format(v)));
+//               }
+//               result.add(thdDataVO);
+//           });
+//           List<ThdDataVO> notM = tempList.stream().filter(temp -> !Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
+//           result.addAll(notM);
+//           Gson gson = new Gson();
+//           topoDataJson = gson.toJson(result);
+//           redisUtil.saveByKeyWithExpire(devId, (Object) topoDataJson, 30L);
+//       }
+//        publisher.send("/zl/devData/"+devId,topoDataJson,1,false);
+//    }
+    /**
+     * 实时数据应答
+     */
+    @MqttSubscribe(value = "/zl/askDevData/{devId}/{typeId}",qos = 1)
+    public void responseTopoDataByType(String topic, @NamedValue("devId") String devId,@NamedValue("typeId") String typeId, MqttMessage message, @Payload String payload) {
+        String topoDataJson =redisUtil.getStringByKey (devId+"#"+typeId);
+        if(StringUtils.isEmpty(topoDataJson)){
+            List<ThdDataVO> result = new ArrayList<>();
+            List<ThdDataVO> tempList = new ArrayList<>();
 
-           //1.查询拓扑图配置的指标:拓扑图扑图配置：7677f94c749dedaff30f911949cbd724
+            //1.查询拓扑图配置的指标:拓扑图扑图配置：7677f94c749dedaff30f911949cbd724
-           List<EleEpdPqd> data = csStatisticalSetFeignClient.queryStatisticalSelect("b934664f9592d1c5e92caa90695b7103").getData();
+            List<EleEpdPqd> data = csStatisticalSetFeignClient.queryStatisticalSelect(typeId).getData();
-           data.forEach(temp->{
+            data.forEach(temp->{
-               if(Objects.nonNull(temp.getHarmStart())&&Objects.nonNull(temp.getHarmEnd())){
+                if(Objects.nonNull(temp.getHarmStart())&&Objects.nonNull(temp.getHarmEnd())){
-                       FrequencyStatisticalQueryParam frequencyStatisticalQueryParam = new FrequencyStatisticalQueryParam();
+                    FrequencyStatisticalQueryParam frequencyStatisticalQueryParam = new FrequencyStatisticalQueryParam();
-                       frequencyStatisticalQueryParam.setDevId(devId);
+                    frequencyStatisticalQueryParam.setDevId(devId);
-                       frequencyStatisticalQueryParam.setStatisticalId(temp.getId());
+                    frequencyStatisticalQueryParam.setStatisticalId(temp.getId());
-                       frequencyStatisticalQueryParam.setValueType("avg");
+                    frequencyStatisticalQueryParam.setValueType("avg");
-                       frequencyStatisticalQueryParam.setFrequencyStart(temp.getHarmStart());
+                    frequencyStatisticalQueryParam.setFrequencyStart(temp.getHarmStart());
-                       frequencyStatisticalQueryParam.setFrequencyEnd(temp.getHarmEnd());
+                    frequencyStatisticalQueryParam.setFrequencyEnd(temp.getHarmEnd());
-                       List<ThdDataVO> thdDataVOList = stableDataService.QuerySqlData(frequencyStatisticalQueryParam);
+                    List<ThdDataVO> thdDataVOList = stableDataService.QuerySqlData(frequencyStatisticalQueryParam);
-                       tempList.addAll(thdDataVOList);
+                    tempList.addAll(thdDataVOList);
 
-               }else {
+                }else {
-                   CommonStatisticalQueryParam commonStatisticalQueryParam = new CommonStatisticalQueryParam();
+                    CommonStatisticalQueryParam commonStatisticalQueryParam = new CommonStatisticalQueryParam();
-                   commonStatisticalQueryParam.setDevId(devId);
+                    commonStatisticalQueryParam.setDevId(devId);
-                   commonStatisticalQueryParam.setStatisticalId(temp.getId());
+                    commonStatisticalQueryParam.setStatisticalId(temp.getId());
-                   commonStatisticalQueryParam.setValueType("avg");
+                    commonStatisticalQueryParam.setValueType("avg");
-                   List<ThdDataVO>  listFuture= stableDataService.queryFisrtCommonStatistical(commonStatisticalQueryParam);
+                    List<ThdDataVO>  listFuture= stableDataService.queryFisrtCommonStatistical(commonStatisticalQueryParam);
-                   tempList.addAll(listFuture);
+                    tempList.addAll(listFuture);
-               }
+                }
 
-           });
+            });
-           //过滤M相
-           List<ThdDataVO> m = tempList.stream().filter(temp -> Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
-           m.stream().forEach(temp->{
-               Stream.of("A","B","C").forEach(phase->{
-                   ThdDataVO thdDataVO = new ThdDataVO();
-                   BeanUtils.copyProperties(temp,thdDataVO);
-                   thdDataVO.setPhase(phase);
-                   result.add(thdDataVO);
-               });
-           });
-           List<ThdDataVO> apfThdI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Load(%)")).collect(Collectors.toList());
-           Map<String, List<ThdDataVO>> collect3 = apfThdI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-           collect3.forEach((k,v)->{
-               if(!CollectionUtil.isEmpty(v)){
-                   double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-                   ThdDataVO thdDataVO = new ThdDataVO();
-                   BeanUtils.copyProperties(v.get(0),thdDataVO);
-                   thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-                   thdDataVO.setPhase("avg");
-                   result.add(thdDataVO);
-               }
-           });
-           List<ThdDataVO> apfRmsI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_RmsI_TolOut(A)")).collect(Collectors.toList());
-           Map<String, List<ThdDataVO>> collect2 = apfRmsI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-           collect2.forEach((k,v)->{
-               if(!CollectionUtil.isEmpty(v)){
-                   double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-                   ThdDataVO thdDataVO = new ThdDataVO();
-                   BeanUtils.copyProperties(v.get(0),thdDataVO);
-                   thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-                   thdDataVO.setPhase("avg");
-                   result.add(thdDataVO);
-               }
-           });
-           List<ThdDataVO> apfThdISys = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Sys(%)")).collect(Collectors.toList());
-           Map<String, List<ThdDataVO>> collect4 = apfThdISys.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-           collect4.forEach((k,v)->{
-               if(!CollectionUtil.isEmpty(v)){
-                   double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-                   ThdDataVO thdDataVO = new ThdDataVO();
-                   BeanUtils.copyProperties(v.get(0),thdDataVO);
-                   thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-                   thdDataVO.setPhase("avg");
-                   result.add(thdDataVO);
 
-               }
+            //过滤M相
-           });
+            List<ThdDataVO> m = tempList.stream().filter(temp -> Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
-           Double capacity = devCapacityFeignClient.getDevCapacity(devId).getData();
+            m.stream().forEach(temp->{
-           apfRmsI.forEach(temp->{
+                Stream.of("A","B","C").forEach(phase->{
-               ThdDataVO thdDataVO = new ThdDataVO();
+                    ThdDataVO thdDataVO = new ThdDataVO();
-               BeanUtils.copyProperties(temp,thdDataVO);
+                    BeanUtils.copyProperties(temp,thdDataVO);
-               thdDataVO.setUnit("%");
+                    thdDataVO.setPhase(phase);
-               thdDataVO.setStatisticalName("load_Rate");
+                    result.add(thdDataVO);
-               thdDataVO.setAnotherName("负载率");
+                });
-               if (capacity<=0){
+            });
-                   thdDataVO.setStatisticalData(3.1415926);
+            //如果是基础数据则添加拓扑图的数据
-               }else {
+            if(Objects.equals("fc8c86dbc3f2d9810f5cd8f53c295415",typeId)){
-                   double v = temp.getStatisticalData()*100 / capacity;
+                List<ThdDataVO> apfThdI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Load(%)")).collect(Collectors.toList());
-                   thdDataVO.setStatisticalData(Double.valueOf(df.format(v)));
+                Map<String, List<ThdDataVO>> collect3 = apfThdI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-               }
+                collect3.forEach((k,v)->{
-               result.add(thdDataVO);
+                    if(!CollectionUtil.isEmpty(v)){
-           });
+                        double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-           List<ThdDataVO> notM = tempList.stream().filter(temp -> !Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
+                        ThdDataVO thdDataVO = new ThdDataVO();
-           result.addAll(notM);
+                        BeanUtils.copyProperties(v.get(0),thdDataVO);
-           Gson gson = new Gson();
+                        thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-           topoDataJson = gson.toJson(result);
+                        thdDataVO.setPhase("avg");
-           redisUtil.saveByKeyWithExpire(devId, (Object) topoDataJson, 30L);
+                        result.add(thdDataVO);
-       }
+                    }
-        publisher.send("/zl/devData/"+devId,topoDataJson,1,false);
+                });
+                List<ThdDataVO> apfRmsI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_RmsI_TolOut(A)")).collect(Collectors.toList());
+                Map<String, List<ThdDataVO>> collect2 = apfRmsI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
+                collect2.forEach((k,v)->{
+                    if(!CollectionUtil.isEmpty(v)){
+                        double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
+                        ThdDataVO thdDataVO = new ThdDataVO();
+                        BeanUtils.copyProperties(v.get(0),thdDataVO);
+                        thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
+                        thdDataVO.setPhase("avg");
+                        result.add(thdDataVO);
+                    }
+                });
+                List<ThdDataVO> apfThdISys = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Sys(%)")).collect(Collectors.toList());
+                Map<String, List<ThdDataVO>> collect4 = apfThdISys.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
+                collect4.forEach((k,v)->{
+                    if(!CollectionUtil.isEmpty(v)){
+                        double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
+                        ThdDataVO thdDataVO = new ThdDataVO();
+                        BeanUtils.copyProperties(v.get(0),thdDataVO);
+                        thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
+                        thdDataVO.setPhase("avg");
+                        result.add(thdDataVO);
+
+                    }
+                });
+                Double capacity = devCapacityFeignClient.getDevCapacity(devId).getData();
+                apfRmsI.forEach(temp->{
+                    ThdDataVO thdDataVO = new ThdDataVO();
+                    BeanUtils.copyProperties(temp,thdDataVO);
+                    thdDataVO.setUnit("%");
+                    thdDataVO.setStatisticalName("load_Rate");
+                    thdDataVO.setAnotherName("负载率");
+                    if (capacity<=0){
+                        thdDataVO.setStatisticalData(3.1415926);
+                    }else {
+                        double v = temp.getStatisticalData()*100 / capacity;
+                        thdDataVO.setStatisticalData(Double.valueOf(df.format(v)));
+                    }
+                    result.add(thdDataVO);
+                });
+            }
+
+            List<ThdDataVO> notM = tempList.stream().filter(temp -> !Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
+            result.addAll(notM);
+            Gson gson = new Gson();
+            topoDataJson = gson.toJson(result);
+            redisUtil.saveByKeyWithExpire(devId+"#"+typeId, (Object) topoDataJson, 30L);
+        }
+        publisher.send("/zl/devData/"+devId+"/"+typeId,topoDataJson,1,false);
     }
 
 
-//    @MqttSubscribe(value = "/zl/askDvrData/{devId}",qos = 1)
-//    public void responseDvrData(String topic, @NamedValue("devId") String devId, MqttMessage message, @Payload String payload) {
-//        String topoDataJson =redisUtil.getStringByKey (devId+"DVR");
-//        if(StringUtils.isEmpty(topoDataJson)){
-//            List<ThdDataVO> result = new ArrayList<>();
-//            List<ThdDataVO> tempList = new ArrayList<>();
-//
-//
-//            //1.查询DVR配置的指标:DVR配置：9fc1de386b623a1339977e168a23ad97
-//            List<EleEpdPqd> data = csStatisticalSetFeignClient.queryStatisticalSelect("9fc1de386b623a1339977e168a23ad97").getData();
-//            data.forEach(temp->{
-//                if(Objects.nonNull(temp.getHarmStart())&&Objects.nonNull(temp.getHarmEnd())){
-//
-//                    FrequencyStatisticalQueryParam frequencyStatisticalQueryParam = new FrequencyStatisticalQueryParam();
-//                    frequencyStatisticalQueryParam.setDevId(devId);
-//                    frequencyStatisticalQueryParam.setStatisticalId(temp.getId());
-//                    frequencyStatisticalQueryParam.setValueType("avg");
-//                    frequencyStatisticalQueryParam.setFrequencyStart(temp.getHarmStart());
-//                    frequencyStatisticalQueryParam.setFrequencyEnd(temp.getHarmEnd());
-//                    List<ThdDataVO> thdDataVOList = stableDataService.QuerySqlData(frequencyStatisticalQueryParam);
-//                    tempList.addAll(thdDataVOList);
-//
-//                }else {
-//                    CommonStatisticalQueryParam commonStatisticalQueryParam = new CommonStatisticalQueryParam();
-//                    commonStatisticalQueryParam.setDevId(devId);
-//                    commonStatisticalQueryParam.setStatisticalId(temp.getId());
-//                    commonStatisticalQueryParam.setValueType("avg");
-//                    List<ThdDataVO>  listFuture= stableDataService.queryFisrtCommonStatistical(commonStatisticalQueryParam);
-//                    tempList.addAll(listFuture);
-//                }
-//
-//            });
-//
-//            //过滤M相
-////            List<ThdDataVO> m = tempList.stream().filter(temp -> Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
-////            m.stream().forEach(temp->{
-////                Stream.of("A","B","C").forEach(phase->{
-////                    ThdDataVO thdDataVO = new ThdDataVO();
-////                    BeanUtils.copyProperties(temp,thdDataVO);
-////                    thdDataVO.setPhase(phase);
-////                    result.add(thdDataVO);
-////                });
-////            });
-////            //过滤谐波电流，谐波电压畸变率求平均值
-////            List<ThdDataVO> thdI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Pq_ThdU(%)")).collect(Collectors.toList());
-////            Map<String, List<ThdDataVO>> collect = thdI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-////            collect.forEach((k,v)->{
-////                if(!CollectionUtil.isEmpty(v)){
-////                    double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-////                    ThdDataVO thdDataVO = new ThdDataVO();
-////                    BeanUtils.copyProperties(v.get(0),thdDataVO);
-////                    thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-////                    thdDataVO.setPhase("avg");
-////                    result.add(thdDataVO);
-////
-////                }
-////            });
-////
-////           List<ThdDataVO> thdV = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Pq_ThdI(%)")).collect(Collectors.toList());
-////           Map<String, List<ThdDataVO>> collect1 = thdV.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-////           collect1.forEach((k,v)->{
-////               if(!CollectionUtil.isEmpty(v)){
-////                   double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-////                   ThdDataVO thdDataVO = new ThdDataVO();
-////                   BeanUtils.copyProperties(v.get(0),thdDataVO);
-////                   thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-////                   thdDataVO.setPhase("avg");
-////                   result.add(thdDataVO);
-////
-////               }
-////           });
-////            List<ThdDataVO> apfThdI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Load(%)")).collect(Collectors.toList());
-////            Map<String, List<ThdDataVO>> collect3 = apfThdI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-////            collect3.forEach((k,v)->{
-////                if(!CollectionUtil.isEmpty(v)){
-////                    double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-////                    ThdDataVO thdDataVO = new ThdDataVO();
-////                    BeanUtils.copyProperties(v.get(0),thdDataVO);
-////                    thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-////                    thdDataVO.setPhase("avg");
-////                    result.add(thdDataVO);
-////
-////                }
-////            });
-////            List<ThdDataVO> apfRmsI = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_RmsI_TolOut(A)")).collect(Collectors.toList());
-////            Map<String, List<ThdDataVO>> collect2 = apfRmsI.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-////            collect2.forEach((k,v)->{
-////                if(!CollectionUtil.isEmpty(v)){
-////                    double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-////                    ThdDataVO thdDataVO = new ThdDataVO();
-////                    BeanUtils.copyProperties(v.get(0),thdDataVO);
-////                    thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-////                    thdDataVO.setPhase("avg");
-////                    result.add(thdDataVO);
-////
-////                }
-////            });
-////            List<ThdDataVO> apfThdISys = tempList.stream().filter(temp -> Objects.equals(temp.getStatisticalName(), "Apf_ThdA_Sys(%)")).collect(Collectors.toList());
-////            Map<String, List<ThdDataVO>> collect4 = apfThdISys.stream().collect(Collectors.groupingBy(ThdDataVO::getLineId));
-////            collect4.forEach((k,v)->{
-////                if(!CollectionUtil.isEmpty(v)){
-////                    double asDouble = v.stream().mapToDouble(ThdDataVO::getStatisticalData).average().getAsDouble();
-////                    ThdDataVO thdDataVO = new ThdDataVO();
-////                    BeanUtils.copyProperties(v.get(0),thdDataVO);
-////                    thdDataVO.setStatisticalData(Double.valueOf(df.format(asDouble)));
-////                    thdDataVO.setPhase("avg");
-////                    result.add(thdDataVO);
-////
-////                }
-////            });
-////
-////            List<ThdDataVO> notM = tempList.stream().filter(temp -> !Objects.equals(temp.getPhase(), "M")).collect(Collectors.toList());
-//
-//            result.addAll(tempList);
-//
-//
-//
-//            Gson gson = new Gson();
-//            topoDataJson = gson.toJson(result);
-//            redisUtil.saveByKeyWithExpire(devId+"DVR", (Object) topoDataJson,Long.valueOf(10*60));
-//        }
-//
-//
-//        publisher.send("/zl/DvrData/"+devId,topoDataJson,1,false);
-//    }
 
     public String getCldidName( String cldid) {
 
@@ -357,4 +357,14 @@ public class MqttMessageHandler {
 //            return thdDataVOList;
 //        }
 //    }
+
+    /**
+     * 处理补召数据
+     */
+    @MqttSubscribe(value = "/makeUpData/{nDid}/{lineId}",qos = 1)
+    public void responseRtData(String topic, @NamedValue("nDid") String nDid, @NamedValue("lineId") String lineId, MqttMessage message, @Payload String payload) {
+        //下载文件
+        fileFeignClient.downloadMakeUpFile(nDid);
+    }
+
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/CsDataSetMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.csharmonic.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.csdevice.pojo.po.CsDataSet;
+
+/**
+ * <p>
+ * 数据集表 Mapper 接口
+ * </p>
+ *
+ * @author xuyang
+ * @since 2023-05-31
+ */
+public interface CsDataSetMapper extends BaseMapper<CsDataSet> {
+
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml

@@ -121,9 +121,18 @@
   <select id="queryEventPageWeb" resultType="com.njcn.csharmonic.pojo.vo.EventDetailVO">
     select DISTINCT b.id id,
     b.device_id deviceId,b.line_id lineId,b.code code,
-    b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location,d.name lineName
+    b.start_time startTime,b.tag tag ,b.wave_path wavePath,b.instant_pics,b.rms_pics , b.type type,b.level level,b.location location
-    from  cs_event b inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did where 1=1
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
+    ,d.name lineName
+    </if>
+    from  cs_event b
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
+    inner join cs_equipment_delivery c on b.device_id=c.id inner join cs_line d on d.device_id=b.device_id and d.clDid=b.cl_did
+    </if>
+    where 1=1
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
     and b.process=c.process
+    </if>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.endTime  != null and csEventUserQueryPage.endTime !=''">
       AND DATE(b.start_time) &lt;= DATE(#{csEventUserQueryPage.endTime})
     </if>
@@ -131,7 +140,6 @@
       AND DATE(b.start_time) &gt;= DATE(#{csEventUserQueryPage.startTime})
     </if>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.target != null and csEventUserQueryPage.target.size()>0">
-
       and b.tag in
       <foreach collection="csEventUserQueryPage.target" index="index" item="item" open="(" separator="," close=")">
         #{item}
@@ -142,10 +150,24 @@
       #{item}
     </foreach>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != null and csEventUserQueryPage.type !=''">
-      AND   b.type =#{ csEventUserQueryPage.type}
+      <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type == 3 ">
+        AND   b.type in(2,3)
+      </if>
+      <if test="csEventUserQueryPage!=null and csEventUserQueryPage.type != 3 ">
+        AND   b.type =#{ csEventUserQueryPage.type}
+      </if>
+
     </if>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.level != null and csEventUserQueryPage.level !=''">
-      AND   b.level =#{ csEventUserQueryPage.level}
+      AND   b.level = #{ csEventUserQueryPage.level}
+    </if>
+
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.eventType != null and csEventUserQueryPage.eventType !=''">
+      AND b.tag = #{csEventUserQueryPage.eventType}
+    </if>
+
+    <if test="csEventUserQueryPage!=null and csEventUserQueryPage.location != null and csEventUserQueryPage.location !=''">
+      AND b.location = #{csEventUserQueryPage.location}
     </if>
     order by b.start_time desc
   </select>

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/CsEventPOService.java

@@ -11,6 +11,7 @@ import com.njcn.csharmonic.pojo.vo.EventDetailVO;
 import com.njcn.event.file.pojo.dto.WaveDataDTO;
 
 import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -49,4 +50,6 @@ public interface CsEventPOService extends IService<CsEventPO>{
     void saveBatchEventList(List<CsEventPO> csEventPOS);
 
     void getFileZip(String eventId,HttpServletResponse response);
+
+    List<DataGroupEventVO> queryEventList(LocalDateTime startDate, LocalDateTime endDate, String lineId);
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IDataService.java

@@ -0,0 +1,32 @@
+package com.njcn.csharmonic.service;
+
+import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
+import com.njcn.csdevice.pojo.vo.RecordVo;
+import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.pojo.vo.RealTimeDataVo;
+
+import java.util.List;
+
+/**
+ * @author xuyang
+ */
+public interface IDataService {
+
+    /**
+     * 获取设备准实时数据
+     * @param param
+     * @return
+     */
+    List<RealTimeDataVo> getRealTimeData(DataParam param);
+
+    /**
+     * 获取监测点测试项信息
+     */
+    List<RecordVo> getTestData(DataParam param);
+
+    /**
+     * 根据测试项id获取时间范围内的暂态事件
+     */
+    List<DataGroupEventVO> getEventByItem(String id);
+
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/IStatisticsDataDataService.java

@@ -0,0 +1,18 @@
+package com.njcn.csharmonic.service;
+
+import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
+import com.njcn.csharmonic.pojo.vo.LineIntegrityVo;
+
+import java.util.List;
+
+/**
+ * @author xy
+ */
+public interface IStatisticsDataDataService {
+
+    /**
+     * 数据完整性、终端在线率
+     * @param param
+     */
+    List<LineIntegrityVo> getDevData(StatisticsDataParam param);
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/OfflineDataUploadService.java

@@ -38,6 +38,6 @@ public interface OfflineDataUploadService {
      * 根据项目递归获取文件夹下的bin文件，区分暂态、稳态，存储离线文件的方式，调用黄正剑的离线数据补招功能
      * @return
      */
-    void startMakeUpData(MakeUpParam param);
+    boolean startMakeUpData(MakeUpParam param);
 
 }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventPOServiceImpl.java

@@ -53,6 +53,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.net.URLEncoder;
+import java.time.LocalDateTime;
 import java.util.*;
 
 
@@ -206,6 +207,20 @@ public class CsEventPOServiceImpl extends ServiceImpl<CsEventPOMapper, CsEventPO
 
     }
 
+    @Override
+    public List<DataGroupEventVO> queryEventList(LocalDateTime startDate, LocalDateTime endDate, String lineId) {
+        List<DataGroupEventVO> dataGroupEventVOList = new ArrayList<>();
+        LambdaQueryWrapper<CsEventPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(CsEventPO::getLineId,lineId)
+                .eq(CsEventPO::getType,0).between(CsEventPO::getStartTime,startDate,endDate)
+                .orderByDesc(CsEventPO::getStartTime);
+        List<CsEventPO> pos = this.baseMapper.selectList(lambdaQueryWrapper);
+        if(CollUtil.isNotEmpty(pos)){
+            dataGroupEventVOList = BeanUtil.copyToList(pos,DataGroupEventVO.class);
+        }
+        return dataGroupEventVOList;
+    }
+
 
     /**
      * @return WaveDataDTO

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/DataServiceImpl.java

@@ -0,0 +1,373 @@
+package com.njcn.csharmonic.service.impl;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.api.WlRecordFeignClient;
+import com.njcn.csdevice.pojo.dto.CsEquipmentDeliveryDTO;
+import com.njcn.csdevice.pojo.param.WlRecordParam;
+import com.njcn.csdevice.pojo.param.WlRecordTemplete;
+import com.njcn.csdevice.pojo.po.CsDataSet;
+import com.njcn.csdevice.pojo.po.CsLedger;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csdevice.pojo.po.WlRecord;
+import com.njcn.csdevice.pojo.vo.DataGroupEventVO;
+import com.njcn.csdevice.pojo.vo.RecordVo;
+import com.njcn.csdevice.utils.DataChangeUtil;
+import com.njcn.csharmonic.api.EventFeignClient;
+import com.njcn.csharmonic.constant.HarmonicConstant;
+import com.njcn.csharmonic.mapper.CsDataSetMapper;
+import com.njcn.csharmonic.param.DataParam;
+import com.njcn.csharmonic.pojo.vo.RealTimeDataVo;
+import com.njcn.csharmonic.service.CsEventPOService;
+import com.njcn.csharmonic.service.IDataService;
+import com.njcn.csharmonic.util.InfluxDbParamUtil;
+import com.njcn.influx.pojo.dto.EventDataSetDTO;
+import com.njcn.influx.pojo.dto.StatisticalDataDTO;
+import com.njcn.influx.service.CommonService;
+import com.njcn.influx.service.EvtDataService;
+import com.njcn.system.api.*;
+import com.njcn.system.pojo.po.EleEpdPqd;
+import com.njcn.system.pojo.po.EleEvtParm;
+import com.njcn.system.pojo.vo.DictTreeVO;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.DecimalFormat;
+import java.time.Duration;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * 类的介绍：
+ *
+ * @author xuyang
+ * @version 1.0.0
+ * @createTime 2023/6/1 10:11
+ */
+@Service
+@AllArgsConstructor
+public class DataServiceImpl implements IDataService {
+
+    private final CommonService commonService;
+    private final CsStatisticalSetFeignClient csStatisticalSetFeignClient;
+    private final DictTreeFeignClient dictTreeFeignClient;
+    private final InfluxDbParamUtil influxDbParamUtil;
+    private final CsLineFeignClient csLineFeignClient;
+    private final CsDataSetMapper csDataSetMapper;
+    private final WlRecordFeignClient wlRecordFeignClient;
+    private final CsEventPOService csEventPOService;
+    private final DecimalFormat df = new DecimalFormat("#0.00");
+    private final EpdFeignClient epdFeignClient;
+    private final EvtDataService evtDataService;
+    private final EleEvtFeignClient eleEvtFeignClient;
+    private final EquipmentFeignClient equipmentFeignClient;
+
+    @Override
+    public List<RealTimeDataVo> getRealTimeData(DataParam param) {
+        List<RealTimeDataVo> result = new ArrayList<>();
+        //获取监测点使用的数据集
+        List<CsLinePO> finalCsLinePOList = csLineFeignClient.queryLineById(Arrays.asList(param.getLineId())).getData();
+        CsDataSet csDataSet = csDataSetMapper.selectOne(new LambdaQueryWrapper<CsDataSet>().eq(CsDataSet::getId,finalCsLinePOList.get(0).getDataSetId()));
+        Double ct = finalCsLinePOList.get(0).getCtRatio();
+        Double pt = finalCsLinePOList.get(0).getPtRatio();
+        //根据类型id获取指标分组
+        List<DictTreeVO> dictTreeVOList = dictTreeFeignClient.query(param.getTargetType()).getData();
+        if (CollUtil.isNotEmpty(dictTreeVOList)) {
+            dictTreeVOList = dictTreeVOList.stream().sorted(Comparator.comparing(DictTreeVO::getSort)).collect(Collectors.toList());
+            //根据分组获取对应指标
+            List<RealTimeDataVo> finalResult = result;
+            dictTreeVOList.forEach(item->{
+                List<EleEpdPqd> epdPqdList = csStatisticalSetFeignClient.queryStatisticalSelect(item.getId()).getData();
+                epdPqdList.forEach(item2->{
+                    if (Objects.isNull(item2.getHarmStart())) {
+                        RealTimeDataVo vo = getBaseData(item2,param.getLineId(),param.getDataLevel(),csDataSet.getDataLevel(),pt,ct);
+                        if (Objects.nonNull(vo)) {
+                            finalResult.add(vo);
+                        }
+                    } else if (Objects.equals(item2.getHarmStart(),2)) {
+                        List<RealTimeDataVo> harmList = getHarmData(item2,param.getLineId());
+                        finalResult.addAll(harmList);
+                    } else if (Objects.equals(item2.getHarmStart(),1)) {
+                        List<RealTimeDataVo> inuharmList = getInuHarmData(item2,param.getLineId());
+                        finalResult.addAll(inuharmList);
+                    }
+                });
+            });
+        }
+        if (CollUtil.isNotEmpty(result)) {
+            result = channelData(result);
+        }
+        return result;
+    }
+
+    @Override
+    public List<RecordVo> getTestData(DataParam param) {
+        WlRecordParam.lineRecord record = new WlRecordParam.lineRecord();
+        record.setLineId(param.getLineId());
+        String beginDay = LocalDateTimeUtil.format(LocalDateTimeUtil.beginOfDay(LocalDateTimeUtil.parse(param.getStartTime(), DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATETIME_PATTERN);
+        String endDay = LocalDateTimeUtil.format(LocalDateTimeUtil.endOfDay(LocalDateTimeUtil.parse(param.getEndTime(), DatePattern.NORM_DATE_PATTERN)),DatePattern.NORM_DATETIME_PATTERN);
+        record.setItemStartTime(beginDay);
+        record.setItemEndTime(endDay);
+        record.setDataSource(param.getDataSource());
+        List<RecordVo> list = wlRecordFeignClient.findDevBaseDataByLineId(record).getData();
+        if (CollUtil.isNotEmpty(list)) {
+            list.forEach(item->{
+                if (Objects.nonNull(item.getEndTime())) {
+                    Duration duration = Duration.between(item.getStartTime(), item.getEndTime());
+                    long totalMinutes = duration.toMinutes();
+                    long completeHours = totalMinutes / 60;
+                    long remainingMinutes = totalMinutes % 60;
+                    long millis = duration.getSeconds();
+                    if (completeHours == 0 && remainingMinutes == 0 && millis <= 60) {
+                        remainingMinutes = 1;
+                    }
+                    item.setLastTime(completeHours + "小时" + remainingMinutes + "分钟");
+                }
+            });
+        }
+        return list;
+    }
+
+    @Override
+    public List<DataGroupEventVO> getEventByItem(String id) {
+        List<DataGroupEventVO> result = new ArrayList<>();
+        List<WlRecord> list = wlRecordFeignClient.getWlAssByWlId(id).getData();
+        if (CollUtil.isNotEmpty(list)) {
+            list.forEach(item->{
+                List<DataGroupEventVO> eventList = csEventPOService.queryEventList(item.getStartTime(),item.getEndTime(),item.getLineId());
+                result.addAll(eventList);
+            });
+        }
+        if (CollUtil.isNotEmpty(result)) {
+            result.forEach(temp->{
+                String lineName = csLineFeignClient.getById(temp.getLineId()).getData().getName();
+                temp.setLineName(lineName);
+                List<CsEquipmentDeliveryDTO> dto = equipmentFeignClient.queryDeviceById(Collections.singletonList(temp.getDeviceId())).getData();
+                if (CollUtil.isNotEmpty(dto)) {
+                    String devName = dto.get(0).getName();
+                    temp.setDevName(devName);
+                }
+
+                EleEpdPqd ele = epdFeignClient.findByName(temp.getTag()).getData();
+                if(ele!=null){
+                    temp.setShowName(ele.getShowName());
+                    //相别
+                    List<EleEvtParm> data1 = eleEvtFeignClient.queryByPid(ele.getId()).getData();
+                    List<EventDataSetDTO> eventDataSetDTOS = new ArrayList<>();
+                    for (EleEvtParm eleEvtParm : data1) {
+                        EventDataSetDTO eventDataSetDTO = new EventDataSetDTO();
+                        BeanUtils.copyProperties(eleEvtParm,eventDataSetDTO);
+                        EventDataSetDTO evtData = evtDataService.getEventDataSet(com.njcn.csdevice.constant.DataParam.evtData, temp.getId(), eleEvtParm.getName());
+                        if (evtData == null) {
+                            eventDataSetDTO.setValue("-");
+                        }else {
+                            eventDataSetDTO.setValue(Optional.ofNullable(evtData.getValue()).orElse("-"));
+                        }
+                        eventDataSetDTOS.add(eventDataSetDTO);
+                    }
+                    List<EventDataSetDTO> evtParamPhase = eventDataSetDTOS.stream().
+                            filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), com.njcn.csdevice.constant.DataParam.EvtParamPhase)).
+                            collect(Collectors.toList());
+                    if(CollectionUtil.isEmpty(evtParamPhase)){
+                        temp.setPhaseType(null);
+                    }else {
+                        temp.setPhaseType(evtParamPhase.get(0).getValue()+(Objects.isNull(evtParamPhase.get(0).getUnit())?"":evtParamPhase.get(0).getUnit()));
+                    }
+
+                    List<EventDataSetDTO> evtParamDepth = eventDataSetDTOS.stream().
+                            filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), com.njcn.csdevice.constant.DataParam.EvtParamDepth)).
+                            collect(Collectors.toList());
+                    if(CollectionUtil.isEmpty(evtParamDepth)){
+                        temp.setFeatureAmplitude(null);
+                    }else {
+                        temp.setFeatureAmplitude("-".equals(evtParamDepth.get(0).getValue())?null:Float.parseFloat(evtParamDepth.get(0).getValue()));
+                    }
+                    List<EventDataSetDTO> evtParmTm = eventDataSetDTOS.stream().
+                            filter(dataSetDTO -> Objects.equals(dataSetDTO.getName(), com.njcn.csdevice.constant.DataParam.EVTPARAMTM)).
+                            collect(Collectors.toList());
+                    if(CollectionUtil.isEmpty(evtParamDepth)){
+                        temp.setPersistTime(null);
+                    }else {
+                        temp.setPersistTime("-".equals(evtParmTm.get(0).getValue())?null:Double.parseDouble(evtParmTm.get(0).getValue()));
+                    }
+                }
+            });
+        }
+        return result;
+    }
+
+    //基础数据
+    public RealTimeDataVo getBaseData(EleEpdPqd item2, String lineId, String dataLevel, String csDataSetLevel,Double pt, Double ct) {
+        RealTimeDataVo vo = new RealTimeDataVo();
+        String unit;
+        double re;
+        vo.setId(item2.getId());
+        vo.setName(item2.getName());
+        StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getName(),item2.getPhase(),"avg",influxDbParamUtil.getClDidByLineId(lineId));
+        if (Objects.nonNull(statisticalDataDTO)) {
+            vo.setTime(statisticalDataDTO.getTime());
+            vo.setAvgValue(statisticalDataDTO.getValue());
+        }
+        vo.setPhase(item2.getPhase());
+        vo.setOtherName(item2.getShowName());
+        vo.setSort(item2.getSort());
+        if (Objects.equals("Primary",dataLevel)) {
+            if (Objects.equals("Primary",csDataSetLevel)) {
+                if (HarmonicConstant.POWER_LIST.contains(item2.getShowName())) {
+                    re = Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue() / 1000));
+                    vo.setAvgValue(re);
+                    unit = "k" + item2.getUnit();
+                } else {
+                    vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));
+                    unit = item2.getUnit();
+                }
+            } else {
+                if(Objects.nonNull(item2.getPrimaryFormula())){
+                    switch (item2.getPrimaryFormula()) {
+                        case "*PT":
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt / 1000;
+                            unit = "k" + item2.getUnit();
+                            break;
+                        case "*CT":
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * ct;
+                            unit = item2.getUnit();
+                            break;
+                        case "*PT*CT":
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() * pt * ct / 1000;
+                            unit = "k" + item2.getUnit();
+                            break;
+                        default:
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
+                            unit = item2.getUnit();
+                            break;
+                    }
+                    vo.setAvgValue(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
+                }else {
+                    if (Objects.nonNull(statisticalDataDTO)) {
+                        re = statisticalDataDTO.getValue();
+                        vo.setAvgValue(Double.valueOf(df.format(re)));
+                    }
+                    unit = item2.getUnit();
+                }
+            }
+        } else {
+            if (Objects.equals("Primary",csDataSetLevel)) {
+                if(Objects.nonNull(item2.getPrimaryFormula())) {
+                    switch (item2.getPrimaryFormula()) {
+                        case "*PT":
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt;
+                            break;
+                        case "*CT":
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / ct;
+                            break;
+                        case "*PT*CT":
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue() / pt / ct / 1000;
+                            break;
+                        default:
+                            re = Objects.isNull(statisticalDataDTO) ? 3.14159 : statisticalDataDTO.getValue();
+                            break;
+                    }
+                    vo.setAvgValue(Objects.equals(re,3.14159) ? 3.14159 : Double.parseDouble(df.format(re)));
+                }else {
+                    if (Objects.nonNull(statisticalDataDTO)) {
+                        re = statisticalDataDTO.getValue();
+                        vo.setAvgValue(Double.valueOf(df.format(re)));
+                    }
+                }
+            } else {
+                vo.setAvgValue(Objects.isNull(statisticalDataDTO) ? 3.14159 : Double.parseDouble(df.format(statisticalDataDTO.getValue())));
+            }
+            unit = item2.getUnit();
+        }
+        vo.setUnit(unit);
+        if (Objects.nonNull(unit)) {
+            vo.setOtherName(item2.getShowName() + "(" + unit + ")");
+        }
+        return vo;
+    }
+
+    //谐波数据
+    public List<RealTimeDataVo> getHarmData(EleEpdPqd item2, String lineId) {
+        List<RealTimeDataVo> list = new ArrayList<>();
+        for (int i = item2.getHarmStart(); i <= item2.getHarmEnd(); i++) {
+            RealTimeDataVo vo = new RealTimeDataVo();
+            vo.setId(item2.getId());
+            vo.setName(item2.getName().concat("_").concat(Integer.toString(i)));
+            StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getName().concat("_").concat(Integer.toString(i)),item2.getPhase(),"avg",influxDbParamUtil.getClDidByLineId(lineId));
+            if (Objects.isNull(statisticalDataDTO)) {
+                vo.setAvgValue(3.14159);
+            } else {
+                vo.setTime(statisticalDataDTO.getTime());
+                vo.setAvgValue(Double.valueOf(df.format(statisticalDataDTO.getValue())));
+            }
+            vo.setPhase(item2.getPhase());
+            vo.setOtherName(i + "次" + "(" + item2.getUnit() + ")");
+            vo.setSort(item2.getSort());
+            vo.setUnit(item2.getUnit());
+            list.add(vo);
+        }
+        return list;
+    }
+
+    //间谐波数据
+    public List<RealTimeDataVo> getInuHarmData(EleEpdPqd item2, String lineId) {
+        List<RealTimeDataVo> list = new ArrayList<>();
+        for (int i = item2.getHarmStart(); i <= item2.getHarmEnd(); i++) {
+            RealTimeDataVo vo = new RealTimeDataVo();
+            vo.setId(item2.getId());
+            vo.setName(item2.getName().concat("_").concat(Integer.toString(i)));
+            StatisticalDataDTO statisticalDataDTO = commonService.getLineRtData(lineId,influxDbParamUtil.getTableNameByClassId(item2.getClassId()),item2.getName().concat("_").concat(Integer.toString(i)),item2.getPhase(),"avg",influxDbParamUtil.getClDidByLineId(lineId));
+            if (Objects.isNull(statisticalDataDTO)) {
+                vo.setAvgValue(3.14159);
+            } else {
+                vo.setTime(statisticalDataDTO.getTime());
+                vo.setAvgValue(Double.valueOf(df.format(statisticalDataDTO.getValue())));
+            }
+            vo.setPhase(item2.getPhase());
+            vo.setOtherName((i-0.5) + "次" + "(" + item2.getUnit() + ")");
+            vo.setSort(item2.getSort());
+            vo.setUnit(item2.getUnit());
+            list.add(vo);
+        }
+        return list;
+    }
+
+    //数据格式处理
+    public  List<RealTimeDataVo> channelData(List<RealTimeDataVo> list) {
+        List<RealTimeDataVo> result = new ArrayList<>();
+        //将list 排序，并按照排序后的结果进行有序分组
+        LinkedHashMap<String, List<RealTimeDataVo>> map = list.stream().sorted(Comparator.comparing(RealTimeDataVo::getSort)).collect(Collectors.groupingBy(RealTimeDataVo::getName, LinkedHashMap::new, Collectors.toList()));
+        map.forEach((k,v)->{
+            RealTimeDataVo vo = new RealTimeDataVo();
+            RealTimeDataVo vo1 = v.get(0);
+            BeanUtils.copyProperties(vo1,vo);
+            RealTimeDataVo phaseA = v.stream().filter(s->Objects.equals(s.getPhase(),"A") || Objects.equals(s.getPhase(),"AB")).findFirst().orElse(null);
+            if (Objects.nonNull(phaseA)) {
+                vo.setValueA(phaseA.getAvgValue());
+            }
+            RealTimeDataVo phaseB = v.stream().filter(s->Objects.equals(s.getPhase(),"B") || Objects.equals(s.getPhase(),"BC")).findFirst().orElse(null);
+            if (Objects.nonNull(phaseB)) {
+                vo.setValueB(phaseB.getAvgValue());
+            }
+            RealTimeDataVo phaseC = v.stream().filter(s->Objects.equals(s.getPhase(),"C") || Objects.equals(s.getPhase(),"CA")).findFirst().orElse(null);
+            if (Objects.nonNull(phaseC)) {
+                vo.setValueC(phaseC.getAvgValue());
+            }
+            RealTimeDataVo phaseM = v.stream().filter(s->Objects.equals(s.getPhase(),"M")).findFirst().orElse(null);
+            if (Objects.nonNull(phaseM)) {
+                vo.setValueM(phaseM.getAvgValue());
+            }
+            vo.setPhase("/");
+            vo.setAvgValue(null);
+            result.add(vo);
+        });
+        return result;
+    }
+
+}

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/OfflineDataUploadServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.csharmonic.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.nacos.shaded.com.google.gson.Gson;
@@ -25,6 +26,7 @@ import com.njcn.csharmonic.offline.log.vo.NewTaglogbuffer;
 import com.njcn.csharmonic.offline.log.vo.TagComtradeCfg;
 import com.njcn.csharmonic.offline.mincfg.AnalyseComtradeCfg;
 import com.njcn.csharmonic.offline.vo.Response;
+import com.njcn.csharmonic.pojo.dto.DownloadMakeUpDto;
 import com.njcn.csharmonic.pojo.dto.MakeUpDto;
 import com.njcn.csharmonic.pojo.param.MakeUpParam;
 import com.njcn.csharmonic.pojo.vo.MakeUpVo;
@@ -49,7 +51,10 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import static com.njcn.access.enums.TypeEnum.DATA_48;
@@ -151,7 +156,7 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
                 // 创建 DateTimeFormatter 对象并指定格式
                 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
                 List<RspDataDto.ProjectInfo> projectInfoList = channelObjectUtil.objectToList(redisUtil.getObjectByKey(key),RspDataDto.ProjectInfo.class);
-                projectInfoList.forEach(item->{
+                for (RspDataDto.ProjectInfo item : projectInfoList) {
                     MakeUpVo vo = new MakeUpVo();
                     vo.setType("dir");
                     BeanUtils.copyProperties(item,vo);
@@ -168,11 +173,14 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
                         vo.setEndTime(formattedDate);
                     }
                     result.add(vo);
-                });
+                }
             }
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
+        if (CollUtil.isNotEmpty(result)) {
+            result = result.stream().sorted(Comparator.comparing(MakeUpVo::getStartTime).reversed()).collect(Collectors.toList());
+        }
         return result;
     }
 
@@ -216,98 +224,181 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
     }
 
     @Override
-    public void startMakeUpData(MakeUpParam param) {
+    public boolean startMakeUpData(MakeUpParam param) {
+        boolean result = false;
         List<String> fileList = new ArrayList<>();
-        Map<String,List<String>> map = new HashMap<>();
+        //fixme 这边补召暂不支持多工程补召，防止下载文件时间过长，会出问题。
-        //组装文件路径
+        String s = param.getProList().get(0);
-        for (String s : param.getProList()) {
+        //稳态补招
-            //稳态补招
+        if (param.getDataTypeList().contains(0)) {
-            if (param.getDataTypeList().contains(0)) {
+            String minPath = s + "/min";
-                String minPath = s + "/min";
+            List<FileDto.DirInfo> projectInfoList = getFileList(param.getLineId(),param.getNDid(),minPath);
-                List<FileDto.DirInfo> projectInfoList = getFileList(param.getLineId(),param.getNDid(),minPath);
+            if (CollectionUtil.isNotEmpty(projectInfoList)) {
-                if (CollectionUtil.isNotEmpty(projectInfoList)) {
+                projectInfoList.forEach(item->{
-                    projectInfoList.forEach(item->{
+                    String linePath = item.getName();
-                        String linePath = item.getName();
+                    if (timeRange(param.getStartTime(),param.getEndTime(),linePath,"min")) {
-                        if (timeRange(param.getStartTime(),param.getEndTime(),linePath,"min")) {
+                        List<FileDto.DirInfo> lineDataList = getFileList(param.getLineId(),param.getNDid(),linePath);
-                            List<FileDto.DirInfo> lineDataList = getFileList(param.getLineId(),param.getNDid(),linePath);
+                        if (CollectionUtil.isNotEmpty(lineDataList)) {
-                            if (CollectionUtil.isNotEmpty(lineDataList)) {
+                            fileList.addAll(lineDataList.stream().map(FileDto.DirInfo::getName).collect(Collectors.toList()));
-                                fileList.addAll(lineDataList.stream().map(FileDto.DirInfo::getName).collect(Collectors.toList()));
-                            }
                         }
-                    });
-                }
-            }
-            //暂态补招
-            if (param.getDataTypeList().contains(1)) {
-                //事件
-                String logPath = s + "/log";
-                List<FileDto.DirInfo> logList = getFileList(param.getLineId(),param.getNDid(),logPath);
-                if (CollectionUtil.isNotEmpty(logList)) {
-                    logList.forEach(item->{
-                        if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"log")) {
-                            fileList.add(item.getName());
-                        }
-                    });
-                }
-                //录波文件
-                String comtradePath = s + "/comtrade";
-                List<FileDto.DirInfo> comtradeList = getFileList(param.getLineId(),param.getNDid(),comtradePath);
-                if (CollectionUtil.isNotEmpty(comtradeList)) {
-                    comtradeList.forEach(item->{
-                        if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"comtrade")) {
-                            fileList.add(item.getName());
-                        }
-                    });
-                }
-            }
-            if (CollectionUtil.isNotEmpty(fileList)) {
-                //添加record.bin文件
-                fileList.add(s + "/record.bin");
-                map.put(s,fileList);
-            }
-        }
-        if (CollectionUtil.isNotEmpty(map)) {
-            List<String> keyList = new ArrayList<>();
-            //获取装置信息
-            CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData();
-            map.forEach((k,v)->{
-                String proName = k.replace("/bd0/cmn/",OssPath.DEV_MAKE_UP_PATH + param.getNDid() + "/");
-                String key = AppRedisKey.PROJECT_INFO + param.getNDid();
-                v.forEach(item->{
-                    redisUtil.delete(key);
-                    Object object = redisUtil.getObjectByKey(AppRedisKey.DEVICE_MID + param.getNDid());
-                    if (!Objects.isNull(object)) {
-                        mid = (Integer) object;
-                    }
-                    askFileInfo(param.getNDid(),mid,item);
-                    try {
-                        Thread.sleep(10000);
-                        FileDto.FileInfo info = channelObjectUtil.objectToSingleObject(redisUtil.getObjectByKey(key),FileDto.FileInfo.class);
-                        String path = deviceFtpFeignClient.downloadFile(param.getNDid(),item,info.getFileSize(),info.getFileCheck()).getData();
-                        String lsFile = generalInfo.getBusinessTempPath() + File.separator + item.split(StrUtil.SLASH)[item.split(StrUtil.SLASH).length - 1];
-                        moveFile(path,getFilePath(item,param.getNDid()),lsFile);
-                        //删除临时文件
-                        File file = new File(lsFile);
-                        if (file.exists()) {
-                            file.delete();
-                        }
-                        //删除下载文件
-                        fileStorageUtil.deleteFile(path);
-                        //存储下载
-                        keyList.add(item);
-                        //推送下载进度
-                        String json = "{allStep:" + fileList.size() * 2 + ",nowStep:" + keyList.size() + "}";
-                        publisher.send("/dataOnlineRecruitment/Progress/" + param.getLineId(), new Gson().toJson(json), 1, false);
-                    } catch (Exception e) {
-                        throw new BusinessException(CsHarmonicResponseEnum.MAKE_UP_ERROR);
                     }
                 });
-                //下载完成，调用解析接口
+            }
-                portableOffLogFeignClient.dataOnlineRecruitment(vo.getId(),param.getLineId(),proName);
-            });
         }
+        //暂态补招
+        if (param.getDataTypeList().contains(1)) {
+            //事件
+            String logPath = s + "/log";
+            List<FileDto.DirInfo> logList = getFileList(param.getLineId(),param.getNDid(),logPath);
+            if (CollectionUtil.isNotEmpty(logList)) {
+                logList.forEach(item->{
+                    if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"log")) {
+                        fileList.add(item.getName());
+                    }
+                });
+            }
+            //录波文件
+            String comtradePath = s + "/comtrade";
+            List<FileDto.DirInfo> comtradeList = getFileList(param.getLineId(),param.getNDid(),comtradePath);
+            if (CollectionUtil.isNotEmpty(comtradeList)) {
+                comtradeList.forEach(item->{
+                    if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"comtrade")) {
+                        fileList.add(item.getName());
+                    }
+                });
+            }
+        }
+        if (CollectionUtil.isNotEmpty(fileList)) {
+            //添加record.bin文件
+            fileList.add(s + "/record.bin");
+            redisUtil.delete(AppRedisKey.MAKE_UP_FILES + param.getNDid());
+            CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData();
+            DownloadMakeUpDto downloadMakeUpDto = new DownloadMakeUpDto();
+            downloadMakeUpDto.setFileList(fileList);
+            downloadMakeUpDto.setLineId(param.getLineId());
+            downloadMakeUpDto.setDevId(vo.getId());
+            downloadMakeUpDto.setAllStep(fileList.size());
+            String proName = s.replace("/bd0/cmn/",OssPath.DEV_MAKE_UP_PATH + param.getNDid() + "/");
+            downloadMakeUpDto.setEngineeringName(proName);
+            redisUtil.saveByKey(AppRedisKey.MAKE_UP_FILES + param.getNDid(),downloadMakeUpDto);
+            publisher.send("/makeUpData/" + param.getNDid() +"/" + param.getLineId(), "makeUpData", 1, false);
+            log.info("下载的文件列表,{}",fileList);
+            result = true;
+        } else {
+            throw new BusinessException("装置内未找到原始文件!");
+        }
+        return result;
     }
 
+//    @Override
+//    public boolean startMakeUpData(MakeUpParam param) {
+//        boolean result = true;
+//        try {
+//            List<String> fileList = new ArrayList<>();
+//            Map<String,List<String>> map = new HashMap<>();
+//            String s = param.getProList().get(0);
+//
+//
+//
+//
+//            //组装文件路径
+//            for (String s : param.getProList()) {
+//                //稳态补招
+//                if (param.getDataTypeList().contains(0)) {
+//                    String minPath = s + "/min";
+//                    List<FileDto.DirInfo> projectInfoList = getFileList(param.getLineId(),param.getNDid(),minPath);
+//                    if (CollectionUtil.isNotEmpty(projectInfoList)) {
+//                        projectInfoList.forEach(item->{
+//                            String linePath = item.getName();
+//                            if (timeRange(param.getStartTime(),param.getEndTime(),linePath,"min")) {
+//                                List<FileDto.DirInfo> lineDataList = getFileList(param.getLineId(),param.getNDid(),linePath);
+//                                if (CollectionUtil.isNotEmpty(lineDataList)) {
+//                                    fileList.addAll(lineDataList.stream().map(FileDto.DirInfo::getName).collect(Collectors.toList()));
+//                                }
+//                            }
+//                        });
+//                    }
+//                }
+//                //暂态补招
+//                if (param.getDataTypeList().contains(1)) {
+//                    //事件
+//                    String logPath = s + "/log";
+//                    List<FileDto.DirInfo> logList = getFileList(param.getLineId(),param.getNDid(),logPath);
+//                    if (CollectionUtil.isNotEmpty(logList)) {
+//                        logList.forEach(item->{
+//                            if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"log")) {
+//                                fileList.add(item.getName());
+//                            }
+//                        });
+//                    }
+//                    //录波文件
+//                    String comtradePath = s + "/comtrade";
+//                    List<FileDto.DirInfo> comtradeList = getFileList(param.getLineId(),param.getNDid(),comtradePath);
+//                    if (CollectionUtil.isNotEmpty(comtradeList)) {
+//                        comtradeList.forEach(item->{
+//                            if (timeRange(param.getStartTime(),param.getEndTime(),item.getName(),"comtrade")) {
+//                                fileList.add(item.getName());
+//                            }
+//                        });
+//                    }
+//                }
+//                if (CollectionUtil.isNotEmpty(fileList)) {
+//                    redisUtil.deleteKeysByString(AppRedisKey.MAKE_UP_FILES);
+//                    //添加record.bin文件
+//                    fileList.add(s + "/record.bin");
+//                    map.put(s,fileList);
+//                }
+//                redisUtil.saveByKey(AppRedisKey.MAKE_UP_FILES + param.getNDid(),map);
+//                publisher.send("/makeUpData/" + param.getNDid() +"/" + param.getLineId(), "makeUpData", 1, false);
+//                log.info("下载的文件列表,{}",fileList);
+//            }
+//        } catch (Exception e) {
+//            result = false;
+//        }
+//        return result;
+//
+//        if (CollectionUtil.isNotEmpty(map)) {
+//            List<String> keyList = new ArrayList<>();
+//            //获取装置信息
+//            CsEquipmentDeliveryVO vo = equipmentFeignClient.queryEquipmentByndid(param.getNDid()).getData();
+//            map.forEach((k,v)->{
+//                String proName = k.replace("/bd0/cmn/",OssPath.DEV_MAKE_UP_PATH + param.getNDid() + "/");
+//                String key = AppRedisKey.PROJECT_INFO + param.getNDid();
+//                v.forEach(item->{
+//                    redisUtil.delete(key);
+//                    Object object = redisUtil.getObjectByKey(AppRedisKey.DEVICE_MID + param.getNDid());
+//                    if (!Objects.isNull(object)) {
+//                        mid = (Integer) object;
+//                    }
+//                    askFileInfo(param.getNDid(),mid,item);
+//                    try {
+//                        Thread.sleep(10000);
+//                        FileDto.FileInfo info = channelObjectUtil.objectToSingleObject(redisUtil.getObjectByKey(key),FileDto.FileInfo.class);
+//                        String path = deviceFtpFeignClient.downloadFile(param.getNDid(),item,info.getFileSize(),info.getFileCheck()).getData();
+//                        String lsFile = generalInfo.getBusinessTempPath() + File.separator + item.split(StrUtil.SLASH)[item.split(StrUtil.SLASH).length - 1];
+//                        moveFile(path,getFilePath(item,param.getNDid()),lsFile);
+//                        //删除临时文件
+//                        File file = new File(lsFile);
+//                        if (file.exists()) {
+//                            file.delete();
+//                        }
+//                        //删除下载文件
+//                        fileStorageUtil.deleteFile(path);
+//                        //存储下载
+//                        keyList.add(item);
+//                        //推送下载进度
+//                        String json = "{allStep:" + fileList.size() * 2 + ",nowStep:" + keyList.size() + "}";
+//                        publisher.send("/dataOnlineRecruitment/Progress/" + param.getLineId(), new Gson().toJson(json), 1, false);
+//                    } catch (Exception e) {
+//                        throw new BusinessException(CsHarmonicResponseEnum.MAKE_UP_ERROR);
+//                    }
+//                });
+//                //下载完成，调用解析接口
+//                portableOffLogFeignClient.dataOnlineRecruitment(vo.getId(),param.getLineId(),proName);
+//            });
+//        }
+//    }
+
 
     /**
      * 时间处理
@@ -376,25 +467,6 @@ public class OfflineDataUploadServiceImpl implements OfflineDataUploadService {
         }
     }
 
-    /**
-     * 询问文件信息
-     */
-    public void askFileInfo(String nDid, Integer mid, String fileName) {
-        String version = csTopicFeignClient.find(nDid).getData();
-        ReqAndResDto.Req reqAndResParam = new ReqAndResDto.Req();
-        reqAndResParam.setMid(mid);
-        reqAndResParam.setDid(0);
-        reqAndResParam.setPri(AccessEnum.FIRST_CHANNEL.getCode());
-        reqAndResParam.setType(Integer.parseInt(TypeEnum.TYPE_8.getCode()));
-        reqAndResParam.setExpire(-1);
-        String json = "{Name:\""+fileName+"\"}";
-        JSONObject jsonObject = JSONObject.fromObject(json);
-        reqAndResParam.setMsg(jsonObject);
-        log.info("请求文件信息报文:" + new Gson().toJson(reqAndResParam));
-        publisher.send("/Pfm/DevFileCmd/"+version+"/"+nDid,new Gson().toJson(reqAndResParam),1,false);
-    }
-
-
     /**
      * 获取文件数据
      */

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/RealDataServiceImpl.java

@@ -1,6 +1,8 @@
 package com.njcn.csharmonic.service.impl;
 
 import com.njcn.access.api.AskDeviceDataFeignClient;
+import com.njcn.access.utils.MqttUtil;
+import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsLineFeignClient;
 import com.njcn.csdevice.api.DataSetFeignClient;
 import com.njcn.csdevice.pojo.po.CsDataSet;
@@ -23,12 +25,18 @@ public class RealDataServiceImpl implements RealDataService {
     private final DataSetFeignClient dataSetFeignClient;
     private final AskDeviceDataFeignClient askDeviceDataFeignClient;
     private final RedisUtil redisUtil;
+    private final MqttUtil mqttUtil;
 
     @Override
     public boolean getBaseRealData(String lineId) {
         boolean result = true;
         try {
             String nDid = lineId.substring(0, lineId.length() - 1);
+            String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+            if (!mqttClient) {
+                throw new BusinessException("装置离线");
+            }
             Integer clDid = Integer.parseInt(lineId.substring(lineId.length() - 1));
             //获取装置所用模板
             CsLinePO po = csLineFeignClient.getById(lineId).getData();
@@ -46,8 +54,8 @@ public class RealDataServiceImpl implements RealDataService {
                     result = false;
                 }
             }
-        } catch (InterruptedException e) {
+        } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new BusinessException(e.getMessage());
         }
         return result;
     }
@@ -57,6 +65,11 @@ public class RealDataServiceImpl implements RealDataService {
         boolean result = true;
         try {
             String nDid = lineId.substring(0, lineId.length() - 1);
+            String clientName = "NJCN-" + nDid.substring(nDid.length() - 6);
+            boolean mqttClient = mqttUtil.judgeClientOnline(clientName);
+            if (!mqttClient) {
+                throw new BusinessException("装置离线");
+            }
             Integer clDid = Integer.parseInt(lineId.substring(lineId.length() - 1));
             //获取装置所用模板
             CsLinePO po = csLineFeignClient.getById(lineId).getData();
@@ -75,8 +88,8 @@ public class RealDataServiceImpl implements RealDataService {
                     result = false;
                 }
             }
-        } catch (InterruptedException e) {
+        } catch (Exception e) {
-            throw new RuntimeException(e);
+            throw new BusinessException(e.getMessage());
         }
         return result;
     }

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StableDataServiceImpl.java

@@ -36,6 +36,7 @@ import lombok.RequiredArgsConstructor;
 import org.influxdb.dto.QueryResult;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 import java.text.DecimalFormat;
 import java.time.ZoneId;
@@ -273,7 +274,11 @@ public class StableDataServiceImpl implements StableDataService {
             List<CsLinePO> finalCsLinePOList = csLinePOList;
             data.forEach(epdPqd->{
             String frequency = Optional.ofNullable(commonStatisticalQueryParam.getFrequency()).orElse("");
-
+            if(StringUtils.isEmpty(commonStatisticalQueryParam.getFrequency())){
+                frequency ="";
+            }else {
+                frequency = "_"+commonStatisticalQueryParam.getFrequency();
+            }
             String finalFrequency1 = frequency;
             List<CommonQueryParam> commonQueryParams = csLinePOList1.stream().map(temp -> {
                 CommonQueryParam commonQueryParam = new CommonQueryParam();

cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java

@@ -0,0 +1,74 @@
+package com.njcn.csharmonic.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.njcn.csdevice.api.CsLineFeignClient;
+import com.njcn.csdevice.api.EquipmentFeignClient;
+import com.njcn.csdevice.pojo.po.CsEquipmentDeliveryPO;
+import com.njcn.csdevice.pojo.po.CsLinePO;
+import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
+import com.njcn.csharmonic.pojo.vo.LineIntegrityVo;
+import com.njcn.csharmonic.service.IStatisticsDataDataService;
+import com.njcn.influx.pojo.dto.StatisticalDataDTO;
+import com.njcn.influx.service.CommonService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Function;
+import java.util.stream.Collectors;
+
+/**
+ * @author xy
+ */
+@Service
+@RequiredArgsConstructor
+public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService {
+
+    private final EquipmentFeignClient equipmentFeignClient;
+    private final CsLineFeignClient csLineFeignClient;
+    private final CommonService commonService;
+
+    @Override
+    public List<LineIntegrityVo> getDevData(StatisticsDataParam param) {
+        List<LineIntegrityVo> result = new ArrayList<>();
+        //获取库中正常的所有装置
+        List<CsEquipmentDeliveryPO> devList = equipmentFeignClient.getAll().getData();
+        if (CollectionUtil.isNotEmpty(devList)) {
+            Map<String, CsEquipmentDeliveryPO> devMap = devList.stream().collect(Collectors.toMap(CsEquipmentDeliveryPO::getId, Function.identity()));
+            //获取所有监测点
+            List<String> devIdList = devList.stream().map(CsEquipmentDeliveryPO::getId).collect(Collectors.toList());
+            if (CollectionUtil.isNotEmpty(devIdList)) {
+                List<CsLinePO> csLinePOList = csLineFeignClient.getLinesByDevList(devIdList).getData();
+                csLinePOList.forEach(item->{
+                    //应收数据
+                    int dueCount = 1440 / item.getLineInterval();
+                    LineIntegrityVo vo = new LineIntegrityVo();
+                    StatisticalDataDTO statisticalDataDTO;
+                    Integer process = devMap.get(item.getDevId()).getProcess();
+                    //治理监测点
+                    if (item.getClDid() == 0) {
+                        statisticalDataDTO = commonService.getCounts(item.getLineId(),"apf_data","Apf_Freq","frequency","M","avg",item.getClDid().toString(),process.toString(),param.getStartTime(),param.getEndTime());
+                    }
+                    //电能质量监测点
+                    else {
+                        statisticalDataDTO = commonService.getCounts(item.getLineId(),"pqd_data","Pq_Freq","frequency","M","avg",item.getClDid().toString(),process.toString(),param.getStartTime(),param.getEndTime());
+                    }
+                    vo.setDevId(item.getDevId());
+                    vo.setDevName(devMap.get(item.getDevId()).getName());
+                    vo.setLineId(item.getLineId());
+                    vo.setLineName(item.getName());
+                    if (Objects.isNull(statisticalDataDTO.getFrequency())) {
+                        vo.setLineIntegrity(null);
+                    } else {
+                        vo.setLineIntegrity(Integer.parseInt(statisticalDataDTO.getFrequency()) / dueCount * 100.0);
+                    }
+                    result.add(vo);
+                });
+            }
+        }
+        return result;
+    }
+}

cs-report/cs-report-boot/src/main/java/com/njcn/csreport/job/ReportCovertJob.java

@@ -2,7 +2,9 @@ package com.njcn.csreport.job;
 
 import cn.hutool.extra.spring.SpringUtil;
 import com.github.jeffreyning.mybatisplus.service.IMppService;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.utils.HarmonicTimesUtil;
+import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.csdevice.api.CsLedgerFeignClient;
 import com.njcn.csdevice.pojo.dto.LineParamDTO;
 import com.njcn.csdevice.pojo.po.CsLedger;
@@ -73,7 +75,11 @@ public class ReportCovertJob {
      */
     @Scheduled(cron = "0 0 1 * * ? ")
     public void executeEvent() throws ClassNotFoundException {
-        LocalDate today = LocalDate.now().minusDays(3);
+        DateTimeFormatter formatter1 = DateTimeFormatter.ISO_DATE;
+        // 获取当前日期
+        LocalDate today = LocalDate.now();
+
+
         // 计算前一天的日期
         LocalDate yesterday = today.minusDays(1);
         // 获取前一天的开始时间（00:00:00）
@@ -121,7 +127,9 @@ public class ReportCovertJob {
             collect.forEach((tempPhase,byNameMap)->{
                 //最小值
                 InfluxQueryWrapper influxQueryWrapperMin = new InfluxQueryWrapper(PqdData.class, clazz);
-                influxQueryWrapperMin.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "min").eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase).eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
+                influxQueryWrapperMin.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "min")
+                        .eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase);
+//                        .eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
 
 
                 byNameMap.forEach((name, eleEpdPqdList) -> {
@@ -150,7 +158,9 @@ public class ReportCovertJob {
 
                 //最大值
                 InfluxQueryWrapper influxQueryWrapperMax = new InfluxQueryWrapper(PqdData.class, clazz);
-                influxQueryWrapperMax.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "max").eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase).eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
+                influxQueryWrapperMax.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "max")
+                        .eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase);
+//                        .eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
 
 
                 byNameMap.forEach((name, eleEpdPqdList) -> {
@@ -178,7 +188,9 @@ public class ReportCovertJob {
 
                 //平均值
                 InfluxQueryWrapper influxQueryWrapperAvg = new InfluxQueryWrapper(PqdData.class, clazz);
-                influxQueryWrapperAvg.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "avg").eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase).eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
+                influxQueryWrapperAvg.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "avg")
+                        .eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase);
+//                        .eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
 
                 byNameMap.forEach((name, eleEpdPqdList) -> {
                     EleEpdPqd tempEleEpdPqd = eleEpdPqdList.get(0);
@@ -206,7 +218,9 @@ public class ReportCovertJob {
 
                 //CP95
                 InfluxQueryWrapper influxQueryWrapperCp95 = new InfluxQueryWrapper(PqdData.class, clazz);
-                influxQueryWrapperCp95.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "avg").eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase).eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
+                influxQueryWrapperCp95.regular(PqdData::getLineId, lineIndex).eq(InfluxDBTableConstant.VALUE_TYPE, "avg")
+                        .eq(InfluxDBTableConstant.PHASIC_TYPE,tempPhase);
+//                        .eq(InfluxDBTableConstant.IS_ABNORMAL, 0);
 
                 byNameMap.forEach((name, eleEpdPqdList) -> {
                     EleEpdPqd tempEleEpdPqd = eleEpdPqdList.get(0);
@@ -304,6 +318,7 @@ public class ReportCovertJob {
 
         }
 
+
     }
 
     public String getPhase( String phase) {
@@ -329,4 +344,5 @@ public class ReportCovertJob {
         return "";
     }
 
+
 }

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/param/AppVersionParam.java

@@ -0,0 +1,31 @@
+package com.njcn.cssystem.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @author xy
+ */
+@Data
+public class AppVersionParam implements Serializable {
+
+    @ApiModelProperty("app版本信息")
+    @NotBlank(message = "app版本信息不能为空")
+    private String appVersion;
+
+    @ApiModelProperty("严重度(0:优化 1:bug调整)")
+    @NotNull(message = "更新严重度不能为空")
+    private Integer sev;
+
+    @ApiModelProperty("整改内容")
+    private String content;
+
+    @ApiModelProperty("版本类型 APP WEB")
+    @NotNull(message = "版本类型不能为空")
+    private String versionType;
+
+}

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/po/AppVersion.java

@@ -0,0 +1,57 @@
+package com.njcn.cssystem.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xy
+ * @since 2024-11-21
+ */
+@Getter
+@Setter
+@TableName("app_version")
+public class AppVersion extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * app版本名称
+     */
+    private String versionName;
+
+    /**
+     * 版本发布时间
+     */
+    private LocalDateTime publishTime;
+
+    /**
+     * 严重度(0:优化 1:bug调整)
+     */
+    private Integer sev;
+
+    /**
+     * 版本类型 APP Web
+     */
+    private String versionType;
+
+    /**
+     * 修改内容
+     */
+    private String content;
+
+
+}

cs-system/cs-system-api/src/main/java/com/njcn/cssystem/pojo/vo/AppVersionVo.java

@@ -0,0 +1,25 @@
+package com.njcn.cssystem.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @author xy
+ */
+@Data
+public class AppVersionVo implements Serializable {
+
+    @ApiModelProperty("app版本名称")
+    private String versionName;
+
+    @ApiModelProperty("版本发布时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private LocalDateTime publishTime;
+
+    @ApiModelProperty("严重度(0:优化 1:bug调整)")
+    private Integer sev;
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/controller/baseinfo/AppVersionController.java

@@ -0,0 +1,76 @@
+package com.njcn.cssystem.controller.baseinfo;
+
+
+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.cssystem.pojo.param.AppVersionParam;
+import com.njcn.cssystem.pojo.po.AppVersion;
+import com.njcn.cssystem.pojo.vo.AppVersionVo;
+import com.njcn.cssystem.service.IAppVersionService;
+import com.njcn.web.controller.BaseController;
+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.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2024-11-21
+ */
+@RestController
+@Slf4j
+@RequestMapping("/appVersion")
+@Api(tags = "版本信息")
+@AllArgsConstructor
+public class AppVersionController extends BaseController {
+
+    private final IAppVersionService appVersionService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/add")
+    @ApiOperation("新增版本信息")
+    @ApiImplicitParam(name = "param", value = "app版本信息", required = true)
+    public HttpResult<String> add(@RequestBody @Validated AppVersionParam param){
+        String methodDescribe = getMethodDescribe("add");
+        boolean result = appVersionService.add(param);
+        if (result) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "新增成功", methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "新增失败", methodDescribe);
+        }
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getLastData")
+    @ApiOperation("查询最新版本信息")
+    @ApiImplicitParam(name = "versionType", value = "版本类型(APP WEB)", required = true)
+    public HttpResult<AppVersionVo> getLastData(@RequestParam("versionType") String versionType){
+        String methodDescribe = getMethodDescribe("getLastData");
+        AppVersionVo vo = appVersionService.getLastData(versionType);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getAllData")
+    @ApiOperation("查询所有版本信息")
+    @ApiImplicitParam(name = "versionType", value = "版本类型(APP WEB)")
+    public HttpResult< List<AppVersion>> getAllData(@RequestParam(value = "versionType",required = false) String versionType){
+        String methodDescribe = getMethodDescribe("getAllData");
+        List<AppVersion> list = appVersionService.getAllData(versionType);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}
+

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/mapper/AppVersionMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.cssystem.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.cssystem.pojo.po.AppVersion;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2024-11-21
+ */
+public interface AppVersionMapper extends BaseMapper<AppVersion> {
+
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/IAppVersionService.java

@@ -0,0 +1,25 @@
+package com.njcn.cssystem.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.cssystem.pojo.param.AppVersionParam;
+import com.njcn.cssystem.pojo.po.AppVersion;
+import com.njcn.cssystem.pojo.vo.AppVersionVo;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2024-11-21
+ */
+public interface IAppVersionService extends IService<AppVersion> {
+
+    boolean add(AppVersionParam param);
+
+    AppVersionVo getLastData(String versionType);
+
+    List<AppVersion> getAllData(String versionType);
+}

cs-system/cs-system-boot/src/main/java/com/njcn/cssystem/service/impl/AppVersionServiceImpl.java

@@ -0,0 +1,62 @@
+package com.njcn.cssystem.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.cssystem.mapper.AppVersionMapper;
+import com.njcn.cssystem.pojo.param.AppVersionParam;
+import com.njcn.cssystem.pojo.po.AppVersion;
+import com.njcn.cssystem.pojo.vo.AppVersionVo;
+import com.njcn.cssystem.service.IAppVersionService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xy
+ * @since 2024-11-21
+ */
+@Service
+public class AppVersionServiceImpl extends ServiceImpl<AppVersionMapper, AppVersion> implements IAppVersionService {
+
+    @Override
+    public boolean add(AppVersionParam param) {
+        AppVersion appVersion = new AppVersion();
+        appVersion.setVersionName(param.getAppVersion());
+        appVersion.setPublishTime(LocalDateTime.now());
+        appVersion.setSev(param.getSev());
+        appVersion.setVersionType(param.getVersionType());
+        appVersion.setContent(param.getContent());
+        return this.save(appVersion);
+    }
+
+    @Override
+    public AppVersionVo getLastData(String versionType) {
+        AppVersionVo vo = new AppVersionVo();
+        LambdaQueryWrapper<AppVersion> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(AppVersion::getVersionType, versionType);
+        queryWrapper.orderByDesc(AppVersion::getPublishTime).last("limit 1");
+        AppVersion appVersion = this.getOne(queryWrapper);
+        if (Objects.nonNull(appVersion)) {
+            BeanUtils.copyProperties(appVersion, vo);
+        }
+        return vo;
+    }
+
+    @Override
+    public List<AppVersion> getAllData(String versionType) {
+        LambdaQueryWrapper<AppVersion> queryWrapper = new LambdaQueryWrapper<>();
+        if (Objects.nonNull(versionType)) {
+            queryWrapper.eq(AppVersion::getVersionType, versionType);
+        }
+        queryWrapper.orderByDesc(AppVersion::getPublishTime);
+        return this.list(queryWrapper);
+    }
+}