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

预处理兼容pq/pms处理

Browse Source
This commit is contained in:
雨木c
2023-09-21 15:34:38 +08:00
parent 511924fd75
commit 4e7da3a056
29 changed files with 280 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DataIntegrityRateController.java
View File

@@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.RestController;
/**
* @author qijian
* r_mp_integrity_d
* @date 2022/10/26
* 数据完整率算法
*/
@@ -35,6 +36,10 @@ public class DataIntegrityRateController extends BaseController {
private final DataIntegrityRateService dataIntegrityRateService;
/**
* r_mp_integrity_d
* @date 2023/9/21
*/
@OperateInfo(info = LogEnum.BUSINESS_COMMON,operateType = OperateType.ADD)
@PostMapping("/lineDataIntegrityRate")
@ApiOperation("监测点日数据完整率")

4
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java
View File

@@ -86,7 +86,7 @@ public class DayDataController extends BaseController {
@OperateInfo(info = LogEnum.BUSINESS_MEDIUM)
public HttpResult<Boolean> dataToDayHandler(@RequestBody LineParam jobParam ){
String startTime,endTime;
log.info(LocalDateTime.now()+"dataToDayHandler开始执行");
log.info(LocalDateTime.now()+"dataToDayHandler开始执行,开始时间-结束时间"+jobParam.getBeginTime()+"___"+jobParam.getEndTime());
String methodDescribe = getMethodDescribe("dataToDayHandler");
List<String> indexLists = new ArrayList<> ();
if(CollectionUtils.isEmpty (jobParam.getLineIds())){
@@ -94,7 +94,7 @@ public class DayDataController extends BaseController {
} else{
indexLists = jobParam.getLineIds();
}
if (jobParam.getRepairFlag()){
if (jobParam.getRepairFlag() == 1){
List<String> timeRange = NjcnDateUtils.findEveryDay(jobParam.getBeginTime(),jobParam.getEndTime());
for (String item : timeRange) {
log.info(item+"-->开始执行");

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java
View File

@@ -58,7 +58,7 @@ public class IntegrityController extends BaseController {
log.info(LocalDateTime.now()+"dataIntegrity开始执行");
String methodDescribe = getMethodDescribe("dataIntegrity");
String startTime,endTime;
if (lineParam.getRepairFlag()){
if (lineParam.getRepairFlag() == 1){
List<String> timeRange = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime());
for (String item : timeRange) {
log.info(item+"-->开始执行");

2
pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ReportServiceImpl.java
View File

@@ -15,7 +15,7 @@ import com.njcn.common.pojo.exception.BusinessException;
import com.njcn.common.utils.FileUtil;
import com.njcn.device.pq.api.DeptLineFeignClient;
import com.njcn.device.pq.api.DeviceUnitClient;
import com.njcn.device.pq.pojo.po.PqsDeviceUnit;
import com.njcn.device.biz.pojo.po.PqsDeviceUnit;
import com.njcn.harmonic.enums.HarmonicResponseEnum;
import com.njcn.harmonic.pojo.dto.ReportTemplateDTO;
import com.njcn.harmonic.pojo.po.ExcelRpt;