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

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

@@ -102,14 +102,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
 
     @Override
     public PageData<IcPartyActivityDTO> search(PartyActivityFormDTO formDTO) {
-        if (null == formDTO.getStartTime()) {
+        /*if (null == formDTO.getStartTime()) {
             Date startDate = DateUtils.parse("1900-01-01 00:00:00", DateUtils.DATE_TIME_PATTERN);
             formDTO.setStartTime(startDate);
         }
         if (null == formDTO.getEndTime()) {
             Date endDate = DateUtils.parse("2099-12-31 00:00:00", DateUtils.DATE_TIME_PATTERN);
             formDTO.setEndTime(endDate);
-        }
+        }*/
         PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize());
         List<IcPartyActivityEntity> list = baseDao.selectActivityList(formDTO);
         PageInfo<IcPartyActivityEntity> pageInfo = new PageInfo<>(list);
@@ -159,14 +159,14 @@ public class IcPartyActivityServiceImpl extends BaseServiceImpl<IcPartyActivityD
 
     @Override
     public List<IcPartyActivityDTO> list(PartyActivityFormDTO formDTO) {
-        if (null == formDTO.getStartTime()) {
+        /*if (null == formDTO.getStartTime()) {
             Date startDate = DateUtils.parse("1900-01-01 00:00:00", DateUtils.DATE_TIME_PATTERN);
             formDTO.setStartTime(startDate);
         }
         if (null == formDTO.getEndTime()) {
             Date endDate = DateUtils.parse("2099-12-31 00:00:00", DateUtils.DATE_TIME_PATTERN);
             formDTO.setEndTime(endDate);
-        }
+        }*/
         List<IcPartyActivityEntity> list = baseDao.selectActivityList(formDTO);
         List<IcPartyActivityDTO> dtoList = ConvertUtils.sourceToTarget(list, IcPartyActivityDTO.class);
 

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

@@ -51,55 +51,27 @@
             a.ID,
             a.ACT_ID,
             a.GRID_ID,
-            b.unitId,
-            c.serviceMatter,
-            TITLE,
-            TARGET,
-            CONTENT,
-            PEOPLE_COUNT,
-            ACTIVITY_TIME,
-            ADDRESS,
-            LONGITUDE,
-            LATITUDE,
-            RESULT,
+            ur.UNIT_ID,
+            GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter,
+            a.TITLE,
+            a.TARGET,
+            a.CONTENT,
+            a.PEOPLE_COUNT,
+            a.ACTIVITY_TIME,
+            a.ADDRESS,
+            a.LONGITUDE,
+            a.LATITUDE,
+            a.RESULT,
             a.AGENCY_ID,
             a.CUSTOMER_ID
         FROM
             ic_party_activity a
-        INNER JOIN  (
-            SELECT
-                ur.ACTIVITY_ID,
-                GROUP_CONCAT( ur.UNIT_ID ) AS unitId
-            FROM
-                ic_activity_unit_relation ur
-            WHERE
-                ur.DEL_FLAG = '0'
-                <if test='null != agencyId and "" != agencyId'>
-                    AND (ur.AGENCY_ID = #{agencyId} or ur.PIDS like concat('%',#{agencyId},'%'))
-                </if>
-                <if test='null != unitId and "" != unitId'>
-                    AND ur.UNIT_ID = #{unitId}
-                </if>
-            GROUP BY
-                ur.ACTIVITY_ID
-            ) b ON a.ID = b.ACTIVITY_ID
-        INNER JOIN  (
-            SELECT
-                sr.ACTIVITY_ID,
-                GROUP_CONCAT( sr.SERVICE_MATTER ) AS serviceMatter
-            FROM
-                ic_activity_service_relation sr
-            WHERE
-                sr.DEL_FLAG = '0'
-                <if test='null != agencyId and "" != agencyId'>
-                    AND (sr.AGENCY_ID = #{agencyId} or sr.PIDS like concat('%',#{agencyId},'%'))
-                </if>
-                <if test='null != serviceMatter and "" != serviceMatter'>
-                    AND sr.SERVICE_MATTER = #{serviceMatter}
-                </if>
-            GROUP BY
-                sr.ACTIVITY_ID
-            ) c ON a.ID = c.ACTIVITY_ID
+        left join ic_activity_unit_relation ur
+            on (ur.ACTIVITY_ID=a.id
+                and ur.del_flag='0')
+        left JOIN ic_activity_service_relation sr
+            on(a.ID = sr.ACTIVITY_ID
+                   and sr.del_flag='0')
         WHERE
             a.DEL_FLAG = '0'
             <if test='null != agencyId and "" != agencyId'>
@@ -109,11 +81,19 @@
                 AND a.GRID_ID = #{gridId}
             </if>
             <if test='null != title and "" != title'>
-                AND TITLE LIKE concat('%', #{title}, '%')
+                AND a.TITLE LIKE concat('%', #{title}, '%')
             </if>
-            AND ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
-        ORDER BY ACTIVITY_TIME DESC
-
+            <if test='null != unitId and "" != unitId'>
+                AND ur.UNIT_ID = #{unitId}
+            </if>
+            <if test='null != serviceMatter and "" != serviceMatter'>
+                AND sr.SERVICE_MATTER = #{serviceMatter}
+            </if>
+            <if test=" null != startTime and null != endTime">
+                AND a.ACTIVITY_TIME BETWEEN #{startTime} AND #{endTime}
+            </if>
+            GROUP BY a.id
+        ORDER BY a.ACTIVITY_TIME DESC
     </select>
 
     <select id="getActivityList" resultType="com.epmet.entity.IcPartyActivityEntity" parameterType = "com.epmet.dto.form.PartyActivityFormDTO">

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

@@ -45,6 +45,7 @@ import java.io.InputStream;
 import java.net.URLEncoder;
 import java.nio.file.Path;
 import java.util.List;
+import java.util.Map;
 import java.util.UUID;
 
 
@@ -329,4 +330,24 @@ public class IcNatController implements ResultDataResolver {
         return new Result();
     }
 
+    /**
+     * 清楚核酸检测记录（只保留近n天）
+     * @author wxz
+     * @date 2022/11/28 下午5:36
+     * * @param map
+     * * @return Result
+     */
+    @PostMapping("clearNatRecords")
+    public Result clearNatRecords(@RequestBody Map<String, Object> map) {
+        // 保留天数
+        Integer retentionDays = (Integer) map.get("retentionDays");
+
+        // 如果是-1直接不做任何操作
+        if (-1 != retentionDays) {
+            icNucleinService.clearNatRecords(retentionDays);
+        }
+
+        return new Result();
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatDao.java

@@ -12,6 +12,7 @@ import com.epmet.entity.IcResiUserEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -86,4 +87,6 @@ public interface IcNatDao extends BaseDao<IcNatEntity> {
      * @Date 2022/10/25 11:13
      */
     void updateRelationOther();
+
+    void deleteNatRecordsBeforeRetentionDays(Date criticleTime);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcNatRelationDao.java

@@ -5,6 +5,8 @@ import com.epmet.entity.IcNatRelationEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.Date;
+
 /**
  * 核酸记录关系表
  *
@@ -19,4 +21,6 @@ public interface IcNatRelationDao extends BaseDao<IcNatRelationEntity> {
      * @Description 关系数据删除--物理删除
      **/
     int delRelation(@Param("icNatId") String icNatId, @Param("agencyId") String agencyId);
+
+    void deleteBeforeRetentionDays(Date criticleTime);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiRentContractInfoDao.java

@@ -0,0 +1,16 @@
+package com.epmet.dao;
+
+import com.epmet.commons.mybatis.dao.BaseDao;
+import com.epmet.entity.IcResiRentContractInfoEntity;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * 居民租房信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-11-25
+ */
+@Mapper
+public interface IcResiRentContractInfoDao extends BaseDao<IcResiRentContractInfoEntity> {
+	
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiRentContractInfoEntity.java

@@ -0,0 +1,41 @@
+package com.epmet.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 居民租房信息
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2022-11-25
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("ic_resi_rent_contract_info")
+public class IcResiRentContractInfoEntity extends BaseEpmetEntity {
+
+	private static final long serialVersionUID = 1L;
+
+    /**
+     * 客户Id customer.id
+     */
+	private String customerId;
+
+    /**
+     * 主表Id
+     */
+	private String icResiUser;
+
+    /**
+     * 合同开始日期
+     */
+	private String contractStartDate;
+
+    /**
+     * 合同结束日期
+     */
+	private String contractEndDate;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/enums/IcResiUserTableEnum.java

@@ -22,6 +22,8 @@ public enum IcResiUserTableEnum {
     IC_VOLUNTEER("ic_volunteer","志愿者信息录入表", 6, 3, "IS_VOLUNTEER", true),
     IC_OLD_PEOPLE("ic_old_people","老年人信息录入表", 7, 2, "IS_OLD_PEOPLE", true),
     IC_SPECIAL("ic_special","特殊人群信息录入表", 8, 3, "IS_SPECIAL", true),
+    IC_TENANT("ic_resi_rent_contract_info","租户信息录入表", null, 2, "IS_TENANT", true),
+
 
 //    下面的是：没有实际数据库表，在ic_resi_user中有一个标记，但是导入的时候是有单独的sheet的
     IC_DBH("virtual_dbh","低保人员信息录入表", null, 2, "IS_DBH", false),
@@ -34,7 +36,6 @@ public enum IcResiUserTableEnum {
     IC_CJ("virtual_cj","残疾人员信息录入表", null, 2, "IS_CJ", false),
     IC_DB("virtual_db","大病人员信息录入表", null, 2, "IS_DB", false),
     IC_MB("virtual_mb","慢病人员信息录入表", null, 2, "IS_MB", false),
-    IC_TENANT("virtual_tenant","租户信息录入表", null, 2, "IS_TENANT", false),
     IC_FLOATING("virtual_floating","流动人口信息录入表", null, 2, "IS_FLOATING", false),
     IC_XJC("virtual_xjc","新阶层人士信息录入表", null, 2, "IS_XJC", false);
 

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

@@ -97,4 +97,12 @@ public interface IcNatService extends BaseService<IcNatEntity> {
 
     void initNatLocal();
 
+    /**
+     * 清理nat记录，目前不区分客户，后期需要区分可以再加
+     * @author wxz
+     * @date 2022/11/28 下午5:39
+     * * @param retentionDays 保留的天数(最近)
+     *
+     */
+    void clearNatRecords(Integer retentionDays);
 }

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

@@ -733,4 +733,15 @@ public class IcNatServiceImpl extends BaseServiceImpl<IcNatDao, IcNatEntity> imp
         icNatRelationDao.insert(relation);
     }
 
+    @Override
+    public void clearNatRecords(Integer retentionDays) {
+        Date criticleTime = DateUtils.addDateDays(new Date(), 0 - retentionDays);
+
+        // 1。删除nat核酸检测信息。NatTime建索引
+        baseDao.deleteNatRecordsBeforeRetentionDays(criticleTime);
+
+        // 2.删除关系信息
+        // 没有记录业务时间，只能暂且按照创建时间来了，大不了多些脏数据。createdTime建索引！
+        icNatRelationDao.deleteBeforeRetentionDays(criticleTime);
+    }
 }

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

@@ -373,13 +373,25 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         c.setImportTag(importTag);
         newlyOrChangedResi.set(c);
 
-        List<ResiCategoryItemResultDTO> resiCategoryItems = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listResiCategoryItems(customerId),
+        // 查询居民类别的字段->中文的map
+        //List<ResiCategoryItemResultDTO> resiCategoryItems = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listResiCategoryItems(customerId),
+        //        ServiceConstant.OPER_CUSTOMIZE_SERVER,
+        //        EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
+        //        String.format("【居民信息导入】查询居民类别items失败,customerId：%s", customerId),
+        //        "居民信息导入失败");
+        //
+        //Map<String, String> columnNameAndLabel = resiCategoryItems.stream().collect(Collectors.toMap((o) -> o.getColumnName(), (o) -> o.getLabel()));
+
+        IcResiCategoryStatsConfigDTO sfdto = new IcResiCategoryStatsConfigDTO();
+        sfdto.setCustomerId(customerId);
+
+        List<IcResiCategoryStatsConfigDTO> categoryListResult = getResultDataOrThrowsException(operCustomizeOpenFeignClient.getCategoryList(sfdto),
                 ServiceConstant.OPER_CUSTOMIZE_SERVER,
                 EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),
-                String.format("【居民信息导入】查询居民类别items失败,customerId：%s", customerId),
+                String.format("【居民信息导入】初始化居民类别items失败,customerId：%s", customerId),
                 "居民信息导入失败");
 
-        Map<String, String> columnNameAndLabel = resiCategoryItems.stream().collect(Collectors.toMap((o) -> o.getColumnName(), (o) -> o.getLabel()));
+        Map<String, String> columnNameAndLabel = categoryListResult.stream().collect(Collectors.toMap((o) -> o.getColumnName(), (o) -> o.getLabel()));
 
         resiCategoryColumnNameAndLabel.set(columnNameAndLabel);
     }

epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.93__ic_resi_contract_info.sql

@@ -0,0 +1,14 @@
+CREATE TABLE `ic_resi_rent_contract_info` (
+                                         `ID` varchar(64) NOT NULL COMMENT '唯一标识',
+                                         `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id',
+                                         `IC_RESI_USER` varchar(64) NOT NULL COMMENT '主表Id',
+                                         `CONTRACT_START_DATE` varchar(32) DEFAULT NULL COMMENT '合同开始日期',
+                                         `CONTRACT_END_DATE` varchar(32) DEFAULT NULL COMMENT '合同结束日期',
+                                         `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除',
+                                         `REVISION` int(11) NOT NULL COMMENT '乐观锁',
+                                         `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人',
+                                         `CREATED_TIME` datetime NOT NULL COMMENT '创建时间',
+                                         `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人',
+                                         `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间',
+                                         PRIMARY KEY (`ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='居民租房信息';

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

@@ -275,4 +275,8 @@
         UPDATED_TIME = NOW()
         where user_type != 'import'
     </update>
+
+    <delete id="deleteNatRecordsBeforeRetentionDays">
+        delete from ic_nat where SAMPLE_TIME <![CDATA[<]]> #{criticleTime}
+    </delete>
 </mapper>

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

@@ -13,4 +13,8 @@
         </if>
     </delete>
 
+    <delete id="deleteBeforeRetentionDays">
+        delete from ic_nat_relation where CREATED_TIME <![CDATA[<]]> #{criticleTime}
+    </delete>
+
 </mapper>

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

@@ -0,0 +1,21 @@
+<?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.dao.IcResiRentContractInfoDao">
+
+    <resultMap type="com.epmet.entity.IcResiRentContractInfoEntity" id="icResiContractInfoMap">
+        <result property="id" column="ID"/>
+        <result property="customerId" column="CUSTOMER_ID"/>
+        <result property="icResiUser" column="IC_RESI_USER"/>
+        <result property="contractStartDate" column="CONTRACT_START_DATE"/>
+        <result property="contractEndDate" column="CONTRACT_END_DATE"/>
+        <result property="delFlag" column="DEL_FLAG"/>
+        <result property="revision" column="REVISION"/>
+        <result property="createdBy" column="CREATED_BY"/>
+        <result property="createdTime" column="CREATED_TIME"/>
+        <result property="updatedBy" column="UPDATED_BY"/>
+        <result property="updatedTime" column="UPDATED_TIME"/>
+    </resultMap>
+
+
+</mapper>