From 4ffccaced0e8a4732e4b86ed6358e4122cdabdfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com> Date: Tue, 11 Apr 2023 16:31:51 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=AD=E5=BF=83=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/njcn/device/biz/utils/COverlimit.java | 2 +- .../harmonic/controller/line/DistortionRateController.java | 3 ++- .../harmonic/controller/line/NormalLimitController.java | 2 +- .../harmonic/service/mysql/Impl/line/DayDataServiceImpl.java | 4 ++++ .../harmonic/service/mysql/Impl/line/LimitRateService.java | 4 ++++ .../service/mysql/Impl/line/LimitTargetServiceImpl.java | 3 +++ 6 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java index 8cf1050c0..f754790aa 100644 --- a/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java +++ b/pqs-device/common-device-biz/src/main/java/com/njcn/device/biz/utils/COverlimit.java @@ -396,7 +396,7 @@ public class COverlimit { }else if(DicDataEnum.KV1100.getCode().equalsIgnoreCase(voltageLevel)){ return 7000; }else { - throw new BusinessException("没有对应电压等级,请先完善字典"); + throw new BusinessException("没有对应电压等级,请先完善字典"+voltageLevel); } } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java index 3a504b52f..7e98c1c5c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java @@ -42,7 +42,7 @@ public class DistortionRateController extends BaseController { @OperateInfo(info = LogEnum.BUSINESS_COMMON) @PostMapping("/distortionRate") - @ApiOperation("谐波畸变率排名") + @ApiOperation("谐波畸变率排名_mysql") @ApiImplicitParam(name = "lineParam", value = "参数", required = true) public HttpResult distortionRate(@RequestBody @Validated LineParam lineParam){ String methodDescribe = getMethodDescribe("distortionRate"); @@ -54,6 +54,7 @@ public class DistortionRateController extends BaseController { @PostMapping("/distortionRateBySource") @ApiOperation("谐波畸变率排名") @ApiImplicitParam(name = "lineParam", value = "参数", required = true) + @Deprecated public HttpResult distortionRateBySource(@RequestBody @Validated LineParam lineParam){ log.info(LocalDateTime.now()+"distortionRateBySource开始执行"); String methodDescribe = getMethodDescribe("distortionRateBySource"); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java index 50357e4a0..946608786 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java @@ -25,7 +25,7 @@ import org.springframework.web.bind.annotation.RestController; @Slf4j @RestController @RequestMapping("/normalLimit") -@Api(tags = "告警数据预处理") +@Api(tags = "告警数据预处理_mysql") @AllArgsConstructor public class NormalLimitController extends BaseController { diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java index d5638910a..1d574ad9b 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/DayDataServiceImpl.java @@ -540,6 +540,7 @@ public class DayDataServiceImpl implements DayDataService { @Transactional(rollbackFor = {Exception.class}) @Async("asyncExecutor") public void dataToDayHandler(List indexLists, String startTime, String endTime) { + log.info(LocalDateTime.now()+"data表转day开始=====》"); Date time = null; SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); try { @@ -761,6 +762,9 @@ public class DayDataServiceImpl implements DayDataService { if (!CollectionUtils.isEmpty(dataPltPOList)){ statDataPltDService.insert(dataPltPOList); } + + + log.info(LocalDateTime.now()+"data表转day结束=====》"); } diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java index ea8402a97..6c1fba6ed 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/LimitRateService.java @@ -29,6 +29,7 @@ import org.springframework.util.CollectionUtils; import java.text.ParseException; import java.text.SimpleDateFormat; import java.time.Instant; +import java.time.LocalDateTime; import java.util.*; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; @@ -111,6 +112,7 @@ public class LimitRateService extends MppServiceImpl lineList, String startTime, String endTime) { + log.info(LocalDateTime.now()+"r_stat_limit_rate_d开始执行=======》"); List list = new ArrayList<>(); List limitRateList = new ArrayList<> (); Date date = null; @@ -153,6 +155,8 @@ public class LimitRateService extends MppServiceImpl list = new ArrayList<>(); Date dateOut = DateUtil.parse(time); List limitRateData = new ArrayList<>(); @@ -83,6 +85,7 @@ public class LimitTargetServiceImpl extends MppServiceImpl getLimitRateData(String lineId,String date){