pms报表bug解决

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<Map<String,String>> getCustomDetailByLineId(@RequestParam("id") String id) {
+        String methodDescribe = getMethodDescribe("getCustomDetailByLineId");
+        Map<String,String> result = commTerminalService.getCustomDetailByLineId(id);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
+    }
+
 
     /**
      * 用于返回pq 还是pms系统

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;
 
 /**
  * <p>
@@ -95,4 +96,7 @@ public interface MonitorMapper extends BaseMapper<Monitor> {
     * @Date: 2023/10/13 11:23
     */
     List<Monitor> selectMonitorList(@Param("param") StatisticsBizBaseParam param);
+
+
+    Map<String, String> getCustomDetailByLineId(@Param("lineId")String lineId);
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/mapper/majornetwork/mapping/MonitorMapper.xml

@@ -195,4 +195,26 @@
 
     </select>
 
+
+    <select id="getCustomDetailByLineId" resultType="map">
+        SELECT
+            monitor.id AS lineId,
+            concat(statation.Power_Name,"_",wire.name,"_",monitor.name) as lineName,
+            concat(monitor.pt1,concat(':',monitor.pt2)) as pt,
+            concat(monitor.ct1,concat(':',monitor.ct2)) as ct,
+            monitor.Power_Supply_Eq_Capacity as Dev_Capacity,
+            monitor.Min_Short_Circuit_Capacity as Short_Capacity,
+            monitor.User_Agreement_Capacity as Standard_Capacity,
+            monitor.User_Agreement_Capacity as Deal_Capacity,
+            terminal.Verification_Date AS This_Time_Check,
+            dic.name AS voltageLevel
+        FROM
+            pms_monitor monitor
+                left join pms_terminal terminal on monitor.Terminal_Id = terminal.id
+                left join pms_statation_stat statation on monitor.Powerr_Id = statation.Power_Id
+                left join pms_generatrix_wire wire on monitor.Line_Id = wire.id
+                left join sys_dict_data dic on monitor.Voltage_Level = dic.id
+        WHERE monitor.id = #{lineId}
+    </select>
+
 </mapper>

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<StatisticsMonitor> getStatisticsMonitor(StatisticsBizBaseParam param);
+
+    /**
+     * 获取监测点的台账详细信息
+     * @author cdf
+     * @date 2023/10/23
+     */
+    Map<String,String> getCustomDetailByLineId(String id);
 }

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<String, String> getCustomDetailByLineId(String id) {
+        return monitorMapper.getCustomDetailByLineId(id);
+    }
 
 }

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<String, String> unitMap(String lineID) {
-        PqsDeviceUnit deviceUnit = deviceUnitClient.lineUnitDetail(lineID).getData();
+        PqsDeviceUnit deviceUnit = commTerminalGeneralClient.lineUnitDetail(lineID).getData();
         List<DictData> dictData = dicDataFeignClient.getDicDataByTypeCode(DicDataTypeEnum.DEVICE_UNIT.getCode()).getData();
         Map<String, String> unit = new HashMap<>();
         List<String> list = dictData.stream().map(DictData::getCode).collect(Collectors.toList());