From a72dfa048102c7562ce38a4083b1918b062c62f0 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 4 Dec 2023 17:13:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=A4=A7=E5=B1=8F=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/CustomerAgencyResultDTO.java | 143 ++++++++++++++++++ .../epmet/feign/GovOrgOpenFeignClient.java | 4 + .../GovOrgOpenFeignClientFallback.java | 5 + .../controller/CustomerAgencyController.java | 12 ++ .../epmet/service/CustomerAgencyService.java | 2 + .../impl/CustomerAgencyServiceImpl.java | 11 ++ .../dto/result/IcUserStreetResultDTO.java | 22 +++ .../dto/result/IcUserStreetTypeResultDTO.java | 28 ++++ .../controller/IcResiUserController.java | 25 +++ .../java/com/epmet/dao/IcResiUserDao.java | 2 + .../com/epmet/service/IcResiUserService.java | 3 + .../service/impl/IcResiUserServiceImpl.java | 34 +++++ .../main/resources/mapper/IcResiUserDao.xml | 12 ++ 13 files changed, 303 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetTypeResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java new file mode 100644 index 0000000000..d307e2f475 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CustomerAgencyResultDTO.java @@ -0,0 +1,143 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; +import lombok.Data; + +import java.io.Serializable; + +/** + * 机关单位信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-04-20 + */ +@Data +public class CustomerAgencyResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + private String id; + /** + * 客户ID + */ + private String customerId; + + /** + * 上级组织机构ID + */ + private String pid; + + /** + * 所有上级组织机构ID(以英文:隔开) + */ + private String pids; + + /** + * 所有上级名称,以-连接 + */ + private String allParentName; + + /** + * 组织名称 + */ + private String organizationName; + + /** + * 机关级别（社区级：community， +乡（镇、街道）级:street, +区县级: district, +市级: city +省级:province） 机关级别（社区级：community，乡（镇、街道）级:street,区县级: district,市级: city省级:province） + */ + private String level; + + /** + * 地区编码 + */ + private String areaCode; + + /** + * 总人数 + */ + private Integer totalUser; + + /** + * 省 + */ + private String province; + + /** + * 【城市】名称 + */ + private String city; + + /** + * 【区县】名称 + */ + private String district; + + /** + * 当前组织的上级行政地区编码add0204;举例平阴县对应的是济南市3701 + */ + private String parentAreaCode; + + /** + * 街道 + */ + private String street; + + /** + * 【社区】名称0409 + */ + private String community; + + /** + * 坐标 + */ + private String coordinates; + + /** + * 中心位置经度 + */ + private String longitude; + + /** + * 中心位置纬度 + */ + private String latitude; + + /** + * 中心点位位置 + */ + private String centerAddress; + + /** + * 组织编码 + */ + private String code; + + /** + * 负责人姓名 + */ + private String contacts; + + /** + * 联系电话 + */ + private String mobile; +} 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 7aa747a910..9f2e8d227e 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 @@ -712,4 +712,8 @@ public interface GovOrgOpenFeignClient { @PostMapping("/gov/org/department/notsyncdept") Result notSyncDept(@RequestBody CheckStaffInfoFormDTO formDTO); + + + @GetMapping("/gov/org/customeragency/getLevelAagencyList/{level}") + Result> getLevelAagencyList(@PathVariable("level") String level); } 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 82af2caade..007e2f728a 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 @@ -464,6 +464,11 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "notSyncDept", formDTO); } + @Override + public Result> getLevelAagencyList(String level) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getLevelAagencyList", level); + } + @Override public Result> gridStaff(CustomerGridStaffListFormDTO dto) { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "gridStaffList", dto); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java index 73316bad52..d7df143542 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerAgencyController.java @@ -32,6 +32,7 @@ import com.epmet.constant.CustomerAgencyConstant; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.entity.CustomerAgencyEntity; import com.epmet.excel.CustomerAgencyExcel; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerOrgParameterService; @@ -487,5 +488,16 @@ public class CustomerAgencyController { return customerAgencyService.getCommunityInfoByUserId(userId); } + /** + * @Description: 获取level的组织列表 + * @param level: + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/4 15:36 + */ + @GetMapping("getLevelAagencyList/{level}") + public Result> getLevelAagencyList(@PathVariable("level") String level) { + return customerAgencyService.getLevelAagencyList(level); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java index bec4188167..7ea83066d5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CustomerAgencyService.java @@ -335,4 +335,6 @@ public interface CustomerAgencyService extends BaseService * @Date 2022/6/21 22:41 **/ Result getCommunityInfoByUserId(String userId); + + Result> getLevelAagencyList(String level); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java index f2c0392dc7..73615695ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerAgencyServiceImpl.java @@ -1587,4 +1587,15 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl().ok(communityInfoResultDTO); } + @Override + public Result> getLevelAagencyList(String level) { + + LambdaUpdateWrapper lambdaUpdateWrapper = new LambdaUpdateWrapper() + .eq(CustomerAgencyEntity::getLevel,level); + + List result = baseDao.selectList(lambdaUpdateWrapper); + + return new Result>().ok(ConvertUtils.sourceToTarget(result, CustomerAgencyResultDTO.class)); + } + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java new file mode 100644 index 0000000000..4042fe761a --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetResultDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/5 11:14 + * @DESC + */ +@Data +public class IcUserStreetResultDTO implements Serializable { + + private static final long serialVersionUID = -3215965796907113918L; + + private String streetId; + + private String streetName; + + private Integer count; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetTypeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetTypeResultDTO.java new file mode 100644 index 0000000000..f363205d21 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserStreetTypeResultDTO.java @@ -0,0 +1,28 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/5 11:14 + * @DESC + */ +@Data +public class IcUserStreetTypeResultDTO implements Serializable { + + private static final long serialVersionUID = -3215965796907113918L; + + private Integer dangyuanCount; + + private Integer dibaohuCount; + + private Integer baozhangfangCount; + + private Integer shiyeCount; + + private Integer yulingfunvCount; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index f958d975d3..948ddf94d7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1306,4 +1306,29 @@ public class IcResiUserController implements ResultDataResolver { return new Result().ok(icResiUserService.icUserMatchGrid(formDTO)); } + + /** + * @Description: 大屏 街道居民统计 + * @param : + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/4 15:52 + */ + @GetMapping("screen/getStreetUserStatistics") + public Result> getStreetUserStatistics(){ + return new Result>().ok(icResiUserService.getStreetUserStatistics()); + } + + /** + * @Description: 大屏 街道居民类型统计 + * @param : + * @Return com.epmet.commons.tools.utils.Result> + * @Author: lichao + * @Date: 2023/12/4 15:52 + */ + @GetMapping("screen/getStreetUserTypeStatistics") + public Result getStreetUserTypeStatistics(String streetId){ + return new Result().ok(icResiUserService.getStreetUserTypeStatistics(streetId)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index f75c1cbb55..efc4a6980b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -428,4 +428,6 @@ public interface IcResiUserDao extends BaseDao { * @Date 2022/6/29 17:37 */ List getIcUserCount(IcUserCountFormDTO formDTO); + + IcUserStreetTypeResultDTO getStreetUserTypeStatistics(@Param("pids") String pids); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 550bb9563e..fe1fce8ad6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -508,4 +508,7 @@ public interface IcResiUserService extends BaseService { */ IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); + List getStreetUserStatistics(); + + IcUserStreetTypeResultDTO getStreetUserTypeStatistics(String streetId); } 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 519528e55b..36fa652f2e 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 @@ -3251,6 +3251,40 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getStreetUserStatistics() { + List result = new ArrayList<>(); + List streetList = govOrgOpenFeignClient.getLevelAagencyList("street").getData(); + streetList.forEach( + street -> { + IcUserStreetResultDTO dto = new IcUserStreetResultDTO(); + + LambdaQueryWrapper resiUserEntityLambdaQueryWrapper + = new LambdaQueryWrapper().likeRight(IcResiUserEntity::getPids, street.getPids()+ ":" + street.getId()); + List houseEntities = icResiUserDao.selectList(resiUserEntityLambdaQueryWrapper); + dto.setStreetName(street.getOrganizationName()); + dto.setStreetId(street.getId()); + dto.setCount(houseEntities.size()); + result.add(dto); + }); + return result; + } + + @Override + public IcUserStreetTypeResultDTO getStreetUserTypeStatistics(String streetId) { + + IcUserStreetTypeResultDTO result = new IcUserStreetTypeResultDTO(); + + CustomerAgencyDTO customerAgencyDTO = govOrgOpenFeignClient.getAgencyById(streetId).getData(); + + if (customerAgencyDTO!=null){ + result = baseDao.getStreetUserTypeStatistics(customerAgencyDTO.getPids() +":"+ customerAgencyDTO.getId()); + }else{ + throw new EpmetException("未查询到街道"+streetId); + } + return result; + } + public PaCustomerDTO getCustomerInfo(String appId) { JSONObject jsonObject = new JSONObject(); String data = HttpClientManager.getInstance().sendPostByJSON("https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/" + appId, JSON.toJSONString(jsonObject)).getData(); diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml index da04d1a58c..631d1e8fcc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiUserDao.xml @@ -1281,4 +1281,16 @@ +