diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetChildrenDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetChildrenDTO.java index 62f728467..6126d8e06 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetChildrenDTO.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/DeptGetChildrenDTO.java @@ -1,5 +1,6 @@ package com.njcn.device.biz.pojo.dto; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.List; @@ -13,12 +14,18 @@ import java.util.List; @Data public class DeptGetChildrenDTO { + @ApiModelProperty(name = "deptId",value = "部门id") private String deptId; + @ApiModelProperty(name = "deptId",value = "部门名称") private String deptName; + @ApiModelProperty(name = "deptChildren",value = "子集部门code集合") private List deptChildren; + @ApiModelProperty(name = "lineIds",value = "监测点信息") private List lineIds; + @ApiModelProperty(name = "pwMonitorIds",value = "配网监测点信息") + private List pwMonitorIds; } diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PmsDeptGetChildrenDTO.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PmsDeptGetChildrenDTO.java deleted file mode 100644 index ac2b4ea7c..000000000 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/dto/PmsDeptGetChildrenDTO.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.njcn.device.biz.pojo.dto; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.util.List; - -/** - * @author wr - * @description - * @date 2023/4/26 10:08 - */ -@Data -public class PmsDeptGetChildrenDTO { - - @ApiModelProperty(name = "deptId",value = "部门id") - private String deptId; - - @ApiModelProperty(name = "deptId",value = "部门名称") - private String deptName; - - @ApiModelProperty(name = "deptChildren",value = "子集部门code集合") - private List deptChildren; - - @ApiModelProperty(name = "monitorIds",value = "主网监测点信息") - private List monitorIds; - - @ApiModelProperty(name = "pwMonitorIds",value = "配网监测点信息") - private List pwMonitorIds; - -} diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java index d92bae4fe..e9a3d75b5 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/DeptGetLineParam.java @@ -20,7 +20,6 @@ public class DeptGetLineParam { @ApiModelProperty(name = "deptId",value = "部门id") private String deptId; - @NotBlank(message = "系统类型不可为空") @ApiModelProperty(name = "serverName",value = "系统类型 0.event-boot 1.harmonic-boot") private String serverName; diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/PmsDeptGetLineParam.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/PmsDeptGetLineParam.java deleted file mode 100644 index 365d4c91b..000000000 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/pojo/param/PmsDeptGetLineParam.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.njcn.device.biz.pojo.param; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import javax.validation.constraints.NotBlank; - -/** - * @author wr - * @description - * @date 2023/4/26 10:37 - */ -@Data -public class PmsDeptGetLineParam { - @NotBlank(message = "部门id不可为空") - @ApiModelProperty(name = "deptId",value = "部门id") - private String deptId; -} diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java index 4ae07c604..94154c611 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptMonitorController.java @@ -1,11 +1,10 @@ package com.njcn.device.pms.controller.ledgerManger; -import cn.hutool.core.date.TimeInterval; import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; -import com.njcn.device.biz.pojo.dto.PmsDeptGetChildrenDTO; -import com.njcn.device.biz.pojo.param.PmsDeptGetLineParam; +import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; +import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.pms.service.majornetwork.IMonitorService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; @@ -42,11 +41,9 @@ public class DeptMonitorController extends BaseController { */ @PostMapping("/deptGetLineIds") @ApiImplicitParam(name = "param", value = "请求参数", required = true) - public HttpResult> deptGetLineList(@RequestBody @Validated PmsDeptGetLineParam param) { - TimeInterval timer = new TimeInterval(); + public HttpResult> deptGetLineList(@RequestBody @Validated DeptGetLineParam param) { String methodDescribe = getMethodDescribe("deptGetLineList"); - List monitor = monitorService.deptMonitor(param); - log.info("运行时长" + timer.intervalRestart()); + List monitor = monitorService.deptMonitor(param); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java index 0019b8117..ee7685a74 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java @@ -3,8 +3,8 @@ 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.common.pojo.dto.SimpleDTO; -import com.njcn.device.biz.pojo.dto.PmsDeptGetChildrenDTO; -import com.njcn.device.biz.pojo.param.PmsDeptGetLineParam; +import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; +import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; @@ -16,7 +16,6 @@ import com.njcn.device.pq.pojo.po.Overlimit; import java.util.List; -import java.util.Map; /** *

@@ -142,5 +141,5 @@ public interface IMonitorService extends IService { * 根据部门id获取监测点信息 * @return */ - List deptMonitor(PmsDeptGetLineParam param); + List deptMonitor(DeptGetLineParam param); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java index 5edb2f3c7..e7934193d 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java @@ -1,7 +1,6 @@ package com.njcn.device.pms.service.majornetwork.impl; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; @@ -10,12 +9,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.njcn.common.pojo.dto.SimpleDTO; import com.njcn.common.pojo.enums.common.DataStateEnum; import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.device.biz.pojo.dto.PmsDeptGetChildrenDTO; -import com.njcn.device.biz.pojo.param.PmsDeptGetLineParam; +import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO; +import com.njcn.device.biz.pojo.param.DeptGetLineParam; import com.njcn.device.biz.utils.COverlimit; import com.njcn.device.pms.enums.PmsDeviceResponseEnum; import com.njcn.device.pms.mapper.majornetwork.*; -import com.njcn.device.pms.pojo.dto.PmsGeneralDeviceDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorDTO; import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO; @@ -325,9 +323,9 @@ public class MonitorServiceImpl extends ServiceImpl impl } @Override - public List deptMonitor(PmsDeptGetLineParam param) { + public List deptMonitor(DeptGetLineParam param) { //返回主网和配网监测信息 - List deviceInfos = new ArrayList<>(); + List deviceInfos = new ArrayList<>(); List deptInfos = deptFeignClient.getDeptDescendantIndexes(param.getDeptId(), Stream.of(0,1).collect(Collectors.toList())).getData(); List directDeptInfos = deptInfos.stream() .filter(deptDTO -> deptDTO.getPid().equals(param.getDeptId())) @@ -356,8 +354,14 @@ public class MonitorServiceImpl extends ServiceImpl impl return deviceInfos; } - private PmsDeptGetChildrenDTO getPmsMonitor(DeptDTO deptDTO, List deptIdList) { - PmsDeptGetChildrenDTO pmsDeptGetChildrenDTO = new PmsDeptGetChildrenDTO(); + /** + * 获取主配网监测点id集合 + * @param deptDTO + * @param deptIdList + * @return + */ + private DeptGetChildrenDTO getPmsMonitor(DeptDTO deptDTO, List deptIdList) { + DeptGetChildrenDTO pmsDeptGetChildrenDTO = new DeptGetChildrenDTO(); pmsDeptGetChildrenDTO.setDeptId(deptDTO.getCode()); if (deptDTO.getType() == 0) { pmsDeptGetChildrenDTO.setDeptName(deptDTO.getArea()); @@ -371,10 +375,10 @@ public class MonitorServiceImpl extends ServiceImpl impl //配网监测点 List pwMonitorList = iDistributionMonitorService.getMonitorByCondition(deptIdList,null); - pmsDeptGetChildrenDTO.setMonitorIds(monitorList.stream().map(Monitor::getId).distinct().collect(Collectors.toList())); + pmsDeptGetChildrenDTO.setLineIds(monitorList.stream().map(Monitor::getId).distinct().collect(Collectors.toList())); pmsDeptGetChildrenDTO.setPwMonitorIds(pwMonitorList.stream().map(PmsMonitorBaseDTO::getMonitorId).distinct().collect(Collectors.toList())); }else{ - pmsDeptGetChildrenDTO.setMonitorIds(new ArrayList<>()); + pmsDeptGetChildrenDTO.setLineIds(new ArrayList<>()); pmsDeptGetChildrenDTO.setPwMonitorIds(new ArrayList<>()); } return pmsDeptGetChildrenDTO;