diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java index 8393d03..dffb9c0 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java @@ -84,7 +84,7 @@ public class AppProjectController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/updateProject") @ApiOperation("web修改项目信息") - public HttpResult updateProject(@RequestBody AppProjectAuditParm appProjectAuditParm){ + public HttpResult updateProject(@RequestBody @Validated AppProjectAuditParm appProjectAuditParm){ String methodDescribe = getMethodDescribe("updateProject"); Boolean flag = appProjectService.updateProject(appProjectAuditParm); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java index f21da08..29cff6e 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java @@ -253,13 +253,21 @@ class AppProjectServiceImpl extends ServiceImpl } @Override + @Transactional(rollbackFor = BusinessException.class) public Boolean updateProject(AppProjectAuditParm appProjectAuditParm) { - return this.lambdaUpdate().set(AppProjectPO::getName,appProjectAuditParm.getName()) + //修改项目表 + this.lambdaUpdate().set(AppProjectPO::getName,appProjectAuditParm.getName()) .set(AppProjectPO::getArea,appProjectAuditParm.getArea()) .set(AppProjectPO::getDescription,appProjectAuditParm.getDescription()) .eq(AppProjectPO::getId,appProjectAuditParm.getId()) .eq(AppProjectPO::getStatus,"1") .update(); + //修改台账表 + CsLedger csLedger = new CsLedger(); + csLedger.setId(appProjectAuditParm.getId()); + csLedger.setName(appProjectAuditParm.getName()); + csLedgerMapper.updateById(csLedger); + return true; } @Override diff --git a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HalfMonthReportVO.java b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HalfMonthReportVO.java index 792ed10..439a053 100644 --- a/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HalfMonthReportVO.java +++ b/cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HalfMonthReportVO.java @@ -45,6 +45,9 @@ public class HalfMonthReportVO implements Serializable { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime latestTime; + @ApiModelProperty("流程状态") + private Integer process; + @ApiModelProperty("数据完整性") private Double integrity; diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java index 574dc50..4be5cca 100644 --- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java +++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java @@ -124,6 +124,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService vo.setLineName(line.getName()); vo.setCommunicationStatus(dev.getRunStatus() == 1 ? "离线" : "在线"); vo.setLatestTime(LocalDateTime.now()); + vo.setProcess(dev.getProcess()); List l1 = list1.stream().filter(item -> item.getLineIndex().equals(line.getLineId())).collect(Collectors.toList()); if (CollectionUtil.isNotEmpty(l1)) {