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

epmet-commons/epmet-commons-mybatis/pom.xml

@@ -13,7 +13,7 @@
     <packaging>jar</packaging>
 
     <properties>
-        <mybatisplus.version>3.2.0</mybatisplus.version>
+        <mybatisplus.version>3.4.2</mybatisplus.version>
         <druid.version>1.1.14</druid.version>
         <sqlserver.version>4.0</sqlserver.version>
         <oracle.version>11.2.0.3</oracle.version>

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/config/MybatisPlusConfig.java

@@ -8,7 +8,9 @@
 
 package com.epmet.commons.mybatis.config;
 
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import com.epmet.commons.mybatis.interceptor.DataFilterInterceptor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -37,8 +39,10 @@ public class MybatisPlusConfig {
      */
     @Bean
     @Order(0)
-    public PaginationInterceptor paginationInterceptor() {
-        return new PaginationInterceptor();
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
     }
 
 }

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/entity/BaseEpmetEntity.java

@@ -26,7 +26,7 @@ public abstract class BaseEpmetEntity implements Serializable {
     /**
      * id
      */
-    @TableId(type = IdType.UUID)
+    @TableId(type = IdType.ASSIGN_ID)
     private String id;
 
     /**

epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/service/impl/BaseServiceImpl.java

@@ -57,7 +57,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
         Page<T> page = initPage(params);
 
         //默认排序
-        if (StringUtils.isNotEmpty(defaultOrderField)) {
+        if (StringUtils.isNotBlank(defaultOrderField)) {
             if (isAsc) {
                 page.addOrder(OrderItem.asc(defaultOrderField));
             } else {
@@ -111,7 +111,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
         String order = (String) params.get(Constant.ORDER);
 
         //前端字段排序
-        if (StringUtils.isNotEmpty(orderField) && StringUtils.isNotEmpty(order)) {
+        if (StringUtils.isNotBlank(orderField) && StringUtils.isNotBlank(order)) {
             if (Constant.ASC.equalsIgnoreCase(order)) {
                 return page.addOrder(OrderItem.asc(orderField));
             } else {
@@ -135,7 +135,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
     protected Map<String, Object> paramsToLike(Map<String, Object> params, String... likes) {
         for (String like : likes) {
             String val = (String) params.get(like);
-            if (StringUtils.isNotEmpty(val)) {
+            if (StringUtils.isNotBlank(val)) {
                 params.put(like, "%" + val + "%");
             } else {
                 params.put(like, null);
@@ -294,12 +294,12 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
 
     @Override
     public boolean deleteById(Serializable id) {
-        return SqlHelper.delBool(baseDao.deleteById(id));
+        return SqlHelper.retBool(baseDao.deleteById(id));
     }
 
     @Override
     public boolean deleteBatchIds(Collection<? extends Serializable> idList) {
-        return SqlHelper.delBool(baseDao.deleteBatchIds(idList));
+        return SqlHelper.retBool(baseDao.deleteBatchIds(idList));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -311,7 +311,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
             Assert.notNull(tableInfo, "error: can not execute. because can not find cache of TableInfo for entity!");
             String keyProperty = tableInfo.getKeyProperty();
             Assert.notEmpty(keyProperty, "error: can not execute. because can not find column for id from entity!");
-            Object idVal = ReflectionKit.getMethodValue(cls, entity, tableInfo.getKeyProperty());
+            Object idVal = ReflectionKit.getFieldValue( entity, tableInfo.getKeyProperty());
             return StringUtils.checkValNull(idVal) || Objects.isNull(selectById((Serializable) idVal)) ? insert(entity) : updateById(entity);
         }
         return false;
@@ -335,7 +335,7 @@ public abstract class BaseServiceImpl<M extends BaseMapper<T>, T> implements Bas
         try (SqlSession batchSqlSession = sqlSessionBatch()) {
             int i = 0;
             for (T entity : entityList) {
-                Object idVal = ReflectionKit.getMethodValue(cls, entity, keyProperty);
+                Object idVal = ReflectionKit.getFieldValue(entity, keyProperty);
                 if (StringUtils.checkValNull(idVal) || Objects.isNull(selectById((Serializable) idVal))) {
                     batchSqlSession.insert(sqlStatement(SqlMethod.INSERT_ONE), entity);
                 } else {

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/NumConstant.java

@@ -47,6 +47,7 @@ public interface NumConstant {
     BigDecimal ONE_HUNDRED_DECIMAL = new BigDecimal(100);
     BigDecimal ZERO_DECIMAL = new BigDecimal(0);
     int ONE_THOUSAND = 1000;
+    int TEN_THOUSAND = 10000;
     int MAX = 99999999;
     int EIGHTY_EIGHT = 88;
     int EIGHTY = 80;

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/IcFormCodeEnum.java

@@ -0,0 +1,46 @@
+package com.epmet.commons.tools.enums;
+
+/**
+ * desc：数字社区平台-表单配置枚举类
+ *
+ * @author jianjun liu
+ * @date 2020-07-03 11:14
+ **/
+public enum IcFormCodeEnum {
+	/**
+	 * 表单code枚举
+	 */
+	RESI_BASE_INFO("resi_base_info", "居民信息"),
+
+	;
+
+	private String code;
+	private String name;
+
+
+
+	IcFormCodeEnum(String code, String name) {
+		this.code = code;
+		this.name = name;
+	}
+
+	public static IcFormCodeEnum getEnum(String code) {
+		IcFormCodeEnum[] values = IcFormCodeEnum.values();
+		for (IcFormCodeEnum value : values) {
+			if (value.getCode().equals(code)) {
+				return value;
+			}
+		}
+		return null;
+	}
+
+
+	public String getCode() {
+		return code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+}

epmet-module/data-aggregator/data-aggregator-client/pom.xml

@@ -20,9 +20,8 @@
         <dependency>
             <groupId>com.baomidou</groupId>
             <artifactId>mybatis-plus-annotation</artifactId>
-            <version>3.2.0</version>
-            <scope>compile</scope>
+            <version>3.4.2</version>
         </dependency>
     </dependencies>
 
-</project>
+</project>

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -177,6 +177,24 @@ public class GovOrgController {
         return new Result<OrgStaffListResultDTO>().ok(govOrgService.staffList(formDTO));
     }
 
+    /**
+     * @Param formDTO
+     * @Description 获取当前组织下的【组织添加的】工作人员 组织/部门/网格下人员列表
+     * @author sun
+     */
+    @PostMapping("currentOrgStafflist")
+    public Result<OrgStaffListResultDTO> getCurrentOrgStafflist(@LoginUser TokenDto tokenDto, @RequestBody OrgStaffListFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO, OrgStaffListFormDTO.OrgStaff.class);
+        if(!"agency".equals(formDTO.getOrgType())&&!"dept".equals(formDTO.getOrgType())&&!"grid".equals(formDTO.getOrgType())){
+            throw new RenException("参数类型错误");
+        }
+        //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        //formDTO.setStaffId("73ae6280e46a6653a5605d51d5462725");
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        formDTO.setStaffId(tokenDto.getUserId());
+        return new Result<OrgStaffListResultDTO>().ok(govOrgService.getCurrentOrgStafflist(formDTO));
+    }
+
     /**
      * @Param formDTO
      * @Description 【通讯录】人员详情v2

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/CustomerStaffDao.java

@@ -64,11 +64,11 @@ public interface CustomerStaffDao extends BaseDao<CustomerStaffEntity> {
      * @Description 分页查询工作人员基础信息、角色信息【组织人员单位领导角色人员在前；部门人员部门领导角色人员在前；网格人员网格长角色人员在前】
      * @author sun
      */
-    List<ListStaffResultDTO> selectStaffList(@Param("staffIds") LinkedList<String> staffIds);
+    List<ListStaffResultDTO> selectStaffList(@Param("staffIds") List<String> staffIds);
 
     /**
      * @Description 查询工作人员基础信息
      * @author sun
      */
     CustomerStaffDTO selectByStaffId(@Param("staffId") String staffId);
-}
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/UserBaseInfoDao.java

@@ -55,5 +55,5 @@ public interface UserBaseInfoDao extends BaseDao<UserBaseInfoEntity> {
      * @Description 查询userId的身份证号在小程序用户中存在的多个userId值
      * @author sun
      */
-    List<UserBaseInfoDTO> getUserBaseList(@Param("userId") String userId, @Param("customerId") String customerId);
+    List<UserBaseInfoDTO> getUserBaseList(@Param("customerId") String customerId, @Param("userId") String userId, @Param("idCard") String idCard);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java

@@ -176,6 +176,8 @@ public interface EpmetUserService {
      */
     List<CustomerStaffEntity> listStaffsByIds(List<String> userIdsPart);
 
+    List<ListStaffResultDTO> selectStaffList(List<String> staffIds);
+
     /**
      * 【人员类别分析】-各类别人数
      * @param formDTO

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java

@@ -35,6 +35,8 @@ import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity;
 import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import com.epmet.dataaggre.service.datastats.DataStatsService;
+import com.epmet.dataaggre.entity.epmetuser.*;
+import com.epmet.dataaggre.service.datastats.DataStatsService;
 import com.epmet.dataaggre.service.epmetuser.EpmetUserService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService;
 import com.epmet.dataaggre.service.epmetuser.StaffPatrolRecordService;
@@ -721,7 +723,13 @@ public class EpmetUserServiceImpl implements EpmetUserService {
      */
     @Override
     public List<UserBaseInfoDTO> getUserBaseList(String userId, String customerId) {
-        return userBaseInfoDao.getUserBaseList(userId, customerId);
+        List<UserBaseInfoDTO> resultList = new ArrayList<>();
+        List<UserBaseInfoDTO> list = userBaseInfoDao.getUserBaseList(customerId, userId, null);
+        if (!CollectionUtils.isEmpty(list) && StringUtils.isNotBlank(list.get(0).getIdNum())) {
+            return userBaseInfoDao.getUserBaseList(customerId, null, list.get(0).getIdNum());
+        }
+        resultList.addAll(list);
+        return resultList;
     }
 
     /**
@@ -750,6 +758,11 @@ public class EpmetUserServiceImpl implements EpmetUserService {
         return customerStaffDao.selectList(query);
     }
 
+    @Override
+    public List<ListStaffResultDTO> selectStaffList(List<String> staffIds) {
+        return customerStaffDao.selectStaffList(staffIds);
+    }
+
     /**
      * 【人员类别分析】-各类别人数
      *

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -11,7 +11,6 @@ import com.epmet.dataaggre.dto.govorg.form.SubOrgFormDTO;
 import com.epmet.dataaggre.dto.govorg.result.*;
 import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
-import com.epmet.dataaggre.entity.govorg.CustomerGridEntity;
 
 import java.util.List;
 
@@ -93,6 +92,7 @@ public interface GovOrgService {
      * @author sun
      */
     OrgStaffListResultDTO staffList(OrgStaffListFormDTO formDTO);
+    OrgStaffListResultDTO getCurrentOrgStafflist(OrgStaffListFormDTO formDTO);
 
     /**
      * @Param formDTO

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -416,6 +416,41 @@ public class GovOrgServiceImpl implements GovOrgService {
         return resultDTO;
     }
 
+    /**
+     * @Param formDTO
+     * @Description 【通讯录】组织/部门/网格下人员列表
+     * @author sun
+     */
+    @Override
+    public OrgStaffListResultDTO getCurrentOrgStafflist(OrgStaffListFormDTO formDTO) {
+        OrgStaffListResultDTO resultDTO = new OrgStaffListResultDTO();
+        //1.按类型查询组织、部门、网格下所有工作人员Id列表[需要按角色排序 所以这里不能分页]
+        List<String> staffIds = customerStaffAgencyDao.selectStaffList(formDTO.getOrgId(), formDTO.getOrgType());
+        if (org.springframework.util.CollectionUtils.isEmpty(staffIds)) {
+            return resultDTO;
+        }
+        formDTO.setStaffIds(staffIds);
+        //是否包含自己
+        if("0".equals(formDTO.getIncludeMe())){
+            staffIds.removeIf(s->s.equals(formDTO.getStaffId()));
+        }
+
+        //2.分页查询工作人员基础信息、角色信息【组织人员单位领导角色人员在前；部门人员部门领导角色人员在前；网格人员网格长角色人员在前】
+        List<ListStaffResultDTO> staffList = epmetUserService.selectStaffList(staffIds);
+
+        //3.查询工作人员注册组织关系信息
+        List<String> staffIdList = staffList.stream().map(ListStaffResultDTO::getStaffId).collect(Collectors.toList());
+        if (!CollectionUtils.isEmpty(staffIdList)){
+            List<StaffOrgNameResultDTO> list = customerAgencyDao.selelctStaffOrg(staffIdList);
+            staffList.forEach(re -> list.stream().filter(l -> re.getStaffId().equals(l.getStaffId())).forEach(s -> re.setOrgType(s.getOrgType())));
+        }
+
+        //3.封装数据并返回
+        resultDTO.setStaffCount(staffIds.size());
+        resultDTO.setStaffList((null == staffList ? new ArrayList<>() : staffList));
+        return resultDTO;
+    }
+
     /**
      * @Param formDTO
      * @Description 【通讯录】人员详情v2

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/UserBaseInfoDao.xml

@@ -41,13 +41,24 @@
 
     <select id="getUserBaseList" resultType="com.epmet.dto.UserBaseInfoDTO">
         SELECT
-            *
+            customer_id,
+            user_id,
+            mobile,
+            real_name,
+            id_num,
+            gender,
+            head_img_url
         FROM
             user_base_info
         WHERE
             del_flag = '0'
-        AND id_num = ( SELECT id_num FROM user_base_info WHERE user_id = #{userId})
         AND customer_id = #{customerId}
+        <if test='userId != "" and userId != null'>
+            AND user_id = #{userId}
+        </if>
+        <if test='idCard != "" and idCard != null'>
+            AND id_num = #{idCard}
+        </if>
     </select>
 
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -29,7 +29,6 @@
         WHERE
             p.DEL_FLAG = '0'
             AND p.CUSTOMER_ID = #{customerId}
-            AND p.ORG_ID_PATH LIKE concat('%', #{agencyId}, '%')
             <if test="projectStatus != null and projectStatus != ''">
                 AND p.`STATUS` = #{projectStatus}
             </if>

epmet-module/data-report/data-report-client/src/main/java/com/epmet/evaluationindex/screen/dto/result/OrgRankDataShibeiResultDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.evaluationindex.screen.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description 市北数字社区-组织先进排行榜 查询结果dto
+ * @ClassName OrgRankDataResultDTO
+ * @Auth wangc
+ * @Date 2020-08-21 11:16
+ */
+@Data
+public class OrgRankDataShibeiResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -7874641768141936572L;
+
+    private String orgId;
+    /**
+     * 名称    XXXX社区党委
+     * */
+    private String name;
+
+    /**
+     * 党员数
+     * */
+    private BigDecimal score;
+
+    /**
+     * 数据所属月份
+     */
+    private String monthId;
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/IndexController.java

@@ -154,6 +154,19 @@ public class IndexController {
         return new Result<List<IndexAdvanceBranchRankResultDTO>>().ok(indexService.advancedBranchRank(formDTO));
     }
 
+    /**
+     * @param formDTO
+     * @Description 数字社区：数据分析-动力网格
+     * @author sun
+     */
+    @PostMapping("advancedbranchrank-shibei")
+    Result<List<OrgRankDataShibeiResultDTO>> advancedBranchRankShibei(@RequestBody AdvancedBranchRankFormDTO formDTO, @LoginUser TokenDto loginUser){
+        ValidatorUtils.validateEntity(formDTO, AdvancedBranchRankFormDTO.AddUserInternalGroup.class);
+        formDTO.setCustomerId(loginUser.getCustomerId());
+        //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        return new Result<List<OrgRankDataShibeiResultDTO>>().ok(indexService.advancedBranchRankShibei(formDTO));
+    }
+
     /**
      * @param formDTO
      * @author yinzuomei

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/evaluationindex/screen/ScreenOrgRankDataShibeiDao.java

@@ -0,0 +1,42 @@
+/**
+ * Copyright 2018 人人开源 https://www.renren.io
+ * <p>
+ * 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.
+ * <p>
+ * 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.
+ * <p>
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package com.epmet.datareport.dao.evaluationindex.screen;
+
+import com.epmet.evaluationindex.screen.dto.form.AdvancedBranchRankFormDTO;
+import com.epmet.evaluationindex.screen.dto.result.OrgRankDataShibeiResultDTO;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+ * 党建引领-组织排行榜
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-18
+ */
+@Mapper
+public interface ScreenOrgRankDataShibeiDao {
+
+    /**
+     * @return
+     * @Description 查询指定机关的所有直属网格月度数据
+     * @author wangc
+     * @date 2020.08.21 13:58
+     **/
+    List<OrgRankDataShibeiResultDTO> selectGridRankList(AdvancedBranchRankFormDTO formDTO);
+}

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/IndexService.java

@@ -94,4 +94,14 @@ public interface IndexService {
      * @Date 2021/2/28 14:33
      **/
     List<SubAgencyIndexRankResultDTO> subAgencyIndexRankPy(SubAgencyIndexRankPyFormDTO formDTO);
+
+    /**
+     * desc: 市北数字社区特供接口 网格排行
+     *
+     * @param formDTO
+     * @return java.util.List<com.epmet.evaluationindex.screen.dto.result.IndexAdvanceBranchRankResultDTO>
+     * @author LiuJanJun
+     * @date 2022/1/14 4:57 下午
+     */
+    List<OrgRankDataShibeiResultDTO> advancedBranchRankShibei(AdvancedBranchRankFormDTO formDTO);
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -9,6 +9,7 @@ import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.DataSourceConstant;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataMonthlyDao;
 import com.epmet.datareport.dao.evaluationindex.screen.ScreenIndexDataYearlyDao;
+import com.epmet.datareport.dao.evaluationindex.screen.ScreenOrgRankDataShibeiDao;
 import com.epmet.datareport.service.evaluationindex.screen.IndexService;
 import com.epmet.evaluationindex.screen.constant.ScreenConstant;
 import com.epmet.evaluationindex.screen.dto.form.*;
@@ -43,6 +44,8 @@ public class IndexServiceImpl implements IndexService {
     @Autowired
     private ScreenIndexDataMonthlyDao screenIndexDataMonthlyDao;
     @Autowired
+    private ScreenOrgRankDataShibeiDao screenOrgRankDataShibeiDao;
+    @Autowired
     private PartyMemberLeadServiceImpl partyMemberLeadServiceImpl;
     @Autowired
     private com.epmet.datareport.utils.DateUtils dateUtils;
@@ -412,6 +415,23 @@ public class IndexServiceImpl implements IndexService {
         return list;
     }
 
+    /**
+     * @param formDTO
+     * @Description  先进排行-先进支部排行
+     * @author sun
+     * @return
+     */
+    @Override
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
+    public List<OrgRankDataShibeiResultDTO> advancedBranchRankShibei(AdvancedBranchRankFormDTO formDTO) {
+        //根据当前所选组织，查询screen_index_data_monthly中类型为网格的按照总指数倒序，关联screen_org_rank_data表取其他数据
+        //1.级联查询组织下所有网格的先进支部排行数据，按总指数降序
+        if (StringUtils.isBlank(formDTO.getMonthId())) {
+            formDTO.setMonthId(DateUtils.getBeforeNMonth(1));
+        }
+        return screenOrgRankDataShibeiDao.selectGridRankList(formDTO);
+    }
+
     @Override
     @DataSource(value = DataSourceConstant.EVALUATION_INDEX, datasourceNameFromArg = true)
     public List<PeerComparisonResultDTO> getSubSingleIndexRank(SubSingleIndexRankFormDTO formDTO) {

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenOrgRankDataShibeiDao.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="com.epmet.datareport.dao.evaluationindex.screen.ScreenOrgRankDataShibeiDao">
+
+    <!-- 查询指定机关的直属网格月度数据 -->
+    <select id="selectGridRankList" resultType="com.epmet.evaluationindex.screen.dto.result.OrgRankDataShibeiResultDTO">
+        SELECT
+            rankData.ORG_NAME AS NAME,
+            round(rankData.SCORE,1) score,
+            rankData.ORG_ID as orgId,
+            rankData.MONTH_ID
+        FROM
+            screen_org_rank_data_shibei rankData
+        LEFT JOIN screen_customer_agency agency
+        ON rankData.PARENT_ID = agency.AGENCY_ID AND agency.DEL_FLAG = 0
+        WHERE
+            rankData.DEL_FLAG = '0'
+            AND rankData.ORG_TYPE = 'grid'
+            AND rankData.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
+            AND rankData.MONTH_ID = #{monthId}
+            AND rankData.CUSTOMER_ID = #{customerId}
+            ORDER BY
+            rankData.SCORE DESC
+            LIMIT #{topNum}
+    </select>
+
+
+</mapper>

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/DataStatisticalOpenFeignClient.java

@@ -20,6 +20,7 @@ import com.epmet.dto.user.result.MidPatrolDetailResult;
 import com.epmet.dto.user.result.MidPatrolRecordResult;
 import com.epmet.feign.impl.DataStatisticalOpenFeignClientFallBackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -351,6 +352,17 @@ public interface DataStatisticalOpenFeignClient {
     @PostMapping("/data/stats/demand/volunteer/daily")
     Result statsVolunteerDemandServicesDaily(@RequestParam(value = "customer-id", required = false) String customerId);
 
+    /**
+     * desc: 市北私有化部署需要 支持的任务之一
+     *
+     * @param formDTO
+     * @return com.epmet.commons.tools.utils.Result
+     * @author LiuJanJun
+     * @date 2022/1/18 4:37 下午
+     */
+    @PostMapping("/data/stats/shibeiICJob/userPointAndProjectStatus/{bizType}")
+    Result userPointAndProjectStatus(@PathVariable("bizType") String biztype,@RequestBody ExtractOriginFormDTO formDTO);
+
     @PostMapping("/data/stats/ic/user/category-analysis-daily")
     Result statUserCategoryDaily(@RequestBody IcUserCategoryAnalysisDailyFormDTO formDTO);
 }

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/feign/impl/DataStatisticalOpenFeignClientFallBack.java

@@ -337,6 +337,11 @@ public class DataStatisticalOpenFeignClientFallBack implements DataStatisticalOp
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statsVolunteerDemandServicesDaily", customerId);
     }
 
+    @Override
+    public Result userPointAndProjectStatus(String biztype,ExtractOriginFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "userPointAndProjectStatus", biztype,formDTO);
+    }
+
     @Override
     public Result statUserCategoryDaily(IcUserCategoryAnalysisDailyFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.DATA_STATISTICAL_SERVER, "statUserCategoryDaily", formDTO);

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/controller/ShiBeiICJobController.java

@@ -0,0 +1,106 @@
+package com.epmet.controller;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.redis.RedisKeys;
+import com.epmet.commons.tools.redis.RedisUtils;
+import com.epmet.commons.tools.utils.DateUtils;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.StatsFormDTO;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.dto.screen.form.ScreenCentralZoneDataFormDTO;
+import com.epmet.service.StatsProjectService;
+import com.epmet.service.evaluationindex.extract.toscreen.ScreenGrassrootsGovernDataAbsorptionService;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+/**
+ * desc：市北数字社区 单独部署 job入口 【用户积分排名及项目状态数据】
+ */
+@RequestMapping("shibeiICJob")
+@RestController
+@Slf4j
+public class ShiBeiICJobController {
+    @Autowired
+    private ScreenGrassrootsGovernDataAbsorptionService screenGrassrootsGovernDataAbsorptionService;
+    @Autowired
+    private StatsProjectService statsProjectService;
+    @Autowired
+    private RedisUtils redisUtils;
+
+    @PostMapping("userPointAndProjectStatus/{bizType}")
+    public Result<String> userPointAndProjectStatus(@PathVariable("bizType") String bizType, @RequestBody ExtractOriginFormDTO formDTO) {
+        if (StringUtils.isBlank(formDTO.getCustomerId())){
+            return new Result<String>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误cid不能为空");
+        }
+        long start = System.currentTimeMillis();
+        Set<String> result = new LinkedHashSet<>();
+        if (StringUtils.isNotBlank(formDTO.getStartDate()) && StringUtils.isNotBlank(formDTO.getEndDate())) {
+            List<String> daysBetween = DateUtils.getDaysBetween(formDTO.getStartDate(), formDTO.getEndDate());
+            daysBetween.forEach(d -> {
+                executeMethod(bizType, formDTO.getCustomerId(), d);
+                result.add(d);
+                redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus-"+bizType), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
+            });
+        } else {
+            if (StringUtils.isBlank(formDTO.getDateId())){
+                formDTO.setDateId(DateUtils.getBeforeNDay(NumConstant.ONE));
+            }
+            executeMethod(bizType, formDTO.getCustomerId(), formDTO.getDateId());
+            result.add(formDTO.getDateId());
+            redisUtils.hSet(RedisKeys.getBackDoorbizExcuteResult("userPointAndProjectStatus-"+bizType), formDTO.getCustomerId(), result, 3 * 24 * 60 * 60L);
+        }
+        long end = System.currentTimeMillis();
+        long l = (end - start) / 1000;
+        return new Result<String>().ok("userPointAndProjectStatus耗时-"+bizType + l + "s");
+    }
+
+    private void executeMethod(String bizType, String customerId, String d) {
+        if (bizType.equals(BizTypeEnum.USER.getType())){
+            this.extractUserPointData(customerId, d);
+        }
+        if (bizType.equals(BizTypeEnum.PROJECT.getType())) {
+            this.agencyProjectStats(customerId, d);
+        }
+    }
+
+    /**
+     * @Author sun
+     * @Description 数据-项目-机关日(月)统计
+     **/
+    private void agencyProjectStats(String customerId, String dateId) {
+        try {
+            if (StringUtils.isNotBlank(dateId)) {
+                dateId = DateUtils.format(DateUtils.parseDate(dateId, DateUtils.DATE_PATTERN_YYYYMMDD));
+            }
+            StatsFormDTO formDTO = new StatsFormDTO();
+            formDTO.setCustomerId(customerId);
+            formDTO.setDate(dateId);
+
+            statsProjectService.agencyProjectStats(formDTO);
+        } catch (Exception e) {
+            log.error("市北-项目状态数据写入失败，参数为：{}" + customerId + StrConstant.HYPHEN + dateId, e);
+        }
+        new Result();
+    }
+
+    private void extractUserPointData(String customerId, String dateId) {
+        try {
+            //基层治理 - 热心市民 screen_party_user_rank_data
+            ScreenCentralZoneDataFormDTO param = new ScreenCentralZoneDataFormDTO();
+            param.setCustomerId(customerId);
+            param.setDateId(dateId);
+            screenGrassrootsGovernDataAbsorptionService.userScoreDataHub(param);
+        } catch (Exception e) {
+            log.error("市北-热心市民/党员得分数据写入失败，参数为：{}" + customerId + StrConstant.HYPHEN + dateId, e);
+        }
+    }
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/crm/CustomerEntity.java

@@ -17,9 +17,10 @@
 
 package com.epmet.entity.crm;
 
+import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -27,7 +28,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 客户表 
+ * 客户表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-11
@@ -39,6 +40,11 @@ public class CustomerEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_UUID)
+	private String id;
     /**
      * 客户名称
      */

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenPartyUserRankDataServiceImpl.java

@@ -25,6 +25,7 @@ import com.epmet.constant.DataSourceConstant;
 import com.epmet.dao.evaluationindex.screen.ScreenPartyUserRankDataDao;
 import com.epmet.entity.evaluationindex.screen.ScreenPartyUserRankDataEntity;
 import com.epmet.service.evaluationindex.screen.ScreenPartyUserRankDataService;
+import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -61,7 +62,7 @@ public class ScreenPartyUserRankDataServiceImpl extends BaseServiceImpl<ScreenPa
             do {
                 affectedRows = baseDao.deletePartyUserRankData(customerId);
             } while (affectedRows > NumConstant.ZERO);
-            baseDao.insertBatch(dataList);
+            ListUtils.partition(dataList,NumConstant.ONE_THOUSAND).forEach(part->baseDao.insertBatch(part));
         }
     }
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsGroupServiceImpl.java

@@ -135,15 +135,10 @@ public class StatsGroupServiceImpl implements StatsGroupService {
             if (customerIds.size() != NumConstant.ZERO) {
                 DimIdGenerator.DimIdBean dimIdBean = this.getDimIdBean(formDTO);
                 customerIds.forEach(customerId -> {
-                    Boolean status = true;
                     try {
                         List<DimAgencyDTO> customerAgencyInfos = dimAgencyService.getAgencyInfoByCustomerId(customerId);
-                        List<List<DimAgencyDTO>> partition = ListUtils.partition(customerAgencyInfos, NumConstant.ONE_HUNDRED);
-                        for (List<DimAgencyDTO> p : partition) {
-                            List<AgencyGroupDailyResultDTO> agencyGroupDaily = this.getAgencyGroupDaily(p, dimIdBean, customerId);
-                            factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily, customerId,status);
-                            status = false;
-                        }
+                        List<AgencyGroupDailyResultDTO> agencyGroupDaily = this.getAgencyGroupDaily(customerAgencyInfos, dimIdBean, customerId);
+                        factGroupAgencyDailyService.insertGroupAgencyDaily(agencyGroupDaily, customerId);
                     } catch (Exception e) {
                         log.error(String.format(GroupConstant.STATS_FAILED_AGENCY_DAILY, customerId, LocalDate.now(), e));
                     }
@@ -180,7 +175,7 @@ public class StatsGroupServiceImpl implements StatsGroupService {
     }
 
     /**
-     * @param customerAgencyInfos
+     * @param agencyList
      * @param timeDim
      * @param customerId
      * @Description 网格小组 【机关-日】 数据统计处理

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsProjectServiceImpl.java

@@ -1,6 +1,5 @@
 package com.epmet.service.impl;
 
-import cn.hutool.core.collection.CollectionUtil;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.utils.DateUtils;
 import com.epmet.constant.ProjectConstant;
@@ -80,8 +79,8 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         if (null != formDTO && StringUtils.isNotBlank(formDTO.getCustomerId())) {
             customerAgencyStats(formDTO.getCustomerId(), date);
         } else {
-            int pageNo = 1;
-            int pageSize = 100;
+            int pageNo = NumConstant.ONE;
+            int pageSize = NumConstant.ONE_HUNDRED;
             List<String> customerIdList = null;
             do {
                 customerIdList = dimCustomerService.selectCustomerIdPage(pageNo++, pageSize);
@@ -185,10 +184,10 @@ public class StatsProjectServiceImpl implements StatsProjectService {
         projectEntity.setCustomerId(customerId);
         projectEntity.setCreatedTime(date);
         projectEntity.setStatus(ProjectConstant.CLOSED);
-        projectEntity.setPageSize(NumConstant.ONE_THOUSAND);
+        projectEntity.setPageSize(NumConstant.TEN_THOUSAND);
         int pageNo = NumConstant.ONE;
-        int size = NumConstant.ZERO;
-        List<ProjectProcessEntity> processList = new ArrayList<>();
+        int size;
+        List<ProjectProcessEntity> processList = null;
         do {
             //1.一千条一循环查询节点数据，封装每个组织对应数据
             projectEntity.setPageNo(pageNo);
@@ -278,7 +277,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 }
                 mapList.put(agency.getId(), entity);
             }
-        } while (size == NumConstant.ONE_THOUSAND);
+        } while (size == projectEntity.getPageSize());
 
         //二、再分页查询项目表数据，封装每个组织的已结案已解决总数、已结案未解决总数;日增量中已结案已解决总数、已结案未解决总数
         int num = NumConstant.ONE;
@@ -374,7 +373,7 @@ public class StatsProjectServiceImpl implements StatsProjectService {
                 }
                 mapList.put(agency.getId(), entity);
             }
-        } while (size == NumConstant.ONE_THOUSAND);
+        } while (size == projectEntity.getPageSize());
 
         List<FactAgencyProjectDailyEntity> projectDateEntityList = new ArrayList<>(mapList.values());
         //三、批量保存数据，先删后增

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/org/impl/CustomerGridServiceImpl.java

@@ -81,6 +81,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
      * @param gridId
      * @return
      */
+    @Override
     public GridInfoDTO queryGridInfoDTO(String gridId){
         return baseDao.selectGridInfo(gridId);
     }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/FactGroupAgencyDailyService.java

@@ -101,7 +101,7 @@ public interface FactGroupAgencyDailyService extends BaseService<FactGroupAgency
      * @param agencyList
      * @author zxc
      */
-    void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId,Boolean status);
+    void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId);
 
     /**
      * @param

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/stats/impl/FactGroupAgencyDailyServiceImpl.java

@@ -113,15 +113,12 @@ public class FactGroupAgencyDailyServiceImpl extends BaseServiceImpl<FactGroupAg
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId,Boolean status) {
+    public void insertGroupAgencyDaily(List<AgencyGroupDailyResultDTO> agencyList,String customerId) {
         if (!CollectionUtils.isEmpty(agencyList)){
-            // true 为当前客户第一回进入,需要删除历史数据
-            if (status){
-                Integer delNum;
-                do {
-                    delNum = baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
-                }while (delNum > NumConstant.ZERO && delNum == NumConstant.ONE_THOUSAND);
-            }
+            Integer delNum;
+            do {
+                delNum = baseDao.deleteInsertAgencyDailyByDateId(agencyList.get(NumConstant.ZERO).getDateId(),customerId);
+            }while (delNum > NumConstant.ZERO && delNum == NumConstant.ONE_THOUSAND);
             List<List<AgencyGroupDailyResultDTO>> partition = ListUtils.partition(agencyList, NumConstant.ONE_HUNDRED);
             partition.forEach(p -> {
                 baseDao.insertGroupAgencyDaily(p);

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceItemDictDao.java

@@ -34,4 +34,6 @@ import java.util.List;
 public interface IcServiceItemDictDao extends BaseDao<IcServiceItemDictEntity> {
 
     List<ServiceItemResultDTO> pageList(String customerId);
+
+    IcServiceItemDictEntity selectMax(String customerId);
 }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcResiDemandDictServiceImpl.java

@@ -81,6 +81,7 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void addFirstCategory(AddFirstCategoryFormDTO formDTO) {
+        formDTO.setCategoryName(formDTO.getCategoryName().trim());
         if (checkCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), NumConstant.ONE, NumConstant.ZERO_STR,null) > NumConstant.ZERO) {
             // 名称唯一
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("【%s】已存在", formDTO.getCategoryName()), "分类名称已存在");
@@ -105,6 +106,7 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void addChild(AddCategoryFormDTO formDTO) {
+        formDTO.setCategoryName(formDTO.getCategoryName().trim());
         if(NumConstant.ZERO_STR.equals(formDTO.getParentCategoryCode())){
             throw new RenException("添加一级分类，调用接口/heart/icresidemanddict/addfirst");
         }
@@ -160,8 +162,9 @@ public class IcResiDemandDictServiceImpl extends BaseServiceImpl<IcResiDemandDic
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(UpdateFormDTO formDTO) {
+        formDTO.setCategoryName(formDTO.getCategoryName().trim());
         IcResiDemandDictEntity origin = baseDao.selectById(formDTO.getCategoryId());
-        if (checkCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), NumConstant.TWO, origin.getParentCode(), formDTO.getCategoryId()) > NumConstant.ZERO) {
+        if (checkCategoryName(formDTO.getCustomerId(), formDTO.getCategoryName(), formDTO.getLevel(), origin.getParentCode(), formDTO.getCategoryId()) > NumConstant.ZERO) {
             // 名称唯一
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), String.format("【%s】已存在", formDTO.getCategoryName()), "分类名称已存在");
         }

epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceItemDictServiceImpl.java

@@ -74,6 +74,7 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void addOrUpdate(ServiceItemAddFormDTO formDTO) {
+        formDTO.setCategoryName(formDTO.getCategoryName().trim());
         //分类名称是否唯一
         LambdaQueryWrapper<IcServiceItemDictEntity> nameQuery = new LambdaQueryWrapper<>();
         nameQuery.eq(IcServiceItemDictEntity::getCustomerId, formDTO.getCustomerId())
@@ -90,10 +91,8 @@ public class IcServiceItemDictServiceImpl extends BaseServiceImpl<IcServiceItemD
             baseDao.update(null, update);
             return;
         }
-        LambdaQueryWrapper<IcServiceItemDictEntity> maxQuery = new LambdaQueryWrapper<>();
-        maxQuery.eq(IcServiceItemDictEntity::getCustomerId, formDTO.getCustomerId())
-                .orderByDesc(IcServiceItemDictEntity::getCategoryCode).last("limit 1");
-        IcServiceItemDictEntity max = baseDao.selectOne(maxQuery);
+        //如果说当前查询的编码是1022，但是库里面1023已经存在且del_flag='0'。这个时候新增的编码为1023就会报错。
+        IcServiceItemDictEntity max = baseDao.selectMax(formDTO.getCustomerId());
         // 获取编码
         IcServiceItemDictEntity insert = new IcServiceItemDictEntity();
         insert.setCustomerId(formDTO.getCustomerId());

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.10__update_service_item.sql

@@ -0,0 +1,49 @@
+-- 服务事项从需求分类字典表中抽离出来了，对应历史数据修改如下
+-- 1、联建单位的服务事项置空
+update ic_party_unit set SERVICE_MATTER ='';
+-- 2、联建活动的服务事项修改为新的编码
+update ic_party_activity set SERVICE_MATTER='1006' where SERVICE_MATTER = '10100006';
+update ic_party_activity set SERVICE_MATTER='1008' where SERVICE_MATTER = '10100008';
+update ic_party_activity set SERVICE_MATTER='1002' where SERVICE_MATTER = '10100002';
+update ic_party_activity set SERVICE_MATTER='1009' where SERVICE_MATTER = '10100009';
+update ic_party_activity set SERVICE_MATTER='1017' where SERVICE_MATTER = '10100017';
+update ic_party_activity set SERVICE_MATTER='1021' where SERVICE_MATTER = '10100021';
+update ic_party_activity set SERVICE_MATTER='1015' where SERVICE_MATTER = '10100015';
+update ic_party_activity set SERVICE_MATTER='1011' where SERVICE_MATTER = '10100011';
+update ic_party_activity set SERVICE_MATTER='1018' where SERVICE_MATTER = '10100018';
+update ic_party_activity set SERVICE_MATTER='1005' where SERVICE_MATTER = '10100005';
+update ic_party_activity set SERVICE_MATTER='1010' where SERVICE_MATTER = '10100010';
+update ic_party_activity set SERVICE_MATTER='1003' where SERVICE_MATTER = '10100003';
+update ic_party_activity set SERVICE_MATTER='1020' where SERVICE_MATTER = '10100020';
+update ic_party_activity set SERVICE_MATTER='1022' where SERVICE_MATTER = '10100022';
+update ic_party_activity set SERVICE_MATTER='1014' where SERVICE_MATTER = '10100014';
+update ic_party_activity set SERVICE_MATTER='1007' where SERVICE_MATTER = '10100007';
+update ic_party_activity set SERVICE_MATTER='1001' where SERVICE_MATTER = '10100001';
+update ic_party_activity set SERVICE_MATTER='1004' where SERVICE_MATTER = '10100004';
+update ic_party_activity set SERVICE_MATTER='1016' where SERVICE_MATTER = '10100016';
+update ic_party_activity set SERVICE_MATTER='1013' where SERVICE_MATTER = '10100013';
+update ic_party_activity set SERVICE_MATTER='1012' where SERVICE_MATTER = '10100012';
+update ic_party_activity set SERVICE_MATTER='1019' where SERVICE_MATTER = '10100019';
+-- 3、爱心互助-活动类型为联建活动，对应的服务事项编码改为新的
+update act_info set SERVICE_MATTER='1006' where ACT_TYPE='party' and SERVICE_MATTER='10100006' ;
+update act_info set SERVICE_MATTER='1008' where ACT_TYPE='party' and SERVICE_MATTER='10100008' ;
+update act_info set SERVICE_MATTER='1002' where ACT_TYPE='party' and SERVICE_MATTER='10100002' ;
+update act_info set SERVICE_MATTER='1009' where ACT_TYPE='party' and SERVICE_MATTER='10100009' ;
+update act_info set SERVICE_MATTER='1017' where ACT_TYPE='party' and SERVICE_MATTER='10100017' ;
+update act_info set SERVICE_MATTER='1021' where ACT_TYPE='party' and SERVICE_MATTER='10100021' ;
+update act_info set SERVICE_MATTER='1015' where ACT_TYPE='party' and SERVICE_MATTER='10100015' ;
+update act_info set SERVICE_MATTER='1011' where ACT_TYPE='party' and SERVICE_MATTER='10100011' ;
+update act_info set SERVICE_MATTER='1018' where ACT_TYPE='party' and SERVICE_MATTER='10100018' ;
+update act_info set SERVICE_MATTER='1005' where ACT_TYPE='party' and SERVICE_MATTER='10100005' ;
+update act_info set SERVICE_MATTER='1010' where ACT_TYPE='party' and SERVICE_MATTER='10100010' ;
+update act_info set SERVICE_MATTER='1003' where ACT_TYPE='party' and SERVICE_MATTER='10100003' ;
+update act_info set SERVICE_MATTER='1020' where ACT_TYPE='party' and SERVICE_MATTER='10100020' ;
+update act_info set SERVICE_MATTER='1022' where ACT_TYPE='party' and SERVICE_MATTER='10100022' ;
+update act_info set SERVICE_MATTER='1014' where ACT_TYPE='party' and SERVICE_MATTER='10100014' ;
+update act_info set SERVICE_MATTER='1007' where ACT_TYPE='party' and SERVICE_MATTER='10100007' ;
+update act_info set SERVICE_MATTER='1001' where ACT_TYPE='party' and SERVICE_MATTER='10100001' ;
+update act_info set SERVICE_MATTER='1004' where ACT_TYPE='party' and SERVICE_MATTER='10100004' ;
+update act_info set SERVICE_MATTER='1016' where ACT_TYPE='party' and SERVICE_MATTER='10100016' ;
+update act_info set SERVICE_MATTER='1013' where ACT_TYPE='party' and SERVICE_MATTER='10100013' ;
+update act_info set SERVICE_MATTER='1012' where ACT_TYPE='party' and SERVICE_MATTER='10100012' ;
+update act_info set SERVICE_MATTER='1019' where ACT_TYPE='party' and SERVICE_MATTER='10100019' ;

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcResiDemandDictDao.xml

@@ -192,9 +192,7 @@
             CONVERT ( m.CATEGORY_CODE, UNSIGNED )) AS maxFirstCategoryCode
         FROM
             ic_resi_demand_dict m
-        WHERE
-            m.DEL_FLAG = '0'
-            AND m.CUSTOMER_ID = #{customerId}
+        WHERE m.CUSTOMER_ID = #{customerId}
             AND m.`LEVEL` = #{level}
             and m.parent_code=#{parentCode}
     </select>

epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceItemDictDao.xml

@@ -18,4 +18,17 @@
             d.SORT DESC
     </select>
 
+    <select id="selectMax" parameterType="java.lang.String" resultType="com.epmet.entity.IcServiceItemDictEntity">
+        SELECT
+            d.ID,
+            d.CATEGORY_CODE,
+            d.SORT
+        FROM
+            ic_service_item_dict d
+        WHERE
+            d.DEL_FLAG = '0'
+            AND d.CUSTOMER_ID = #{customerId}
+            order by CATEGORY_CODE desc
+            limit 1
+    </select>
 </mapper>

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcPrivateDeploySupportProjectTask.java

@@ -0,0 +1,33 @@
+package com.epmet.task.ic;
+
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.task.ITask;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * desc：数字社区私有化部署 任务之一还有【autoEvaluateDemandTask，statsDemandTask，dailyStatisticalVoteTask,IcPrivateDeploySupportUserPointTask】
+ */
+@Slf4j
+@Component("icPrivateDeploySupportProjectTask")
+public class IcPrivateDeploySupportProjectTask implements ITask {
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
+        }
+        Result result = dataStatisticalOpenFeignClient.userPointAndProjectStatus(BizTypeEnum.PROJECT.getType(), formDTO);
+        log.info("icPrivateDeploySupportProjectTask excute end，param:{},result:{}",params,result);
+    }
+}

epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/ic/IcPrivateDeploySupportUserPointTask.java

@@ -0,0 +1,33 @@
+package com.epmet.task.ic;
+
+
+import com.alibaba.fastjson.JSON;
+import com.epmet.commons.tools.enums.BizTypeEnum;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.extract.form.ExtractOriginFormDTO;
+import com.epmet.feign.DataStatisticalOpenFeignClient;
+import com.epmet.task.ITask;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * desc：数字社区私有化部署 任务之一还有【autoEvaluateDemandTask，statsDemandTask，dailyStatisticalVoteTask,icPrivateDeploySupportProjectTask】
+ */
+@Slf4j
+@Component("icPrivateDeploySupportUserPointTask")
+public class IcPrivateDeploySupportUserPointTask implements ITask {
+    @Autowired
+    private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient;
+
+    @Override
+    public void run(String params) {
+        ExtractOriginFormDTO formDTO = new ExtractOriginFormDTO();
+        if (StringUtils.isNotBlank(params)) {
+            formDTO = JSON.parseObject(params, ExtractOriginFormDTO.class);
+        }
+        Result result = dataStatisticalOpenFeignClient.userPointAndProjectStatus(BizTypeEnum.USER.getType(), formDTO);
+        log.info("icPrivateDeploySupportUserPointTask excute end，param:{},result:{}",params,result);
+    }
+}

epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/dto/result/DailyStatisticalVoteJobResultDTO.java

@@ -17,6 +17,7 @@ public class DailyStatisticalVoteJobResultDTO implements Serializable {
     private static final long serialVersionUID = 5266996778036448163L;
 
     private String issueId;
+    private String customerId;
 
     /**
      * 统计日期

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueVoteStatisticalDailyServiceImpl.java

@@ -390,7 +390,7 @@ public class IssueVoteStatisticalDailyServiceImpl extends BaseServiceImpl<IssueV
         Integer delNum;
         do {
             delNum = baseDao.delHistoryData(customerId, dateId);
-        } while (delNum != null && delNum > NumConstant.ZERO);
+        } while (delNum > NumConstant.ZERO);
         List<List<IssueVoteStatisticalDailyEntity>> partition = ListUtils.partition(needInsert, NumConstant.ONE_HUNDRED);
         partition.forEach(p -> {
             baseDao.insertBatch(p);

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteDetailDao.xml

@@ -195,6 +195,7 @@
                t.* FROM
         (SELECT
             vd.ISSUE_ID,
+            vd.CUSTOMER_ID AS customerId,
             COUNT(CASE WHEN vd.ATTITUDE = 'opposition' THEN 1 END) AS oppositionCount,
             COUNT(CASE WHEN vd.ATTITUDE = 'opposition' THEN 1 END) AS oppositionIncrement,
             COUNT(CASE WHEN vd.ATTITUDE = 'support' THEN 1 END) AS supportCount,

epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueVoteStatisticalDailyDao.xml

@@ -147,7 +147,7 @@
 
                     votable_count,
 
-
+                    customer_id,
 
                     created_by,
 
@@ -180,7 +180,7 @@
 
                     #{item.votableCount},
 
-
+                    #{item.customerId},
 
                     #{item.createdBy},
 

epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ResiEventDao.xml

@@ -242,6 +242,7 @@
         <foreach item="epmetUserId" collection="epmetUserIdList" open="AND (" separator="or" close=")" index="">
             re.REPORT_USER_ID = #{epmetUserId}
         </foreach>
+        order by re.CREATED_TIME desc
     </select>
 
     <resultMap id="resiEventListResultMap" type="com.epmet.dto.result.ResiEventListResultDTO">

epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml

@@ -112,11 +112,6 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
-  threadpool:
-    default:
-      coreSize: 10
-      maxQueueSize: 500
-      queueSizeRejectionThreshold: 500
 
 ribbon:
   ReadTimeout: 300000

epmet-module/oper-crm/oper-crm-server/src/main/java/com/epmet/entity/CustomerEntity.java

@@ -17,8 +17,9 @@
 
 package com.epmet.entity;
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -26,7 +27,7 @@ import lombok.EqualsAndHashCode;
 import java.util.Date;
 
 /**
- * 客户表 
+ * 客户表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-11
@@ -38,6 +39,12 @@ public class CustomerEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * id
+	 */
+	@TableId(type = IdType.ASSIGN_UUID)
+	private String id;
+
     /**
      * 客户名称
      */

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java

@@ -16,6 +16,9 @@ public class CustomerFormQueryDTO implements Serializable {
     // 获取表单相关信息
     public interface GetFormInfoGroup {}
 
+    /**
+     * @see com.epmet.commons.tools.enums.IcFormCodeEnum
+     */
     @NotBlank(message = "formCode不能为空,居民信息默认传:resi_base_info",groups = { AddUserInternalGroup.class, GetFormInfoGroup.class} )
     private String formCode;
 

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryAllListResultDTO.java

@@ -0,0 +1,43 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/1/17 10:52 上午
+ * @DESC
+ */
+@Data
+public class IndividualCategoryAllListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = -3294223041221531203L;
+
+    /**
+     * 标签
+     */
+    private String label;
+
+    /**
+     * 图片
+     */
+    private String managementIcon;
+
+    /**
+     * 字段名
+     */
+    private String columnName;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    private String id;
+
+    /**
+     * 是否选中 true：是；false：否
+     */
+    private boolean isSelected = false;
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IndividualCategoryListResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -35,4 +36,6 @@ public class IndividualCategoryListResultDTO implements Serializable {
     private Integer sort;
 
     private String id;
+
+    private Integer count = NumConstant.ZERO;
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcIndividualCategoryManageController.java

@@ -10,6 +10,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.dto.IcIndividualCategoryManageDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
 import com.epmet.dto.form.PackageEditIndividualCategoryFormDTO;
+import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.service.IcIndividualCategoryManageService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,4 +57,15 @@ public class IcIndividualCategoryManageController {
         return new Result();
     }
 
+    /**
+     * @Description  查询客户下人员分类，并且赋值本人选中的
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/20 10:44 上午
+     */
+    @PostMapping("individualcategoryalllist")
+    public Result<List<IndividualCategoryAllListResultDTO>> individualCategoryAllList(@LoginUser TokenDto tokenDto){
+        return new Result<List<IndividualCategoryAllListResultDTO>>().ok(icIndividualCategoryManageService.individualCategoryAllList(tokenDto));
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/entity/IcFormQueryBuilderEntity.java

@@ -47,6 +47,8 @@ public class IcFormQueryBuilderEntity extends BaseEpmetEntity {
 
     /**
      * ic_form.form_code，举例：resi_base_info
+	 * @see com.epmet.commons.tools.enums.IcFormCodeEnum
+	 *
      */
 	private String formCode;
 

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcIndividualCategoryManageService.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.dto.IcIndividualCategoryManageDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
+import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
 
@@ -36,4 +37,12 @@ public interface IcIndividualCategoryManageService extends BaseService<IcIndivid
      */
     void editIndividualCategory(List<EditIndividualCategoryFormDTO> formDTOS, TokenDto tokenDto);
 
+    /**
+     * @Description  查询客户下人员分类，并且赋值本人选中的
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/20 10:44 上午
+     */
+    List<IndividualCategoryAllListResultDTO> individualCategoryAllList(TokenDto tokenDto);
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcIndividualCategoryManageServiceImpl.java

@@ -1,14 +1,27 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
+import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
+import com.epmet.commons.tools.redis.common.CustomerStaffRedis;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.commons.tools.utils.Result;
 import com.epmet.dao.IcIndividualCategoryManageDao;
+import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.form.EditIndividualCategoryFormDTO;
+import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
+import com.epmet.dto.form.StatsResiListFormDTO;
+import com.epmet.dto.result.IcStatsResiResultDTO;
+import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
+import com.epmet.dto.result.IndividualCategoryAllListResultDTO;
 import com.epmet.dto.result.IndividualCategoryListResultDTO;
 import com.epmet.entity.IcIndividualCategoryManageEntity;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.IcIndividualCategoryManageService;
 import org.apache.commons.collections4.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -24,6 +37,11 @@ import java.util.List;
 @Service
 public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcIndividualCategoryManageDao, IcIndividualCategoryManageEntity> implements IcIndividualCategoryManageService {
 
+    @Autowired
+    private OperCustomizeOpenFeignClient operCustomizeOpenFeignClient;
+    @Autowired
+    private EpmetUserOpenFeignClient userOpenFeignClient;
+
     /**
      * @Description 【人员分类管理】查询个人分类列表
      * @param tokenDto
@@ -32,10 +50,30 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
      */
     @Override
     public List<IndividualCategoryListResultDTO> individualCategoryList(TokenDto tokenDto) {
+        CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId());
+        if (null == staffInfo){
+            throw new EpmetException(String.format("查询工作人员%s信息失败...",tokenDto.getUserId()));
+        }
+        StatsResiListFormDTO formDTO = new StatsResiListFormDTO();
+        formDTO.setId(staffInfo.getAgencyId());
+        formDTO.setLevel("agency");
+        formDTO.setCustomerId(tokenDto.getCustomerId());
+        Result<List<IcStatsResiResultDTO>> list = userOpenFeignClient.getPersonCategoryList(formDTO);
+        if (!list.success()){
+            throw new EpmetException("查询人员分类下人数失败...");
+        }
+        List<IcStatsResiResultDTO> datas = list.getData();
         List<IndividualCategoryListResultDTO> result = baseDao.individualCategoryList(tokenDto.getUserId());
-        if (CollectionUtils.isNotEmpty(result)){
+        if (CollectionUtils.isNotEmpty(datas) && CollectionUtils.isNotEmpty(result)){
+            result.forEach( r -> datas.stream().filter( d -> d.getId().equals(r.getId())).forEach(d -> r.setCount(d.getCount())));
+            return result;
+        }
+        if (CollectionUtils.isEmpty(datas) && CollectionUtils.isNotEmpty(result)){
             return result;
         }
+        if (CollectionUtils.isEmpty(result)){
+            return new ArrayList<>();
+        }
         return new ArrayList<>();
     }
 
@@ -59,4 +97,28 @@ public class IcIndividualCategoryManageServiceImpl extends BaseServiceImpl<IcInd
             insertBatch(entities);
         }
     }
+
+    /**
+     * @Description  查询客户下人员分类，并且赋值本人选中的
+     * @param tokenDto
+     * @author zxc
+     * @date 2022/1/20 10:44 上午
+     */
+    @Override
+    public List<IndividualCategoryAllListResultDTO> individualCategoryAllList(TokenDto tokenDto) {
+        IcResiCategoryStatsConfigFormDTO formDTO = new IcResiCategoryStatsConfigFormDTO();
+        Result<List<IcResiCategoryStatsConfigDTO>> listResult = operCustomizeOpenFeignClient.resiCategoryStatsListShowd(formDTO);
+        if (!listResult.success()){
+            throw new EpmetException("查询客户下的人员类别失败...");
+        }
+        if (CollectionUtils.isEmpty(listResult.getData())){
+            return new ArrayList<>();
+        }
+        List<IndividualCategoryAllListResultDTO> result = ConvertUtils.sourceToTarget(listResult.getData(), IndividualCategoryAllListResultDTO.class);
+        List<IndividualCategoryListResultDTO> configs = baseDao.individualCategoryList(tokenDto.getUserId());
+        if (CollectionUtils.isNotEmpty(configs)){
+            result.forEach(r -> configs.stream().filter(c -> c.getColumnName().equals(r.getColumnName())).forEach(c -> r.setSelected(true)));
+        }
+        return result;
+    }
 }

epmet-module/resi-hall/resi-hall-server/src/main/resources/bootstrap.yml

@@ -69,6 +69,10 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+      #      hystric最大线程个数,默认10，改为20
+      maximumSize: 20
 
 ribbon:
   ReadTimeout: 300000

epmet-module/resi-home/resi-home-server/src/main/resources/bootstrap.yml

@@ -68,6 +68,10 @@ hystrix:
         isolation:
           thread:
             timeoutInMilliseconds: 60000 #缺省为1000
+  threadpool:
+    default:
+#      hystric最大线程个数,默认10，改为20
+      maximumSize: 20
 
 ribbon:
   ReadTimeout: 300000

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DelIcResiUserFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -21,6 +22,6 @@ public class DelIcResiUserFormDTO implements Serializable {
     private String icResiUserId;
     @NotBlank(message = "token获取的customerId不能为空", groups = IdGroup.class)
     private String customerId;
-    private String formCode="resi_base_info";
+    private String formCode= IcFormCodeEnum.RESI_BASE_INFO.getCode();
 }
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DynamicQueryFormDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.dto.form;
 
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -14,7 +15,7 @@ import java.util.List;
 @Data
 public class DynamicQueryFormDTO implements Serializable {
     private String customerId;
-    private String formCode="resi_base_info";
+    private String formCode= IcFormCodeEnum.RESI_BASE_INFO.getCode();
     @NotBlank(message = "resultTableName不能为空")
     private String resultTableName;
     private List<ResiUserQueryValueDTO> conditions;

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/StatsResiListFormDTO.java

@@ -43,4 +43,6 @@ public class StatsResiListFormDTO implements Serializable {
     @NotBlank(message = "level不能为空")
     private String level;
 
+    private String customerId;
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@@ -1,6 +1,7 @@
 package com.epmet.feign;
 
 
+import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
 import com.epmet.commons.tools.security.dto.TokenDto;
@@ -24,8 +25,8 @@ import java.util.Set;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:09
  */
-// @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
+ @FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087")
+//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class)
 public interface EpmetUserOpenFeignClient {
 
     /**
@@ -708,4 +709,7 @@ public interface EpmetUserOpenFeignClient {
     @PostMapping("/epmetuser/userbaseinfo/resirelationinfo")
     Result<RegisterRelationDTO> resiRelationInfo(@RequestParam("userId")String userId);
 
+    @PostMapping("/epmetuser/statsresiwarn/list2")
+    Result<List<IcStatsResiResultDTO>> getPersonCategoryList(@RequestBody StatsResiListFormDTO formDTO);
+
 }

epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@@ -522,4 +522,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<RegisterRelationDTO> resiRelationInfo(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "resiRelationInfo", userId);
     }
+
+    @Override
+    public Result<List<IcStatsResiResultDTO>> getPersonCategoryList(StatsResiListFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getPersonCategoryList", formDTO);
+    }
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@@ -28,6 +28,7 @@ import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
 import com.epmet.commons.tools.dto.result.OptionDataResultDTO;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.ExceptionUtils;
@@ -91,9 +92,6 @@ import java.util.stream.Collectors;
 @RequestMapping("icresiuser")
 public class IcResiUserController {
 
-    //todo 枚举吧
-    private static final String IC_RESI_FORM_CODE = "resi_base_info";
-
     /**
      * 居民上传临时目录
      */
@@ -312,7 +310,7 @@ public class IcResiUserController {
             Set<String> stopSearchSet = new HashSet<>();
 
             //获取表单项
-            List<FormItemResult> resiFormAllItems = icResiUserService.listFormItems(customerId, IC_RESI_FORM_CODE);
+            List<FormItemResult> resiFormAllItems = icResiUserService.listFormItems(customerId, IcFormCodeEnum.RESI_BASE_INFO.getCode());
             Map<String, FormItemResult> allItemMap = resiFormAllItems.stream().collect(Collectors.toMap(FormItemResult::getItemId, o -> o));
             Map<String, ExportResiUserItemDTO> map = new HashMap<>();
             allItemMap.values().forEach(item->{
@@ -345,7 +343,7 @@ public class IcResiUserController {
                     .collect(Collectors.toList());
             List<Map<String, Object>> resiResultList = null;
 
-            pageFormDTO.setPageSize(NumConstant.FIVE_HUNDRED);
+            pageFormDTO.setPageSize(NumConstant.TEN_THOUSAND);
             for (IcResiUserTableEnum tableEnum : resiTableList) {
                 String tableName = tableEnum.getTableName();
                 pageFormDTO.setPageNo(NumConstant.ONE);
@@ -436,7 +434,7 @@ public class IcResiUserController {
             savePath = IC_RESI_UPLOAD_DIR.resolve(fileName);
 
             IOUtils.copy(file.getInputStream(), new FileOutputStream(savePath.toString()));
-            List<FormItemResult> formItemList = icResiUserService.listFormItems(customerId,IC_RESI_FORM_CODE);
+            List<FormItemResult> formItemList = icResiUserService.listFormItems(customerId,IcFormCodeEnum.RESI_BASE_INFO.getCode());
             icResiUserImportService.importIcResiInfoFromExcel(formItemList, savePath.toString(), response);
         } catch (IOException e) {
             String errorMsg = ExceptionUtils.getErrorStackTrace(e);
@@ -444,7 +442,9 @@ public class IcResiUserController {
             throw new RenException(EpmetErrorCode.SERVER_ERROR.getCode());
         } finally {
             try {
-                Files.delete(savePath);
+                if (savePath != null){
+                    Files.delete(savePath);
+                }
             } catch (IOException e) {
                 log.error("【导入居民信息失败】清理上传的文件失败：{}", ExceptionUtils.getErrorStackTrace(e));
             }
@@ -491,7 +491,7 @@ public class IcResiUserController {
     @NotNull
     private CustomerFormResultDTO getResiFormAddItems(String customerId) {
         CustomerFormQueryDTO queryDTO = new CustomerFormQueryDTO();
-        queryDTO.setFormCode("resi_base_info");
+        queryDTO.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         queryDTO.setCustomerId(customerId);
         Result<CustomerFormResultDTO> resultForm = operCustomizeOpenFeignClient.getCustomerForm(queryDTO);
         if (resultForm == null || !resultForm.success() || resultForm.getData() == null) {
@@ -649,20 +649,20 @@ public class IcResiUserController {
     @PostMapping("search")
     public Result<PageData<Map<String, Object>>> searchResi(@RequestBody IcResiUserPageFormDTO input, @LoginUser TokenDto loginUser) {
         if (StringUtils.isBlank(input.getKeyword())) {
-            PageData<Map<String, Object>> r = new PageData<Map<String, Object>>(new ArrayList<>(), 0);
+            PageData<Map<String, Object>> r = new PageData<Map<String, Object>>(new ArrayList<>(), NumConstant.ZERO_L);
             return new Result<PageData<Map<String, Object>>>().ok(r);
         }
 
         input.setKeyword(input.getKeyword().trim());
         input.setCustomerId(loginUser.getCustomerId());
         input.setStaffId(loginUser.getUserId());
-        input.setFormCode("resi_base_info");
+        input.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         if (input.getPageNo() == null) {
-            input.setPageNo(1);
+            input.setPageNo(NumConstant.ONE);
         }
 
         if (input.getPageSize() == null) {
-            input.setPageSize(20);
+            input.setPageSize(NumConstant.TWENTY);
         }
 
         PageData<Map<String, Object>> r = icResiUserService.pageResiMap(input);

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/StatsResiWarnController.java

@@ -60,12 +60,23 @@ public class StatsResiWarnController {
     private StatsResiWarnService statsResiWarnService;
 
     @PostMapping("list")
-    public Result list(@LoginUser TokenDto tokenDto,@RequestBody StatsResiListFormDTO formDTO){
+    public Result<List<IcStatsResiResultDTO>> list(@LoginUser TokenDto tokenDto,@RequestBody StatsResiListFormDTO formDTO){
         ValidatorUtils.validateEntity(formDTO);
         String customerId = tokenDto.getCustomerId();
         List<IcStatsResiResultDTO> icStatsResiResultDTOList = statsResiWarnService.list(customerId,formDTO.getId(),formDTO.getLevel());
-        return new Result().ok(icStatsResiResultDTOList);
+        return new Result<List<IcStatsResiResultDTO>>().ok(icStatsResiResultDTOList);
+    }
 
+    /**
+     * @Description  内部调了list
+     * @param formDTO
+     * @author zxc
+     * @date 2022/1/20 2:11 下午
+     */
+    @PostMapping("list2")
+    public Result<List<IcStatsResiResultDTO>> list2(@RequestBody StatsResiListFormDTO formDTO){
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<List<IcStatsResiResultDTO>>().ok(statsResiWarnService.list2(formDTO));
     }
 
     @PostMapping("buildingwarnlist")

epmet-user/epmet-user-server/src/main/java/com/epmet/service/StatsResiWarnService.java

@@ -17,6 +17,7 @@
 
 package com.epmet.service;
 
+import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.result.IcStatsResiResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnBuildingResultDTO;
 import com.epmet.dto.result.IcStatsResiWarnUserResultDTO;
@@ -38,6 +39,8 @@ public interface StatsResiWarnService{
 
     List<IcStatsResiResultDTO> list(String customerId,String id, String level);
 
+    List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO);
+
     void resiWarn(String customerId);
 
     void resiWarnByOne(String customerId,String userId);

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

@@ -476,7 +476,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     @Override
     public PageData<Map<String, Object>> pageResiMap(IcResiUserPageFormDTO formDTO) {
         CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(),formDTO.getStaffId());
-        String staffOrgPath=StrConstant.EPMETY_STR;
+        String staffOrgPath;
         if(StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds())&& !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())){
             staffOrgPath=staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId());
         }else{
@@ -542,14 +542,14 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
         for (Map<String, Object> resultMap : list) {
             String gridIdValue = null != resultMap.get(UserConstant.GRID_ID) ? resultMap.get(UserConstant.GRID_ID).toString() : StrConstant.EPMETY_STR;
             resultMap.put("GRID_ID_VALUE", gridIdValue);
-            if (null != gridInfoMap && gridInfoMap.containsKey(gridIdValue) && null != gridInfoMap.get(gridIdValue)) {
+            if (gridInfoMap.containsKey(gridIdValue) && null != gridInfoMap.get(gridIdValue)) {
                 //GRID_NAME
                 resultMap.put(UserConstant.GRID_ID, gridInfoMap.get(gridIdValue).getGridName());
             }
 
             String homeId = null != resultMap.get(UserConstant.HOME_ID) ? resultMap.get(UserConstant.HOME_ID).toString() : StrConstant.EPMETY_STR;
             resultMap.put("HOME_ID_VALUE", homeId);
-            if (null != houseInfoMap && houseInfoMap.containsKey(homeId) && null != houseInfoMap.get(homeId)) {
+            if (houseInfoMap.containsKey(homeId) && null != houseInfoMap.get(homeId)) {
                 HouseInfoDTO houseInfoDTO = houseInfoMap.get(homeId);
                 String buildName = StringUtils.isNotBlank(houseInfoDTO.getBuildingName()) ? houseInfoDTO.getBuildingName() : StrConstant.EPMETY_STR;
                 resultMap.put("BUILD_NAME", buildName);
@@ -1181,7 +1181,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private Map<String, String> getVolunteerCategoryOptions(String customerId) {
         IcFormOptionsQueryFormDTO optionsQuery = new IcFormOptionsQueryFormDTO();
         optionsQuery.setCustomerId(customerId);
-        optionsQuery.setFormCode("resi_base_info");
+        optionsQuery.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         optionsQuery.setLabel("志愿者类别");
         List<IcFormItemOptionsDTO> categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery),
                 ServiceConstant.OPER_CUSTOMIZE_SERVER,

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

@@ -10,6 +10,7 @@ import com.epmet.dao.IcStatsResiWarnDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.IcResiCategoryWarnConfigDTO;
 import com.epmet.dto.form.IcResiCategoryStatsConfigFormDTO;
+import com.epmet.dto.form.StatsResiListFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.IcResiUserEntity;
 import com.epmet.entity.IcStatsResiWarnEntity;
@@ -193,6 +194,11 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         return result;
     }
 
+    @Override
+    public List<IcStatsResiResultDTO> list2(StatsResiListFormDTO formDTO) {
+        return this.list(formDTO.getCustomerId(), formDTO.getId(), formDTO.getLevel());
+    }
+
     /**
      * 统计
      */

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

@@ -1,6 +1,7 @@
 package com.epmet.service.impl;
 
 import com.epmet.commons.tools.constant.ServiceConstant;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.ExceptionUtils;
 import com.epmet.commons.tools.feign.ResultDataResolver;
@@ -16,13 +17,12 @@ import com.epmet.feign.EpmetHeartOpenFeignClient;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.feign.OperCustomizeOpenFeignClient;
 import com.epmet.service.VolunteerService;
+import com.google.common.collect.Lists;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import com.google.common.collect.Lists;
-
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
@@ -68,7 +68,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve
         // 2.补充图例
         IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO();
         optionsForm.setCustomerId(customerId);
-        optionsForm.setFormCode("resi_base_info");
+        optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         optionsForm.setLabel("志愿者类别");
 
         String errorMsg = "【志愿者分布】查询志愿者图例失败";

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.24__alter_change_detailed.sql

@@ -1,3 +1,3 @@
 ALTER TABLE `ic_user_change_detailed`
-ADD COLUMN `PIDS`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT ''组织的所有上级Id'' AFTER `IC_USER_CHANGE_RECORD_ID`;
+ADD COLUMN `PIDS`  varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '组织的所有上级Id' AFTER `IC_USER_CHANGE_RECORD_ID`;
 

epmet-user/epmet-user-server/src/test/java/com/epmet/epmetuser/test/IcResiUserControllerTest.java

@@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.params.ExcelExportEntity;
 import cn.afterturn.easypoi.excel.export.ExcelExportService;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.epmet.commons.tools.enums.IcFormCodeEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.utils.Result;
@@ -61,7 +62,7 @@ public class IcResiUserControllerTest {
     @NotNull
     private CustomerFormResultDTO getResiFormItems(String customerId) {
         CustomerFormQueryDTO queryDTO = new CustomerFormQueryDTO();
-        queryDTO.setFormCode("resi_base_info");
+        queryDTO.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode());
         queryDTO.setCustomerId(customerId);
         Result<CustomerFormResultDTO> resultForm = operCustomizeOpenFeignClient.getCustomerForm(queryDTO);
         if (resultForm == null || !resultForm.success() ||resultForm.getData() == null){