From c2205665d5eb1801f8ecc6ab5eff2384f62f2095 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 15 May 2023 13:29:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/model/BuildingInfoModel.java | 3 --- .../service/impl/BuildingServiceImpl.java | 2 ++ .../impl/IcNeighborHoodServiceImpl.java | 5 +++-- .../resources/excel/building_template.xlsx | Bin 11754 -> 11727 bytes 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java index 38df15fe5d..3a72a3f253 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/BuildingInfoModel.java +++ b/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; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 8eb14781f5..c8a7d1fd13 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/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); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index f9c10cf973..bc6175f78a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -629,14 +629,15 @@ public class IcNeighborHoodServiceImpl extends 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 OM57Rxh>`D~VgCg@dt|c! delta 5510 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 g;gP{vIk`~@asCaR|3Wa{Uq}US;UvW1XZ Date: Mon, 15 May 2023 13:46:55 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/excel/IcBuildingExcel.java | 4 ++-- .../main/resources/excel/building_export.xlsx | Bin 11696 -> 11676 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java index 52e7a2a435..baf1cdb4a6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcBuildingExcel.java +++ b/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;*/ } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/building_export.xlsx index d1cad4c5560a387e821cd06056ab4b93983d127f..ba32c961d1359c4a0993a119cadd5a3106ca006a 100644 GIT binary patch delta 5360 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 From 511eaab4ee4643ba994f1436843785373ae05ab7 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 17 May 2023 14:17:29 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=8B=89=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcResiUserDeadTaskLogDTO.java | 69 ++++++++++ .../com/epmet/dto/form/DataSyncTaskParam.java | 4 + .../IcResiUserDeadTaskLogController.java | 72 ++++++++++ .../java/com/epmet/dao/DataSyncConfigDao.java | 4 + .../epmet/dao/IcResiUserDeadTaskLogDao.java | 16 +++ .../entity/IcResiUserDeadTaskLogEntity.java | 39 ++++++ .../excel/IcResiUserDeadTaskLogExcel.java | 48 +++++++ .../redis/IcResiUserDeadTaskLogRedis.java | 30 +++++ .../service/IcResiUserDeadTaskLogService.java | 78 +++++++++++ .../impl/DataSyncConfigServiceImpl.java | 126 ++++++++++++++---- .../IcResiUserDeadTaskLogServiceImpl.java | 83 ++++++++++++ .../resources/mapper/DataSyncConfigDao.xml | 77 +++++++++++ .../mapper/IcResiUserDeadTaskLogDao.xml | 20 +++ 13 files changed, 642 insertions(+), 24 deletions(-) create mode 100755 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java create mode 100755 epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java create mode 100755 epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDeadTaskLogDao.xml diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDeadTaskLogDTO.java new file mode 100755 index 0000000000..5fe9720ce7 --- /dev/null +++ b/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; + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java index 13a230c644..fff121cde4 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/DataSyncTaskParam.java +++ b/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; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserDeadTaskLogController.java new file mode 100755 index 0000000000..ded5028e7e --- /dev/null +++ b/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> page(@RequestParam Map params){ + PageData page = icResiUserDeadTaskLogService.page(params); + return new Result>().ok(page); + } + + @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) + public Result get(@PathVariable("id") String id){ + IcResiUserDeadTaskLogDTO data = icResiUserDeadTaskLogService.get(id); + return new Result().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(); + } + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java index 35bbc6266d..303366c0f6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/DataSyncConfigDao.java @@ -60,6 +60,10 @@ public interface DataSyncConfigDao extends BaseDao { */ List getIdCardsByScope(DataSyncTaskParam formDTO); + List getIdCardsByScopeLimit(DataSyncTaskParam formDTO); + + List getIdCardsForSiWang(@Param("start")int start, @Param("end")int end); + DataSyncConfigDTO getConfigInfoByType(@Param("customerId") String customerId, @Param("switchStatus") String switchStatus,@Param("dataCode")String dataCode); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDeadTaskLogDao.java new file mode 100755 index 0000000000..b51a494890 --- /dev/null +++ b/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 { + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserDeadTaskLogEntity.java new file mode 100755 index 0000000000..79f9318880 --- /dev/null +++ b/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; + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/excel/IcResiUserDeadTaskLogExcel.java new file mode 100755 index 0000000000..b6deb4af29 --- /dev/null +++ b/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; + + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/IcResiUserDeadTaskLogRedis.java new file mode 100755 index 0000000000..764447a7e9 --- /dev/null +++ b/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; + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserDeadTaskLogService.java new file mode 100755 index 0000000000..6f42f28fb1 --- /dev/null +++ b/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 { + + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2023-05-16 + */ + PageData page(Map params); + + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2023-05-16 + */ + List list(Map 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); +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java index 4473b71722..8d2c06dfa9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncConfigServiceImpl.java @@ -106,6 +106,9 @@ public class DataSyncConfigServiceImpl extends BaseServiceImpl logEntityLambdaQueryWrapper = new LambdaQueryWrapper().orderByDesc(IcResiUserDeadTaskLogEntity::getCreatedTime).last("limit 1"); + IcResiUserDeadTaskLogEntity logEntity = icResiUserDeadTaskLogDao.selectOne(logEntityLambdaQueryWrapper); + + List 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 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 getNatUserInfoFromDbLimit(DataSyncTaskParam formDTO) { + //根据 组织 分页获取 居民数据 + List list = baseDao.getIdCardsByScopeLimit(formDTO); + return list; + } + + /** + * desc：从数据库获取居民信息死亡 + * @return + */ + public List getNatUserInfoFromDbForSiWang(int start, int end) { + + List list = baseDao.getIdCardsForSiWang(start, end); + return list; + } + private void canJi(List resiList) { try { List list = new ArrayList<>(); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserDeadTaskLogServiceImpl.java new file mode 100755 index 0000000000..29b5089654 --- /dev/null +++ b/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 implements IcResiUserDeadTaskLogService { + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, IcResiUserDeadTaskLogDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, IcResiUserDeadTaskLogDTO.class); + } + + private QueryWrapper getWrapper(Map params){ + String id = (String)params.get(FieldConstant.ID_HUMP); + + QueryWrapper 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)); + } + +} \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml index ea80141610..f25185a68d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/DataSyncConfigDao.xml @@ -108,6 +108,83 @@ ORDER BY CREATED_TIME + + + + + + +