技术监督用户信息迁移

pqs-advance/advance-api/src/main/java/com/njcn/advance/pojo/dto/waveAnalysis/BackData.java

@@ -47,7 +47,7 @@ import java.util.List;
  * angle_diff_cn C相相位负跳变
  * bph_max_value 不平衡度（单位%）
  */
-@JsonIgnoreProperties(ignoreUnknown = true)
+@JsonIgnoreProperties(ignoreUnknown = true,value = {"pointer"})
 public class BackData extends Structure {
 	public int qvvr_cata_cause[] = new int[256];
 	public int qvvr_phasetype[] = new int[256];

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/mapper/PqSensitiveUserMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.device.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.device.biz.pojo.po.PqSensitiveUser;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author xy
+ * @since 2025-11-17
+ */
+public interface PqSensitiveUserMapper extends BaseMapper<PqSensitiveUser> {
+
+}

pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/po/PqSensitiveUser.java

@@ -0,0 +1,62 @@
+package com.njcn.device.biz.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.njcn.db.bo.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+
+import static com.baomidou.mybatisplus.annotation.IdType.ASSIGN_ID;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-02-10
+ * @Description:
+ */
+@Getter
+@Setter
+@TableName("pq_sensitive_user")
+public class PqSensitiveUser extends BaseEntity implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    @TableId(value = "id",type = ASSIGN_ID)
+    private String id;
+
+    /**
+     * 敏感用户名称
+     */
+    private String name;
+
+    /**
+     * 敏感负荷类型
+     */
+    private String loadType;
+
+    /**
+     * 用户协议容量
+     */
+    private Double userAgreementCapacity;
+
+    /**
+     * 装机容量
+     */
+    private Double installedCapacity;
+
+    /**
+     * 所属厂站名称
+     */
+    private String substationName;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+
+}

pqs-device/pq-device/pq-device-api/pom.xml

@@ -27,6 +27,12 @@
             <artifactId>pqs-influx</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>supervision-api</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 </project>

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/UserLedgerFeignClient.java

@@ -0,0 +1,45 @@
+package com.njcn.device.pq.api;
+
+import com.njcn.common.pojo.constant.ServerInfo;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.device.pq.api.fallback.UserLedgerFeignClientFallbackFactory;
+import com.njcn.supervision.pojo.param.SensitiveUserParam;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.po.user.UserReportPO;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
+import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+
+/**
+ * 流程实例 Api 接口
+ *
+ */
+@FeignClient(value = ServerInfo.DEVICE, path = "/userReport", fallbackFactory = UserLedgerFeignClientFallbackFactory.class)
+public interface UserLedgerFeignClient {
+
+
+    @PostMapping("/selectUserList")
+    HttpResult<List<UserLedgerVO>> selectUserList(@RequestBody UserReportParam userReportParam);
+
+    @GetMapping("/selectUserInfo")
+    HttpResult<UserLedgerVO> selectUserInfo(@RequestParam("id") String id);
+
+    @PostMapping(value = "/bindUserStation")
+    HttpResult<List<UserLedgerVO>> bindUserStation(@RequestParam("userId")String userId,@RequestParam("stationId")String stationId);
+
+    @PostMapping("/getUserReportByIds")
+    HttpResult<List<NewUserReportVO>> getUserReportByIds(@RequestBody List<String> ids);
+
+    @PostMapping("/getSensitiveUserByDept")
+    @ApiOperation("根据部门获取敏感用户信息")
+    HttpResult<List<UserReportPO>> getSensitiveUserByDept(@RequestBody @Validated SensitiveUserParam param) ;
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/UserLedgerFeignClientFallbackFactory.java

@@ -1,10 +1,12 @@
-package com.njcn.supervision.api.fallback;
+package com.njcn.device.pq.api.fallback;
 
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.supervision.api.UserLedgerFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
+import com.njcn.supervision.pojo.param.SensitiveUserParam;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.supervision.utils.SupervisionEnumUtil;
@@ -52,6 +54,12 @@ public class UserLedgerFeignClientFallbackFactory implements FallbackFactory<Use
                 log.error("{}异常，降级处理，异常为：{}", "根据ids获取非电网侧用户信息", throwable.toString());
                 throw new BusinessException(finalExceptionEnum);
             }
+
+            @Override
+            public HttpResult<List<UserReportPO>> getSensitiveUserByDept(SensitiveUserParam param) {
+                log.error("{}异常，降级处理，异常为：{}", "根据部门获取敏感用户信息异常", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
         };
     }
 }

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/PqSensitiveUserParam.java

@@ -0,0 +1,76 @@
+package com.njcn.device.pq.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2025-12-02
+ * @Description:
+ */
+@Data
+public class PqSensitiveUserParam {
+
+
+
+
+    /**
+     * 敏感用户名称
+     */
+    @NotBlank(message = "用户名称不可为空")
+    @ApiModelProperty(name = "name",value = "用户名称不可为空")
+    private String name;
+
+    /**
+     * 敏感负荷类型
+     */
+    @NotBlank(message = "敏感负荷类型不可为空")
+    @ApiModelProperty(name = "loadType",value = "敏感负荷类型")
+    private String loadType;
+
+    /**
+     * 用户协议容量
+     */
+    @Range(min = 0,max = 10000000 )
+    @ApiModelProperty(name = "userAgreementCapacity",value = "用户协议容量")
+    private Double userAgreementCapacity;
+
+    /**
+     * 装机容量
+     */
+    @Range(min = 0,max = 10000000 )
+    @ApiModelProperty(name = "installedCapacity",value = "装机容量")
+    private Double installedCapacity;
+
+    /**
+     * 所属厂站名称
+     */
+    @NotBlank(message = "所属厂站名称不可为空")
+    @ApiModelProperty(name = "substationName",value = "所属厂站名称")
+    private String substationName;
+
+    /**
+     * 排序
+     */
+    @NotNull(message = "排序不可为空")
+    @ApiModelProperty(name = "sort",value = "排序")
+    private Integer sort;
+
+
+    @Data
+    @EqualsAndHashCode(callSuper = true)
+    public static class UpdatePqSensitiveUserParam extends PqSensitiveUserParam{
+
+        /**
+         * id
+         */
+        @NotBlank(message = "id不可为空")
+        @ApiModelProperty(name = "id",value = "id")
+        private String id;
+    }
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/AreaLineInfoVO.java

@@ -63,6 +63,9 @@ public class AreaLineInfoVO implements Serializable {
     @ApiModelProperty(name = "pt2",value = "pt2")
     private Integer pt2;
 
+    @ApiModelProperty(name = "ptType",value = "接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)")
+    private Integer ptType;
+
     @ApiModelProperty(name = "objName",value = "对象名称")
     private String objName;
 

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/LineInfoMonitorIdVO.java

@@ -0,0 +1,52 @@
+package com.njcn.device.pq.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @author wr
+ * @description
+ * @date 2026/2/2 15:16
+ */
+@Data
+public class LineInfoMonitorIdVO {
+
+    @ApiModelProperty(name = "lineId",value = "监测点id")
+    private String lineId;
+
+    @ApiModelProperty(name = "gdName",value = "供电公司名称")
+    private String gdName;
+
+    @ApiModelProperty(name = "lineName",value = "监测点名称")
+    private String lineName;
+
+    @ApiModelProperty(name = "loadType",value = "干扰源类型")
+    private String loadType;
+
+    @ApiModelProperty(name = "objName",value = "对象名称")
+    private String objName;
+
+    @ApiModelProperty(name = "subName",value = "变电站名称")
+    private String subName;
+
+    @ApiModelProperty(name = "powerSubstationName", value = "电网侧变电站")
+    private String powerSubstationName;
+
+    @ApiModelProperty(name = "deviceId",value = "装置Id")
+    private String deviceId;
+
+    @ApiModelProperty(name = "deviceName",value = "装置名称")
+    private String deviceName;
+
+    @ApiModelProperty(name = "ip",value = "装置ip")
+    private String ip;
+
+    @ApiModelProperty(name = "manufacturer",value = "供应商名称")
+    private String manufacturer;
+
+    @ApiModelProperty(name = "monitorId",value = "国网ID")
+    private String monitorId;
+
+    @ApiModelProperty(name = "powerFlag",value = "电网标志（0-电网侧；1-非电网侧）")
+    private Integer powerFlag;
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/PqSensitiveUserVo.java

@@ -0,0 +1,64 @@
+package com.njcn.device.pq.pojo.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author xy
+ * @since 2025-11-17
+ */
+@Data
+public class PqSensitiveUserVo implements Serializable{
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * id
+     */
+    private String id;
+
+    /**
+     * 敏感用户名称
+     */
+    private String name;
+
+    /**
+     * 敏感负荷类型
+     */
+    private String loadType;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 是否监测
+     */
+    private String isMonitor;
+
+    /**
+     * 是否治理
+     */
+    private String isGovern;
+
+    /**
+     * 用户协议容量
+     */
+    private Double userAgreementCapacity;
+
+    /**
+     * 装机容量
+     */
+    private Double installedCapacity;
+
+    /**
+     * 所属厂站名称
+     */
+    private String substationName;
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/CityDataExcel.java

@@ -0,0 +1,44 @@
+package com.njcn.device.pq.pojo.vo.dataClean;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @version 1.0.0
+ * @author: chenchao
+ * @date: 2022/07/18 11:04
+ */
+@Getter
+@Setter
+@EqualsAndHashCode
+public class CityDataExcel implements Serializable {
+
+
+    @ExcelProperty(value = "单位")
+    private String deptName;
+
+    @ExcelProperty(value = "监测终端数量")
+    private BigDecimal deviceNum;
+
+    @ExcelProperty(value = "监测点个数")
+    private BigDecimal lineNum;
+
+    @ExcelProperty(value = "在线率（%）")
+    private BigDecimal onlineRate;
+
+    @ExcelProperty(value = "完整率（%）")
+    private BigDecimal integrity;
+
+    @ExcelProperty(value = "问题监测点")
+    private BigDecimal abnormalNum;
+
+    @ExcelProperty(value = "问题监测点")
+    private List<String> abnormalList;
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/dataClean/LineDataExcel.java

@@ -0,0 +1,54 @@
+package com.njcn.device.pq.pojo.vo.dataClean;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.EqualsAndHashCode;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @version 1.0.0
+ * @author: chenchao
+ * @date: 2022/07/18 11:04
+ */
+@Getter
+@Setter
+@EqualsAndHashCode
+public class LineDataExcel implements Serializable {
+
+    @ExcelProperty(value = "序号")
+    private BigDecimal lineNum;
+
+    @ExcelProperty(value = "监测点名称")
+    private String lineName;
+
+    @ExcelProperty(value = "所属部门")
+    private String deptName;
+
+    @ExcelProperty(value = "接入电网侧变电站名")
+    private String powerSubstationName;
+
+    @ExcelProperty(value = "监测点对象名称")
+    private String objName;
+
+    @ExcelProperty(value = "装置编号")
+    private String deviceName;
+
+    @ExcelProperty(value = "IP地址")
+    private String ip;
+
+    @ExcelProperty(value = "终端厂家")
+    private String manufacturer;
+
+    @ExcelProperty(value = "在线率")
+    private BigDecimal onlineRate;
+
+    @ExcelProperty(value = "数据完整性")
+    private BigDecimal integrity;
+
+    @ExcelProperty(value = "国网ID")
+    private BigDecimal monitorId;
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/DataLineExcelUtil.java

@@ -0,0 +1,107 @@
+package com.njcn.device.pq.utils;
+
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.ObjUtil;
+import com.alibaba.nacos.shaded.com.google.common.collect.Lists;
+import com.njcn.device.pq.pojo.vo.dataClean.CityDataExcel;
+import com.njcn.device.pq.pojo.vo.dataClean.LineDataExcel;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * @author wr
+ * @description
+ * @date 2026/2/2 10:13
+ */
+public class DataLineExcelUtil {
+
+    /**
+     * 创建监测点信息表头
+     * @param FlyMonitorId
+     * @return
+     */
+    public static List<List<String>> lineHeader(Boolean FlyMonitorId) {
+        List<List<String>> header = new ArrayList<>();
+        header.add(Collections.singletonList("序号"));
+        header.add(Collections.singletonList("监测点名称"));
+        header.add(Collections.singletonList("所属部门"));
+        header.add(Collections.singletonList("接入电网侧变电站名"));
+        header.add(Collections.singletonList("监测点对象名称"));
+        header.add(Collections.singletonList("装置编号"));
+        header.add(Collections.singletonList("IP地址"));
+        header.add(Collections.singletonList("终端厂家"));
+        header.add(Collections.singletonList("在线率"));
+        header.add(Collections.singletonList("数据完整性"));
+        if(FlyMonitorId){
+            header.add(Collections.singletonList("国网ID"));
+        }
+        return header;
+    }
+
+    /**
+     * 监测点信息表头数据写入
+     * @param data
+     * @return
+     */
+    public static List<List<Object>> lineBody(List<LineDataExcel> data) {
+        List<List<Object>> result = new ArrayList<>();
+        if(CollUtil.isNotEmpty(data)){
+            for (LineDataExcel datum : data) {
+                ArrayList<Object> row = Lists.newArrayList(datum.getLineNum(),
+                        datum.getLineName(),
+                        datum.getDeptName(),
+                        datum.getPowerSubstationName(),
+                        datum.getObjName(),
+                        datum.getDeviceName(),
+                        datum.getIp(),
+                        datum.getManufacturer(),
+                        datum.getOnlineRate(),
+                        datum.getIntegrity());
+                if(ObjUtil.isNotNull(datum.getMonitorId())){
+                    row.add(datum.getMonitorId());
+                }
+                result.add(row);
+            }
+        }
+        // 插入一个空行
+        result.add(Collections.emptyList());
+        return result;
+    }
+
+    /**
+     * 创建地市信息表头
+     * @return
+     */
+    public static List<List<String>> cityHeader() {
+        List<List<String>> header = new ArrayList<>();
+        header.add(Collections.singletonList("单位"));
+        header.add(Collections.singletonList("监测终端数量"));
+        header.add(Collections.singletonList("监测点个数"));
+        header.add(Collections.singletonList("在线率（%）"));
+        header.add(Collections.singletonList("完整率（%）"));
+        header.add(Collections.singletonList("问题监测点"));
+        return header;
+    }
+
+    public static List<List<Object>> cityBody(List<CityDataExcel> data) {
+        List<List<Object>> result = new ArrayList<>();
+        if(CollUtil.isNotEmpty(data)){
+            for (CityDataExcel datum : data) {
+                ArrayList<Object> row = Lists.newArrayList(datum.getDeptName(),
+                        datum.getDeviceNum(),
+                        datum.getLineNum(),
+                        datum.getOnlineRate(),
+                        datum.getIntegrity(),
+                        datum.getAbnormalNum());
+            result.add(row);
+            }
+        }
+        // 插入一个空行
+        result.add(Collections.emptyList());
+        return result;
+    }
+
+
+}

pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/utils/FixedDynamicExcelExport.java

@@ -4,12 +4,17 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.write.handler.SheetWriteHandler;
 import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
 import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.metadata.style.WriteFont;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 import com.njcn.device.pq.pojo.vo.dataClean.DataVerifyExcel;
+import org.apache.poi.ss.usermodel.BorderStyle;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
 import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.VerticalAlignment;
 
 import java.io.FileOutputStream;
-import java.io.OutputStream;
 import java.lang.reflect.Field;
 import java.util.*;
 
@@ -57,23 +62,13 @@ public class FixedDynamicExcelExport {
         }
     }
 
-    public static void exportExcelByDataSize(List<DataVerifyExcel> dataList, OutputStream outputStream) {
-        // 步骤1：统计每个字段的有效数据量
+    public static Map<String, List> exportExcelByDataSize(List<DataVerifyExcel> dataList) {
+        Map<String, List> map = new HashMap<>(2);
         Map<String, Integer> fieldCount = countValidData(dataList);
-        // 步骤2：按数据量降序排序字段名
         List<String> sortedFields = sortFields(fieldCount);
-        // 步骤3：构建正确的动态表头
-        List<List<String>> head = buildCorrectHead(sortedFields);
-        // 步骤4：构建对应顺序的行数据
-        List<List<Object>> data = buildRowData(dataList, sortedFields);
-
-        // 步骤5：导出Excel（含列宽设置）
-        EasyExcel.write(outputStream)
-                    .head(head)
-                    .registerWriteHandler(new SimpleColumnWidthStyleStrategy(20))
-                    .registerWriteHandler(new FreezeHeaderHandler()) // 用修复后的表头
-                    .sheet("数据统计")
-                    .doWrite(data);
+        map.put("head", buildCorrectHead(sortedFields));
+        map.put("data", buildRowData(dataList, sortedFields));
+        return map;
     }
 
     public static class FreezeHeaderHandler implements SheetWriteHandler {
@@ -91,6 +86,40 @@ public class FixedDynamicExcelExport {
         }
     }
 
+    public static HorizontalCellStyleStrategy writeCenterStyle() {
+        // 内容的策略
+        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+        //设置 自动换行
+        contentWriteCellStyle.setWrapped(true);
+        //设置 垂直居中
+        contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+        //设置 水平居中
+        contentWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+        //设置边框样式
+        contentWriteCellStyle.setBorderLeft(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderTop(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderRight(BorderStyle.THIN);
+        contentWriteCellStyle.setBorderBottom(BorderStyle.THIN);
+
+        WriteFont bodyWriteFont = new WriteFont();
+        bodyWriteFont.setFontHeightInPoints((short) 11);
+        bodyWriteFont.setBold(false);
+        bodyWriteFont.setFontName("宋体");
+        contentWriteCellStyle.setWriteFont(bodyWriteFont);
+
+        // 头部
+        WriteCellStyle headWriteCellStyle = new WriteCellStyle();
+        // 设置字体居中
+        headWriteCellStyle.setHorizontalAlignment(HorizontalAlignment.CENTER);
+        WriteFont headWriteFont = new WriteFont();
+        // 设置字体大小为20
+        headWriteFont.setFontHeightInPoints((short) 11);
+        headWriteFont.setBold(false);
+        headWriteFont.setFontName("宋体");
+        headWriteCellStyle.setWriteFont(headWriteFont);
+
+        return new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle);
+    }
     // ★ 修复点1：构建正确的表头（每个列名独立成List）
     private static List<List<String>> buildCorrectHead(List<String> allFields) {
         List<List<String>> head = new ArrayList<>();

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/DataVerifyController.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pq.controller;
 
 
+import cn.hutool.core.date.DateUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -155,6 +156,8 @@ public class DataVerifyController extends BaseController {
     public void dataVerifyExcel(HttpServletResponse response, MonitorBaseParam monitorBaseParam) throws IOException {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
+        monitorBaseParam.setSearchBeginTime(DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())).toString());
+        monitorBaseParam.setSearchEndTime(DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())).toString());
         iPqDataVerifyBakService.dataVerifyExcel(response, monitorBaseParam);
 
     }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/PqSensitiveUserController.java

@@ -0,0 +1,113 @@
+package com.njcn.device.pq.controller;
+
+
+import cn.hutool.core.collection.CollUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+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.device.biz.pojo.po.PqSensitiveUser;
+import com.njcn.device.pq.pojo.param.PqSensitiveUserParam;
+import com.njcn.device.pq.pojo.vo.PqSensitiveUserVo;
+import com.njcn.device.pqUser.service.IPqSensitiveUserService;
+import com.njcn.web.controller.BaseController;
+import com.njcn.web.pojo.param.BaseParam;
+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.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author xy
+ * @since 2025-11-17
+ */
+@Slf4j
+@RestController
+@RequestMapping("/pqSensitiveUser")
+@Api(tags = "敏感负荷用户管理")
+@AllArgsConstructor
+public class PqSensitiveUserController extends BaseController {
+
+    private final IPqSensitiveUserService pqSensitiveUserService;
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getList")
+    @ApiOperation("获取敏感负荷用户列表")
+    @ApiImplicitParam(name = "param", value = "查询参数", required = true)
+    public HttpResult<Page<PqSensitiveUserVo>> getList(@RequestBody BaseParam param) {
+        String methodDescribe = getMethodDescribe("getList");
+        Page<PqSensitiveUserVo> page = pqSensitiveUserService.getList(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, page, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getListByIds")
+    @ApiOperation("根据id集合获取敏感负荷用户列表")
+    @ApiImplicitParam(name = "ids", value = "id集合")
+    public HttpResult<List<PqSensitiveUser>> getListByIds(@RequestParam(name = "ids", required = false) List<String> ids) {
+        String methodDescribe = getMethodDescribe("getListByIds");
+        List<PqSensitiveUser> list;
+        list = pqSensitiveUserService.list(
+                new LambdaQueryWrapper<PqSensitiveUser>().in(PqSensitiveUser::getId, ids)
+        );
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 新增用户对象
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
+    @PostMapping("/save")
+    @ApiOperation("新增用户对象")
+    public HttpResult<Boolean> save(@RequestBody @Validated PqSensitiveUserParam pqSensitiveUserParam) {
+        String methodDescribe = getMethodDescribe("save");
+        pqSensitiveUserService.save(pqSensitiveUserParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+    }
+
+    /**
+     * 修改用户对象
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.UPDATE)
+    @PostMapping("/update")
+    @ApiOperation("修改用户对象")
+    public HttpResult<Boolean> update(@RequestBody @Validated PqSensitiveUserParam.UpdatePqSensitiveUserParam pqSensitiveUserParam) {
+        String methodDescribe = getMethodDescribe("update");
+        pqSensitiveUserService.update(pqSensitiveUserParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+    }
+
+
+    /**
+     * 删除用户对象
+     */
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.DELETE)
+    @PostMapping("/delete")
+    @ApiOperation("删除用户对象")
+    @ApiImplicitParam(name = "ids", value = "id集合")
+    public HttpResult<Boolean> delete(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("delete");
+        pqSensitiveUserService.removeByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);
+    }
+
+}
+

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/IDataVerifyService.java

@@ -1,6 +1,5 @@
 package com.njcn.device.pq.service;
 
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
 import com.njcn.device.pq.pojo.po.DataVerify;
@@ -10,7 +9,6 @@ import com.njcn.device.pq.pojo.vo.dataClean.PowerQualityIndicatorsVO;
 import com.njcn.device.pq.pojo.vo.dataClean.VerifyMonitorVO;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>
@@ -22,19 +20,6 @@ import java.util.Map;
  */
 public interface IDataVerifyService extends IService<DataVerify> {
 
-
-    VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam);
-
-    List<PowerQualityIndicatorsVO> getMonitorVerifyDay(MonitorBaseParam monitorBaseParam);
-
-
-    List<DetailAbnormalVO> monitorAbnormalTable(MonitorBaseParam monitorBaseParam);
-
-
-
-    List<DetailAbnormalVO.DetailAbnormalInnerVO> monitorAbnormalTableDetail(MonitorBaseParam monitorBaseParam);
-
-
     VerifyMonitorVO getMonitorLimitData(MonitorBaseParam monitorBaseParam);
 
     List<PowerQualityIndicatorsVO> getMonitorLimitDataDay(MonitorBaseParam monitorBaseParam);
@@ -43,6 +28,5 @@ public interface IDataVerifyService extends IService<DataVerify> {
 
     DetailAbnormalVO.DetailLimitCountVO monitorLimitTableDetail(MonitorBaseParam monitorBaseParam);
 
-
     DetailAbnormalVO.Assess limitTableDetail(MonitorBaseParam monitorBaseParam);
 }

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DataVerifyServiceImpl.java

@@ -31,13 +31,11 @@ import com.njcn.device.pq.mapper.DataVerifyMapper;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
 import com.njcn.device.pq.pojo.po.DataVerify;
 import com.njcn.device.pq.pojo.po.DeptLine;
-import com.njcn.device.pq.pojo.po.PqDataVerifyBak;
 import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.device.pq.pojo.vo.dataClean.*;
 import com.njcn.device.pq.service.CommTerminalService;
 import com.njcn.device.pq.service.IDataVerifyService;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicDataEnum;
@@ -51,7 +49,6 @@ import org.springframework.stereotype.Service;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
@@ -76,7 +73,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
     private final CommTerminalService commTerminalService;
     private final LineMapper lineMapper;
     private final DictTreeFeignClient dictTreeFeignClient;
-    private final UserLedgerFeignClient userLedgerFeignClient;
     private final PqReasonableRangeFeignClient pqReasonableRangeFeignClient;
     private final DataLimitTargetFeignClient dataLimitTargetFeignClient;
     private final DataLimitRateFeignClient dataLimitRateFeignClient;
@@ -86,121 +82,6 @@ public class DataVerifyServiceImpl extends ServiceImpl<DataVerifyMapper, DataVer
     private final DeptLineService deptLineService;
 
 
-    @Override
-    public VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam) {
-        List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
-        if (CollUtil.isEmpty(monitorIds)) {
-            throw new BusinessException(DeviceResponseEnum.QUERY_LINE_DATA_EMPTY);
-        }
-        List<DataVerify> dataVerifyList = commQuery(monitorIds, monitorBaseParam);
-        VerifyMonitorVO verifyMonitorVO = new VerifyMonitorVO();
-        verifyMonitorVO.setRunNum(monitorIds.size());
-        verifyMonitorVO.setAbnormalNum(dataVerifyList.stream().collect(Collectors.groupingBy(DataVerify::getLineId)).size());
-        verifyMonitorVO.setMapList(getRangeAbnormalMonitor(monitorBaseParam, dataVerifyList));
-        verifyMonitorVO.setTargetList(getAbnormalTarget(dataVerifyList));
-        verifyMonitorVO.setMonitorAlarmInfo(getAbnormalTable(dataVerifyList, monitorBaseParam));
-        return verifyMonitorVO;
-    }
-
-    @Override
-    public List<PowerQualityIndicatorsVO> getMonitorVerifyDay(MonitorBaseParam monitorBaseParam) {
-        List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
-        List<DataVerify> dataVerifyList = commQuery(monitorIds, monitorBaseParam);
-        return getAbnormalTable(dataVerifyList, monitorBaseParam);
-    }
-
-    @Override
-    public List<DetailAbnormalVO> monitorAbnormalTable(MonitorBaseParam monitorBaseParam) {
-        List<DetailAbnormalVO> result = new ArrayList<>();
-        List<LineDevGetDTO> lineDetailList = lineMapper.getMonitorListDetail(monitorBaseParam.getMonitorIds());
-        Map<String, LineDevGetDTO> lineDetailMap = lineDetailList.stream().collect(Collectors.toMap(LineDevGetDTO::getPointId, Function.identity()));
-
-        LambdaQueryWrapper<DataVerify> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.between(DataVerify::getTime, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())),
-                        DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchEndTime())))
-                .in(DataVerify::getLineId, monitorBaseParam.getMonitorIds()).orderByAsc(DataVerify::getTime);
-        if (StrUtil.isNotBlank(monitorBaseParam.getTargetKey())) {
-            String[] target = monitorBaseParam.getTargetKey().split(SEPARATOR);
-            lambdaQueryWrapper.eq(DataVerify::getIndexCode, target[0]).eq(DataVerify::getIndexTable, target[1]);
-        }
-        List<DataVerify> dataVerifyList = this.list(lambdaQueryWrapper);
-        Map<String, List<DataVerify>> dataMap = dataVerifyList.stream().collect(Collectors.groupingBy(it -> it.getTime().format(DATE_FORMAT)));
-        dataMap.forEach((dateStr, data) -> {
-            Map<String, List<DataVerify>> lineMap = data.stream().collect(Collectors.groupingBy(DataVerify::getLineId));
-            lineMap.forEach((lineId, lineList) -> {
-                long count = lineList.stream().map(DataVerify::getTime).distinct().count();
-                DetailAbnormalVO detailAbnormalVO = new DetailAbnormalVO();
-                LineDevGetDTO lineDevGetDTO = lineDetailMap.get(lineId);
-                detailAbnormalVO.setTimeSum("");
-                detailAbnormalVO.setDate(dateStr);
-                detailAbnormalVO.setMonitorName(lineDevGetDTO.getPointName());
-                detailAbnormalVO.setMonitorId(lineDevGetDTO.getPointId());
-                detailAbnormalVO.setTargetKey(monitorBaseParam.getTargetKey());
-                result.add(detailAbnormalVO);
-            });
-        });
-        return result;
-    }
-
-    @Override
-    public List<DetailAbnormalVO.DetailAbnormalInnerVO> monitorAbnormalTableDetail(MonitorBaseParam monitorBaseParam) {
-        Map<String, PqReasonableRangeDto> dtoMap = getStandRange();
-
-        List<DetailAbnormalVO.DetailAbnormalInnerVO> result = new ArrayList<>();
-        LambdaQueryWrapper<DataVerify> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.between(DataVerify::getTime, DateUtil.beginOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())), DateUtil.endOfDay(DateUtil.parse(monitorBaseParam.getSearchBeginTime())))
-                .in(DataVerify::getLineId, monitorBaseParam.getMonitorIds()).orderByAsc(DataVerify::getTime);
-        if (StrUtil.isNotBlank(monitorBaseParam.getTargetKey())) {
-            String[] queryTarget = monitorBaseParam.getTargetKey().split(SEPARATOR);
-            lambdaQueryWrapper.eq(DataVerify::getIndexCode, queryTarget[0]).eq(DataVerify::getIndexTable, queryTarget[1]);
-        }
-
-        List<DataVerify> dataVerifyList = this.list(lambdaQueryWrapper);
-        Map<LocalDateTime, List<DataVerify>> listMap = dataVerifyList.stream().collect(Collectors.groupingBy(DataVerify::getTime, TreeMap::new,
-                Collectors.toList()));
-        listMap.forEach((time, timeList) -> {
-            Map<String, List<DataVerify>> indexMap = timeList.stream().collect(Collectors.groupingBy(it -> it.getIndexCode() + SEPARATOR + it.getIndexTable() + SEPARATOR + it.getIndexName()));
-            indexMap.forEach((target, list) -> {
-                String[] temKey = target.split(SEPARATOR);
-                PqReasonableRangeDto pqReasonableRangeDto = dtoMap.get(temKey[0] + SEPARATOR + temKey[1]);
-                String unit;
-                if (StrUtil.isNotBlank(pqReasonableRangeDto.getUnit())) {
-                    unit = pqReasonableRangeDto.getUnit();
-                } else {
-                    unit = "";
-                }
-
-                Map<String, List<DataVerify>> phaseMap = list.stream().collect(Collectors.groupingBy(DataVerify::getPhasicType));
-                phaseMap.forEach((phaseKey, valueList) -> {
-                    DetailAbnormalVO.DetailAbnormalInnerVO vo = new DetailAbnormalVO.DetailAbnormalInnerVO();
-                    vo.setTime(time.format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)));
-                    vo.setTargetName(temKey[2]);
-                    vo.setTargetKey(temKey[0] + temKey[1]);
-                    vo.setPhaseType(phaseKey);
-                    vo.setRangeDesc(pqReasonableRangeDto.getMinValue() + unit + " ~ " + pqReasonableRangeDto.getMaxValue() + unit);
-                    valueList.forEach(it -> {
-                        switch (it.getValueType()) {
-                            case "AVG":
-                                vo.setAvg(it.getAbnormalValue().toString());
-                                break;
-                            case "MAX":
-                                vo.setMax(it.getAbnormalValue().toString());
-                                break;
-                            case "MIN":
-                                vo.setMin(it.getAbnormalValue().toString());
-                                break;
-                            case "CP95":
-                                vo.setCp95(it.getAbnormalValue().toString());
-                                break;
-                        }
-                    });
-                    result.add(vo);
-                });
-            });
-        });
-        return result;
-    }
-
     @Override
     public VerifyMonitorVO getMonitorLimitData(MonitorBaseParam monitorBaseParam) {
         List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java

@@ -29,10 +29,10 @@ import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.service.DeviceRunEvaluateService;
 import com.njcn.device.pq.service.IPqDataVerifyCountService;
 import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
+import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.harmonic.api.RStatLimitRateDClient;
 import com.njcn.harmonic.pojo.param.RStatLimitQueryParam;
 import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -64,7 +64,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
     private final RStatOnlinerateDMapper onLineRateDMapper;
     private final RStatIntegrityDMapper integrityDMapper;
     private final LineMapper lineMapper;
-    private final UserLedgerFeignClient userLedgerFeignClient;
+    private final UserLedgerService userLedgerService;
     private final DeptLineService deptLineService;
     private final GeneralDeviceService deviceService;
     private final OnLineRateMapper onLineRateMapper;
@@ -523,7 +523,7 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService {
 
 
     private Map<String, NewUserReportVO> getUserLedgerByObjIds(List<String> objIds) {
-        List<NewUserReportVO> userReportVOList = userLedgerFeignClient.getUserReportByIds(objIds).getData();
+        List<NewUserReportVO> userReportVOList = userLedgerService.getUserReportByIds(objIds);
         return userReportVOList.stream().collect(Collectors.toMap(NewUserReportVO::getId, Function.identity()));
     }
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineIntegrityDataServiceImpl.java

@@ -3,7 +3,6 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.njcn.common.config.GeneralInfo;
@@ -28,8 +27,8 @@ import com.njcn.device.pq.pojo.vo.RStatIntegrityVO;
 import com.njcn.device.pq.service.LineIntegrityDataService;
 import com.njcn.device.pq.utils.DataStatisticsUtil;
 import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
+import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.harmonic.pojo.vo.IntegrityIconVO;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.pojo.enums.StatisticsEnum;
@@ -38,8 +37,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.text.Collator;
 import java.util.*;
 import java.util.function.Function;
@@ -59,18 +56,12 @@ import java.util.stream.Stream;
 public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataMapper, LineIntegrityDataVO> implements LineIntegrityDataService {
 
     private final LineIntegrityDataMapper lineIntegrityDataMapper;
-
     private final AlarmClient alarmClient;
-
     private final GeneralDeviceService generalDeviceService;
-
     private final RStatIntegrityDMapper rStatIntegrityDMapper;
-
     private final GeneralInfo generalInfo;
-
     private final GeneralDeviceInfoClient generalDeviceInfoClient;
-
-    private final UserLedgerFeignClient userLedgerFeignClient;
+    private final UserLedgerService userLedgerService;
 
     /**
      * 监测点数据完整性
@@ -88,7 +79,7 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
         if (CollectionUtil.isNotEmpty(generalDeviceDTOList)) {
             Map<String, UserLedgerVO> userLedgerVOMap;
             if (lineIntegrityDataParam.isUserLedger()) {
-                List<UserLedgerVO> userLedgerVOList = userLedgerFeignClient.selectUserList(new UserReportParam()).getData();
+                List<UserLedgerVO> userLedgerVOList = userLedgerService.selectUserList(new UserReportParam());
                 userLedgerVOMap = userLedgerVOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
             } else {
                 userLedgerVOMap = new HashMap<>();
@@ -101,12 +92,7 @@ public class LineIntegrityDataServiceImpl extends ServiceImpl<LineIntegrityDataM
             if (CollectionUtil.isEmpty(alarmStrategyVos)) {
                 throw new BusinessException(DeviceResponseEnum.QUERY_ALARMSTRATEGY_DATA_EMPTY);
             }
-            List<AlarmStrategyVO> alarmAlgoDescribe = lineIntegrityDataMapper.getAlarmAlgoDescribe(alarmStrategyVos);
-            Map<Integer, Integer> mapAlarm = alarmAlgoDescribe.stream().collect(Collectors.toMap(AlarmStrategyVO::getAlgoDescribe, AlarmStrategyVO::getIntegrityValue));
-
             Map<String, Integer> mapA = alarmStrategyVos.stream().collect(Collectors.toMap(AlarmStrategyVO::getId, AlarmStrategyVO::getIntegrityValue));
-
-
             // 遍历集合
             for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) {
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java

@@ -4,6 +4,7 @@ package com.njcn.device.pq.service.impl;
 import cn.hutool.core.codec.Base64;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.*;
+import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.json.JSONArray;
@@ -11,38 +12,49 @@ import cn.hutool.json.JSONConfig;
 import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONTokener;
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.WriteTable;
+import com.alibaba.excel.write.style.column.SimpleColumnWidthStyleStrategy;
 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.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.dataProcess.api.PqReasonableRangeFeignClient;
 import com.njcn.dataProcess.enums.DataCleanEnum;
 import com.njcn.dataProcess.param.DataCleanParam;
 import com.njcn.dataProcess.pojo.dto.PqReasonableRangeDto;
+import com.njcn.device.common.mapper.onlinerate.OnLineRateMapper;
+import com.njcn.device.common.service.GeneralDeviceService;
 import com.njcn.device.line.mapper.LineMapper;
 import com.njcn.device.line.service.DeptLineService;
 import com.njcn.device.pq.constant.Param;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.mapper.PqDataVerifyBakMapper;
+import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
+import com.njcn.device.pq.pojo.param.DeviceInfoParam;
+import com.njcn.device.pq.pojo.param.OnlineRateParam;
 import com.njcn.device.pq.pojo.param.dataClean.MonitorBaseParam;
 import com.njcn.device.pq.pojo.po.DeptLine;
 import com.njcn.device.pq.pojo.po.PqDataVerifyBak;
-import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
-import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
+import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.pq.pojo.vo.dataClean.*;
 import com.njcn.device.pq.service.CommTerminalService;
 import com.njcn.device.pq.service.IPqDataVerifyBakService;
+import com.njcn.device.pq.utils.DataLineExcelUtil;
+import com.njcn.device.rstatintegrity.mapper.RStatIntegrityDMapper;
 import com.njcn.oss.utils.FileStorageUtil;
-import com.njcn.poi.excel.ExcelUtil;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.system.api.DictTreeFeignClient;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
@@ -52,6 +64,7 @@ import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 import static com.njcn.device.pq.utils.FixedDynamicExcelExport.exportExcelByDataSize;
+import static com.njcn.device.pq.utils.FixedDynamicExcelExport.writeCenterStyle;
 
 /**
  * <p>
@@ -72,9 +85,11 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
     private final PqReasonableRangeFeignClient pqReasonableRangeFeignClient;
     private final LineMapper lineMapper;
     private final DictTreeFeignClient dictTreeFeignClient;
-    private final UserLedgerFeignClient userLedgerFeignClient;
     private final FileStorageUtil fileStorageUtil;
     private final DeptLineService deptLineService;
+    private final GeneralDeviceService deviceService;
+    private final RStatIntegrityDMapper integrityDMapper;
+    private final OnLineRateMapper onLineRateMapper;
 
     @Override
     public VerifyMonitorVO getMonitorVerifyData(MonitorBaseParam monitorBaseParam) {
@@ -180,6 +195,9 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
     @Override
     public List<PowerQualityIndicatorsVO> getMonitorVerifyDay(MonitorBaseParam monitorBaseParam) {
         List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
+        if(CollectionUtils.isEmpty(monitorIds)){
+            return new ArrayList<>();
+        }
         List<PqDataVerifyBak> dataVerifyList = baseDataVerifyQuery(monitorIds, monitorBaseParam);
         return getAbnormalTable(dataVerifyList, monitorBaseParam);
     }
@@ -373,37 +391,225 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
     @Override
     public void dataVerifyExcel(HttpServletResponse response, MonitorBaseParam monitorBaseParam) throws IOException {
         if (StrUtil.isNotBlank(monitorBaseParam.getDeptId())) {
-            List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
-            monitorBaseParam.setMonitorIds(monitorIds);
-        }
-        List<DataVerifyExcel> dataVerifyExcels = this.baseMapper.selectDataVerifySum(monitorBaseParam);
-        List<String> ids = dataVerifyExcels.stream().map(DataVerifyExcel::getLineId).collect(Collectors.toList());
-        List<AreaLineInfoVO> areaLineInfoVOList = lineMapper.getBaseLineAreaInfo(ids, null, null);
-        Map<String, AreaLineInfoVO> map = areaLineInfoVOList.stream().collect(Collectors.toMap(AreaLineInfoVO::getLineId, Function.identity()));
-        for (DataVerifyExcel dataVerifyExcel : dataVerifyExcels) {
-            if (map.containsKey(dataVerifyExcel.getLineId())) {
-                AreaLineInfoVO areaLineInfoVO = map.get(dataVerifyExcel.getLineId());
-                dataVerifyExcel.setCity(areaLineInfoVO.getGdName());
-                dataVerifyExcel.setLineName(areaLineInfoVO.getLineName());
-                dataVerifyExcel.setLoadType(areaLineInfoVO.getLoadType());
-                dataVerifyExcel.setObjName(areaLineInfoVO.getObjName());
-                dataVerifyExcel.setStationName(areaLineInfoVO.getSubName());
-                dataVerifyExcel.setPowerSubstationName(areaLineInfoVO.getPowerSubstationName());
-                dataVerifyExcel.setDevName(areaLineInfoVO.getDeviceName());
-                dataVerifyExcel.setIp(areaLineInfoVO.getIp());
-                dataVerifyExcel.setManufacturer(areaLineInfoVO.getManufacturer());
+            DeviceInfoParam param = new DeviceInfoParam();
+            param.setDeptIndex(monitorBaseParam.getDeptId());
+            param.setStatisticalType(new SimpleDTO());
+            //获取终端台账类信息
+            List<GeneralDeviceDTO> deviceInfo = deviceService.getDeviceInfo(param, Arrays.asList(0), Arrays.asList(1));
+            List<String> lineIds = deviceInfo.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList());
+            List<String> devIds = deviceInfo.stream().flatMap(x -> x.getDeviceIndexes().stream()).distinct().collect(Collectors.toList());
+            List<LineInfoMonitorIdVO> areaLineInfoVOList = lineMapper.getBaseLineInfoMonitorIdInfo(lineIds);
+            List<LineInfoMonitorIdVO> monitorLine = areaLineInfoVOList.stream().filter(x -> StrUtil.isNotBlank(x.getMonitorId())).collect(Collectors.toList());
+            List<LineInfoMonitorIdVO> gridSide = areaLineInfoVOList.stream().filter(x -> x.getPowerFlag() == 0).collect(Collectors.toList());
+            List<LineInfoMonitorIdVO> nonGridSide = areaLineInfoVOList.stream().filter(x -> x.getPowerFlag() == 1).collect(Collectors.toList());
+
+            OnlineRateParam onlineRateParam = new OnlineRateParam();
+            onlineRateParam.setIds(devIds);
+            onlineRateParam.setStartTime(monitorBaseParam.getSearchBeginTime());
+            onlineRateParam.setEndTime(monitorBaseParam.getSearchEndTime());
+            //完整率
+            List<RStatIntegrityVO> integrityList = integrityDMapper.getLineIntegrityRateInfo(lineIds,
+                    monitorBaseParam.getSearchBeginTime(),
+                    monitorBaseParam.getSearchEndTime());
+            //获取所有终端在线率
+            List<RStatOnlineRateVO> onlineRateByDev = onLineRateMapper.getOnlineRateByDevIds(onlineRateParam);
+            List<CityDataExcel> cityData1 = new ArrayList<>();
+            List<CityDataExcel> cityData2 = new ArrayList<>();
+            List<CityDataExcel> cityData3 = new ArrayList<>();
+            for (GeneralDeviceDTO dto : deviceInfo) {
+                cityData1.add(addCityDataExcel(dto, monitorLine, onlineRateByDev, integrityList));
+                cityData2.add(addCityDataExcel(dto, gridSide, onlineRateByDev, integrityList));
+                cityData3.add(addCityDataExcel(dto, nonGridSide, onlineRateByDev, integrityList));
             }
+            monitorBaseParam.setMonitorIds(lineIds);
+            List<DataVerifyExcel> dataVerifyExcels = this.baseMapper.selectDataVerifySum(monitorBaseParam);
+            Map<String, LineInfoMonitorIdVO> lineInfomap = areaLineInfoVOList.stream().collect(Collectors.toMap(LineInfoMonitorIdVO::getLineId, Function.identity()));
+            for (DataVerifyExcel dataVerifyExcel : dataVerifyExcels) {
+                if (lineInfomap.containsKey(dataVerifyExcel.getLineId())) {
+                    LineInfoMonitorIdVO areaLineInfoVO = lineInfomap.get(dataVerifyExcel.getLineId());
+                    dataVerifyExcel.setCity(areaLineInfoVO.getGdName());
+                    dataVerifyExcel.setLineName(areaLineInfoVO.getLineName());
+                    dataVerifyExcel.setLoadType(areaLineInfoVO.getLoadType());
+                    dataVerifyExcel.setObjName(areaLineInfoVO.getObjName());
+                    dataVerifyExcel.setStationName(areaLineInfoVO.getSubName());
+                    dataVerifyExcel.setPowerSubstationName(areaLineInfoVO.getPowerSubstationName());
+                    dataVerifyExcel.setDevName(areaLineInfoVO.getDeviceName());
+                    dataVerifyExcel.setIp(areaLineInfoVO.getIp());
+                    dataVerifyExcel.setManufacturer(areaLineInfoVO.getManufacturer());
+                }
+            }
+            dataVerifyExcels.sort(Comparator
+                    .comparing(DataVerifyExcel::getAllTime, Comparator.reverseOrder())
+                    .thenComparing((DataVerifyExcel item) -> item.getCity() + "_" + item.getStationName() + "_" + item.getDevName())
+            );
+            Map<String, List> map = exportExcelByDataSize(dataVerifyExcels);
+            // 步骤5：导出Excel（含列宽设置）
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream())
+                    .registerWriteHandler(new SimpleColumnWidthStyleStrategy(20))
+                    .registerWriteHandler(writeCenterStyle()).build();
+            WriteSheet writeSheet0 = EasyExcel.writerSheet("监测点异常指标统计").build();
+            WriteTable writeTable0 = EasyExcel.writerTable(0).needHead(Boolean.TRUE).head(map.get("head")).build();
+            excelWriter.write(map.get("data"), writeSheet0, writeTable0);
+
+            Map<Integer, List<CityDataExcel>> cityData = new HashMap<>();
+            cityData.put(1, cityData1);
+            cityData.put(2, cityData2);
+            cityData.put(3, cityData3);
+
+            Map<Integer, List<LineDataExcel>> lineData = new HashMap<>();
+            addLineDataExcel(cityData1, areaLineInfoVOList, onlineRateByDev, integrityList, lineData, 1);
+            addLineDataExcel(cityData2, areaLineInfoVOList, onlineRateByDev, integrityList, lineData, 2);
+            addLineDataExcel(cityData3, areaLineInfoVOList, onlineRateByDev, integrityList, lineData, 3);
+
+            excelExtracted(excelWriter, "数据质量", new HashMap<>(), cityData, true);
+            excelExtracted(excelWriter, "数据质量表格", lineData, new HashMap<>(), false);
+            excelWriter.finish();
+        }
+    }
+
+    private void addLineDataExcel(List<CityDataExcel> cityData1, List<LineInfoMonitorIdVO> areaLineInfoVOList, List<RStatOnlineRateVO> onlineRateByDev, List<RStatIntegrityVO> integrityList, Map<Integer, List<LineDataExcel>> lineData, Integer num) {
+        List<LineDataExcel> lineDataExcels1 = new ArrayList<>();
+        List<String> lineData1 = cityData1.stream().flatMap(x -> x.getAbnormalList().stream()).collect(Collectors.toList());
+        List<LineInfoMonitorIdVO> lineInfoData1 = areaLineInfoVOList.stream().filter(x -> lineData1.contains(x.getLineId())).collect(Collectors.toList());
+        LineDataExcel lineDataExcel;
+        for (int i = 0; i < lineInfoData1.size(); i++) {
+            LineInfoMonitorIdVO dto = lineInfoData1.get(i);
+            lineDataExcel = new LineDataExcel();
+            lineDataExcel.setLineNum(BigDecimal.valueOf((i + 1)));
+            lineDataExcel.setLineName(dto.getLineName());
+            lineDataExcel.setDeptName(dto.getDeviceName());
+            lineDataExcel.setPowerSubstationName(dto.getPowerSubstationName());
+            lineDataExcel.setObjName(dto.getObjName());
+            lineDataExcel.setDeviceName(dto.getDeviceName());
+            lineDataExcel.setIp(dto.getIp());
+            lineDataExcel.setManufacturer(dto.getManufacturer());
+            lineDataExcel.setOnlineRate(onLineRate(onlineRateByDev, Arrays.asList(dto.getDeviceId())));
+            lineDataExcel.setIntegrity(integrity(integrityList, Arrays.asList(dto.getLineId())));
+            if (num == 1) {
+                lineDataExcel.setMonitorId(new BigDecimal(dto.getMonitorId()));
+            }
+            lineDataExcels1.add(lineDataExcel);
+        }
+        lineData.put(num, lineDataExcels1);
+    }
+
+
+    private CityDataExcel addCityDataExcel(GeneralDeviceDTO dto, List<LineInfoMonitorIdVO> monitorLine, List<RStatOnlineRateVO> onlineRateByDev, List<RStatIntegrityVO> integrityList) {
+        CityDataExcel data = new CityDataExcel();
+        List<String> monitorLineList = monitorLine.stream()
+                .filter(x -> dto.getLineIndexes().contains(x.getLineId()))
+                .map(LineInfoMonitorIdVO::getLineId)
+                .distinct()
+                .collect(Collectors.toList());
+        List<String> devList = monitorLine.stream()
+                .filter(x -> dto.getDeviceIndexes().contains(x.getDeviceId()))
+                .map(LineInfoMonitorIdVO::getDeviceId)
+                .distinct()
+                .collect(Collectors.toList());
+        data.setDeptName(dto.getName());
+        data.setDeviceNum(BigDecimal.valueOf(devList.size()));
+        data.setLineNum(BigDecimal.valueOf(monitorLineList.size()));
+        data.setOnlineRate(onLineRate(onlineRateByDev, devList));
+        data.setIntegrity(integrity(integrityList, monitorLineList));
+        List<String> abnormalList = integrityList.stream()
+                .filter(x -> ObjUtil.isNotNull(x.getIntegrityRate()))
+                .filter(x -> x.getIntegrityRate().compareTo(BigDecimal.ZERO) == 0)
+                .filter(x -> monitorLineList.contains(x.getLineIndex()))
+                .map(RStatIntegrityVO::getLineIndex)
+                .distinct()
+                .collect(Collectors.toList());
+        data.setAbnormalNum(BigDecimal.valueOf(abnormalList.size()));
+        data.setAbnormalList(abnormalList);
+        return data;
+    }
+
+    private BigDecimal integrity(List<RStatIntegrityVO> integrityList, List<String> lineIds) {
+        //监测完整率
+        List<RStatIntegrityVO> integrityDS = integrityList.stream().filter(x -> lineIds.contains(x.getLineIndex())).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(integrityDS)) {
+            double realTime = integrityDS.stream().mapToDouble(RStatIntegrityVO::getRealTime).sum();
+            double dueTime = integrityDS.stream().mapToDouble(RStatIntegrityVO::getDueTime).sum();
+            if (dueTime == 0) {
+                return new BigDecimal(0);
+            }
+            return NumberUtil.round(Math.min(realTime * 100.0 / dueTime, 100), 2);
+        } else {
+            return new BigDecimal(0);
+        }
+    }
+
+    private BigDecimal onLineRate(List<RStatOnlineRateVO> onlineRateByDev, List<String> devIds) {
+        //终端在线率
+        List<RStatOnlineRateVO> onlineRateDS = onlineRateByDev.stream().filter(x -> devIds.contains(x.getDevIndex())).collect(Collectors.toList());
+        if (CollUtil.isNotEmpty(onlineRateDS)) {
+            double onlineTime = onlineRateDS.stream().mapToDouble(RStatOnlineRateVO::getOnlineMin).sum();
+            double offlineTime = onlineRateDS.stream().mapToDouble(RStatOnlineRateVO::getOfflineMin).sum();
+            if ((onlineTime + offlineTime) == 0) {
+                return new BigDecimal(0);
+            }
+            return NumberUtil.round(Math.min(onlineTime * 100.0 / (onlineTime + offlineTime), 100), 2);
+        } else {
+            return new BigDecimal(0);
+        }
+    }
+
+    private void excelExtracted(ExcelWriter excelWriter, String sheetName, Map<Integer, List<LineDataExcel>> lineData, Map<Integer, List<CityDataExcel>> cityData, Boolean fly) {
+        // 构建sheet页--表示不加表头
+        WriteSheet writeSheet = EasyExcel.writerSheet(sheetName).needHead(Boolean.FALSE).build();
+        // 表头的数量
+        int num = 0;
+        Boolean first = false;
+        // 模拟写5张表
+        for (int i = 1; i < 4; i++) {
+            String name = "";
+            if (i == 1) {
+                if (fly) {
+                    name = "一类监测点";
+                } else {
+                    name = "冀北公司一类监测点数据质量问题";
+                }
+                first = true;
+            }
+            if (i == 2) {
+                if (fly) {
+                    name = "电网侧";
+                } else {
+                    name = "冀北公司电网侧监测点数据质量问题（不包含一类监测点）";
+                }
+                first = false;
+            }
+            if (i == 3) {
+                if (fly) {
+                    name = "非电网侧";
+                } else {
+                    name = "冀北公司非电网侧问题监测点（不包含一类监测点）";
+                }
+                first = false;
+            }
+            String finalName = name;
+            List<List<String>> contentHeader;
+            if (fly) {
+                contentHeader = DataLineExcelUtil.cityHeader();
+            } else {
+                contentHeader = DataLineExcelUtil.lineHeader(first);
+            }
+            List<List<String>> nameHeader = contentHeader.stream().map(item -> Collections.singletonList(finalName)).collect(Collectors.toList());
+            // 这里必须指定需要头，table 会继承sheet的配置，sheet配置了不需要，table 默认也是不需要
+            // 创建一个表头
+            WriteTable writeTable1 = EasyExcel.writerTable(num).needHead(Boolean.TRUE).head(nameHeader).build();
+            excelWriter.write(new ArrayList<>(), writeSheet, writeTable1);
+            //创建数据
+            WriteTable writeTable2 = EasyExcel.writerTable(num + 1).needHead(Boolean.TRUE).head(contentHeader).build();
+            List<List<Object>> body;
+            if (fly) {
+                body = DataLineExcelUtil.cityBody(cityData.get(i));
+            } else {
+                body = DataLineExcelUtil.lineBody(lineData.get(i));
+            }
+            excelWriter.write(body, writeSheet, writeTable2);
+            // 插入两次表头加2
+            num = num + 2;
         }
-        dataVerifyExcels.sort(Comparator
-                .comparing(DataVerifyExcel::getAllTime, Comparator.reverseOrder())
-                .thenComparing((DataVerifyExcel item) -> item.getCity() + "_" + item.getStationName()+"_"+item.getDevName())
-        );
-        exportExcelByDataSize(dataVerifyExcels,response.getOutputStream());
-//        Set<String> excludeColumnFiledNames = new HashSet<>(1);
-//        excludeColumnFiledNames.add("lineId");
-//        EasyExcel.write(response.getOutputStream(), DataVerifyExcel.class)
-//                .excludeColumnFiledNames(excludeColumnFiledNames).sheet("sheet")
-//                .doWrite(dataVerifyExcels);
     }
 
 

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/RunManageServiceImpl.java

@@ -25,7 +25,7 @@ import com.njcn.device.pq.pojo.vo.RunManageVO;
 import com.njcn.device.pq.pojo.vo.RunTimeVO;
 import com.njcn.device.pq.pojo.vo.TerminalLedgerVO;
 import com.njcn.device.pq.service.RunManageService;
-import com.njcn.supervision.api.UserLedgerFeignClient;
+import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataTypeEnum;
@@ -70,7 +70,7 @@ public class RunManageServiceImpl implements RunManageService {
 
     private final LineDetailMapper lineDetailMapper;
 
-    private final UserLedgerFeignClient userLedgerFeignClient;
+    private final UserLedgerService userLedgerService;
 
     @Override
     public List<RunManageVO> getLineLedger(RunManageParam runManageParam) {
@@ -89,7 +89,7 @@ public class RunManageServiceImpl implements RunManageService {
             resultList = deviceMapper.getRunManageList(lineIndexes, runManageParam.getComFlag(),Objects.isNull(runManageParam.getRunFlag())?new ArrayList<>():runManageParam.getRunFlag(), Objects.isNull(runManageParam.getSearchValue())?null:runManageParam.getSearchValue());
             if(CollUtil.isNotEmpty(resultList)){
                 List<String> objIds = resultList.stream().map(RunManageVO::getObjId).collect(Collectors.toList());
-                Map<String,NewUserReportVO> runManageVOMap = userLedgerFeignClient.getUserReportByIds(objIds).getData().stream().collect(Collectors.toMap(NewUserReportVO::getId,Function.identity()));
+                Map<String,NewUserReportVO> runManageVOMap = userLedgerService.getUserReportByIds(objIds).stream().collect(Collectors.toMap(NewUserReportVO::getId,Function.identity()));
                 resultList.forEach(it->{
                     if(StrUtil.isNotBlank(it.getObjId())){
                         if(runManageVOMap.containsKey(it.getObjId())){

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalTreeServiceImpl.java

@@ -23,14 +23,13 @@ import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.DeptLineTreeVO;
 import com.njcn.device.pq.pojo.vo.TerminalTree;
 import com.njcn.device.pq.service.TerminalTreeService;
-import com.njcn.supervision.api.UserLedgerFeignClient;
+import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.pojo.enums.StatisticsEnum;
 import com.njcn.system.pojo.po.Area;
 import com.njcn.user.api.DeptFeignClient;
-import com.njcn.user.pojo.po.Dept;
 import com.njcn.web.utils.RequestUtil;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -66,7 +65,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
 
     private final TreeMapper treeMapper;
 
-    private final UserLedgerFeignClient userLedgerFeignClient;
+    private final UserLedgerService userLedgerService;
 
     /**
      * 台账页面终端树
@@ -114,7 +113,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
 
 
         UserReportParam userReportParam = new UserReportParam();
-        List<UserLedgerVO> userReportPOList = userLedgerFeignClient.selectUserList(userReportParam).getData();
+        List<UserLedgerVO> userReportPOList = userLedgerService.selectUserList(userReportParam);
         userReportPOList = userReportPOList.stream().filter(it -> StrUtil.isNotBlank(it.getStationId())).collect(Collectors.toList());
         Map<String, List<UserLedgerVO>> userMap = userReportPOList.stream().collect(Collectors.groupingBy(UserLedgerVO::getStationId));
 
@@ -272,7 +271,7 @@ public class TerminalTreeServiceImpl implements TerminalTreeService {
             } else {
                 // 获取用户
                 UserReportParam userReportParam = new UserReportParam();
-                List<UserLedgerVO> userReportPOList = userLedgerFeignClient.selectUserList(userReportParam).getData();
+                List<UserLedgerVO> userReportPOList = userLedgerService.selectUserList(userReportParam);
                 userReportPOList = userReportPOList.stream().filter(it -> StrUtil.isNotBlank(it.getStationId())).collect(Collectors.toList());
                 Map<String, UserLedgerVO> userMap = userReportPOList.stream().collect(Collectors.toMap(UserLedgerVO::getId, Function.identity()));
 

pqs-device/pq-device/pq-device-com/pom.xml

@@ -29,12 +29,7 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.njcn</groupId>
-            <artifactId>supervision-api</artifactId>
-            <version>1.0.0</version>
-            <scope>compile</scope>
-        </dependency>
+
         <dependency>
             <groupId>com.njcn</groupId>
             <artifactId>common-oss</artifactId>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/common/service/impl/TerminalBaseServiceImpl.java

@@ -7,6 +7,7 @@ import cn.afterturn.easypoi.excel.entity.ImportParams;
 import cn.afterturn.easypoi.excel.entity.result.ExcelImportResult;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.text.StrBuilder;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -60,6 +61,7 @@ import com.njcn.device.pq.utils.DeviceUtil;
 import com.njcn.device.substation.mapper.SubstationMapper;
 import com.njcn.device.subvoltage.mapper.VoltageMapper;
 import com.njcn.device.terminal.mapper.PqsTerminalLogsMapper;
+import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.device.utils.ExcelStyleUtil;
 import com.njcn.message.api.ProduceFeignClient;
 import com.njcn.message.constant.DeviceRebootType;
@@ -72,7 +74,6 @@ import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.poi.excel.ExcelUtil;
 import com.njcn.poi.util.PoiUtil;
 import com.njcn.redis.utils.RedisUtil;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
@@ -96,10 +97,10 @@ import org.springframework.util.CollectionUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
-import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -138,7 +139,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
     private final NodeDeviceService nodeDeviceService;
     private final DeviceProcessService deviceProcessService;
     private final ProduceFeignClient produceFeignClient;
-    private final UserLedgerFeignClient userLedgerFeignClient;
+    private final UserLedgerService userLedgerService;
 
     @Value("${oracle.isSync}")
     private Boolean isSync;
@@ -681,6 +682,9 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
                     BeanUtils.copyProperties(updateDeviceParam, deviceDetail);
                     deviceDetail.setId(updateDeviceParam.getDevIndex());
                     coderM3d(deviceDetail, true);
+                    deviceDetail.setLoginTime(LocalDate.parse(updateDeviceParam.getLoginTime(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
+                    deviceDetail.setThisTimeCheck(LocalDate.parse(updateDeviceParam.getThisTimeCheck(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
+                    deviceDetail.setNextTimeCheck(LocalDate.parse(updateDeviceParam.getNextTimeCheck(), DateTimeFormatter.ofPattern(DatePattern.NORM_DATE_PATTERN)));
 
                     this.updateById(device);
                     deviceMapper.updateById(deviceDetail);
@@ -984,7 +988,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
         Line obj;
         if (level == 700) {
             obj = new Line();
-            UserLedgerVO userLedgerVO = userLedgerFeignClient.selectUserInfo(id).getData();
+            UserLedgerVO userLedgerVO = userLedgerService.selectUserInfo(id);
             if (Objects.nonNull(userLedgerVO)) {
                 obj.setId(userLedgerVO.getId());
                 obj.setLevel(LineBaseEnum.USER_LEVEL.getCode());

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/LineMapper.java

@@ -216,6 +216,8 @@ public interface LineMapper extends BaseMapper<Line> {
      */
     List<AreaLineInfoVO> getBaseLineAreaInfo(@Param("list") List<String> lineIndex, @Param("searchValue") String searchValue, @Param("comFlag") Integer comFlag);
 
+    List<LineInfoMonitorIdVO> getBaseLineInfoMonitorIdInfo(@Param("list") List<String> lineIndex);
+
     /**
      * 返回监测点信息及通讯状态
      *

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml

@@ -557,6 +557,7 @@
         detail.ct2,
         detail.pt1,
         detail.pt2,
+        detail.PT_Type as ptType,
         detail.obj_name,
         detail.Dev_Capacity deviceCapacity,
         detail.Short_Capacity,
@@ -1512,17 +1513,9 @@
     <select id="getCustomDetailByLineId" resultType="map">
         SELECT
             line.id AS lineId,
-            CONCAT(sub.NAME, '_', vo.NAME, '_', line.NAME) AS lineName,
-            CONCAT(
-                    IFNULL(CAST(detail.pt1 AS VARCHAR), 'N/A'),
-                    ':',
-                    IFNULL(CAST(detail.pt2 AS VARCHAR), 'N/A')
-            ) AS pt,
-            CONCAT(
-                    IFNULL(CAST(detail.ct1 AS VARCHAR), 'N/A'),
-                    ':',
-                    IFNULL(CAST(detail.ct2 AS VARCHAR), 'N/A')
-            ) AS ct,
+            CONCAT(CONCAT(CONCAT(sub.NAME, '_'), vo.NAME), CONCAT('_', line.NAME)) AS lineName,
+            CONCAT(CONCAT(COALESCE(detail.pt1, 'N/A'), ':'), COALESCE(detail.pt2, 'N/A')) AS pt,
+            CONCAT(CONCAT(COALESCE(detail.ct1, 'N/A'), ':'), COALESCE(detail.ct2, 'N/A')) AS ct,
             detail.Dev_Capacity AS Dev_Capacity,
             detail.Short_Capacity AS Short_Capacity,
             detail.Standard_Capacity AS Standard_Capacity,
@@ -1541,6 +1534,7 @@
         WHERE
             line.id = #{lineId}
     </select>
+
     <select id="selectByIds" resultType="com.njcn.device.pq.pojo.vo.LineDetailVO$Detail">
         SELECT DISTINCT
             line.id as lineId,
@@ -1949,5 +1943,83 @@
             </foreach>
 
     </select>
+    <select id="getBaseLineInfoMonitorIdInfo" resultType="com.njcn.device.pq.pojo.vo.LineInfoMonitorIdVO">
+        SELECT
+        line.Id lineId,
+        line.Name lineName,
+        gd.Name gdName,
+        substation.id subId,
+        substation.Name subName,
+        subscale.name subScale,
+        device.id deviceId,
+        device.name deviceName,
+        pqdevice.IP ip,
+        factory.Name manufacturer,
+        voltage.id voltageId,
+        voltage.Name voltageName,
+        scale.Name voltageScale,
+        pqdevice.run_flag,
+        pqdevice.com_flag,
+        pqsubstation.Lng,
+        pqsubstation.lat,
+        detail.num,
+        detail.ct1,
+        detail.ct2,
+        detail.pt1,
+        detail.pt2,
+        detail.obj_name,
+        detail.Dev_Capacity deviceCapacity,
+        detail.Short_Capacity,
+        detail.Standard_Capacity,
+        detail.Deal_Capacity,
+        detail.Business_Type businessType,
+        detail.Calssification_Grade,
+        detail.Superiors_Substation,
+        detail.Hang_Line,
+        loadtype.name loadType,
+        detail.New_Station_Id as newStationId,
+        detail.obj_id,
+        detail.big_obj_type,
+        detail.small_obj_type,
+        detail.Power_Flag powerFlag,
+        detail.Power_Substation_Name powerSubstationName,
+        detail.Monitor_Id monitorId
+
+        FROM
+        pq_line line,
+        pq_line_detail detail,
+        pq_line voltage,
+        pq_voltage pqvoltage,
+        pq_line device,
+        pq_device pqdevice,
+        pq_line substation,
+        pq_substation pqsubstation,
+        pq_line gd,
+        sys_dict_data scale,
+        sys_dict_data factory,
+        sys_dict_data loadtype,
+        sys_dict_data subscale
+        WHERE
+        line.id = detail.id
+        AND line.pid = voltage.id
+        AND voltage.id = pqvoltage.id
+        AND pqvoltage.Scale = scale.id
+        AND voltage.pid = device.id
+        AND voltage.pid = pqdevice.id
+        AND pqdevice.Manufacturer = factory.id
+        AND device.pid = substation.id
+        AND substation.id = pqsubstation.id
+        AND pqsubstation.scale = subscale.id
+        AND substation.pid = gd.id
+        AND detail.load_type = loadtype.id
+        <if test="list !=null  and list.size() >0">
+            AND line.Id IN
+            <foreach item="item" collection="list" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+
+
+    </select>
 
 </mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/DeptLineServiceImpl.java

@@ -19,7 +19,7 @@ import com.njcn.device.pq.pojo.po.DeptLine;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.DevDetailVO;
 import com.njcn.device.pq.pojo.vo.LineDeviceStateVO;
-import com.njcn.supervision.api.UserLedgerFeignClient;
+import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.system.api.DictTreeFeignClient;
 import com.njcn.system.enums.DicTreeEnum;
@@ -27,7 +27,6 @@ import com.njcn.system.pojo.vo.DictTreeVO;
 import com.njcn.user.api.DeptFeignClient;
 import com.njcn.user.pojo.dto.DeptDTO;
 import com.njcn.user.pojo.po.Dept;
-import com.njcn.user.pojo.vo.PvTerminalTreeVO;
 import com.njcn.web.pojo.param.DeptLineParam;
 import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
@@ -52,7 +51,7 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
     private final LineMapper lineMapper;
     private final DictTreeFeignClient dictTreeFeignClient;
     private final LineDetailMapper detailMapper;
-    private final UserLedgerFeignClient userLedgerFeignClient;
+    private final UserLedgerService userLedgerService;
 
 
     @Override
@@ -251,7 +250,7 @@ public class DeptLineServiceImpl extends ServiceImpl<DeptLineMapper, DeptLine> i
                     .distinct()
                     .collect(Collectors.toList());
             if(CollUtil.isNotEmpty(objIds)){
-                List<NewUserReportVO> data = userLedgerFeignClient.getUserReportByIds(objIds).getData();
+                List<NewUserReportVO> data = userLedgerService.getUserReportByIds(objIds);
                 Map<String, String> userMap = data.stream().collect(Collectors.toMap(NewUserReportVO::getId, NewUserReportVO::getProjectName));
                 for (DevDetailVO lineDeviceByDevId : lineDeviceByDevIds) {
                     if(StrUtil.isNotBlank(lineDeviceByDevId.getObjId())){

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/service/impl/LineServiceImpl.java

@@ -39,11 +39,11 @@ import com.njcn.device.pq.pojo.vo.*;
 import com.njcn.device.substation.mapper.SubstationMapper;
 import com.njcn.device.subvoltage.mapper.VoltageMapper;
 import com.njcn.device.terminal.mapper.TerminalMaintainMapper;
+import com.njcn.device.userledger.service.UserLedgerService;
 import com.njcn.influx.constant.InfluxDbSqlConstant;
 import com.njcn.influx.imapper.PqsCommunicateMapper;
 import com.njcn.influx.pojo.po.PqsCommunicate;
 import com.njcn.influx.query.InfluxQueryWrapper;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.api.DicDataFeignClient;
@@ -106,8 +106,10 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
     private final TerminalMaintainMapper terminalMaintainMapper;
     private final DeptFeignClient deptFeignClient;
     private final DeptLineService deptLineService;
-    private final UserLedgerFeignClient userLedgerFeignClient;
+    private final UserLedgerService userLedgerService;
     private final PqDevTypeService pqDevTypeService;
+
+
     @Override
     public LineDetailDataVO getLineDetailData(String id) {
         if (StringUtils.isEmpty(id)) {
@@ -744,7 +746,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
 
         if (CollUtil.isNotEmpty(userLedgerList)) {
             List<String> objIds = userLedgerList.stream().map(LineDetail::getObjId).distinct().collect(Collectors.toList());
-            List<NewUserReportVO> newUserReportVOList = userLedgerFeignClient.getUserReportByIds(objIds).getData();
+            List<NewUserReportVO> newUserReportVOList = userLedgerService.getUserReportByIds(objIds);
             Map<String, NewUserReportVO> map = newUserReportVOList.stream().collect(Collectors.toMap(NewUserReportVO::getId, Function.identity()));
 
             List<DictData> dictDataList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE_STAND.getCode()).getData();
@@ -892,7 +894,7 @@ public class LineServiceImpl extends ServiceImpl<LineMapper, Line> implements Li
         List<String> userIds = resList.stream().map(AreaLineInfoVO::getObjId).filter(StrUtil::isNotBlank).collect(Collectors.toList());
         Map<String, NewUserReportVO> userReportVOMap = new HashMap<>();
         if (CollUtil.isNotEmpty(userIds)) {
-            List<NewUserReportVO> data = userLedgerFeignClient.getUserReportByIds(userIds).getData();
+            List<NewUserReportVO> data = userLedgerService.getUserReportByIds(userIds);
             if (CollUtil.isNotEmpty(data)) {
                 userReportVOMap = data.stream().collect(Collectors.toMap(NewUserReportVO::getId, Function.identity()));
             }

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/pqUser/service/IPqSensitiveUserService.java

@@ -0,0 +1,26 @@
+package com.njcn.device.pqUser.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.device.biz.pojo.po.PqSensitiveUser;
+import com.njcn.device.pq.pojo.param.PqSensitiveUserParam;
+import com.njcn.device.pq.pojo.vo.PqSensitiveUserVo;
+import com.njcn.web.pojo.param.BaseParam;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author xy
+ * @since 2025-11-17
+ */
+public interface IPqSensitiveUserService extends IService<PqSensitiveUser> {
+
+    Page<PqSensitiveUserVo> getList(BaseParam param);
+
+    boolean save(PqSensitiveUserParam pqSensitiveUserParam);
+
+    boolean update(PqSensitiveUserParam.UpdatePqSensitiveUserParam pqSensitiveUserParam);
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/pqUser/service/impl/PqSensitiveUserServiceImpl.java

@@ -0,0 +1,107 @@
+package com.njcn.device.pqUser.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+
+import com.njcn.device.biz.mapper.PqSensitiveUserMapper;
+import com.njcn.device.biz.pojo.po.PqSensitiveUser;
+import com.njcn.device.pq.pojo.param.PqSensitiveUserParam;
+import com.njcn.device.pq.pojo.vo.PqSensitiveUserVo;
+import com.njcn.device.pqUser.service.IPqSensitiveUserService;
+import com.njcn.system.api.DicDataFeignClient;
+import com.njcn.system.pojo.po.DictData;
+import com.njcn.web.pojo.param.BaseParam;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author xy
+ * @since 2025-11-17
+ */
+@DS("sjzx")
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class PqSensitiveUserServiceImpl extends ServiceImpl<PqSensitiveUserMapper, PqSensitiveUser> implements IPqSensitiveUserService {
+
+
+    private final DicDataFeignClient dicDataFeignClient;
+
+    @Override
+    public Page<PqSensitiveUserVo> getList(BaseParam param) {
+        Page<PqSensitiveUserVo> result = new Page<>(param.getPageNum(),param.getPageSize());
+        LambdaQueryWrapper<PqSensitiveUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.orderByDesc(PqSensitiveUser::getSort);
+        if (StrUtil.isNotBlank(param.getSearchValue())) {
+            lambdaQueryWrapper.like(PqSensitiveUser::getName, param.getSearchValue());
+        }
+        Page<PqSensitiveUser> page = this.page(new Page<>(param.getPageNum(),param.getPageSize()),lambdaQueryWrapper);
+        if(CollUtil.isNotEmpty(page.getRecords())){
+            List<PqSensitiveUserVo> dataGroupEventVOList = new ArrayList<>();
+            page.getRecords().forEach(item->{
+                PqSensitiveUserVo vo = new PqSensitiveUserVo();
+                BeanUtil.copyProperties(item,vo);
+                dataGroupEventVOList.add(vo);
+            });
+            result.setRecords(dataGroupEventVOList);
+            result.setTotal(page.getTotal());
+            result.setSize(page.getSize());
+            result.setCurrent(page.getCurrent());
+            result.setPages(page.getPages());
+        }
+        return result;
+    }
+
+    @Override
+    public boolean save(PqSensitiveUserParam pqSensitiveUserParam) {
+        checkParam(pqSensitiveUserParam,false);
+
+        PqSensitiveUser pqSensitiveUser = new PqSensitiveUser();
+        BeanUtil.copyProperties(pqSensitiveUserParam,pqSensitiveUser);
+        return this.save(pqSensitiveUser);
+    }
+
+    @Override
+    public boolean update(PqSensitiveUserParam.UpdatePqSensitiveUserParam pqSensitiveUserParam) {
+        checkParam(pqSensitiveUserParam,true);
+        PqSensitiveUser pqSensitiveUser = new PqSensitiveUser();
+        BeanUtil.copyProperties(pqSensitiveUserParam,pqSensitiveUser);
+        return this.updateById(pqSensitiveUser);
+    }
+
+
+    private void checkParam(PqSensitiveUserParam param,boolean update){
+        DictData data = dicDataFeignClient.getDicDataById(param.getLoadType()).getData();
+        if(Objects.isNull(data)){
+            throw new BusinessException(CommonResponseEnum.FAIL,"字典负荷类型缺失！");
+        }
+
+        LambdaQueryWrapper<PqSensitiveUser> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PqSensitiveUser::getName,param.getName());
+        if(update){
+            if(param instanceof PqSensitiveUserParam.UpdatePqSensitiveUserParam){
+                lambdaQueryWrapper.ne(PqSensitiveUser::getId,((PqSensitiveUserParam.UpdatePqSensitiveUserParam) param).getId());
+            }
+        }
+        int count = this.count(lambdaQueryWrapper);
+        if(count>0){
+            throw new BusinessException(CommonResponseEnum.FAIL,"用户名称重复！");
+        }
+    }
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/controller/UserLedgerController.java

@@ -0,0 +1,150 @@
+package com.njcn.device.userledger.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.OperateType;
+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.device.userledger.service.UserLedgerService;
+import com.njcn.supervision.pojo.param.SensitiveUserParam;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.po.file.FileUrl;
+import com.njcn.supervision.pojo.po.user.UserReportPO;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
+import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
+import com.njcn.supervision.pojo.vo.user.UserReportVO;
+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.ArrayList;
+import java.util.List;
+
+/**
+ * 干扰源用户管理
+ *
+ * @author qijian
+ * @version 1.0.0
+ * @createTime 2022/11/11 - 9:20
+ */
+@Slf4j
+@RestController
+@RequestMapping("/userReport")
+@Api(tags = "干扰源用户管理")
+@AllArgsConstructor
+public class UserLedgerController extends BaseController {
+
+    private final UserLedgerService userReportPOService;
+
+
+    @PostMapping(value = "/selectUserList")
+    @ApiOperation("查询用户台账")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    public HttpResult<List<UserLedgerVO>> selectUserList(@RequestBody UserReportParam userReportParam) {
+        String methodDescribe = getMethodDescribe("selectUserList");
+        List<UserLedgerVO> b = userReportPOService.selectUserList(userReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @GetMapping(value = "/selectUserInfo")
+    @ApiOperation("查询用户基本详情")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    public HttpResult<UserLedgerVO> selectUserInfo(@RequestParam String id) {
+        String methodDescribe = getMethodDescribe("selectUserInfo");
+        UserLedgerVO b = userReportPOService.selectUserInfo(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+
+    @PostMapping(value = "/bindUserStation")
+    @ApiOperation("绑定用户电站信息")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    public HttpResult<List<UserLedgerVO>> bindUserStation(@RequestParam("userId")String userId,@RequestParam("stationId")String stationId) {
+        String methodDescribe = getMethodDescribe("bindUserStation");
+        userReportPOService.bindUserStation(userId,stationId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
+    }
+
+
+    @PostMapping("/getUserReportByIds")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据ids获取非电网侧用户信息")
+    public HttpResult<List<NewUserReportVO>> getUserReportByIds(@RequestBody List<String> ids) {
+        String methodDescribe = getMethodDescribe("getUserReportByIds");
+        List<NewUserReportVO> userReportByIds = userReportPOService.getUserReportByIds(ids);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportByIds, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getSensitiveUserByDept")
+    @ApiOperation("根据部门获取敏感用户信息")
+    @ApiImplicitParam(name = "param", value = "参数", required = true)
+    public HttpResult<List<UserReportPO>> getSensitiveUserByDept(@RequestBody @Validated SensitiveUserParam param) {
+        String methodDescribe = getMethodDescribe("getSensitiveUserByDept");
+        List<UserReportPO> list = userReportPOService.getSensitiveUserByDept(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/getUserLedgerPage")
+    @ApiOperation("分页查询干扰源用户台账")
+    @ApiImplicitParam(name = "userReportQueryParam", value = "参数", required = true)
+    public HttpResult<Page<UserReportVO>> getUserLedgerPage(@RequestBody @Validated UserReportParam.UserReportQueryParam userReportQueryParam) {
+        String methodDescribe = getMethodDescribe("getUserLedgerPage");
+        Page<UserReportVO> out = userReportPOService.getUserLedgerPage(userReportQueryParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, out, methodDescribe);
+    }
+
+    @GetMapping("/getById")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据id获取用户档案录入的详细数据")
+    public HttpResult<UserReportVO.UserReportListVO> getById(String id) {
+        String methodDescribe = getMethodDescribe("getById");
+        UserReportVO.UserReportListVO userReportVO = userReportPOService.getVOById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportVO, methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @GetMapping("/getFileById")
+    @ApiOperation("根据id查询文件信息集合")
+    public HttpResult<List<FileUrl>> getFileUrlList(String id) {
+        String methodDescribe = getMethodDescribe("getFileUrlList");
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, new ArrayList<>(), methodDescribe);
+    }
+
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD)
+    @PostMapping("/add")
+    @ApiOperation("新增干扰源用户")
+    @ApiImplicitParam(name = "userReportParam", value = "实体参数", required = true)
+    public HttpResult<String> addUserReport(@RequestBody @Validated UserReportParam userReportParam) {
+        String methodDescribe = getMethodDescribe("addUserReport");
+        String userReportId = userReportPOService.addUserReport(userReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportId, methodDescribe);
+    }
+
+    @PostMapping(value = "/deleteUserReport")
+    @ApiOperation("干扰源接入功能删除流程")
+    @OperateInfo(info = LogEnum.BUSINESS_MEDIUM, operateType = OperateType.DELETE)
+    public HttpResult<Boolean> deleteUserReport(@RequestBody List<String> supervisionId) {
+        String methodDescribe = getMethodDescribe("deleteUserReport");
+        Boolean b = userReportPOService.deleteUserReport(supervisionId);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, b, methodDescribe);
+    }
+
+    @GetMapping("/getUserReportById")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("根据id获取用户档案录入数据")
+    public HttpResult<UserReportVO> getUserReportById(String id) {
+        String methodDescribe = getMethodDescribe("getUserReportById");
+        UserReportVO userReportVO = userReportPOService.getUserReportById(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userReportVO, methodDescribe);
+    }
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/UserReportNormalMapper.java

@@ -0,0 +1,17 @@
+package com.njcn.device.userledger.mapper;
+
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
+
+/**
+ * <p>
+ * 干扰源用户常态化管理 Mapper 接口
+ * </p>
+ *
+ * @author hongawen
+ * @since 2024-05-17
+ */
+public interface UserReportNormalMapper extends BaseMapper<UserReportNormalPO> {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/UserReportPOMapper.java

@@ -0,0 +1,24 @@
+package com.njcn.device.userledger.mapper;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.njcn.supervision.pojo.po.user.UserReportPO;
+import com.njcn.supervision.pojo.vo.user.UserReportVO;
+import org.apache.ibatis.annotations.Param;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:07【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface UserReportPOMapper extends BaseMapper<UserReportPO> {
+
+    Page<UserReportVO> page(@Param("page")Page<Object> objectPage, @Param("ew") QueryWrapper<UserReportVO> userReportVOQueryWrapper);
+
+
+    UserReportVO getUserReportById(@Param("ew")QueryWrapper<UserReportVO> userReportVOQueryWrapper);
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/UserReportProjectPOMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.device.userledger.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:08【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface UserReportProjectPOMapper extends BaseMapper<UserReportProjectPO> {
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/UserReportRenewalMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.device.userledger.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.supervision.pojo.po.user.UserReportRenewalPO;
+
+/**
+ * <p>
+ * 用户档案信息表	 Mapper 接口
+ * </p>
+ *
+ * @author wr
+ * @since 2024-06-26
+ */
+public interface UserReportRenewalMapper extends BaseMapper<UserReportRenewalPO> {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/UserReportSensitivePOMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.device.userledger.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:09【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface UserReportSensitivePOMapper extends BaseMapper<UserReportSensitivePO> {
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/UserReportSubstationPOMapper.java

@@ -0,0 +1,15 @@
+package com.njcn.device.userledger.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:09【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface UserReportSubstationPOMapper extends BaseMapper<UserReportSubstationPO> {
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/mapper/mapping/UserReportPOMapper.xml

@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.device.userledger.mapper.UserReportPOMapper">
+
+  <!--获取流程表单分页列表-->
+  <select id="page" resultType="com.njcn.supervision.pojo.vo.user.UserReportVO">
+    SELECT
+      supervision_user_report.id,
+      supervision_user_report.report_date,
+      supervision_user_report.org_id,
+      supervision_user_report.expected_production_date,
+      supervision_user_report.user_type,
+      supervision_user_report.city,
+      supervision_user_report.rate_power,
+      supervision_user_report.responsible_department,
+      supervision_user_report.user_status,
+      supervision_user_report.substation,
+      supervision_user_report.voltage_level,
+      supervision_user_report.project_name,
+      supervision_user_report.evaluation_dept,
+      supervision_user_report.data_type,
+      supervision_user_report.evaluation_conclusion,
+      supervision_user_report.process_instance_id,
+      supervision_user_report.history_instance_id,
+      supervision_user_report.create_time,
+      supervision_user_report.create_by,
+      supervision_user_report.status,
+      supervision_user_report.dev_id,
+      supervision_user_report.line_id,
+      supervision_user_report.second_assessment_id secondAssessmentId
+    FROM supervision_user_report supervision_user_report
+    WHERE ${ew.sqlSegment}
+  </select>
+
+  <select id="getUserReportById" resultType="com.njcn.supervision.pojo.vo.user.UserReportVO">
+    SELECT
+      supervision_user_report.id,
+      supervision_user_report.report_date,
+      supervision_user_report.org_id,
+      supervision_user_report.expected_production_date,
+      supervision_user_report.user_type,
+      supervision_user_report.city,
+      supervision_user_report.responsible_department,
+      supervision_user_report.user_status,
+      supervision_user_report.substation,
+      supervision_user_report.voltage_level,
+      supervision_user_report.project_name,
+      supervision_user_report.evaluation_dept,
+      supervision_user_report.data_type,
+      supervision_user_report.evaluation_conclusion,
+      supervision_user_report.process_instance_id,
+      supervision_user_report.history_instance_id,
+      supervision_user_report.create_time,
+      supervision_user_report.create_by,
+      supervision_user_report.status,
+      supervision_user_report.dev_id,
+      supervision_user_report.line_id
+    FROM supervision_user_report supervision_user_report
+    WHERE ${ew.sqlSegment}
+  </select>
+</mapper>

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/IUserReportNormalService.java

@@ -0,0 +1,19 @@
+package com.njcn.device.userledger.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
+
+
+/**
+ * <p>
+ * 干扰源用户常态化管理 服务类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2024-05-17
+ */
+public interface IUserReportNormalService extends IService<UserReportNormalPO> {
+
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/IUserReportRenewalService.java

@@ -0,0 +1,17 @@
+package com.njcn.device.userledger.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.supervision.pojo.po.user.UserReportRenewalPO;
+
+/**
+ * <p>
+ * 用户档案信息表	 服务类
+ * </p>
+ *
+ * @author wr
+ * @since 2024-06-26
+ */
+public interface IUserReportRenewalService extends IService<UserReportRenewalPO> {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/UserLedgerService.java

@@ -0,0 +1,93 @@
+package com.njcn.device.userledger.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.supervision.pojo.param.SensitiveUserParam;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.po.user.UserReportPO;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
+import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
+import com.njcn.supervision.pojo.vo.user.UserReportVO;
+
+import java.util.List;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2026/3/4 9:12
+ */
+public interface UserLedgerService extends IService<UserReportPO> {
+
+
+    /**
+     * 查询用户台账
+     * @param userReportParam
+     * @return
+     */
+    List<UserLedgerVO> selectUserList(UserReportParam userReportParam);
+
+    /**
+     * 查询用户基本详情
+     * @param id
+     * @return
+     */
+    UserLedgerVO selectUserInfo(String id);
+
+    /**
+     * 绑定用户电站信息
+     * @param userId
+     * @param stationId
+     * @return
+     */
+    Boolean bindUserStation(String userId,String stationId);
+
+    /**
+     * 根据ids获取非电网侧用户信息
+     * @param ids
+     * @return
+     */
+    List<NewUserReportVO> getUserReportByIds(List<String> ids);
+
+
+    /**
+     * 根据部门获取敏感用户信息
+     * @param param
+     * @return
+     */
+    List<UserReportPO> getSensitiveUserByDept(SensitiveUserParam param);
+
+    /**
+     * 分页查询干扰源用户台账
+     * @param userReportQueryParam
+     * @return
+     */
+    Page<UserReportVO> getUserLedgerPage(UserReportParam.UserReportQueryParam userReportQueryParam);
+
+    /**
+     * 根据id获取用户档案录入的详细数据
+     * @param id
+     * @return
+     */
+    UserReportVO.UserReportListVO getVOById(String id);
+
+    /**
+     * 新增干扰源用户
+     * @param userReportParam
+     * @return
+     */
+    String addUserReport(UserReportParam userReportParam);
+
+    /**
+     * 干扰源接入功能删除流程
+     * @param supervisionId
+     * @return
+     */
+    Boolean deleteUserReport(List<String> supervisionId);
+
+    /**
+     * 根据id获取用户档案录入数据
+     * @param id
+     * @return
+     */
+    UserReportVO getUserReportById(String id);
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/UserReportProjectPOService.java

@@ -0,0 +1,17 @@
+package com.njcn.device.userledger.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:08【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface UserReportProjectPOService extends IService<UserReportProjectPO>{
+
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/UserReportSensitivePOService.java

@@ -0,0 +1,17 @@
+package com.njcn.device.userledger.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:09【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface UserReportSensitivePOService extends IService<UserReportSensitivePO>{
+
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/UserReportSubstationPOService.java

@@ -0,0 +1,17 @@
+package com.njcn.device.userledger.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
+
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:09【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+public interface UserReportSubstationPOService extends IService<UserReportSubstationPO>{
+
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/UserLedgerServiceImpl.java

@@ -0,0 +1,422 @@
+package com.njcn.device.userledger.service.impl;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.bpm.enums.BpmProcessInstanceStatusEnum;
+import com.njcn.bpm.enums.BpmTaskStatusEnum;
+import com.njcn.common.pojo.constant.PatternRegex;
+import com.njcn.common.pojo.enums.common.DataStateEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.device.userledger.mapper.UserReportNormalMapper;
+import com.njcn.device.userledger.mapper.UserReportPOMapper;
+import com.njcn.device.userledger.service.UserLedgerService;
+import com.njcn.device.userledger.service.UserReportProjectPOService;
+import com.njcn.device.userledger.service.UserReportSensitivePOService;
+import com.njcn.device.userledger.service.UserReportSubstationPOService;
+import com.njcn.supervision.enums.FlowStatusEnum;
+import com.njcn.supervision.enums.SupervisionResponseEnum;
+import com.njcn.supervision.enums.UserNatureEnum;
+import com.njcn.supervision.pojo.param.SensitiveUserParam;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.po.user.*;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
+import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
+import com.njcn.supervision.pojo.vo.user.UserReportVO;
+import com.njcn.user.api.DeptFeignClient;
+import com.njcn.user.api.UserFeignClient;
+import com.njcn.user.pojo.po.Dept;
+import com.njcn.user.pojo.vo.UserVO;
+import com.njcn.web.constant.ValidMessage;
+import com.njcn.web.factory.PageFactory;
+import com.njcn.web.utils.RequestUtil;
+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 java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
+
+/**
+ * @author wr
+ * @description
+ * @date 2026/3/3 16:19
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class UserLedgerServiceImpl extends ServiceImpl<UserReportPOMapper, UserReportPO> implements UserLedgerService {
+
+    private final DeptFeignClient deptFeignClient;
+    private final UserReportProjectPOService userReportProjectPOService;
+    private final UserReportSubstationPOService userReportSubstationPOService;
+    private final UserReportNormalMapper userReportNormalMapper;
+    private final UserReportSensitivePOService userReportSensitivePOService;
+    private final UserFeignClient userFeignClient;
+
+    @Override
+    public List<UserLedgerVO> selectUserList(UserReportParam userReportParam) {
+        LambdaQueryWrapper<UserReportPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        if (StrUtil.isNotBlank(userReportParam.getCity())) {
+            lambdaQueryWrapper.in(UserReportPO::getCity, Stream.of(userReportParam.getCity()).collect(Collectors.toList()));
+        }
+        if (StrUtil.isNotBlank(userReportParam.getStationId())) {
+            lambdaQueryWrapper.eq(UserReportPO::getStationId, userReportParam.getStationId());
+        }
+        if (ObjectUtil.isNotNull(userReportParam.getUserType())) {
+            lambdaQueryWrapper.eq(UserReportPO::getUserType, userReportParam.getUserType());
+        }
+        lambdaQueryWrapper.eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode());
+        List<UserReportPO> list = this.list(lambdaQueryWrapper);
+        return BeanUtil.copyToList(list, UserLedgerVO.class);
+    }
+
+    @Override
+    public UserLedgerVO selectUserInfo(String id) {
+        LambdaQueryWrapper<UserReportPO> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(UserReportPO::getId, id).eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode());
+        UserReportPO userReportPO = this.getById(id);
+        if (Objects.nonNull(userReportPO)) {
+            return BeanUtil.copyProperties(userReportPO, UserLedgerVO.class);
+        }
+        return null;
+    }
+
+    @Override
+    public Boolean bindUserStation(String userId, String stationId) {
+        UserReportPO userReportPO = new UserReportPO();
+        userReportPO.setId(userId);
+        userReportPO.setStationId(stationId);
+        return this.updateById(userReportPO);
+    }
+
+    @Override
+    public List<NewUserReportVO> getUserReportByIds(List<String> ids) {
+        List<UserReportPO> userReportPOS = this.listByIds(ids);
+        List<NewUserReportVO> info = new ArrayList<>();
+        for (UserReportPO userReportNormalPO : userReportPOS) {
+            NewUserReportVO newUserReportVO = new NewUserReportVO();
+
+            BeanUtil.copyProperties(userReportNormalPO, newUserReportVO);
+            info.add(newUserReportVO);
+        }
+        return info;
+    }
+
+    @Override
+    public List<UserReportPO> getSensitiveUserByDept(SensitiveUserParam param) {
+        QueryWrapper<UserReportPO> userReportVOQueryWrapper = new QueryWrapper<>();
+        List<String> data = deptFeignClient.getDepSonIdtByDeptId(param.getDeptId()).getData();
+        //此处仅查询敏感及重要用户
+        userReportVOQueryWrapper.and(wrapper ->
+                        wrapper.in("supervision_user_report.org_id", data)
+                )
+                .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode())
+                .eq("supervision_user_report.user_type", UserNatureEnum.SENSITIVE_USER.getCode())
+                .in("supervision_user_report.status", Arrays.asList(FlowStatusEnum.AUDIT.getCode(), FlowStatusEnum.APPROVE.getCode()));
+        userReportVOQueryWrapper.like(StringUtils.isNotBlank(param.getProjectName()), "supervision_user_report.project_name", param.getProjectName());
+        userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
+        return this.baseMapper.selectList(userReportVOQueryWrapper);
+    }
+
+    @Override
+    public Page<UserReportVO> getUserLedgerPage(UserReportParam.UserReportQueryParam userReportQueryParam) {
+        //正则校验
+        Pattern pattern = Pattern.compile(PatternRegex.ALL_CHAR_1_20);
+        Matcher matcher = pattern.matcher(userReportQueryParam.getProjectName());
+        if (StringUtils.isNotBlank(userReportQueryParam.getProjectName()) && !matcher.matches()) {
+            throw new BusinessException(ValidMessage.SEARCH_DATA_ERROR);
+        }
+        QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
+
+        //此处仅查询敏感及重要用户
+        userReportVOQueryWrapper
+                .eq("supervision_user_report.state", DataStateEnum.ENABLE.getCode());
+
+        if (Objects.nonNull(userReportQueryParam)) {
+            if (StrUtil.isNotBlank(userReportQueryParam.getCity())) {
+                //查询所有区域下的数据
+                userReportVOQueryWrapper.in("supervision_user_report.city", userReportQueryParam.getCity());
+            }
+            if (Objects.nonNull(userReportQueryParam.getDataType())) {
+                userReportVOQueryWrapper.eq("data_type", userReportQueryParam.getDataType());
+            }
+            userReportVOQueryWrapper.like(StringUtils.isNotBlank(userReportQueryParam.getProjectName()), "supervision_user_report.project_name", userReportQueryParam.getProjectName());
+            if (StrUtil.isNotBlank(userReportQueryParam.getSearchBeginTime()) && StrUtil.isNotBlank(userReportQueryParam.getSearchEndTime())) {
+                userReportVOQueryWrapper.and(wrapper -> wrapper.between("supervision_user_report.report_date",
+                                DateUtil.beginOfDay(DateUtil.parse(userReportQueryParam.getSearchBeginTime())),
+                                DateUtil.endOfDay(DateUtil.parse(userReportQueryParam.getSearchEndTime())))
+                        .or()
+                        .between("supervision_user_report.expected_production_date",
+                                DateUtil.beginOfDay(DateUtil.parse(userReportQueryParam.getSearchBeginTime())),
+                                DateUtil.endOfDay(DateUtil.parse(userReportQueryParam.getSearchEndTime())))
+                );
+            }
+            userReportVOQueryWrapper.orderByDesc("supervision_user_report.Update_Time");
+        }
+        userReportVOQueryWrapper.orderByDesc("supervision_user_report.create_time");
+        Page<UserReportVO> page;
+        page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(userReportQueryParam), PageFactory.getPageSize(userReportQueryParam)), userReportVOQueryWrapper);
+        page.getRecords().forEach(temp -> {
+            Integer needGovernance = 0;
+            if (
+                    CollectionUtil.newArrayList(
+                            UserNatureEnum.BUILD_POWER_GRID.getCode(),
+                            UserNatureEnum.EXTEND_POWER_GRID.getCode()
+                    ).contains(temp.getUserType())) {
+                //电网工程类用户额外数据
+                needGovernance = userReportProjectPOService.getById(temp.getId()).getNeedGovernance();
+            } else if (
+                    CollectionUtil.newArrayList(
+                            UserNatureEnum.BUILD_NON_LINEAR_LOAD.getCode(),
+                            UserNatureEnum.EXTEND_NON_LINEAR_LOAD.getCode(),
+                            UserNatureEnum.BUILD_NEW_ENERGY_POWER_STATION.getCode(),
+                            UserNatureEnum.EXTEND_NEW_ENERGY_POWER_STATION.getCode()
+                    ).contains(temp.getUserType())) {
+                //非线性负荷用户 & 新能源发电站用户
+
+                needGovernance = userReportSubstationPOService.getById(temp.getId()).getNeedGovernance();
+            } else if (UserNatureEnum.SENSITIVE_USER.getCode().equals(temp.getUserType())) {
+                // 敏感及重要用户
+                needGovernance = userReportSensitivePOService.getById(temp.getId()).getNeedGovernance();
+            }
+            temp.setNeedGovernance(needGovernance);
+            //添加治理评估文件，需先判断入网评估是否审核通过
+            boolean type = true;
+            if (1 == temp.getNeedGovernance()) {
+                List<UserReportNormalPO> list = userReportNormalMapper.selectList(new LambdaQueryWrapper<UserReportNormalPO>()
+                        .eq(UserReportNormalPO::getUserReportId, temp.getId())
+                        .eq(UserReportNormalPO::getState, DataStateEnum.ENABLE.getCode())
+                        .ne(UserReportNormalPO::getStatus, BpmTaskStatusEnum.CANCEL.getStatus())
+                        .eq(UserReportNormalPO::getType, 0)
+                        .orderByDesc(UserReportNormalPO::getCreateTime)
+                );
+                if (CollUtil.isNotEmpty(list)) {
+                    List<String> collect = list.stream().filter(x -> !Objects.equals(x.getStatus(), BpmTaskStatusEnum.APPROVE.getStatus()))
+                            .map(UserReportNormalPO::getId)
+                            .collect(Collectors.toList());
+                    if (CollUtil.isNotEmpty(collect)) {
+                        type = false;
+                    }
+                } else {
+                    type = false;
+                }
+            }
+            temp.setType(type);
+        });
+        return page;
+    }
+
+    @Override
+    public UserReportVO.UserReportListVO getVOById(String id) {
+        UserReportVO.UserReportListVO userReportVO = new UserReportVO.UserReportListVO();
+        UserReportPO userReportPO = this.baseMapper.selectById(id);
+        //复制基础信息
+        BeanUtil.copyProperties(userReportPO, userReportVO);
+        //处理特殊字段，用户名、部门名
+        if (StrUtil.isNotBlank(userReportPO.getReporter())){
+            UserVO userVO = userFeignClient.getUserById(userReportPO.getReporter()).getData();
+            if(ObjUtil.isNotNull(userVO)){
+                userReportVO.setReporter(userVO.getName());
+
+            }
+        }
+        if (StrUtil.isNotBlank(userReportPO.getReporter())){
+            Dept dept = deptFeignClient.getDeptById(userReportPO.getOrgId()).getData();
+            if(ObjUtil.isNotNull(dept)){
+                userReportVO.setOrgName(dept.getName());
+            }
+        }
+        /*
+            根据用户性质获取自己特有的字段，此处需要特殊处理
+            1、每个附件需要返回文件名称以及可以预览的url
+            todo...by黄正剑
+         */
+        if (
+                CollectionUtil.newArrayList(
+                        UserNatureEnum.BUILD_POWER_GRID.getCode(),
+                        UserNatureEnum.EXTEND_POWER_GRID.getCode()
+                ).contains(userReportPO.getUserType())) {
+            //电网工程类用户额外数据
+            UserReportProjectPO byId = userReportProjectPOService.getById(id);
+            userReportVO.setUserReportProjectPO(byId);
+
+        } else if (
+                CollectionUtil.newArrayList(
+                        UserNatureEnum.BUILD_NON_LINEAR_LOAD.getCode(),
+                        UserNatureEnum.EXTEND_NON_LINEAR_LOAD.getCode(),
+                        UserNatureEnum.BUILD_NEW_ENERGY_POWER_STATION.getCode(),
+                        UserNatureEnum.EXTEND_NEW_ENERGY_POWER_STATION.getCode()
+                ).contains(userReportPO.getUserType())) {
+            //非线性负荷用户 & 新能源发电站用户
+            UserReportSubstationPO byId = userReportSubstationPOService.getById(id);
+            userReportSubstationPOService.saveOrUpdate(byId);
+            userReportVO.setUserReportSubstationPO(byId);
+        } else if (UserNatureEnum.SENSITIVE_USER.getCode().equals(userReportPO.getUserType())) {
+            // 敏感及重要用户
+            UserReportSensitivePO byId = userReportSensitivePOService.getById(id);
+            userReportVO.setUserReportSensitivePO(byId);
+        }
+        List<UserReportNormalPO> list = userReportNormalMapper.selectList(new LambdaQueryWrapper<UserReportNormalPO>()
+                .eq(UserReportNormalPO::getUserReportId, id)
+                .eq(UserReportNormalPO::getStatus, BpmTaskStatusEnum.APPROVE.getStatus())
+                .eq(UserReportNormalPO::getState, DataStateEnum.ENABLE.getCode())
+                .orderByDesc(UserReportNormalPO::getCreateTime)
+        );
+        Optional<String> netInReport = list.stream().filter(x -> 0 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
+        Optional<String> governReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getReportUrl).findFirst();
+        Optional<String> simulationReport = list.stream().filter(x -> 1 == x.getType()).map(UserReportNormalPO::getSimulationReportUrl).findFirst();
+        userReportVO.setNetInReport(Collections.singletonList(netInReport.orElse(null)));
+        userReportVO.setGovernReport(Collections.singletonList(governReport.orElse(null)));
+        userReportVO.setSimulationReport(Collections.singletonList(simulationReport.orElse(null)));
+        return userReportVO;
+    }
+
+    @Override
+    public String addUserReport(UserReportParam userReportParam) {
+        UserReportPO userReportPO = new UserReportPO();
+        BeanUtils.copyProperties(userReportParam, userReportPO);
+        userReportPO.setState(DataStateEnum.ENABLE.getCode());
+        if (Objects.equals(userReportParam.getSaveOrCheckflag(), "2")) {
+            checkProjectName(userReportParam, !StringUtils.isEmpty(userReportParam.getId()));
+        }
+        //判断工程名称是否有重复的
+        if (Objects.equals(userReportParam.getSaveOrCheckflag(), "1")) {
+            userReportPO.setStatus(BpmTaskStatusEnum.WAIT.getStatus());
+            checkProjectName(userReportParam, !StringUtils.isEmpty(userReportParam.getId()));
+        } else {
+            //常态化干扰源用户信息更新的用的
+            if (!Objects.equals(userReportParam.getSaveOrCheckflag(), "0")) {
+                userReportPO.setStatus(BpmTaskStatusEnum.RUNNING.getStatus());
+            }
+        }
+        if (ObjectUtil.isNotNull(userReportParam.getDataType())) {
+            userReportPO.setDataType(userReportParam.getDataType());
+            if (userReportParam.getDataType() == 1) {
+                if (UserNatureEnum.SENSITIVE_USER.getCode().equals(userReportParam.getUserType())) {
+                    userReportPO.setStatus(BpmTaskStatusEnum.APPROVE.getStatus());
+                }
+            }
+        } else {
+            userReportPO.setDataType(0);
+        }
+        this.saveOrUpdate(userReportPO);
+        userReportPO = this.getById(userReportPO.getId());
+        if (
+                CollectionUtil.newArrayList(
+                        UserNatureEnum.BUILD_POWER_GRID.getCode(),
+                        UserNatureEnum.EXTEND_POWER_GRID.getCode()
+                ).contains(userReportPO.getUserType())) {
+            //电网工程类用户额外数据
+            UserReportProjectPO userReportProjectPO = userReportParam.getUserReportProjectPO();
+            userReportProjectPO.setId(userReportPO.getId());
+            userReportProjectPO.setState(DataStateEnum.ENABLE.getCode());
+            userReportProjectPOService.saveOrUpdate(userReportProjectPO);
+        } else if (
+                CollectionUtil.newArrayList(
+                        UserNatureEnum.BUILD_NON_LINEAR_LOAD.getCode(),
+                        UserNatureEnum.EXTEND_NON_LINEAR_LOAD.getCode(),
+                        UserNatureEnum.BUILD_NEW_ENERGY_POWER_STATION.getCode(),
+                        UserNatureEnum.EXTEND_NEW_ENERGY_POWER_STATION.getCode()
+                ).contains(userReportPO.getUserType())) {
+            //非线性负荷用户 & 新能源发电站用户
+            UserReportSubstationPO userReportSubstationPO = userReportParam.getUserReportSubstationPO();
+            userReportSubstationPO.setId(userReportPO.getId());
+            userReportSubstationPO.setState(DataStateEnum.ENABLE.getCode());
+            userReportSubstationPOService.saveOrUpdate(userReportSubstationPO);
+        } else if (UserNatureEnum.SENSITIVE_USER.getCode().equals(userReportPO.getUserType())) {
+            // 敏感及重要用户
+            UserReportSensitivePO userReportSensitivePO = userReportParam.getUserReportSensitivePO();
+            userReportSensitivePO.setId(userReportPO.getId());
+            userReportSensitivePO.setState(DataStateEnum.ENABLE.getCode());
+            userReportSensitivePOService.saveOrUpdate(userReportSensitivePO);
+        }
+        return userReportPO.getId();
+    }
+
+    @Override
+    public Boolean deleteUserReport(List<String> supervisionId) {
+        List<UserReportPO> userReportPOS = this.listByIds(supervisionId);
+        if (CollUtil.isEmpty(userReportPOS)) {
+            throw new BusinessException(SupervisionResponseEnum.EXISTENCE_OR_NOT);
+        }
+        //先判断是否是删除管理员，如果是就有全部删除权限，否则就只能删除带提交审批的
+        List<String> deleteUser = userReportPOS.stream().map(UserReportPO::getCreateBy).distinct().collect(Collectors.toList());
+        long statusCount = userReportPOS.stream().filter(x -> !BpmTaskStatusEnum.WAIT.getStatus().equals(x.getStatus())).count();
+        //判断是否有权限操作
+        if (CollUtil.isEmpty(deleteUser)) {
+            throw new BusinessException(SupervisionResponseEnum.EXISTENCE_OR_NOT);
+        }
+        //如果为空则需要判断信息，先判断全部数据是否都是自己创建的，然后判断是否是都是带提交数据
+        if (CollUtil.isEmpty(deleteUser)) {
+            long count = deleteUser.stream().filter(x -> !RequestUtil.getUserIndex().equals(x)).count();
+            if (count > 0) {
+                throw new BusinessException(SupervisionResponseEnum.NO_POWER);
+            } else {
+                if (statusCount > 0) {
+                    throw new BusinessException(SupervisionResponseEnum.DELETE_TO_BE_SUBMITTED);
+                }
+            }
+        }
+        return this.update(new LambdaUpdateWrapper<UserReportPO>().set(UserReportPO::getState, DataStateEnum.DELETED.getCode())
+                .in(UserReportPO::getId, supervisionId));
+    }
+
+    @Override
+    public UserReportVO getUserReportById(String id) {
+        QueryWrapper<UserReportVO> userReportVOQueryWrapper = new QueryWrapper<>();
+        userReportVOQueryWrapper.eq("supervision_user_report.id", id);
+        return this.baseMapper.getUserReportById(userReportVOQueryWrapper);
+    }
+
+    /**
+     * 判断工程名称是否重复，如果重复则提示用户XXX已经创建该工程
+     *
+     * @param userReportParam 用户申请数据
+     * @param isExcludeSelf   是否排除自己，一般新增不排除，更新时需要排除自己
+     */
+    protected void checkProjectName(UserReportParam userReportParam, boolean isExcludeSelf) {
+        if (!StringUtils.isEmpty(userReportParam.getProjectName())) {
+            LambdaQueryWrapper<UserReportPO> userReportPOLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            userReportPOLambdaQueryWrapper
+                    .eq(UserReportPO::getProjectName, userReportParam.getProjectName())
+                    .in(UserReportPO::getStatus, CollectionUtil.newArrayList(BpmProcessInstanceStatusEnum.AWAIT.getStatus(), BpmProcessInstanceStatusEnum.RUNNING.getStatus(), BpmProcessInstanceStatusEnum.APPROVE.getStatus()))
+                    .eq(UserReportPO::getState, DataStateEnum.ENABLE.getCode());
+            //更新的时候，需排除当前记录
+            if (isExcludeSelf) {
+                if (userReportParam instanceof UserReportParam.UserReportUpdate) {
+                    userReportPOLambdaQueryWrapper.ne(UserReportPO::getId, ((UserReportParam.UserReportUpdate) userReportParam).getId());
+                } else {
+                    userReportPOLambdaQueryWrapper.ne(UserReportPO::getId, (userReportParam).getId());
+                }
+            }
+            List<UserReportPO> userReportPOList = this.baseMapper.selectList(userReportPOLambdaQueryWrapper);
+            if (CollectionUtil.isNotEmpty(userReportPOList)) {
+                //过滤已取消的申请
+                userReportPOList = userReportPOList.stream()
+                        .filter(userReportPO -> !userReportPO.getStatus().equals(FlowStatusEnum.CANCEL.getCode()))
+                        .collect(Collectors.toList());
+                //如果还存在，则说明有人申请过了
+                if (CollectionUtil.isNotEmpty(userReportPOList)) {
+                    UserVO userVO = userFeignClient.getUserById(userReportPOList.get(0).getReporter()).getData();
+                    throw new BusinessException(userReportParam.getProjectName().concat(",该工程已被:").concat(userVO.getName()).concat("申请"));
+                }
+            }
+        }
+
+    }
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/UserReportNormalServiceImpl.java

@@ -0,0 +1,26 @@
+package com.njcn.device.userledger.service.impl;
+
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.userledger.mapper.UserReportNormalMapper;
+import com.njcn.device.userledger.service.IUserReportNormalService;
+import com.njcn.supervision.pojo.po.user.UserReportNormalPO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 干扰源用户常态化管理 服务实现类
+ * </p>
+ *
+ * @author hongawen
+ * @since 2024-05-17
+ */
+@Service
+@RequiredArgsConstructor
+public class UserReportNormalServiceImpl extends ServiceImpl<UserReportNormalMapper, UserReportNormalPO> implements IUserReportNormalService {
+
+
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/UserReportProjectPOServiceImpl.java

@@ -0,0 +1,19 @@
+package com.njcn.device.userledger.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.userledger.mapper.UserReportProjectPOMapper;
+import com.njcn.device.userledger.service.UserReportProjectPOService;
+import com.njcn.supervision.pojo.po.user.UserReportProjectPO;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:08【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class UserReportProjectPOServiceImpl extends ServiceImpl<UserReportProjectPOMapper, UserReportProjectPO> implements UserReportProjectPOService {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/UserReportRenewalServiceImpl.java

@@ -0,0 +1,23 @@
+package com.njcn.device.userledger.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.userledger.mapper.UserReportRenewalMapper;
+import com.njcn.device.userledger.service.IUserReportRenewalService;
+import com.njcn.supervision.pojo.po.user.UserReportRenewalPO;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+
+/**
+ * <p>
+ * 用户档案信息表	 服务实现类
+ * </p>
+ *
+ * @author wr
+ * @since 2024-06-26
+ */
+@Service
+@RequiredArgsConstructor
+public class UserReportRenewalServiceImpl extends ServiceImpl<UserReportRenewalMapper, UserReportRenewalPO> implements IUserReportRenewalService {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/UserReportSensitivePOServiceImpl.java

@@ -0,0 +1,19 @@
+package com.njcn.device.userledger.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.userledger.mapper.UserReportSensitivePOMapper;
+import com.njcn.device.userledger.service.UserReportSensitivePOService;
+import com.njcn.supervision.pojo.po.user.UserReportSensitivePO;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:09【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class UserReportSensitivePOServiceImpl extends ServiceImpl<UserReportSensitivePOMapper, UserReportSensitivePO> implements UserReportSensitivePOService {
+
+}

pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/userledger/service/impl/UserReportSubstationPOServiceImpl.java

@@ -0,0 +1,19 @@
+package com.njcn.device.userledger.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.njcn.device.userledger.mapper.UserReportSubstationPOMapper;
+import com.njcn.device.userledger.service.UserReportSubstationPOService;
+import com.njcn.supervision.pojo.po.user.UserReportSubstationPO;
+import org.springframework.stereotype.Service;
+/**
+ * 
+ * Description:
+ * Date: 2024/4/25  10:09【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+@Service
+public class UserReportSubstationPOServiceImpl extends ServiceImpl<UserReportSubstationPOMapper, UserReportSubstationPO> implements UserReportSubstationPOService {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/ReportController.java

@@ -234,4 +234,10 @@ public class ReportController extends BaseController {
         reportService.getPmsAreaReport(areaReportParam, response);
     }
 
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @PostMapping("/createEventReport")
+    @ApiOperation("暂态事件报告导出")
+    public void createEventReport(@RequestBody @Validated List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException {
+        commMonitorEventReportService.createEventReport(index,response);
+    }
 }

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java

@@ -2021,7 +2021,7 @@ public class ReportServiceImpl implements ReportService {
     @Override
     public Page<WaveTypeVO> getEventReport(WaveTypeParam deviceInfoParam) {
         Page<WaveTypeVO> page = new Page<>(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize());
-        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalAllDeviceInfo(deviceInfoParam).getData();
+        List<GeneralDeviceDTO> generalDeviceDTOList = generalDeviceInfoClient.getPracticalRunDeviceInfo(deviceInfoParam).getData();
         List<String> lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList());
         if (CollUtil.isEmpty(lineIds)) {
             return page;

pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/VoltageRideThroughEventServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import com.njcn.device.pq.api.DeptLineFeignClient;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.pojo.vo.LineDetailDataVO;
 import com.njcn.event.pojo.param.VoltageRideThroughQueryParam;
 import com.njcn.event.pojo.po.EventDetail;
@@ -14,7 +15,6 @@ import com.njcn.event.common.service.EventDetailService;
 import com.njcn.event.service.majornetwork.SpThroughService;
 import com.njcn.event.service.majornetwork.VoltageRideThroughEventService;
 import com.njcn.event.pojo.param.SpThroughParam;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.pojo.po.Area;

pqs-event/event-common/src/main/java/com/njcn/event/common/mapper/RmpEventDetailMapper.java

@@ -1,10 +1,8 @@
 package com.njcn.event.common.mapper;
 
-import cn.hutool.core.date.DateTime;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.njcn.event.pojo.dto.EventCount;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
-import com.njcn.event.pojo.vo.RmpEventDetailVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

pqs-event/event-common/src/main/java/com/njcn/event/common/pojo/dto/EventEigDetail.java

@@ -0,0 +1,69 @@
+package com.njcn.event.common.pojo.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @description: 暂降事件特征幅值
+ * @author: denghuajun
+ * @time: 2019-10-17 13:59:51
+ **/
+@Data
+public class EventEigDetail implements Serializable {
+    /**
+     * 输出参数
+     * 持续时间（单位秒）
+     * hold_time_rms 有效值算法持续时间
+     * hold_time_dq dq变换算法持续时间
+     * 波形起始点（单位度）
+     * POW_a A相波形起始点
+     * POW_b B相波形起始点
+     * POW_c C相波形起始点
+     * 跳变段电压变化率（单位V/S）
+     * Voltagechange_Va A相跳变段电压变化率
+     * Voltagechange_Vb B相跳变段电压变化率
+     * Voltagechange_Vc C相跳变段电压变化率
+     * 分段信息
+     * SEG_T_num 分段数目
+     * SEG_T0_idx 原始分段位置
+     * SEG_T_idx 修正分段位置
+     * 有效值分段信息
+     * SEG_RMS_T_num 分段数目
+     * SEG_RMS_T_idx 分段位置
+     * 特征幅值（单位V）
+     * u_min_num 特征值个数
+     * ua_min A相电压特征值
+     * ub_min B相电压特征值
+     * uc_min C相电压特征值
+     * u3_min 三相电压特征值
+     * order_min_idx 最小值位置
+     * 相位跳变(单位度)
+     * angle_diff_ap A相相位正跳变
+     * angle_diff_bp B相相位正跳变
+     * angle_diff_cp C相相位正跳变
+     * angle_diff_an A相相位负跳变
+     * angle_diff_bn B相相位负跳变
+     * angle_diff_cn C相相位负跳变
+     * bph_max_value 不平衡度（单位%）
+     */
+    public float hold_time_dq;
+    public float pow_a;
+    public float pow_b;
+    public float pow_c;
+    public float voltagechange_Va;
+    public float voltagechange_Vb;
+    public float voltagechange_Vc;
+    public float ua_min;
+    public float ub_min;
+    public float uc_min;
+    public float angle_diff_ap;
+    public float angle_diff_bp;
+    public float angle_diff_cp;
+    public float bph_max_value;
+    public String sagReason; // 暂降原因描述，数据库获取
+    public String sagType; // 暂降类型描述，数据库获取
+    private Integer pttype;
+
+
+}

pqs-event/event-common/src/main/java/com/njcn/event/common/pojo/dto/EventInfoDetailVO.java

@@ -0,0 +1,63 @@
+package com.njcn.event.common.pojo.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * @Description:
+ * @Author: wr
+ * @Date: 2023/11/1 13:17
+ */
+@Data
+public class EventInfoDetailVO implements Serializable {
+
+    @ApiModelProperty("监测点名称")
+    private String lineName;
+
+    @ApiModelProperty("供电公司名称")
+    private String gdName;
+
+    @ApiModelProperty("变电站名称")
+    private String bdzName;
+
+    @ApiModelProperty("终端名称")
+    private String devName;
+
+    @ApiModelProperty("电压等级")
+    private String scale;
+
+    @ApiModelProperty("ip")
+    private String ip;
+
+    @ApiModelProperty("暂降事件id")
+    private String eventDetailIndex;
+
+    @ApiModelProperty("触发时间")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS")
+    private LocalDateTime timeID;
+
+    @ApiModelProperty("持续时间")
+    private Double persistTime;
+
+    @ApiModelProperty("处理结果第一条事件发生时间毫秒")
+    private Double ms;
+
+    @ApiModelProperty("特征幅值")
+    private Double eventValue;
+
+    @ApiModelProperty("报告状态")
+    private int report;
+
+    @ApiModelProperty("评价")
+    private int evaluate;
+
+    @ApiModelProperty("报告路径")
+    private String reportPath;
+
+
+
+}

pqs-event/event-common/src/main/java/com/njcn/event/common/service/CommMonitorEventReportService.java

@@ -2,8 +2,11 @@ package com.njcn.event.common.service;
 
 import com.njcn.event.common.pojo.dto.LineDetailDataCommDTO;
 import com.njcn.event.pojo.param.ExportParam;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
 
 /**
  * pqs
@@ -15,4 +18,10 @@ public interface CommMonitorEventReportService {
 
     void getLineExport(ExportParam exportParam, LineDetailDataCommDTO lineDetailDataCommDTO, HttpServletResponse response);
 
+
+    /**
+     * 暂态事件报告
+     * @param index
+     */
+    void createEventReport(List<String> index, HttpServletResponse response) throws IOException, InvalidFormatException;
 }

pqs-event/event-common/src/main/java/com/njcn/event/common/service/WaveService.java

@@ -0,0 +1,28 @@
+package com.njcn.event.common.service;
+
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
+import com.njcn.event.common.pojo.dto.EventEigDetail;
+import com.njcn.event.file.pojo.dto.WaveDataDTO;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
+
+import java.util.List;
+
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-02-26
+ * @Description:
+ */
+public interface WaveService {
+
+    /**
+     * 通过优化后的方式获取波形数据
+     * @param
+     * @param
+     * @return
+     */
+    WaveDataDTO getWavedata(RmpEventDetailPO eventDetail, AreaLineInfoVO line);
+
+
+    List<EventEigDetail> eventDetailEigenvalue(String eventDetailIndex,Integer ptType);
+}

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/CommMonitorEventReportServiceImpl.java

@@ -1,34 +1,43 @@
 package com.njcn.event.common.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
-import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
 import com.njcn.echarts.pojo.constant.PicCommonData;
 import com.njcn.echarts.util.DrawPicUtil;
 import com.njcn.event.common.mapper.RmpEventDetailMapper;
+import com.njcn.event.common.pojo.dto.EventEigDetail;
 import com.njcn.event.common.pojo.dto.LineDetailDataCommDTO;
+import com.njcn.event.common.service.CommMonitorEventReportService;
 import com.njcn.event.common.service.EventAnalysisService;
 import com.njcn.event.common.service.EventReportService;
-import com.njcn.event.common.service.CommMonitorEventReportService;
+import com.njcn.event.common.service.WaveService;
+import com.njcn.event.common.pojo.dto.EventInfoDetailVO;
+import com.njcn.event.common.utils.WordUtil;
 import com.njcn.event.common.utils.WordUtils;
+import com.njcn.event.file.component.WavePicComponent;
+import com.njcn.event.file.pojo.bo.WaveDataDetail;
+import com.njcn.event.file.pojo.dto.WaveDataDTO;
+import com.njcn.event.file.utils.WaveUtil;
 import com.njcn.event.pojo.param.ExportParam;
 import com.njcn.event.pojo.param.StatisticsParam;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.RmpEventDetailPO;
 import com.njcn.event.pojo.vo.*;
+import com.njcn.oss.utils.FileStorageUtil;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.enums.DicDataEnum;
 import com.njcn.system.enums.DicDataTypeEnum;
 import com.njcn.system.pojo.po.DictData;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFCellStyle;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
 import org.apache.poi.util.Units;
 import org.apache.poi.xwpf.usermodel.*;
@@ -38,9 +47,7 @@ import org.springframework.stereotype.Service;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
+import java.io.*;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.math.RoundingMode;
@@ -49,6 +56,7 @@ import java.text.SimpleDateFormat;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 
 /**
@@ -63,17 +71,16 @@ import java.util.stream.Collectors;
 public class CommMonitorEventReportServiceImpl implements CommMonitorEventReportService {
 
 
+    private final DicDataFeignClient dicDataFeignClient;
+    private final EventReportService eventReportService;
+    private final EventAnalysisService eventAnalysisService;
+    private final RmpEventDetailMapper rmpEventDetailMapper;
+    private final WaveService waveService;
+    private final DrawPicUtil drawPicUtil;
+    private final WavePicComponent wavePicComponent;
+    private final FileStorageUtil fileStorageUtil;
     private final LineFeignClient lineFeignClient;
 
-    private final DicDataFeignClient dicDataFeignClient;
-
-    private final EventReportService eventReportService;
-    //调用暂降密度接口
-    private final EventAnalysisService eventAnalysisService;
-    private final MonitorClient monitorClient;
-    private final RmpEventDetailMapper rmpEventDetailMapper;
-
-    private final DrawPicUtil drawPicUtil;
 
     /**
      * 监测点导出word
@@ -218,7 +225,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
                     EventDetail eventDetail = plot.get(j);
                     String s = eventDetail.getStartTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
 
-                    insertRow(doc, table, centerParagraph, false, j + 1 + "", s, BigDecimal.valueOf(eventDetail.getFeatureAmplitude() * 100).setScale(2, RoundingMode.HALF_UP).toString(), eventDetail.getDuration() + "", eventDetail.getAdvanceType(), eventDetail.getAdvanceReason(), eventDetail.getSeverity() + "");
+                    insertRow(doc, table, centerParagraph, false, j + 1 + "", s, BigDecimal.valueOf(eventDetail.getFeatureAmplitude() * 100).setScale(2, RoundingMode.HALF_UP).toString(), eventDetail.getDuration() + "", Objects.isNull(eventDetail.getAdvanceType()) ? "/" : eventDetail.getAdvanceType(), Objects.isNull(eventDetail.getAdvanceReason()) ? "/" : eventDetail.getAdvanceReason(), Objects.isNull(eventDetail.getSeverity()) ? "/" : eventDetail.getSeverity() + "");
                 }
                 i++;
             }
@@ -361,7 +368,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
                 } else {
                     for (int j = 0; j < reasonTypeTime.size(); j++) {
                         TimeVO timeVO = reasonTypeTime.get(j);
-                        insertRow(doc, table1, centerParagraph, false,timeVO.getFulltime(), timeVO.getTimes());
+                        insertRow(doc, table1, centerParagraph, false, timeVO.getFulltime(), timeVO.getTimes());
                     }
                 }
                 two++;
@@ -376,7 +383,7 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
         if (fly) {
             List<DictData> tempDictType = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.EVENT_STATIS.getCode()).getData();
             List<String> typeIds = tempDictType.stream().filter(x -> DicDataEnum.VOLTAGE_DIP.getCode().equals(x.getCode()) || DicDataEnum.SHORT_INTERRUPTIONS.getCode().equals(x.getCode()))
-                .map(DictData::getId).collect(Collectors.toList());
+                    .map(DictData::getId).collect(Collectors.toList());
             List<EventDetail> tempInfo = info.stream().filter(temp -> typeIds.contains(temp.getEventType())).collect(Collectors.toList());
             StatisticVO statistic = eventReportService.getStatistic(tempInfo, reasonData, typeData);
             if (exportParam.isYybg() || exportParam.isYytx()) {
@@ -460,8 +467,8 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
             response.setContentType("application/octet-stream;charset=UTF-8");
             doc.write(outputStream);
             outputStream.close();
-        }catch (Exception e){
-            throw new BusinessException(CommonResponseEnum.FAIL,"导出监测点暂降报告异常");
+        } catch (Exception e) {
+            throw new BusinessException(CommonResponseEnum.FAIL, "导出监测点暂降报告异常");
         }
 
     }
@@ -520,14 +527,8 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
     }
 
 
-    public void setCellStyle(HSSFCell cellname, String value, HSSFCellStyle style) {
-        cellname.setCellValue(value);
-        cellname.setCellStyle(style);
-    }
 
     /**
-     *
-     *
      * @param document 文档
      * @param image    图片base64
      * @param name     图片名
@@ -536,16 +537,16 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
      */
     public void createPic(XWPFDocument document, String image, String name) {
         try {
-        XWPFParagraph picParagraph = WordUtils.getCenterParagraph(document);
-        XWPFRun createRun = picParagraph.createRun();
-        if (image.contains(PicCommonData.PNG_PREFIX)) {
-            image = image.replace(PicCommonData.PNG_PREFIX, "");
-        }
-        byte[] bytes = Base64.getDecoder().decode(image);
-        InputStream in = new ByteArrayInputStream(bytes);
-        createRun.addPicture(in, 5, name, Units.toEMU(410), Units.toEMU(170));
-        }catch (Exception e){
-            log.error("在word中创建图片异常:",e);
+            XWPFParagraph picParagraph = WordUtils.getCenterParagraph(document);
+            XWPFRun createRun = picParagraph.createRun();
+            if (image.contains(PicCommonData.PNG_PREFIX)) {
+                image = image.replace(PicCommonData.PNG_PREFIX, "");
+            }
+            byte[] bytes = Base64.getDecoder().decode(image);
+            InputStream in = new ByteArrayInputStream(bytes);
+            createRun.addPicture(in, 5, name, Units.toEMU(410), Units.toEMU(170));
+        } catch (Exception e) {
+            log.error("在word中创建图片异常:", e);
         }
     }
 
@@ -581,13 +582,72 @@ public class CommMonitorEventReportServiceImpl implements CommMonitorEventReport
 //                .map(DictData::getId).collect(Collectors.toList());
         //数据暂降查询
         List<RmpEventDetailPO> info = rmpEventDetailMapper.selectList(new LambdaQueryWrapper<RmpEventDetailPO>()
-                .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
+                        .eq(RmpEventDetailPO::getMeasurementPointId, statisticsParam.getLineIndex())
 //                .in(RmpEventDetailPO::getEventType, typeIds)
-                .ge(StrUtil.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
-                .le(StrUtil.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
+                        .ge(StrUtil.isNotBlank(statisticsParam.getStartTime()), RmpEventDetailPO::getStartTime, DateUtil.beginOfDay(DateUtil.parse(statisticsParam.getStartTime())))
+                        .le(StrUtil.isNotBlank(statisticsParam.getEndTime()), RmpEventDetailPO::getStartTime, DateUtil.endOfDay(DateUtil.parse(statisticsParam.getEndTime())))
+                        .orderByDesc(RmpEventDetailPO::getStartTime)
         );
 
         return BeanUtil.copyToList(info, EventDetail.class);
     }
 
+
+    /**
+     * 生成暂降事件报告
+     */
+    public void createEventReport(List<String> eventIndex, HttpServletResponse response) throws IOException, InvalidFormatException {
+        WordUtil wordUtil = new WordUtil();
+        for (String index : eventIndex) {
+            RmpEventDetailPO detail = rmpEventDetailMapper.selectById(index);
+            List<AreaLineInfoVO> lineDetail = lineFeignClient.getBaseLineAreaInfo(Stream.of(detail.getLineId()).collect(Collectors.toList())).getData();
+            AreaLineInfoVO line = lineDetail.get(0);
+            WaveDataDTO waveData = waveService.getWavedata(detail, line);
+            //数据筛选,如果是双路电压的话，会存在2个波形数据
+            List<WaveDataDetail> waveDataDetails = WaveUtil.filterWaveData(waveData);
+            if (ObjUtil.isNull(waveData)) {
+                throw new BusinessException(CommonResponseEnum.FAIL, "没有波形数据");
+            } else {
+                //获取瞬时波形
+                String instantPath = wavePicComponent.generateImageShun(waveData, waveDataDetails);
+                InputStream instantStream = fileStorageUtil.getFileStream(instantPath);
+                String imageShun64 = cn.hutool.core.codec.Base64.encode(instantStream);
+
+                wordUtil.translateShun(index, imageShun64);
+                //获取rms波形
+                String rmsPath = wavePicComponent.generateImageRms(waveData, waveDataDetails);
+                InputStream rmsStream = fileStorageUtil.getFileStream(rmsPath);
+                String rmsShun64 = cn.hutool.core.codec.Base64.encode(rmsStream);
+                wordUtil.translateRms(index, rmsShun64);
+
+                EventInfoDetailVO eventInfoList = new EventInfoDetailVO();
+                eventInfoList.setLineName(line.getLineName());
+                eventInfoList.setGdName(line.getGdName());
+                eventInfoList.setBdzName(line.getSubName());
+                eventInfoList.setDevName(line.getDeviceName());
+                eventInfoList.setScale(line.getVoltageScale());
+                eventInfoList.setIp(line.getIp());
+                eventInfoList.setEventDetailIndex(detail.getEventId());
+                eventInfoList.setTimeID(detail.getStartTime());
+                eventInfoList.setPersistTime(detail.getDuration());
+                eventInfoList.setMs(detail.getFirstMs());
+                eventInfoList.setEventValue(detail.getFeatureAmplitude());
+                wordUtil.setEventInfoList(index, eventInfoList);
+                List<EventEigDetail> eventDetailEigenvalue = waveService.eventDetailEigenvalue(index,line.getPtType());
+                wordUtil.setEventDetailEigenvalue(index, eventDetailEigenvalue);
+
+            }
+        }
+        wordUtil.createReport(eventIndex);
+        try {
+            ServletOutputStream outputStream = response.getOutputStream();
+            String fileName = URLEncoder.encode("暂降事件报告_" + DateUtil.format(new Date(),DatePattern.NORM_DATE_PATTERN)+ ".docx", "UTF-8");
+            response.setHeader("Content-Disposition", "attachment; filename=\"" + fileName + "\"");
+            response.setContentType("application/octet-stream;charset=UTF-8");
+            wordUtil.getDocument().write(outputStream);
+            outputStream.close();
+        } catch (Exception e) {
+            throw new BusinessException(CommonResponseEnum.FAIL, "导出暂降事件报告异常");
+        }
+    }
 }

pqs-event/event-common/src/main/java/com/njcn/event/common/service/impl/WaveServiceImpl.java

@@ -0,0 +1,125 @@
+package com.njcn.event.common.service.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.njcn.advance.api.EventWaveAnalysisFeignClient;
+import com.njcn.advance.pojo.dto.waveAnalysis.EntityAdvancedData;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.utils.PubUtils;
+import com.njcn.device.pq.pojo.vo.AreaLineInfoVO;
+import com.njcn.event.common.pojo.dto.EventEigDetail;
+import com.njcn.event.common.service.WaveService;
+import com.njcn.event.file.component.WaveFileComponent;
+import com.njcn.event.file.pojo.dto.WaveDataDTO;
+import com.njcn.event.file.pojo.enums.WaveFileResponseEnum;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
+import com.njcn.oss.constant.GeneralConstant;
+import com.njcn.oss.constant.OssPath;
+import com.njcn.oss.utils.FileStorageUtil;
+import com.njcn.system.api.DicDataFeignClient;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.io.InputStream;
+import java.util.*;
+
+
+/**
+ * @Author: cdf
+ * @CreateTime: 2026-02-26
+ * @Description:
+ */
+@Service
+@RequiredArgsConstructor
+@Slf4j
+public class WaveServiceImpl implements WaveService {
+
+    private final WaveFileComponent waveFileComponent;
+    private final FileStorageUtil fileStorageUtil;
+    private final EventWaveAnalysisFeignClient eventWaveAnalysisFeignClient;
+
+    /**
+     * 根据暂降事件索引获取波形数据
+     * 注：当前只考虑本地的波形文件
+     *
+     * @param eventDetail 暂态事件
+     * @param line       监测点
+     */
+    @Override
+    public WaveDataDTO getWavedata(RmpEventDetailPO eventDetail, AreaLineInfoVO line) {
+        WaveDataDTO waveDataDTO = null;
+        if (ObjectUtil.isNotEmpty(line)) {
+            String waveName = eventDetail.getWavePath();
+            if (StrUtil.isBlank(waveName)) {
+                throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
+            }
+            String wavePath = OssPath.WAVE_DIR + line.getIp() + StrUtil.SLASH + waveName;
+            try (
+                    InputStream cfgStream = fileStorageUtil.getFileStream(wavePath + GeneralConstant.CFG);
+                    InputStream datStream = fileStorageUtil.getFileStream(wavePath + GeneralConstant.DAT)
+            ) {
+                if (Objects.isNull(cfgStream) || Objects.isNull(datStream)) {
+                    throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
+                }
+                waveDataDTO = waveFileComponent.getComtrade(cfgStream, datStream, 1);
+            } catch (Exception e) {
+                try {
+                    InputStream cfgStreamLower = fileStorageUtil.getFileStream(wavePath + GeneralConstant.CFG_LOWER);
+                    InputStream datStreamLower = fileStorageUtil.getFileStream(wavePath + GeneralConstant.DAT_LOWER);
+                    if (Objects.isNull(cfgStreamLower) || Objects.isNull(datStreamLower)) {
+                        throw new BusinessException(WaveFileResponseEnum.ANALYSE_WAVE_NOT_FOUND);
+                    }
+                    waveDataDTO = waveFileComponent.getComtrade(cfgStreamLower, datStreamLower, 1);
+                } catch (Exception e1) {
+                    throw new BusinessException(WaveFileResponseEnum.WAVE_DATA_INVALID);
+                }
+            }
+            waveDataDTO = waveFileComponent.getValidData(waveDataDTO);
+            waveDataDTO.setPtType(line.getPtType());
+            waveDataDTO.setPt(line.getPt1() * 1.0 / line.getPt2());
+            waveDataDTO.setCt(line.getCt1() * 1.0 / line.getCt2());
+            waveDataDTO.setMonitorName(line.getLineName());
+        }
+        return waveDataDTO;
+    }
+
+    @Override
+    public List<EventEigDetail> eventDetailEigenvalue(String eventDetailIndex,Integer ptType) {
+        List<EventEigDetail> eventInfoDetails = new ArrayList<>();
+        EntityAdvancedData entityAdvancedData = eventWaveAnalysisFeignClient.analysis(eventDetailIndex).getData() ;
+        if (entityAdvancedData.backNumber != -1) {
+            for (int i = 0; i < entityAdvancedData.backNumber; i++) {
+                EventEigDetail eventEigDetail = new EventEigDetail();
+                eventEigDetail.setHold_time_dq(entityAdvancedData.evt_buf[i].hold_time_dq * 1000);
+                eventEigDetail.setPow_a(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].POW_a));
+                eventEigDetail.setPow_b(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].POW_b));
+                eventEigDetail.setPow_c(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].POW_c));
+
+                eventEigDetail.setVoltagechange_Va(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].Voltagechange_Va / 1000));
+                eventEigDetail.setVoltagechange_Vb(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].Voltagechange_Vb / 1000));
+                eventEigDetail.setVoltagechange_Vc(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].Voltagechange_Vc / 1000));
+
+
+                eventEigDetail.setUa_min(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].ua_min[0]));
+                eventEigDetail.setUb_min(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].ub_min[0]));
+                eventEigDetail.setUc_min(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].ua_min[0]));
+
+                eventEigDetail.setAngle_diff_ap(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].angle_diff_ap[0]));
+                eventEigDetail.setAngle_diff_bp(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].angle_diff_bp[0]));
+                eventEigDetail.setAngle_diff_cp(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].angle_diff_cp[0]));
+
+                eventEigDetail.setBph_max_value(PubUtils.floatRound(2, entityAdvancedData.evt_buf[i].bph_max_value[0]));
+                eventEigDetail.setSagReason(entityAdvancedData.sagReason[0]);//暂降原因，暂降原因都一样
+                eventEigDetail.setSagType(entityAdvancedData.sagType[i]);//暂降类型
+                eventInfoDetails.add(eventEigDetail);
+                eventEigDetail.setPttype(ptType);
+            }
+        } else {
+            eventInfoDetails = null;
+        }
+        return eventInfoDetails;
+    }
+
+
+}

pqs-event/event-common/src/main/java/com/njcn/event/common/utils/WordUtil.java

@@ -0,0 +1,342 @@
+package com.njcn.event.common.utils;
+
+
+import com.njcn.event.common.pojo.dto.EventEigDetail;
+import com.njcn.event.common.pojo.dto.EventInfoDetailVO;
+import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
+import org.apache.poi.util.Units;
+import org.apache.poi.xwpf.usermodel.*;
+import org.openxmlformats.schemas.wordprocessingml.x2006.main.*;
+import sun.misc.BASE64Decoder;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.math.BigInteger;
+import java.time.format.DateTimeFormatter;
+import java.util.*;
+
+public class WordUtil {
+    private Map<String, List<byte[]>> listShunPic = new HashMap<>();
+    private Map<String, List<byte[]>> listRmsPic = new HashMap<>();
+    private XWPFDocument document;
+    private Map<String, List<EventEigDetail>> eventDetailEigenvalue = new HashMap<>();
+    private Map<String, EventInfoDetailVO> eventInfoList = new HashMap<>();
+
+    public void setEventInfoList(String index, EventInfoDetailVO eventInfoList) {
+        EventInfoDetailVO tmp = eventInfoList == null ? new EventInfoDetailVO() : eventInfoList;
+        this.eventInfoList.put(index, tmp);
+    }
+
+    public void setEventDetailEigenvalue(String index, List<EventEigDetail> eventDetailEigenvalue) {
+        List<EventEigDetail> tmp = eventDetailEigenvalue == null ? new ArrayList<>() : eventDetailEigenvalue;
+        this.eventDetailEigenvalue.put(index, tmp);
+    }
+
+    public XWPFDocument getDocument() {
+        return document;
+    }
+
+    public WordUtil() {
+        this.document = new XWPFDocument();
+    }
+
+    public void translateShun(String index, String strShunPic) {
+        BASE64Decoder decoder = new BASE64Decoder();
+        List<byte[]> tmp = new ArrayList<>();
+        try {
+            byte[] buffer = decoder.decodeBuffer(strShunPic);
+            tmp.add(buffer);
+        } catch (Exception e) {
+        }
+        listShunPic.put(index, tmp);
+    }
+
+    public void translateRms(String index, String strRmsPic) {
+        BASE64Decoder decoder = new BASE64Decoder();
+        List<byte[]> tmp = new ArrayList<>();
+        try {
+            byte[] buffer = decoder.decodeBuffer(strRmsPic);
+            tmp.add(buffer);
+        } catch (Exception e) {
+        }
+        listRmsPic.put(index, tmp);
+    }
+
+    public void createReport(List<String> eventIndex) throws IOException, InvalidFormatException {
+        setHeadingStyle(this.document);
+
+        // 添加标题
+        XWPFParagraph titleParagraph = getCenterParagraph(this.document);
+        addLine(titleParagraph, 11);
+        // 设置段落居中
+        XWPFRun titleParagraphBigRun = titleParagraph.createRun();
+        addParagraph(titleParagraphBigRun, "宋体", 28, "000000", "暂降事件报告", true);
+        addLine(titleParagraph, 17);
+        XWPFRun titleParagraphDateRun = titleParagraph.createRun();
+        addParagraph(titleParagraphDateRun, "宋体", 16, "000000", "南京灿能电力自动化股份有限公司", false);
+        addLine(titleParagraph, 1);
+        titleParagraphDateRun = titleParagraph.createRun();
+        addParagraph(titleParagraphDateRun, "宋体", 14, "000000", "生成时间：" + getRightNow(), false);
+        addLine(titleParagraph, 8);
+        titleParagraph = getLeftParagraph(this.document);
+        titleParagraphDateRun = titleParagraph.createRun();
+        addParagraph(titleParagraphDateRun, "宋体", 10, "000000", "【申明】本公司保留对报告的修改权，恕不另行通知，敬请关注最新版本。", false);
+        for (int m = 0; m < eventIndex.size(); m++) {
+            String eventId = eventIndex.get(m);
+            List<EventEigDetail> eventDetailEigenvaluetmp = this.eventDetailEigenvalue.get(eventId);
+            String time = eventInfoList.get(eventId).getTimeID().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS"));
+            createTitle(document, (m + 1) + ". " + time, "标题 1", 0, 20);
+            createTitle(document, (m + 1) + "." + "1. 基本信息", "标题 2", 0, 15);
+            XWPFParagraph introductionContentParagraph = getLeftParagraph(document);
+            introductionContentParagraph.setIndentationFirstLine(200);
+            XWPFRun introductionContentRun = introductionContentParagraph.createRun();
+            addParagraph(introductionContentRun, "宋体", 11, "000000", eventInfoList.get(eventId).getGdName() + "，" + eventInfoList.get(eventId).getBdzName() + "，网络参数：" + eventInfoList.get(eventId).getIp() + "，" + eventInfoList.get(eventId).getLineName() + "于" + time + "发生暂降事件，特征幅值：" + (eventInfoList.get(eventId).getEventValue()) + "%，持续时间：" + eventInfoList.get(eventId).getPersistTime() + "s。", false);
+            createTitle(document, (m + 1) + "." + "2. 波形图", "标题 2", 0, 15);
+            createTitle(document, (m + 1) + "." + "2.1 瞬时波形图", "标题 3", 200, 11);
+            for (int shun = 0; shun < listShunPic.get(eventId).size(); shun++) {
+                createPic(document, "瞬时波形" + (shun), listShunPic.get(eventId).get(shun));
+            }
+            createTitle(document, (m + 1) + "." + "2.2 RMS波形图", "标题 3", 200, 11);
+            for (int rms = 0; rms < listRmsPic.get(eventId).size(); rms++) {
+                createPic(document, "RMS波形" + (eventId), listRmsPic.get(eventId).get(rms));
+            }
+            createTitle(document, (m + 1) + "." + "3. 多特征值", "标题 2", 0, 15);
+
+            XWPFParagraph value = getLeftParagraph(document);
+            XWPFRun valuex = value.createRun();
+            addParagraph(valuex, "宋体", 11, "000000", "事件总分段数：" + eventDetailEigenvaluetmp.size(), false);
+            addLine(value, 1);
+
+            if (eventDetailEigenvaluetmp.size() == 0) {
+                continue;
+            }
+            valuex = value.createRun();
+            addParagraph(valuex, "宋体", 11, "000000", "暂降原因：" + eventDetailEigenvaluetmp.get(0).getSagReason(), false);
+            addLine(value, 1);
+
+            for (int i = 0; i < eventDetailEigenvaluetmp.size(); i++) {
+                valuex = value.createRun();
+                addParagraph(valuex, "宋体", 11, "000000", "分段" + (i + 1) + "多特征值", true);
+                addLine(value, 1);
+                valuex = value.createRun();
+                addParagraph(valuex, "宋体", 11, "000000", "波形起始点相位(°)：" + (eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "A" : "AB") + "相" + eventDetailEigenvaluetmp.get(i).getPow_a() + "   " + (eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "B" : "BC") + "相" + eventDetailEigenvaluetmp.get(i).getPow_b() + "   " + ((eventDetailEigenvaluetmp.get(0).getPttype() == 2) ? "" : ((eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "C" : "CA") + "相" + eventDetailEigenvaluetmp.get(i).getPow_c())), false);
+                addLine(value, 1);
+                valuex = value.createRun();
+                addParagraph(valuex, "宋体", 11, "000000", "跳变段电压变化率(V/ms)：" + (eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "A" : "AB") + "相" + eventDetailEigenvaluetmp.get(i).getVoltagechange_Va() + "   " + (eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "B" : "BC") + "相" + eventDetailEigenvaluetmp.get(i).getVoltagechange_Vb() + "   " + ((eventDetailEigenvaluetmp.get(0).getPttype() == 2) ? "" : ((eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "C" : "CA") + "相" + eventDetailEigenvaluetmp.get(i).getVoltagechange_Vc())), false);
+                addLine(value, 1);
+                valuex = value.createRun();
+                addParagraph(valuex, "宋体", 11, "000000", "相位跳变(°)：" + (eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "A" : "AB") + "相" + eventDetailEigenvaluetmp.get(i).getAngle_diff_ap() + "   " + (eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "B" : "BC") + "相" + eventDetailEigenvaluetmp.get(i).getAngle_diff_bp() + "   " + ((eventDetailEigenvaluetmp.get(0).getPttype() == 2) ? "" : ((eventDetailEigenvaluetmp.get(0).getPttype() == 0 ? "C" : "CA") + "相" + eventDetailEigenvaluetmp.get(i).getAngle_diff_cp())), false);
+                /*
+                 * addLine(value, 1); valuex = value.createRun();
+                 * addParagraph(valuex, "宋体", 11, "000000", "特征幅值(V)：A相" +
+                 * this.eventDetailEigenvalue.get(i).getUa_min() + "   B相" +
+                 * this.eventDetailEigenvalue.get(i).getUb_min() + "   C相" +
+                 * this.eventDetailEigenvalue.get(i).getUc_min(), false);
+                 */
+                /*
+                 * addLine(value, 1); valuex = value.createRun();
+                 * addParagraph(valuex, "宋体", 11, "000000", "持续时间(ms)：" +
+                 * this.eventDetailEigenvalue.get(i).getHold_time_dq(), false);
+                 */
+                addLine(value, 1);
+                valuex = value.createRun();
+                addParagraph(valuex, "宋体", 11, "000000", "不平衡度(%)：" + eventDetailEigenvaluetmp.get(i).getBph_max_value(), false);
+                addLine(value, 1);
+                valuex = value.createRun();
+                addParagraph(valuex, "宋体", 11, "000000", "暂降类型：" + eventDetailEigenvaluetmp.get(i).getSagType(), false);
+                addLine(value, 1);
+            }
+            addLine(value, 1);
+        }
+        System.out.println("11");
+    }
+
+    public void createPic(XWPFDocument document, String name, byte[] base64Info) throws IOException, InvalidFormatException {
+        XWPFParagraph picParagraph = getCenterParagraph(document);
+        XWPFRun createRun = picParagraph.createRun();
+        InputStream in = new ByteArrayInputStream(base64Info);
+        createRun.addPicture(in, 5, name, Units.toEMU(410), Units.toEMU(170));
+    }
+
+    public void createTitle(XWPFDocument document, String message, String style, int line, int fontSize) {
+        XWPFParagraph summaeTableParagraph = getLeftParagraph(document);
+        summaeTableParagraph.setStyle(style);
+        summaeTableParagraph.setIndentationFirstLine(line);
+        XWPFRun summaeTableRun = summaeTableParagraph.createRun();
+        addParagraph(summaeTableRun, "宋体", fontSize, "000000", message, false);
+    }
+
+    public void setParagraphStyle(XWPFParagraph paragraph) {
+        paragraph.setSpacingBefore(100);
+        paragraph.setSpacingAfter(100);
+    }
+
+    /**
+     * 返回指定格式的段落 居中型
+     *
+     * @param document 文档对象
+     */
+    public XWPFParagraph getCenterParagraph(XWPFDocument document) {
+        XWPFParagraph paragraph = document.createParagraph();
+        setParagraphStyle(paragraph);
+        paragraph.setAlignment(ParagraphAlignment.CENTER);
+        paragraph.setVerticalAlignment(TextAlignment.CENTER);
+        return paragraph;
+    }
+
+    /**
+     * 返回指定格式的段落 居左型
+     *
+     * @param document 文档对象
+     */
+    public XWPFParagraph getLeftParagraph(XWPFDocument document) {
+        XWPFParagraph paragraph = document.createParagraph();
+        setParagraphStyle(paragraph);
+        paragraph.setAlignment(ParagraphAlignment.LEFT);
+        return paragraph;
+    }
+
+    /**
+     * 添加换行符
+     *
+     * @param paragraph 指定段落
+     * @param amount    行数
+     */
+    public void addLine(XWPFParagraph paragraph, Integer amount) {
+        XWPFRun run = paragraph.createRun();
+        run.setFontSize(11);
+        for (int i = 0; i < amount; i++) {
+            run.addCarriageReturn();
+        }
+    }
+
+    /**
+     * 添加段落文本
+     *
+     * @param run             文本执行对象
+     * @param fontFamily      字体类型
+     * @param fontSize        字体大小
+     * @param backgroundColor 字体颜色
+     * @param bold            是否加粗
+     */
+    public void addParagraph(XWPFRun run, String fontFamily, Integer fontSize, String backgroundColor, String message, boolean bold) {
+        run.setText(message);
+        run.setColor(backgroundColor);
+        run.setFontSize(fontSize);
+        run.setFontFamily(fontFamily);
+        run.setBold(bold);
+    }
+
+    /**
+     * 增加自定义标题样式。这里用的是stackoverflow的源码
+     *
+     * @param docxDocument 目标文档
+     * @param strStyleId   样式名称
+     * @param headingLevel 样式级别
+     */
+    public void addCustomHeadingStyle(XWPFDocument docxDocument, String strStyleId, int headingLevel) {
+
+        CTStyle ctStyle = CTStyle.Factory.newInstance();
+        ctStyle.setStyleId(strStyleId);
+
+        CTString styleName = CTString.Factory.newInstance();
+        styleName.setVal(strStyleId);
+        ctStyle.setName(styleName);
+
+        CTDecimalNumber indentNumber = CTDecimalNumber.Factory.newInstance();
+        indentNumber.setVal(BigInteger.valueOf(headingLevel));
+
+        // lower number > style is more prominent in the formats bar
+        ctStyle.setUiPriority(indentNumber);
+
+        CTOnOff onoffnull = CTOnOff.Factory.newInstance();
+        ctStyle.setUnhideWhenUsed(onoffnull);
+
+        // style shows up in the formats bar
+        ctStyle.setQFormat(onoffnull);
+
+        // style defines a heading of the given level
+        CTPPr ppr = CTPPr.Factory.newInstance();
+        ppr.setOutlineLvl(indentNumber);
+        ctStyle.setPPr(ppr);
+
+        XWPFStyle style = new XWPFStyle(ctStyle);
+
+        // is a null op if already defined
+        XWPFStyles styles = docxDocument.createStyles();
+
+        style.setType(STStyleType.PARAGRAPH);
+        styles.addStyle(style);
+
+    }
+
+    /**
+     * 设置文档中标题格式
+     */
+    public void setHeadingStyle(XWPFDocument document) {
+        addCustomHeadingStyle(document, "标题 1", 1);
+        addCustomHeadingStyle(document, "标题 2", 2);
+        addCustomHeadingStyle(document, "标题 3", 3);
+        addCustomHeadingStyle(document, "标题 4", 4);
+        addCustomHeadingStyle(document, "标题 5", 5);
+        addCustomHeadingStyle(document, "标题 6", 6);
+        addCustomHeadingStyle(document, "标题 7", 7);
+    }
+
+    /**
+     * 给表格添加一行数据
+     *
+     * @param paragraph 段落对象
+     * @param row       行对象
+     * @param data      不定长度的数据
+     */
+    public void setExcelContent(XWPFParagraph paragraph, XWPFTableRow row, String... data) {
+        for (int i = 0; i < data.length; i++) {
+            XWPFRun run = paragraph.createRun();
+            run.setFontFamily("宋体");
+            run.setText(data[i]);
+            row.getCell(i).setParagraph(paragraph);
+            paragraph.removeRun(0);
+        }
+    }
+
+    /**
+     * 添加表头标题一行数据
+     *
+     * @param paragraph 段落对象
+     * @param row       行对象
+     * @param data      不定长度的数据
+     */
+    public void setExcelHeadContent(XWPFParagraph paragraph, XWPFTableRow row, String... data) {
+        XWPFRun run = paragraph.createRun();
+        run.setFontFamily("宋体");
+        run.setBold(true);
+        run.setText(data[0]);
+        row.getCell(0).setParagraph(paragraph);
+        paragraph.removeRun(0);
+        for (int i = 1; i < data.length; i++) {
+            XWPFRun run1 = paragraph.createRun();
+            run1.setFontFamily("宋体");
+            run1.setBold(true);
+            run1.setText(data[i]);
+            row.addNewTableCell().setParagraph(paragraph);
+            paragraph.removeRun(0);
+        }
+    }
+
+    /**
+     * 获取当前的日期
+     *
+     * @return
+     */
+    public String getRightNow() {
+        Calendar rightNow = Calendar.getInstance();
+        Integer year = rightNow.get(Calendar.YEAR);
+        Integer month = rightNow.get(Calendar.MONTH) + 1;
+        Integer day = rightNow.get(rightNow.DAY_OF_MONTH);
+        return year + "年" + month + "月" + day + "日";
+    }
+
+
+}

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/controller/report/ExportModelController.java

@@ -125,6 +125,6 @@ public class ExportModelController extends BaseController {
 
 
 
-        monitorHarmonicReportService.exportWorld(response,startTime,endTime,type,lineIndex,name,reportNumber,crmName,isUrl,file, harmLineDetailDataCommDTO,overLimitInfoCommDTO,deviceUnitCommDTO);
+        monitorHarmonicReportService.exportWorld(response,startTime,endTime,type,lineIndex,name,reportNumber,crmName,isUrl,file, harmLineDetailDataCommDTO,overLimitInfoCommDTO,deviceUnitCommDTO,null);
     }
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/AnalyzeServiceImpl.java

@@ -13,6 +13,7 @@ import com.google.common.collect.Lists;
 import com.njcn.common.config.GeneralInfo;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.dto.OverLimitLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
@@ -36,7 +37,6 @@ import com.njcn.harmonic.pojo.vo.WarningSubstationVO;
 import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.IAnalyzeService;
 import com.njcn.poi.excel.ExcelUtil;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.DicDataFeignClient;
@@ -82,7 +82,6 @@ public class AnalyzeServiceImpl implements IAnalyzeService {
     private final RStatLimitTargetMapper targetMapper;
     private final EventDetailFeignClient eventDetailFeignClient;
     private final DicDataFeignClient dicDataFeignClient;
-
     private final UserLedgerFeignClient userLedgerFeignClient;
 
     @Override

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/ComAssessServiceImpl.java

@@ -1,6 +1,5 @@
 package com.njcn.harmonic.service.impl;
 
-import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
@@ -13,22 +12,19 @@ import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO;
 import com.njcn.device.pms.pojo.param.PmsDeviceInfoParam;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
-import com.njcn.device.pq.enums.LineBaseEnum;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.biz.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
-import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.harmonic.mapper.RStatComassesDMapper;
 import com.njcn.harmonic.pojo.dto.ComAssessDTO;
 import com.njcn.harmonic.pojo.po.PQSComAssesPO;
 import com.njcn.harmonic.pojo.po.day.RStatComassesDPO;
 import com.njcn.harmonic.pojo.vo.ComAssessVO;
-import com.njcn.harmonic.pojo.vo.PollutionVO;
 import com.njcn.harmonic.service.ComAssessService;
 import com.njcn.harmonic.utils.HarmonicComAssesUtil;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.api.DicDataFeignClient;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/GridServiceImpl.java

@@ -212,7 +212,7 @@ public class GridServiceImpl implements IGridService {
             if (param.getAreaType() == 0) {
                 AssessVo.AssessTrendVo vo = new AssessVo.AssessTrendVo();
                 vo.setDeptId(param.getDeptIndex());
-                vo.setDeptName("冀北");
+                vo.setDeptName(deptFeignClient.getDeptById(param.getDeptIndex()).getData().getName());
                 List<AssessVo> children = new ArrayList<>();
                 map.forEach((k1, v1) -> {
                     AssessVo assessVo = new AssessVo();

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/HarmonicServiceImpl.java

@@ -11,12 +11,12 @@ import com.njcn.common.config.GeneralInfo;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.SubstationFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PowerFlagEnum;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.biz.pojo.dto.PollutionLineDTO;
 import com.njcn.device.pq.pojo.dto.PollutionParamDTO;
-import com.njcn.device.pq.pojo.po.Line;
 import com.njcn.device.pq.pojo.po.LineDetail;
 import com.njcn.device.pq.pojo.vo.LineDeviceStateVO;
 import com.njcn.harmonic.constant.Param;
@@ -27,7 +27,6 @@ import com.njcn.harmonic.pojo.po.LimitTarget;
 import com.njcn.harmonic.pojo.po.day.RStatLimitTargetDPO;
 import com.njcn.harmonic.pojo.vo.*;
 import com.njcn.harmonic.service.IHarmonicService;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import com.njcn.system.enums.DicDataEnum;
@@ -57,15 +56,10 @@ import java.util.stream.Stream;
 public class HarmonicServiceImpl implements IHarmonicService {
 
     private final GeneralDeviceInfoClient generalDeviceInfoClient;
-
     private final GeneralInfo generalInfo;
-
     private final LineFeignClient lineFeignClient;
-
     private final RStatLimitTargetDMapper targetDMapper;
-
     private final UserLedgerFeignClient userLedgerFeignClient;
-
     private final SubstationFeignClient substationFeignClient;
 
     @Override

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/OracleResultServiceImpl.java

@@ -864,7 +864,7 @@ public class OracleResultServiceImpl implements OracleResultService {
         String endTime = historyParam.getEndTime();
         String key = "a1a69c93c11e4910aa247087c261bec5";
         String secret = "038de3c27cc54489862d181470e3ad92";
-        String url = "https://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGvol_zl_ds";
+        String url = "http://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGvol_zl_ds";
         String apiId = "0644f1c6abd65d3a3a81eb3314390e14";
         String apiName = "电能质量谐波监测系统_分布式光伏台区电压日数据_e_mp_TGvol_zl_时间";
         List<HarmonicHistoryV> harmonicHistory = adsDiList(HarmonicHistoryV.class, id, starTime, endTime, key, secret, url, apiId, apiName);
@@ -877,7 +877,7 @@ public class OracleResultServiceImpl implements OracleResultService {
         String endTime = historyParam.getEndTime();
         String key = "a1a69c93c11e4910aa247087c261bec5";
         String secret = "038de3c27cc54489862d181470e3ad92";
-        String url = "https://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGpower_zl_ds";
+        String url = "http://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGpower_zl_ds";
         String apiId = "f9f0eb9627410c0ad4a66ae33a75e2c9";
         String apiName = "get_电能质量谐波监测系统_分布式光伏台区功率日数据_e_mp_TGpower_zl_时间";
         List<HarmonicHistoryP> harmonicHistory = adsDiList(HarmonicHistoryP.class, id, starTime, endTime, key, secret, url, apiId, apiName);
@@ -890,7 +890,7 @@ public class OracleResultServiceImpl implements OracleResultService {
         String endTime = historyParam.getEndTime();
         String key = "a1a69c93c11e4910aa247087c261bec5";
         String secret = "038de3c27cc54489862d181470e3ad92";
-        String url = "https://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGfactor_zl_ds";
+        String url = "http://25.37.90.72/ast/ydxxcjxt/dws/get_e_mp_TGfactor_zl_ds";
         String apiId = "bf6cc99505f93c355baad9926b61f17e";
         String apiName = "get_电能质量谐波监测系统_分布式光伏台区功率因数日数据_e_mp_TGfactor_zl_时间";
         List<HarmonicHistoryC> harmonicHistory = adsDiList(HarmonicHistoryC.class, id, starTime, endTime, key, secret, url, apiId, apiName);

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/PollutionSubstationServiceImpl.java

@@ -33,6 +33,7 @@ import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
 import com.njcn.device.pq.api.SubstationFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PowerFlagEnum;
 import com.njcn.device.pq.pojo.dto.*;
@@ -61,8 +62,6 @@ import com.njcn.harmonic.pojo.vo.SubstationVo;
 import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.PollutionSubstationService;
 import com.njcn.poi.excel.ExcelUtil;
-import com.njcn.supervision.api.UserLedgerFeignClient;
-import com.njcn.supervision.api.UserReportManageFeignClient;
 import com.njcn.supervision.pojo.param.SensitiveUserParam;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
@@ -133,7 +132,6 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
     private final UserLedgerFeignClient userLedgerFeignClient;
     private final RmpEventDetailFeignClient detailFeignClient;
     private final CommLineClient commLineClient;
-    private final UserReportManageFeignClient userReportManageFeignClient;
 
     /**
      * @param pollutionSubstationQuryParam
@@ -392,7 +390,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     eq("DATE_FORMAT( data_date ,'%Y-%m-%d')", searchBeginTime);
             RStatPollutionSubstationYPO rStatPollutionSubstationYPO = pollutionSubstationYPOMapper.selectOne(wrapper);
 
-            Optional.ofNullable(rStatPollutionSubstationYPO).ifPresent(t -> pollutionsubVO.setData(t.getValue()));
+            Optional.ofNullable(rStatPollutionSubstationYPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue()));
         } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_QUARTER)) {
             QueryWrapper<RStatPollutionSubstationQPO> wrapper = new QueryWrapper<>();
             wrapper.eq("substation_id", id).
@@ -400,7 +398,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     eq("DATE_FORMAT( data_date ,'%Y-%m-%d')", searchBeginTime);
             RStatPollutionSubstationQPO rStatPollutionSubstationQPO = pollutionSubstationQPOMapper.selectOne(wrapper);
 
-            Optional.ofNullable(rStatPollutionSubstationQPO).ifPresent(t -> pollutionsubVO.setData(t.getValue()));
+            Optional.ofNullable(rStatPollutionSubstationQPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue()));
         } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_MONTH)) {
             QueryWrapper<RStatPollutionSubstationM> wrapper = new QueryWrapper<>();
             wrapper.eq("substation_id", id).
@@ -408,7 +406,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     eq("DATE_FORMAT( data_date ,'%Y-%m-%d')", searchBeginTime);
             RStatPollutionSubstationM rStatPollutionSubstationM = pollutionSubstationMMapper.selectOne(wrapper);
 
-            Optional.ofNullable(rStatPollutionSubstationM).ifPresent(t -> pollutionsubVO.setData(t.getValue()));
+            Optional.ofNullable(rStatPollutionSubstationM).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue()));
 
         } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_DAY)) {
             QueryWrapper<RStatPollutionSubstationDPO> wrapper = new QueryWrapper<>();
@@ -417,7 +415,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     eq("DATE_FORMAT( data_date ,'%Y-%m-%d')", searchBeginTime);
             RStatPollutionSubstationDPO rStatPollutionSubstationDPO = pollutionSubstationDPOMapper.selectOne(wrapper);
 
-            Optional.ofNullable(rStatPollutionSubstationDPO).ifPresent(t -> pollutionsubVO.setData(t.getValue()));
+            Optional.ofNullable(rStatPollutionSubstationDPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue()));
         } else if (Objects.equals(harmonicPublicParam.getReportFlag(), BizParamConstant.STAT_BIZ_WEEK)) {
             QueryWrapper<RStatPollutionSubstationDPO> wrapper = new QueryWrapper<>();
             wrapper.eq("substation_id", id).
@@ -425,7 +423,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
                     between("DATE_FORMAT( data_date ,'%Y-%m-%d')", searchBeginTime, searchEndTime)
                     .orderByDesc("value").last(" limit 1");
             RStatPollutionSubstationDPO rStatPollutionSubstationDPO = pollutionSubstationDPOMapper.selectOne(wrapper);
-            Optional.ofNullable(rStatPollutionSubstationDPO).ifPresent(t -> pollutionsubVO.setData(t.getValue()));
+            Optional.ofNullable(rStatPollutionSubstationDPO).ifPresent(a -> pollutionsubVO.setData(BigDecimal.valueOf(a.getValue()).setScale(2, RoundingMode.UP).doubleValue()));
 
         }
     }
@@ -1282,7 +1280,7 @@ public class PollutionSubstationServiceImpl extends ServiceImpl<RStatPollutionSu
         SensitiveUserParam sensitiveUserParam = new SensitiveUserParam();
         sensitiveUserParam.setDeptId(param.getDeptId());
         sensitiveUserParam.setProjectName(param.getSearchValue());
-        List<UserReportPO> userReportPOList = userReportManageFeignClient.getSensitiveUserByDept(sensitiveUserParam).getData();
+        List<UserReportPO> userReportPOList = userLedgerFeignClient.getSensitiveUserByDept(sensitiveUserParam).getData();
 
         if (CollectionUtil.isNotEmpty(userReportPOList)) {
             userReportPOList.forEach(item -> {

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyExceedRateServiceImpl.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.NumberUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PowerFlagEnum;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -24,7 +25,6 @@ import com.njcn.harmonic.mapper.RStatLimitRateDMapper;
 import com.njcn.harmonic.service.SteadyExceedRateService;
 import com.njcn.harmonic.utils.PubUtils;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import lombok.AllArgsConstructor;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/SteadyQualifyServiceImpl.java

@@ -9,6 +9,7 @@ import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
@@ -21,7 +22,6 @@ import com.njcn.harmonic.pojo.vo.SteadyQualifyDetailVO;
 import com.njcn.harmonic.pojo.vo.SteadyQualifyVO;
 import com.njcn.harmonic.service.SteadyQualifyService;
 import com.njcn.harmonic.utils.PubUtils;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import lombok.AllArgsConstructor;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/THDistortionServiceImpl.java

@@ -10,6 +10,7 @@ import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.param.StatisticsBizBaseParam;
 import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.api.LineFeignClient;
+import com.njcn.device.pq.api.UserLedgerFeignClient;
 import com.njcn.device.pq.enums.LineBaseEnum;
 import com.njcn.device.pq.enums.PowerFlagEnum;
 import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO;
@@ -25,7 +26,6 @@ import com.njcn.harmonic.pojo.vo.THDistortionCensusVO;
 import com.njcn.harmonic.pojo.vo.THDistortionVO;
 import com.njcn.harmonic.service.THDistortionService;
 import com.njcn.harmonic.utils.PubUtils;
-import com.njcn.supervision.api.UserLedgerFeignClient;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
 import lombok.AllArgsConstructor;

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/QualifiedReportServiceImpl.java

@@ -194,7 +194,7 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
             //计算组装谐波含电压有率
            int flagV = 0;
             for (int i = HARMONIC_START; i < HARMONIC_END; i++) {
-                BigDecimal v = new BigDecimal(getUharmOvertime(i));
+                BigDecimal v = new BigDecimal(getUharmOvertime(i,map));
                 BigDecimal hegeRate = alltime.subtract(v).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
                 if (hegeRate.floatValue() < 95) {
                     content.append(String.valueOf(i)).append("次谐波电压含有率合格率").append(String.valueOf(hegeRate.floatValue())).append("%;");
@@ -206,7 +206,7 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
             int flagI = 0;
             for (int i = HARMONIC_START; i < HARMONIC_END; i++) {
                 String key = "IHARM_" + i + "_OVERTIME";
-                BigDecimal ih = new BigDecimal(getIharmOvertime(i));
+                BigDecimal ih = new BigDecimal(getIharmOvertime(i,map));
                 BigDecimal hegeRate = alltime.subtract(ih).divide(alltime, 4, RoundingMode.HALF_UP).multiply(new BigDecimal(100));
                 if (hegeRate.floatValue() < 95) {
                     BigDecimal maxI = (BigDecimal) lineIhMap.get(key);
@@ -239,22 +239,22 @@ public class QualifiedReportServiceImpl implements QualifiedReportService {
     }
 
 
-    public Integer getUharmOvertime(int harmonicOrder) {
+    public Integer getUharmOvertime(int harmonicOrder, RStatLimitTargetDPO map) {
         try {
-            Field field = this.getClass().getDeclaredField("uharm" + harmonicOrder + "Overtime");
+            Field field = map.getClass().getDeclaredField("uharm" + harmonicOrder + "Overtime");
             field.setAccessible(true);
-            return (Integer) field.get(this);
+            return (Integer) field.get(map);
         } catch (NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
             return 0;
         }
     }
 
-    public Integer getIharmOvertime(int harmonicOrder) {
+    public Integer getIharmOvertime(int harmonicOrder, RStatLimitTargetDPO map) {
         try {
-            Field field = this.getClass().getDeclaredField("iharm" + harmonicOrder + "Overtime");
+            Field field = map.getClass().getDeclaredField("iharm" + harmonicOrder + "Overtime");
             field.setAccessible(true);
-            return (Integer) field.get(this);
+            return (Integer) field.get(map);
         } catch (NoSuchFieldException | IllegalAccessException e) {
             e.printStackTrace();
             return 0;

pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/mapper/mapping/RStatDataVDMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.harmonic.rstatlimitrate.mapper.RStatDataVDMapper">
+<mapper namespace="com.njcn.harmonic.common.mapper.RStatDataVDMapper">
 
     <select id="getFreqDev" resultType="com.njcn.harmonic.pojo.po.RStatDataVD">
         select

pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/MonitorHarmonicReportService.java

@@ -25,5 +25,5 @@ public interface MonitorHarmonicReportService {
                      String crmName,
                      Boolean isUrl,
                      MultipartFile file,
-                     HarmLineDetailDataCommDTO lineDto, OverLimitInfoCommDTO overLimitData, DeviceUnitCommDTO deviceUnit);
+                     HarmLineDetailDataCommDTO lineDto, OverLimitInfoCommDTO overLimitData, DeviceUnitCommDTO deviceUnit, String dataLevel);
 }

pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/CustomReportTableServiceImpl.java

@@ -14,6 +14,7 @@ import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONTokener;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.toolkit.SqlRunner;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
@@ -157,7 +158,13 @@ public class CustomReportTableServiceImpl implements CustomReportTableService {
                 } else {
                     phase = PHASE_MAPPING.get(item.getPhase());
                 }
-                tMap.put((item.getOtherName() + phase + item.getResourcesId()).toUpperCase(), item.getPrimaryFormula());
+                if (ObjectUtils.isNotNull(item.getHarmStart()) && ObjectUtils.isNotNull(item.getHarmEnd())) {
+                    for (int i = item.getHarmStart(); i <= item.getHarmEnd() + 1; i++) {
+                        tMap.put((item.getOtherName() + "_" + i + phase + item.getResourcesId()).toUpperCase(), item.getPrimaryFormula());
+                    }
+                } else {
+                    tMap.put((item.getOtherName() + phase + item.getResourcesId()).toUpperCase(), item.getPrimaryFormula());
+                }
             });
 
             eleEpdPqdList = eleEpdPqdList.stream().filter(it->"T".equals(it.getPhase())||"M".equals(it.getPhase())).collect(Collectors.toList());

pqs-harmonic/harmonic-common/src/main/java/com/njcn/harmonic/common/service/impl/MonitorHarmonicReportServiceImpl.java

@@ -14,15 +14,15 @@ import com.njcn.device.pms.api.MonitorClient;
 import com.njcn.device.pms.pojo.po.Monitor;
 import com.njcn.device.pq.api.DeviceUnitClient;
 import com.njcn.harmonic.common.pojo.dto.DeviceUnitCommDTO;
+import com.njcn.harmonic.common.pojo.dto.HarmLineDetailDataCommDTO;
+import com.njcn.harmonic.common.pojo.dto.OverLimitInfoCommDTO;
+import com.njcn.harmonic.common.service.MonitorCommReportService;
+import com.njcn.harmonic.common.service.MonitorHarmonicReportService;
 import com.njcn.harmonic.pojo.param.ReportQueryParam;
 import com.njcn.harmonic.pojo.po.report.EnumPass;
 import com.njcn.harmonic.pojo.po.report.Pass;
 import com.njcn.harmonic.pojo.po.report.ReportTarget;
 import com.njcn.harmonic.pojo.vo.ReportValue;
-import com.njcn.harmonic.common.pojo.dto.HarmLineDetailDataCommDTO;
-import com.njcn.harmonic.common.pojo.dto.OverLimitInfoCommDTO;
-import com.njcn.harmonic.common.service.MonitorCommReportService;
-import com.njcn.harmonic.common.service.MonitorHarmonicReportService;
 import com.njcn.harmonic.utils.WordUtil2;
 import com.njcn.system.api.DicDataFeignClient;
 import com.njcn.system.api.ThemeFeignClient;
@@ -114,7 +114,7 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
                             String crmName,
                             Boolean isUrl,
                             MultipartFile file,
-                            HarmLineDetailDataCommDTO lineDto, OverLimitInfoCommDTO overLimit, DeviceUnitCommDTO deviceUnit) {
+                            HarmLineDetailDataCommDTO lineDto, OverLimitInfoCommDTO overLimit, DeviceUnitCommDTO deviceUnit, String dataLevel) {
         //获取监测点信息
         String bdname;
         Integer pttype;
@@ -122,6 +122,12 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         String atype = "";
         String btype = "";
         String ctype = "";
+        //pt
+        Double pt = getData(lineDto.getPt());
+        //ct
+        Double ct = getData(lineDto.getCt());
+
+
         if (type == 0) {
             if (ObjectUtil.isNull(lineDto)) {
                 throw new BusinessException(CommonResponseEnum.NO_DATA);
@@ -263,14 +269,13 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         // 基波电压最大值
 
         reportmap.put("$B" + "V0" + "X" + "_A$", judgeNull(voltage1.getFmaxValue()));
-
         reportmap.put("$B" + "V0" + "X" + "_B$", judgeNull(voltage2.getFmaxValue()));
         reportmap.put("$B" + "V0" + "X" + "_C$", judgeNull(voltage3.getFmaxValue()));
 
         // 基波电流最大值
-        reportmap.put("$B" + "I0" + "X" + "_A$", judgeNull(current1.getFmaxValue()));
-        reportmap.put("$B" + "I0" + "X" + "_B$", judgeNull(current2.getFmaxValue()));
-        reportmap.put("$B" + "I0" + "X" + "_C$", judgeNull(current3.getFmaxValue()));
+        reportmap.put("$B" + "I0" + "X" + "_A$", dataConversion(current1.getFmaxValue(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "X" + "_B$", dataConversion(current2.getFmaxValue(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "X" + "_C$", dataConversion(current3.getFmaxValue(),dataLevel,ct,true));
 
         /**************************************************************
          **** 三张大表基础数据幅值
@@ -291,9 +296,9 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         reportmap.put("$B" + "V0" + "N" + "_C$", judgeNull(voltage3.getMinValue()));
 
         // 基波电流最小值
-        reportmap.put("$B" + "I0" + "N" + "_A$", judgeNull(current1.getMinValue()));
-        reportmap.put("$B" + "I0" + "N" + "_B$", judgeNull(current2.getMinValue()));
-        reportmap.put("$B" + "I0" + "N" + "_C$", judgeNull(current3.getMinValue()));
+        reportmap.put("$B" + "I0" + "N" + "_A$", dataConversion(current1.getMinValue(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "N" + "_B$", dataConversion(current2.getMinValue(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "N" + "_C$", dataConversion(current3.getMinValue(),dataLevel,ct,true));
 
         /**************************************************************
          **** 三张大表基础数据幅值
@@ -314,9 +319,9 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         reportmap.put("$B" + "V0" + "E" + "_C$", judgeNull(voltage3.getMeanValue()));
 
         // 基波电流平均值
-        reportmap.put("$B" + "I0" + "E" + "_A$", judgeNull(current1.getMeanValue()));
-        reportmap.put("$B" + "I0" + "E" + "_B$", judgeNull(current2.getMeanValue()));
-        reportmap.put("$B" + "I0" + "E" + "_C$", judgeNull(current3.getMeanValue()));
+        reportmap.put("$B" + "I0" + "E" + "_A$", dataConversion(current1.getMeanValue(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "E" + "_B$", dataConversion(current2.getMeanValue(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "E" + "_C$", dataConversion(current3.getMeanValue(),dataLevel,ct,true));
 
         /**************************************************************
          **** 三张大表基础数据幅值
@@ -337,9 +342,9 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         reportmap.put("$B" + "V0" + "%" + "_C$", judgeNull(voltage3.getCp95Value()));
 
         // 基波电流cp95值
-        reportmap.put("$B" + "I0" + "%" + "_A$", judgeNull(current1.getCp95Value()));
-        reportmap.put("$B" + "I0" + "%" + "_B$", judgeNull(current2.getCp95Value()));
-        reportmap.put("$B" + "I0" + "%" + "_C$", judgeNull(current3.getCp95Value()));
+        reportmap.put("$B" + "I0" + "%" + "_A$", dataConversion(current1.getCp95Value(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "%" + "_B$", dataConversion(current2.getCp95Value(),dataLevel,ct,true));
+        reportmap.put("$B" + "I0" + "%" + "_C$", dataConversion(current3.getCp95Value(),dataLevel,ct,true));
 
         /**************************************************************
          **** 三张大表基础数据幅值
@@ -387,10 +392,10 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
                 Double vaveValue = Double.parseDouble(reportmap.get("$BV0E_" + tmpstrMap + "$").toString());
                 Double vcp95Value = Double.parseDouble(reportmap.get("$BV0%_" + tmpstrMap + "$").toString());
                 // 基波电流
-                Double imaxValue = Double.parseDouble(reportmap.get("$BI0X_" + tmpstrMap + "$").toString());
-                Double iminValue = Double.parseDouble(reportmap.get("$BI0N_" + tmpstrMap + "$").toString());
-                Double iaveValue = Double.parseDouble(reportmap.get("$BI0E_" + tmpstrMap + "$").toString());
-                Double icp95Value = Double.parseDouble(reportmap.get("$BI0%_" + tmpstrMap + "$").toString());
+                Double imaxValue = !Objects.equals("Secondary",dataLevel) ? Double.parseDouble(reportmap.get("$BI0X_" + tmpstrMap + "$").toString()):Double.parseDouble(reportmap.get("$BI0X_" + tmpstrMap + "$").toString())*ct;
+                Double iminValue = !Objects.equals("Secondary",dataLevel) ? Double.parseDouble(reportmap.get("$BI0N_" + tmpstrMap + "$").toString()):Double.parseDouble(reportmap.get("$BI0N_" + tmpstrMap + "$").toString())*ct;
+                Double iaveValue = !Objects.equals("Secondary",dataLevel) ? Double.parseDouble(reportmap.get("$BI0E_" + tmpstrMap + "$").toString()):Double.parseDouble(reportmap.get("$BI0E_" + tmpstrMap + "$").toString())*ct;
+                Double icp95Value = !Objects.equals("Secondary",dataLevel) ? Double.parseDouble(reportmap.get("$BI0%_" + tmpstrMap + "$").toString()):Double.parseDouble(reportmap.get("$BI0%_" + tmpstrMap + "$").toString())*ct;
 
                 if (!(vmaxValue >= vminValue && vmaxValue >= vaveValue && vmaxValue >= vcp95Value)) {
                     strBaseVIResult += "注意:从上表中可以看出" + strLineBaseName
@@ -1222,9 +1227,12 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
             String strCurrent = strMap + (i + 1) + "%";
 
             // 谐波电流幅值
-            strCurrentA = judgeNull(this.listICurrent.get(i).getList().get(0).getCp95Value());
-            strCurrentB = judgeNull(this.listICurrent.get(i).getList().get(1).getCp95Value());
-            strCurrentC = judgeNull(this.listICurrent.get(i).getList().get(2).getCp95Value());
+//            strCurrentA = judgeNull(this.listICurrent.get(i).getList().get(0).getCp95Value());
+//            strCurrentB = judgeNull(this.listICurrent.get(i).getList().get(1).getCp95Value());
+//            strCurrentC = judgeNull(this.listICurrent.get(i).getList().get(2).getCp95Value());
+            strCurrentA = dataConversion(this.listICurrent.get(i).getList().get(0).getCp95Value(),dataLevel,ct,true);
+            strCurrentB = dataConversion(this.listICurrent.get(i).getList().get(1).getCp95Value(),dataLevel,ct,true);
+            strCurrentC = dataConversion(this.listICurrent.get(i).getList().get(2).getCp95Value(),dataLevel,ct,true);
             strLimit = judgeNull(this.listICurrent.get(i).getOverLimit());
 
             reportmap.put(strCurrent + "_A$", strCurrentA);
@@ -1253,9 +1261,9 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
             reportmap.put("$CI" + (i + 1) + "L$", strLimit);
 
             try {
-                maxValue = Double.parseDouble(strCurrentA);
-                minValue = Double.parseDouble(strCurrentB);
-                aveValue = Double.parseDouble(strCurrentC);
+                maxValue = Objects.equals("Secondary",dataLevel) ? Double.parseDouble(strCurrentA)*ct : Double.parseDouble(strCurrentA);
+                minValue = Objects.equals("Secondary",dataLevel) ? Double.parseDouble(strCurrentB)*ct : Double.parseDouble(strCurrentB);
+                aveValue = Objects.equals("Secondary",dataLevel) ? Double.parseDouble(strCurrentC)*ct : Double.parseDouble(strCurrentC);;
                 limit = Double.parseDouble(strLimit);
             } catch (Exception e) {
                 strResultCurrentValue += "注意:从上表中可以看出" + strLineBaseName +(i + 1)+ "次谐波电流幅值95%概率值数据存在异常(不是数值类型)。\r\n";
@@ -1380,6 +1388,26 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         }
     }
 
+    public Double getData(String data) {
+        double ratio = 1.0;
+        if (Objects.isNull(data) || data.isEmpty()) {
+            return ratio;
+        }
+        String[] parts = data.split("/");
+        if (parts.length == 2) {
+            try {
+                Double num1 = Double.parseDouble(parts[0]);
+                Double num2 = Double.parseDouble(parts[1]);
+                ratio = num1 / num2;
+            } catch (NumberFormatException var7) {
+                System.out.println("字符串格式错误");
+            }
+        } else {
+            ratio = Double.parseDouble(parts[0]);
+        }
+        return ratio;
+    }
+
     /**
      * 数据单位信息 重组
      *
@@ -1722,6 +1750,22 @@ public class MonitorHarmonicReportServiceImpl implements MonitorHarmonicReportSe
         return (result == null) ? "/" : result.toString();
     }
 
+    public String dataConversion(Float result, String dataLevel, Double ratio, Boolean isI) {
+        if (result == null) {
+            return "/";
+        }
+        if (!"Secondary".equals(dataLevel)) {
+            return String.valueOf(result);
+        }
+        double conversionRatio = (ratio != null) ? ratio : 1.0;
+        double convertedValue = result * conversionRatio;
+        if (isI != null && Boolean.TRUE.equals(isI)) {
+            return String.format("%.2f", convertedValue);
+        } else {
+            return String.format("%.2f", convertedValue / 1000.0);
+        }
+    }
+
     /**
      * 谐波电流限值
      *

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.prepare.harmonic.service.mysql.Impl.line;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.DatePattern;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
@@ -26,6 +27,7 @@ import org.springframework.transaction.annotation.Transactional;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 
 /**
@@ -1851,10 +1853,12 @@ public class DayDataServiceImpl implements DayDataService {
                 .groupBy(DataPlt::getLineId, DataPlt::getPhaseType, DataPlt::getQualityFlag, DataPlt::getValueType)
                 .between(DataPlt::getTime, startTime, endTime);
         List<DataPlt> result1 = dataPltMapper.getStatisticsByWraper(influxQueryWrapper);
-        result1.forEach(item -> {
-            item.setValueType(InfluxDbSqlConstant.MIN);
-        });
-        result.addAll(result1);
+        if(CollUtil.isNotEmpty(result1)){
+            result1.sort(Comparator.comparing(DataPlt::getPlt));
+            DataPlt dataPlt = result1.get(0);
+            dataPlt.setValueType(InfluxDbSqlConstant.MIN);
+            result.add(dataPlt);
+        }
         //最大值
         InfluxQueryWrapper influxQueryWrapper2 = new InfluxQueryWrapper(DataPlt.class);
         influxQueryWrapper2.regular(DataPlt::getLineId, lineIndex)
@@ -1862,10 +1866,13 @@ public class DayDataServiceImpl implements DayDataService {
                 .groupBy(DataPlt::getLineId, DataPlt::getPhaseType, DataPlt::getQualityFlag, DataPlt::getValueType)
                 .between(DataPlt::getTime, startTime, endTime);
         List<DataPlt> result2 = dataPltMapper.getStatisticsByWraper(influxQueryWrapper2);
-        result2.forEach(item -> {
-            item.setValueType(InfluxDbSqlConstant.MAX);
-        });
-        result.addAll(result2);
+        if(CollUtil.isNotEmpty(result2)){
+            result2.sort(Comparator.comparing(DataPlt::getPlt).reversed());
+            DataPlt dataPlt = result2.get(0);
+            dataPlt.setValueType(InfluxDbSqlConstant.MAX);
+            result.add(dataPlt);
+        }
+
         //平均值
         InfluxQueryWrapper influxQueryWrapper3 = new InfluxQueryWrapper(DataPlt.class);
         influxQueryWrapper3.regular(DataPlt::getLineId, lineIndex)
@@ -1873,10 +1880,14 @@ public class DayDataServiceImpl implements DayDataService {
                 .groupBy(DataPlt::getLineId, DataPlt::getPhaseType, DataPlt::getQualityFlag, DataPlt::getValueType)
                 .between(DataPlt::getTime, startTime, endTime);
         List<DataPlt> result3 = dataPltMapper.getStatisticsByWraper(influxQueryWrapper3);
-        result3.forEach(item -> {
-            item.setValueType(InfluxDbSqlConstant.AVG_WEB);
-        });
-        result.addAll(result3);
+        if(CollUtil.isNotEmpty(result3)){
+            double asDouble = result3.stream().mapToDouble(DataPlt::getPlt).average().getAsDouble();
+            DataPlt dataPlt = result3.get(0);
+            dataPlt.setValueType(InfluxDbSqlConstant.AVG_WEB);
+            dataPlt.setPlt(asDouble);
+            result.add(dataPlt);
+        }
+
         //CP95(取平均值的CP95值)
         InfluxQueryWrapper influxQueryWrapper4 = new InfluxQueryWrapper(DataPlt.class);
         influxQueryWrapper4.regular(DataPlt::getLineId, lineIndex)
@@ -1884,10 +1895,12 @@ public class DayDataServiceImpl implements DayDataService {
                 .groupBy(DataPlt::getLineId, DataPlt::getPhaseType, DataPlt::getQualityFlag, DataPlt::getValueType)
                 .between(DataPlt::getTime, startTime, endTime);
         List<DataPlt> result4 = dataPltMapper.getStatisticsByWraper(influxQueryWrapper4);
-        result4.forEach(item -> {
-            item.setValueType(InfluxDbSqlConstant.CP95);
-        });
-        result.addAll(result4);
+        if(CollUtil.isNotEmpty(result4)){
+            result4.sort(Comparator.comparing(DataPlt::getPlt).reversed());
+            DataPlt dataPlt = result4.get(0);
+            dataPlt.setValueType(InfluxDbSqlConstant.CP95);
+            result.add(dataPlt);
+        }
         return result;
     }
 

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserLedgerOldFeignClient.java

@@ -2,7 +2,7 @@ package com.njcn.supervision.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.supervision.api.fallback.UserLedgerFeignClientFallbackFactory;
+import com.njcn.supervision.api.fallback.UserLedgerOldFeignClientFallbackFactory;
 import com.njcn.supervision.pojo.param.user.UserReportParam;
 import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
 import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
@@ -19,8 +19,8 @@ import java.util.List;
  * 流程实例 Api 接口
  *
  */
-@FeignClient(value = ServerInfo.SUPERVISION, path = "/userReport", fallbackFactory = UserLedgerFeignClientFallbackFactory.class)
-public interface UserLedgerFeignClient {
+@FeignClient(value = ServerInfo.SUPERVISION, path = "/userReport", fallbackFactory = UserLedgerOldFeignClientFallbackFactory.class)
+public interface UserLedgerOldFeignClient {
 
 
     @PostMapping("/selectUserList")

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportManageOldFeignClient.java

@@ -2,7 +2,7 @@ package com.njcn.supervision.api;
 
 import com.njcn.common.pojo.constant.ServerInfo;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.supervision.api.fallback.UserReportFeignClientFallbackFactory;
+import com.njcn.supervision.api.fallback.UserReportOldFeignClientFallbackFactory;
 import com.njcn.supervision.pojo.param.SensitiveUserParam;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
 import io.swagger.annotations.ApiOperation;
@@ -18,8 +18,8 @@ import java.util.List;
  *
  * @author 徐扬
  */
-@FeignClient(value = ServerInfo.SUPERVISION, path = "/userReport", fallbackFactory = UserReportFeignClientFallbackFactory.class)
-public interface UserReportManageFeignClient {
+@FeignClient(value = ServerInfo.SUPERVISION, path = "/userReport", fallbackFactory = UserReportOldFeignClientFallbackFactory.class)
+public interface UserReportManageOldFeignClient {
 
 
     @PostMapping("/getSensitiveUserByDept")

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserLedgerOldFeignClientFallbackFactory.java

@@ -0,0 +1,57 @@
+package com.njcn.supervision.api.fallback;
+
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.exception.BusinessException;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.supervision.api.UserLedgerOldFeignClient;
+import com.njcn.supervision.pojo.param.user.UserReportParam;
+import com.njcn.supervision.pojo.vo.user.NewUserReportVO;
+import com.njcn.supervision.pojo.vo.user.UserLedgerVO;
+import com.njcn.supervision.utils.SupervisionEnumUtil;
+import feign.hystrix.FallbackFactory;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+
+@Slf4j
+@Component
+public class UserLedgerOldFeignClientFallbackFactory implements FallbackFactory<UserLedgerOldFeignClient> {
+    @Override
+    public UserLedgerOldFeignClient create(Throwable throwable) {
+        //判断抛出异常是否为解码器抛出的业务异常
+        Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
+        if (throwable.getCause() instanceof BusinessException) {
+            BusinessException businessException = (BusinessException) throwable.getCause();
+            exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult());
+        }
+        Enum<?> finalExceptionEnum = exceptionEnum;
+        return new UserLedgerOldFeignClient() {
+
+            @Override
+            public HttpResult<List<UserLedgerVO>> selectUserList(UserReportParam userReportParam) {
+                log.error("{}异常，降级处理，异常为：{}", "查询用户台账", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<UserLedgerVO> selectUserInfo(String id) {
+                log.error("{}异常，降级处理，异常为：{}", "查询用户台账详情", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<UserLedgerVO>> bindUserStation(String userId, String stationId) {
+                log.error("{}异常，降级处理，异常为：{}", "用户电站信息绑定", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+
+            @Override
+            public HttpResult<List<NewUserReportVO>> getUserReportByIds(List<String> ids) {
+                log.error("{}异常，降级处理，异常为：{}", "根据ids获取非电网侧用户信息", throwable.toString());
+                throw new BusinessException(finalExceptionEnum);
+            }
+        };
+    }
+}

pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportOldFeignClientFallbackFactory.java

@@ -3,7 +3,7 @@ package com.njcn.supervision.api.fallback;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.common.pojo.response.HttpResult;
-import com.njcn.supervision.api.UserReportManageFeignClient;
+import com.njcn.supervision.api.UserReportManageOldFeignClient;
 import com.njcn.supervision.pojo.param.SensitiveUserParam;
 import com.njcn.supervision.pojo.po.user.UserReportPO;
 import com.njcn.supervision.utils.SupervisionEnumUtil;
@@ -16,9 +16,9 @@ import java.util.List;
 
 @Slf4j
 @Component
-public class UserReportFeignClientFallbackFactory implements FallbackFactory<UserReportManageFeignClient> {
+public class UserReportOldFeignClientFallbackFactory implements FallbackFactory<UserReportManageOldFeignClient> {
     @Override
-    public UserReportManageFeignClient create(Throwable throwable) {
+    public UserReportManageOldFeignClient create(Throwable throwable) {
         //判断抛出异常是否为解码器抛出的业务异常
         Enum<?> exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK;
         if (throwable.getCause() instanceof BusinessException) {
@@ -26,7 +26,7 @@ public class UserReportFeignClientFallbackFactory implements FallbackFactory<Use
             exceptionEnum = SupervisionEnumUtil.getExceptionEnum(businessException.getResult());
         }
         Enum<?> finalExceptionEnum = exceptionEnum;
-        return new UserReportManageFeignClient() {
+        return new UserReportManageOldFeignClient() {
 
             @Override
             public HttpResult<List<UserReportPO>> getSensitiveUserByDept(SensitiveUserParam param) {

pqs-system/system-api/src/main/java/com/njcn/system/pojo/po/PqFrontLogsChild.java

@@ -34,7 +34,7 @@ public class PqFrontLogsChild extends BaseEntity {
     @TableField(value = "grade")
     private String grade;
 
-    @TableField(value = "`state`")
+    @TableField(value = "state")
     private Integer state;
 
 }

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml

@@ -30,5 +30,6 @@
     <where>
        ${ew.sqlSegment}
     </where>
+    order by A.sort asc
   </select>
 </mapper>

pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqFrontLogsChildMapper.xml

@@ -15,6 +15,6 @@
   </resultMap>
   <sql id="Base_Column_List">
     <!--@mbg.generated-->
-    id, main_id, log, `state`, create_by, create_time, update_by, update_time
+    id, main_id, log, state, create_by, create_time, update_by, update_time
   </sql>
 </mapper>

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/EventDictServiceImpl.java

@@ -131,7 +131,8 @@ public class EventDictServiceImpl extends ServiceImpl<EventDictMapper, ReportDic
         queryWrapper.eq("report_dict.state", DataStateEnum.ENABLE.getCode()).eq("report_dict.Type",dictQueryParam.getType());
         List<ReportDict> reportAllDicts = this.baseMapper.selectList(queryWrapper);
         List<ReportDict> reportDicts = new ArrayList<>();
-        reportAllDicts.stream().filter(reportDict -> reportDict.getId().equals(dictQueryParam.getId())).forEach(reportDict -> {
+        List<ReportDict> rootList = reportAllDicts.stream().filter(reportDict -> Objects.equals(reportDict.getPid(),"0")).collect(Collectors.toList());
+        rootList.forEach(reportDict -> {
             reportDicts.add(reportDict);
             getChild(reportDicts, reportDict, reportAllDicts);
         });

pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java

@@ -71,10 +71,10 @@ public class PqDashboardPageServiceImpl extends ServiceImpl<PqDashboardPageMappe
         if (Objects.nonNull(param.getSearchBeginTime()) && Objects.nonNull(param.getSearchEndTime())) {
             queryWrapper.between("A.Create_Time", param.getSearchBeginTime(), param.getSearchEndTime());
         }
-        if(Objects.nonNull(param.getPageName())){
-            queryWrapper.like("A.page_name",param.getPageName());
+        if(Objects.nonNull(param.getSearchValue())){
+            queryWrapper.like("A.page_name",param.getSearchValue());
         }
-        queryWrapper.orderByAsc("A.sort");
+//        queryWrapper.orderByAsc("A.sort");
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
     }
 

pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/AuthClientParam.java

@@ -0,0 +1,37 @@
+package com.njcn.user.pojo.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+/**
+ * Description:
+ * Date: 2024/7/11  18:04【需求编号】
+ *
+ * @author clam
+ * @version V1.0.0
+ */
+
+@Data
+@ApiModel
+public class AuthClientParam {
+
+    @ApiModelProperty(name = "sessionTime",value = "*会话超时时间(分钟)")
+    @NotNull(message = "会话超时时间(分钟)不可为空")
+    @Range(min = 1,max = 1440000,message = "会话超时时间(分钟)超范围")
+    private Integer accessTokenValidity;
+
+    @ApiModelProperty(name = "sessionRefreshTime",value = "*会话刷新时间(分钟)")
+    @NotNull(message = "会话刷新时间(分钟)不可为空")
+    @Range(min = 1,max = 1440000,message = "会话刷新时间(分钟)超范围")
+    private Integer refreshTokenValidity;
+
+
+
+
+
+}

pqs-user/user-api/src/main/java/com/njcn/user/pojo/param/PassWordRuleParam.java

@@ -29,15 +29,15 @@ public class PassWordRuleParam {
     @Range(min = 5,max = 60,message = "自动解锁(分钟)超范围")
     private Integer releaseTime;
 
-    @ApiModelProperty(name = "sessionTime",value = "*会话超时时间(分钟)")
-    @NotNull(message = "会话超时时间(分钟)不可为空")
-    @Range(min = 1,max = 1440000,message = "会话超时时间(分钟)超范围")
-    private Integer sessionTime;
-
-    @ApiModelProperty(name = "sessionRefreshTime",value = "*会话刷新时间(分钟)")
-    @NotNull(message = "会话刷新时间(分钟)不可为空")
-    @Range(min = 1,max = 1440000,message = "会话刷新时间(分钟)超范围")
-    private Integer sessionRefreshTime;
+//    @ApiModelProperty(name = "sessionTime",value = "*会话超时时间(分钟)")
+//    @NotNull(message = "会话超时时间(分钟)不可为空")
+//    @Range(min = 1,max = 1440000,message = "会话超时时间(分钟)超范围")
+//    private Integer sessionTime;
+//
+//    @ApiModelProperty(name = "sessionRefreshTime",value = "*会话刷新时间(分钟)")
+//    @NotNull(message = "会话刷新时间(分钟)不可为空")
+//    @Range(min = 1,max = 1440000,message = "会话刷新时间(分钟)超范围")
+//    private Integer sessionRefreshTime;
 
     @ApiModelProperty(name = "passwordExpirationDays",value = "密码有效期")
     @NotNull(message = "密码有效期不可为空")
@@ -57,13 +57,24 @@ public class PassWordRuleParam {
     //@NotNull(message = "密码大小写混合校验不可为空")
     private Integer mixedCaseCheckFlag;*/
 
-    @ApiModelProperty(name = "maxUseUser",value = "大于0" )
+    @ApiModelProperty(name = "maxUseUser",value = "最大并发用户" )
     @NotNull(message = "最大并发用户不可为空")
     @Range(min = 10,max = 99,message = "最大并发用户超范围")
     private Integer maxUseUser;
 
-    @NotNull(message = "账号长时间未登录休眠期(天)")
+    @ApiModelProperty(name = "maxUseUser",value = "验证密码错误次数" )
+    @NotNull(message = "验证密码错误次数时间范围不可为空")
+    @Range(min = 10,max = 99,message = "最大并发用户超范围")
+    private Integer lockPwdCheck;
+
+    @NotNull(message = "账号长时间未登录休眠期(天)不可为空")
     @Range(min = 1,max = 180,message = "账号长时间未登录休眠期(天)超范围")
     private Integer sleepDay;
+    @NotNull(message = "用户注销时间(天)不可为空")
+    @Range(min = 1,max = 360,message = "用户注销(天)超范围")
+    private Integer logoutDay;
+    //（类型：0-临时用户 1-正常用户）
+    @NotNull(message = "用户类型不可为空")
+    private Integer type;
 
 }

pqs-user/user-boot/src/main/java/com/njcn/user/controller/AuthClientController.java

@@ -9,6 +9,8 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.user.enums.UserResponseEnum;
+import com.njcn.user.pojo.param.AuthClientParam;
+import com.njcn.user.pojo.param.PassWordRuleParam;
 import com.njcn.user.pojo.po.AuthClient;
 import com.njcn.user.service.IAuthClientService;
 import io.swagger.annotations.Api;
@@ -17,11 +19,8 @@ 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.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
 
-import org.springframework.web.bind.annotation.RestController;
 import com.njcn.web.controller.BaseController;
 
 import java.util.Objects;
@@ -57,5 +56,15 @@ public class AuthClientController extends BaseController {
         }
     }
 
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("客户端会话配置更新")
+    @RequestMapping(value = "/sessionConfigUpdate", method = RequestMethod.POST)
+    public HttpResult<Boolean> sessionConfigUpdate(@RequestBody @Validated AuthClientParam authClientParam) {
+        String methodDescribe = getMethodDescribe("sessionConfigUpdate");
+        Boolean flag = authClientService.sessionConfigUpdate(authClientParam);
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);
+    }
+
 }
 

pqs-user/user-boot/src/main/java/com/njcn/user/controller/PassWordRuleController.java

@@ -19,6 +19,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * Description:
  * Date: 2024/7/11  18:01【需求编号】
@@ -34,6 +36,8 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 public class PassWordRuleController extends BaseController {
     private final IPassWordRuleService passWordRuleService;
+
+
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("密码规则修改")
     @RequestMapping(value = "/ruleUpdate", method = RequestMethod.POST)
@@ -64,6 +68,16 @@ public class PassWordRuleController extends BaseController {
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userStrategy, methodDescribe);
     }
 
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取用户策略列表")
+    @RequestMapping(value = "/getUserStrategyList", method = RequestMethod.POST)
+    public HttpResult<List<PassWordRuleParam>> getUserStrategyList() {
+        String methodDescribe = getMethodDescribe("getUserStrategyList");
+        List<PassWordRuleParam> userStrategys = passWordRuleService.getUserStrategyList();
+
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, userStrategys, methodDescribe);
+    }
+
 
     @OperateInfo(info = LogEnum.SYSTEM_SERIOUS)
     @ApiOperation("解锁超级管理员")

pqs-user/user-boot/src/main/java/com/njcn/user/service/IAuthClientService.java

@@ -1,6 +1,7 @@
 package com.njcn.user.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.njcn.user.pojo.param.AuthClientParam;
 import com.njcn.user.pojo.po.AuthClient;
 
 /**
@@ -19,4 +20,6 @@ public interface IAuthClientService extends IService<AuthClient> {
      * @return .
      */
     AuthClient getAuthClientByName(String clientName);
+
+    Boolean sessionConfigUpdate(AuthClientParam authClientParam);
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/IPassWordRuleService.java

@@ -3,6 +3,8 @@ package com.njcn.user.service;
 import com.njcn.user.pojo.param.PassWordRuleParam;
 import com.njcn.user.pojo.po.UserStrategy;
 
+import java.util.List;
+
 /**
  * Description:
  * Date: 2024/7/11  18:06【需求编号】
@@ -18,4 +20,6 @@ public interface IPassWordRuleService {
     Boolean unlockRoot();
 
     UserStrategy getUserStrategy();
+
+    List<PassWordRuleParam> getUserStrategyList();
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/AuthClientServiceImpl.java

@@ -5,6 +5,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.system.api.AreaFeignClient;
 import com.njcn.system.pojo.po.Area;
 import com.njcn.user.mapper.AuthClientMapper;
+import com.njcn.user.pojo.param.AuthClientParam;
 import com.njcn.user.pojo.po.AuthClient;
 import com.njcn.user.service.IAuthClientService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -31,4 +32,11 @@ public class AuthClientServiceImpl extends ServiceImpl<AuthClientMapper, AuthCli
               .eq(AuthClient::getState,DataStateEnum.ENABLE.getCode())
               .one();
     }
+
+    @Override
+    public Boolean sessionConfigUpdate(AuthClientParam authClientParam) {
+        return  lambdaUpdate().set(AuthClient::getRefreshTokenValidity,authClientParam.getRefreshTokenValidity())
+                .set(AuthClient::getAccessTokenValidity,authClientParam.getAccessTokenValidity())
+                .update();
+    }
 }

pqs-user/user-boot/src/main/java/com/njcn/user/service/impl/PassWordRuleServiceImpl.java

@@ -2,7 +2,6 @@ package com.njcn.user.service.impl;
 
 import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.user.pojo.param.PassWordRuleParam;
-import com.njcn.user.pojo.po.AuthClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.po.UserStrategy;
 import com.njcn.user.service.IAuthClientService;
@@ -13,6 +12,9 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * Description:
  * Date: 2024/7/11  18:06【需求编号】
@@ -33,19 +35,21 @@ public class PassWordRuleServiceImpl implements IPassWordRuleService {
     @Transactional(rollbackFor = {Exception.class})
     public Boolean ruleUpdate(PassWordRuleParam passWordRuleParam) {
 
-        iUserStrategyService.lambdaUpdate().eq(UserStrategy::getType,"1")
+        iUserStrategyService.lambdaUpdate().eq(UserStrategy::getType,passWordRuleParam.getType())
                 .eq(UserStrategy::getState, DataStateEnum.ENABLE.getCode())
                 .set(UserStrategy::getLimitPwdTimes,passWordRuleParam.getErrorsCount())
                 .set(UserStrategy::getLimitPwdDate,passWordRuleParam.getPasswordExpirationMonth())
                 .set(UserStrategy::getLockPwdTime,passWordRuleParam.getReleaseTime())
                 .set(UserStrategy::getMaxNum,passWordRuleParam.getMaxUseUser())
                 .set(UserStrategy::getSleep,passWordRuleParam.getSleepDay())
+                .set(UserStrategy::getLockPwdCheck,passWordRuleParam.getLockPwdCheck())
+                .set(UserStrategy::getLogout,passWordRuleParam.getLogoutDay())
                 .update();
 
-        iAuthClientService.lambdaUpdate()
-                .set(AuthClient::getRefreshTokenValidity,passWordRuleParam.getSessionRefreshTime())
-                .set(AuthClient::getAccessTokenValidity,passWordRuleParam.getSessionTime())
-                .update();
+//        iAuthClientService.lambdaUpdate()
+//                .set(AuthClient::getRefreshTokenValidity,passWordRuleParam.getSessionRefreshTime())
+//                .set(AuthClient::getAccessTokenValidity,passWordRuleParam.getSessionTime())
+//                .update();
         return true;
     }
 
@@ -59,10 +63,11 @@ public class PassWordRuleServiceImpl implements IPassWordRuleService {
         passWordRuleParam.setPasswordExpirationMonth(userStrategy.getLimitPwdDate());
         passWordRuleParam.setMaxUseUser(userStrategy.getMaxNum());
         passWordRuleParam.setSleepDay(userStrategy.getSleep());
-
-        AuthClient authClient = iAuthClientService.lambdaQuery().last(" limit 1").one();
-        passWordRuleParam.setSessionTime(authClient.getAccessTokenValidity());
-        passWordRuleParam.setSessionRefreshTime(authClient.getRefreshTokenValidity());
+        passWordRuleParam.setLockPwdCheck(userStrategy.getLockPwdCheck());
+        passWordRuleParam.setLogoutDay(userStrategy.getLogout());
+//        AuthClient authClient = iAuthClientService.lambdaQuery().last(" limit 1").one();
+//        passWordRuleParam.setSessionTime(authClient.getAccessTokenValidity());
+//        passWordRuleParam.setSessionRefreshTime(authClient.getRefreshTokenValidity());
         return passWordRuleParam;
     }
 
@@ -79,4 +84,26 @@ public class PassWordRuleServiceImpl implements IPassWordRuleService {
                 .eq(UserStrategy::getState, DataStateEnum.ENABLE.getCode())
                 .one();
     }
+
+    @Override
+    public List<PassWordRuleParam> getUserStrategyList() {
+        List<UserStrategy> list = iUserStrategyService.list();
+        List<PassWordRuleParam> collect = list.stream().map(temp -> {
+            PassWordRuleParam passWordRuleParam = new PassWordRuleParam();
+
+            passWordRuleParam.setErrorsCount(temp.getLimitPwdTimes());
+            passWordRuleParam.setReleaseTime(temp.getLockPwdTime());
+            passWordRuleParam.setPasswordExpirationMonth(temp.getLimitPwdDate());
+            passWordRuleParam.setMaxUseUser(temp.getMaxNum());
+            passWordRuleParam.setSleepDay(temp.getSleep());
+            passWordRuleParam.setLockPwdCheck(temp.getLockPwdCheck());
+            passWordRuleParam.setLogoutDay(temp.getLogout());
+            passWordRuleParam.setType(temp.getType());
+//        AuthClient authClient = iAuthClientService.lambdaQuery().last(" limit 1").one();
+//        passWordRuleParam.setSessionTime(authClient.getAccessTokenValidity());
+//        passWordRuleParam.setSessionRefreshTime(authClient.getRefreshTokenValidity());
+            return passWordRuleParam;
+        }).collect(Collectors.toList());
+        return collect;
+    }
 }