From 30e52e96fea9c7164b3005910cb977405f8a8c60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 31 Oct 2023 11:24:08 +0800 Subject: [PATCH] =?UTF-8?q?pms=E6=8A=A5=E8=A1=A8bug=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ledgerManger/CommTerminalController.java | 15 +++++++++++++ .../mapper/majornetwork/MonitorMapper.java | 4 ++++ .../majornetwork/mapping/MonitorMapper.xml | 22 +++++++++++++++++++ .../ledgerManger/CommTerminalService.java | 8 +++++++ .../impl/CommTerminalServiceImpl.java | 4 ++++ .../service/impl/CustomReportServiceImpl.java | 2 +- 6 files changed, 54 insertions(+), 1 deletion(-) diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java index 58cbc136e..464e15b59 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommTerminalController.java @@ -335,6 +335,21 @@ public class CommTerminalController extends BaseController { return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statisticsMonitor, methodDescribe); } + /** + * 获取监测点的台账详细信息 + * @author cdf + * @date 2023/10/23 + */ + @OperateInfo(info = LogEnum.BUSINESS_COMMON) + @GetMapping("/getCustomDetailByLineId") + @ApiOperation("获取监测点的台账详细信息(自定义报表用)") + @ApiImplicitParam(name = "id", value = "监测点ID", required = true) + public HttpResult> getCustomDetailByLineId(@RequestParam("id") String id) { + String methodDescribe = getMethodDescribe("getCustomDetailByLineId"); + Map result = commTerminalService.getCustomDetailByLineId(id); + return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe); + } + /** * 用于返回pq 还是pms系统 diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java index 66c2facd0..2c882c859 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/MonitorMapper.java @@ -16,6 +16,7 @@ import com.njcn.device.pms.pojo.vo.MonitorVO; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** *

@@ -95,4 +96,7 @@ public interface MonitorMapper extends BaseMapper { * @Date: 2023/10/13 11:23 */ List selectMonitorList(@Param("param") StatisticsBizBaseParam param); + + + Map getCustomDetailByLineId(@Param("lineId")String lineId); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml index 6d0330c76..320523e53 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml @@ -195,4 +195,26 @@ + + + diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java index 650842645..ea0f6d914 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/CommTerminalService.java @@ -6,6 +6,7 @@ import com.njcn.device.biz.pojo.dto.*; import com.njcn.device.biz.pojo.param.DeptGetLineParam; import java.util.List; +import java.util.Map; /** * pqs @@ -95,4 +96,11 @@ public interface CommTerminalService { LineDevGetDTO getMonitorDetail(String monitorId); List getStatisticsMonitor(StatisticsBizBaseParam param); + + /** + * 获取监测点的台账详细信息 + * @author cdf + * @date 2023/10/23 + */ + Map getCustomDetailByLineId(String id); } diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java index e74521583..52629d314 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/ledgerManger/impl/CommTerminalServiceImpl.java @@ -731,5 +731,9 @@ public class CommTerminalServiceImpl implements CommTerminalService { return info; } + @Override + public Map getCustomDetailByLineId(String id) { + return monitorMapper.getCustomDetailByLineId(id); + } } diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java index 0669768b6..5b31480d8 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/impl/CustomReportServiceImpl.java @@ -586,7 +586,7 @@ public class CustomReportServiceImpl implements CustomReportService { * @return */ private Map unitMap(String lineID) { - PqsDeviceUnit deviceUnit = deviceUnitClient.lineUnitDetail(lineID).getData(); + PqsDeviceUnit deviceUnit = commTerminalGeneralClient.lineUnitDetail(lineID).getData(); List dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData(); Map unit = new HashMap<>(); List list = dictData.stream().map(DictData::getCode).collect(Collectors.toList());