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

epmet-gateway/src/main/resources/bootstrap.yml

@@ -88,6 +88,7 @@ spring:
             - Path=${server.servlet.context-path}/job/**
           filters:
             - StripPrefix=1
+            - CpAuth=true
         #用户服务
         - id: epmet-user-server
           uri: @gateway.routes.epmet-user-server.uri@

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java

@@ -342,6 +342,7 @@ public class CustomerAgencyController {
 
     /**
      * @Description 获取客户下组织树不含网格和部门
+     * 哪些地方用到了比如：办事指南-指南管理查询条件
      * @Param tokenDTO
      * @Return {@link Result<  AgencyTreeResultDTO >}
      * @Author zhaoqifeng

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

@@ -160,7 +160,8 @@
             AND a.DEL_FLAG = '0'
 
         </where>
-        ORDER BY CAST(a.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
+        ORDER BY a.GRID_ID asc,
+            CAST(a.NEIGHBOR_HOOD_NAME AS SIGNED),CONVERT(a.NEIGHBOR_HOOD_NAME using gbk)
     </select>
     <select id="searchAllNeighborhood" resultType="com.epmet.excel.IcNeighborHoodExcel">
         select

epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/IcEventListFormDTO.java

@@ -1,7 +1,6 @@
 package com.epmet.dto.form;
 
 import com.epmet.commons.tools.validator.group.CustomerClientShowGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import lombok.Data;
 
 import javax.validation.constraints.NotBlank;
@@ -28,6 +27,7 @@ public class IcEventListFormDTO implements Serializable {
     private String icEventId;
     /**
      * 所属组织
+     * 前端传入，如果没传，默认查询登录用户所属组织及下级
      */
     private String agencyId;
     /**

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java

@@ -112,9 +112,11 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
 
     @Override
     public PageData<IcEventListResultDTO> list(IcEventListFormDTO formDTO) {
-        //获取当前工作人员缓存信息
-        CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
-        formDTO.setAgencyId(staffInfo.getAgencyId());
+        if(StringUtils.isBlank(formDTO.getAgencyId())){
+            //获取当前工作人员缓存信息
+            CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId());
+            formDTO.setAgencyId(staffInfo.getAgencyId());
+        }
 
         //分页查询当前组织下网格内事件数据
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage());

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

@@ -78,4 +78,18 @@ public class IcFormItemGroupDTO implements Serializable {
      */
 	private Boolean display;
 
+    /**
+     * 政策人员信息组件;1:展示；0：不展示；默认0
+     */
+    private String policyFlag;
+
+    /**
+     * 1展示，0不展示，默认0
+     */
+    private String childShowFlag;
+
+    /**
+     * 组编码,唯一标识
+     */
+    private String groupCode;
 }

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

@@ -39,6 +39,11 @@ public class FormGroupDTO implements Serializable {
      */
     private String tableName;
 
+    /**
+     *组编码,唯一标识
+     */
+    private String groupCode;
+
     /**
      * 分组里面的组件
      */

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

@@ -52,9 +52,10 @@ public class IcFormController {
 
     /**
      * desc: 初始化 客户表单配置
+     * 运营端-数字社区初始化
      *
      * @param customerId
-     * @param formCode
+     * @param formCode value: resi_base_info
      * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.CustomerFormResultDTO>
      * @author LiuJanJun
      * @date 2021/12/8 4:28 下午

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

@@ -79,4 +79,14 @@ public class IcFormItemGroupEntity extends BaseEpmetEntity {
 	 * 政策人员信息组件;1:展示；0：不展示；默认0
 	 */
 	private String policyFlag;
+
+	/**
+	 * 1展示，0不展示，默认0
+	 */
+	private String childShowFlag;
+
+	/**
+	 * 组编码,唯一标识
+	 */
+	private String groupCode;
 }

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

@@ -172,7 +172,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
         defaultIcForm.setCreatedTime(new Date());
         defaultIcForm.setUpdatedBy("init_user");
         defaultIcForm.setUpdatedTime(new Date());
-
+        // 1、设置ic_form
         int insert = baseDao.insert(defaultIcForm);
         log.info("insert icForm:" + insert);
 
@@ -184,7 +184,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             return "默认配置错误";
         }
         String defaultBaseInfoGroupId = "default_0";
-        //设置ic_form_item
+        //2、设置ic_form_item
         itemList.forEach(item -> {
             item.setId(newPrefixed + item.getId());
             item.setCustomerId(customerId);
@@ -215,7 +215,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemDao.insert(item);
         });
 
-        //设置ic_form_item_options
+        //3、设置ic_form_item_options
         LambdaQueryWrapper<IcFormItemOptionsEntity> wrapperOptions = new LambdaQueryWrapper<>();
         wrapperOptions.eq(IcFormItemOptionsEntity::getCustomerId, defaultCustomerId);
         wrapperOptions.eq(IcFormItemOptionsEntity::getFormCode, formCode);
@@ -233,7 +233,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemOptionsDao.insert(item);
         });
 
-        //设置ic_form_item_group
+        //4、设置ic_form_item_group
         LambdaQueryWrapper<IcFormItemGroupEntity> wrapperGroup = new LambdaQueryWrapper<>();
         wrapperGroup.eq(IcFormItemGroupEntity::getCustomerId, defaultCustomerId);
         wrapperGroup.eq(IcFormItemGroupEntity::getFormCode, formCode);
@@ -255,7 +255,7 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormItemGroupDao.insert(item);
         });
 
-        //设置ic_form_query_builder
+        //5、设置ic_form_query_builder
         LambdaQueryWrapper<IcFormQueryBuilderEntity> wrapperQuery = new LambdaQueryWrapper<>();
         wrapperQuery.eq(IcFormQueryBuilderEntity::getCustomerId, defaultCustomerId);
         wrapperQuery.eq(IcFormQueryBuilderEntity::getFormCode, formCode);
@@ -272,6 +272,26 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icFormQueryBuilderDao.insert(item);
         });
 
+        //6、设置ic_form_list_item
+        LambdaQueryWrapper<IcFormListItemEntity> listItemWapper = new LambdaQueryWrapper<>();
+        listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId);
+        listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode);
+        List<IcFormListItemEntity> listItemList = icFormListItemDao.selectList(listItemWapper);
+        if (CollectionUtils.isEmpty(listItemList)) {
+            return "默认配置错误";
+        }
+        listItemList.forEach(item -> {
+            item.setId(newPrefixed + item.getId());
+            item.setCustomerId(customerId);
+            item.setFormItemId(newPrefixed + item.getFormItemId());
+            item.setCreatedBy("init_user");
+            item.setCreatedTime(new Date());
+            item.setUpdatedBy("init_user");
+            item.setUpdatedTime(new Date());
+            log.debug("stats:"+ JSON.toJSONString(item));
+            icFormListItemDao.insert(item);
+        });
+
         //设置ic_resi_category_stats_config
         LambdaQueryWrapper<IcResiCategoryStatsConfigEntity> wrapperStats = new LambdaQueryWrapper<>();
         wrapperStats.eq(IcResiCategoryStatsConfigEntity::getCustomerId, defaultCustomerId);
@@ -302,26 +322,6 @@ public class IcFormServiceImpl extends BaseServiceImpl<IcFormDao, IcFormEntity>
             icResiCategoryWarnConfigDao.insert(item);
         });
 
-        //设置ic_form_list_item
-        LambdaQueryWrapper<IcFormListItemEntity> listItemWapper = new LambdaQueryWrapper<>();
-        listItemWapper.eq(IcFormListItemEntity::getCustomerId, defaultCustomerId);
-        listItemWapper.eq(IcFormListItemEntity::getFormCode, formCode);
-        List<IcFormListItemEntity> listItemList = icFormListItemDao.selectList(listItemWapper);
-        if (CollectionUtils.isEmpty(listItemList)) {
-            return "默认配置错误";
-        }
-        listItemList.forEach(item -> {
-            item.setId(newPrefixed + item.getId());
-            item.setCustomerId(customerId);
-            item.setFormItemId(newPrefixed + item.getFormItemId());
-            item.setCreatedBy("init_user");
-            item.setCreatedTime(new Date());
-            item.setUpdatedBy("init_user");
-            item.setUpdatedTime(new Date());
-            log.debug("stats:"+ JSON.toJSONString(item));
-            icFormListItemDao.insert(item);
-        });
-
         //设置ic_service_item_dict和ic_resi_demand_dict
         Result result = epmetHeartOpenFeignClient.customerInit(customerId);
         if (!result.success()) {

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.40__itemgroup_code.sql

@@ -0,0 +1,56 @@
+alter table ic_form_item_group add COLUMN GROUP_CODE VARCHAR(32) DEFAULT '' COMMENT '组编码,唯一标识' after CHILD_SHOW_FLAG;
+
+update ic_form_item_group g set g.GROUP_CODE='jcxx'
+where g.LABEL='基础信息';
+
+
+update ic_form_item_group g set g.GROUP_CODE='jyxx'
+where g.LABEL='教育信息';
+
+update ic_form_item_group g set g.GROUP_CODE='xqah'
+where g.LABEL='兴趣爱好';
+
+update ic_form_item_group g set g.GROUP_CODE='zjxy'
+where g.LABEL='宗教信仰';
+
+update ic_form_item_group g set g.GROUP_CODE='jkxx'
+where g.LABEL='健康信息';
+
+update ic_form_item_group g set g.GROUP_CODE='gzxx'
+where g.LABEL='工作信息';
+
+update ic_form_item_group g set g.GROUP_CODE='jjzk'
+where g.LABEL='经济状况';
+
+update ic_form_item_group g set g.GROUP_CODE='jzxx'
+where g.LABEL='居住信息';
+
+update ic_form_item_group g set g.GROUP_CODE='jtxx'
+where g.LABEL='家庭信息';
+
+update ic_form_item_group g set g.GROUP_CODE='dyxx'
+where g.LABEL='党员信息';
+
+update ic_form_item_group g set g.GROUP_CODE='bzfxx'
+where g.LABEL='保障房信息';
+
+update ic_form_item_group g set g.GROUP_CODE='syxx'
+where g.LABEL='失业信息';
+
+update ic_form_item_group g set g.GROUP_CODE='tyjrxx'
+where g.LABEL='退役军人信息';
+
+update ic_form_item_group g set g.GROUP_CODE='zyzxx'
+where g.LABEL='志愿者信息';
+
+update ic_form_item_group g set g.GROUP_CODE='tsrqxx'
+where g.LABEL='特殊人群信息';
+
+update ic_form_item_group g set g.GROUP_CODE='tzry'
+where g.LABEL='统战人员';
+
+update ic_form_item_group g set g.GROUP_CODE='lnrxx'
+where g.LABEL='老年人信息';
+
+update ic_form_item_group g set g.GROUP_CODE='resi_demand'
+where g.LABEL='居民需求信息';

epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormDao.xml

@@ -66,7 +66,8 @@
             g.LABEL,
             g.sort,
             g.SUPPORT_ADD,
-            g.TABLE_NAME AS TABLE_NAME
+            g.TABLE_NAME AS TABLE_NAME,
+            g.GROUP_CODE
         FROM
             ic_form_item_group g
         WHERE
@@ -124,6 +125,7 @@
         <result property="sort" column="sort"/>
         <result property="supportAdd" column="SUPPORT_ADD"/>
         <result property="tableName" column="TABLE_NAME"/>
+        <result property="groupCode" column="GROUP_CODE"/>
         <collection property="itemList" ofType="com.epmet.dto.result.FormItemResult2"
                     column="group_id"  select="com.epmet.dao.IcFormDao.selectItemListByGroupId">
         </collection>
@@ -200,7 +202,8 @@
                 case when g.table_name is null or g.table_name ='' then 'ic_resi_user'
                      else g.TABLE_NAME
                     end
-                ) AS TABLE_NAME
+                ) AS TABLE_NAME,
+            g.GROUP_CODE
         FROM
             ic_form_item_group g
         WHERE

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

@@ -111,7 +111,7 @@ public class IcMoveInAddEditFormDTO implements Serializable {
     /**
      * 详细地址
      */
-    @NotBlank(message = "详细地址不能为空", groups = {AddGroup.class})
+    //@NotBlank(message = "详细地址不能为空", groups = {AddGroup.class})
     private String address;
     /**
      * 迁移证号码

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

@@ -6,6 +6,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.EasyExcelFactory;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.bean.ResiImportCategoryData;
@@ -452,6 +453,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                                       String currUserAgencyPids, String currentUserId, String tableName) {
         String loginUserCustomerId = EpmetRequestHolder.getLoginUserCustomerId();
         // 遍历每一行，将行内容转化为
+        String idCard = null;
         for (Map<Integer, String> row : dataRows) {
 
             LinkedHashMap<String, String> columnAndValues = new LinkedHashMap<>();
@@ -462,7 +464,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                 execSpecifiedCheckAndFill(columnAndValues);
                 //默认新增
                 columnAndValues.put("SUB_STATUS", IcResiUserSubStatusEnum.IMPORT.getSubStatus());
-                String idCard = columnAndValues.get("ID_CARD");
+                idCard = columnAndValues.get("ID_CARD");
                 Map<String, String> existingResiMap = icResiUserDao.selectResiInfoMap(loginUserCustomerId, idCard, null);
 
                 if (existingResiMap == null) {
@@ -579,7 +581,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     errorMsg = e.getMessage();
                 } else {
                     errorMsg = "未知系统错误";
-                    log.error(ExceptionUtils.getErrorStackTrace(e));
+                    log.error("【居民信息导入】导入身份证为{}的居民基础信息出现未知错误:{}", idCard == null ? "" : idCard, ExceptionUtils.getErrorStackTrace(e));
                 }
 
                 ErrorRow errorRow = new ErrorRow();
@@ -695,12 +697,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
         // 遍历每一行，将行内容转化为
         for (Map<Integer, String> row : dataRows) {
-
+            String idCard = null;
             try {
                 convertColumnWrappers2Map4Persist(headerColumnWrapper, row, currUserAgencyId, checkBoxOptionColumnIdxAndLabel, columnAndValues, false);
 
                 // 检验身份证号
-                String idCard = columnAndValues.get("ID_CARD");
+                idCard = columnAndValues.get("ID_CARD");
                 if (StringUtils.isBlank(idCard)) {
                     String resiName = columnAndValues.get("NAME");
                     if (resiName == null) {
@@ -754,7 +756,7 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
                     errorMsg = e.getMessage();
                 } else {
                     errorMsg = "未知系统错误";
-                    log.error(ExceptionUtils.getErrorStackTrace(e));
+                    log.error("【居民信息导入】导入身份证为{}的居民扩展信息{}出现未知错误:{}", idCard == null ? "" : idCard, targetTableName, ExceptionUtils.getErrorStackTrace(e));
                 }
 
                 ErrorRow errorRow = new ErrorRow();

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.89__data_sync_job_create.sql

@@ -0,0 +1,19 @@
+CREATE TABLE `ic_sync_job` (
+  `ID` varchar(64) NOT NULL COMMENT 'ID',
+  `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID',
+  `ORG_ID` varchar(64) NOT NULL COMMENT '组织ID',
+  `PID` varchar(255) NOT NULL COMMENT '组织ID的上级',
+  `ORG_ID_PATH` varchar(1024) NOT NULL COMMENT '组织ID的所有上级，包括org_id',
+  `JOB_TYPE` varchar(255) NOT NULL COMMENT '任务类型，残疾：disability；死亡：death；核酸：nat；',
+  `OPERATOR_ID` varchar(255) NOT NULL COMMENT '操作员ID【staffId】',
+  `OPERATION_STATUS` varchar(255) DEFAULT NULL COMMENT '操作状态,等待中：waiting；进行中：processing；结束：finish',
+  `PROCESSOR_IP` varchar(15) DEFAULT NULL COMMENT '处理器实例ip',
+  `DEL_FLAG` int(11) NOT NULL,
+  `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+  `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人',
+  `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+  `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人',
+  `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+  PRIMARY KEY (`ID`),
+  KEY `ORG_ID` (`ORG_ID`,`OPERATION_STATUS`,`JOB_TYPE`) USING BTREE
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='同步任务表'

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.90__alter_ic_move_in_record.sql

@@ -0,0 +1,3 @@
+ALTER TABLE `ic_move_in_record`
+MODIFY COLUMN `ADDRESS`  varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL COMMENT '详细地址' AFTER `SOURCE_ADDRESS`;
+

epmet-user/epmet-user-server/src/main/resources/mapper/ChangeDeathDao.xml

@@ -44,7 +44,10 @@
         d.UPDATED_TIME
         FROM
         pli_change_death d
-        LEFT JOIN ic_resi_user u ON u.ID_CARD = d.ID_CARD
+        LEFT JOIN ic_resi_user u
+            ON (u.ID_CARD = d.ID_CARD
+                and u.DEL_FLAG='0'
+                and d.CUSTOMER_ID=u.CUSTOMER_ID)
         LEFT JOIN pli_change_welfare w ON d.ID_CARD = w.ID_CARD
         AND w.DEL_FLAG = '0'
         WHERE

epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml

@@ -182,6 +182,7 @@
     </sql>
 
     <!--   查询列表用  -->
+    <!-- 2022.11.18 小寨子写死排序   -->
     <select id="selectListResiMap" parameterType="map" resultType="map">
         select
         ic_resi_user.id as icResiUserId,
@@ -200,9 +201,9 @@
             <include refid="listWhereForPage"></include>
             <if test="keyword != null and keyword != ''">
                 AND (
-                NAME = #{keyword}
-                or MOBILE = #{keyword}
-                or ID_CARD = #{keyword}
+                NAME like concat('%', #{keyword},'%')
+                or MOBILE like concat('%', #{keyword},'%')
+                or ID_CARD like concat('%', #{keyword},'%')
                 )
             </if>
         </where>
@@ -212,13 +213,26 @@
                 ${groupTableName}.ID
             </foreach>
         </if>
-        ORDER BY
-        IC_RESI_USER.GRID_ID desc,
-        IC_RESI_USER.VILLAGE_ID ASC,
-        IC_RESI_USER.BUILD_ID ASC,
-        IC_RESI_USER.UNIT_ID ASC,
-        IC_RESI_USER.HOME_ID ASC,
-        IC_RESI_USER.ID ASC
+        <choose>
+            <when test="customerId == '1536638904600752130'  ">
+                ORDER BY
+                field( IC_RESI_USER.GRID_ID, '1537272060187049986', '1537272342477508609', '1537275342477501111', '1593432493598076929' ),
+                IC_RESI_USER.VILLAGE_ID ASC,
+                IC_RESI_USER.BUILD_ID ASC,
+                IC_RESI_USER.UNIT_ID ASC,
+                IC_RESI_USER.HOME_ID ASC,
+                IC_RESI_USER.ID ASC
+            </when>
+            <otherwise>
+                ORDER BY
+                IC_RESI_USER.GRID_ID desc,
+                IC_RESI_USER.VILLAGE_ID ASC,
+                IC_RESI_USER.BUILD_ID ASC,
+                IC_RESI_USER.UNIT_ID ASC,
+                IC_RESI_USER.HOME_ID ASC,
+                IC_RESI_USER.ID ASC
+            </otherwise>
+        </choose>
     </select>
 
     <update id="updateToDel" parameterType="map">