From b49f338d1727226faee2e940ea4daac940f591b7 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 16 May 2023 15:43:06 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E8=AE=BF=E9=97=AE=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/epmet-cloud.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/epmet-cloud.md b/doc/epmet-cloud.md index 18928176dc..15a6fa173d 100644 --- a/doc/epmet-cloud.md +++ b/doc/epmet-cloud.md @@ -20,6 +20,9 @@ PS:目前正在测试通过负载均衡器和本地环境变量实现动态修 - dysmsapi.aliyuncs.com 阿里云短信 - api.weixin.qq.com 微信直接交互（二维码等） - oss-cn-qingdao.aliyuncs.com(如果需要用到oss) +- service.sdmap.gov.cn 地图搜索代理 +- wprd03.is.autonavi.com 地图瓦片代理 +- oapi.dingtalk.com 钉钉后台交互（如果需要） From fdf9a82f62d4c95bdc5c42c67032a8dbda40c8a3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 12:06:38 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=80=E4=B8=AAGovOr?= =?UTF-8?q?gOpenFeignClient?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 9a3863b42d..ae2b92dcd5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -154,8 +154,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultDTOResult = getGovOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId()); + Result resultDTOResult = govOrgOpenFeignClient.getHouseAgencyInfo(houseInfo.getHomeId()); HouseAgencyInfoResultDTO data = resultDTOResult.getData(); entity.setGridId(data.getGridId()); entity.setPids(data.getPids() + ":" + data.getAgencyId()); From 547f9da83d6a29fed3a1e32f2cd8fd14dba3c81b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 13:13:31 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=EF=BC=8C=E5=88=A0=E9=99=A4=E5=B1=85=E6=B0=91=EF=BC=8C?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B=E6=98=AF=E5=90=A6=E6=98=AF?= =?UTF-8?q?=E5=85=9A=E5=91=98=E4=B8=AD=E5=BF=83=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ConfigPartyCenterHouseFormDTO.java | 18 +++++++++ .../epmet/feign/GovOrgOpenFeignClient.java | 10 +++++ .../GovOrgOpenFeignClientFallback.java | 12 ++++++ .../epmet/controller/IcHouseController.java | 10 +++++ .../com/epmet/service/IcHouseService.java | 7 ++++ .../service/impl/IcHouseServiceImpl.java | 19 ++++++++- .../impl/IcResiUserImportServiceImpl.java | 40 ++++++++++++++++++- .../service/impl/IcResiUserServiceImpl.java | 27 ++++++++----- 8 files changed, 130 insertions(+), 13 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ConfigPartyCenterHouseFormDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ConfigPartyCenterHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ConfigPartyCenterHouseFormDTO.java new file mode 100644 index 0000000000..faa711dc25 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ConfigPartyCenterHouseFormDTO.java @@ -0,0 +1,18 @@ +package com.epmet.dto.result.lingshan; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/17 12:45 + */ +@Data +public class ConfigPartyCenterHouseFormDTO { + private String houseId; + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 6712f7247e..3f76336879 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.ConfigPartyCenterHouseFormDTO; import com.epmet.feign.fallback.GovOrgOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -782,4 +783,13 @@ public interface GovOrgOpenFeignClient { Result> lingshanPartyServiceCenterList( @RequestParam(value = "objType", required = false) String objType, @RequestParam(value = "orgId", required = false) String orgId); + + /** + * 灵山项目：新增居民/修改居民/删除居民/导入居民时，重新更新房屋是否是党员中心户 + * + * @param formDTO + * @return + */ + @PostMapping("/gov/org/ichouse/updatePartyCenterHouse") + Result updatePartyCenterHouse(@RequestBody ConfigPartyCenterHouseFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index 040c046b85..5d8c8ebf4b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.ConfigPartyCenterHouseFormDTO; import com.epmet.feign.GovOrgOpenFeignClient; import java.util.List; @@ -483,4 +484,15 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { public Result> lingshanPartyServiceCenterList(String objType, String orgId) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "lingshanPartyServiceCenterList", objType, orgId); } + + /** + * 灵山项目：新增居民/修改居民/删除居民/导入居民时，重新更新房屋是否是党员中心户 + * + * @param formDTO + * @return + */ + @Override + public Result updatePartyCenterHouse(ConfigPartyCenterHouseFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "updatePartyCenterHouse", formDTO); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java index e0ffaeb3e7..ae3393cf17 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java @@ -218,4 +218,14 @@ public class IcHouseController { return new Result>().ok(icHouseService.getOrgTreeData(formDTO.getGridId())); } + /** + * 灵山项目：新增居民/修改居民/删除居民/导入居民时，重新更新房屋是否是党员中心户 + * @param formDTO + * @return + */ + @PostMapping("updatePartyCenterHouse") + public Result updatePartyCenterHouse(@RequestBody ConfigPartyCenterHouseFormDTO formDTO){ + icHouseService.updatePartyCenterHouse(formDTO.getHouseId(),formDTO.getPartyCenterHouseFlag()); + return new Result(); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index 476ce0419a..cec8ca1349 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -176,4 +176,11 @@ public interface IcHouseService extends BaseService { * @return */ List getOrgTreeData(String gridId); + + /** + * 更新房屋是否是党员中心户 + * @param houseId + * @param partyCenterHouseFlag + */ + void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 0a9da1c2b6..34cebde341 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; @@ -452,8 +453,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId); partyCenterHouseLianhuDao.deleteByPartyCenterHouseId(partyCenterHouseId); // 后插入 lianHuHouseList.forEach(lianHuHouse->{ @@ -534,6 +533,22 @@ public class IcHouseServiceImpl extends BaseServiceImpl update = new LambdaUpdateWrapper<>(); + update.set(IcHouseEntity::getPartyCenterHouseFlag, partyCenterHouseFlag).eq(IcHouseEntity::getId, houseId); + baseDao.update(null, update); + if(NumConstant.ZERO_STR.equals(partyCenterHouseFlag)){ + //房屋如果不是党员中心户，自动删除绑定的联户 + partyCenterHouseLianhuDao.deleteByPartyCenterHouseId(houseId); + } + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index e0b5c91837..32b893b28b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -6,7 +6,6 @@ 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; @@ -14,6 +13,7 @@ import com.epmet.bean.ResiImportChangedData; import com.epmet.bean.ResiImportResiCategoryChangedCache; import com.epmet.commons.rocketmq.messages.PartymemberSyncMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -41,6 +41,7 @@ import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.IcResiUserOrgMsgFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.ConfigPartyCenterHouseFormDTO; import com.epmet.entity.*; import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.handler.IcResiImportDynamicExcelListener; @@ -61,6 +62,7 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -2299,4 +2301,40 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res importTaskId, processStatus, operatorId, resultDesc, resultDescPath); } } + + /** + * 灵山需求 + * @param houseId ：房屋id + */ + @Async + public void syncHousePartyCenterHouse(String houseId,String resiUserId) { + if(StringUtils.isBlank(houseId)){ + IcResiUserEntity entity=icResiUserDao.selectById(resiUserId); + houseId=entity.getHomeId(); + } + // 查询房屋里的所有人 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, houseId) + .eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR) + .select(IcResiUserEntity::getId); + List resiList = icResiUserDao.selectList(wrapper); + + //默认该房屋不是党员中心户 + ConfigPartyCenterHouseFormDTO configPartyCenterHouseFormDTO=new ConfigPartyCenterHouseFormDTO(); + configPartyCenterHouseFormDTO.setHouseId(houseId); + configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ZERO_STR); + + if(CollectionUtils.isNotEmpty(resiList)){ + List resiIds = resiList.stream().map(IcResiUserEntity::getId).collect(Collectors.toList()); + // 是否有党员中心户 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.in(IcPartyMemberEntity::getIcResiUser, resiIds) + .eq(IcPartyMemberEntity::getIsDyzxh, NumConstant.ONE_STR); + List dyzxhList = icPartyMemberDao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(dyzxhList)) { + configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ONE_STR); + } + } + govOrgOpenFeignClient.updatePartyCenterHouse(configPartyCenterHouseFormDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index ae2b92dcd5..2dd0e033a4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -61,6 +61,7 @@ import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; +import com.epmet.dto.result.lingshan.ConfigPartyCenterHouseFormDTO; import com.epmet.dto.result.resi.IcResiNonDynamicResultDTO; import com.epmet.entity.*; import com.epmet.enums.RenHuConditionEnum; @@ -132,8 +133,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> subTableRes = operCustomizeOpenFeignClient.queryIcResiSubTables(queryDTO); @@ -217,6 +219,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resiWrapper=new LambdaQueryWrapper<>(); resiWrapper.eq(IcResiUserEntity::getAgencyId,formDTO.getAgencyId()); resiWrapper.select(IcResiUserEntity::getId); - List resiIds=icResiUserDao.selectList(resiWrapper); + List resiIds=baseDao.selectList(resiWrapper); for(IcResiUserEntity entity:resiIds){ baseDao.updateToDel(entity.getId(),formDTO.getCurrentStaffId()); CustomerFormQueryDTO queryDTO = ConvertUtils.sourceToTarget(formDTO, CustomerFormQueryDTO.class); @@ -448,7 +452,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl columns = categoryListResult.getData().stream().map(IcResiCategoryStatsConfigDTO::getColumnName).collect(Collectors.toList()); - Map hash = icResiUserDao.getCategoryListMap(columns, entity.getId()); + Map hash = baseDao.getCategoryListMap(columns, entity.getId()); //封装变更记录和变更明细数据 //变更记录 IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); @@ -1685,7 +1692,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl volunteers = icResiUserDao.selectVolunteerByUserId(resiEntity.getId()); + List volunteers = baseDao.selectVolunteerByUserId(resiEntity.getId()); if (CollectionUtils.isNotEmpty(volunteers)) { String[] vCategories = volunteers.get(0).split(","); @@ -1702,7 +1709,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resiCategoryNames = new ArrayList<>(); - Map categories = icResiUserDao.getCategoryListMap(resiCategoryColumns, resiUserId); + Map categories = baseDao.getCategoryListMap(resiCategoryColumns, resiUserId); categories.forEach((k, v) -> { if (NumConstant.ONE_STR.equals(v)) { ResiCategoryEnum enumObject = ResiCategoryEnum.getEnum(k); @@ -2832,7 +2839,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl userWrapper = new LambdaQueryWrapper<>(); userWrapper.ne(IcResiUserEntity::getId, dto.getIcResiUserId()); From d9a8ce711a1aea077c3e0b0ef8112d230ec7ae1e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 13:43:18 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E7=AD=89=E4=BC=9A=E5=86=8D=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 36 ---------------- .../service/impl/IcResiUserServiceImpl.java | 41 +++++++++++++++++-- 2 files changed, 38 insertions(+), 39 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 32b893b28b..1bc7389627 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -2301,40 +2301,4 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res importTaskId, processStatus, operatorId, resultDesc, resultDescPath); } } - - /** - * 灵山需求 - * @param houseId ：房屋id - */ - @Async - public void syncHousePartyCenterHouse(String houseId,String resiUserId) { - if(StringUtils.isBlank(houseId)){ - IcResiUserEntity entity=icResiUserDao.selectById(resiUserId); - houseId=entity.getHomeId(); - } - // 查询房屋里的所有人 - LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getHomeId, houseId) - .eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR) - .select(IcResiUserEntity::getId); - List resiList = icResiUserDao.selectList(wrapper); - - //默认该房屋不是党员中心户 - ConfigPartyCenterHouseFormDTO configPartyCenterHouseFormDTO=new ConfigPartyCenterHouseFormDTO(); - configPartyCenterHouseFormDTO.setHouseId(houseId); - configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ZERO_STR); - - if(CollectionUtils.isNotEmpty(resiList)){ - List resiIds = resiList.stream().map(IcResiUserEntity::getId).collect(Collectors.toList()); - // 是否有党员中心户 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); - queryWrapper.in(IcPartyMemberEntity::getIcResiUser, resiIds) - .eq(IcPartyMemberEntity::getIsDyzxh, NumConstant.ONE_STR); - List dyzxhList = icPartyMemberDao.selectList(queryWrapper); - if (CollectionUtils.isNotEmpty(dyzxhList)) { - configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ONE_STR); - } - } - govOrgOpenFeignClient.updatePartyCenterHouse(configPartyCenterHouseFormDTO); - } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 2dd0e033a4..8cc63c2c41 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -87,6 +87,7 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -220,7 +221,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, houseId) + .eq(IcResiUserEntity::getStatus, NumConstant.ZERO_STR) + .select(IcResiUserEntity::getId); + List resiList = baseDao.selectList(wrapper); + + //默认该房屋不是党员中心户 + ConfigPartyCenterHouseFormDTO configPartyCenterHouseFormDTO=new ConfigPartyCenterHouseFormDTO(); + configPartyCenterHouseFormDTO.setHouseId(houseId); + configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ZERO_STR); + + if(CollectionUtils.isNotEmpty(resiList)){ + List resiIds = resiList.stream().map(IcResiUserEntity::getId).collect(Collectors.toList()); + // 是否有党员中心户 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); + queryWrapper.in(IcPartyMemberEntity::getIcResiUser, resiIds) + .eq(IcPartyMemberEntity::getIsDyzxh, NumConstant.ONE_STR); + List dyzxhList = icPartyMemberDao.selectList(queryWrapper); + if (CollectionUtils.isNotEmpty(dyzxhList)) { + configPartyCenterHouseFormDTO.setPartyCenterHouseFlag(NumConstant.ONE_STR); + } + } + govOrgOpenFeignClient.updatePartyCenterHouse(configPartyCenterHouseFormDTO); + } } From ba94f0b41db41e06aa2425dbdc24f28155e4a764 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 13:45:52 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E7=AD=89=E4=BC=9A=E5=86=8D=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 8cc63c2c41..681c0cc358 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -87,7 +87,6 @@ import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; From 465222149b951c9096988b05b7703252c92dd98a Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 14:03:22 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC=E5=85=A5=E7=9A=84?= =?UTF-8?q?postProcessor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ResiImportDyzxhPostProcessor.java | 13 ++++++++++++ .../processor/ResiImportPostProcessor.java | 21 +++++++++++++++++++ .../impl/IcResiUserImportServiceImpl.java | 10 ++++++++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java create mode 100644 epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java new file mode 100644 index 0000000000..a88b085b6c --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java @@ -0,0 +1,13 @@ +package com.epmet.processor; + +import org.springframework.stereotype.Component; + +import java.util.Map; + +@Component +public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{ + @Override + public void consume(Map resiInfoMap) { + System.out.println(resiInfoMap); + } +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java new file mode 100644 index 0000000000..8fb7633444 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportPostProcessor.java @@ -0,0 +1,21 @@ +package com.epmet.processor; + +import java.util.Map; + +/** + * @Description 居民信息导入之后的处理方法 + * @Author wangxianzhang + * @Time 2023/5/17 1:33 PM + */ +public abstract class ResiImportPostProcessor { + + /** + * @Description: 居民信息导入之后的消费方法 + * @param resiInfoMap: 居民信息map + * @Return void + * @Author: wangxianzhang + * @Date: 2023/5/17 1:33 PM + */ + public abstract void consume(Map resiInfoMap); + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index e0b5c91837..81bbe616b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -46,6 +46,7 @@ import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.handler.IcResiImportDynamicExcelListener; import com.epmet.excel.handler.IcResiVirtualSheetImportListener; import com.epmet.feign.*; +import com.epmet.processor.ResiImportPostProcessor; import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.send.SendMqMsgUtil; import com.epmet.service.IcResiUserImportService; @@ -170,6 +171,8 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res private IcPartyMemberDao icPartyMemberDao; @Autowired private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + @Autowired + private List resiImportPostProcessors; /** * 子表中不需要的列。因为主表中需要身份证号，网格等信息，但子表中不需要这些列必填，只要有身份证号即可，因此字表判断的时候需要排除这些列 @@ -584,6 +587,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res categoryData = null; } + // 居民信息导入后置处理器回调 + resiImportPostProcessors.forEach(p -> p.consume(columnAndValues)); + } catch (Exception e) { String errorMsg; @@ -1040,7 +1046,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res superOptions = new HashMap<>(); superOptions.put(superColumnValue, options); itemIdAndOptionsCache.put(currentItemId, superOptions); - + if (options == null) { + System.out.println(options); + } String colValue = options.get(cellContent); columnWrapper.setColValue(colValue); } From 7ea467d5efc239fcb10f9f84ebdef9d345b4430e Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 14:16:32 +0800 Subject: [PATCH 07/17] modify... --- .../java/com/epmet/processor/ResiImportDyzxhPostProcessor.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java index a88b085b6c..45dc81fe25 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java @@ -8,6 +8,6 @@ import java.util.Map; public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{ @Override public void consume(Map resiInfoMap) { - System.out.println(resiInfoMap); + } } From b90add68e6ed129b67164186edec643c0839f7c7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 14:28:22 +0800 Subject: [PATCH 08/17] test --- .../mq/listener/ICWarnStatsEventListener.java | 5 +++++ .../ResiImportDyzxhPostProcessor.java | 21 +++++++++++++++++++ .../service/impl/IcResiUserServiceImpl.java | 6 ------ 3 files changed, 26 insertions(+), 6 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java index c1328f548a..8d9b07a7ab 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/mq/listener/ICWarnStatsEventListener.java @@ -15,6 +15,7 @@ import com.epmet.constant.SystemMessageType; import com.epmet.service.IcNatService; import com.epmet.service.IcResiUserService; import com.epmet.service.StatsResiWarnService; +import com.epmet.service.impl.IcResiUserServiceImpl; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang.StringUtils; import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext; @@ -77,6 +78,10 @@ public class ICWarnStatsEventListener implements MessageListenerConcurrently { if (!updateIcNatResiFlag(tags, obj)){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"消费失败,等待重新消费"); } + + //灵山需求：如果放屋里的人，有党员中心户， 将ic_house.party_center_house_flag置为1，说明该房屋是党员中心户 + SpringContextUtils.getBean(IcResiUserServiceImpl.class).syncHousePartyCenterHouse(null,obj.getIcResiUser()); + } catch (RenException e) { // 如果是我们手动抛出的异常，说明在业务可控范围内。目前不需要MQ重试 logger.error("【开放数据事件监听器】-居民信息变动MQ失败:".concat(ExceptionUtils.getErrorStackTrace(e))); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java index a88b085b6c..a4fd8ccd55 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java @@ -1,13 +1,34 @@ package com.epmet.processor; +import com.epmet.commons.rocketmq.messages.IcResiUserAddMQMsg; +import com.epmet.constant.SystemMessageType; +import com.epmet.dto.form.SystemMsgFormDTO; +import com.epmet.feign.EpmetMessageOpenFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import java.util.Map; +@Slf4j @Component public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{ + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; + + @Override public void consume(Map resiInfoMap) { System.out.println(resiInfoMap); + String customerId=resiInfoMap.get("CUSTOMER_ID"); + String userId=resiInfoMap.get("ID"); + //推送MQ事件 + IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg(); + mqMsg.setCustomerId(customerId); + mqMsg.setIcResiUser(userId); + SystemMsgFormDTO form = new SystemMsgFormDTO(); + form.setMessageType(SystemMessageType.IC_RESI_USER_ADD); + form.setContent(mqMsg); + epmetMessageOpenFeignClient.sendSystemMsgByMQ(form); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 681c0cc358..b149345970 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java @@ -219,8 +219,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 17 May 2023 15:11:15 +0800 Subject: [PATCH 09/17] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E5=85=9A=E5=91=98=E4=B8=AD=E5=BF=83=E6=88=B7?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E4=B8=AA=E6=88=BF=E5=B1=8B=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/enums/HouseChangeEnums.java | 5 ++- .../epmet/service/impl/HouseServiceImpl.java | 38 +++++++++++++++++++ .../service/impl/IcHouseServiceImpl.java | 14 +++++-- 3 files changed, 52 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseChangeEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseChangeEnums.java index bd8cd9a1be..e10170853d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseChangeEnums.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseChangeEnums.java @@ -14,8 +14,9 @@ public enum HouseChangeEnums { RENT_FLAG("RENT_FLAG","房屋状态"), OWNER_NAME("OWNER_NAME","房主姓名"), OWNER_PHONE("OWNER_PHONE","房主电话"), - OWNER_ID_CARD("OWNER_ID_CARD","房主身份证"); - + OWNER_ID_CARD("OWNER_ID_CARD","房主身份证"), + // 灵山项目：是否党员中心户：1是；0不是 + PARTY_CENTER_HOUSE_FLAG("PARTY_CENTER_HOUSE_FLAG", "党员中心户"); private String column; private String columnName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index d47c6e0132..a642150cf9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -356,6 +356,44 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { e.setChangeBefore(StringUtils.isNotBlank(entity.getOwnerIdCard()) ? entity.getOwnerIdCard() : "无"); entityList.add(e); } + if (StringUtils.isNotBlank(entity.getPartyCenterHouseFlag())) { + if(!entity.getPartyCenterHouseFlag().equals(houseDTO.getPartyCenterHouseFlag())){ + String originName=NumConstant.ZERO_STR.equals(entity.getPartyCenterHouseFlag())?"否":"是"; + String nowName=""; + if(NumConstant.ZERO_STR.equals(houseDTO.getPartyCenterHouseFlag())){ + nowName="否"; + }else if(NumConstant.ONE_STR.equals(houseDTO.getPartyCenterHouseFlag())){ + nowName="是"; + }else{ + nowName="-"; + } + sbAfter.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append(nowName).append("；"); + sbBefore.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append(originName).append("；"); + IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity(); + e.setChangeCol(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumn()); + e.setChangeAfter(nowName); + e.setChangeBefore(originName); + entityList.add(e); + } + } else { + // 原来不确定是否是党员中心户 + String nowName=""; + if(NumConstant.ZERO_STR.equals(houseDTO.getPartyCenterHouseFlag())){ + nowName="否"; + }else if(NumConstant.ONE_STR.equals(houseDTO.getPartyCenterHouseFlag())){ + nowName="是"; + }else{ + nowName="-"; + } + sbAfter.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append(nowName).append("；"); + sbBefore.append(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumnName()).append(":").append("-").append("；"); + IcHouseChangeDetailEntity e = new IcHouseChangeDetailEntity(); + e.setChangeCol(HouseChangeEnums.PARTY_CENTER_HOUSE_FLAG.getColumn()); + e.setChangeAfter(nowName); + e.setChangeBefore("-"); + entityList.add(e); + } + if (StringUtils.isNotBlank(sbAfter)) { String before = sbBefore.substring(NumConstant.ZERO, sbBefore.length() - NumConstant.ONE); String after = sbAfter.substring(NumConstant.ZERO, sbAfter.length() - NumConstant.ONE); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 34cebde341..e471544dc3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.OperCustomizeOpenFeignClient; import com.epmet.redis.IcHouseRedis; import com.epmet.service.CustomerGridService; +import com.epmet.service.HouseService; import com.epmet.service.IcHouseService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -541,13 +542,20 @@ public class IcHouseServiceImpl extends BaseServiceImpl update = new LambdaUpdateWrapper<>(); - update.set(IcHouseEntity::getPartyCenterHouseFlag, partyCenterHouseFlag).eq(IcHouseEntity::getId, houseId); - baseDao.update(null, update); if(NumConstant.ZERO_STR.equals(partyCenterHouseFlag)){ //房屋如果不是党员中心户，自动删除绑定的联户 partyCenterHouseLianhuDao.deleteByPartyCenterHouseId(houseId); } + //加一条变更记录吧。。 就当留痕了 + IcHouseEntity origin = baseDao.selectById(houseId); + IcHouseDTO icHouseDTO = ConvertUtils.sourceToTarget(origin, IcHouseDTO.class); + SpringContextUtils.getBean(HouseService.class).houseChangeRecord(houseId, icHouseDTO.getCustomerId(), icHouseDTO); + //修改 + LambdaUpdateWrapper update = new LambdaUpdateWrapper<>(); + update.set(IcHouseEntity::getPartyCenterHouseFlag, partyCenterHouseFlag) + .set(IcHouseEntity::getUpdatedTime,new Date()) + .eq(IcHouseEntity::getId, houseId); + baseDao.update(null, update); } From c527311c6ddef2a4aa6eb81f48cd7ae3c36df21d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 15:30:19 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=BF=98=E4=BA=86=E8=B5=8B=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index e471544dc3..27c8f572e4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -549,6 +549,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl update = new LambdaUpdateWrapper<>(); From 05f37c85cee57f304d252fa65677d298df894122 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 16:13:06 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=81=94=E6=88=B7?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E3=80=82=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LingshanPartyCenterHouseLianhuDao.java | 2 ++ .../service/impl/IcHouseServiceImpl.java | 30 +++++++++++-------- .../LingshanPartyCenterHouseLianhuDao.xml | 8 +++++ .../ResiImportDyzxhPostProcessor.java | 3 +- .../impl/IcResiUserImportServiceImpl.java | 11 +++---- 5 files changed, 35 insertions(+), 19 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java index aaeb853332..7b712e100c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java @@ -14,4 +14,6 @@ import org.apache.ibatis.annotations.Mapper; public interface LingshanPartyCenterHouseLianhuDao extends BaseDao { int deleteByPartyCenterHouseId(String partyCenterHouseId); + + LingshanPartyCenterHouseLianhuEntity selectByHouseId(String houseId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java index 27c8f572e4..8a782c376a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java @@ -446,6 +446,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl lianHuHouseList) { IcHouseEntity partyCenterHouse=baseDao.selectById(partyCenterHouseId); @@ -471,19 +472,22 @@ public class IcHouseServiceImpl extends BaseServiceImpl delete from lingshan_party_center_house_lianhu where PARTY_CENTER_HOUSE_ID=#{partyCenterHouseId} + + \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java index a4fd8ccd55..ec5628378d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/ResiImportDyzxhPostProcessor.java @@ -21,7 +21,8 @@ public class ResiImportDyzxhPostProcessor extends ResiImportPostProcessor{ public void consume(Map resiInfoMap) { System.out.println(resiInfoMap); String customerId=resiInfoMap.get("CUSTOMER_ID"); - String userId=resiInfoMap.get("ID"); + // String userId=resiInfoMap.get("ID"); + String userId=resiInfoMap.get("IC_RESI_USER"); //推送MQ事件 IcResiUserAddMQMsg mqMsg = new IcResiUserAddMQMsg(); mqMsg.setCustomerId(customerId); diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java index 0e6a5ba8eb..b5151a3cb7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java @@ -13,7 +13,6 @@ import com.epmet.bean.ResiImportChangedData; import com.epmet.bean.ResiImportResiCategoryChangedCache; import com.epmet.commons.rocketmq.messages.PartymemberSyncMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -41,7 +40,6 @@ import com.epmet.dto.form.HouseFormDTO; import com.epmet.dto.form.IcResiUserOrgMsgFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.*; -import com.epmet.dto.result.lingshan.ConfigPartyCenterHouseFormDTO; import com.epmet.entity.*; import com.epmet.enums.IcResiUserTableEnum; import com.epmet.excel.handler.IcResiImportDynamicExcelListener; @@ -63,7 +61,6 @@ import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -589,8 +586,6 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res categoryData = null; } - // 居民信息导入后置处理器回调 - resiImportPostProcessors.forEach(p -> p.consume(columnAndValues)); } catch (Exception e) { String errorMsg; @@ -770,6 +765,12 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res // 将成功的居民的身份证号添加到列表中 successIdCards.add(row.get(ID_CARD_COLUMN_NO)); + + // 居民信息-党员信息导入后置处理器回调 + LinkedHashMap finalColumnAndValues = columnAndValues; + resiImportPostProcessors.forEach(p -> { + p.consume(finalColumnAndValues); + }); } catch (Exception e) { String errorMsg; if (e instanceof RenException || e instanceof EpmetException) { From 72bb63e0ba9c2f45a2c382f9444f283c3ac24f11 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 17 May 2023 16:44:14 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=AE=A1=E7=90=86-?= =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=88=97=E8=A1=A8=E3=80=81=E6=9F=A5=E7=9C=8B?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E3=80=81=E7=A4=BE=E5=8C=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=EF=BC=88=E6=88=BF=E5=B1=8B=EF=BC=89=E7=BB=9F=E4=B8=80=E8=BF=94?= =?UTF-8?q?=E5=9B=9EpartyCenterHouseFlag?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/IcHouseListResultDTO.java | 5 ++++- .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java index 03346cb6fc..459fb1bcca 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java @@ -89,5 +89,8 @@ public class IcHouseListResultDTO implements Serializable { */ private String houseCode; - + /** + * 灵山项目：是否党员中心户：1是；0不是 + */ + private String partyCenterHouseFlag; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index fb4e43e0bf..7ffaff80a2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -118,7 +118,8 @@ gr.GRID_NAME, IFNULL(a.sort,0) as sort, IFNULL(a.REMARK,'') AS remark, - a.CUSTOMER_ID + a.CUSTOMER_ID, + a.PARTY_CENTER_HOUSE_FLAG as partyCenterHouseFlag from ic_house a LEFT JOIN ic_building b on a.BUILDING_ID = b.ID and b.DEL_FLAG = '0' LEFT JOIN ic_neighbor_hood c on a.NEIGHBOR_HOOD_ID = c.ID and c.DEL_FLAG = '0' From 79bf2c6ce18c43d57d2f5898531a895c4865e246 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 16:53:10 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E6=96=B0=E5=A2=9E=EF=BC=9A=E3=80=90?= =?UTF-8?q?=E7=81=B5=E5=B1=B1=E8=A1=97=E9=81=93=E3=80=91=E5=A4=A7=E5=B1=8F?= =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E5=8A=9E=E6=9C=8D=E5=8A=A1=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=88=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LingShanScreenServiceRstDTO.java | 32 ++++++++- .../LingShanAgentServiceController.java | 13 ++++ .../service/LingShanAgentServiceService.java | 2 + .../impl/LingShanAgentServiceServiceImpl.java | 70 ++++++++++++++++++- 4 files changed, 115 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java index 4669c0a2ce..f9e9cf9db2 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java @@ -1,10 +1,14 @@ package com.epmet.dto.result.agentservice; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.security.PrivateKey; +import java.util.ArrayList; import java.util.Date; +import java.util.List; @Data @AllArgsConstructor @@ -13,8 +17,9 @@ public class LingShanScreenServiceRstDTO { private String content; private String applicantName; private String applicantMobile; - private String applicantHomeAddress; + private String exceptServeAddress; private Date createdTime; + private Date exceptServeTime; private String agentName; private String agentMobile; @@ -26,4 +31,29 @@ public class LingShanScreenServiceRstDTO { * 纬度 */ private String latitude; + + private String processTime; + private String processDesc; + private List attachments; + private String processStatus; + private String closeDesc; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date closeTime; + private Integer satisfication; + + /** + * 处理进展 + */ + private List processNodes = new ArrayList<>(); + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class ProcessNode { + private Integer processType; + private String processTypeName; + private String processorName; + private String processDesc; + private List processAttachments = new ArrayList<>(); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java index 541462c10b..6bca986b45 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/LingShanAgentServiceController.java @@ -286,6 +286,19 @@ public class LingShanAgentServiceController { return new Result>().ok(rl); } + /** + * @Description: 中央大屏:服务详情 + * @param id: + * @Return com.epmet.commons.tools.utils.Result + * @Author: wangxianzhang + * @Date: 2023/5/17 2:40 PM + */ + @GetMapping("screen/serviceDetail") + public Result screenServiceDetail(@RequestParam("id") String id) { + LingShanScreenServiceRstDTO c = lingShanServiceAgentService.screenServiceDetail(id); + return new Result().ok(c); + } + /** * @Description: 服务类型数量分析 * @param orgType: diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java index 992244d76b..539809106a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/LingShanAgentServiceService.java @@ -38,4 +38,6 @@ public interface LingShanAgentServiceService { List serviceCategoryAnalysis(String orgType, String orgId); List serviceTrendAnalysis(String orgType, String orgId); + + LingShanScreenServiceRstDTO screenServiceDetail(String id); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index cfa4aef5ee..0b2fc2bd19 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -513,7 +513,6 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ d.setAgentMobile(agentInfo.getMobile()); } - // todo 此处要查什么？？申请人家庭住址？申请人家庭住址是什么？ // IcResiUserDTO resiUser = getResultDataOrReturnNull(userOpenFeignClient.getIcResiUserDTO(rec.getApplicantId()), ServiceConstant.EPMET_USER_SERVER); // if (resiUser == null) { // log.error("【灵山大屏】代办事件列表：查询申请人信息失败，申请人ID:" + rec.getApplicantId()); @@ -527,6 +526,8 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ // } d.setContent(rec.getContent()); + d.setExceptServeAddress(rec.getExceptServeAddress()); + d.setExceptServeTime(rec.getExceptServeTime()); d.setCreatedTime(rec.getCreatedTime()); d.setApplicantName(rec.getApplicantName()); d.setApplicantMobile(rec.getContactMobile()); @@ -537,6 +538,73 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ }).collect(Collectors.toList()); } + @Override + public LingShanScreenServiceRstDTO screenServiceDetail(String id) { + LingshanAgentServiceRecordEntity serviceRecord = agentServiceRecordDao.selectById(id); + if (serviceRecord == null) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "未找到对应服务，ID:" + id); + } + + LingShanScreenServiceRstDTO rd = new LingShanScreenServiceRstDTO(); + rd.setExceptServeAddress(serviceRecord.getExceptServeAddress()); + rd.setExceptServeTime(serviceRecord.getExceptServeTime()); + rd.setContent(serviceRecord.getContent()); + rd.setLatitude(serviceRecord.getLatitude()); + rd.setLongitude(serviceRecord.getLongitude()); + rd.setAgentMobile(serviceRecord.getContactMobile()); + rd.setAgentName(serviceRecord.getAgentName()); + rd.setApplicantMobile(serviceRecord.getContactMobile()); + rd.setApplicantName(serviceRecord.getApplicantName()); + rd.setCreatedTime(serviceRecord.getCreatedTime()); + rd.setCloseTime(serviceRecord.getCloseTime()); + rd.setSatisfication(serviceRecord.getSatisfication()); + rd.setAttachments(JSON.parseArray(serviceRecord.getAttachments(), String.class)); + + // 处理进展 + List processNodes = rd.getProcessNodes(); + + // 创建起始节点 + LingShanScreenServiceRstDTO.ProcessNode nc = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, new ArrayList<>()); + processNodes.add(nc); + + // 根据最新状态拼接后续处理节点 + int processStatus = serviceRecord.getProcessStatus().intValue(); + LingShanAgentServiceProcessStatusEnum processStatusEnum = LingShanAgentServiceProcessStatusEnum.getByStatus(processStatus); + + if (LingShanAgentServiceProcessStatusEnum.WITHDRAW.getStatusCode() == processStatus) { + // 已撤回 + LingShanScreenServiceRstDTO.ProcessNode nd = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, new ArrayList<>()); + processNodes.add(nd); + } else { + // 正常处理流程 + if (processStatus == LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()) { + // 受理 0 1 + LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>()); + processNodes.add(np); + } else if (processStatus == LingShanAgentServiceProcessStatusEnum.REJECTED.getStatusCode()) { + // 驳回 0 2 + LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>()); + processNodes.add(np); + } else { + // 办结 0 1 3 + LingShanScreenServiceRstDTO.ProcessNode na = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>()); + LingShanScreenServiceRstDTO.ProcessNode ncc = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class)); + processNodes.add(na); + processNodes.add(ncc); + } + + } + + return rd; + } + + private LingShanScreenServiceRstDTO.ProcessNode createProcessNode(LingShanAgentServiceProcessStatusEnum processStatusEnum, String applicantName, String processDesc, List processAttachments) { + return new LingShanScreenServiceRstDTO.ProcessNode( + processStatusEnum.getStatusCode(), + processStatusEnum.getStatusName(), + applicantName, processDesc, processAttachments); + } + @Override public List serviceCategoryAnalysis(String orgType, String orgId) { From ebd58115f6ced1ff9453cda3b1539afbb85b106b Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 17:12:18 +0800 Subject: [PATCH 14/17] modify --- .../dto/result/agentservice/LingShanScreenServiceRstDTO.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java index f9e9cf9db2..7b44a527d0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java @@ -5,7 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import java.security.PrivateKey; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -50,8 +49,8 @@ public class LingShanScreenServiceRstDTO { @NoArgsConstructor @AllArgsConstructor public static class ProcessNode { - private Integer processType; - private String processTypeName; + private Integer processStatus; + private String processStatusName; private String processorName; private String processDesc; private List processAttachments = new ArrayList<>(); From f5468cfdc489006ea7c5772a3fedec57db42b2dc Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 17:31:55 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0id=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/agentservice/LingShanScreenServiceRstDTO.java | 1 + .../com/epmet/service/impl/LingShanAgentServiceServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java index 7b44a527d0..dc6988ccb8 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java @@ -13,6 +13,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor public class LingShanScreenServiceRstDTO { + private String id; private String content; private String applicantName; private String applicantMobile; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index 0b2fc2bd19..8819a436e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -524,7 +524,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ // d.setApplicantHomeAddress(resiUserGridInfo.getGridName()); // } // } - + d.setId(rec.getId()); d.setContent(rec.getContent()); d.setExceptServeAddress(rec.getExceptServeAddress()); d.setExceptServeTime(rec.getExceptServeTime()); From 519af27c7a0f9a3c3994d25587b601afb65121f7 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 17:49:23 +0800 Subject: [PATCH 16/17] - --- .../dto/result/agentservice/LingShanScreenServiceRstDTO.java | 3 ++- .../epmet/service/impl/LingShanAgentServiceServiceImpl.java | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java index dc6988ccb8..7f34592fd4 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java @@ -32,7 +32,8 @@ public class LingShanScreenServiceRstDTO { */ private String latitude; - private String processTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date processTime; private String processDesc; private List attachments; private String processStatus; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index 8819a436e9..4606ee0946 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -560,6 +560,11 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ rd.setSatisfication(serviceRecord.getSatisfication()); rd.setAttachments(JSON.parseArray(serviceRecord.getAttachments(), String.class)); + if (serviceRecord.getProcessStatus() == LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode() + || serviceRecord.getProcessStatus() == LingShanAgentServiceProcessStatusEnum.CLOSED.getStatusCode()) { + rd.setProcessTime(serviceRecord.getProcessTime()); + } + // 处理进展 List processNodes = rd.getProcessNodes(); From f4e0cf80899278002bcb8a345236510146e31293 Mon Sep 17 00:00:00 2001 From: wxz Date: Wed, 17 May 2023 18:01:19 +0800 Subject: [PATCH 17/17] - --- .../LingShanScreenServiceRstDTO.java | 2 ++ .../impl/LingShanAgentServiceServiceImpl.java | 19 +++++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java index 7f34592fd4..42c85b61ce 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/agentservice/LingShanScreenServiceRstDTO.java @@ -55,6 +55,8 @@ public class LingShanScreenServiceRstDTO { private String processStatusName; private String processorName; private String processDesc; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date processTime; private List processAttachments = new ArrayList<>(); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java index 4606ee0946..35beffaaf3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/LingShanAgentServiceServiceImpl.java @@ -569,7 +569,7 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ List processNodes = rd.getProcessNodes(); // 创建起始节点 - LingShanScreenServiceRstDTO.ProcessNode nc = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, new ArrayList<>()); + LingShanScreenServiceRstDTO.ProcessNode nc = createProcessNode(LingShanAgentServiceProcessStatusEnum.WAIT_ACCEPT, serviceRecord.getApplicantName(), null, serviceRecord.getCreatedTime(), new ArrayList<>()); processNodes.add(nc); // 根据最新状态拼接后续处理节点 @@ -578,22 +578,22 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ if (LingShanAgentServiceProcessStatusEnum.WITHDRAW.getStatusCode() == processStatus) { // 已撤回 - LingShanScreenServiceRstDTO.ProcessNode nd = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, new ArrayList<>()); + LingShanScreenServiceRstDTO.ProcessNode nd = createProcessNode(processStatusEnum, serviceRecord.getApplicantName(), null, serviceRecord.getProcessTime(), new ArrayList<>()); processNodes.add(nd); } else { // 正常处理流程 if (processStatus == LingShanAgentServiceProcessStatusEnum.ACCEPTED.getStatusCode()) { // 受理 0 1 - LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>()); + LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); processNodes.add(np); } else if (processStatus == LingShanAgentServiceProcessStatusEnum.REJECTED.getStatusCode()) { // 驳回 0 2 - LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>()); + LingShanScreenServiceRstDTO.ProcessNode np = createProcessNode(processStatusEnum, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); processNodes.add(np); } else { // 办结 0 1 3 - LingShanScreenServiceRstDTO.ProcessNode na = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), new ArrayList<>()); - LingShanScreenServiceRstDTO.ProcessNode ncc = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class)); + LingShanScreenServiceRstDTO.ProcessNode na = createProcessNode(LingShanAgentServiceProcessStatusEnum.ACCEPTED, serviceRecord.getAgentName(), serviceRecord.getProcessDesc(), serviceRecord.getProcessTime(), new ArrayList<>()); + LingShanScreenServiceRstDTO.ProcessNode ncc = createProcessNode(LingShanAgentServiceProcessStatusEnum.CLOSED, serviceRecord.getAgentName(), serviceRecord.getCloseDesc(), serviceRecord.getCloseTime(), JSON.parseArray(serviceRecord.getProcessAttachments(), String.class)); processNodes.add(na); processNodes.add(ncc); } @@ -603,11 +603,14 @@ public class LingShanAgentServiceServiceImpl implements LingShanAgentServiceServ return rd; } - private LingShanScreenServiceRstDTO.ProcessNode createProcessNode(LingShanAgentServiceProcessStatusEnum processStatusEnum, String applicantName, String processDesc, List processAttachments) { + private LingShanScreenServiceRstDTO.ProcessNode createProcessNode(LingShanAgentServiceProcessStatusEnum processStatusEnum, String applicantName, String processDesc, Date processTime, List processAttachments) { return new LingShanScreenServiceRstDTO.ProcessNode( processStatusEnum.getStatusCode(), processStatusEnum.getStatusName(), - applicantName, processDesc, processAttachments); + applicantName, + processDesc, + processTime, + processAttachments); } @Override