Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

电能质量问题监测点超标新增需求

Browse Source
This commit is contained in:
hzj
2024-04-08 15:12:24 +08:00
parent 2512a861bb
commit 3e8b420db8
14 changed files with 558 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/CommLineController.java
View File

@@ -1,12 +1,11 @@
package com.njcn.device.pms.controller.ledgerManger;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.constant.ServerInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
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.commApi.fallback.CommTerminalGeneralClientFallbackFactory;
import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
import com.njcn.device.biz.pojo.dto.LineDTO;
import com.njcn.device.pms.service.majornetwork.IMonitorService;
import com.njcn.web.controller.BaseController;
@@ -14,7 +13,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@@ -43,6 +41,15 @@ public class CommLineController extends BaseController {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@GetMapping("/getLineAllDetail")
@ApiOperation("获取监测点id取超标监测点信息")
public HttpResult<LineALLInfoDTO> getLineAllDetail(@RequestParam("id") String id) {
String methodDescribe = getMethodDescribe("getLineAllDetail");
LineALLInfoDTO result = monitorService.getLineAllDetail(id);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getLineDetailBatch")
@ApiOperation("批量获取监测点信息")

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

@@ -4,6 +4,7 @@ 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.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
import com.njcn.device.biz.pojo.dto.LineDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.pms.pojo.dto.PmsMonitorBaseDTO;
@@ -197,4 +198,6 @@ public interface IMonitorService extends IService<Monitor> {
* @date 2024/2/26
*/
List<Dept> existMonitorDeptTree();
LineALLInfoDTO getLineAllDetail(String id);
}

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

@@ -19,6 +19,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.device.biz.enums.DeviceResponseEnum;
import com.njcn.device.biz.pojo.dto.DeptGetChildrenDTO;
import com.njcn.device.biz.pojo.dto.LineALLInfoDTO;
import com.njcn.device.biz.pojo.dto.LineDTO;
import com.njcn.device.biz.pojo.param.DeptGetLineParam;
import com.njcn.device.biz.pojo.po.DeviceBak;
@@ -612,6 +613,43 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
return deptList.stream().filter(it->monitorList.contains(it.getCode())).collect(Collectors.toList());
}
@Override
public LineALLInfoDTO getLineAllDetail(String id) {
LineALLInfoDTO lineALLInfoDTO = new LineALLInfoDTO();
Monitor monitor = this.getBaseMapper().selectById(id);
PmsTerminal pmsTerminal = terminalMapper.selectById(monitor.getTerminalId());
//处理监测点信息
LineALLInfoDTO.LineLineDTO lineLineDTO = new LineALLInfoDTO.LineLineDTO();
lineLineDTO.setLineId(monitor.getId());
lineLineDTO.setLinename(monitor.getLineName());
lineLineDTO.setObjName(monitor.getMonitorObjectName());
lineLineDTO.setLoadType(dicDataFeignClient.getDicDataById(monitor.getMonitorTag()).getData().getName());
//电压使用母线电压
lineLineDTO.setVoltageLevel(dicDataFeignClient.getDicDataById(monitor.getVoltageLevel()).getData().getName());
lineALLInfoDTO.setLineLineDTO(lineLineDTO);
//处理母线信息
LineALLInfoDTO.LineBusbarDTO lineBusbarDTO = new LineALLInfoDTO.LineBusbarDTO();
lineBusbarDTO.setBusBarId(monitor.getLineId());
lineBusbarDTO.setBusBarName(monitor.getLineName());
lineALLInfoDTO.setLineBusbarDTO(lineBusbarDTO);
//处理设备信息
LineALLInfoDTO.LineDeviceDTO lineDeviceDTO = new LineALLInfoDTO.LineDeviceDTO();
lineDeviceDTO.setDeviceId(monitor.getTerminalId());
lineDeviceDTO.setDeviceName(pmsTerminal.getName());
lineALLInfoDTO.setLineDeviceDTO(lineDeviceDTO);
//处理电站信息
LineALLInfoDTO.LineSubStationDTO lineSubStationDTO = new LineALLInfoDTO.LineSubStationDTO();
lineSubStationDTO.setSubStationId(monitor.getPowerrId());
lineSubStationDTO.setSubStationName(monitor.getPowerrName());
lineALLInfoDTO.setLineSubStationDTO(lineSubStationDTO);
//todo 处理部门信息后续需要部门信息在添加
return lineALLInfoDTO;
}
private String dealDataBatchUpdate(List<PmsLedgerExcel> pmsLedgerExcelList) {
List<PmsLedgerExcel> oracleTerminalExcelMsg = new ArrayList<>();