From 5e1ea951da44f132c2b1212a6af5d47621426424 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 17 Apr 2023 10:04:10 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E3=80=91fix=201.=E5=85=9A=E5=91=98=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E5=B9=B4=E9=BE=84=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/LingShanScreenServiceImpl.java | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 876a1471e4..92af453b13 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -8,10 +8,14 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.CustomerResiUserRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.PidUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.partyOrg.dao.IcPartyActDao; import com.epmet.modules.partyOrg.dao.IcPartyActTypeDictDao; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; @@ -29,6 +33,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.time.LocalDate; import java.util.*; import java.util.function.Function; import java.util.stream.Collectors; @@ -51,6 +56,9 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD @Autowired private ResiGroupOpenFeignClient groupOpenFeignClient; + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Override public List listPartyOrgCategoryAndQuantity(String agencyId) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); @@ -169,10 +177,22 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD return l.stream().map(e -> { // 查询支部 IcPartyOrgEntity branch = icPartyOrgDao.selectById(e.getSszb()); + // 查询居民信息，用于显示年龄 + IcResiUserInfoCache resiInfo = CustomerResiUserRedis.getIcResiUserInfo(e.getIcResiUser()); LingShanScreenPartyOrgTreeResultDTO.Partymember t = new LingShanScreenPartyOrgTreeResultDTO.Partymember(); + + String birthDay; + if (resiInfo != null + && StringUtils.isNotBlank(birthDay = resiInfo.getBirthday())) { + Date birthday = DateUtils.parse(birthDay, DateUtils.DATE_PATTERN); + Calendar ci = Calendar.getInstance(); + ci.setTime(birthday); + int birthYear = ci.get(Calendar.YEAR); + t.setAge((LocalDate.now().getYear() - birthYear) + ""); + } + t.setName(e.getName()); - t.setAge(e.getAgencyId()); Integer gender = e.getGender(); t.setGender(gender != null ? GenderEnum.getName(gender.toString()) : "未知"); t.setOrgname(branch != null ? branch.getPartyOrgName() : null); From 560ae03b31dcf62511aad2b86a261a84228b5530 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 17 Apr 2023 14:47:38 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=B1=B1=E5=A4=A7?= =?UTF-8?q?=E5=B1=8F=E3=80=911.=E6=96=B0=E5=A2=9E=EF=BC=9A=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E7=BB=84=E7=BB=87id=E6=9F=A5=E8=AF=A2=E5=85=9A?= =?UTF-8?q?=E5=91=98=E6=95=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/LingShanScreenController.java | 12 ++++++++++++ .../service/LingShanScreenService.java | 9 +++++++++ .../service/impl/LingShanScreenServiceImpl.java | 15 +++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java index 4196d68859..71e0e3ae75 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/LingShanScreenController.java @@ -105,4 +105,16 @@ public class LingShanScreenController { return new Result>().ok(l); } + /** + * @description: 大屏地图-党员数 + * @param agencyId: + * @return + * @author: WangXianZhang + * @date: 2023/4/17 1:54 PM + */ + @GetMapping("partymemberQty") + public Result getPartymemberQtyOfOrg(@RequestParam("agencyId") String agencyId) { + return new Result().ok(lingShanScreenService.getPartymemberQtyOfOrg(agencyId)); + } + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java index 8bff76abff..265467a062 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/LingShanScreenService.java @@ -56,4 +56,13 @@ public interface LingShanScreenService { * @date: 2023/4/14 7:27 PM */ List actQtyOfPartyOrgStats(String agencyId, Date holdTimeStart, Date holdTimeEnd); + + /** + * @description: 大屏地图-党员数 + * @param agencyId: + * @return + * @author: WangXianZhang + * @date: 2023/4/17 1:55 PM + */ + Integer getPartymemberQtyOfOrg(String agencyId); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java index 92af453b13..74332828cd 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/LingShanScreenServiceImpl.java @@ -305,4 +305,19 @@ public class LingShanScreenServiceImpl implements LingShanScreenService, ResultD return rl; } + + @Override + public Integer getPartymemberQtyOfOrg(String agencyId) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(agencyId); + if (agencyInfo == null) { + logger.error("getPartymemberQtyOfOrg查询组织信息失败agencyId:{}", agencyId); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前组织信息失败，agencyId:" + agencyId, "查询当前组织信息失败"); + } + + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.likeRight(IcPartyMemberEntity::getAgencyPids, PidUtils.convertPid2OrgIdPath(agencyId, agencyInfo.getPids())) + .or() + .eq(IcPartyMemberEntity::getAgencyId, agencyId); + return icPartyMemberDao.selectCount(query); + } }