Browse Source

Merge branch 'yantai_zhengwu_master'

dev
lichao 2 years ago
parent
commit
b11201b94c
  1. 4
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java
  2. 3
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java
  3. 2
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java
  4. 5
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java
  5. BIN
      epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx
  6. BIN
      epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx
  7. 69
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java
  8. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java
  9. 72
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java
  10. 4
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java
  11. 16
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java
  12. 39
      epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java
  13. 48
      epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java
  14. 30
      epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java
  15. 78
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java
  16. 126
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java
  17. 83
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java
  18. 77
      epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml
  19. 20
      epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDeadTaskLogDao.xml

4
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java

@ -134,6 +134,6 @@ public class IcBuildingExcel extends ExcelVerifyInfo implements Serializable {
@Excel(name = "楼长身份证号")
private String buildingLeaderIdCard;
@Excel(name = "楼长类型")
private String buildingLeaderType;
/* @Excel(name = "楼长类型")
private String buildingLeaderType;*/
}

3
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java

@ -47,9 +47,6 @@ public class BuildingInfoModel {
@ExcelProperty(value = "楼长身份证号")
private String buildingLeaderIdCard;
@ExcelProperty(value = "楼长类型")
private String buildingLeaderType;
@ExcelProperty(value = "排序")
private BigDecimal sort;

2
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@ -121,6 +121,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
icBuildingDTO.setCustomerId(customerId);
IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class);
entity.setBuildingLeaderType("0");
icBuildingDao.insert(entity);
@ -735,6 +736,7 @@ public class BuildingServiceImpl implements BuildingService {
IcBuildingDTO icBuildingDTO = ConvertUtils.sourceToTarget(formDTO, IcBuildingDTO.class);
icBuildingDTO.setId(formDTO.getBuildingId());
icBuildingDTO.setCustomerId(customerId);
icBuildingDTO.setBuildingLeaderType("0");
icBuildingService.update(icBuildingDTO);

5
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@ -648,14 +648,15 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
private String getBuildingId(String customerId, ImportGeneralDTO info) {
//根据小区ID和楼栋名获取楼栋信息
IcBuildingDTO building = icBuildingService.getBuildingInfo(info.getNeighborHoodId(), info.getBuildingName());
if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
/* if (StringUtils.isNotBlank(info.getBuildingLeaderType())){
if (info.getBuildingLeaderType().equals("楼长")){
info.setBuildingLeaderTypeNum("0");
}
if (info.getBuildingLeaderType().equals("单元长")){
info.setBuildingLeaderTypeNum("1");
}
}
}*/
info.setBuildingLeaderTypeNum("0");
if (null != building) {
info.setBuildingExistStatus(true);

BIN
epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx

Binary file not shown.

BIN
epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_template.xlsx

Binary file not shown.

69
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java

@ -0,0 +1,69 @@
package com.epmet.dto;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Data
public class IcResiUserDeadTaskLogDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键
*/
private String id;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 0:正常数据 1:特殊数据
*/
private Integer dataType;
/**
* 数据数量
*/
private Integer dataCount;
/**
* 删除标识 0.未删除 1.已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人
*/
private String createdBy;
/**
* 创建时间
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

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

@ -55,4 +55,8 @@ public class DataSyncTaskParam implements Serializable {
* vaccine疫苗接种
*/
private String jobType;
private int start;
private int end;
}

72
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java

@ -0,0 +1,72 @@
package com.epmet.controller;
import com.epmet.commons.tools.aop.NoRepeatSubmit;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.AssertUtils;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.dto.IcResiUserDeadTaskLogDTO;
import com.epmet.service.IcResiUserDeadTaskLogService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@RestController
@RequestMapping("icResiUserDeadTaskLog")
public class IcResiUserDeadTaskLogController {
@Autowired
private IcResiUserDeadTaskLogService icResiUserDeadTaskLogService;
@RequestMapping("page")
public Result<PageData<IcResiUserDeadTaskLogDTO>> page(@RequestParam Map<String, Object> params){
PageData<IcResiUserDeadTaskLogDTO> page = icResiUserDeadTaskLogService.page(params);
return new Result<PageData<IcResiUserDeadTaskLogDTO>>().ok(page);
}
@RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
public Result<IcResiUserDeadTaskLogDTO> get(@PathVariable("id") String id){
IcResiUserDeadTaskLogDTO data = icResiUserDeadTaskLogService.get(id);
return new Result<IcResiUserDeadTaskLogDTO>().ok(data);
}
@NoRepeatSubmit
@PostMapping("save")
public Result save(@RequestBody IcResiUserDeadTaskLogDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
icResiUserDeadTaskLogService.save(dto);
return new Result();
}
@NoRepeatSubmit
@PostMapping("update")
public Result update(@RequestBody IcResiUserDeadTaskLogDTO dto){
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
icResiUserDeadTaskLogService.update(dto);
return new Result();
}
@PostMapping("delete")
public Result delete(@RequestBody String[] ids){
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
icResiUserDeadTaskLogService.delete(ids);
return new Result();
}
}

4
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java

@ -60,6 +60,10 @@ public interface DataSyncConfigDao extends BaseDao<DataSyncConfigEntity> {
*/
List<NatUserInfoResultDTO> getIdCardsByScope(DataSyncTaskParam formDTO);
List<NatUserInfoResultDTO> getIdCardsByScopeLimit(DataSyncTaskParam formDTO);
List<NatUserInfoResultDTO> getIdCardsForSiWang(@Param("start")int start, @Param("end")int end);
DataSyncConfigDTO getConfigInfoByType(@Param("customerId") String customerId, @Param("switchStatus") String switchStatus,@Param("dataCode")String dataCode);
}

16
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java

@ -0,0 +1,16 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.entity.IcResiUserDeadTaskLogEntity;
import org.apache.ibatis.annotations.Mapper;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Mapper
public interface IcResiUserDeadTaskLogDao extends BaseDao<IcResiUserDeadTaskLogEntity> {
}

39
epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java

@ -0,0 +1,39 @@
package com.epmet.entity;
import com.baomidou.mybatisplus.annotation.TableName;
import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("ic_resi_user_dead_task_log")
public class IcResiUserDeadTaskLogEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 客户Id customer.id
*/
private String customerId;
/**
* 0:正常数据 1:特殊数据
*/
private Integer dataType;
/**
* 数据数量
*/
private Integer dataCount;
}

48
epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java

@ -0,0 +1,48 @@
package com.epmet.excel;
import cn.afterturn.easypoi.excel.annotation.Excel;
import lombok.Data;
import java.util.Date;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Data
public class IcResiUserDeadTaskLogExcel {
@Excel(name = "主键")
private String id;
@Excel(name = "客户Id customer.id")
private String customerId;
@Excel(name = "0:正常数据 1:特殊数据")
private Integer dataType;
@Excel(name = "数据数量")
private Integer dataCount;
@Excel(name = "删除标识 0.未删除 1.已删除")
private String delFlag;
@Excel(name = "乐观锁")
private Integer revision;
@Excel(name = "创建人")
private String createdBy;
@Excel(name = "创建时间")
private Date createdTime;
@Excel(name = "更新人")
private String updatedBy;
@Excel(name = "更新时间")
private Date updatedTime;
}

30
epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java

@ -0,0 +1,30 @@
package com.epmet.redis;
import com.epmet.commons.tools.redis.RedisUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Component
public class IcResiUserDeadTaskLogRedis {
@Autowired
private RedisUtils redisUtils;
public void delete(Object[] ids) {
}
public void set(){
}
public String get(String id){
return null;
}
}

78
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java

@ -0,0 +1,78 @@
package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.IcResiUserDeadTaskLogDTO;
import com.epmet.entity.IcResiUserDeadTaskLogEntity;
import java.util.List;
import java.util.Map;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
public interface IcResiUserDeadTaskLogService extends BaseService<IcResiUserDeadTaskLogEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<IcResiUserDeadTaskLogDTO>
* @author generator
* @date 2023-05-16
*/
PageData<IcResiUserDeadTaskLogDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<IcResiUserDeadTaskLogDTO>
* @author generator
* @date 2023-05-16
*/
List<IcResiUserDeadTaskLogDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return IcResiUserDeadTaskLogDTO
* @author generator
* @date 2023-05-16
*/
IcResiUserDeadTaskLogDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2023-05-16
*/
void save(IcResiUserDeadTaskLogDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2023-05-16
*/
void update(IcResiUserDeadTaskLogDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2023-05-16
*/
void delete(String[] ids);
}

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

@ -106,6 +106,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
private IcTripReportRecordService icTripReportRecordService;
@Autowired
private IcTripReportRecordDao icTripReportRecordDao;
@Autowired
private IcResiUserDeadTaskLogDao icResiUserDeadTaskLogDao;
@Resource(name = "yantaiNamedParamLantuJdbcTemplate")
private NamedParameterJdbcTemplate yantaiNamedParamLantuJdbcTemplate;
@ -273,33 +276,86 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
log.warn("deathInfoScanTask scopeList is null");
return;
}
int pageNo = NumConstant.ONE;
int pageSize = NumConstant.ONE_THOUSAND;
LambdaQueryWrapper<IcResiUserDeadTaskLogEntity> logEntityLambdaQueryWrapper = new LambdaQueryWrapper<IcResiUserDeadTaskLogEntity>().orderByDesc(IcResiUserDeadTaskLogEntity::getCreatedTime).last("limit 1");
IcResiUserDeadTaskLogEntity logEntity = icResiUserDeadTaskLogDao.selectOne(logEntityLambdaQueryWrapper);
List<NatUserInfoResultDTO> userInfoResultDTOS = new ArrayList<>();
boolean isNum = false;
int start = 0;
if (logEntity == null){
userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000);
if (userInfoResultDTOS.size() < 50000){
isNum = true;
}
}else{
if (logEntity.getDataType() == 1){
userInfoResultDTOS = getNatUserInfoFromDbForSiWang(logEntity.getDataCount(),50000);
isNum = true;
}else if (logEntity.getDataType() == 0){
start = logEntity.getDataCount();
}
}
IcResiUserDeadTaskLogEntity newLog = new IcResiUserDeadTaskLogEntity();
newLog.setCreatedTime(new Date());
List<NatUserInfoResultDTO> dbResiList = null;
do {
for (DataSyncConfigDTO config : configData) {
// 设置查询数据范围
formDTO.setOrgList(config.getScopeList());
DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode());
dbResiList = getNatUserInfoFromDb(formDTO, pageNo, pageSize);
if (CollectionUtils.isEmpty(dbResiList)) {
continue;
}
switch (anEnum) {
case SI_WANG:
try {
//查询正常状态的居民
siWang(dbResiList);
log.info("======siWang信息拉取结束======");
} catch (Exception e) {
log.error("death thread execute exception", e);
}
default:
log.warn("没有要处理的数据");
for (DataSyncConfigDTO config : configData) {
// 设置查询数据范围
formDTO.setOrgList(config.getScopeList());
DataSyncEnum anEnum = DataSyncEnum.getEnum(config.getDataCode());
if (isNum){
formDTO.setStart(start);
formDTO.setEnd(50000-userInfoResultDTOS.size());
dbResiList = getNatUserInfoFromDbLimit(formDTO);
dbResiList.addAll(userInfoResultDTOS);
newLog.setDataType(0);
newLog.setDataCount(50000-dbResiList.size());
}else{
formDTO.setStart(start);
formDTO.setEnd(start+50000);
dbResiList = getNatUserInfoFromDbLimit(formDTO);
if (dbResiList.size()<50000){
userInfoResultDTOS = getNatUserInfoFromDbForSiWang(0,50000-dbResiList.size());
dbResiList.addAll(userInfoResultDTOS);
if (dbResiList.size() < 50000){
formDTO.setStart(0);
formDTO.setEnd(50000-dbResiList.size());
dbResiList.addAll(getNatUserInfoFromDbLimit(formDTO));
newLog.setDataType(0);
newLog.setDataCount(50000-dbResiList.size());
}else{
newLog.setDataType(1);
newLog.setDataCount(50000-dbResiList.size());
}
}else{
newLog.setDataType(0);
newLog.setDataCount(start+50000);
}
}
pageNo++;
} while (dbResiList != null && dbResiList.size() == pageSize);
icResiUserDeadTaskLogDao.insert(newLog);
if (CollectionUtils.isEmpty(dbResiList)) {
continue;
}
switch (anEnum) {
case SI_WANG:
try {
//查询正常状态的居民
siWang(dbResiList);
log.info("======siWang信息拉取结束======");
} catch (Exception e) {
log.error("death thread execute exception", e);
}
default:
log.warn("没有要处理的数据");
}
}
}
/**
@ -680,6 +736,28 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl<DataSyncConfigDao
return pageInfo.getList();
}
/**
* desc从数据库获取居民信息
*
* @param formDTO
* @return
*/
public List<NatUserInfoResultDTO> getNatUserInfoFromDbLimit(DataSyncTaskParam formDTO) {
//根据 组织 分页获取 居民数据
List<NatUserInfoResultDTO> list = baseDao.getIdCardsByScopeLimit(formDTO);
return list;
}
/**
* desc从数据库获取居民信息死亡
* @return
*/
public List<NatUserInfoResultDTO> getNatUserInfoFromDbForSiWang(int start, int end) {
List<NatUserInfoResultDTO> list = baseDao.getIdCardsForSiWang(start, end);
return list;
}
private void canJi(List<NatUserInfoResultDTO> resiList) {
try {
List<DataSyncRecordDisabilityEntity> list = new ArrayList<>();

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

@ -0,0 +1,83 @@
package com.epmet.service.impl;
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.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.dao.IcResiUserDeadTaskLogDao;
import com.epmet.dto.IcResiUserDeadTaskLogDTO;
import com.epmet.entity.IcResiUserDeadTaskLogEntity;
import com.epmet.service.IcResiUserDeadTaskLogService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
/**
* 居民死亡任务log
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2023-05-16
*/
@Service
public class IcResiUserDeadTaskLogServiceImpl extends BaseServiceImpl<IcResiUserDeadTaskLogDao, IcResiUserDeadTaskLogEntity> implements IcResiUserDeadTaskLogService {
@Override
public PageData<IcResiUserDeadTaskLogDTO> page(Map<String, Object> params) {
IPage<IcResiUserDeadTaskLogEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, IcResiUserDeadTaskLogDTO.class);
}
@Override
public List<IcResiUserDeadTaskLogDTO> list(Map<String, Object> params) {
List<IcResiUserDeadTaskLogEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, IcResiUserDeadTaskLogDTO.class);
}
private QueryWrapper<IcResiUserDeadTaskLogEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
QueryWrapper<IcResiUserDeadTaskLogEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public IcResiUserDeadTaskLogDTO get(String id) {
IcResiUserDeadTaskLogEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, IcResiUserDeadTaskLogDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(IcResiUserDeadTaskLogDTO dto) {
IcResiUserDeadTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserDeadTaskLogEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(IcResiUserDeadTaskLogDTO dto) {
IcResiUserDeadTaskLogEntity entity = ConvertUtils.sourceToTarget(dto, IcResiUserDeadTaskLogEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
}

77
epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml

@ -108,6 +108,83 @@
ORDER BY CREATED_TIME
</select>
<!-- 根据范围查询居民证件号 -->
<select id="getIdCardsByScopeLimit" resultType="com.epmet.dto.result.NatUserInfoResultDTO">
SELECT
DISTINCT ID_CARD AS idCard,
CUSTOMER_ID,
ID AS userId,
`NAME`,
AGENCY_ID AS agencyId,
GRID_ID,
<if test="categoryColumn != null and categoryColumn != ''">
${categoryColumn} AS categoryColumn,
</if>
pids,
mobile
FROM ic_resi_user
WHERE DEL_FLAG = '0'
AND `STATUS` =
<choose>
<when test="resiStatus != null and resiStatus != ''">
#{resiStatus}
</when>
<otherwise>
'0'
</otherwise>
</choose>
<if test="idCards != null and idCards.size() != 0">
AND id_card in
<foreach collection="idCards" item="idCard" separator="," close=")" open="(" >
#{idCard}
</foreach>
</if>
<choose>
<when test='null == agencyId'>
AND (
<foreach collection="orgList" item="l" separator="OR">
<choose>
<when test='"grid" == l.orgType'>GRID_ID = #{l.orgId}</when>
<otherwise>PIDS LIKE CONCAT(#{l.orgIdPath},'%')</otherwise>
</choose>
</foreach>
)
</when>
<otherwise>
AND PIDS LIKE CONCAT(#{agencyId},'%')
</otherwise>
</choose>
ORDER BY CREATED_TIME
limit #{start} , #{end}
</select>
<!-- 根据范围查询居民证件号 -->
<select id="getIdCardsForSiWang" resultType="com.epmet.dto.result.NatUserInfoResultDTO">
SELECT
DISTINCT ID_CARD AS idCard,
CUSTOMER_ID,
ID AS userId,
`NAME`,
AGENCY_ID AS agencyId,
GRID_ID,
pids,
mobile
FROM ic_resi_user
WHERE DEL_FLAG = '0'
AND
(PIDS LIKE CONCAT('%','1580109539564904450','%')
OR
PIDS LIKE CONCAT('%','1536259086301294593','%')
OR
PIDS LIKE CONCAT('%','1536259195479027714','%')
OR
PIDS LIKE CONCAT('%','1580099893898829826','%'))
ORDER BY CREATED_TIME
limit #{start} , #{end}
</select>
<select id="getConfigInfoByType" resultType="com.epmet.dto.DataSyncConfigDTO">
select * FROM data_sync_config
WHERE DEL_FLAG = 0

20
epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDeadTaskLogDao.xml

@ -0,0 +1,20 @@
<?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.IcResiUserDeadTaskLogDao">
<resultMap type="com.epmet.entity.IcResiUserDeadTaskLogEntity" id="icResiUserDeadTaskLogMap">
<result property="id" column="ID"/>
<result property="customerId" column="CUSTOMER_ID"/>
<result property="dataType" column="DATA_TYPE"/>
<result property="dataCount" column="DATA_COUNT"/>
<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>
Loading…
Cancel
Save