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 082590fa..1a466019 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 @@ -212,6 +212,17 @@ public interface EpmetConstant { String EPMET_PROJECT_UPLOAD_PROJECT_PROCESS = "/data/stats/project/uploadprojectprocess"; + /** + * 【事件/项目分析】按类别统计-网格（03-22已确定） + */ + String EPMET_PROJECT_CATEGORY_GRID_DAILY = "/data/stats/project/category-grid-daily"; + + /** + * 【事件/项目分析】按类别统计-组织（03-22已确定） + */ + String EPMET_PROJECT_CATEGORY_ORG_DAILY = "/data/stats/project/category-org-daily"; + + /** * 行政地区编码查询 - 平阴县 */ diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java new file mode 100644 index 00000000..46bd078b --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryGridDailyResultDTO.java @@ -0,0 +1,66 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 【事件/项目分析】按类别统计-网格（03-22已确定） + * + * @author zhy + * @date 2021/3/22 16:55 + */ +@Data +public class CategoryGridDailyResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 类别编码 + */ + private String categoryCode; + + /** + * 项目总数 + */ + private Integer projectTotal; + + /** + * 组织id + */ + private String gridId; + + /** + * 组织所属上级id；如果属于跟组织下直属网格，pid=0 + */ + private String pid; + + /** + * 组织所有父级ids，以英文逗号隔开; pid=0时，pids=0 + */ + private String pids; + + /** + * 分类等级：1、2.... + */ + private Integer level; + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java new file mode 100644 index 00000000..b7f866a2 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/item/result/CategoryOrgDailyResultDTO.java @@ -0,0 +1,71 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.dto.item.result; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 【事件/项目分析】按类别统计-组织（03-22已确定） + * + * @author zhy + * @date 2021/3/22 16:56 + */ +@Data +public class CategoryOrgDailyResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 类别编码 + */ + private String categoryCode; + + /** + * 项目总数 + */ + private Integer projectTotal; + + /** + * 组织id + */ + private String orgId; + + /** + * 组织所属上级id；如果属于跟组织下直属网格，pid=0 + */ + private String pid; + + /** + * 组织所有父级ids，以英文逗号隔开; pid=0时，pids=0 + */ + private String pids; + + /** + * 社区级：community，乡（镇、街道）级:street + */ + private String orgType; + + /** + * 分类等级：1、2.... + */ + private Integer level; + +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCategoryDateDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCategoryDateDTO.java new file mode 100644 index 00000000..69928cef --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/ScreenCategoryDateDTO.java @@ -0,0 +1,31 @@ +package com.elink.esua.epdc.dto.screen.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 【事件/项目分析】按类别统计 + * + * @author zhy + * @date 2021/3/23 10:37 + */ +@Data +public class ScreenCategoryDateDTO implements Serializable { + private static final long serialVersionUID = 8161588041384645877L; + + /** + * 当为true时后台将先删除当前维度的数据，后新增 + */ + private Boolean isFirst; + + /** + * 日期Id, 数据更新至：yyyyMMdd + */ + private String dateId; + + /** + * 上报数据 + */ + private Object dataList; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/dao/EpdcTableNameDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/dao/EpdcTableNameDao.java new file mode 100644 index 00000000..5c31c38a --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/dao/EpdcTableNameDao.java @@ -0,0 +1,33 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.elink.esua.epdc.modules.common.dao; + +import com.elink.esua.epdc.commons.mybatis.dao.BaseDao; +import com.elink.esua.epdc.modules.common.entity.EpdcTableName; +import org.apache.ibatis.annotations.Mapper; + + +/** + * 声明表名 + * + * @author work@yujt.net.cn + * @date 2020/7/20 16:04 + */ +@Mapper +public interface EpdcTableNameDao extends BaseDao { +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/entity/EpdcTableName.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/entity/EpdcTableName.java new file mode 100644 index 00000000..c9be7178 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/common/entity/EpdcTableName.java @@ -0,0 +1,17 @@ +package com.elink.esua.epdc.modules.common.entity; + +import lombok.Data; + +import java.io.Serializable; + +/** + * 声明表名 + * + * @author work@yujt.net.cn + * @date 2020/7/20 16:00 + */ +@Data +public class EpdcTableName implements Serializable { + + private static final long serialVersionUID = 2548002813384497114L; +} diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java index f7fa875e..334074a9 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemAnalysisController.java @@ -20,14 +20,12 @@ package com.elink.esua.epdc.modules.item.controller; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.result.*; -import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; -import com.elink.esua.epdc.dto.item.result.DifficultItemResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemResultDTO; -import com.elink.esua.epdc.dto.item.result.ItemSurveyResultDTO; -import com.elink.esua.epdc.dto.item.result.UnsolvedItemResultDTO; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.Map; @@ -109,4 +107,30 @@ public class ItemAnalysisController { PageData page = itemAnalysisService.listReportSolvedItemResultDTO(params); return new Result>().ok(page); } + + /** + * 【事件/项目分析】按类别统计-网格（03-22已确定） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhy + * @date 2021/3/22 17:06 + */ + @GetMapping("categoryGridDaily") + public Result getCategoryGridDaily(String date) { + return itemAnalysisService.getCategoryGridDaily(date); + } + + /** + * 【事件/项目分析】按类别统计-组织（03-22已确定） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhy + * @date 2021/3/22 17:06 + */ + @GetMapping("categoryOrgDaily") + public Result getCategoryOrgDaily(String date) { + return itemAnalysisService.getCategoryOrgDaily(date); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java index df1ae540..606257ee 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemAnalysisDao.java @@ -105,4 +105,10 @@ public interface ItemAnalysisDao extends BaseDao { * @Date: 2020-02-12 */ List selectListHotItemList(HotItemListFormDTO formDto); + + List getCategoryGridDaily(); + + List getCategoryCommDaily(); + + List getCategoryStreetDaily(); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java index b5ad15be..79d5afd0 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemAnalysisService.java @@ -1,8 +1,8 @@ package com.elink.esua.epdc.modules.item.service; import com.elink.esua.epdc.commons.tools.page.PageData; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO; -import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; import com.elink.esua.epdc.dto.item.result.*; @@ -89,4 +89,24 @@ public interface ItemAnalysisService { * @Date: 2020-02-12 */ List listHotItemList(HotItemListFormDTO formDto); + + /** + * 【事件/项目分析】按类别统计-网格（03-22已确定） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/3/23 9:13 + */ + Result getCategoryGridDaily(String date); + + /** + * 【事件/项目分析】按类别统计-组织（03-22已确定） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhy + * @date 2021/3/23 9:13 + */ + Result getCategoryOrgDaily(String date); } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java index 89cef81e..0822fb4c 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemAnalysisServiceImpl.java @@ -2,23 +2,31 @@ package com.elink.esua.epdc.modules.item.service.impl; import com.baomidou.mybatisplus.core.metadata.IPage; 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.constant.NumConstant; import com.elink.esua.epdc.commons.tools.page.PageData; import com.elink.esua.epdc.commons.tools.security.user.SecurityUser; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; +import com.elink.esua.epdc.commons.tools.utils.DateUtils; +import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.datasources.DataSourceNames; import com.elink.esua.epdc.datasources.annotation.DataSource; import com.elink.esua.epdc.dto.item.form.HotItemListFormDTO; -import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.dto.item.form.ItemAnalysisFormDTO; import com.elink.esua.epdc.dto.item.form.ItemSurveyFormDTO; import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.modules.item.dao.ItemAnalysisDao; import com.elink.esua.epdc.modules.item.service.ItemAnalysisService; +import com.elink.esua.epdc.utils.EpmetUtils; +import com.elink.esua.epdc.utils.ScreenDataUtils; +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.Service; +import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; @@ -31,6 +39,8 @@ import java.util.Map; public class ItemAnalysisServiceImpl extends BaseServiceImpl implements ItemAnalysisService { private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired + private EpmetUtils epmetUtils; /** * @param params * @return com.elink.esua.epdc.dto.item.result.ItemResultDTO @@ -149,4 +159,26 @@ public class ItemAnalysisServiceImpl extends BaseServiceImpl gridDataList = baseDao.getCategoryGridDaily(); + String dataJson = ScreenDataUtils.getScreenCategoryDataJson(gridDataList, date, true); + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_CATEGORY_GRID_DAILY, dataJson); + return new Result(); + } + + @Override + public Result getCategoryOrgDaily(String date) { + date = StringUtils.isEmpty(date) ? DateUtils.format(DateUtils.addDateDays(new Date(),-1)) : date; + List commDataList = baseDao.getCategoryCommDaily(); + List streetDataList = baseDao.getCategoryStreetDaily(); + List orgDataList = new ArrayList<>(); + orgDataList.addAll(streetDataList); + orgDataList.addAll(commDataList); + String dataJson = ScreenDataUtils.getScreenCategoryDataJson(orgDataList, date, true); + epmetUtils.httpPost(EpmetConstant.EPMET_PROJECT_CATEGORY_ORG_DAILY, dataJson); + return new Result(); + } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java index 3106f42f..b4335992 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/utils/ScreenDataUtils.java @@ -2,6 +2,7 @@ package com.elink.esua.epdc.utils; import com.alibaba.fastjson.JSONObject; import com.elink.esua.epdc.commons.tools.utils.DateUtils; +import com.elink.esua.epdc.dto.screen.result.ScreenCategoryDateDTO; import com.elink.esua.epdc.dto.screen.result.ScreenDataDTO; import com.elink.esua.epdc.dto.screen.result.ScreenDataDateDTO; import com.elink.esua.epdc.dto.screen.result.ScreenDataMonthDTO; @@ -142,6 +143,28 @@ public class ScreenDataUtils { dateDto.setMonthId(dateId.replace("-", "")); dateDto.setDataList(data); + return JSONObject.toJSONString(dateDto); + } + /** + * 数据更新至事件为年月日类型 + * + * @param data 数据 + * @param dateId 日期字符串 + * @param isFirst 是否首次 + * @return java.lang.String + * @author zhy + * @date 2021/3/23 9:52 + */ + public static String getScreenCategoryDataJson(Object data, String dateId, Boolean isFirst) { + if (StringUtils.isEmpty(dateId)) { + // 获取当前时间 yyyy-MM + dateId = DateUtils.formatYearMonth(new Date()); + } + ScreenCategoryDateDTO dateDto = new ScreenCategoryDateDTO(); + dateDto.setIsFirst(isFirst); + dateDto.setDateId(dateId.replace("-", "")); + dateDto.setDataList(data); + return JSONObject.toJSONString(dateDto); } } diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/common/EpdcTableName.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/common/EpdcTableName.xml new file mode 100644 index 00000000..566cdb25 --- /dev/null +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/common/EpdcTableName.xml @@ -0,0 +1,29 @@ + + + + + + + + js_esua_epdc_admin + js_esua_epdc_analysis + js_esua_epdc_api + js_esua_epdc_custom + js_esua_epdc_events + js_esua_epdc_group + js_esua_epdc_mutuality + js_esua_epdc_news + js_esua_epdc_user + + + + + diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml index 4da8ddd3..c8e773b6 100644 --- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml +++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/item/ItemAnalysisDao.xml @@ -479,4 +479,76 @@ statementNum DESC LIMIT #{pageIndex}, #{pageSize}; + + + + + + 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 9a3e9c53..c1ee468e 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 @@ -6,6 +6,7 @@ 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; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -296,6 +297,28 @@ public interface AnalysisFeignClient { @PostMapping("analysis/data/stats/project/uploadprojectprocess") Result uploadProjectProcess(@RequestBody ScreenProjectFormDTO screenProjectFormDTO); + /** + * 【事件/项目分析】按类别统计-网格（03-22已确定） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhy + * @date 2021/3/22 17:06 + */ + @GetMapping("analysis/item/categoryGridDaily") + Result getCategoryGridDaily(String date); + + /** + * 【事件/项目分析】按类别统计-组织（03-22已确定） + * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhy + * @date 2021/3/22 17:06 + */ + @GetMapping("analysis/item/categoryOrgDaily") + Result getCategoryOrgDaily(String date); + /** * @Description 分类编码上报 * @Author songyunpeng 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 14d09505..e17331a6 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 @@ -159,4 +159,13 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result uploadCategoryCode() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "uploadCategoryCode"); } + @Override + public Result getCategoryGridDaily(String date) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "getCategoryGridDaily",date); + } + + @Override + public Result getCategoryOrgDaily(String date) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getCategoryOrgDaily", date); + } } 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 8e700127..73cf2609 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 @@ -41,7 +41,7 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP @Override public void run(String param) { - for (int i = 0; i < 12; i++) { + for (int i = 0; i < 14; i++) { createThread(i); } } @@ -83,6 +83,12 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP }else if (methodIndex == 11) { // 011、项目分类字典上报 uploadcategorydict(); + }else if (methodIndex == 12) { + // 012、【事件/项目分析】按类别统计-网格 + categoryGridDaily(); + }else if (methodIndex == 13) { + // 013、【事件/项目分析】按类别统计-组织 + categoryOrgDaily(); } return 0; } @@ -318,5 +324,33 @@ public class ScreenProjectDataPushDayTaskImpl implements ScreenProjectDataMonthP analysisFeignClient.uploadCategoryCode(); logger.info("<" + methodName + "|项目分类字典上报>定时任务执行结束"); } + /** + * 项目分类字典上报 + * + * @return void + * @author WK + * @since 2020/9/17 14:01 + */ + private void categoryGridDaily() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|【事件/项目分析】按类别统计-网格>定时任务开始执行"); + analysisFeignClient.getCategoryGridDaily(""); + logger.info("<" + methodName + "|【事件/项目分析】按类别统计-网格>定时任务执行结束"); + } + /** + * 项目分类字典上报 + * + * @return void + * @author WK + * @since 2020/9/17 14:01 + */ + private void categoryOrgDaily() { + // 方法名 + String methodName = Thread.currentThread().getStackTrace()[2].getMethodName(); + logger.info("<" + methodName + "|【事件/项目分析】按类别统计-组织>定时任务开始执行"); + analysisFeignClient.getCategoryOrgDaily(""); + logger.info("<" + methodName + "|【事件/项目分析】按类别统计-组织>定时任务执行结束"); + } } \ No newline at end of file