diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java index 6eec84de5..3ebda0863 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java @@ -1,11 +1,14 @@ package com.njcn.prepare.harmonic.controller.line; +import cn.hutool.core.collection.CollectionUtil; 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.common.utils.NjcnDateUtils; +import com.njcn.device.biz.commApi.CommTerminalGeneralClient; +import com.njcn.prepare.harmonic.pojo.bo.CalculatedParam; import com.njcn.prepare.harmonic.pojo.param.LineParam; import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService; import com.njcn.prepare.harmonic.utils.PublicUtil; @@ -15,6 +18,7 @@ import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -40,6 +44,8 @@ public class IntegrityController extends BaseController { private final IntegrityService integrityService; + private final CommTerminalGeneralClient commTerminalGeneralClient; + @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/dataIntegrity") @ApiOperation("数据完整性统计(MySQL库)") @@ -47,18 +53,14 @@ public class IntegrityController extends BaseController { public HttpResult dataIntegrity(@RequestBody @Validated LineParam lineParam){ log.info(LocalDateTime.now()+"dataIntegrity开始执行"); String methodDescribe = getMethodDescribe("dataIntegrity"); - String startTime,endTime; - if (Objects.nonNull(lineParam.getRepairFlag()) && lineParam.getRepairFlag()){ - List timeRange = NjcnDateUtils.findEveryDay(lineParam.getBeginTime(),lineParam.getEndTime()); - for (String item : timeRange) { - log.info(item+"-->开始执行"); - startTime = item+" "+"00:00:00"; - endTime = item+" "+"23:59:59"; -// integrityService.dataIntegrity(lineParam,startTime,endTime); - } + CalculatedParam calculatedParam = new CalculatedParam(); + calculatedParam.setDataDate(lineParam.getDataDate()); + if (CollectionUtil.isNotEmpty(lineParam.getLineIds())){ + calculatedParam.setIdList(lineParam.getLineIds()); } else { -// integrityService.dataIntegrity(lineParam,lineParam.getBeginTime(),lineParam.getEndTime()); + calculatedParam.setIdList(commTerminalGeneralClient.getRunMonitorIds().getData()); } + integrityService.dataIntegrity(calculatedParam); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, CommonResponseEnum.SUCCESS.getMessage(), methodDescribe); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java index 81dbb86e5..e11378c35 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/IntegrityServiceImpl.java @@ -135,7 +135,7 @@ public class IntegrityServiceImpl extends MppServiceImpl