diff --git a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DeptLineController.java b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptLineController.java similarity index 98% rename from pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DeptLineController.java rename to pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptLineController.java index db2812194..3d8673e19 100644 --- a/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DeptLineController.java +++ b/pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptLineController.java @@ -1,4 +1,4 @@ -package com.njcn.device.pms.controller; +package com.njcn.device.pms.controller.ledgerManger; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.constant.OperateType; diff --git a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java index 40b1f3f24..a7cb767da 100644 --- a/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java +++ b/pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java @@ -30,7 +30,7 @@ public interface TerminalBaseClient { * @author xy * @date 2022/2/21 18:53 */ - @GetMapping("/getSubstationById") + @PostMapping("/getSubstationById") HttpResult> getSubstationById(@RequestParam("list") List list); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java index cc2a27a7a..7e54d1d4e 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java @@ -48,6 +48,7 @@ public class HarmDateToDayJob { @XxlJob("harmDateToDayJobToMysql") public void harmDateToDayJobToMysql(){ + log.info(LocalDateTime.now()+"data转day数据调度开始------------------------"); LineParam lineParam = new LineParam(); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); diff --git a/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java b/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java index b06df4809..71b6517f5 100644 --- a/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java +++ b/pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java @@ -36,7 +36,8 @@ public class CommonExecutorUtils { break; case BizParamConstant.STAT_BIZ_MONTH: //月 - date = sdf.format(DateUtil.beginOfMonth(DateUtil.lastMonth())); + calendar.add(Calendar.DAY_OF_MONTH,-1); + date = sdf.format(DateUtil.beginOfDay(calendar.getTime())); break; case BizParamConstant.STAT_BIZ_QUARTER: //季度 diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java index e54b2bddb..f6581d172 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java @@ -98,6 +98,7 @@ public class DayDataController extends BaseController { } else { startTime = jobParam.getDataDate()+" "+"00:00:00"; endTime = jobParam.getDataDate()+" "+"23:59:59"; + log.info("统计时间范围:"+startTime+"----->"+endTime); dayDataService.dataToDayHandler(indexLists,startTime,endTime); } return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java index d6f337974..124ad9829 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java @@ -130,7 +130,7 @@ public class PollutionServiceImpl implements PollutionService { localEnd = LocalDateTimeUtil.parse(lineParam.getDataDate() + "T23:59:59"); }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(lineParam.getType())){ Date dateOutb = DateUtil.beginOfMonth(dateOut); - Date dateOute = DateUtil.endOfMonth(dateOut); + Date dateOute = dateOut; local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00"); localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59"); }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(lineParam.getType())){ @@ -144,6 +144,8 @@ public class PollutionServiceImpl implements PollutionService { local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00"); localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59"); } + + log.info("污区数据统计间隔"+local+"----->"+localEnd); lambdaQuery.ge(RMpPollutionDPO::getDataDate, local).le(RMpPollutionDPO::getDataDate,localEnd); List pollutionDayList = rMpPollutionDMapper.selectList(lambdaQuery); //MySql入表变电站、单位