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

1.pms主网测点数据上送功能

Browse Source
This commit is contained in:
chendaofei
2024-10-23 14:23:30 +08:00
parent b36f4400bf
commit ef35d9bdbe
18 changed files with 633 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/MonitorClient.java
View File

@@ -68,6 +68,15 @@ public interface MonitorClient {
@PostMapping("getMonitorList")
HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds);
/**
* 通过同源监测点编码获取监测点信息
* @author cdf
* @date 2022/11/29
*/
@PostMapping("getMonitorListByMid")
HttpResult<List<Monitor>> getMonitorListByMid(@RequestBody List<String> midIds);
@PostMapping("getMonitorPage")
HttpResult<Page<Monitor>> getMonitorPage(@RequestBody TerminalQueryParam baseParam);

4
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/PmsTerminalClient.java
View File

@@ -32,4 +32,8 @@ public interface PmsTerminalClient {
*/
@PostMapping("/getTerminalSelectList")
HttpResult<List<PmsTerminal>> getTerminalSelectList(@RequestBody PmsBaseParam pmsBaseParam);
@PostMapping("/getTerminalSelectByIds")
HttpResult<List<PmsTerminal>> getTerminalSelectByIds(@RequestBody List<String> ids);
}

6
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/MonitorClientFallbackFactory.java
View File

@@ -63,6 +63,12 @@ public class MonitorClientFallbackFactory implements FallbackFactory<MonitorClie
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<Monitor>> getMonitorListByMid(List<String> midIds) {
log.error("{}异常，降级处理，异常为：{}", "使用同源监测点编码获取监测点信息 ", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Page<Monitor>> getMonitorPage(TerminalQueryParam baseParam) {
log.error("{}异常，降级处理，异常为：{}", "分页获取主网监测点数据 ", throwable.toString());

6
pqs-device/pms-device/pms-device-api/src/main/java/com/njcn/device/pms/api/fallback/PmsTerminalClientFallbackFactory.java
View File

@@ -36,6 +36,12 @@ public class PmsTerminalClientFallbackFactory implements FallbackFactory<PmsTerm
log.error("{}异常，降级处理，异常为：{}", "获取主网所有终端", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<List<PmsTerminal>> getTerminalSelectByIds(List<String> ids) {
log.error("{}异常，降级处理，异常为：{}", "使用装置id集合查询装置信息", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

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

@@ -131,15 +131,27 @@ public class PmsMonitorController extends BaseController {
@ApiOperation("获取所有主网监测点(或者指定监测点编号查询)")
@ApiImplicitParam(name = "monitorIds",value = "主网监测点编号",required = true)
public HttpResult<List<Monitor>> getMonitorList(@RequestBody List<String> monitorIds) {
String methodDescribe = getMethodDescribe("getAllMonitorList");
String methodDescribe = getMethodDescribe("getMonitorList");
List<Monitor> monitor= monitorService.getMonitorList(monitorIds);
if (Objects.isNull(monitor)) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
/**
* 使用同源监测点编码获取监测点信息
* @author cdf
* @date 2022/11/29
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getMonitorListByMid")
@ApiOperation("使用同源监测点编码获取监测点信息")
@ApiImplicitParam(name = "midIds",value = "主网监测点编号",required = true)
public HttpResult<List<Monitor>> getMonitorListByMid(@RequestBody List<String> midIds) {
String methodDescribe = getMethodDescribe("getMonitorListByMid");
List<Monitor> monitor= monitorService.getMonitorListByMid(midIds);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, monitor, methodDescribe);
}
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/getMonitorPage")
@ApiOperation("获取所有主网监测点(或者指定监测点编号查询)")

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

@@ -83,6 +83,16 @@ public class PmsTerminalController extends BaseController {
}
}
@OperateInfo(info = LogEnum.SYSTEM_COMMON)
@PostMapping("/getTerminalSelectByIds")
@ApiOperation("根据ID集合查询监测终端台账数据")
@ApiImplicitParam(name = "ID集合",value = "ids",required = true)
public HttpResult<List<PmsTerminal>> getTerminalSelectByIds(@RequestBody List<String> ids){
String methodDescribe = getMethodDescribe("getTerminalSelectByIds");
List<PmsTerminal> pmsTerminal = iTerminalService.getTerminalSelectByIds(ids);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, pmsTerminal, methodDescribe);
}
/**
* 新增监测终端台账信息
* @author hany

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

@@ -88,6 +88,8 @@ public interface IMonitorService extends IService<Monitor> {
List<Monitor> getMonitorList(List<String> monitorIds);
List<Monitor> getMonitorListByMid(List<String> midIds);
List<LineDevGetDTO> getPmsCalMonitorList(List<String> monitorIds);

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

@@ -302,6 +302,16 @@ public class MonitorServiceImpl extends ServiceImpl<MonitorMapper, Monitor> impl
return monitorList;
}
@Override
public List<Monitor> getMonitorListByMid(List<String> midIds) {
List<Monitor> monitorList;
LambdaQueryWrapper<Monitor> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(Monitor::getStatus, DataStateEnum.ENABLE.getCode()).in(Monitor::getMonitorId,midIds);
monitorList = this.list(lambdaQueryWrapper);
return monitorList;
}
@Override
public List<LineDevGetDTO> getPmsCalMonitorList(List<String> monitorIds) {
List<LineDevGetDTO> monitorList = new ArrayList<>();

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

@@ -47,7 +47,7 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
private final DevVersionMapper devVersionMapper;
private final ProgramVersionService programVersionService;
@Value("${socket.port}")
@Value("${socket.port:60000}")
private Integer socketPort;
@Override