elink-star
/
esua-epdc-js
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

定时任务screenBaseReportDataPushTask

ftature/screen
曲树通 4 years ago
parent
cb6334a952
commit
9f5a2222b1
10 changed files with 332 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ItemCountParamDTO.java
  2. 2
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
  3. 153
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java
  4. 5
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java
  5. 77
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java
  6. 90
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java
  7. 90
      esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
  8. 5
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
  9. 5
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
  10. 21
      esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java

33
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/form/ItemCountParamDTO.java
View File

@ -0,0 +1,33 @@
package com.elink.esua.epdc.dto.screen.form;
import lombok.Data;
import java.io.Serializable;
/**
* @author: qushutong
* @Date: 2022/2/23 16:58
* @Description: 项目总数数据推送
*/
@Data
public class ItemCountParamDTO implements Serializable {
private static final long serialVersionUID = 1132628937660635407L;
/**
* 截止时间
*/
private String endTime;
/**
* 客户id
*/
private String customId;
/**
* 开始时间
*/
private String startTime;
}

2
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/pom.xml
View File

@ -190,7 +190,7 @@
<!-- nacos -->
<nacos.register-enabled>true</nacos.register-enabled>
<nacos.server-addr>172.16.0.7:10000,172.16.0.7:10001</nacos.server-addr>
<nacos.ip>172.16.0.8</nacos.ip>
<nacos.ip>172.16.0.7</nacos.ip>
<nacos.namespace></nacos.namespace>
<epmet.url>https://epmet-open.pingyin.gov.cn/api</epmet.url>
<epmet.secret>0f2ad2929f1e4f778dc1e90a64d154e572af864ea0eb4d73be56480f0af34ba1</epmet.secret>

153
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenBaseReportDataController.java
View File

@ -1,9 +1,11 @@
package com.elink.esua.epdc.modules.screen.controller;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO;
import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportDataService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@ -21,170 +23,197 @@ public class ScreenBaseReportDataController {
private ScreenBaseReportDataService screenBaseReportDataService;
/**
* @Description 网格状态话题数据
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 网格状态话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
@PostMapping("gridtopicstatus")
Result gridTopicStatus(){
Result gridTopicStatus() {
return screenBaseReportDataService.gridTopicStatus();
};
}
;
/**
* @Description 组织状态话题数据
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 组织状态话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
@PostMapping("agencytopicstatus")
Result agencyTopicStatus(){
Result agencyTopicStatus() {
return screenBaseReportDataService.agencyTopicStatus();
};
}
;
/**
* @Description 网格话题转议题数据
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 网格话题转议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
@PostMapping("gridtopicissue")
Result gridTopicIssue(){
Result gridTopicIssue() {
return screenBaseReportDataService.gridTopicIssue();
};
}
;
/**
* @Description 组织话题转议题数据
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 组织话题转议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
@PostMapping("agencytopicissue")
Result agencyTopicIssue(){
Result agencyTopicIssue() {
return screenBaseReportDataService.agencyTopicIssue();
};
}
;
/**
* @Description 网格项目数据
* @Description 网格项目数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("gridproject")
Result selectGridProjectList(){
return screenBaseReportDataService.selectGridProjectList();
};
Result selectGridProjectList(@RequestBody ItemCountParamDTO paramDto) {
return screenBaseReportDataService.selectGridProjectList(paramDto);
}
;
/**
* @Description 组织项目数据
* @Description 组织项目数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("agencyproject")
Result selectCommunityProjectList(){
return screenBaseReportDataService.selectCommunityProjectList();
};
Result selectCommunityProjectList(@RequestBody ItemCountParamDTO paramDto) {
return screenBaseReportDataService.selectCommunityProjectList(paramDto);
}
;
/**
* @Description 网格群组总数
* @Description 网格群组总数
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("gridgrouptotal")
Result selectGridGroupTotalList(){
Result selectGridGroupTotalList() {
return screenBaseReportDataService.selectGridGroupTotalList();
};
}
;
/**
* @Description 组织群组总数
* @Description 组织群组总数
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("agencygrouptotal")
Result selectCommunityGroupTotalList(){
Result selectCommunityGroupTotalList() {
return screenBaseReportDataService.selectCommunityGroupTotalList();
};
}
;
/**
* @Description 网格热议话题数据
* @Description 网格热议话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("gridhottopic")
Result selectGridHotTopic(){
Result selectGridHotTopic() {
return screenBaseReportDataService.selectGridHotTopic();
};
}
;
/**
* @Description 组织热议话题数据
* @Description 组织热议话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("agencyhottopic")
Result selectAgencyHotTopic(){
Result selectAgencyHotTopic() {
return screenBaseReportDataService.selectAgencyHotTopic();
};
}
;
/**
* @Description 网格议题数据
* @Description 网格议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("gridissue")
Result selectGridIssue(){
Result selectGridIssue() {
return screenBaseReportDataService.selectGridIssue();
};
}
;
/**
* @Description 组织议题数据
* @Description 组织议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("agencyissue")
Result selectAgencyIssue(){
Result selectAgencyIssue() {
return screenBaseReportDataService.selectAgencyIssue();
};
}
;
/**
* @Description 网格注册用户数据
* @Description 网格注册用户数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("gridreguser")
Result selectGridRegUser(){
Result selectGridRegUser() {
return screenBaseReportDataService.selectGridRegUser();
};
}
;
/**
* @Description 组织注册用户数据
* @Description 组织注册用户数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
@PostMapping("agencyreguser")
Result selectAgencyRegUser(){
Result selectAgencyRegUser() {
return screenBaseReportDataService.selectAgencyRegUser();
};
}
;
}

5
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java
View File

@ -1,6 +1,7 @@
package com.elink.esua.epdc.modules.screen.dao;
import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenBaseReportDataFormDTO;
import com.elink.esua.epdc.dto.screen.result.*;
import org.apache.ibatis.annotations.Mapper;
@ -59,7 +60,7 @@ public interface ScreenBaseReportDataDao extends BaseDao<ScreenBaseReportDataFor
* @Param [customId]
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.GridGridProjectResultDTO>
**/
List<GridGridProjectResultDTO> selectGridProjectList(@Param("customId")String customId);
List<GridGridProjectResultDTO> selectGridProjectList(ItemCountParamDTO paramDto);
/**
* @Description 组织项目数据
@ -68,7 +69,7 @@ public interface ScreenBaseReportDataDao extends BaseDao<ScreenBaseReportDataFor
* @Param [customId]
* @return java.util.List<com.elink.esua.epdc.dto.screen.result.CommunityProjectResultDTO>
**/
List<CommunityProjectResultDTO> selectCommunityProjectList(@Param("customId")String customId);
List<CommunityProjectResultDTO> selectCommunityProjectList(ItemCountParamDTO paramDto);
/**

77
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenBaseReportDataService.java
View File

@ -1,6 +1,7 @@
package com.elink.esua.epdc.modules.screen.service;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO;
/**
* 平阴-大屏基础信息上报
@ -10,127 +11,125 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
*/
public interface ScreenBaseReportDataService {
/**
* @Description 网格状态话题数据
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 网格状态话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result gridTopicStatus();
/**
* @Description 组织状态话题数据
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 组织状态话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result agencyTopicStatus();
/**
* @Description 网格话题转议题数据
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 网格话题转议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result gridTopicIssue();
/**
* @Description 组织话题转议题数据
/**
* @return com.elink.esua.epdc.commons.tools.utils.Result
* @Description 组织话题转议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param []
* @return com.elink.esua.epdc.commons.tools.utils.Result
**/
Result agencyTopicIssue();
/**
* @Description 网格项目数据
* @Description 网格项目数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectGridProjectList();
Result selectGridProjectList(ItemCountParamDTO paramDto);
/**
* @Description 组织项目数据
* @Description 组织项目数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectCommunityProjectList();
Result selectCommunityProjectList(ItemCountParamDTO paramDto);
/**
* @Description 网格群组总数
* @Description 网格群组总数
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectGridGroupTotalList();
/**
* @Description 组织群组总数
* @Description 组织群组总数
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectCommunityGroupTotalList();
/**
* @Description 网格热议话题数据
* @Description 网格热议话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectGridHotTopic();
/**
* @Description 组织热议话题数据
* @Description 组织热议话题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectAgencyHotTopic();
/**
* @Description 网格议题数据
* @Description 网格议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectGridIssue();
/**
* @Description 组织议题数据
* @Description 组织议题数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectAgencyIssue();
/**
* @Description 网格注册用户数据
* @Description 网格注册用户数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectGridRegUser();
/**
* @Description 组织注册用户数据
* @Description 组织注册用户数据
* @Author songyunpeng
* @Date 2021/6/25
* @Date 2021/6/25
* @Param [customId]
**/
Result selectAgencyRegUser();

90
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java
View File

@ -3,6 +3,7 @@ package com.elink.esua.epdc.modules.screen.service.impl;
import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
import com.elink.esua.epdc.commons.tools.constant.EpmetConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenBaseReportDataFormDTO;
import com.elink.esua.epdc.dto.screen.result.*;
import com.elink.esua.epdc.modules.screen.dao.ScreenBaseReportDataDao;
@ -10,10 +11,15 @@ import com.elink.esua.epdc.modules.screen.service.ScreenBaseReportDataService;
import com.elink.esua.epdc.utils.EpmetUtils;
import com.elink.esua.epdc.utils.ScreenDataUtils;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.List;
import java.util.Optional;
@ -68,22 +74,82 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl<ScreenBaseR
return new Result(); }
@Override
public Result selectGridProjectList() {
List<GridGridProjectResultDTO> gridGridProjectResultDTOS = baseDao.selectGridProjectList(customerId);
String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true);
// 数据上报
String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson);
log.info(body);
public Result selectGridProjectList(ItemCountParamDTO paramDto) {
paramDto.setCustomId(customerId);
if (StringUtils.isBlank(paramDto.getEndTime())) {
List<GridGridProjectResultDTO> gridGridProjectResultDTOS = baseDao.selectGridProjectList(paramDto);
String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true);
log.info("正常网格项目数据上报数据 " + dataJson);
// 数据上报
String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson);
log.info("正常网格项目数据上报返回 " + body);
} else {
// 推送所有日期
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar ca = Calendar.getInstance();
Date curDate = null;
Date endDate = null;
try {
curDate = sdf.parse(paramDto.getStartTime());
endDate = sdf.parse(paramDto.getEndTime());
} catch (ParseException e) {
e.printStackTrace();
}
int i =curDate.compareTo(endDate);
while (curDate.compareTo(endDate) <= 0) {
ca.setTime(curDate);
paramDto.setEndTime(sdf.format(curDate));
ca.add(Calendar.DAY_OF_MONTH, 1);
curDate = ca.getTime();
List<GridGridProjectResultDTO> gridGridProjectResultDTOS = baseDao.selectGridProjectList(paramDto);
String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true);
log.info("网格项目数据上报数据 " + dataJson);
// 数据上报
String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson);
log.info("网格项目数据上报返回 " + body);
}
}
return new Result();
}
@Override
public Result selectCommunityProjectList() {
List<CommunityProjectResultDTO> communityProjectResultDTOS = baseDao.selectCommunityProjectList(customerId);
String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true);
// 数据上报
String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson);
log.info(body);
public Result selectCommunityProjectList(ItemCountParamDTO paramDto) {
paramDto.setCustomId(customerId);
if (StringUtils.isBlank(paramDto.getEndTime())) {
List<CommunityProjectResultDTO> communityProjectResultDTOS = baseDao.selectCommunityProjectList(paramDto);
String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true);
log.info("正常组织项目数据上报数据 " + dataJson);
// 数据上报
String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson);
log.info("正常组织项目数据上报返回 " + body);
} else {
// 推送所有日期
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
Calendar ca = Calendar.getInstance();
Date curDate = null;
Date endDate = null;
try {
curDate = sdf.parse(paramDto.getStartTime());
endDate = sdf.parse(paramDto.getEndTime());
} catch (ParseException e) {
e.printStackTrace();
}
int i =curDate.compareTo(endDate);
while (curDate.compareTo(endDate) <= 0) {
ca.setTime(curDate);
paramDto.setEndTime(sdf.format(curDate));
ca.add(Calendar.DAY_OF_MONTH, 1);
curDate = ca.getTime();
List<CommunityProjectResultDTO> communityProjectResultDTOS = baseDao.selectCommunityProjectList(paramDto);
String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true);
log.info("组织项目数据上报数据 " + dataJson);
// 数据上报
String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson);
log.info("组织项目数据上报返回 " + body);
}
}
return new Result();
}

90
esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
View File

@ -303,16 +303,32 @@
grid.id as gridId,
grid.pid as agencyId,
'${customId}' as customerId,
DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
<choose>
<when test="endTime != null and endTime != ''">
DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
</when>
<otherwise>
DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
</otherwise>
</choose>
ifnull(count(ei.ID),0) as projectTotal,
ifnull(count(ei.ITEM_STATE = '0' or null),0) as pendingTotal,
ifnull(round(ifnull(count(ei.ITEM_STATE = '0' or null),0) / ifnull(count(ei.ID),0) * 100),0) as pendingRatio,
@ -339,7 +355,14 @@
where grid.del_flag = '0'
and grid.type_key = 'grid_party'
and grid.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
<choose>
<when test="endTime != null and endTime != ''">
and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d')
</when>
<otherwise>
and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
</otherwise>
</choose>
group by grid.id
</select>
<select id="selectCommunityProjectList"
@ -350,16 +373,32 @@
sd.id as agencyId,
sd.pid as parentId,
'${customId}' as customerId,
DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
<choose>
<when test="endTime != null and endTime != ''">
DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
</when>
<otherwise>
DATE_FORMAT(date_add(now(), interval -1 day), '%Y%m%d') as dateId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'W',
WEEK(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m-%d'))) weekId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y') AS yearId,
CONCAT(DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y'), '%Y'),
'Q',
QUARTER(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'),
'%Y-%m-%d'))) quarterId,
DATE_FORMAT(STR_TO_DATE(DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d'), '%Y-%m'), '%Y%m') AS monthId,
</otherwise>
</choose>
ifnull(count(ei.ID),0) as projectTotal,
ifnull(count(ei.ITEM_STATE = '0' or null),0) as pendingTotal,
ifnull(round(ifnull(count(ei.ITEM_STATE = '0' or null),0) / ifnull(count(ei.ID),0) * 100),0) as pendingRatio,
@ -387,7 +426,14 @@
and sd.type_key in ( 'street_party', 'community_party' )
and sd.id not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
and ei.`GRID_ID` not in (SELECT t.DEPT_ID FROM `esua_epdc_admin`.`sys_dept_config` t WHERE t.DEL_FLAG = '0')
and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
<choose>
<when test="endTime != null and endTime != ''">
and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(#{endTime}, interval -1 day), '%Y-%m-%d')
</when>
<otherwise>
and DATE_FORMAT(ei.CREATED_TIME, '%Y-%m-%d') &lt;= DATE_FORMAT(date_add(now(), interval -1 day), '%Y-%m-%d')
</otherwise>
</choose>
group by sd.id;
</select>
<select id="selectGridGroupTotalList"

5
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
View File

@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback;
@ -378,7 +379,7 @@ public interface AnalysisFeignClient {
* @Param [customId]
**/
@PostMapping("analysis/screenBaseReport/gridproject")
Result selectGridProjectList();
Result selectGridProjectList(ItemCountParamDTO paramDto);
/**
* @Description 组织项目数据
@ -387,7 +388,7 @@ public interface AnalysisFeignClient {
* @Param [customId]
**/
@PostMapping("analysis/screenBaseReport/agencyproject")
Result selectCommunityProjectList();
Result selectCommunityProjectList(ItemCountParamDTO paramDto);
/**

5
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
View File

@ -3,6 +3,7 @@ package com.elink.esua.epdc.feign.fallback;
import com.elink.esua.epdc.commons.tools.constant.ServiceConstant;
import com.elink.esua.epdc.commons.tools.utils.ModuleUtils;
import com.elink.esua.epdc.commons.tools.utils.Result;
import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO;
import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO;
import com.elink.esua.epdc.feign.AnalysisFeignClient;
@ -181,12 +182,12 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
}
@Override
public Result selectGridProjectList() {
public Result selectGridProjectList(ItemCountParamDTO paramDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridProjectList");
}
@Override
public Result selectCommunityProjectList() {
public Result selectCommunityProjectList(ItemCountParamDTO paramDto) {
return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectCommunityProjectList");
}

21
esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTaskImpl.java
View File

@ -1,6 +1,9 @@
package com.elink.esua.epdc.task.screen;
import com.alibaba.fastjson.JSONObject;
import com.elink.esua.epdc.dto.screen.form.ItemCountParamDTO;
import com.elink.esua.epdc.feign.AnalysisFeignClient;
import org.apache.commons.lang.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@ -22,7 +25,11 @@ public class ScreenBaseReportDataPushTaskImpl implements ScreenIndexDataPushTask
@Override
public void run(String param) {
// 参数处理
ItemCountParamDTO paramDto = new ItemCountParamDTO();
if (StringUtils.isNotEmpty(param)) {
paramDto = JSONObject.parseObject(param, ItemCountParamDTO.class);
}
// 01、网格状态话题数据
gridTopicStatus();
// 02、组织状态话题数据
@ -32,9 +39,9 @@ public class ScreenBaseReportDataPushTaskImpl implements ScreenIndexDataPushTask
// 04、组织话题转议题数据
agencyTopicIssue();
// 05、网格项目数据
selectGridProjectList();
selectGridProjectList(paramDto);
// 组织项目数据
selectCommunityProjectList();
selectCommunityProjectList(paramDto);
// 网格群组总数
selectGridGroupTotalList();
// 组织群组总数
@ -116,11 +123,11 @@ public class ScreenBaseReportDataPushTaskImpl implements ScreenIndexDataPushTask
* @Param []
* @return void
**/
public void selectGridProjectList() {
public void selectGridProjectList(ItemCountParamDTO paramDto) {
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|大屏基础信息上报-网格项目数据>定时任务开始执行");
analysisFeignClient.selectGridProjectList();
analysisFeignClient.selectGridProjectList(paramDto);
logger.info("<" + methodName + "|大屏基础信息上报-网格项目数据>定时任务执行结束");
}
/**
@ -130,11 +137,11 @@ public class ScreenBaseReportDataPushTaskImpl implements ScreenIndexDataPushTask
* @Param []
* @return void
**/
public void selectCommunityProjectList() {
public void selectCommunityProjectList(ItemCountParamDTO paramDto) {
// 方法名
String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
logger.info("<" + methodName + "|大屏基础信息上报-组织项目数据>定时任务开始执行");
analysisFeignClient.selectCommunityProjectList();
analysisFeignClient.selectCommunityProjectList(paramDto);
logger.info("<" + methodName + "|大屏基础信息上报-组织项目数据>定时任务执行结束");
}
/**

Write Preview
Loading…
Cancel
Save