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

1.优化数据单位显示

Browse Source 
2.优化补召功能
3.监测点数据完整性及装置在线率(未开发完)
This commit is contained in:
xy
2024-11-04 20:44:56 +08:00
parent ce861e1804
commit 66c54ac3eb
21 changed files with 475 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/OfflineDataUploadController.java
View File

@@ -74,12 +74,16 @@ public class OfflineDataUploadController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping(value = "/makeUp")
@ApiOperation("设备补招")
@ApiOperation("设备补召")
@ApiImplicitParam(name = "param", value = "补招参数", required = true)
public HttpResult<String> makeUp(@RequestBody MakeUpParam param) {
String methodDescribe = getMethodDescribe("makeUp");
offlineDataUploadService.startMakeUpData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, null, methodDescribe);
boolean result = offlineDataUploadService.startMakeUpData(param);
if (result) {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, "文件补召中,请稍后", methodDescribe);
} else {
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.FAIL, "文件补召中失败", methodDescribe);
}
}
}

45
cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/controller/StatisticsDataDataController.java Normal file
View File

@@ -0,0 +1,45 @@
package com.njcn.csharmonic.controller;
import com.njcn.common.pojo.annotation.OperateInfo;
import com.njcn.common.pojo.enums.common.LogEnum;
import com.njcn.common.pojo.enums.response.CommonResponseEnum;
import com.njcn.common.pojo.response.HttpResult;
import com.njcn.common.utils.HttpResultUtil;
import com.njcn.csharmonic.pojo.param.StatisticsDataParam;
import com.njcn.csharmonic.pojo.vo.LineIntegrityVo;
import com.njcn.csharmonic.service.IStatisticsDataDataService;
import com.njcn.web.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* @author xy
*/
@Slf4j
@RestController
@RequestMapping("/statisticsData")
@Api(tags = "统计数据")
@AllArgsConstructor
public class StatisticsDataDataController extends BaseController {
private final IStatisticsDataDataService statisticsDataDataService;
@OperateInfo(info = LogEnum.BUSINESS_COMMON)
@PostMapping("/devData")
@ApiOperation("装置数据统计(监测点完整性、装置在线率)")
@ApiImplicitParam(name = "param", value = "参数", required = true)
public HttpResult<List<LineIntegrityVo>> getDevData(@RequestBody StatisticsDataParam param) {
String methodDescribe = getMethodDescribe("getDevData");
List<LineIntegrityVo> list = statisticsDataDataService.getDevData(param);
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
}
}