From 6470d349f3931277b315c58da275af2d35d7b49f Mon Sep 17 00:00:00 2001 From: songyunpeng Date: Tue, 13 Jul 2021 16:12:01 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/EpmetConstant.java | 10 + .../GridManagerUploadDataResultDTO.java | 123 ++++++++++++ .../GridManagerUploadEventResultDTO.java | 74 +++++++ .../ScreenGridManagerController.java | 46 +++++ .../screen/dao/ScreenGridManagerDao.java | 37 ++++ .../service/ScreenGridManagerService.java | 32 +++ .../impl/ScreenBaseReportDataServiceImpl.java | 38 ++-- .../impl/ScreenGridManagerServiceImpl.java | 64 ++++++ .../mapper/screen/ScreenGridManagerDao.xml | 186 ++++++++++++++++++ .../epdc/dto/ScreenGridManagerParamDTO.java | 24 +++ .../esua/epdc/feign/AnalysisFeignClient.java | 19 ++ .../fallback/AnalysisFeignClientFallback.java | 10 + .../screen/ScreenBaseReportDataPushTask.java | 18 -- .../screen/ScreenGridManagerDataTaskImpl.java | 40 ++++ .../ScreenGridManagerEventsTaskImpl.java | 51 +++++ .../screen/ScreenProjectDataDayPushTask.java | 19 -- .../ScreenProjectDataMonthPushTask.java | 19 -- .../ScreenProjectDataPushDayTaskImpl.java | 15 +- .../ScreenProjectDataPushMonthTaskImpl.java | 5 +- .../task/screen/ScreenProjectPushTask.java | 19 -- .../screen/ScreenProjectPushTaskImpl.java | 4 +- .../task/screen/ScreenPublicDataPushTask.java | 20 -- .../screen/ScreenPublicDataPushTaskImpl.java | 2 +- 23 files changed, 749 insertions(+), 126 deletions(-) create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java create mode 100644 esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenGridManagerParamDTO.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java create mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataDayPushTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataMonthPushTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTask.java delete mode 100644 esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTask.java diff --git a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java index 4b4d23cf..712eb2f8 100644 --- a/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java +++ b/esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/EpmetConstant.java @@ -394,4 +394,14 @@ public interface EpmetConstant { */ String EPMET_SCREEN_BASE_REPORT_AGENCY_REGISTER_USER = "/data/stats/basereport/agencyreguser"; + /** + * 组织注册用户数据 + */ + String EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_EVENT = "/data/stats/statsuser/gm-uploadevent"; + + /** + * 组织注册用户数据 + */ + String EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA = "/data/stats/statsuser/gm-uploaddata"; + } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java new file mode 100644 index 00000000..dcba4652 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadDataResultDTO.java @@ -0,0 +1,123 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格员数据分析上报 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridManagerUploadDataResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 日期ID + */ + private String dateId; + + /** + * 月ID + */ + private String monthId; + + /** + * 年ID + */ + private String yearId; + + /** + * 客户Id + */ + private String customerId; + + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格id + */ + private String gridId; + + + + + + /** + * 工作人员id【网格员基础信息接口获取】 + */ + private String staffId ; + + /** + * 工作人员姓名【网格员基础信息接口获取】 + */ + private String staffName; + + /** + * 项目立项数,截止到当前dateId的总数 + */ + private Integer projectCount; + + /** + * 议题转项目数,截止到当前dateId的总数 + */ + private Integer issueToProjectCount ; + + /** + * 议题关闭数,截止到当前dateId的总数 + */ + private Integer closedIssueCount ; + + /** + * 项目响应数,截止到当前dateId的总数 + */ + private Integer projectResponseCount ; + + /** + * 项目吹哨数,截止到当前dateId的总数 + */ + private Integer projectTransferCount ; + + /** + * 项目结案数，dateId这一天的增量 + */ + private Integer projectClosedCount ; + + /** + * 项目结案数，dateId这一天的增量 + */ + private Integer projectIncr ; + + /** + * 议题转项目数，dateId这一天的增量 + */ + private Integer issueToProjectIncr ; + + /** + * 议题关闭数，dateId这一天的增量 + */ + private Integer closedIssueIncr ; + + /** + * 项目响应数，dateId这一天的增量 + */ + private Integer projectResponseIncr ; + + /** + * 项目吹哨数，dateId这一天的增量 + */ + private Integer projectTransferIncr ; + /** + * 项目结案数，截止到当前dateId的总数 + */ + private Integer projectClosedIncr ; + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java new file mode 100644 index 00000000..902b67b5 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/GridManagerUploadEventResultDTO.java @@ -0,0 +1,74 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格员事件总数上报 + * @Auther: songyunpeng + * @Date: 2021-06-25 09:59 + */ +@Data +public class GridManagerUploadEventResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 日期ID + */ + private String dateId; + + /** + * 月ID + */ + private String monthId; + + /** + * 年ID + */ + private String yearId; + + /** + * 周ID + */ + private String weekId; + + + + /** + * 季度ID + */ + private String quarterId; + + /** + * 客户Id + */ + private String customerId; + + + /** + * 机关id:网格所属的组织id + */ + private String agencyId; + + /** + * 网格id + */ + private String gridId; + + + + + + /** + * 产品这边工作人员用户id + */ + private String staffId ; + + /** + * 事件数 + */ + private Integer reportProjectCount; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java new file mode 100644 index 00000000..3d955e94 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/controller/ScreenGridManagerController.java @@ -0,0 +1,46 @@ +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.ScreenJobFormDTO; +import com.elink.esua.epdc.modules.screen.service.ScreenGridManagerService; +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; + +/** + * @author songyunpeng + * @Description 网格员管理 + * @create 2021-06-25 + */ + +@RestController +@RequestMapping("girdManager") +public class ScreenGridManagerController { + + @Autowired + private ScreenGridManagerService screenGridManagerService; + /** + * @Description 网格员数据分析上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [yearMonthDay] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping("gridManagerUploadData") + public Result selectGridManagerUploadData() { + return screenGridManagerService.selectGridManagerUploadData(); + } + /** + * @Description 网格员事件分析上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @PostMapping("gridManagerUploadEvent") + public Result selectGridManagerUploadEvent(@RequestBody ScreenJobFormDTO formDto) { + return screenGridManagerService.selectGridManagerUploadEvent(formDto.getYearMonth()); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java new file mode 100644 index 00000000..6c087774 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenGridManagerDao.java @@ -0,0 +1,37 @@ +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.ScreenBaseReportDataFormDTO; +import com.elink.esua.epdc.dto.screen.result.*; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * @Description 网格员管理信息 + * @Author songyunpeng + * @Date 2021/6/25 + **/ +@Mapper +public interface ScreenGridManagerDao extends BaseDao { + + /** + * @Description 网格员数据分析上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [customId] + * @return java.util.List + **/ + List selectGridManagerUploadData(@Param("customId")String customId,@Param("yearMonthDay") String yearMonthDay); + /** + * @Description 网格员事件总数上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [customId] + * @return java.util.List + **/ + List selectGridManagerUploadEvent(@Param("customId")String customId,@Param("yearMonthDay") String yearMonthDay); + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java new file mode 100644 index 00000000..97537a41 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/ScreenGridManagerService.java @@ -0,0 +1,32 @@ +package com.elink.esua.epdc.modules.screen.service; + +import com.elink.esua.epdc.commons.tools.utils.Result; + +/** + * 网格管理 + * + * @Author：syp + * @Date：2021/6/25 18:04 + */ +public interface ScreenGridManagerService { + + /** + * @Description 网格员数据分析上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [customId] + * @return java.util.List + **/ + Result selectGridManagerUploadData(); + /** + * @Description 网格员事件总数上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [customId] + * @return java.util.List + **/ + Result selectGridManagerUploadEvent(String yearMonthDay); + + + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java index 5a7722e8..a2b0f043 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenBaseReportDataServiceImpl.java @@ -9,6 +9,7 @@ import com.elink.esua.epdc.modules.screen.dao.ScreenBaseReportDataDao; 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.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -20,6 +21,7 @@ import java.util.List; * @Date：2020/9/9 18:05 */ @Service +@Slf4j public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl implements ScreenBaseReportDataService { @Autowired private EpmetUtils epmetUtils; @@ -32,7 +34,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl gridTopicStatusResultDTOS = baseDao.selectGridTopicStatusList(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(gridTopicStatusResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_STATUS, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_STATUS, dataJson); + log.info(body); return new Result(); } @@ -41,7 +44,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl communityTopicStatusResultDTOS = baseDao.selectCommunityTopicStatusList(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicStatusResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_TOPIC_STATUS, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_TOPIC_STATUS, dataJson); + log.info(body); return new Result(); } @Override @@ -49,7 +53,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl gridTopicIssueResultDTOS = baseDao.selectGridTopicIssueList(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(gridTopicIssueResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_ISSUE, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_TOPIC_ISSUE, dataJson); + log.info(body); return new Result(); } @Override @@ -57,7 +62,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl communityTopicIssueResultDTOS = baseDao.selectCommunityTopicIssueList(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(communityTopicIssueResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGNENCY_TOPIC_ISSUE, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGNENCY_TOPIC_ISSUE, dataJson); + log.info(body); return new Result(); } @Override @@ -65,7 +71,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl gridGridProjectResultDTOS = baseDao.selectGridProjectList(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(gridGridProjectResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_PROJECT, dataJson); + log.info(body); return new Result(); } @@ -74,7 +81,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl communityProjectResultDTOS = baseDao.selectCommunityProjectList(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(communityProjectResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_PROJECT, dataJson); + log.info(body); return new Result(); } @@ -92,7 +100,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl communityGroupTotalResultDTOS = baseDao.selectCommunityGroupTotalList(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(communityGroupTotalResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_GROUP_TOTAL, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_GROUP_TOTAL, dataJson); + log.info(body); return new Result(); } @@ -101,7 +110,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl gridHotTopicResultDTOS = baseDao.selectGridHotTopic(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(gridHotTopicResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_HOT_TOPIC, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_HOT_TOPIC, dataJson); + log.info(body); return new Result(); } @Override @@ -126,7 +136,8 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl gridUserResultDTOS = baseDao.selectGridRegUser(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(gridUserResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_REGISTER_USER, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_GRID_REGISTER_USER, dataJson); + log.info(body); return new Result(); } @Override @@ -159,6 +172,7 @@ public class ScreenBaseReportDataServiceImpl extends BaseServiceImpl communityUserResultDTOS = baseDao.selectAgencyRegUser(customerId); String dataJson = ScreenDataUtils.getScreenDateJson(communityUserResultDTOS,true); // 数据上报 - epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_REGISTER_USER, dataJson); + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_BASE_REPORT_AGENCY_REGISTER_USER, dataJson); + log.info(body); return new Result(); } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java new file mode 100644 index 00000000..a3ed5ff7 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGridManagerServiceImpl.java @@ -0,0 +1,64 @@ +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.DateUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.screen.form.ScreenBaseReportDataFormDTO; +import com.elink.esua.epdc.dto.screen.result.GridManagerUploadDataResultDTO; +import com.elink.esua.epdc.dto.screen.result.GridManagerUploadEventResultDTO; +import com.elink.esua.epdc.modules.screen.dao.ScreenGridManagerDao; +import com.elink.esua.epdc.modules.screen.service.ScreenGridManagerService; +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.util.Date; +import java.util.List; + +/** + * @Author：liuchuang + * @Date：2020/9/9 18:05 + */ +@Service +@Slf4j +public class ScreenGridManagerServiceImpl extends BaseServiceImpl implements ScreenGridManagerService { + @Autowired + private EpmetUtils epmetUtils; + + @Value("${epmet.config.customerId}") + private String customerId; + + @Override + public Result selectGridManagerUploadData() { + // 统计截止到昨天的数据 + String yearMonthDay = DateUtils.format(DateUtils.addDateDays(new Date(), -1)); + List gridManagerUploadDataResultDTOS = baseDao.selectGridManagerUploadData(customerId, yearMonthDay); + if(gridManagerUploadDataResultDTOS.size()!=0){ + String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadDataResultDTOS,true); + // 数据上报 + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_DATA, dataJson); + log.info(body); + } + + return new Result<>(); + } + + @Override + public Result selectGridManagerUploadEvent(String yearMonthDay) { + // 如果统计年月日为空，则统计当前天的数据 + yearMonthDay = StringUtils.isEmpty(yearMonthDay) ? DateUtils.format(new Date()) : yearMonthDay; + List gridManagerUploadEventResultDTOS = baseDao.selectGridManagerUploadEvent(customerId, yearMonthDay); + if(gridManagerUploadEventResultDTOS.size()>0){ + String dataJson = ScreenDataUtils.getScreenDateJson(gridManagerUploadEventResultDTOS,true); + // 数据上报 + String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_STATS_USER_GRID_MANAGER_UPLOAD_EVENT, dataJson); + log.info(body); + } + return new Result<>(); + } +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml new file mode 100644 index 00000000..96b1a9d9 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenGridManagerDao.xml @@ -0,0 +1,186 @@ + + + + + + + + diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenGridManagerParamDTO.java b/esua-epdc/epdc-module/epdc-job/epdc-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenGridManagerParamDTO.java new file mode 100644 index 00000000..b66e2c74 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-client/src/main/java/com/elink/esua/epdc/dto/ScreenGridManagerParamDTO.java @@ -0,0 +1,24 @@ +package com.elink.esua.epdc.dto; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 网格员事件管理定时任务入参 + * + * @Author：songyunpeng + * @Date：2021/03/02 10:30 + */ +@Data +public class ScreenGridManagerParamDTO implements Serializable { + private static final long serialVersionUID = -8868143963953751575L; + + /** + * 网格员事件管理 + */ + private String gridManagerUploadEvent; + + + +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index d2ad2abc..d530c094 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -469,4 +469,23 @@ public interface AnalysisFeignClient { **/ @PostMapping("analysis/screenBaseReport/agencyreguser") Result selectAgencyRegUser(); + + + /** + * @Description 网格员数据分析上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [customId] + **/ + @PostMapping("analysis/girdManager/gridManagerUploadData") + Result selectGridManagerUploadData(); + /** + * @Description 网格员事件总数上报 + * @Author songyunpeng + * @Date 2021/7/12 + * @Param [customId] + **/ + @PostMapping("analysis/girdManager/gridManagerUploadEvent") + Result selectGridManagerUploadEvent(ScreenJobFormDTO formDto); + } diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 04e2ec0c..b6035a71 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -230,6 +230,16 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectAgencyRegUser"); } + @Override + public Result selectGridManagerUploadData() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridManagerUploadData"); + } + + @Override + public Result selectGridManagerUploadEvent(ScreenJobFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "selectGridManagerUploadEvent",formDto); + } + @Override public Result getCategoryGridDaily(String date) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryGridDaily",date); diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java deleted file mode 100644 index c33c43ef..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenBaseReportDataPushTask.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.elink.esua.epdc.task.screen; - -/** - * 大屏基础信息上报 - * - * @Author：songyunpeng - * @Date：2021/6/25 - */ -public interface ScreenBaseReportDataPushTask { - /** - * @Description 大屏基础信息上报 - * @Author songyunpeng - * @Date 2021/6/25 - * @Param [param] - * @return void - **/ - void run(String param); -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java new file mode 100644 index 00000000..5b742f70 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerDataTaskImpl.java @@ -0,0 +1,40 @@ +package com.elink.esua.epdc.task.screen; + +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @program: esua-epdc + * @description: 网格员事件管理 + * @author: syp + * @create: 2021-02-24 13:48 + **/ +@Component("screenGridManagerDataTask") +public class ScreenGridManagerDataTaskImpl implements ScreenIndexDataPushTask { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + + @Autowired + private AnalysisFeignClient analysisFeignClient; + + + @Override + public void run(String param) { + // 网格员数据管理 + gridManagerUploadData(); + } + + + private void gridManagerUploadData() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|【网格员管理】网格员数据管理>定时任务开始执行"); + analysisFeignClient.selectGridManagerUploadData(); + logger.info("<" + methodName + "|【网格员管理】网格员数据管理>定时任务执行结束"); + } + +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java new file mode 100644 index 00000000..9f1b3466 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenGridManagerEventsTaskImpl.java @@ -0,0 +1,51 @@ +package com.elink.esua.epdc.task.screen; + +import com.alibaba.fastjson.JSONObject; +import com.elink.esua.epdc.dto.ScreenGridManagerParamDTO; +import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO; +import com.elink.esua.epdc.feign.AnalysisFeignClient; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * @program: esua-epdc + * @description: 网格员事件管理 + * @author: syp + * @create: 2021-02-24 13:48 + **/ +@Component("screenGridManagerEventsTask") +public class ScreenGridManagerEventsTaskImpl implements ScreenIndexDataPushTask { + + private final Logger logger = LoggerFactory.getLogger(getClass()); + + + @Autowired + private AnalysisFeignClient analysisFeignClient; + + + @Override + public void run(String param) { + // 参数处理 + ScreenGridManagerParamDTO paramDto = new ScreenGridManagerParamDTO(); + if (StringUtils.isNotEmpty(param)) { + paramDto = JSONObject.parseObject(param, ScreenGridManagerParamDTO.class); + } + // 网格员事件管理 + gridManagerUploadEvent(paramDto.getGridManagerUploadEvent()); + } + + + private void gridManagerUploadEvent(String gridManagerUploadEvent) { + ScreenJobFormDTO formDto = new ScreenJobFormDTO(); + formDto.setYearMonth(gridManagerUploadEvent); + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|【网格员管理】网格员事件管理>定时任务开始执行"); + analysisFeignClient.selectGridManagerUploadEvent(formDto); + logger.info("<" + methodName + "|【网格员管理】网格员事件管理>定时任务执行结束"); + } + +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataDayPushTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataDayPushTask.java deleted file mode 100644 index bdb9a7fa..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataDayPushTask.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.elink.esua.epdc.task.screen; - -/** - * 大屏【事件/项目分析】信息统计上报 - * - * @Author： wangtong - * @Date： 2021/2/24 14:16 - */ -public interface ScreenProjectDataDayPushTask { - /** - * 大屏数据推送 - * - * @param param 入参 - * @return void - * @author wangtong - * @since 2021/2/24 14:16 - */ - void run(String param); -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataMonthPushTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataMonthPushTask.java deleted file mode 100644 index 076b8d34..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataMonthPushTask.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.elink.esua.epdc.task.screen; - -/** - * 大屏【事件/项目分析】信息统计上报 - * - * @Author： wangtong - * @Date： 2021/2/24 14:16 - */ -public interface ScreenProjectDataMonthPushTask { - /** - * 大屏数据推送 - * - * @param param 入参 - * @return void - * @author wangtong - * @since 2021/2/24 14:16 - */ - void run(String param); -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushDayTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushDayTaskImpl.java index 929e4105..98605287 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushDayTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushDayTaskImpl.java @@ -1,20 +1,12 @@ package com.elink.esua.epdc.task.screen; -import com.elink.esua.epdc.commons.tools.utils.DateUtils; import com.elink.esua.epdc.dao.ScreenRecordDao; -import com.elink.esua.epdc.dto.screen.form.ScreenProjectFormDTO; -import com.elink.esua.epdc.entity.ScreenRecordEntity; import com.elink.esua.epdc.feign.AnalysisFeignClient; -import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -27,7 +19,7 @@ import java.util.concurrent.Future; * @create: 2021-02-24 13:48 **/ @Component("screenProjectDataPushDayTask") -public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthPushTask { +public class ScreenProjectDataPushDayTaskImpl implements ScreenIndexDataPushTask { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -36,9 +28,6 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP @Autowired private AnalysisFeignClient analysisFeignClient; - @Autowired - private ScreenRecordDao screenRecordDao; - @Override public void run(String param) { for (int i = 0; i < 12; i++) { @@ -278,4 +267,4 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP logger.info("<" + methodName + "|【事件/项目分析】按类别统计-组织>定时任务执行结束"); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushMonthTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushMonthTaskImpl.java index 679a9652..450fc3ee 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushMonthTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectDataPushMonthTaskImpl.java @@ -1,7 +1,6 @@ package com.elink.esua.epdc.task.screen; import com.alibaba.fastjson.JSONObject; -import com.elink.esua.epdc.dao.ScreenRecordDao; import com.elink.esua.epdc.dto.ScreenJobMonthDataParamDTO; import com.elink.esua.epdc.dto.screen.form.ScreenJobFormDTO; import com.elink.esua.epdc.feign.AnalysisFeignClient; @@ -23,7 +22,7 @@ import java.util.concurrent.Future; * @create: 2021-02-24 13:48 **/ @Component("screenProjectDataPushMonthTask") -public class ScreenProjectDataPushMonthTaskImpl implements ScreenProjectDataMonthPushTask { +public class ScreenProjectDataPushMonthTaskImpl implements ScreenIndexDataPushTask { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -166,4 +165,4 @@ public class ScreenProjectDataPushMonthTaskImpl implements ScreenProjectDataMont analysisFeignClient.governrankdata(formDto); logger.info("<" + methodName + "|基层治理-治理能力数据>定时任务执行结束"); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTask.java deleted file mode 100644 index 5718f234..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTask.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.elink.esua.epdc.task.screen; - -/** - * 大屏项目信息统计上报 - * - * @Author： wangtong - * @Date： 2021/2/24 14:16 - */ -public interface ScreenProjectPushTask { - /** - * 大屏数据推送 - * - * @param param 入参 - * @return void - * @author wangtong - * @since 2021/2/24 14:16 - */ - void run(String param); -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java index 9a6bb5dd..a509b567 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenProjectPushTaskImpl.java @@ -27,7 +27,7 @@ import java.util.concurrent.Future; * @create: 2021-02-24 13:48 **/ @Component("screenProjectPushTask") -public class ScreenProjectPushTaskImpl implements ScreenProjectPushTask { +public class ScreenProjectPushTaskImpl implements ScreenIndexDataPushTask { private final Logger logger = LoggerFactory.getLogger(getClass()); @@ -137,4 +137,4 @@ public class ScreenProjectPushTaskImpl implements ScreenProjectPushTask { analysisFeignClient.uploadProjectProcess(screenProjectFormDTO); logger.info("<" + methodName + "|项目处理流程信息上报>定时任务执行结束"); } -} \ No newline at end of file +} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTask.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTask.java deleted file mode 100644 index f1f661e4..00000000 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTask.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.elink.esua.epdc.task.screen; - -/** - * 大屏公共信息统计上报 - * - * @Author：liuchuang - * @Date：2020/9/17 13:56 - */ -public interface ScreenPublicDataPushTask { - - /** - * 大屏数据推送 - * - * @param param 入参 - * @return void - * @author Liuchuang - * @since 2020/9/9 15:21 - */ - void run(String param); -} diff --git a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java index 8d8f5d43..e19811a9 100644 --- a/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java +++ b/esua-epdc/epdc-module/epdc-job/epdc-job-server/src/main/java/com/elink/esua/epdc/task/screen/ScreenPublicDataPushTaskImpl.java @@ -21,7 +21,7 @@ import java.util.concurrent.Future; * @Date：2020/9/17 13:56 */ @Component("screenPublicDataPushTask") -public class ScreenPublicDataPushTaskImpl implements ScreenPublicDataPushTask { +public class ScreenPublicDataPushTaskImpl implements ScreenIndexDataPushTask { private final Logger logger = LoggerFactory.getLogger(getClass());