Merge remote-tracking branch 'origin/dev_ylfn'

# Conflicts:
#	epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
#	epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java

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

@@ -0,0 +1,35 @@
+package com.epmet.task.ic;
+
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.feign.EpmetUserOpenFeignClient;
+import com.epmet.task.ITask;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+
+/**
+ * desc:定时弥补数据 保证数据的一致性
+ */
+@Slf4j
+@Component("icUpdateYlfnTask")
+public class IcUpdateYlfnTask implements ITask {
+
+    @Resource
+    private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
+
+    /**
+     * 执行定时任务接口
+     *
+     * @param params 参数，多参数使用JSON数据
+     */
+    @Override
+    public void run(String params) {
+        Result result = epmetUserOpenFeignClient.updateYlfn();
+        if (result.success()) {
+            log.info("icUpdateYlfnTask定时任务正在执行定时任务执行成功");
+        } else {
+            log.warn("icUpdateYlfnTask定时任务正在执行定时任务执行失败:" + result.getMsg());
+        }
+    }
+}

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

@@ -74,5 +74,12 @@ public class IcResiCategoryStatsConfigFormDTO implements Serializable {
     private Integer level2;
 
     private Integer level3;
-
+    /**
+     * 自动匹配：开启1；不匹配：0
+     */
+    private String autoMatching;
+    /**
+     * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49
+     */
+    private String ylfnValue;
 }

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

@@ -44,7 +44,10 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable {
      */
 	private String label;
 
-
+    /**
+     * 列名
+     */
+    private String columnName;
 
     /**
      * 管理平台分类图标
@@ -84,4 +87,13 @@ public class IcResiCategoryStatsConfigResultDTO implements Serializable {
      * 等级3阈值
      */
     private Integer level3;
+
+    /**
+     * 自动匹配：开启1；不匹配：0
+     */
+    private String autoMatching;
+    /**
+     * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49
+     */
+    private String ylfnValue;
 }

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

@@ -0,0 +1,18 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2022/9/8 15:43
+ */
+@Data
+public class YlfnValueResultDTO implements Serializable {
+    private static final long serialVersionUID = -1416102274320519092L;
+    private String customerId;
+    private Integer min;
+    private Integer max;
+}

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java

@@ -178,5 +178,6 @@ public interface OperCustomizeOpenFeignClient {
      */
     @PostMapping("/oper/customize/icformitemoptions/getItemConditions")
     Result<Map<String, String>> getOptionsMap(@RequestBody IcFormOptionsQueryFormDTO input);
-
+    @PostMapping("/oper/customize/icresicategorystatsconfig/getYlfnValue")
+    Result<List<YlfnValueResultDTO>> getYlfnValue();
 }

epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/fallback/OperCustomizeOpenFeignClientFallback.java

@@ -142,4 +142,9 @@ public class OperCustomizeOpenFeignClientFallback implements OperCustomizeOpenFe
 		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getOptionsMap", input);
 	}
 
+	@Override
+	public Result<List<YlfnValueResultDTO>> getYlfnValue() {
+		return ModuleUtils.feignConError(ServiceConstant.OPER_CUSTOMIZE_SERVER, "getYlfnValue", null);
+	}
+
 }

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

@@ -26,6 +26,7 @@ import com.epmet.commons.tools.validator.group.AddGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
 import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
+import com.epmet.dto.result.YlfnValueResultDTO;
 import com.epmet.excel.IcResiCategoryStatsConfigExcel;
 import com.epmet.service.IcResiCategoryStatsConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -96,4 +97,9 @@ public class IcResiCategoryStatsConfigController {
         return new Result<List<IcResiCategoryStatsConfigDTO>>().ok(icResiCategoryStatsConfigService.getCategoryList(dto));
     }
 
+    @PostMapping("getYlfnValue")
+    public Result<List<YlfnValueResultDTO>> getYlfnValue() {
+        return new Result<List<YlfnValueResultDTO>>().ok(icResiCategoryStatsConfigService.getYlfnValue());
+    }
+
 }

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

@@ -80,4 +80,12 @@ public class IcResiCategoryStatsConfigEntity extends BaseEpmetEntity {
      */
 	private Integer sort;
 
+	/**
+	 * 自动匹配：开启1；不匹配：0
+	 */
+	private String autoMatching;
+	/**
+	 * 育龄妇女年龄范围，英文逗号隔开的数字例如：18,49
+	 */
+	private String ylfnValue;
 }

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

@@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO;
+import com.epmet.dto.result.YlfnValueResultDTO;
 import com.epmet.entity.IcResiCategoryStatsConfigEntity;
 
 import java.util.List;
@@ -111,4 +112,14 @@ public interface IcResiCategoryStatsConfigService extends BaseService<IcResiCate
      */
     List<CustomerCategoryShowAndWarnListResultDTO> getCustomerCategoryShowAndWarnList(String customerId);
 
+    /**
+     * 获取育龄妇女配置
+     *
+     * @Param
+     * @Return {@link List< YlfnValueResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2022/9/8 15:50
+     */
+    List<YlfnValueResultDTO> getYlfnValue();
+
 }

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

@@ -22,11 +22,14 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
+import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.dao.IcResiCategoryStatsConfigDao;
 import com.epmet.dto.IcResiCategoryStatsConfigDTO;
 import com.epmet.dto.result.CustomerCategoryShowAndWarnListResultDTO;
+import com.epmet.dto.result.YlfnValueResultDTO;
 import com.epmet.entity.IcResiCategoryStatsConfigEntity;
 import com.epmet.redis.IcResiCategoryStatsConfigRedis;
 import com.epmet.service.IcResiCategoryStatsConfigService;
@@ -37,6 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 居民类别配置表
@@ -137,4 +141,33 @@ public class IcResiCategoryStatsConfigServiceImpl extends BaseServiceImpl<IcResi
         return new ArrayList<>();
     }
 
+    /**
+     * 获取育龄妇女配置
+     *
+     * @Param
+     * @Return {@link List<  YlfnValueResultDTO >}
+     * @Author zhaoqifeng
+     * @Date 2022/9/8 15:50
+     */
+    @Override
+    public List<YlfnValueResultDTO> getYlfnValue() {
+        LambdaQueryWrapper<IcResiCategoryStatsConfigEntity> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(IcResiCategoryStatsConfigEntity::getAutoMatching, NumConstant.ONE_STR);
+        wrapper.eq(IcResiCategoryStatsConfigEntity::getColumnName, "IS_YLFN");
+        wrapper.isNotNull(IcResiCategoryStatsConfigEntity::getYlfnValue);
+        wrapper.ne(IcResiCategoryStatsConfigEntity::getYlfnValue,StrConstant.EPMETY_STR);
+        List<IcResiCategoryStatsConfigEntity> list = baseDao.selectList(wrapper);
+        if(CollectionUtils.isEmpty(list)) {
+            return Collections.emptyList();
+        }
+        return list.stream().map(item -> {
+            YlfnValueResultDTO dto = new YlfnValueResultDTO();
+            dto.setCustomerId(item.getCustomerId());
+            String[] ages = item.getYlfnValue().split(StrConstant.COMMA);
+            dto.setMin(Integer.valueOf(ages[0]));
+            dto.setMax(Integer.valueOf(ages[1]));
+            return dto;
+        }).collect(Collectors.toList());
+    }
+
 }

epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.38__ylfnv.sql

@@ -0,0 +1,4 @@
+alter table ic_resi_category_stats_config
+    add COLUMN `AUTO_MATCHING` varchar(1) NOT NULL DEFAULT '0' COMMENT '自动匹配：开启1；不匹配：0' after SORT;
+
+alter table ic_resi_category_stats_config add COLUMN `YLFN_VALUE` varchar(32) DEFAULT NULL COMMENT '育龄妇女年龄范围，英文逗号隔开的数字例如：18,49' after AUTO_MATCHING;

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

@@ -26,6 +26,7 @@
         select
         a.ID as id,
         a.LABEL as label,
+        a.COLUMN_NAME as columnName,
         a.MANAGEMENT_ICON as managementIcon,
         a.DATA_ICON as dataIcon,
         a.HOUSE_SHOW_ICON as houseShowIcon,
@@ -34,7 +35,9 @@
         b.LEVEL_1 as level1,
         b.LEVEL_2 as level2,
         b.LEVEL_3 as level3,
-        b.WARN
+        b.WARN,
+        a.AUTO_MATCHING as autoMatching,
+        a.YLFN_VALUE as ylfnValue
         from
         ic_resi_category_stats_config a
         left join ic_resi_category_warn_config b on a.TABLE_NAME = b.TABLE_NAME and a.COLUMN_NAME = b.COLUMN_NAME and b.DEL_FLAG =0 and b.CUSTOMER_ID = #{customerId}

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

@@ -882,4 +882,7 @@ public interface EpmetUserOpenFeignClient {
      */
     @PostMapping("/epmetuser/icresiuser/nonDynamic/listResi")
     Result<PageData<IcResiNonDynamicResultDTO>> listResiNonDynamic(@RequestBody IcResiPageNonDynamicFormDTO input);
+
+    @PostMapping("/epmetuser/icresiuser/updateYlfn")
+    Result updateYlfn();
 }

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

@@ -678,4 +678,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
     public Result<PageData<IcResiNonDynamicResultDTO>> listResiNonDynamic(IcResiPageNonDynamicFormDTO input) {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "listResiNonDynamic", input);
     }
+
+    @Override
+    public Result updateYlfn() {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateYlfn", null);
+    }
 }

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

@@ -1422,4 +1422,17 @@ public class IcResiUserController implements ResultDataResolver {
         return new Result<PageData<SearchByNameResultDTO>>().ok(icResiUserService.icUserStatisList(formDTO));
     }
 
+    /**
+     * 更新育龄妇女状态定时任务
+     * @Param
+     * @Return {@link Result}
+     * @Author zhaoqifeng
+     * @Date 2022/9/8 17:19
+     */
+    @PostMapping("updateYlfn")
+    public Result updateYlfn() {
+        icResiUserService.updateYlfn();
+        return new Result();
+    }
+
 }

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

@@ -509,4 +509,13 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
     PageData<IcResiNonDynamicResultDTO> listResiNonDynamic(Boolean fuzzy, String gridId, String name, String mobile, Integer pageNo, Integer pageSize);
 
     PageData<SearchByNameResultDTO> icUserStatisList(UserChartFormDTO formDTO);
+
+    /**
+     * 更新育龄妇女状态定时任务
+     * @Param
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/9/8 15:45
+     */
+    void updateYlfn();
 }

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

@@ -53,10 +53,7 @@ import com.epmet.commons.tools.utils.*;
 import com.epmet.constant.IcPlatformConstant;
 import com.epmet.constant.IcResiUserConstant;
 import com.epmet.constant.UserConstant;
-import com.epmet.dao.IcPartyMemberDao;
-import com.epmet.dao.IcResiUserDao;
-import com.epmet.dao.IcVolunteerDao;
-import com.epmet.dao.UserBaseInfoDao;
+import com.epmet.dao.*;
 import com.epmet.dto.*;
 import com.epmet.dto.form.*;
 import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO;
@@ -160,6 +157,10 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     private EpmetUserOpenFeignClient epmetUserOpenFeignClient;
     @Autowired
     private DistributedLock distributedLock;
+    @Resource
+    private IcUserChangeRecordDao icUserChangeRecordDao;
+    @Resource
+    private IcUserChangeDetailedDao icUserChangeDetailedDao;
 
 
 
@@ -3412,4 +3413,117 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
     }
 
 
+
+    /**
+     * 更新育龄妇女状态定时任务
+     *
+     * @Param
+     * @Return
+     * @Author zhaoqifeng
+     * @Date 2022/9/8 15:45
+     */
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateYlfn() {
+        //获取育龄妇女配置
+        Result<List<YlfnValueResultDTO>> value = operCustomizeOpenFeignClient.getYlfnValue();
+        if(!value.success()) {
+            throw new EpmetException(value.getCode(), value.getMsg());
+        }
+        value.getData().forEach(item -> {
+            //查询客户下的非育龄妇女的女性居民
+            LambdaQueryWrapper<IcResiUserEntity> wrapper = new LambdaQueryWrapper<>();
+            wrapper.eq(IcResiUserEntity::getCustomerId, item.getCustomerId());
+            wrapper.eq(IcResiUserEntity::getGender, NumConstant.TWO_STR);
+            wrapper.eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR);
+            List<IcResiUserEntity> list = baseDao.selectList(wrapper);
+            if (CollectionUtils.isNotEmpty(list)) {
+                list.forEach(user -> {
+                    IdCardRegexUtils pares = IdCardRegexUtils.parse(user.getIdCard());
+                    if (null != pares && NumConstant.ONE_STR.equals(pares.getTypeEnum().getType())) {
+                        if (!NumConstant.ONE_STR.equals(user.getIsYlfn())) {
+                            //将不是育龄妇女的变为育龄妇女
+                            if (pares.getParsedResult().getAge() >= item.getMin() && pares.getParsedResult().getAge() <= item.getMax()) {
+                                //更新育龄妇女状态
+                                IcResiUserEntity icResiUserEntity = new IcResiUserEntity();
+                                icResiUserEntity.setId(user.getId());
+                                icResiUserEntity.setIsYlfn(NumConstant.ONE_STR);
+                                baseDao.updateById(icResiUserEntity);
+
+                                //添加居民变更记录
+                                IcUserChangeRecordEntity record = new IcUserChangeRecordEntity();
+                                record.setCustomerId(user.getCustomerId());
+                                record.setOperatorId("APP_USER");
+                                record.setOperatorName("自动匹配");
+                                record.setIcUserId(user.getId());
+                                record.setIcUserName(user.getName());
+                                record.setType("category");
+                                record.setTypeName("类别");
+                                record.setBeforeChangeName("育龄妇女:否;");
+                                record.setAfterChangeName("育龄妇女:是;");
+                                record.setChangeTime(new Date());
+                                icUserChangeRecordDao.insert(record);
+                                //添加变更明细
+                                IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity();
+                                detail.setCustomerId(user.getCustomerId());
+                                detail.setIcUserChangeRecordId(record.getId());
+                                detail.setPids(user.getPids());
+                                detail.setAgencyId(user.getAgencyId());
+                                detail.setGridId(user.getGridId());
+                                detail.setNeighborHoodId(user.getVillageId());
+                                detail.setBuildingId(user.getBuildId());
+                                detail.setBuildingUnitId(user.getUnitId());
+                                detail.setHouseId(user.getHomeId());
+                                detail.setIcUserId(user.getId());
+                                detail.setType("category");
+                                detail.setTypeName("类别");
+                                detail.setFieldName("IS_YLFN");
+                                detail.setValue(NumConstant.ONE);
+                                icUserChangeDetailedDao.insert(detail);
+                            }
+                        } else {
+                            //将是育龄妇女的变为非育龄妇女
+                            if (pares.getParsedResult().getAge() < item.getMin() || pares.getParsedResult().getAge() > item.getMax()) {
+                                //更新育龄妇女状态
+                                IcResiUserEntity icResiUserEntity = new IcResiUserEntity();
+                                icResiUserEntity.setId(user.getId());
+                                icResiUserEntity.setIsYlfn(NumConstant.ZERO_STR);
+                                baseDao.updateById(icResiUserEntity);
+                                //添加居民变更记录
+                                IcUserChangeRecordEntity record = new IcUserChangeRecordEntity();
+                                record.setCustomerId(user.getCustomerId());
+                                record.setOperatorId("APP_USER");
+                                record.setOperatorName("自动匹配");
+                                record.setIcUserId(user.getId());
+                                record.setIcUserName(user.getName());
+                                record.setType("category");
+                                record.setTypeName("类别");
+                                record.setBeforeChangeName("育龄妇女:是;");
+                                record.setAfterChangeName("育龄妇女:否;");
+                                record.setChangeTime(new Date());
+                                icUserChangeRecordDao.insert(record);
+                                //添加变更明细
+                                IcUserChangeDetailedEntity detail = new IcUserChangeDetailedEntity();
+                                detail.setCustomerId(user.getCustomerId());
+                                detail.setIcUserChangeRecordId(record.getId());
+                                detail.setPids(user.getPids());
+                                detail.setAgencyId(user.getAgencyId());
+                                detail.setGridId(user.getGridId());
+                                detail.setNeighborHoodId(user.getVillageId());
+                                detail.setBuildingId(user.getBuildId());
+                                detail.setBuildingUnitId(user.getUnitId());
+                                detail.setHouseId(user.getHomeId());
+                                detail.setIcUserId(user.getId());
+                                detail.setType("category");
+                                detail.setTypeName("类别");
+                                detail.setFieldName("IS_YLFN");
+                                detail.setValue(NumConstant.ONE_NEG);
+                                icUserChangeDetailedDao.insert(detail);
+                            }
+                        }
+                    }
+                });
+            }
+        });
+    }
 }