diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorAuditParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorAuditParam.java index 18c87e288..d09b3a0a8 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/MonitorAuditParam.java +++ b/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; + } } diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/param/TransformerParam.java new file mode 100644 index 000000000..8914b25d6 --- /dev/null +++ b/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; +} diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/MonitorAudit.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/MonitorAudit.java index 4c50fe4d0..1385f0ac0 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/MonitorAudit.java +++ b/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; /** diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java index 9f0abd0d9..74bea8eb6 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Transformer.java +++ b/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; /** diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/MonitorAuditController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/MonitorAuditController.java index ce7eeea7f..a24c937bf 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/MonitorAuditController.java +++ b/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; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/TransformerController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/TransformerController.java index 3c6fdf7f9..7d8a6206e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/TransformerController.java +++ b/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; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorAuditService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorAuditService.java index 271e6917d..ac920ce08 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorAuditService.java +++ b/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; /** *

@@ -25,8 +24,27 @@ public interface IMonitorAuditService extends IService { */ Page 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 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java index 99c610da7..176d7a1a8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/ITransformerService.java +++ b/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; /** *

@@ -26,6 +25,24 @@ public interface ITransformerService extends IService { */ Page 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); + /** * 修改变压器台账数据状态 * diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorAuditServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorAuditServiceImpl.java index 989801da4..0de69494d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorAuditServiceImpl.java +++ b/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(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 update = new LambdaUpdateWrapper<>(); diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransformerServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransformerServiceImpl.java index c7e4ea9d6..e44157470 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/TransformerServiceImpl.java +++ b/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(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 update = new LambdaUpdateWrapper<>(); diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java index 0cd59e665..621523b19 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RVoltageIconVO.java +++ b/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; + } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationVoltageMMapper.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationVoltageMMapper.java index 55551e798..042a4e079 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationVoltageMMapper.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/RStatSubstationVoltageMMapper.java @@ -25,6 +25,6 @@ public interface RStatSubstationVoltageMMapper extends BaseMapper getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param); + List getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param,@Param("ids")List ids); } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml index 01d51a39a..9332dddad 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/mapper/majornetwork/mapping/RStatSubstationVoltageMMapper.xml @@ -25,6 +25,12 @@ #{item} + + AND substation_voltage IN + + #{item} + + AND data_date >= #{param.startTime} diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java index cc662efa0..b02868cf5 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatSubstationVoltageMServiceImpl.java +++ b/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 devVoltageData = dicDataFeignClient.getDicDataByTypeCode( DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); + List ids = devVoltageData.stream().map(DictData::getId).collect(Collectors.toList()); + Map iconVOMap = devVoltageData.stream() + .collect(Collectors.toMap(DictData::getId,DictData::getSort )); //查询数据库 - List statSubstationIcon = rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam); + List statSubstationIcon = rStatSubstationVoltageMMapper.getStatSubstationIcon(baseParam,ids); Map 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 notMeasurementList = devVoltageData.stream().filter(r -> !devVoltageMap.containsKey(r.getId())) .collect(Collectors.toList()); @@ -67,8 +75,10 @@ public class RStatSubstationVoltageMServiceImpl extends ServiceImpl s.getSort())); return statSubstationIcon; } }