From f36bb0dc4d92611a2a52cbf423b3a0526620b234 Mon Sep 17 00:00:00 2001 From: wurui Date: Tue, 21 Mar 2023 16:28:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RMpPwAlarmDetailDServiceImpl.java | 3 +- .../process/enums/ProcessResponseEnum.java | 3 +- .../process/pojo/param/ExcessiveParam.java | 4 + .../process/pojo/param/StrategyParam.java | 36 +++--- .../po/RMpOnlineMonitorOverproofProblem.java | 5 + .../njcn/process/pojo/po/ThsWarnStrategy.java | 3 +- .../controller/ThsWarnStrategyController.java | 6 +- .../process/mapper/ThsWarnStrategyMapper.java | 9 ++ .../mapper/mapping/ThsWarnStrategyMapper.xml | 19 ++- .../service/ThsWarnStrategyService.java | 6 +- .../service/impl/IssuesServiceImpl.java | 8 +- .../impl/ThsWarnStrategyServiceImpl.java | 108 +++++++++++------- 12 files changed, 138 insertions(+), 72 deletions(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java index 54e50dbb2..19fa35545 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/distribution/impl/RMpPwAlarmDetailDServiceImpl.java @@ -34,6 +34,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -86,7 +87,7 @@ implements RMpPwAlarmDetailDService{ //配网监测点id集合 List pwMonitorIds = pwMonitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); //配网监测点Map集合 - Map pwMonitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, item -> item)); + Map pwMonitorMap = pwMonitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(),(Key1, kye2) -> Key1)); //合并主网配网监测点id集合（并去重） diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java index bb2c414db..03998b2da 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java @@ -18,7 +18,8 @@ public enum ProcessResponseEnum { PROCESS_COMMON_ERROR("A00550","监督管理模块异常"), ARCHIVE_ERROR("A00552","不满足归档调节，操作失败！"), PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"), - + QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"), + ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"), ; private final String code; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java index 15bc8ad88..5a911058c 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/ExcessiveParam.java @@ -28,6 +28,10 @@ public class ExcessiveParam extends IssuesParam { @NotNull(message = "监测点ID不可为空") private String measurementPointId; + @ApiModelProperty(name = "measurementPointId",value = "监测点ID") + @NotNull(message = "监测点ID不可为空") + private String measurementPointName; + @ApiModelProperty(name = "warnLastTime",value = "告警持续时间") @NotNull(message = "告警持续时间不可为空") private String warnLastTime; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java index 03425a7b9..2e925832b 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java @@ -37,7 +37,7 @@ public class StrategyParam { private String name; @ApiModelProperty("等级（0：一级；1：二级；2：三级）") - private String grade; + private Integer grade; @ApiModelProperty(value = "区分预警单/告警单（0：预警单 ；1：告警单）") private Integer type; @@ -71,7 +71,7 @@ public class StrategyParam { private String id; @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中") - @TableField("Operation") + @NotNull(message = "id不能为空") private Integer operation; @ApiModelProperty(value = "监测点标签") @@ -84,7 +84,23 @@ public class StrategyParam { } @Data - public static class StrategyUpdateParam { + public static class StrategyUpdateParam extends StrategyUpParam{ + + @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中") + private Integer operation; + + @ApiModelProperty(value = "监测点标签") + @NotBlank(message = "监测点标签不能为空") + private List monitorTag; + + @ApiModelProperty(value = "指标类型") + @NotEmpty(message = "指标类型集合不能为空") + private List indicatorTypes; + + } + + @Data + public static class StrategyUpParam { @ApiModelProperty(value = "预警单id") private String id; @@ -96,18 +112,6 @@ public class StrategyParam { @NotNull(message = "等级不能为空") private Integer grade; - @ApiModelProperty(value = "关系（0：与；1：或）只存在于指标类型中") - @TableField("Operation") - private Integer operation; - - @ApiModelProperty(value = "监测点标签") - @NotBlank(message = "监测点标签不能为空") - private String monitorTag; - - @ApiModelProperty(value = "指标类型") - @NotEmpty(message = "指标类型集合不能为空") - private List indicatorTypes; - } @Data @@ -116,7 +120,7 @@ public class StrategyParam { @NotBlank(message = "id不能为空") private String id; - @ApiModelProperty(value = "0.删除 1.正常") + @ApiModelProperty(value = "0.删除 1.启用 2.关闭") private Integer state; } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java index d8d93d3af..afbd2e90d 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RMpOnlineMonitorOverproofProblem.java @@ -45,6 +45,11 @@ public class RMpOnlineMonitorOverproofProblem implements Serializable { */ private String measurementPointId; + /** + * 监测点ID + */ + private String measurementPointName; + /** * 操作时间 */ diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java index de5b95df5..1a5ff6fa5 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java @@ -45,9 +45,8 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable { @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)") private Integer type; - @ApiModelProperty(value = "0.删除 1.正常") + @ApiModelProperty(value = "0.删除 1.启用 2.关闭") @TableField("State") - @TableLogic private Integer state; @TableField("Create_By") diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java index 5aa175b1b..e01bfcd27 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java @@ -78,7 +78,7 @@ public class ThsWarnStrategyController extends BaseController { @PostMapping("/updateStrategy") @ApiOperation(value = "预警单/告警单修改") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) - public HttpResult updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpdateParam param) { + public HttpResult updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpParam param) { String methodDescribe = getMethodDescribe("updateStrategy"); Boolean flag = thsWarnStrategyService.updateStrategy(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); @@ -96,7 +96,7 @@ public class ThsWarnStrategyController extends BaseController { @PostMapping("/getMonitor") @ApiOperation(value = "监测点查询接口") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - public HttpResult> getMonitor(@Param("monitorTag") String monitorTag, @Param("orgId") String orgId) { + public HttpResult> getMonitor(@Param("monitorTag") List monitorTag, @Param("orgId") String orgId) { String methodDescribe = getMethodDescribe("getMonitor"); List monitor = thsWarnStrategyService.getMonitor(monitorTag, orgId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); @@ -114,7 +114,7 @@ public class ThsWarnStrategyController extends BaseController { @PostMapping("/delStrategy") @ApiOperation(value = "预警单/告警单信息删除") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) - public HttpResult bindStrategy(@RequestBody List ids) { + public HttpResult delStrategy(String ids) { String methodDescribe = getMethodDescribe("delStrategy"); Boolean flag = thsWarnStrategyService.delStrategy(ids); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java index e241c0c56..3f0e63644 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/ThsWarnStrategyMapper.java @@ -37,6 +37,15 @@ public interface ThsWarnStrategyMapper extends BaseMapper { */ List getStrategyDetail(@Param("id") String id); + /*** + * 获取监测点标签id + * @author wr + * @date 2023-03-10 13:46 + * @param id + * @return List + */ + List getMonitorTagDetail(@Param("id") String id); + /** * 查询所有部门的策略列表 * diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsWarnStrategyMapper.xml b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsWarnStrategyMapper.xml index 297c1a10e..bc33f9af7 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsWarnStrategyMapper.xml +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/mapper/mapping/ThsWarnStrategyMapper.xml @@ -21,7 +21,11 @@ - + + @@ -67,5 +68,13 @@ tws.State = 1 and tws.Grade in(0,2) + diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java index 17cf4868e..d1cc8b041 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java @@ -63,7 +63,7 @@ public interface ThsWarnStrategyService extends IService { * @param param * @return Boolean */ - Boolean updateStrategy(StrategyParam.StrategyUpdateParam param); + Boolean updateStrategy(StrategyParam.StrategyUpParam param); /*** * 预警单/告警单修改状态 @@ -81,7 +81,7 @@ public interface ThsWarnStrategyService extends IService { * @param monitorTag * @return List */ - List getMonitor(String monitorTag, String orgId); + List getMonitor(List monitorTag, String orgId); /*** @@ -101,5 +101,5 @@ public interface ThsWarnStrategyService extends IService { * @param ids * @return Boolean */ - Boolean delStrategy(List ids); + Boolean delStrategy(String ids); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java index db4adacb1..017541d6f 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/IssuesServiceImpl.java @@ -122,7 +122,7 @@ public class IssuesServiceImpl implements IssuesService { */ @Override @Transactional(rollbackFor = {Exception.class}) - public void addExcessiveIssues(ExcessiveParam excessiveParam) { + public void addExcessiveIssues(ExcessiveParam excessiveParam) { IssuesParam issuesParam = new IssuesParam(); BeanUtil.copyProperties(excessiveParam, issuesParam); String powerQualityProblemNo = getPowerQualityProblemNo(issuesParam); @@ -284,9 +284,12 @@ public class IssuesServiceImpl implements IssuesService { ExcessiveDetailVO detail = new ExcessiveDetailVO(); BeanUtil.copyProperties(issuesSelectOne(powerQualityProblemNo), detail); detail.setOrgName(deptFeignClient.getDeptById(detail.getOrgNo()).getData().getName()); + + LambdaQueryWrapper excessiveQuery = new LambdaQueryWrapper<>(); excessiveQuery.eq(RMpOnlineMonitorOverproofProblem::getPowerQualityProblemNo, powerQualityProblemNo); RMpOnlineMonitorOverproofProblem excessiveOut = excessiveMapper.selectOne(excessiveQuery); + BeanUtil.copyProperties(excessiveOut, detail); RMpElectricQualityProblemFlowDetails flowDetails = flowDetailSelectOne(powerQualityProblemNo); BeanUtil.copyProperties(processFlowDetail(flowDetails), detail); @@ -484,7 +487,7 @@ public class IssuesServiceImpl implements IssuesService { */ @Override public String uploadFile(MultipartFile issuesFile) { - return fileStorageUtil.uploadMultipart(issuesFile, OssPath.ELECTRICITY_QUALITY); + return fileStorageUtil.getFileUrl( fileStorageUtil.uploadMultipart(issuesFile, OssPath.ELECTRICITY_QUALITY)); } /** @@ -661,6 +664,7 @@ public class IssuesServiceImpl implements IssuesService { toMap(PvTerminalTreeVO::getId, PvTerminalTreeVO::getName)); List rStatElectricQualityProblemLogVOList = rStatElectricQualityProblemLogMapper.selectByProblemNo(powerQualityProblemNo); + rStatElectricQualityProblemLogVOList.stream ().forEach (temp->temp.setOrgName (pvTerminalTreeVOMap.get (temp.getOrgName ()))); return rStatElectricQualityProblemLogVOList; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java index 6ab955a01..7f3ecdf97 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java @@ -7,11 +7,14 @@ import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.param.PmsMonitorParam; +import com.njcn.device.pms.pojo.po.DistributionMonitor; +import com.njcn.process.enums.ProcessResponseEnum; import com.njcn.process.pojo.param.StrategyParam; import com.njcn.process.pojo.po.PmsTerminalDetection; import com.njcn.process.pojo.po.ThsDeptAlarm; @@ -27,6 +30,7 @@ import com.njcn.web.utils.RequestUtil; import com.njcn.web.utils.WebUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.stream.Collectors; @@ -54,12 +58,14 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl() .like(StrUtil.isNotBlank(param.getName()), ThsWarnStrategy::getName, param.getName()) .eq(param.getGrade() != null, ThsWarnStrategy::getGrade, param.getGrade()) - .le(param.getType() != null, ThsWarnStrategy::getType, param.getType()) + .eq(param.getType() != null, ThsWarnStrategy::getType, param.getType()) + .ne(ThsWarnStrategy::getState, DataStateEnum.DELETED.getCode()) ); } @Override + @Transactional(rollbackFor = {Exception.class}) public Boolean insertStrategy(StrategyParam.StrategyInsertParam param) { int count = this.count(new LambdaQueryWrapper() .eq(ThsWarnStrategy::getName, param.getName()) @@ -68,18 +74,22 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl assList = new ArrayList<>(); + //删除之前绑定信息 + thsWarnStrategyAssService.removeById(param.getId()); + //监测点标签绑定 - add(assList,param.getId(),0,param.getMonitorTag()); + add(assList, param.getId(), 0, param.getMonitorTag()); //指标类型绑定 - add(assList,param.getId(),1,param.getIndicatorTypes()); + add(assList, param.getId(), 1, param.getIndicatorTypes()); thsWarnStrategyAssService.saveBatch(assList); ThsWarnStrategy warnStrategy = new ThsWarnStrategy(); @@ -88,32 +98,14 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl assList,String id,Integer type,List ids){ - ThsWarnStrategyAss ass ; - for (String indicatorType : ids) { - ass = new ThsWarnStrategyAss(); - ass.setWarnId(id); - ass.setAssId(indicatorType); - ass.setType(type); - assList.add(ass); - } - } + @Override public StrategyParam.StrategyUpdateParam getUpdateStrategy(String id) { return this.baseMapper.selectUpdateStrategy(id); } @Override - public Boolean updateStrategy(StrategyParam.StrategyUpdateParam param) { + public Boolean updateStrategy(StrategyParam.StrategyUpParam param) { ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper() .ne(ThsWarnStrategy::getId, param.getId()) .and(wrapper -> @@ -125,10 +117,12 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl getMonitor(String monitorTag, String orgId) { + public List getMonitor(List monitorTag, String orgId) { PmsMonitorParam param = new PmsMonitorParam(); - param.setMonitorTags(Arrays.asList(monitorTag)); + param.setMonitorTags(monitorTag); List data = monitorClient.getMonitorInfoListByCond(param).getData(); //获取部门结构 List deptInfos = deptFeignClient.getDeptDescendantIndexes(orgId, WebUtil.filterDeptType()).getData(); List deptDTOS = deptInfos.stream().filter(org -> org.getId().equals(orgId)).collect(Collectors.toList()); - + //递归监测点信息 List monitorTrees = new ArrayList<>(); StrategyParam.MonitorTree tree = new StrategyParam.MonitorTree(); tree.setId(deptDTOS.get(0).getId()); @@ -156,6 +150,53 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl param) { + //删除之前数据 + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(ThsDeptAlarm::getDeptId, param.get(0).getDeptId()); + lambdaQueryWrapper.in(ThsDeptAlarm::getAlarmId, param.get(0).getDeptId()); + lambdaQueryWrapper.in(ThsDeptAlarm::getType, param.get(0).getType()); + thsDeptAlarmService.remove(lambdaQueryWrapper); + return thsDeptAlarmService.saveBatch(param); + } + + @Override + @Transactional(rollbackFor = {Exception.class}) + public Boolean delStrategy(String ids) { + Assert.isTrue(StrUtil.isNotBlank(ids), "id为空,不能删除"); + ThsWarnStrategy byId = this.getById(ids); + if(ObjectUtil.isNull(byId)){ + throw new BusinessException(ProcessResponseEnum.QUERY_IS_EMPTY); + } + if(byId.getState() == 1){ + throw new BusinessException(ProcessResponseEnum.ENABLED_CANNOT_BE_DELETED); + } + thsWarnStrategyAssService.removeById(ids); + return this.removeById(ids); + } + + /*** + * 告警单 监测点标签或指标类型绑定 + * @author wr + * @date 2023-03-20 18:57 + * @param assList 绑定信息 + * @param id 告警单id + * @param type 0:监测点标签 1：指标类型 + * @param ids 监测点标签集合 或 指标类型集合 + */ + private void add(List assList, String id, Integer type, List ids) { + ThsWarnStrategyAss ass; + for (String indicatorType : ids) { + ass = new ThsWarnStrategyAss(); + ass.setWarnId(id); + ass.setAssId(indicatorType); + ass.setType(type); + assList.add(ass); + } + } + /** * 递归生成监测点树 * @@ -215,15 +256,4 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl param) { - return thsDeptAlarmService.saveBatch(param); - } - - @Override - public Boolean delStrategy(List ids) { - Assert.isTrue(CollectionUtil.isNotEmpty(ids), "id为空,不能删除"); - thsWarnStrategyAssService.removeByIds(ids); - return this.removeByIds(ids); - } } From 53170bda6d36a998ace373da3ae59b9f53423e70 Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Tue, 21 Mar 2023 16:31:12 +0800 Subject: [PATCH 2/8] =?UTF-8?q?zbj//=E5=A4=A7=E5=B1=8F=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E8=A7=84=E6=A8=A1=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/pojo/param/LargeScreenParam.java | 40 ++++++++++ .../pojo/param/MonitoringPointScaleParam.java | 30 ++++++++ .../pq/pojo/vo/MonitoringPointScaleVO.java | 35 +++++++++ .../pq/controller/LargeScreenController.java | 47 ++++++++++-- .../device/pq/mapper/LargeScreenMapper.java | 16 ++++ .../pq/mapper/mapping/LargeScreenMapper.xml | 22 ++++++ .../device/pq/service/LargeScreenService.java | 18 +++++ .../service/impl/LargeScreenServiceImpl.java | 75 +++++++++++++++++++ 8 files changed, 275 insertions(+), 8 deletions(-) create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java create mode 100644 pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MonitoringPointScaleVO.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java create mode 100644 pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java new file mode 100644 index 000000000..deb3f5060 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/LargeScreenParam.java @@ -0,0 +1,40 @@ +package com.njcn.device.pq.pojo.param; + +import com.njcn.common.pojo.constant.PatternRegex; +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.device.biz.enums.LineFlagEnum; +import com.njcn.web.constant.ValidMessage; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.hibernate.validator.constraints.Range; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import javax.validation.constraints.Pattern; +import java.io.Serializable; +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/20 + */ +@Data +public class LargeScreenParam implements Serializable { + + @ApiModelProperty(name = "deptIndex", value = "部门索引", required = true) + @NotBlank(message = "部门索引不可为空") + private String deptIndex; + + @ApiModelProperty("开始时间") + @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") + private String searchBeginTime; + + @ApiModelProperty("结束时间") + @Pattern(regexp = PatternRegex.TIME_FORMAT, message = "时间格式错误") + private String searchEndTime; + +} diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java new file mode 100644 index 000000000..c2fa663e7 --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/MonitoringPointScaleParam.java @@ -0,0 +1,30 @@ +package com.njcn.device.pq.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/21 + */ +@Data +public class MonitoringPointScaleParam { + + /** + * 部门名称 + */ + @ApiModelProperty("部门名称") + private String name; + /** + * 部门id + */ + @ApiModelProperty("部门id") + private String index; + /** + * 监测点个数 + */ + @ApiModelProperty("监测点个数") + private int count; + +} diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MonitoringPointScaleVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MonitoringPointScaleVO.java new file mode 100644 index 000000000..fc20d477d --- /dev/null +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/MonitoringPointScaleVO.java @@ -0,0 +1,35 @@ +package com.njcn.device.pq.pojo.vo; + +import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/21 + */ +@Data +public class MonitoringPointScaleVO implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 部门信息 + */ + @ApiModelProperty("部门信息") + private List param; + /** + * 监测点总个数 + */ + @ApiModelProperty("监测点总个数") + private String monitorTotalCount; + /** + * 监测点新增个数 + */ + @ApiModelProperty("监测点新增个数") + private String monitorAddCount; + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java index 1d6b386f7..76a284514 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java @@ -1,23 +1,54 @@ package com.njcn.device.pq.controller; +import cn.hutool.core.collection.CollectionUtil; +import com.njcn.common.pojo.annotation.OperateInfo; +import com.njcn.common.pojo.enums.common.LogEnum; +import com.njcn.common.pojo.enums.response.CommonResponseEnum; +import com.njcn.common.pojo.response.HttpResult; +import com.njcn.common.utils.HttpResultUtil; +import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; +import com.njcn.device.pq.service.LargeScreenService; +import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; +import java.util.Objects; + /** - * pqs - * 大屏接口终端服务 - * @author cdf - * @date 2023/3/20 + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/21 */ @Slf4j -@Api(tags = "大屏-台账相关") +@Api(tags = "大屏监测点规模") @RestController -@RequestMapping("/screenTerminal") +@RequestMapping("/largeScreen") @RequiredArgsConstructor -public class LargeScreenController { +public class LargeScreenController extends BaseController { + private final LargeScreenService largeScreenService; -} + /** + * 监测点规模 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getMonitoringPointScale") + @ApiOperation("监测点规模") + @ApiImplicitParam(name = "largeScreenParam", value = "查询终端条件", required = true) + public HttpResult getMonitoringPointScale(@RequestBody @Validated LargeScreenParam largeScreenParam) { + String methodDescribe = getMethodDescribe("getMonitoringPointScale"); + MonitoringPointScaleVO result = largeScreenService.getMonitoringPointScale(largeScreenParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } +} \ No newline at end of file diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java new file mode 100644 index 000000000..1f8a32531 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/LargeScreenMapper.java @@ -0,0 +1,16 @@ +package com.njcn.device.pq.mapper; + +import org.apache.ibatis.annotations.Param; + +import java.util.List; +import java.util.Map; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/21 + */ +public interface LargeScreenMapper { + + Map getMonitorAddCount(@Param("lineIds") List lineIds, @Param("startTime") String startTime, @Param("endTime") String endTime); +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml new file mode 100644 index 000000000..e5f58e057 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LargeScreenMapper.xml @@ -0,0 +1,22 @@ + + + + + + + diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java new file mode 100644 index 000000000..8eac82b6c --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java @@ -0,0 +1,18 @@ +package com.njcn.device.pq.service; + +import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; + +import java.util.List; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/21 + */ +public interface LargeScreenService { + + MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam); + +} diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java new file mode 100644 index 000000000..7e9fa9068 --- /dev/null +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java @@ -0,0 +1,75 @@ +package com.njcn.device.pq.service.impl; + +import com.njcn.common.pojo.dto.SimpleDTO; +import com.njcn.device.pq.mapper.LargeScreenMapper; +import com.njcn.device.pq.mapper.LineIntegrityDataMapper; +import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; +import com.njcn.device.pq.pojo.param.DeviceInfoParam; +import com.njcn.device.pq.pojo.param.LargeScreenParam; +import com.njcn.device.pq.pojo.param.MonitoringPointScaleParam; +import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; +import com.njcn.device.pq.service.LargeScreenService; + +import com.njcn.system.pojo.enums.StatisticsEnum; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * @version 1.0.0 + * @author: zbj + * @date: 2023/03/21 + */ +@Slf4j +@Service +@RequiredArgsConstructor +public class LargeScreenServiceImpl implements LargeScreenService { + + private final GeneralDeviceService generalDeviceService; + + private final LargeScreenMapper largeScreenMapper; + + /** + * 监测点规模 + */ + @Override + public MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam) { + //创建返回VO + MonitoringPointScaleVO result = new MonitoringPointScaleVO(); + ArrayList list = new ArrayList<>(); + DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam(); + //部门索引 + deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex()); + //统计类型 + SimpleDTO simpleDTO = new SimpleDTO(); + simpleDTO.setName(String.valueOf(StatisticsEnum.POWER_NETWORK)); + deviceInfoParam.setStatisticalType(simpleDTO); + //添加时间 + deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime()); + deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime()); + // 获取所有数据 + List generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList())); + + for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + MonitoringPointScaleParam param = new MonitoringPointScaleParam(); + param.setIndex(generalDeviceDTO.getIndex()); + param.setName(generalDeviceDTO.getName()); + param.setCount(generalDeviceDTO.getLineIndexes().size()); + list.add(param); + } + result.setParam(list); + //所有监测点id + List lineIds = generalDeviceDTOList.stream().flatMap(dto -> dto.getLineIndexes().stream()).collect(Collectors.toList()); + Map count = largeScreenMapper.getMonitorAddCount(lineIds, largeScreenParam.getSearchBeginTime(), largeScreenParam.getSearchEndTime()); + result.setMonitorTotalCount(String.valueOf(lineIds.size())); + result.setMonitorAddCount(count.get("count").toString()); + return result; + } +} From a9e0b7395e48c6693c8e145b25904118f957273d Mon Sep 17 00:00:00 2001 From: huangzj <826100833@qq.com> Date: Wed, 22 Mar 2023 09:02:48 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=BA=E6=99=AE=E6=B5=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/pojo/po/RGeneralSurveyPlanPO.java | 3 +++ .../RGeneralSurveyPlanController.java | 6 +++--- .../service/RGeneralSurveyPlanPOService.java | 2 +- .../impl/RGeneralSurveyPlanPOServiceImpl.java | 19 ++++++++++++++++--- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java index 67f5f441c..e45562175 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/RGeneralSurveyPlanPO.java @@ -128,4 +128,7 @@ public class RGeneralSurveyPlanPO { @TableField(value = "upload_time") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date uploadTime; + @TableField(value = "create_person") + private String createPerson; + } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java index 7d8363c41..7969385fa 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/RGeneralSurveyPlanController.java @@ -158,7 +158,7 @@ public class RGeneralSurveyPlanController extends BaseController { public HttpResult> queryPlan(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ String methodDescribe = getMethodDescribe("queryPlan"); - IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ())); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("0","1","2","3").collect (Collectors.toList ()),"1"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } @@ -169,7 +169,7 @@ public class RGeneralSurveyPlanController extends BaseController { public HttpResult> queryPlanAudit(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ String methodDescribe = getMethodDescribe("queryPlanAudit"); - IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ())); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("1","2").collect (Collectors.toList ()),"2"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } @@ -191,7 +191,7 @@ public class RGeneralSurveyPlanController extends BaseController { public HttpResult> queryPlanResult(@Validated @RequestBody RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm){ String methodDescribe = getMethodDescribe("queryPlanResult"); - IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ())); + IPage rGeneralSurveyPlanVOS = rGeneralSurveyPlanPOService.query (rGeneralSurveyPlanQueryParm, Stream.of ("3","4").collect (Collectors.toList ()),"3"); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rGeneralSurveyPlanVOS, methodDescribe); } diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java index 029abf2d2..df33a17b9 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/RGeneralSurveyPlanPOService.java @@ -37,7 +37,7 @@ public interface RGeneralSurveyPlanPOService extends IMppService query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List statusList); + IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm,List statusList,String type); /** * @Description: surveyResultUpload * @Param: [surveyResultUploadParam] diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java index f0fb43cd8..23467dc85 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/RGeneralSurveyPlanPOServiceImpl.java @@ -34,7 +34,9 @@ import com.njcn.system.api.DicDataFeignClient; import com.njcn.system.enums.DicDataTypeEnum; import com.njcn.system.pojo.po.DictData; import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.po.Dept; import com.njcn.user.pojo.vo.PvTerminalTreeVO; +import com.njcn.web.utils.RequestUtil; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -113,7 +115,11 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl queryWrapper = new QueryWrapper ( ); queryWrapper.lambda ( ).eq (RGeneralSurveyPlanDetail::getPlanNo, rGeneralSurveyPlanAddParm.getPlanNo ( )); @@ -149,11 +155,18 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List statusList) { + public IPage query(RGeneralSurveyPlanQueryParm rGeneralSurveyPlanQueryParm, List statusList,String type) { IPage page = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( )); IPage returnpage = new Page<> (rGeneralSurveyPlanQueryParm.getCurrentPage ( ), rGeneralSurveyPlanQueryParm.getPageSize ( )); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<> ( ); + /*type=1：新建页面：查看自己负责的计划；type=2：审核页面：审核者==当前用户；结果页面：查看自己负责的计划*/ + if(type=="1"||type=="3"){ + queryWrapper.eq (RGeneralSurveyPlanPO::getCreatePerson,RequestUtil.getUserIndex ()); + } + if(type=="2"){ + queryWrapper.eq (RGeneralSurveyPlanPO::getCheckPerson,RequestUtil.getDeptIndex ()); + } if (!StringUtils.isEmpty (rGeneralSurveyPlanQueryParm.getOrgNo ( ))) { List data = deptFeignClient.getDepSonIdtByDeptId (rGeneralSurveyPlanQueryParm.getOrgNo ( )).getData ( ); @@ -382,7 +395,7 @@ public class RGeneralSurveyPlanPOServiceImpl extends MppServiceImpl updateWrapper = new UpdateWrapper ( ); updateWrapper.eq ("plan_no", rGeneralSurveyPlanChcekParm.getPlanNo ( )); updateWrapper.set ("check_comment", rGeneralSurveyPlanChcekParm.getCheckComment ( )); - updateWrapper.set ("check_person", rGeneralSurveyPlanChcekParm.getCheckPerson ( )); +// updateWrapper.set ("check_person", rGeneralSurveyPlanChcekParm.getCheckPerson ( )); updateWrapper.set ("status", Objects.equals ("1", rGeneralSurveyPlanChcekParm.getCheckResult ( )) ? 3 : 2); result = this.update (updateWrapper); return result; From e4c0ee727d9ce37235960b65ace3b1d01c7a017a Mon Sep 17 00:00:00 2001 From: zhangbaojian <1065122561@qq.com> Date: Wed, 22 Mar 2023 09:42:37 +0800 Subject: [PATCH 4/8] =?UTF-8?q?zbj//=E5=A4=A7=E5=B1=8F=E7=9B=91=E6=B5=8B?= =?UTF-8?q?=E7=82=B9=E8=A7=84=E6=A8=A1(=E8=B4=9F=E8=8D=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pq/controller/LargeScreenController.java | 22 +++++++---- .../device/pq/service/LargeScreenService.java | 3 +- .../service/impl/LargeScreenServiceImpl.java | 38 +++++++++++++++++-- 3 files changed, 51 insertions(+), 12 deletions(-) diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java index 76a284514..69bf53884 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/LargeScreenController.java @@ -1,12 +1,10 @@ package com.njcn.device.pq.controller; -import cn.hutool.core.collection.CollectionUtil; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.LargeScreenParam; import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; import com.njcn.device.pq.service.LargeScreenService; @@ -22,9 +20,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; -import java.util.Objects; - /** * @version 1.0.0 * @author: zbj @@ -44,11 +39,24 @@ public class LargeScreenController extends BaseController { */ @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getMonitoringPointScale") - @ApiOperation("监测点规模") - @ApiImplicitParam(name = "largeScreenParam", value = "查询终端条件", required = true) + @ApiOperation("监测点规模(区域)") + @ApiImplicitParam(name = "largeScreenParam", value = "监测点规模(区域)", required = true) public HttpResult getMonitoringPointScale(@RequestBody @Validated LargeScreenParam largeScreenParam) { String methodDescribe = getMethodDescribe("getMonitoringPointScale"); MonitoringPointScaleVO result = largeScreenService.getMonitoringPointScale(largeScreenParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); } + + /** + * 监测点规模 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @PostMapping("/getLoadType") + @ApiOperation("监测点规模(负荷类型)") + @ApiImplicitParam(name = "getLoadType", value = "监测点规模(负荷类型)", required = true) + public HttpResult getLoadType(@RequestBody @Validated LargeScreenParam largeScreenParam) { + String methodDescribe = getMethodDescribe("getLoadType"); + MonitoringPointScaleVO result = largeScreenService.getLoadType(largeScreenParam); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } } \ No newline at end of file diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java index 8eac82b6c..16d3b7935 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/LargeScreenService.java @@ -1,10 +1,8 @@ package com.njcn.device.pq.service; -import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.LargeScreenParam; import com.njcn.device.pq.pojo.vo.MonitoringPointScaleVO; -import java.util.List; /** * @version 1.0.0 @@ -15,4 +13,5 @@ public interface LargeScreenService { MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam); + MonitoringPointScaleVO getLoadType(LargeScreenParam largeScreenParam); } diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java index 7e9fa9068..6d26219a5 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LargeScreenServiceImpl.java @@ -2,7 +2,6 @@ package com.njcn.device.pq.service.impl; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.device.pq.mapper.LargeScreenMapper; -import com.njcn.device.pq.mapper.LineIntegrityDataMapper; import com.njcn.device.pq.pojo.dto.GeneralDeviceDTO; import com.njcn.device.pq.pojo.param.DeviceInfoParam; import com.njcn.device.pq.pojo.param.LargeScreenParam; @@ -37,7 +36,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { private final LargeScreenMapper largeScreenMapper; /** - * 监测点规模 + * 监测点规模(区域) */ @Override public MonitoringPointScaleVO getMonitoringPointScale(LargeScreenParam largeScreenParam) { @@ -49,7 +48,7 @@ public class LargeScreenServiceImpl implements LargeScreenService { deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex()); //统计类型 SimpleDTO simpleDTO = new SimpleDTO(); - simpleDTO.setName(String.valueOf(StatisticsEnum.POWER_NETWORK)); + simpleDTO.setCode(String.valueOf(StatisticsEnum.POWER_NETWORK)); deviceInfoParam.setStatisticalType(simpleDTO); //添加时间 deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime()); @@ -72,4 +71,37 @@ public class LargeScreenServiceImpl implements LargeScreenService { result.setMonitorAddCount(count.get("count").toString()); return result; } + + /** + * 监测点规模(负荷类型) + */ + @Override + public MonitoringPointScaleVO getLoadType(LargeScreenParam largeScreenParam) { + //创建返回VO + MonitoringPointScaleVO result = new MonitoringPointScaleVO(); + ArrayList list = new ArrayList<>(); + DeviceInfoParam.BusinessParam deviceInfoParam = new DeviceInfoParam.BusinessParam(); + //部门索引 + deviceInfoParam.setDeptIndex(largeScreenParam.getDeptIndex()); + //统计类型 + SimpleDTO simpleDTO = new SimpleDTO(); + simpleDTO.setCode(String.valueOf(StatisticsEnum.LOAD_TYPE)); + deviceInfoParam.setStatisticalType(simpleDTO); + //添加时间 + deviceInfoParam.setSearchBeginTime(largeScreenParam.getSearchBeginTime()); + deviceInfoParam.setSearchEndTime(largeScreenParam.getSearchEndTime()); + // 获取所有数据 + List generalDeviceDTOList = generalDeviceService.getDeviceInfo(deviceInfoParam, Stream.of(0).collect(Collectors.toList()), Stream.of(1).collect(Collectors.toList())); + + for (GeneralDeviceDTO generalDeviceDTO : generalDeviceDTOList) { + MonitoringPointScaleParam param = new MonitoringPointScaleParam(); + param.setIndex(generalDeviceDTO.getIndex()); + param.setName(generalDeviceDTO.getName()); + param.setCount(generalDeviceDTO.getLineIndexes().size()); + list.add(param); + } + result.setParam(list); + return result; + } + } From eb6c6fa85b2ed263936d2a169dc3ce8d5fc1fb24 Mon Sep 17 00:00:00 2001 From: zhuxinyu <1799009482@qq.com> Date: Wed, 22 Mar 2023 09:47:07 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E7=BB=88=E7=AB=AF=E5=91=8A=E8=AD=A6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/param/AlarmParam.java | 10 +--------- .../njcn/device/pq/pojo/vo/TerminalAlarmVO.java | 1 + .../device/pq/mapper/mapping/AlarmMapper.xml | 2 +- .../device/pq/service/impl/LineServiceImpl.java | 6 ------ .../service/impl/TerminalAlarmServiceImpl.java | 16 +++------------- 5 files changed, 6 insertions(+), 29 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java index 47985d353..767cce69f 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/param/AlarmParam.java @@ -16,7 +16,7 @@ import javax.validation.constraints.NotBlank; */ @Data @ApiModel -public class AlarmParam { +public class AlarmParam extends BaseParam{ @NotBlank(message = "起始时间不可为空") @DateTimeStrValid @@ -45,12 +45,4 @@ public class AlarmParam { @ApiModelProperty(name = "processTime",value = "处理时间") private String processTime; - - - - @ApiModelProperty("页码") - private Integer pageNum; - - @ApiModelProperty("页面尺寸") - private Integer pageSize; } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java index 996784b91..0abc8840d 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/TerminalAlarmVO.java @@ -20,6 +20,7 @@ import java.time.LocalDateTime; public class TerminalAlarmVO implements Serializable { + // 变电站 private String subName; private String lineGrade; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml index 3e9678f21..1c499dbe6 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/AlarmMapper.xml @@ -64,7 +64,7 @@ FROM f.NAME type, f.id typeId, f.`Level`, - max( a.Occurred_Time ) occurredTime, + max(a.Occurred_Time) occurredTime, e.NAME subName, b.NAME devLineName, b.id devLineId, diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java index ce6587d11..cacba3110 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/LineServiceImpl.java @@ -401,12 +401,6 @@ public class LineServiceImpl extends ServiceImpl implements Li if (CollectionUtils.isEmpty(deviceIndexes)) { continue; } - // 监测点流量统计 -// deviceList = lineMapper.getNewDeviceRunStatistics(lineIndexes, -// DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())), -// DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())), -// (deviceInfoParam.getPageNum()-1)*deviceInfoParam.getPageSize(), -// deviceInfoParam.getPageSize()); page = lineMapper.getNewDeviceRunStatistics( new Page(deviceInfoParam.getPageNum(), deviceInfoParam.getPageSize()), diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java index 30aa20c4e..b41843f97 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/TerminalAlarmServiceImpl.java @@ -29,19 +29,9 @@ public class TerminalAlarmServiceImpl implements TerminalAlarmService { @Override public Page alarmList(AlarmParam alarmParam) { - String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type FROM pqs_alarm group by type,line_id,dev_line_type"; - - - - - - - - - - //Page page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam)); - //return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade()); - return null; + // String sql = "SELECT last(dev_line_type) as dev_line_type,line_id ,type FROM pqs_alarm group by type,line_id,dev_line_type"; + Page page = new Page<>(PageFactory.getPageNum(alarmParam),PageFactory.getPageSize(alarmParam)); + return alarmMapper.getAlarmInfo(page,PubUtils.beginTimeToLocalDateTime(alarmParam.getStartTime()),PubUtils.endTimeToLocalDateTime(alarmParam.getEndTime()),alarmParam.getFlag(),alarmParam.getType(),alarmParam.getAlarmLevel(),alarmParam.getLineGrade()); } @Override From c3b89343fd60d69c7c2b8a89c21c064f1709a4f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Wed, 22 Mar 2023 18:06:00 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=88=A0=E9=99=A4pms=E6=AF=8D=E7=BA=BF?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pms/pojo/po/Generatrix.java | 72 ++-- .../ledgerManger/PmsGeneratrixController.java | 24 +- .../majornetwork/PmsGeneratrixMapper.java | 94 ++--- .../majornetwork/IPmsGeneratrixService.java | 216 +++++------ .../majornetwork/impl/GeneratrixWireImpl.java | 2 - .../impl/PmsGeneratrixServiceImpl.java | 344 +++++++++--------- .../impl/RStatBusbarHarmonicServiceImpl.java | 3 - 7 files changed, 380 insertions(+), 375 deletions(-) diff --git a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java index 72b2bb5dc..507f20702 100644 --- a/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java +++ b/pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/pojo/po/Generatrix.java @@ -1,36 +1,36 @@ -package com.njcn.device.pms.pojo.po; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.njcn.db.bo.BaseEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - -/** - * pms-device - * 母线 - * @author cdf - * @date 2022/10/26 - */ -@Data -@EqualsAndHashCode(callSuper = true) -@TableName("pms_generatrix") -public class Generatrix extends BaseEntity { - - private static final long serialVersionUID = 1L; - - @TableId - private String generatrixId; - - private String generatrixName; - - private String statationId; - - private String statationName; - - private String scale; - - private Integer status; - - -} +//package com.njcn.device.pms.pojo.po; +// +//import com.baomidou.mybatisplus.annotation.TableId; +//import com.baomidou.mybatisplus.annotation.TableName; +//import com.njcn.db.bo.BaseEntity; +//import lombok.Data; +//import lombok.EqualsAndHashCode; +// +///** +// * pms-device +// * 母线 +// * @author cdf +// * @date 2022/10/26 +// */ +//@Data +//@EqualsAndHashCode(callSuper = true) +//@TableName("pms_generatrix") +//public class Generatrix extends BaseEntity { +// +// private static final long serialVersionUID = 1L; +// +// @TableId +// private String generatrixId; +// +// private String generatrixName; +// +// private String statationId; +// +// private String statationName; +// +// private String scale; +// +// private Integer status; +// +// +//} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixController.java index e91a2b99c..985214d2e 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsGeneratrixController.java @@ -1,3 +1,4 @@ +/* package com.njcn.device.pms.controller.ledgerManger; import cn.hutool.core.collection.CollectionUtil; @@ -29,12 +30,14 @@ import javax.validation.constraints.NotEmpty; import java.util.List; import java.util.Objects; +*/ /** * 母线信息 * * @author yzh * @date 2022/10/18 - */ + *//* + @RestController @RequestMapping("/pmsGeneratrix") @@ -45,12 +48,14 @@ public class PmsGeneratrixController extends BaseController { private final IPmsGeneratrixService pmsGeneratrixService; - /** + */ +/** * 获取指定母线信息 * * @param param 获取指定的监测点信息条件 * @return 指定母线信息 - */ + *//* + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getGeneratrixInfo") @ApiOperation("获取指定母线信息") @@ -65,14 +70,16 @@ public class PmsGeneratrixController extends BaseController { } } - /** + */ +/** * 获取母线与电站关联信息 * * @param param 条件参数 * @return com.njcn.common.pojo.response.HttpResult> * @author yzh * @date 2022/11/3 - */ + *//* + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getGeneratrixAndPowerStationInfo") @ApiOperation("获取母线与电站关联信息") @@ -87,13 +94,15 @@ public class PmsGeneratrixController extends BaseController { } } - /** + */ +/** * @Description: 普测计划页面调用根据条件查询母线信息 * @Param: [param] * @return: com.njcn.common.pojo.response.HttpResult> * @Author: clam * @Date: 2022/12/5 - */ + *//* + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/getGeneratrixByCondition") @ApiOperation("普测计划页面调用根据条件查询母线信息") @@ -184,3 +193,4 @@ public class PmsGeneratrixController extends BaseController { } } +*/ diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java index 0c5f92cd0..ba8f7e546 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/PmsGeneratrixMapper.java @@ -1,47 +1,47 @@ -package com.njcn.device.pms.mapper.majornetwork; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; -import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; -import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; -import com.njcn.device.pms.pojo.param.ConditionParam; -import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; -import com.njcn.device.pms.pojo.po.Generatrix; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @author yzh - * @date 2022/10/18 - */ -@Mapper -public interface PmsGeneratrixMapper extends BaseMapper { - - /** - * 获取母线信息 - * - * @param pmsGeneratrixParam 入参 - * @return 母线信息 - */ - List getGeneratrixInfo(@Param("pmsGeneratrixParam") PmsGeneratrixParam pmsGeneratrixParam); - - /** - * 获取母线与电站关联信息 - * - * @param param 条件参数 - * @return java.util.List - * @author yzh - * @date 2022/11/3 - */ - List getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param); - /** - * @Description: 普测计划页面调用根据条件查询母线信息 - * @Param: [data, param] - * @return: java.util.List - * @Author: clam - * @Date: 2022/12/5 - */ - List getGeneratrixByCondition(@Param("orgList")List data, @Param("param")ConditionParam param); -} +//package com.njcn.device.pms.mapper.majornetwork; +// +//import com.baomidou.mybatisplus.core.mapper.BaseMapper; +//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; +//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; +//import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +//import com.njcn.device.pms.pojo.param.ConditionParam; +//import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; +//import com.njcn.device.pms.pojo.po.Generatrix; +//import org.apache.ibatis.annotations.Mapper; +//import org.apache.ibatis.annotations.Param; +// +//import java.util.List; +// +///** +// * @author yzh +// * @date 2022/10/18 +// */ +//@Mapper +//public interface PmsGeneratrixMapper extends BaseMapper { +// +// /** +// * 获取母线信息 +// * +// * @param pmsGeneratrixParam 入参 +// * @return 母线信息 +// */ +// List getGeneratrixInfo(@Param("pmsGeneratrixParam") PmsGeneratrixParam pmsGeneratrixParam); +// +// /** +// * 获取母线与电站关联信息 +// * +// * @param param 条件参数 +// * @return java.util.List +// * @author yzh +// * @date 2022/11/3 +// */ +// List getGeneratrixAndPowerStationInfo(@Param("param") PmsGeneratrixParam param); +// /** +// * @Description: 普测计划页面调用根据条件查询母线信息 +// * @Param: [data, param] +// * @return: java.util.List +// * @Author: clam +// * @Date: 2022/12/5 +// */ +// List getGeneratrixByCondition(@Param("orgList")List data, @Param("param")ConditionParam param); +//} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java index c0e73e5a8..5fd95708a 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IPmsGeneratrixService.java @@ -1,108 +1,108 @@ -package com.njcn.device.pms.service.majornetwork; - -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.baomidou.mybatisplus.extension.service.IService; -import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; -import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; -import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; -import com.njcn.device.pms.pojo.param.ConditionParam; -import com.njcn.device.pms.pojo.param.GeneratrixParam; -import com.njcn.device.pms.pojo.param.PmsBaseParam; -import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; -import com.njcn.device.pms.pojo.po.Generatrix; -import com.njcn.web.pojo.param.BaseParam; - -import java.util.List; - -/** - * @author yzh - * @date 2022/10/18 - */ - -public interface IPmsGeneratrixService extends IService { - - /** - * 获取母线信息 - * - * @param param 入参 - * @return 母线信息 - */ - List getGeneratrixInfo(PmsGeneratrixParam param); - - /** - * 新增母线 - * - * @param generatrixParam 母线 - * @return boolean - * @author cdf - * @date 2022/10/25 - */ - boolean addGeneratrix(GeneratrixParam generatrixParam); - - /** - * 修改母线 - * - * @param generatrixParam 母线 - * @return boolean - * @author cdf - * @date 2022/10/25 - */ - boolean updateGeneratrix(GeneratrixParam generatrixParam); - - /** - * 删除母线 - * - * @param generatrixIds 母线 - * @return boolean - * @author cdf - * @date 2022/10/25 - */ - boolean delGeneratrix(List generatrixIds); - - /** - * 查询母线 - * - * @param generatrixId 母线id - * @return boolean - * @author cdf - * @date 2022/10/25 - */ - Generatrix getGeneratrixById(String generatrixId); - - /** - * 查询母线列表 - * - * @return boolean - * @author cdf - * @date 2022/10/25 - */ - List getGeneratrixList(PmsBaseParam pmsBaseParam); - - /** - * 查询母线列表 - * - * @param baseParam 基础参数 - * @return boolean - * @author cdf - * @date 2022/10/25 - */ - Page getGeneratrixPageList(BaseParam baseParam); - - /** - * 获取母线与电站关联信息 - * - * @param param 条件参数 - * @return java.util.List - * @author yzh - * @date 2022/11/3 - */ - List getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param); - /** - * @Description: 普测计划页面调用根据条件查询母线信息 - * @Param: [param] - * @return: java.util.List - * @Author: clam - * @Date: 2022/12/5 - */ - List getGeneratrixByCondition(ConditionParam param); -} +//package com.njcn.device.pms.service.majornetwork; +// +//import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +//import com.baomidou.mybatisplus.extension.service.IService; +//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; +//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; +//import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +//import com.njcn.device.pms.pojo.param.ConditionParam; +//import com.njcn.device.pms.pojo.param.GeneratrixParam; +//import com.njcn.device.pms.pojo.param.PmsBaseParam; +//import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; +//import com.njcn.device.pms.pojo.po.Generatrix; +//import com.njcn.web.pojo.param.BaseParam; +// +//import java.util.List; +// +///** +// * @author yzh +// * @date 2022/10/18 +// */ +// +//public interface IPmsGeneratrixService extends IService { +// +// /** +// * 获取母线信息 +// * +// * @param param 入参 +// * @return 母线信息 +// */ +// List getGeneratrixInfo(PmsGeneratrixParam param); +// +// /** +// * 新增母线 +// * +// * @param generatrixParam 母线 +// * @return boolean +// * @author cdf +// * @date 2022/10/25 +// */ +// boolean addGeneratrix(GeneratrixParam generatrixParam); +// +// /** +// * 修改母线 +// * +// * @param generatrixParam 母线 +// * @return boolean +// * @author cdf +// * @date 2022/10/25 +// */ +// boolean updateGeneratrix(GeneratrixParam generatrixParam); +// +// /** +// * 删除母线 +// * +// * @param generatrixIds 母线 +// * @return boolean +// * @author cdf +// * @date 2022/10/25 +// */ +// boolean delGeneratrix(List generatrixIds); +// +// /** +// * 查询母线 +// * +// * @param generatrixId 母线id +// * @return boolean +// * @author cdf +// * @date 2022/10/25 +// */ +// Generatrix getGeneratrixById(String generatrixId); +// +// /** +// * 查询母线列表 +// * +// * @return boolean +// * @author cdf +// * @date 2022/10/25 +// */ +// List getGeneratrixList(PmsBaseParam pmsBaseParam); +// +// /** +// * 查询母线列表 +// * +// * @param baseParam 基础参数 +// * @return boolean +// * @author cdf +// * @date 2022/10/25 +// */ +// Page getGeneratrixPageList(BaseParam baseParam); +// +// /** +// * 获取母线与电站关联信息 +// * +// * @param param 条件参数 +// * @return java.util.List +// * @author yzh +// * @date 2022/11/3 +// */ +// List getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param); +// /** +// * @Description: 普测计划页面调用根据条件查询母线信息 +// * @Param: [param] +// * @return: java.util.List +// * @Author: clam +// * @Date: 2022/12/5 +// */ +// List getGeneratrixByCondition(ConditionParam param); +//} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java index ae94e45af..b744f0ea8 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/GeneratrixWireImpl.java @@ -10,7 +10,6 @@ import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixWireMapper; -import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; @@ -18,7 +17,6 @@ import com.njcn.device.pms.pojo.param.ConditionParam; import com.njcn.device.pms.pojo.param.GeneratrixWireParam; import com.njcn.device.pms.pojo.param.PmsBaseParam; import com.njcn.device.pms.pojo.param.PmsGeneratrixParam; -import com.njcn.device.pms.pojo.po.Generatrix; import com.njcn.device.pms.pojo.po.GeneratrixWire; import com.njcn.device.pms.pojo.po.StatationStat; import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java index 95a274617..7dc98fe41 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/PmsGeneratrixServiceImpl.java @@ -1,172 +1,172 @@ -package com.njcn.device.pms.service.majornetwork.impl; - -import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.util.StrUtil; -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.common.DataStateEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.device.pms.enums.PmsDeviceResponseEnum; -import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper; -import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; -import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; -import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; -import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; -import com.njcn.device.pms.pojo.param.*; -import com.njcn.device.pms.pojo.po.Generatrix; -import com.njcn.device.pms.pojo.po.StatationStat; -import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; - -import com.njcn.user.api.DeptFeignClient; -import com.njcn.web.factory.PageFactory; -import com.njcn.web.pojo.param.BaseParam; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.BeanUtils; -import org.springframework.stereotype.Service; - -import java.util.List; -import java.util.Objects; - -/** - * @author yzh - * @date 2022/10/18 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PmsGeneratrixServiceImpl extends ServiceImpl implements IPmsGeneratrixService { - - private final PmsGeneratrixMapper pmsGeneratrixMapper; - - private final StatationStatMapper statationStatMapper; - - private final DeptFeignClient deptFeignClient; - - /** - * 获取母线信息 - * - * @param param 入参 - * @return 母线信息 - */ - @Override - public List getGeneratrixInfo(PmsGeneratrixParam param) { - if (CollUtil.isEmpty(param.getGeneratrixIds())) { - return null; - } - return pmsGeneratrixMapper.getGeneratrixInfo(param); - } - - @Override - public boolean addGeneratrix(GeneratrixParam generatrixParam) { - checkName(generatrixParam,false); - StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId()); - if(Objects.isNull(statationStat)){ - throw new BusinessException(PmsDeviceResponseEnum.NO_STATION); - } - Generatrix generatrix = new Generatrix(); - BeanUtils.copyProperties(generatrixParam, generatrix); - generatrix.setStatationName(statationStat.getPowerName()); - generatrix.setStatus(DataStateEnum.ENABLE.getCode()); - return this.save(generatrix); - } - - @Override - public boolean updateGeneratrix(GeneratrixParam generatrixParam) { - checkName(generatrixParam,true); - StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId()); - if(Objects.isNull(statationStat)){ - throw new BusinessException(PmsDeviceResponseEnum.NO_STATION); - } - Generatrix generatrix = new Generatrix(); - BeanUtils.copyProperties(generatrixParam, generatrix); - generatrix.setStatationName(statationStat.getPowerName()); - return this.updateById(generatrix); - } - - @Override - public boolean delGeneratrix(List generatrixIds) { - return this.removeByIds(generatrixIds); - } - - @Override - public Generatrix getGeneratrixById(String generatrixId) { - return this.getById(generatrixId); - } - - @Override - public List getGeneratrixList(PmsBaseParam pmsBaseParam) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){ - lambdaQueryWrapper.eq(Generatrix::getStatationId,pmsBaseParam.getStationId()); - } - lambdaQueryWrapper.orderByAsc(Generatrix::getCreateTime); - return this.list(lambdaQueryWrapper); - } - - @Override - public Page getGeneratrixPageList(BaseParam baseParam) { - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getGeneratrixName,baseParam.getSearchValue()) - .or(StrUtil.isNotBlank(baseParam.getSearchValue())) - .like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getStatationName,baseParam.getSearchValue()) - .orderByAsc(Generatrix::getCreateTime); - return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); - } - - /** - * 获取母线与电站关联信息 - * - * @param param 条件参数 - * @return java.util.List - * @author yzh - * @date 2022/11/3 - */ - @Override - public List getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) { - return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param); - } - - /** - * @param param - * @Description: 普测计划页面调用根据条件查询母线信息 - * @Param: [param] - * @return: java.util.List - * @Author: clam - * @Date: 2022/12/5 - */ - @Override - public List getGeneratrixByCondition(ConditionParam param) { - - List data = deptFeignClient.getDepSonSelfCodetByDeptId (param.getDeptId ( )).getData ( ); - - return pmsGeneratrixMapper.getGeneratrixByCondition(data,param); - } - - - private void checkName(GeneratrixParam generatrixParam, Boolean updateFlag){ - - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(Generatrix::getGeneratrixName,generatrixParam.getGeneratrixName()) - .eq(Generatrix::getGeneratrixId,generatrixParam.getStatationId()) - .eq(Generatrix::getStatus, DataStateEnum.ENABLE.getCode()); - - if(updateFlag){ - //更新 - lambdaQueryWrapper.ne(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId()); - }else { - //新增校验 - LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); - lambdaQuery.eq(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId()); - int count = this.count(lambdaQuery); - if(count>0){ - throw new BusinessException(PmsDeviceResponseEnum.GENWIRE_SAME); - } - } - int count = this.count(lambdaQueryWrapper); - if(count > 0){ - throw new BusinessException(PmsDeviceResponseEnum.GENERATRIX_NAME_REPEAT); - } - } -} +//package com.njcn.device.pms.service.majornetwork.impl; +// +//import cn.hutool.core.collection.CollUtil; +//import cn.hutool.core.util.StrUtil; +//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.common.DataStateEnum; +//import com.njcn.common.pojo.exception.BusinessException; +//import com.njcn.device.pms.enums.PmsDeviceResponseEnum; +//import com.njcn.device.pms.mapper.majornetwork.PmsGeneratrixMapper; +//import com.njcn.device.pms.mapper.majornetwork.StatationStatMapper; +//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; +//import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationSonDTO; +//import com.njcn.device.pms.pojo.dto.PmsGeneratrixDTO; +//import com.njcn.device.pms.pojo.param.*; +//import com.njcn.device.pms.pojo.po.Generatrix; +//import com.njcn.device.pms.pojo.po.StatationStat; +//import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; +// +//import com.njcn.user.api.DeptFeignClient; +//import com.njcn.web.factory.PageFactory; +//import com.njcn.web.pojo.param.BaseParam; +//import lombok.RequiredArgsConstructor; +//import lombok.extern.slf4j.Slf4j; +//import org.springframework.beans.BeanUtils; +//import org.springframework.stereotype.Service; +// +//import java.util.List; +//import java.util.Objects; +// +///** +// * @author yzh +// * @date 2022/10/18 +// */ +//@Slf4j +//@Service +//@RequiredArgsConstructor +//public class PmsGeneratrixServiceImpl extends ServiceImpl implements IPmsGeneratrixService { +// +// private final PmsGeneratrixMapper pmsGeneratrixMapper; +// +// private final StatationStatMapper statationStatMapper; +// +// private final DeptFeignClient deptFeignClient; +// +// /** +// * 获取母线信息 +// * +// * @param param 入参 +// * @return 母线信息 +// */ +// @Override +// public List getGeneratrixInfo(PmsGeneratrixParam param) { +// if (CollUtil.isEmpty(param.getGeneratrixIds())) { +// return null; +// } +// return pmsGeneratrixMapper.getGeneratrixInfo(param); +// } +// +// @Override +// public boolean addGeneratrix(GeneratrixParam generatrixParam) { +// checkName(generatrixParam,false); +// StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId()); +// if(Objects.isNull(statationStat)){ +// throw new BusinessException(PmsDeviceResponseEnum.NO_STATION); +// } +// Generatrix generatrix = new Generatrix(); +// BeanUtils.copyProperties(generatrixParam, generatrix); +// generatrix.setStatationName(statationStat.getPowerName()); +// generatrix.setStatus(DataStateEnum.ENABLE.getCode()); +// return this.save(generatrix); +// } +// +// @Override +// public boolean updateGeneratrix(GeneratrixParam generatrixParam) { +// checkName(generatrixParam,true); +// StatationStat statationStat = statationStatMapper.selectById(generatrixParam.getStatationId()); +// if(Objects.isNull(statationStat)){ +// throw new BusinessException(PmsDeviceResponseEnum.NO_STATION); +// } +// Generatrix generatrix = new Generatrix(); +// BeanUtils.copyProperties(generatrixParam, generatrix); +// generatrix.setStatationName(statationStat.getPowerName()); +// return this.updateById(generatrix); +// } +// +// @Override +// public boolean delGeneratrix(List generatrixIds) { +// return this.removeByIds(generatrixIds); +// } +// +// @Override +// public Generatrix getGeneratrixById(String generatrixId) { +// return this.getById(generatrixId); +// } +// +// @Override +// public List getGeneratrixList(PmsBaseParam pmsBaseParam) { +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// if(StrUtil.isNotBlank(pmsBaseParam.getStationId())){ +// lambdaQueryWrapper.eq(Generatrix::getStatationId,pmsBaseParam.getStationId()); +// } +// lambdaQueryWrapper.orderByAsc(Generatrix::getCreateTime); +// return this.list(lambdaQueryWrapper); +// } +// +// @Override +// public Page getGeneratrixPageList(BaseParam baseParam) { +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getGeneratrixName,baseParam.getSearchValue()) +// .or(StrUtil.isNotBlank(baseParam.getSearchValue())) +// .like(StrUtil.isNotBlank(baseParam.getSearchValue()),Generatrix::getStatationName,baseParam.getSearchValue()) +// .orderByAsc(Generatrix::getCreateTime); +// return this.page(new Page<>(PageFactory.getPageNum(baseParam),PageFactory.getPageSize(baseParam)),lambdaQueryWrapper); +// } +// +// /** +// * 获取母线与电站关联信息 +// * +// * @param param 条件参数 +// * @return java.util.List +// * @author yzh +// * @date 2022/11/3 +// */ +// @Override +// public List getGeneratrixAndPowerStationInfo(PmsGeneratrixParam param) { +// return pmsGeneratrixMapper.getGeneratrixAndPowerStationInfo(param); +// } +// +// /** +// * @param param +// * @Description: 普测计划页面调用根据条件查询母线信息 +// * @Param: [param] +// * @return: java.util.List +// * @Author: clam +// * @Date: 2022/12/5 +// */ +// @Override +// public List getGeneratrixByCondition(ConditionParam param) { +// +// List data = deptFeignClient.getDepSonSelfCodetByDeptId (param.getDeptId ( )).getData ( ); +// +// return pmsGeneratrixMapper.getGeneratrixByCondition(data,param); +// } +// +// +// private void checkName(GeneratrixParam generatrixParam, Boolean updateFlag){ +// +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.eq(Generatrix::getGeneratrixName,generatrixParam.getGeneratrixName()) +// .eq(Generatrix::getGeneratrixId,generatrixParam.getStatationId()) +// .eq(Generatrix::getStatus, DataStateEnum.ENABLE.getCode()); +// +// if(updateFlag){ +// //更新 +// lambdaQueryWrapper.ne(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId()); +// }else { +// //新增校验 +// LambdaQueryWrapper lambdaQuery = new LambdaQueryWrapper<>(); +// lambdaQuery.eq(Generatrix::getGeneratrixId,generatrixParam.getGeneratrixId()); +// int count = this.count(lambdaQuery); +// if(count>0){ +// throw new BusinessException(PmsDeviceResponseEnum.GENWIRE_SAME); +// } +// } +// int count = this.count(lambdaQueryWrapper); +// if(count > 0){ +// throw new BusinessException(PmsDeviceResponseEnum.GENERATRIX_NAME_REPEAT); +// } +// } +//} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java index e934e99fb..7c204de80 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/RStatBusbarHarmonicServiceImpl.java @@ -3,8 +3,6 @@ package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.dto.SimpleDTO; -import com.njcn.device.pms.api.PmsGeneralDeviceInfoClient; -import com.njcn.device.pms.api.PmsGeneratrixClient; import com.njcn.device.pms.mapper.majornetwork.RStatBusbarHarmonicMapper; import com.njcn.device.pms.pojo.dto.GeneratrixAndPowerStationDTO; import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; @@ -15,7 +13,6 @@ import com.njcn.device.pms.pojo.po.RStatBusbarHarmonicYPO; import com.njcn.device.pms.pojo.vo.RStatBusbarHarmonicYVO; import com.njcn.device.pms.service.majornetwork.IGeneratrixWireService; import com.njcn.device.pms.service.majornetwork.IPmsGeneralDeviceService; -import com.njcn.device.pms.service.majornetwork.IPmsGeneratrixService; import com.njcn.device.pms.service.majornetwork.RStatBusbarHarmonicService; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; From 41566d6acc81dec40cec67173faddce317976393 Mon Sep 17 00:00:00 2001 From: wurui Date: Wed, 22 Mar 2023 18:22:04 +0800 Subject: [PATCH 7/8] =?UTF-8?q?1.pmsbug=E4=BF=AE=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E9=85=8D=E7=BD=91=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=8A=A5?= =?UTF-8?q?=E5=91=8A=202.=E6=8A=80=E6=9C=AF=E7=9B=91=E7=9D=A3=E7=AD=96?= =?UTF-8?q?=E7=95=A5=EF=BC=8C=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/PwEventMonitorReportServiceImpl.java | 3 +- .../process/enums/ProcessResponseEnum.java | 1 + .../njcn/process/pojo/param/MonitorParam.java | 37 +++++++ .../process/pojo/param/StrategyParam.java | 21 ++-- .../njcn/process/pojo/po/ThsWarnStrategy.java | 4 + .../controller/ThsWarnStrategyController.java | 34 ++++--- .../service/ThsWarnStrategyService.java | 29 ++++-- .../impl/ThsWarnStrategyServiceImpl.java | 97 +++++++++++++------ 8 files changed, 168 insertions(+), 58 deletions(-) create mode 100644 pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwEventMonitorReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwEventMonitorReportServiceImpl.java index 61576a481..0da6df3e1 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwEventMonitorReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/distribution/Impl/PwEventMonitorReportServiceImpl.java @@ -19,6 +19,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -60,7 +61,7 @@ public class PwEventMonitorReportServiceImpl implements PwEventMonitorReportServ //查询监测点信息 List monitorList = this.getMonitorList(eventMonitorReportParam); List monitorIdList = monitorList.stream().map(PwPmsMonitorDTO::getMonitorId).collect(Collectors.toList()); //监测点id信息 - Map monitorMap = monitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, monitor -> monitor)); + Map monitorMap = monitorList.stream().collect(Collectors.toMap(PwPmsMonitorDTO::getMonitorId, Function.identity(),(kye1,key2)->kye1)); //获取电压等级的字典 List voltageLevelList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_VOLTAGE.getCode()).getData(); diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java index 03998b2da..67a92c075 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/enums/ProcessResponseEnum.java @@ -20,6 +20,7 @@ public enum ProcessResponseEnum { PROCESS_ERROR("A00553","当前流程未审核通过，操作失败！"), QUERY_IS_EMPTY("A00554","当前未查询到当前策略信息，无法删除!"), ENABLED_CANNOT_BE_DELETED("A00555","策略为启用状态不能删除!"), + THERE_IS_ONLY_ONE_STRATEGY("A00556","自动策略或手动策略，通用策略只能有一条!"), ; private final String code; diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java new file mode 100644 index 000000000..1be7f1d14 --- /dev/null +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/MonitorParam.java @@ -0,0 +1,37 @@ +package com.njcn.process.pojo.param; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * <策略监测点绑定> + * + * @author wr + * @createTime: 2023-03-22 + */ + +@Data +public class MonitorParam { + + @ApiModelProperty(value = "单位id") + @NotBlank(message = "单位id不能为空") + private String deptId; + + @ApiModelProperty(value = "类型 0.预警策略 1.告警策略") + @NotEmpty(message = "类型不能为空") + private Integer type; + + @ApiModelProperty(value = "预警策略/告警策略id") + @NotEmpty(message = "策略id集合不能为空") + private List alarmId; + + @ApiModelProperty(value = "监测点id") + @NotEmpty(message = "监测点id集合不能为空") + private List monitorId; + + +} diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java index 2e925832b..04c866bdc 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/param/StrategyParam.java @@ -57,6 +57,10 @@ public class StrategyParam { @NotNull(message = "等级不能为空") private Integer grade; + @ApiModelProperty(value = "0.通用策略 1.定值策略") + @NotNull(message = "策略选择不能为空") + private Integer bigType; + @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)") @NotNull(message = "区分类别不能为空") private Integer type; @@ -108,6 +112,10 @@ public class StrategyParam { @NotBlank(message = "名称不能为空") private String name; + @ApiModelProperty(value = "0.通用策略 1.定值策略") + @NotNull(message = "策略选择不能为空") + private Integer bigType; + @ApiModelProperty(value = "等级（0：一级；1：二级；2：三级）") @NotNull(message = "等级不能为空") private Integer grade; @@ -134,23 +142,22 @@ public class StrategyParam { @ApiModelProperty("名称") private String name; - @ApiModelProperty("变电站信息") - private List childPower; +// @ApiModelProperty("变电站信息") +// private List childPower; @ApiModelProperty("子节点详细信息") - private List children; + private List children; } @Data - public static class Power { + public static class Monitor { @ApiModelProperty("id") private String id; @ApiModelProperty("名称") private String name; - @ApiModelProperty("监测点信息") - private List childMonitor; + @ApiModelProperty("标识") + private Integer leven=3; } - } diff --git a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java index 1a5ff6fa5..db5a3e165 100644 --- a/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java +++ b/pqs-process/process-api/src/main/java/com/njcn/process/pojo/po/ThsWarnStrategy.java @@ -42,6 +42,10 @@ public class ThsWarnStrategy extends BaseEntity implements Serializable { @TableField("Operation") private Integer operation; + @ApiModelProperty(value = "0.通用策略 1.定值策略") + @TableField("Big_Type") + private Integer bigType; + @ApiModelProperty(value = "区分预警单还是告警单(0：预警单；1：告警单)") private Integer type; diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java index e01bfcd27..7abc5ce5c 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/controller/ThsWarnStrategyController.java @@ -8,8 +8,8 @@ import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; +import com.njcn.process.pojo.param.MonitorParam; import com.njcn.process.pojo.param.StrategyParam; -import com.njcn.process.pojo.po.ThsDeptAlarm; import com.njcn.process.pojo.po.ThsWarnStrategy; import com.njcn.process.service.ThsWarnStrategyService; import com.njcn.web.controller.BaseController; @@ -40,7 +40,7 @@ public class ThsWarnStrategyController extends BaseController { private final ThsWarnStrategyService thsWarnStrategyService; @PostMapping("/getStrategyPage") - @ApiOperation("预警单/告警单策略分页查询") + @ApiOperation("分页查询") @OperateInfo(info = LogEnum.BUSINESS_COMMON) public HttpResult> getStrategyPage(@RequestBody @Validated StrategyParam.StrategyPageParam param) { String methodDescribe = getMethodDescribe("getStrategyPage"); @@ -49,7 +49,7 @@ public class ThsWarnStrategyController extends BaseController { } @PostMapping("/insertStrategy") - @ApiOperation(value = "预警单/告警单单条新增") + @ApiOperation(value = "数据添加") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) public HttpResult insertStrategy(@RequestBody @Validated StrategyParam.StrategyInsertParam param) { String methodDescribe = getMethodDescribe("insertStrategy"); @@ -58,7 +58,7 @@ public class ThsWarnStrategyController extends BaseController { } @PostMapping("/bindStrategy") - @ApiOperation(value = "预警单/告警单信息绑定") + @ApiOperation(value = "信息绑定") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) public HttpResult bindStrategy(@RequestBody @Validated StrategyParam.BindParam param) { String methodDescribe = getMethodDescribe("bindStrategy"); @@ -67,7 +67,7 @@ public class ThsWarnStrategyController extends BaseController { } @PostMapping("/getUpdateStrategy") - @ApiOperation(value = "预警单/告警单修改详细查询") + @ApiOperation(value = "详细查询") @OperateInfo(info = LogEnum.BUSINESS_COMMON) public HttpResult getUpdateStrategy(@RequestParam("id") String id) { String methodDescribe = getMethodDescribe("getUpdateStrategy"); @@ -76,7 +76,7 @@ public class ThsWarnStrategyController extends BaseController { } @PostMapping("/updateStrategy") - @ApiOperation(value = "预警单/告警单修改") + @ApiOperation(value = "信息修改") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) public HttpResult updateStrategy(@RequestBody @Validated StrategyParam.StrategyUpParam param) { String methodDescribe = getMethodDescribe("updateStrategy"); @@ -85,7 +85,7 @@ public class ThsWarnStrategyController extends BaseController { } @PostMapping("/updateStrategyState") - @ApiOperation(value = "预警单/告警单修改状态") + @ApiOperation(value = "修改状态") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.UPDATE) public HttpResult updateStrategyState(@RequestBody @Validated StrategyParam.StrategyStateParam param) { String methodDescribe = getMethodDescribe("updateStrategyState"); @@ -93,26 +93,34 @@ public class ThsWarnStrategyController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } - @PostMapping("/getMonitor") + @GetMapping("/getMonitor") @ApiOperation(value = "监测点查询接口") @OperateInfo(info = LogEnum.BUSINESS_COMMON) - public HttpResult> getMonitor(@Param("monitorTag") List monitorTag, @Param("orgId") String orgId) { + public HttpResult> getMonitor(@Param("orgId") String orgId) { String methodDescribe = getMethodDescribe("getMonitor"); - List monitor = thsWarnStrategyService.getMonitor(monitorTag, orgId); + List monitor = thsWarnStrategyService.getMonitor( orgId); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); } @PostMapping("/bindMonitor") - @ApiOperation(value = "预警单/告警单监测点绑定") + @ApiOperation(value = "监测点绑定") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) - public HttpResult bindMonitor(@RequestBody List param) { + public HttpResult bindMonitor(@RequestBody MonitorParam param) { String methodDescribe = getMethodDescribe("bindMonitor"); Boolean flag = thsWarnStrategyService.bindMonitor(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); } + @GetMapping("/echoMonitor") + @ApiOperation(value = "监测点回显") + public HttpResult> echoMonitor(@Param("deptId") String deptId,@Param("type") Integer type) { + String methodDescribe = getMethodDescribe("echoMonitor"); + List strings = thsWarnStrategyService.echoMonitor(deptId, type); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, strings, methodDescribe); + } + @PostMapping("/delStrategy") - @ApiOperation(value = "预警单/告警单信息删除") + @ApiOperation(value = "信息删除") @OperateInfo(info = LogEnum.BUSINESS_COMMON, operateType = OperateType.ADD) public HttpResult delStrategy(String ids) { String methodDescribe = getMethodDescribe("delStrategy"); diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java index d1cc8b041..500104787 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/ThsWarnStrategyService.java @@ -1,8 +1,8 @@ package com.njcn.process.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.njcn.process.pojo.param.MonitorParam; import com.njcn.process.pojo.param.StrategyParam; -import com.njcn.process.pojo.po.ThsDeptAlarm; import com.njcn.process.pojo.po.ThsWarnStrategy; import com.baomidou.mybatisplus.extension.service.IService; @@ -74,14 +74,14 @@ public interface ThsWarnStrategyService extends IService { */ Boolean updateStrategyState(StrategyParam.StrategyStateParam param); - /*** - * 监测点查询接口 - * @author wr - * @date 2023-03-10 14:52 - * @param monitorTag - * @return List - */ - List getMonitor(List monitorTag, String orgId); + /*** + * 监测点查询接口 + * @author wr + * @date 2023-03-22 17:38 + * @param orgId + * @return List + */ + List getMonitor( String orgId); /*** @@ -91,8 +91,17 @@ public interface ThsWarnStrategyService extends IService { * @param param * @return Boolean */ - Boolean bindMonitor(List param); + Boolean bindMonitor(MonitorParam param); + /*** + * 监测点回显 + * @author wr + * @date 2023-03-22 10:44 + * @param org + * @param type + * @return List + */ + List echoMonitor(String org,Integer type); /*** * 预警单/告警单删除 diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java index 7f3ecdf97..52ee1abf8 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java @@ -1,7 +1,6 @@ package com.njcn.process.service.impl; import cn.hutool.core.bean.BeanUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.lang.Assert; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; @@ -13,10 +12,9 @@ import com.njcn.device.pms.api.MonitorClient; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.param.PmsMonitorParam; -import com.njcn.device.pms.pojo.po.DistributionMonitor; import com.njcn.process.enums.ProcessResponseEnum; +import com.njcn.process.pojo.param.MonitorParam; import com.njcn.process.pojo.param.StrategyParam; -import com.njcn.process.pojo.po.PmsTerminalDetection; import com.njcn.process.pojo.po.ThsDeptAlarm; import com.njcn.process.pojo.po.ThsWarnStrategy; import com.njcn.process.mapper.ThsWarnStrategyMapper; @@ -67,15 +65,24 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl() + ThsWarnStrategy one = this.getOne(new LambdaQueryWrapper() .eq(ThsWarnStrategy::getName, param.getName()) + .or(wrapper -> + wrapper.eq(ThsWarnStrategy::getGrade, param.getGrade()) + .eq(ThsWarnStrategy::getBigType, 0) + ) ); - if (count > 0) { - throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + + if (ObjectUtil.isNotNull(one)) { + if(one.getName().equals(param.getName())){ + throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + } + throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY); } ThsWarnStrategy thsWarnStrategy = BeanUtil.copyProperties(param, ThsWarnStrategy.class); thsWarnStrategy.setCreateBy(RequestUtil.getUserNickname()); thsWarnStrategy.setState(2); + thsWarnStrategy.setBigType(param.getBigType()); return this.save(thsWarnStrategy); } @@ -111,13 +118,21 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl wrapper.eq(ThsWarnStrategy::getName, param.getName()) ) + .or(wrapper -> + wrapper.eq( ThsWarnStrategy::getGrade, param.getGrade()) + .eq(ThsWarnStrategy::getBigType, 0) + ) ); if (ObjectUtil.isNotNull(one)) { - throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + if(one.getName().equals(param.getName())){ + throw new BusinessException(PmsDeviceResponseEnum.MODEL_NAME_REPEAT); + } + throw new BusinessException(ProcessResponseEnum.THERE_IS_ONLY_ONE_STRATEGY); } ThsWarnStrategy thsWarnStrategy = BeanUtil.copyProperties(param, ThsWarnStrategy.class); thsWarnStrategy.setUpdateBy(RequestUtil.getUserNickname()); + thsWarnStrategy.setBigType(param.getBigType()); return this.updateById(thsWarnStrategy); } @@ -131,9 +146,8 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl getMonitor(List monitorTag, String orgId) { + public List getMonitor(String orgId) { PmsMonitorParam param = new PmsMonitorParam(); - param.setMonitorTags(monitorTag); List data = monitorClient.getMonitorInfoListByCond(param).getData(); //获取部门结构 List deptInfos = deptFeignClient.getDeptDescendantIndexes(orgId, WebUtil.filterDeptType()).getData(); @@ -144,22 +158,50 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl powers = getPowers(deptDTOS.get(0).getCode(), data); + powers.addAll(recursionSelectList(orgId, deptInfos, data)); + tree.setChildren(powers); monitorTrees.add(tree); return monitorTrees; } @Override @Transactional(rollbackFor = {Exception.class}) - public Boolean bindMonitor(List param) { - //删除之前数据 + public Boolean bindMonitor(MonitorParam param) { + //删除之前数据(根据部门和策略类型) LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(ThsDeptAlarm::getDeptId, param.get(0).getDeptId()); - lambdaQueryWrapper.in(ThsDeptAlarm::getAlarmId, param.get(0).getDeptId()); - lambdaQueryWrapper.in(ThsDeptAlarm::getType, param.get(0).getType()); + lambdaQueryWrapper.eq(ThsDeptAlarm::getDeptId, param.getDeptId()); + lambdaQueryWrapper.eq(ThsDeptAlarm::getType, param.getType()); thsDeptAlarmService.remove(lambdaQueryWrapper); - return thsDeptAlarmService.saveBatch(param); + + //信息添加 + List info=new ArrayList(); + List alarmIds= param.getAlarmId(); + List monitorIds= param.getMonitorId(); + String deptId= param.getDeptId(); + Integer type= param.getType(); + //便利信息 + ThsDeptAlarm alarm; + for (String s : alarmIds) { + for (String monitorId : monitorIds) { + alarm=new ThsDeptAlarm(); + alarm.setDeptId(deptId); + alarm.setType(type); + alarm.setAlarmId(s); + alarm.setMonitorId(monitorId); + info.add(alarm); + } + } + return thsDeptAlarmService.saveBatch(info); + } + + @Override + public List echoMonitor(String org,Integer type) { + List list = thsDeptAlarmService.list(new LambdaQueryWrapper() + .eq(ThsDeptAlarm::getDeptId, org) + .eq(ThsDeptAlarm::getType, type) + ); + return list.stream().map(ThsDeptAlarm::getMonitorId).distinct().collect(Collectors.toList()); } @Override @@ -213,8 +255,9 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl children = recursionSelectList(customer.getId(), deptInfos, data); + List children = new ArrayList<>(); + children.addAll(getPowers(customer.getCode(), data)); + children.addAll(recursionSelectList(customer.getId(), deptInfos, data)); tree.setChildren(children); menuSelectList.add(tree); })); @@ -229,9 +272,9 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl */ - private static List getPowers(String orgCode, List data) { + private static List getPowers(String orgCode, List data) { //变电站信息初始化 - List powers = new ArrayList<>(); + List powers = new ArrayList<>(); //获取监测点信息 List monitorDTOS = data.stream().filter(dept -> dept.getOrgId().equals(orgCode)).collect(Collectors.toList()); Map> collect = monitorDTOS.stream().collect( @@ -239,18 +282,18 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl { String[] split = key.split("_"); - StrategyParam.Power power = new StrategyParam.Power(); + StrategyParam.MonitorTree power = new StrategyParam.MonitorTree(); power.setId(split[0]); - power.setName(split[1]); + power.setName("变电站名称: "+split[1]); //监测点信息 - List monitors = new ArrayList(); + List monitors = new ArrayList(); for (PmsMonitorDTO dto : value) { - StrategyParam.Power childMonitor = new StrategyParam.Power(); + StrategyParam.Monitor childMonitor = new StrategyParam.Monitor(); childMonitor.setId(dto.getId()); - childMonitor.setName(dto.getName()); + childMonitor.setName("监测点名称: "+getMonitorEventCountdto.getName()); monitors.add(childMonitor); } - power.setChildMonitor(monitors); + power.setChildren(monitors); powers.add(power); }); return powers; From 776cf8c095d0b830d75d322752d6bbdfce64894c Mon Sep 17 00:00:00 2001 From: wurui Date: Wed, 22 Mar 2023 18:50:35 +0800 Subject: [PATCH 8/8] ... --- .../njcn/process/service/impl/ThsWarnStrategyServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java index 52ee1abf8..8fc65c9f1 100644 --- a/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java +++ b/pqs-process/process-boot/src/main/java/com/njcn/process/service/impl/ThsWarnStrategyServiceImpl.java @@ -290,7 +290,7 @@ public class ThsWarnStrategyServiceImpl extends ServiceImpl