From 258b191140ba39e16a40004c5061e7650e4e64e0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 11 Jan 2022 16:33:51 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BE=8B=E8=A1=8C=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E6=95=B0=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datastats/result/WorkFactResultDTO.java | 1 + .../result/PatrolDailySumResult.java | 1 + .../datastats/impl/DataStatsServiceImpl.java | 27 ++++++++----------- .../StatsStaffPatrolRecordDailyDao.xml | 3 ++- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java index 9eebe98854..0a35355dd6 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/WorkFactResultDTO.java @@ -19,6 +19,7 @@ public class WorkFactResultDTO implements Serializable { private Integer closedProjectTotal = 0; private Integer patrolTotal = 0; private String patrolTotalTime = "0"; + private Integer routineWorkCount = 0; private String orgId; private String orgName; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java index c7fbe6b7ef..af0c502590 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/PatrolDailySumResult.java @@ -18,4 +18,5 @@ public class PatrolDailySumResult implements Serializable { private String orgId; private Integer patrolTotal; private Integer totalTime; + private Integer routineWorkCount; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 201f8a39b6..a8fb5ee168 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -3,12 +3,10 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.NumConstant; - import com.epmet.commons.tools.enums.OrgLevelEnum; - import com.epmet.commons.tools.exception.EpmetErrorCode; - import com.epmet.commons.tools.exception.EpmetException; - import com.epmet.commons.tools.exception.RenException; - import com.epmet.commons.tools.feign.ResultDataResolver; - import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.enums.OrgLevelEnum; +import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.dataaggre.constant.DataSourceConstant; @@ -26,22 +24,18 @@ import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; - import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; - import com.epmet.dataaggre.dto.govproject.result.ProjectMonthIncrResultDTO; - import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; +import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; +import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; - import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; - import com.epmet.dataaggre.excel.CustomerDataManageExcel; +import com.epmet.dataaggre.excel.CustomerDataManageExcel; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; - import com.epmet.dataaggre.service.govorg.GovOrgService; - import com.epmet.dataaggre.service.opercrm.CustomerRelation; - import com.epmet.dto.CustomerAgencyDTO; - import com.epmet.feign.GovOrgOpenFeignClient; - import com.github.pagehelper.PageHelper; +import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.opercrm.CustomerRelation; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -1636,6 +1630,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve private void setPatrolAttr(WorkFactResultDTO resultDTO, PatrolDailySumResult patrolRecordDTO) { if (patrolRecordDTO != null){ + resultDTO.setRoutineWorkCount(patrolRecordDTO.getRoutineWorkCount()); resultDTO.setPatrolTotal(patrolRecordDTO.getPatrolTotal()); Integer totalTime = patrolRecordDTO.getTotalTime(); if (totalTime != null || totalTime > 0){ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml index 2d0845dbf0..86aae4d681 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StatsStaffPatrolRecordDailyDao.xml @@ -6,7 +6,8 @@ SELECT #{orgId} orgId, sum(patrol_total) patrolTotal, - sum(TOTAL_TIME) totalTime + sum(TOTAL_TIME) totalTime, + sum(ROUTINE_WORK_COUNT) routineWorkCount FROM stats_staff_patrol_record_daily WHERE del_flag = '0' AND date_id =]]> #{startDateId} From 0a6d2ddefd91b1942b05454ad8c1ca1c5d23129d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Jan 2022 09:43:45 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/feign/GovOrgOpenFeignClient.java | 9 +++++++++ .../GovOrgOpenFeignClientFallback.java | 5 +++++ .../controller/CustomerGridController.java | 11 +++++++++++ .../java/com/epmet/dao/CustomerGridDao.java | 8 ++++++++ .../epmet/service/CustomerGridService.java | 8 ++++++++ .../service/impl/CustomerGridServiceImpl.java | 19 +++++++++++++++++++ .../main/resources/mapper/CustomerGridDao.xml | 19 +++++++++++++++++++ 7 files changed, 79 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 4411112d31..dcc9886c8e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -306,6 +306,15 @@ public interface GovOrgOpenFeignClient { @PostMapping("/gov/org/customergrid/getgridlistbygridids") Result> getGridListByGridIds(List gridIdList); + /** + * @Description 查询网格名 不限制是否同步条件 SYNC_FLAG + * @param gridIdList + * @author zxc + * @date 2022/1/12 9:37 上午 + */ + @PostMapping("/gov/org/customergrid/getallgridlistbygridids") + Result> getAllGridListByGridIds(List gridIdList); + /** * @Description 根据网格Id查询用户数据 * @param customerGridFormDTO diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 95cdf04f81..52e0a615ee 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -177,6 +177,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getGridListByGridIds", gridIdList); } + @Override + public Result> getAllGridListByGridIds(List gridIdList) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAllGridListByGridIds", gridIdList); + } + @Override public Result getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId", customerGridFormDTO); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java index 8422de2c41..8843d646c5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java @@ -183,6 +183,17 @@ public class CustomerGridController { return customerGridService.getGridListByGridIds(gridIdList); } + /** + * @Description 查询网格名 不限制是否同步条件 SYNC_FLAG + * @param gridIdList + * @author zxc + * @date 2022/1/12 9:37 上午 + */ + @PostMapping("getallgridlistbygridids") + public Result> getAllGridListByGridIds(@RequestBody List gridIdList) { + return new Result>().ok(customerGridService.getAllGridListByGridIds(gridIdList)); + } + /** * @Description 获取所属网格 * @param formDTO diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java index 6bee86b049..35e23bc8ea 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java @@ -155,6 +155,14 @@ public interface CustomerGridDao extends BaseDao { */ List selectGridByIds(@Param("gridIdList") List gridIdList); + /** + * @Description 查询网格名 不限制是否同步条件 SYNC_FLAG + * @param gridIdList + * @author zxc + * @date 2022/1/12 9:42 上午 + */ + List selectAllGridByIds(@Param("gridIdList") List gridIdList); + /** * @param formDTO * @Description 获取所属网格 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java index 2b2624ac54..1bc418d8fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java @@ -221,6 +221,14 @@ public interface CustomerGridService extends BaseService { */ Result> getGridListByGridIds(List gridIdList); + /** + * @Description 查询网格名 不限制是否同步条件 SYNC_FLAG + * @param gridIdList + * @author zxc + * @date 2022/1/12 9:37 上午 + */ + List getAllGridListByGridIds(List gridIdList); + /** * @Description 获取所属网格 * @param formDTO diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index 03bb84ba0d..115a784406 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -637,6 +637,25 @@ public class CustomerGridServiceImpl extends BaseServiceImpl getAllGridListByGridIds(List gridIdList) { + if (CollectionUtils.isEmpty(gridIdList)) { + logger.warn("根据网格Id集合获取网格列表信息-传入的网格Id集合为空数组！"); + return new ArrayList<>(); + } + List list = baseDao.selectAllGridByIds(gridIdList); + if (CollectionUtils.isNotEmpty(list)){ + return list; + } + return new ArrayList<>(); + } + /** * @Description 获取所属网格 * @param formDTO diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml index ef2845201c..d741db6e04 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml @@ -755,6 +755,25 @@ AND cg.id = #{gridId} + + + update customer_grid SET AREA_CODE = '', From 3c605a90826af817b812234130f2052a303cee66 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 12 Jan 2022 09:46:14 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java index feef559058..bc850e1d2c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java @@ -190,7 +190,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl gridIds = list.stream().map(m -> m.getGridId()).distinct().collect(Collectors.toList()); - Result> gridNamesResult = govOrgOpenFeignClient.getGridListByGridIds(gridIds); + Result> gridNamesResult = govOrgOpenFeignClient.getAllGridListByGridIds(gridIds); if (!gridNamesResult.success()){ throw new EpmetException("查询网格名字失败..."); } From afe9eea2897e6f280dd2e148c67dc7e18e10122e Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 12 Jan 2022 14:16:27 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=B8=82=E5=8C=97=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=AE=A2=E6=88=B7=E7=9B=B4=E6=8E=A5=E7=94=A8?= =?UTF-8?q?=E4=BB=96=E4=BB=AC=E7=9A=84token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/auth/InternalAuthProcessor.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java index 946c5d1907..1e4a640b6e 100644 --- a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java +++ b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java @@ -92,6 +92,11 @@ public class InternalAuthProcessor extends AuthProcessor { } logger.info("stringResult"+ JSON.toJSONString(stringResult)); } + //市北数字社区的token 直接替换下 + if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(customerId)){ + token = baseTokenDto.getToken(); + } + } } From 78896f9870e3a529a9e8f14d0181822e175ea13a Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 12 Jan 2022 14:17:48 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B8=82=E5=8C=97=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=AE=A2=E6=88=B7=E7=9B=B4=E6=8E=A5=E7=94=A8?= =?UTF-8?q?=E4=BB=96=E4=BB=AC=E7=9A=84token?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/auth/InternalAuthProcessor.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java index 1e4a640b6e..36a8c284e0 100644 --- a/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java +++ b/epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java @@ -92,17 +92,16 @@ public class InternalAuthProcessor extends AuthProcessor { } logger.info("stringResult"+ JSON.toJSONString(stringResult)); } - //市北数字社区的token 直接替换下 - if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(customerId)){ - token = baseTokenDto.getToken(); - } - } } if (baseTokenDto != null) { customerId = baseTokenDto.getCustomerId(); } + //市北数字社区的token 直接替换下 + if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(customerId)){ + token = baseTokenDto.getToken(); + } if (needAuth) { validateToken(baseTokenDto, token, expiration);