Browse Source

不再从参数中获取日期

feature/screenDataPush
zhangyuan 4 years ago
parent
commit
c4929c60b9
  1. 2
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java
  2. 12
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java

2
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGovernanceController.java

@ -48,7 +48,7 @@ public class ScreenGovernanceController {
*/
@PostMapping("gridgoverndaily")
public Result gridgoverndaily(@RequestBody ScreenJobFormDTO formDto) {
log.info("<governrankdatadaily|网格治理指数(天)>定时任务执行");
log.info("<gridgoverndaily|网格治理指数(天)>定时任务执行");
return screenGovernanceService.gridgoverndaily(formDto);
}

12
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java

@ -43,9 +43,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
@Override
public Result governrankdatadaily(ScreenJobFormDTO formDto) {
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1));
if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) {
yearMonthDay = formDto.getYearMonth();
}
List<ScreenGovernRankDataDailyResultDTO> data = baseDao.governrankdatadaily();
List<ScreenGovernRankDataDailyResultDTO> agencyData = baseDao.governrankdatadailyAgency();
List<ScreenGovernRankDataDailyResultDTO> noRespData = baseDao.governrankdatadailyNoResp();
@ -100,9 +98,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
@Override
public Result gridgoverndaily(ScreenJobFormDTO formDto) {
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1));
if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) {
yearMonthDay = formDto.getYearMonth();
}
List<ScreenGridGovernDailyResultDTO> data = baseDao.gridgoverndaily();
JSONObject jsonObject = new JSONObject();
jsonObject.put("isFirst", true);
@ -115,9 +111,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
@Override
public Result agencygoverndaily(ScreenJobFormDTO formDto) {
String yearMonthDay = DateUtils.formatNoSplit(DateUtils.addDateDays(new Date(), -1));
if (formDto.getYearMonth() != null && StringUtils.isNotBlank(formDto.getYearMonth())) {
yearMonthDay = formDto.getYearMonth();
}
List<ScreenAgencyGovernDailyResultDTO> data = baseDao.agencygoverndaily();
JSONObject jsonObject = new JSONObject();
jsonObject.put("isFirst", true);

Loading…
Cancel
Save