From 404d11526a4fecd9d2c032e6c39c6ed85accdd06 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Fri, 28 Nov 2025 10:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=80=E5=8C=97=E7=BB=88=E7=AB=AF=E8=AF=84?= =?UTF-8?q?=E4=BB=B7=E5=88=97=E8=A1=A8=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/device/pq/pojo/vo/DevDetailVO.java | 11 +++ .../pq/pojo/vo/DeviceRunEvaluateVO.java | 12 +++ .../impl/DeviceRunEvaluateServiceImpl.java | 21 ++++- .../device/line/mapper/mapping/LineMapper.xml | 83 +++++++++++-------- 4 files changed, 91 insertions(+), 36 deletions(-) diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java index 2be3c6c62..2eb393ff4 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DevDetailVO.java @@ -11,6 +11,15 @@ import lombok.Data; @Data public class DevDetailVO { + @ApiModelProperty("地市") + private String cit; + + @ApiModelProperty("供电公司") + private String company; + + @ApiModelProperty("终端厂家") + private String manufacturer; + @ApiModelProperty(name = "lineId",value = "监测点索引") private String lineId; @@ -32,4 +41,6 @@ public class DevDetailVO { @ApiModelProperty(name = "subName",value = "对象id(新能源用户)") private String ObjId; + @ApiModelProperty("终端运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）") + private Integer runFlag; } diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java index a317ee87e..ac8fc626f 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/pojo/vo/DeviceRunEvaluateVO.java @@ -29,6 +29,18 @@ public class DeviceRunEvaluateVO { @ApiModelProperty("评价") private BigDecimal evaluate; + @ApiModelProperty("地市") + private String cit; + + @ApiModelProperty("供电公司") + private String company; + + @ApiModelProperty("终端厂家") + private String manufacturer; + + @ApiModelProperty("终端运行状态（0：运行；1：检修；2：停运；3：调试；4：退运）") + private String runFlag; + @ApiModelProperty("完整率") private BigDecimal integrityRate; diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java index f1451f875..fa4d5bc25 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/DeviceRunEvaluateServiceImpl.java @@ -36,6 +36,11 @@ import com.njcn.harmonic.pojo.param.RStatLimitQueryParam; import com.njcn.harmonic.pojo.po.day.RStatLimitRateDPO; import com.njcn.supervision.api.UserLedgerFeignClient; import com.njcn.supervision.pojo.vo.user.NewUserReportVO; +import com.njcn.system.api.DicDataFeignClient; +import com.njcn.system.enums.DicDataTypeEnum; +import com.njcn.system.pojo.po.DictData; +import com.njcn.user.api.DeptFeignClient; +import com.njcn.user.pojo.po.Dept; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -66,7 +71,8 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService { private final DeptLineService deptLineService; private final GeneralDeviceService deviceService; private final OnLineRateMapper onLineRateMapper; - private final LineService lineService; + private final DicDataFeignClient dicDataFeignClient; + private final DeptFeignClient deptFeignClient; /** * 数据完整性:50% */ @@ -340,6 +346,11 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService { @Override public List getRunEvaluate(DeviceInfoParam.BusinessParam param) { + List manufacturerList = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEV_MANUFACTURER.getCode()).getData(); + Map manufacturerMap = manufacturerList.stream().collect(Collectors.toMap(DictData::getId, DictData::getName)); + List deptList = deptFeignClient.getAllDept().getData(); + Map deptMap = deptList.stream().collect(Collectors.toMap(Dept::getId, Dept::getName)); + List info = new ArrayList<>(); //获取终端台账类信息 List deviceInfo = deviceService.getDeviceInfo(param, ObjectUtil.isNull(param.getLineRunFlag()) ? null : Arrays.asList(param.getLineRunFlag()), Arrays.asList(1)); @@ -395,6 +406,14 @@ public class DeviceRunEvaluateServiceImpl implements DeviceRunEvaluateService { evaluateVO.setName(value.get(0).getDevName()); evaluateVO.setSubName(value.get(0).getSubName()); evaluateVO.setIp(value.get(0).getIp()); + //部门 + if (deptMap.containsKey(value.get(0).getCit())) { + evaluateVO.setCit(deptMap.get(value.get(0).getCit())); + } + //终端厂商 + if (manufacturerMap.containsKey(value.get(0).getManufacturer())) { + evaluateVO.setManufacturer(manufacturerMap.get(value.get(0).getManufacturer())); + } evaluateVO.setOnLineRate(onLineRate(onlineRateByDev, Arrays.asList(key))); evaluateVO.setIntegrityRate(integrity(integrityList, ids)); evaluateVO.setPassRate(limitRate(limitRatePOList, ids)); diff --git a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml index 5eff136fe..f852f4934 100644 --- a/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml +++ b/pqs-device/pq-device/pq-device-com/src/main/java/com/njcn/device/line/mapper/mapping/LineMapper.xml @@ -1851,42 +1851,55 @@ where t1.state = 1