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

页面报错

Browse Source
This commit is contained in:
雨木c
2023-04-23 11:54:54 +08:00
parent 87f08d8558
commit bc54c20e1d
6 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/DeptLineController.java → pqs-device/pms-device/pms-device-boot/src/main/java/com/njcn/device/pms/controller/ledgerManger/DeptLineController.java
View File

@@ -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.annotation.OperateInfo;
import com.njcn.common.pojo.constant.OperateType; import com.njcn.common.pojo.constant.OperateType;

2
pqs-device/pq-device/pq-device-api/src/main/java/com/njcn/device/pq/api/TerminalBaseClient.java
View File

@@ -30,7 +30,7 @@ public interface TerminalBaseClient {
* @author xy * @author xy
* @date 2022/2/21 18:53 * @date 2022/2/21 18:53
*/ */
@GetMapping("/getSubstationById") @PostMapping("/getSubstationById")
HttpResult<List<Line>> getSubstationById(@RequestParam("list") List<String> list); HttpResult<List<Line>> getSubstationById(@RequestParam("list") List<String> list);

1
pqs-job/job-executor/src/main/java/com/njcn/executor/handler/HarmDateToDayJob.java
View File

@@ -48,6 +48,7 @@ public class HarmDateToDayJob {
@XxlJob("harmDateToDayJobToMysql") @XxlJob("harmDateToDayJobToMysql")
public void harmDateToDayJobToMysql(){ public void harmDateToDayJobToMysql(){
log.info(LocalDateTime.now()+"data转day数据调度开始------------------------");
LineParam lineParam = new LineParam(); LineParam lineParam = new LineParam();
lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); lineParam.setType(Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY)); lineParam.setDataDate(CommonExecutorUtils.prepareTimeDeal(BizParamConstant.STAT_BIZ_DAY));

3
pqs-job/job-executor/src/main/java/com/njcn/executor/utils/CommonExecutorUtils.java
View File

@@ -36,7 +36,8 @@ public class CommonExecutorUtils {
break; break;
case BizParamConstant.STAT_BIZ_MONTH: 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; break;
case BizParamConstant.STAT_BIZ_QUARTER: case BizParamConstant.STAT_BIZ_QUARTER:
//季度 //季度

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

@@ -98,6 +98,7 @@ public class DayDataController extends BaseController {
} else { } else {
startTime = jobParam.getDataDate()+" "+"00:00:00"; startTime = jobParam.getDataDate()+" "+"00:00:00";
endTime = jobParam.getDataDate()+" "+"23:59:59"; endTime = jobParam.getDataDate()+" "+"23:59:59";
log.info("统计时间范围："+startTime+"----->"+endTime);
dayDataService.dataToDayHandler(indexLists,startTime,endTime); dayDataService.dataToDayHandler(indexLists,startTime,endTime);
} }
return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe); return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, methodDescribe);

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

@@ -130,7 +130,7 @@ public class PollutionServiceImpl implements PollutionService {
localEnd = LocalDateTimeUtil.parse(lineParam.getDataDate() + "T23:59:59"); localEnd = LocalDateTimeUtil.parse(lineParam.getDataDate() + "T23:59:59");
}else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(lineParam.getType())){ }else if (Integer.valueOf(BizParamConstant.STAT_BIZ_MONTH).equals(lineParam.getType())){
Date dateOutb = DateUtil.beginOfMonth(dateOut); Date dateOutb = DateUtil.beginOfMonth(dateOut);
Date dateOute = DateUtil.endOfMonth(dateOut); Date dateOute = dateOut;
local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00"); local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00");
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59"); localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
}else if (Integer.valueOf(BizParamConstant.STAT_BIZ_QUARTER).equals(lineParam.getType())){ }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"); local = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOutb) + "T00:00:00");
localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59"); localEnd = LocalDateTimeUtil.parse(DateUtil.formatDate(dateOute) + "T23:59:59");
} }
log.info("污区数据统计间隔"+local+"----->"+localEnd);
lambdaQuery.ge(RMpPollutionDPO::getDataDate, local).le(RMpPollutionDPO::getDataDate,localEnd); lambdaQuery.ge(RMpPollutionDPO::getDataDate, local).le(RMpPollutionDPO::getDataDate,localEnd);
List<RMpPollutionDPO> pollutionDayList = rMpPollutionDMapper.selectList(lambdaQuery); List<RMpPollutionDPO> pollutionDayList = rMpPollutionDMapper.selectList(lambdaQuery);
//MySql入表变电站、单位 //MySql入表变电站、单位