1.解决分类指标，变电站电压等级图表的,排序问题。

2.添加台账审核属性

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorAuditParam.java

@@ -36,4 +36,33 @@ public class MonitorAuditParam {
     @ApiModelProperty("页面尺寸")
     private Integer pageSize=10;
 
+    @Data
+    public static class AuditParam {
+        private static final long serialVersionUID = 1L;
+
+        /**
+         * 审核id
+         */
+        private String id;
+
+        /**
+         * 提交人员
+         */
+        private String submitName;
+
+        /**
+         * 审核人员
+         */
+        private String auditName;
+
+        /**
+         * 审核内容
+         */
+        private String auditContent;
+
+        /**
+         * 数据类型,字典表（01：主网测点  02：配网测点）
+         */
+        private String dataType;
+    }
 }

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java

@@ -0,0 +1,37 @@
+package com.njcn.device.pms.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author wr
+ * @createTime: 2023-02-22
+ */
+@Data
+public class TransformerParam {
+    /**
+     * 变压器id
+     */
+    @ApiModelProperty(value = "变压器id")
+    private String id;
+
+    /**
+     * 变压器名称
+     */
+    @ApiModelProperty(value = "变压器名称")
+    private String name;
+
+    /**
+     * 变压器类型
+     */
+    @ApiModelProperty(value = "变压器类型")
+    private String type;
+
+    /**
+     * 数据状态：0-删除；1-正常；
+     */
+    @ApiModelProperty(value = "数据状态：0-删除；1-正常；")
+    private Boolean status;
+}

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/MonitorAudit.java

@@ -1,9 +1,13 @@
 package com.njcn.device.pms.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -25,31 +29,49 @@ public class MonitorAudit extends BaseEntity {
     /**
      * 审核id
      */
+    @ApiModelProperty(value = "审核id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(value = "监测点名称")
+    private String monitorName;
+
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(value = "监测点类别")
+    private String monitorSort;
     /**
      * 提交人员
      */
+    @ApiModelProperty(value = "提交人员")
     private String submitName;
 
     /**
      * 审核人员
      */
+    @ApiModelProperty(value = "审核人员")
     private String auditName;
 
     /**
      * 审核内容
      */
+    @ApiModelProperty(value = "审核内容")
     private String auditContent;
 
     /**
      * 数据类型,字典表（01：主网测点  02：配网测点）
      */
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
     private String dataType;
 
     /**
      * 数据状态：0-删除；1-待审核；2-已审核；
      */
+    @ApiModelProperty(value = "数据状态：0-删除；1-待审核；2-已审核；")
     private Boolean status;
 
     /**

pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java

@@ -1,9 +1,12 @@
 package com.njcn.device.pms.pojo.po;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.njcn.db.bo.BaseEntity;
-import java.io.Serializable;
 import java.time.LocalDateTime;
+
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -25,21 +28,26 @@ public class Transformer extends BaseEntity {
     /**
      * 变压器id
      */
+    @ApiModelProperty(value = "变压器id")
+    @TableId(value = "id", type = IdType.ASSIGN_ID)
     private String id;
 
     /**
      * 变压器名称
      */
+    @ApiModelProperty(value = "变压器名称")
     private String name;
 
     /**
      * 变压器类型
      */
+    @ApiModelProperty(value = "变压器类型")
     private String type;
 
     /**
      * 数据状态：0-删除；1-正常； 
      */
+    @ApiModelProperty(value = "数据状态：0-删除；1-正常；")
     private Boolean status;
 
     /**

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/MonitorAuditController.java

@@ -12,7 +12,6 @@ import com.njcn.device.pms.pojo.param.MonitorAuditParam;
 import com.njcn.device.pms.pojo.param.MonitorStatus;
 import com.njcn.device.pms.pojo.po.MonitorAudit;
 import com.njcn.device.pms.service.majornetwork.IMonitorAuditService;
-import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/TransformerController.java

@@ -10,10 +10,8 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.pojo.param.MonitorAuditParam;
 import com.njcn.device.pms.pojo.param.MonitorStatus;
-import com.njcn.device.pms.pojo.po.MonitorAudit;
 import com.njcn.device.pms.pojo.po.Transformer;
 import com.njcn.device.pms.service.majornetwork.ITransformerService;
-import com.njcn.web.pojo.param.BaseParam;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorAuditService.java

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.param.MonitorAuditParam;
 import com.njcn.device.pms.pojo.param.MonitorStatus;
 import com.njcn.device.pms.pojo.po.MonitorAudit;
-import com.njcn.web.pojo.param.BaseParam;
 
 /**
  * <p>
@@ -26,7 +25,26 @@ public interface IMonitorAuditService extends IService<MonitorAudit> {
     Page<MonitorAudit> getAllMonitorAuditList(MonitorAuditParam baseParam);
 
     /***
-    *
+     * 添加台账审核
+     * @author wr
+     * @date 2023-02-22 15:39
+     * @param param
+     * @return boolean
+     */
+    boolean addMonitorAudit(MonitorAuditParam.AuditParam param);
+
+    /***
+     * 修改台账审核
+     * @author wr
+     * @date 2023-02-22 15:48
+     * @param param
+     * @return boolean
+     */
+    boolean updateMonitorAudit(MonitorAuditParam.AuditParam param);
+
+
+   /***
+    * 修改台账审核状态
     * @author wr
     * @date 2023-02-22 14:58
     * @param monitorParam

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java

@@ -4,9 +4,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.njcn.device.pms.pojo.param.MonitorAuditParam;
 import com.njcn.device.pms.pojo.param.MonitorStatus;
-import com.njcn.device.pms.pojo.po.MonitorAudit;
+import com.njcn.device.pms.pojo.param.TransformerParam;
 import com.njcn.device.pms.pojo.po.Transformer;
-import com.njcn.web.pojo.param.BaseParam;
 
 /**
  * <p>
@@ -26,6 +25,24 @@ public interface ITransformerService extends IService<Transformer> {
      */
     Page<Transformer> getAllTransformerList(MonitorAuditParam baseParam);
 
+    /***
+     * 添加变压器台账
+     * @author wr
+     * @date 2023-02-22 15:39
+     * @param param
+     * @return boolean
+     */
+    boolean addTransformer(TransformerParam param);
+
+    /***
+     * 修改变压器台账
+     * @author wr
+     * @date 2023-02-22 15:48
+     * @param param
+     * @return boolean
+     */
+    boolean updateTransformer(TransformerParam param);
+
     /**
      * 修改变压器台账数据状态
      *

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorAuditServiceImpl.java

@@ -1,17 +1,16 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 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.common.pojo.enums.common.DataStateEnum;
 import com.njcn.device.pms.mapper.majornetwork.MonitorAuditMapper;
 import com.njcn.device.pms.pojo.param.MonitorAuditParam;
 import com.njcn.device.pms.pojo.param.MonitorStatus;
 import com.njcn.device.pms.pojo.po.MonitorAudit;
 import com.njcn.device.pms.service.majornetwork.IMonitorAuditService;
-import com.njcn.web.factory.PageFactory;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
@@ -36,10 +35,23 @@ public class MonitorAuditServiceImpl extends ServiceImpl<MonitorAuditMapper, Mon
                 .ne(baseParam.getStatus() == 0, MonitorAudit::getStatus, baseParam.getStatus())
                 .ge(StringUtils.isNotBlank(baseParam.getSearchBeginTime()), MonitorAudit::getCreateTime, baseParam.getSearchBeginTime())
                 .le(StringUtils.isNotBlank(baseParam.getSearchEndTime()), MonitorAudit::getCreateTime, baseParam.getSearchEndTime())
+                .orderByAsc(MonitorAudit::getStatus);
         ;
         return this.page(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()), lambdaQueryWrapper);
     }
 
+    @Override
+    public boolean addMonitorAudit(MonitorAuditParam.AuditParam param) {
+        MonitorAudit monitorAudit = BeanUtil.copyProperties(param, MonitorAudit.class);
+        return this.save(monitorAudit);
+    }
+
+    @Override
+    public boolean updateMonitorAudit(MonitorAuditParam.AuditParam param) {
+        MonitorAudit monitorAudit = BeanUtil.copyProperties(param, MonitorAudit.class);
+        return this.updateById(monitorAudit);
+    }
+
     @Override
     public boolean updateStatus(MonitorStatus.Status monitorParam) {
         LambdaUpdateWrapper<MonitorAudit> update = new LambdaUpdateWrapper<>();

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransformerServiceImpl.java

@@ -1,5 +1,6 @@
 package com.njcn.device.pms.service.majornetwork.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -9,12 +10,9 @@ import com.njcn.common.pojo.enums.common.DataStateEnum;
 import com.njcn.device.pms.mapper.majornetwork.TransformerMapper;
 import com.njcn.device.pms.pojo.param.MonitorAuditParam;
 import com.njcn.device.pms.pojo.param.MonitorStatus;
-import com.njcn.device.pms.pojo.po.MonitorAudit;
+import com.njcn.device.pms.pojo.param.TransformerParam;
 import com.njcn.device.pms.pojo.po.Transformer;
 import com.njcn.device.pms.service.majornetwork.ITransformerService;
-import com.njcn.web.factory.PageFactory;
-import com.njcn.web.pojo.param.BaseParam;
-import org.apache.commons.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -39,6 +37,18 @@ public class TransformerServiceImpl extends ServiceImpl<TransformerMapper, Trans
         return this.page(new Page<>(baseParam.getPageNum(), baseParam.getPageSize()), lambdaQueryWrapper);
     }
 
+    @Override
+    public boolean addTransformer(TransformerParam param) {
+        Transformer transformer = BeanUtil.copyProperties(param, Transformer.class);
+        return this.save(transformer);
+    }
+
+    @Override
+    public boolean updateTransformer(TransformerParam param) {
+        Transformer transformer = BeanUtil.copyProperties(param, Transformer.class);
+        return this.updateById(transformer);
+    }
+
     @Override
     public boolean updateStatus(MonitorStatus.Status monitorParam) {
         LambdaUpdateWrapper<Transformer> update = new LambdaUpdateWrapper<>();

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java

@@ -23,4 +23,7 @@ public class RVoltageIconVO {
     @ApiModelProperty(value = "稳态超标变电站数量")
     private Integer harmonicCount;
 
+    @ApiModelProperty(value = "排序")
+    private Integer sort;
+
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationVoltageMMapper.java

@@ -25,6 +25,6 @@ public interface RStatSubstationVoltageMMapper extends BaseMapper<RStatSubstatio
      * @param param
      * @return
      */
-    List<RVoltageIconVO> getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param);
+    List<RVoltageIconVO> getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param,@Param("ids")List<String> ids);
 
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml

@@ -25,6 +25,12 @@
                     #{item}
                 </foreach>
             </if>
+            <if test="ids != null and  ids.size > 0">
+                AND substation_voltage IN
+                <foreach collection='ids' item='item' index="index" open='(' separator=',' close=')'>
+                    #{item}
+                </foreach>
+            </if>
             <if test="param!=null and param.startTime != null and param.startTime !=''">
                 AND  data_date >= #{param.startTime}
             </if>

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

@@ -20,6 +20,7 @@ import com.njcn.web.utils.WebUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -53,12 +54,19 @@ public class RStatSubstationVoltageMServiceImpl extends ServiceImpl<RStatSubstat
         //获取电压信息
         List<DictData> devVoltageData = dicDataFeignClient.getDicDataByTypeCode(
                 DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData();
+        List<String> ids = devVoltageData.stream().map(DictData::getId).collect(Collectors.toList());
+        Map<String, Integer> iconVOMap = devVoltageData.stream()
+                .collect(Collectors.toMap(DictData::getId,DictData::getSort ));
 
         //查询数据库
-        List<RVoltageIconVO> statSubstationIcon = rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam);
+        List<RVoltageIconVO> statSubstationIcon = rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam,ids);
         Map<String, RVoltageIconVO> devVoltageMap = statSubstationIcon.stream()
                 .collect(Collectors.toMap(RVoltageIconVO::getSubstationVoltage, Function.identity()));
-
+        statSubstationIcon.stream().forEach(r->{
+            if(iconVOMap.containsKey(r.getSubstationVoltage())){
+                r.setSort(iconVOMap.get(r.getSubstationVoltage()));
+            }
+        });
         //处理主节点不存在的集合
         List<DictData> notMeasurementList = devVoltageData.stream().filter(r -> !devVoltageMap.containsKey(r.getId()))
                 .collect(Collectors.toList());
@@ -67,8 +75,10 @@ public class RStatSubstationVoltageMServiceImpl extends ServiceImpl<RStatSubstat
             iconVO.setSubstationVoltage(notData.getId());
             iconVO.setSubstationCount(0);
             iconVO.setHarmonicCount(0);
+            iconVO.setSort(notData.getSort());
             statSubstationIcon.add(iconVO);
         }
+        statSubstationIcon.sort(Comparator.comparing(s -> s.getSort()));
         return statSubstationIcon;
     }
 }