Microservice/govern
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口优化

Browse Source
This commit is contained in:
xy
2025-07-15 18:03:50 +08:00
parent 6782b19b7d
commit ffb6ead753
4 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/controller/project/AppProjectController.java
View File

@@ -84,7 +84,7 @@ public class AppProjectController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON) @OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/updateProject") @PostMapping("/updateProject")
@ApiOperation("web修改项目信息") @ApiOperation("web修改项目信息")
public HttpResult<Boolean> updateProject(@RequestBody AppProjectAuditParm appProjectAuditParm){ public HttpResult<Boolean> updateProject(@RequestBody @Validated AppProjectAuditParm appProjectAuditParm){
String methodDescribe = getMethodDescribe("updateProject"); String methodDescribe = getMethodDescribe("updateProject");
Boolean flag = appProjectService.updateProject(appProjectAuditParm); Boolean flag = appProjectService.updateProject(appProjectAuditParm);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, flag, methodDescribe);

10
cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/AppProjectServiceImpl.java
View File

@@ -253,13 +253,21 @@ class AppProjectServiceImpl extends ServiceImpl<AppProjectMapper, AppProjectPO>
} }
@Override @Override
@Transactional(rollbackFor = BusinessException.class)
public Boolean updateProject(AppProjectAuditParm appProjectAuditParm) { 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::getArea,appProjectAuditParm.getArea())
.set(AppProjectPO::getDescription,appProjectAuditParm.getDescription()) .set(AppProjectPO::getDescription,appProjectAuditParm.getDescription())
.eq(AppProjectPO::getId,appProjectAuditParm.getId()) .eq(AppProjectPO::getId,appProjectAuditParm.getId())
.eq(AppProjectPO::getStatus,"1") .eq(AppProjectPO::getStatus,"1")
.update(); .update();
//修改台账表
CsLedger csLedger = new CsLedger();
csLedger.setId(appProjectAuditParm.getId());
csLedger.setName(appProjectAuditParm.getName());
csLedgerMapper.updateById(csLedger);
return true;
} }
@Override @Override

3
cs-harmonic/cs-harmonic-api/src/main/java/com/njcn/csharmonic/pojo/vo/HalfMonthReportVO.java
View File

@@ -45,6 +45,9 @@ public class HalfMonthReportVO implements Serializable {
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime latestTime; private LocalDateTime latestTime;
@ApiModelProperty("流程状态")
private Integer process;
@ApiModelProperty("数据完整性") @ApiModelProperty("数据完整性")
private Double integrity; private Double integrity;

1
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/StatisticsDataDataServiceImpl.java
View File

@@ -124,6 +124,7 @@ public class StatisticsDataDataServiceImpl implements IStatisticsDataDataService
vo.setLineName(line.getName()); vo.setLineName(line.getName());
vo.setCommunicationStatus(dev.getRunStatus() == 1 ? "离线" : "在线"); vo.setCommunicationStatus(dev.getRunStatus() == 1 ? "离线" : "在线");
vo.setLatestTime(LocalDateTime.now()); vo.setLatestTime(LocalDateTime.now());
vo.setProcess(dev.getProcess());
List<RStatIntegrityD> l1 = list1.stream().filter(item -> item.getLineIndex().equals(line.getLineId())).collect(Collectors.toList()); List<RStatIntegrityD> l1 = list1.stream().filter(item -> item.getLineIndex().equals(line.getLineId())).collect(Collectors.toList());
if (CollectionUtil.isNotEmpty(l1)) { if (CollectionUtil.isNotEmpty(l1)) {