Merge branch 'dev_shibei_match' of http://git.elinkit.com.cn:7070/r/epmet-cloud into shibei_master

epmet-gateway/src/main/java/com/epmet/auth/InternalAuthProcessor.java

@@ -98,6 +98,10 @@ public class InternalAuthProcessor extends AuthProcessor {
         if (baseTokenDto != null) {
             customerId = baseTokenDto.getCustomerId();
         }
+        //市北数字社区的token 直接替换下
+        if (CustomerIdConstant.SHI_BEI_CUSTOMER_ID.equals(customerId)){
+            token = baseTokenDto.getToken();
+        }
 
         if (needAuth) {
             validateToken(baseTokenDto, token, expiration);

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;
 

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;
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java

@@ -4,8 +4,6 @@
 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;
@@ -27,20 +25,16 @@ 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.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.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 lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -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){

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 <![CDATA[>=]]> #{startDateId}

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<List<AllGridsByUserIdResultDTO>> getGridListByGridIds(List<String> gridIdList);
 
+    /**
+     * @Description  查询网格名 不限制是否同步条件 SYNC_FLAG
+     * @param gridIdList
+     * @author zxc
+     * @date 2022/1/12 9:37 上午
+     */
+    @PostMapping("/gov/org/customergrid/getallgridlistbygridids")
+    Result<List<AllGridsByUserIdResultDTO>> getAllGridListByGridIds(List<String> gridIdList);
+
     /**
      * @Description 根据网格Id查询用户数据
      * @param customerGridFormDTO

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<List<AllGridsByUserIdResultDTO>> getAllGridListByGridIds(List<String> gridIdList) {
+        return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAllGridListByGridIds", gridIdList);
+    }
+
     @Override
     public Result<CustomerGridDTO> getCustomerGridByGridId(CustomerGridFormDTO customerGridFormDTO) {
         return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getCustomerGridByGridId", customerGridFormDTO);

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<List<AllGridsByUserIdResultDTO>> getAllGridListByGridIds(@RequestBody List<String> gridIdList) {
+        return new Result<List<AllGridsByUserIdResultDTO>>().ok(customerGridService.getAllGridListByGridIds(gridIdList));
+    }
+
     /**
      * @Description  获取所属网格
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerGridDao.java

@@ -155,6 +155,14 @@ public interface CustomerGridDao extends BaseDao<CustomerGridEntity> {
      */
     List<AllGridsByUserIdResultDTO> selectGridByIds(@Param("gridIdList") List<String> gridIdList);
 
+    /**
+     * @Description  查询网格名 不限制是否同步条件 SYNC_FLAG
+     * @param gridIdList
+     * @author zxc
+     * @date 2022/1/12 9:42 上午
+     */
+    List<AllGridsByUserIdResultDTO> selectAllGridByIds(@Param("gridIdList") List<String> gridIdList);
+
     /**
      * @param formDTO
      * @Description 获取所属网格

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerGridService.java

@@ -221,6 +221,14 @@ public interface CustomerGridService extends BaseService<CustomerGridEntity> {
      */
     Result<List<AllGridsByUserIdResultDTO>> getGridListByGridIds(List<String> gridIdList);
 
+    /**
+     * @Description  查询网格名 不限制是否同步条件 SYNC_FLAG
+     * @param gridIdList
+     * @author zxc
+     * @date 2022/1/12 9:37 上午
+     */
+    List<AllGridsByUserIdResultDTO> getAllGridListByGridIds(List<String> gridIdList);
+
     /**
      * @Description  获取所属网格
      * @param formDTO

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<CustomerGridDao, Cu
         return result.ok(list);
     }
 
+    /**
+     * @Description  查询网格名 不限制是否同步条件 SYNC_FLAG
+     * @param gridIdList
+     * @author zxc
+     * @date 2022/1/12 9:37 上午
+     */
+    @Override
+    public List<AllGridsByUserIdResultDTO> getAllGridListByGridIds(List<String> gridIdList) {
+        if (CollectionUtils.isEmpty(gridIdList)) {
+            logger.warn("根据网格Id集合获取网格列表信息-传入的网格Id集合为空数组！");
+            return new ArrayList<>();
+        }
+        List<AllGridsByUserIdResultDTO> list = baseDao.selectAllGridByIds(gridIdList);
+        if (CollectionUtils.isNotEmpty(list)){
+            return list;
+        }
+        return new ArrayList<>();
+    }
+
     /**
      * @Description  获取所属网格
      * @param formDTO

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -756,6 +756,25 @@
         AND cg.id = #{gridId}
     </select>
 
+    <!-- 查询网格名 不限制是否同步条件 SYNC_FLAG -->
+    <select id="selectAllGridByIds" resultType="com.epmet.dto.result.AllGridsByUserIdResultDTO">
+        SELECT
+            cg.id AS 'gridId',
+            IF(
+            ca.ORGANIZATION_NAME = '',
+            cg.grid_name,
+            CONCAT(ca.organization_name,'-',cg.grid_name)
+            ) AS 'gridName',
+            cg.customer_id AS 'customerId'
+        FROM customer_grid cg
+        INNER JOIN customer_agency ca ON (cg.pid = ca.id AND ca.del_flag = '0')
+        WHERE cg.del_flag = '0'
+        AND cg.id IN
+        <foreach item="id" collection="gridIdList" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </select>
+
     <update id="updateSubGridAreaCode" parameterType="map">
         update customer_grid
         SET AREA_CODE = '',

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/PatrolRoutineWorkServiceImpl.java

@@ -190,7 +190,7 @@ public class PatrolRoutineWorkServiceImpl extends BaseServiceImpl<PatrolRoutineW
             throw new EpmetException("查询例行工作分类失败...");
         }
         List<String> gridIds = list.stream().map(m -> m.getGridId()).distinct().collect(Collectors.toList());
-        Result<List<AllGridsByUserIdResultDTO>> gridNamesResult = govOrgOpenFeignClient.getGridListByGridIds(gridIds);
+        Result<List<AllGridsByUserIdResultDTO>> gridNamesResult = govOrgOpenFeignClient.getAllGridListByGridIds(gridIds);
         if (!gridNamesResult.success()){
             throw new EpmetException("查询网格名字失败...");
         }