波形代码提交

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/PmsMonitorController.java

@@ -1,6 +1,7 @@
 package com.njcn.device.pms.controller.ledgerManger;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.constant.OperateType;
@@ -11,12 +12,9 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pms.annotation.TerminalOperationLogDesc;
 import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
-import com.njcn.device.pms.pojo.param.TerminalQueryParam;
-import com.njcn.device.pms.pojo.param.MonitorParam;
-import com.njcn.device.pms.pojo.param.MonitorStatus;
-import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
-import com.njcn.device.pms.pojo.param.PmsMonitorParam;
+import com.njcn.device.pms.pojo.param.*;
 import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
 import com.njcn.device.pms.service.majornetwork.IMonitorService;
 
@@ -270,5 +268,18 @@ public class PmsMonitorController extends BaseController {
 
     }
 
+    @PostMapping("/getMonitorTerminal")
+    @ApiOperation("获取台账和终端信息(波形专用)")
+    @ApiImplicitParam(name = "monitorParam", value = "主网监测点实体", required = true)
+    public HttpResult<MonitorVO> getMonitorTerminal(@RequestBody MonitorTerminalParam param) {
+        String methodDescribe = getMethodDescribe("getMonitorTerminal");
+        MonitorVO monitorVO = monitorService.monitorTerminal(param);
+        if (ObjectUtil.isEmpty(monitorVO)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitorVO, methodDescribe);
+        }
+
+    }
 }
 

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

@@ -10,6 +10,7 @@ import com.njcn.device.pms.pojo.param.PmsMonitorInfoParam;
 import com.njcn.device.pms.pojo.param.PmsMonitorParam;
 import com.njcn.device.pms.pojo.param.PwPmsMonitorParam;
 import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.vo.MonitorVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -56,4 +57,22 @@ public interface MonitorMapper extends BaseMapper<Monitor> {
     List<PmsMonitorInfoDTO> getMonitorInfo(@Param("pmsMonitorInfoParam") PmsMonitorInfoParam pmsMonitorInfoParam);
 
 
+    /***
+     * 主网监测点和终端信息（波形查看专用）
+     * @author wr
+     * @date 2023-03-23 10:21
+     * @param id
+     * @return MonitorVO
+     */
+    MonitorVO getMonitorTerminal(@Param("id")String id);
+
+
+    /***
+     * 配网监测点和终端信息（波形查看专用）
+     * @author wr
+     * @date 2023-03-23 10:21
+     * @param id
+     * @return MonitorVO
+     */
+    MonitorVO getPwMonitorTerminal(@Param("id")String id);
 }

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

@@ -131,7 +131,37 @@
             AND pm.`Name` LIKE CONCAT('%',#{pmsMonitorInfoParam.monitorName},'%')
         </if>
     </select>
+    <select id="getMonitorTerminal" resultType="com.njcn.device.pms.pojo.vo.MonitorVO">
+        SELECT
+            pm.Id,
+            pm.NAME,
+            pm.Terminal_Wiring_Method,
+            pt.Ip,
+            pt.Port,
+            pm.Pt1,
+            pm.Pt2,
+            pm.Ct1,
+            pm.Ct2
+        FROM
+            pms_monitor pm
+        INNER JOIN pms_terminal pt on pt.Id=pm.Terminal_Id
+        where pm.id = #{id}
 
-
+    </select>
+    <select id="getPwMonitorTerminal" resultType="com.njcn.device.pms.pojo.vo.MonitorVO">
+       SELECT
+            pm.Monitor_Id,
+            pm.Terminal_Wiring_Method,
+            pt.Ip,
+            pt.PORT,
+            pm.Pt1,
+            pm.Pt2,
+            pm.Ct1,
+            pm.Ct2
+       FROM
+            pms_distribution_monitor pm
+	   INNER JOIN pms_terminal pt ON pt.Id = pm.Terminal_Id
+       where pm.Monitor_Id = #{id}
+    </select>
 
 </mapper>

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/IMonitorService.java

@@ -8,6 +8,7 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
 import com.njcn.device.pms.pojo.param.*;
 import com.njcn.device.pms.pojo.po.Monitor;
+import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
 import com.njcn.device.pq.pojo.po.Overlimit;
 
@@ -124,4 +125,12 @@ public interface IMonitorService extends IService<Monitor> {
      */
     boolean updateStatus(MonitorStatus monitorParam);
 
+  /***
+   * 获取台账和终端信息
+   * @author wr
+   * @date 2023-03-23 10:17
+   * @param param
+   * @return MonitorVO
+   */
+   MonitorVO monitorTerminal(MonitorTerminalParam param);
 }

pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/service/majornetwork/impl/MonitorServiceImpl.java

@@ -16,6 +16,7 @@ import com.njcn.device.pms.pojo.dto.PmsMonitorDTO;
 import com.njcn.device.pms.pojo.dto.PmsMonitorInfoDTO;
 import com.njcn.device.pms.pojo.param.*;
 import com.njcn.device.pms.pojo.po.*;
+import com.njcn.device.pms.pojo.vo.MonitorVO;
 import com.njcn.device.pms.pojo.vo.PmsMonitorVO;
 import com.njcn.device.pms.service.majornetwork.IDistributionMonitorService;
 import com.njcn.device.pms.service.majornetwork.IMonitorService;
@@ -149,7 +150,7 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
         LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper
                 .eq(StrUtil.isNotBlank(baseParam.getMonitorState()), Monitor::getMonitorState, baseParam.getMonitorState())
-                .eq(StrUtil.isNotBlank(baseParam.getMonitorTag()),Monitor::getMonitorTag,baseParam.getMonitorTag())
+                .eq(StrUtil.isNotBlank(baseParam.getMonitorTag()), Monitor::getMonitorTag, baseParam.getMonitorTag())
                 .and(StrUtil.isNotBlank(baseParam.getSearchValue()), i -> i.like(Monitor::getName, baseParam.getSearchValue())
                         .or()
                         .like(Monitor::getId, baseParam.getSearchValue())
@@ -272,6 +273,31 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
         return this.update(update);
     }
 
+    @Override
+    public MonitorVO monitorTerminal(MonitorTerminalParam param) {
+        //type 0:主网 1:配网
+        MonitorVO monitorTerminal;
+        if (param.getType() == 0) {
+            monitorTerminal = this.baseMapper.getMonitorTerminal(param.getId());
+        } else {
+            monitorTerminal = this.baseMapper.getPwMonitorTerminal(param.getId());
+        }
+        String terminalWiringMethod = monitorTerminal.getTerminalWiringMethod();
+        DictData data = dicDataFeignClient.getDicDataById(terminalWiringMethod).getData();
+        if( DicDataEnum.STAR.getCode().equals(data.getCode())){
+            monitorTerminal.setTerminalWiringMethod("0");
+        }
+        if( DicDataEnum.STAR_TRIANGLE.getCode().equals(data.getCode())){
+            monitorTerminal.setTerminalWiringMethod("1");
+        }
+        if( DicDataEnum.OPEN_DELTA.getCode().equals(data.getCode())){
+            monitorTerminal.setTerminalWiringMethod("2");
+        }else{
+            monitorTerminal.setTerminalWiringMethod("-1");
+        }
+        return monitorTerminal;
+    }
+
 
     private void checkParam(MonitorParam monitorParam, boolean update) {