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-05-31 09:23:54 +08:00
parent 9f230278bd
commit 5d263c4be4
9 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java
View File

@@ -37,5 +37,5 @@ public interface TerminalBaseClient {
@ApiOperation("终端/母线/监测点同步操作")
@PostMapping("terminalSync")
HttpResult<Object> terminalSync( @RequestBody SyncTerminalParam syncTerminalParam);
HttpResult<String> terminalSync( @RequestBody SyncTerminalParam syncTerminalParam);
}

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/fallback/TerminalBaseClientFallbackFactory.java
View File

@@ -39,7 +39,7 @@ public class TerminalBaseClientFallbackFactory implements FallbackFactory<Termin
}
@Override
public HttpResult<Object> terminalSync(SyncTerminalParam syncTerminalParam) {
public HttpResult<String> terminalSync(SyncTerminalParam syncTerminalParam) {
log.error("{}异常，降级处理，异常为：{}", "台账同步", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}

6
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/controller/TerminalBaseController.java
View File

@@ -146,11 +146,11 @@ public class TerminalBaseController extends BaseController {
@ApiOperation("终端/母线/监测点同步操作")
@OperateInfo(operateType = OperateType.ADD, info = LogEnum.BUSINESS_MEDIUM)
@PostMapping("terminalSync")
public HttpResult<Object> terminalSync(@Valid @RequestBody SyncTerminalParam syncTerminalParam) {
public HttpResult<String> terminalSync(@Valid @RequestBody SyncTerminalParam syncTerminalParam) {
String methodDescribe = getMethodDescribe("terminalSync");
terminalBaseService.terminalSync(syncTerminalParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
String subtation = terminalBaseService.terminalSync(syncTerminalParam);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, subtation, methodDescribe);
}

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

@@ -242,5 +242,5 @@ public interface TerminalBaseService {
* @Author: clam
* @Date: 2024/5/29
*/
boolean terminalSync(SyncTerminalParam syncTerminalParam);
String terminalSync(SyncTerminalParam syncTerminalParam);
}

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

@@ -1812,7 +1812,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
@Override
@Transactional(rollbackFor = Exception.class)
public boolean terminalSync(SyncTerminalParam syncTerminalParam) {
public String terminalSync(SyncTerminalParam syncTerminalParam) {
String projectIndex = null;
String provinceIndex = null;
String gdIndex = null;
@@ -1847,6 +1847,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
//变电站 todo 可能新建电站
if (Objects.nonNull(syncTerminalParam.getSubStationParam())) {
if (StrUtil.isBlank(subIndex) && StrUtil.isNotBlank(gdIndex)) {
Line substation = this.lambdaQuery().eq(Line::getName, syncTerminalParam.getSubStationParam().getName()).one();
if(Objects.isNull(substation)){
Line subStation = assembleLine(syncTerminalParam.getSubStationParam().getName(), LineBaseEnum.SUB_LEVEL.getCode(), gdIndex, projectIndex + StrUtil.COMMA + provinceIndex + StrUtil.COMMA + gdIndex, syncTerminalParam.getSubStationParam().getSort());
this.baseMapper.insert(subStation);
subIndex = subStation.getId();
@@ -1859,6 +1861,8 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
sub.setLat(syncTerminalParam.getSubStationParam().getLat());
substationMapper.insert(sub);
}
}
}
//装置
@@ -1977,7 +1981,7 @@ public class TerminalBaseServiceImpl extends ServiceImpl<LineMapper, Line> imple
deptLine.setLineId(line.getId());
deptLineMapper.insert(deptLine);
return true;
return subIndex;
}

2
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/UserReportFeignClient.java
View File

@@ -19,7 +19,5 @@ public interface UserReportFeignClient {
@GetMapping("/updateUserReportStatus")
HttpResult<Object> updateUserReportStatus(@RequestParam("businessKey") String businessKey, @RequestParam("status")Integer status);
@GetMapping("/updateUserStatus")
HttpResult<Object> updateUserStatus(String businessKey,Integer userStatus) ;
}

5
pqs-supervision/supervision-api/src/main/java/com/njcn/supervision/api/fallback/UserReportFeignClientFallbackFactory.java
View File

@@ -33,11 +33,6 @@ public class UserReportFeignClientFallbackFactory implements FallbackFactory<Use
throw new BusinessException(finalExceptionEnum);
}
@Override
public HttpResult<Object> updateUserStatus(String businessKey, Integer userStatus) {
log.error("{}异常，降级处理，异常为：{}", "更新干扰源用户状态", throwable.toString());
throw new BusinessException(finalExceptionEnum);
}
};
}
}

1
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionDevMainReportPOServiceImpl.java
View File

@@ -205,6 +205,7 @@ public class SupervisionDevMainReportPOServiceImpl extends ServiceImpl<Supervisi
* @Date: 2024/5/11
*/
private void checkIp(SupervisionDevMainReportParam supervisionDevMainReportParam, boolean isExcludeSelf) {
LambdaQueryWrapper<SupervisionTempDeviceReport> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper
.eq(SupervisionTempDeviceReport::getSubstation,supervisionDevMainReportParam.getSupervisionTempDeviceReportParam().getSubstation())

4
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/device/impl/SupervisionTempLineDebugPOServiceImpl.java
View File

@@ -247,8 +247,10 @@ public class SupervisionTempLineDebugPOServiceImpl extends ServiceImpl<Supervisi
syncTerminalParam.setSubVoltageParam(subVoltageParam);
syncTerminalParam.setLineParam(lineParam);
terminalBaseClient.terminalSync(syncTerminalParam);
String substation = terminalBaseClient.terminalSync(syncTerminalParam).getData();
this.updateStatus(id,5);
tempDevice.setSubstation(substation);
supervisionTempDeviceReportService.updateById(tempDevice);
return null;
}