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

限值提交

Browse Source
This commit is contained in:
雨木c
2023-05-16 11:30:41 +08:00
parent d79c333d75
commit a2c8661515
3 changed files with 12 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/CommTerminalController.java
View File

@@ -145,10 +145,10 @@ public class CommTerminalController extends BaseController {
@PostMapping("substationGetLine")
@ApiOperation("根据电站获取所有监测点")
@ApiImplicitParam(name = "substationId", value = "请求体", required = true)
public HttpResult<List<LineDevGetDTO>> substationGetLine(@RequestParam("substationId")String substationId) {
public HttpResult<LineDevGetBandDTO> substationGetLine(@RequestParam("substationId")String substationId) {
TimeInterval timer = new TimeInterval();
String methodDescribe = getMethodDescribe("substationGetLine");
List<LineDevGetDTO> result = commTerminalService.substationGetLine(substationId);
LineDevGetBandDTO result = commTerminalService.substationGetLine(substationId);
log.info("运行时长" + timer.intervalRestart());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}
@@ -162,10 +162,10 @@ public class CommTerminalController extends BaseController {
@PostMapping("busBarGetLine")
@ApiOperation("根据母线id获取监测点信息")
@ApiImplicitParam(name = "busBarId", value = "请求体", required = true)
public HttpResult<List<LineDevGetDTO>> busBarGetLine(@RequestParam("busBarId")String busBarId) {
public HttpResult<LineDevGetBandDTO> busBarGetLine(@RequestParam("busBarId")String busBarId) {
TimeInterval timer = new TimeInterval();
String methodDescribe = getMethodDescribe("busBarGetLine");
List<LineDevGetDTO> result = commTerminalService.busBarGetLine(busBarId);
LineDevGetBandDTO result = commTerminalService.substationGetLine(busBarId);
log.info("运行时长" + timer.intervalRestart());
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
}

10
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/CommTerminalService.java
View File

@@ -60,19 +60,13 @@ public interface CommTerminalService {
List<DeptGetDeviceDTO> deptGetDevice(DeptGetLineParam deptGetLineParam);
/**
* 根据单位获取所有装置
* 根据电站和母线id获取监测点信息
* @author cdf
* @date 2023/5/10
*/
List<LineDevGetDTO> substationGetLine(String substationId);
LineDevGetBandDTO substationGetLine(String substationId);
/**
* 根据母线获取监测点信息
* @author cdf
* @date 2023/5/10
*/
List<LineDevGetDTO> busBarGetLine(String busBarId);

24
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/CommTerminalServiceImpl.java
View File

@@ -178,27 +178,15 @@ public class CommTerminalServiceImpl implements CommTerminalService {
}
@Override
public List<LineDevGetDTO> substationGetLine(String substationId) {
return lineMapper.getLineBySubStation(substationId);
}
@Override
public List<LineDevGetDTO> busBarGetLine(String busBarId) {
return lineMapper.getLineBySubStation(busBarId);
public LineDevGetBandDTO substationGetLine(String substationId) {
LineDevGetBandDTO lineDevGetBandDTO = new LineDevGetBandDTO();
List<LineDevGetDTO> subList = lineMapper.getLineBySubStation(substationId);
lineDevGetBandDTO.setZwList(subList);
return lineDevGetBandDTO;
}
private void getChildrenByParent(List<DeptDTO> deptAllList, List<DeptGetChildrenMoreDTO> res) {
deptAllList.forEach(it -> {
DeptGetChildrenMoreDTO deptGetChildrenMoreDTO = new DeptGetChildrenMoreDTO();
deptGetChildrenMoreDTO.setUnitId(it.getId());
deptGetChildrenMoreDTO.setUnitName(it.getName());
List<String> deptChildren = deptAllList.stream().filter(deptDTO -> deptDTO.getPids().contains(it.getId())).map(DeptDTO::getId).collect(Collectors.toList());
deptChildren.add(it.getId());
deptGetChildrenMoreDTO.setUnitChildrenList(deptChildren);
res.add(deptGetChildrenMoreDTO);
});
}
private List<Integer> filterDataTypeNew(String serverName) {