From 62b0b7e44bfc449578b42d44682b47087bfafa93 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 10:14:15 +0800 Subject: [PATCH 001/177] =?UTF-8?q?/resi/mine/personalcenter/initinfo?= =?UTF-8?q?=E8=BF=94=E5=9B=9EgridId,gridName?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/mine/dto/result/InitInfoResultDTO.java | 11 +++++++++++ .../service/impl/PersonalCenterServiceImpl.java | 13 +++++++++++++ .../epmet/service/impl/UserBaseInfoServiceImpl.java | 12 +++++++++++- 3 files changed, 35 insertions(+), 1 deletion(-) diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java index 36b860a3e9..c55c4d41fb 100644 --- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java +++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/InitInfoResultDTO.java @@ -53,4 +53,15 @@ public class InitInfoResultDTO implements Serializable { * 手机号 */ private String mobile; + + /** + * 2023.04.18烟台需求增加 + * 用于完善信息界面展示 + */ + private String gridId; + /** + * 2023.04.18烟台需求增加 + * 用于完善信息界面展示 + */ + private String gridName; } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java index 5c4788f7b7..29f2eecffe 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/mine/service/impl/PersonalCenterServiceImpl.java @@ -1,6 +1,8 @@ package com.epmet.modules.mine.service.impl; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.EditInfoFormDTO; @@ -11,6 +13,7 @@ import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.modules.mine.service.PersonalCenterService; import com.epmet.resi.mine.dto.result.InitInfoResultDTO; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -46,6 +49,16 @@ public class PersonalCenterServiceImpl implements PersonalCenterService { resultDTO.setIdNum(baseInfoResult.getData().getIdNum()); resultDTO.setMobile(baseInfoResult.getData().getMobile()); resultDTO.setRealName(baseInfoResult.getData().getRealName()); + // start + // 2023.04.18烟台需求增加 + // 用于完善信息界面展示 + resultDTO.setGridId(baseInfoResult.getData().getGridId()); + if (StringUtils.isNotBlank(resultDTO.getGridId())) { + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resultDTO.getGridId()); + if (null != gridInfoCache) { + resultDTO.setGridName(gridInfoCache.getGridNamePath()); + } + }// end return resultDTO; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java index 52930c1242..4cfde975f4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java @@ -365,7 +365,17 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl selecUserBaseInfoByUserId(String userId) { - return new Result().ok(baseDao.selecUserBaseInfoByUserId(userId)); + ResiUserBaseInfoResultDTO resultDTO=baseDao.selecUserBaseInfoByUserId(userId); + // start + // 2023.04.18烟台需求增加 + // 用于完善信息界面展示 + if (null != resultDTO) { + RegisterRelationEntity registerRelation = registerRelationDao.selectRegisteredGridIdByUserId(userId); + if (null != registerRelation) { + resultDTO.setGridId(registerRelation.getGridId()); + } + }// end + return new Result().ok(resultDTO); } From d715eeedc2bceaf5414381d503e906713798c48d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 11:03:50 +0800 Subject: [PATCH 002/177] =?UTF-8?q?=E4=B9=9D=E5=B0=8F=E5=9C=BA=E6=89=80?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=AF=BC=E5=87=BA=E6=96=87=E4=BB=B6=E5=90=8D?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcEnterpriseController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java index ab66b5aa4f..7e11a2d995 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcEnterpriseController.java @@ -147,7 +147,7 @@ public class IcEnterpriseController implements ResultDataResolver { formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.TEN_THOUSAND); try { - String fileName = "企事业单位" + DateUtils.format(new Date()) + ".xlsx"; + String fileName = "九小场所" + DateUtils.format(new Date()) + ".xlsx"; // 头的策略 WriteCellStyle headWriteCellStyle = new WriteCellStyle(); // 背景设置为红色 From 86e770d7870a80577cb3292539d7c4636173bc6b Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 15:01:09 +0800 Subject: [PATCH 003/177] =?UTF-8?q?=E7=BB=84=E7=BB=87=E5=BC=80=E9=80=9A?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 6 ++--- .../java/com/epmet/dao/CustomerAgencyDao.java | 6 ++--- .../epmet/service/CustomerAgencyService.java | 4 ++-- .../impl/CustomerAgencyServiceImpl.java | 12 +++++----- .../resources/mapper/CustomerAgencyDao.xml | 22 +++++++++++++++++-- 5 files changed, 34 insertions(+), 16 deletions(-) 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 e0d4f9f644..1e0a66ddd8 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 @@ -535,9 +535,9 @@ public class CustomerAgencyController { * @Author: lichao * @Date: 2023/4/7 14:48 */ - @GetMapping("getAgencyCountList") - public Result> getAgencyCountList(@RequestParam String agencyId){ - return new Result>().ok(customerAgencyService.getAgencyCountList(agencyId)); + @PostMapping("getAgencyCountList") + public Result> getAgencyCountList(@RequestBody CommunityCountCensusFormDTO dto){ + return new Result>().ok(customerAgencyService.getAgencyCountList(dto)); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 5639d33894..1b21c0059c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -434,11 +434,11 @@ public interface CustomerAgencyDao extends BaseDao { */ List getAllCommunity(String customerId); - List agencyCount(@Param("pids") String pids); + List agencyCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - Integer agencyGridCount(@Param("pids") String pids); + Integer agencyGridCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); - Integer agencyStaffCount(@Param("pids") String pids); + Integer agencyStaffCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); Integer getCommunityCount(@Param("pids")String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); 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 f43de77102..ceac3653a9 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 @@ -368,10 +368,10 @@ public interface CustomerAgencyService extends BaseService /** * 返回下级数量 - * @param agencyId + * @param dto * @return */ - List getAgencyCountList(String agencyId); + List getAgencyCountList(CommunityCountCensusFormDTO dto); /** * @Description: 获取下级组织的社区数量 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 7a651ecc9a..cfb2dcda25 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 @@ -1662,29 +1662,29 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl * @Author: lichao * @Date: 2023/4/7 14:17 */ @Override - public List getAgencyCountList(String agencyId) { + public List getAgencyCountList(CommunityCountCensusFormDTO dto) { List agencyCountCensusResultDTOS = new ArrayList<>(); - CustomerAgencyEntity customerAgency = baseDao.selectById(agencyId); + CustomerAgencyEntity customerAgency = baseDao.selectById(dto.getAgencyId()); if (customerAgency != null){ String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); - agencyCountCensusResultDTOS = baseDao.agencyCount(pids); + agencyCountCensusResultDTOS = baseDao.agencyCount(pids,dto.getTimeStart(),dto.getTimeEnd()); AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO(); agencyCountCensusResultDTOGrid.setLevel("grid"); - agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids)); + agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd())); agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOGrid); AgencyCountCensusResultDTO agencyCountCensusResultDTOStaff = new AgencyCountCensusResultDTO(); agencyCountCensusResultDTOStaff.setLevel("staff"); - agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids)); + agencyCountCensusResultDTOStaff.setCount(baseDao.agencyStaffCount(pids,dto.getTimeStart(),dto.getTimeEnd())); agencyCountCensusResultDTOS.add(agencyCountCensusResultDTOStaff); }else{ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 7f3f76b2d0..08252c1b5c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -889,6 +889,12 @@ from customer_agency where DEL_FLAG = 0 and PIDS like concat(#{pids},'%') + + and agency.UPDATED_TIME >= #{timeStart} + + + and agency.UPDATED_TIME <= #{timeEnd} + group by level @@ -899,6 +905,12 @@ from customer_grid where DEL_FLAG = 0 and PIDS like concat(#{pids},'%') + + and UPDATED_TIME >= #{timeStart} + + + and UPDATED_TIME <= #{timeEnd} + @@ -911,6 +923,12 @@ and staff.DEL_FLAG = 0 and agency.PIDS like concat(#{pids},'%') + + and agency.UPDATED_TIME >= #{timeStart} + + + and agency.UPDATED_TIME <= #{timeEnd} + @@ -1212,10 +1230,10 @@ and agency.LEVEL = 'community' and agency.PIDS like concat(#{pids},'%') - and agency.CREATED_TIME >= #{timeStart} + and agency.UPDATED_TIME >= #{timeStart} - and agency.CREATED_TIME <= #{timeEnd} + and agency.UPDATED_TIME <= #{timeEnd} + + + + + + \ No newline at end of file From dfb74fedc8d5771faa909069e2e28265b049895e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 15:14:01 +0800 Subject: [PATCH 005/177] =?UTF-8?q?=E9=95=87=E8=A1=97=E6=95=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CustomerAgencyDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 08252c1b5c..0329a58092 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -890,10 +890,10 @@ where DEL_FLAG = 0 and PIDS like concat(#{pids},'%') - and agency.UPDATED_TIME >= #{timeStart} + and UPDATED_TIME >= #{timeStart} - and agency.UPDATED_TIME <= #{timeEnd} + and UPDATED_TIME <= #{timeEnd} group by level From 24fc1b1af5e26b79b7a0eedab6dabe830c2236b0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 15:20:04 +0800 Subject: [PATCH 006/177] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8Forg?= =?UTF-8?q?IdPathlike?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dao/IcResiUserDao.java | 7 +++++-- .../service/impl/IcResiUserServiceImpl.java | 18 +++++++++++++++--- .../main/resources/mapper/IcResiUserDao.xml | 6 +++--- 3 files changed, 23 insertions(+), 8 deletions(-) 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 1f78eb3726..a3a2f9d40d 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 @@ -464,11 +464,13 @@ public interface IcResiUserDao extends BaseDao { */ List queryEducationDistribute(@Param("customerId") String customerId, @Param("orgId") String orgId, - @Param("orgType") String orgType); + @Param("orgType") String orgType, + @Param("orgIdPath")String orgIdPath); List selectAgeAgeDistribute(@Param("customerId") String customerId, @Param("orgId") String orgId, - @Param("orgType") String orgType); + @Param("orgType") String orgType, + @Param("orgIdPath")String orgIdPath); /** * @param customerId @@ -481,6 +483,7 @@ public interface IcResiUserDao extends BaseDao { List selectPortrayalResiList(@Param("customerId") String customerId, @Param("orgId") String orgId, @Param("orgType") String orgType, + @Param("orgIdPath") String orgIdPath, @Param("codeType")String codeType, @Param("code") String code); } 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 1c459733ee..7088071b64 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 @@ -3919,8 +3919,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resultList=getDefaultAgeDistribute(); - List list=baseDao.selectAgeAgeDistribute(customerId,orgId,orgType); + List list=baseDao.selectAgeAgeDistribute(customerId,orgId,orgType,orgIdPath); if(CollectionUtils.isEmpty(list)){ return resultList; } @@ -3986,8 +3990,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl totalList = baseDao.queryEducationDistribute(customerId, orgId, orgType); + List totalList = baseDao.queryEducationDistribute(customerId, orgId, orgType,orgIdPath); Map map = totalList.stream().collect(Collectors.toMap(ResiPortrayalResultDTO::getCode,ResiPortrayalResultDTO::getTotalResi)); List resultDTOList = new ArrayList<>(); dictResult.getData().forEach(dict -> { @@ -4037,8 +4045,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,codeType, code); + List list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,orgIdPath,codeType, code); if(CollectionUtils.isNotEmpty(list)){ Set houseIds=list.stream().map(m -> m.getHomeId()).collect(Collectors.toSet()); //查询房子名称 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 229652a45f..5db97e1f5e 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 @@ -1606,7 +1606,7 @@ r.DEL_FLAG = '0' AND r.CUSTOMER_ID = #{customerId} - AND ( r.AGENCY_ID = #{orgId} OR r.PIDS LIKE concat('%',#{orgId},'%') ) + and r.PIDS LIKE concat(#{orgIdPath},'%') and r.GRID_ID = #{orgId} @@ -1647,7 +1647,7 @@ and u.BIRTHDAY is not null and u.BIRTHDAY !='' - AND ( u.AGENCY_ID = #{orgId} OR u.PIDS LIKE concat('%',#{orgId},'%') ) + and u.PIDS LIKE concat(#{orgIdPath},'%') and u.GRID_ID = #{orgId} @@ -1683,7 +1683,7 @@ AND u.CUSTOMER_ID = #{customerId} AND u.`STATUS` = '0' - AND ( u.AGENCY_ID = #{orgId} OR u.PIDS LIKE concat('%',#{orgId},'%') ) + and u.PIDS LIKE concat(#{orgIdPath},'%') and u.GRID_ID = #{orgId} From b35a699620b9b6b2d7d78a57459bb996191cf259 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 15:31:24 +0800 Subject: [PATCH 007/177] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E5=8F=8A=E8=B4=A6?= =?UTF-8?q?=E5=8F=B7=E7=99=BB=E5=BD=95=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/yt/CommunityLoginResultDTO.java | 13 +++++ .../controller/StaffLoginLogController.java | 53 +++++++++++++++++++ 2 files changed, 66 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java index e1cb00a765..a8c1e4fb76 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityLoginResultDTO.java @@ -1,5 +1,8 @@ package com.epmet.dto.result.yt; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -12,26 +15,36 @@ public class CommunityLoginResultDTO { /** * 组织id */ + @ExcelIgnore private String agencyId; /** * 组织名称 */ + @ColumnWidth(20) + @ExcelProperty(value = "社区名称") private String agencyName; /** * 组织级别（社区级：community， 乡（镇、街道）级:street, 区县级: district, 市级: city 省级:province） */ + @ExcelIgnore private String agencyLevel; /** * 所属街道名称； */ + @ColumnWidth(20) + @ExcelProperty(value = "所属街道") private String streetName; /** * 所属区县名称； */ + @ColumnWidth(20) + @ExcelProperty(value = "所属区县") private String districtName; /** * 登录次数 */ + @ColumnWidth(20) + @ExcelProperty(value = "登录次数") private Integer count; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index c2967945f7..12bb6d4cb4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -1,12 +1,21 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.fastjson.JSON; import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.dto.form.yt.CommunityLoginFormDTO; import com.epmet.dto.form.yt.CountActivityFormDTO; import com.epmet.dto.form.yt.LoginLogCountByLevelFormDTO; @@ -16,6 +25,7 @@ import com.epmet.dto.result.yt.LoginLogCountByLevelResultDTO; import com.epmet.excel.yt.AccountActivityExcel; import com.epmet.excel.yt.AccountInactivityExcel; import com.epmet.service.StaffLoginLogService; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -24,6 +34,8 @@ import org.springframework.web.bind.annotation.RestController; import com.epmet.dto.result.yt.AccountActivityInfo; import javax.servlet.http.HttpServletResponse; +import java.io.PrintWriter; +import java.util.Date; import java.util.List; @@ -33,6 +45,7 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2023-04-04 */ +@Slf4j @RestController @RequestMapping("staffLoginLog") public class StaffLoginLogController { @@ -62,6 +75,46 @@ public class StaffLoginLogController { return new Result>().ok(staffLoginLogService.pageCommunityCount(formDTO)); } + /** + * 下级社区账号登录次数排名 + * + * @return + */ + @PostMapping("community-count-export") + public void communityCount(HttpServletResponse response, @RequestBody CommunityLoginFormDTO formDTO) throws Exception { + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "社区级账号登录情况" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), CommunityLoginResultDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + // 默认查询本组织及下级 + data = staffLoginLogService.pageCommunityCount(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), CommunityLoginResultDTO.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("社区级账号登录情况export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + /** * 柱状图：下级组织账号登录次数汇总 * From 818722d2f8ca71b8476c30e578ebb49935ceedf1 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 15:48:24 +0800 Subject: [PATCH 008/177] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E3=80=81=E7=BB=84?= =?UTF-8?q?=E7=BB=87=200=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 2 +- .../impl/CustomerAgencyServiceImpl.java | 20 +++++ .../service/impl/IcHouseServiceImpl.java | 85 +++++++++++++++++-- 3 files changed, 100 insertions(+), 7 deletions(-) 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 1e0a66ddd8..3d26395c0e 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 @@ -530,7 +530,7 @@ public class CustomerAgencyController { /** * @Description: 返回下级数量统计 - * @param agencyId: + * @param dto: * @Return com.epmet.commons.tools.utils.Result> * @Author: lichao * @Date: 2023/4/7 14:48 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 cfb2dcda25..42205950d8 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 @@ -1674,9 +1674,16 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl type = new HashMap<>(); String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); agencyCountCensusResultDTOS = baseDao.agencyCount(pids,dto.getTimeStart(),dto.getTimeEnd()); + agencyCountCensusResultDTOS.forEach( + agencyCountCensusResultDTO ->{ + type.put(agencyCountCensusResultDTO.getLevel(),agencyCountCensusResultDTO.getLevel()); + } + ); AgencyCountCensusResultDTO agencyCountCensusResultDTOGrid = new AgencyCountCensusResultDTO(); agencyCountCensusResultDTOGrid.setLevel("grid"); agencyCountCensusResultDTOGrid.setCount(baseDao.agencyGridCount(pids,dto.getTimeStart(),dto.getTimeEnd())); @@ -1687,9 +1694,22 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl type = new HashMap<>(); + resultDTO.setTotal(0); if (dto.getOrgType().equals("community") || dto.getOrgType().equals("street") ||dto.getOrgType().equals("district") ||dto.getOrgType().equals("city")){ dto.setOrgType("agency"); } - resultDTO.setList(baseDao.getHousePurposeCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd())); - resultDTO.getList().forEach( - result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount()) - ); + List list = baseDao.getHousePurposeCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()); + list.forEach( + result->{ + resultDTO.setTotal(resultDTO.getTotal()+result.getCount()); + type.put(result.getType(),result.getType()); + } + ); + HouseCountPictureListResultDTO houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + if (type.get("1") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("1"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("2") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("2"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("3") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("3"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("4") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("4"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("5") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("5"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("6") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("6"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("7") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("7"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + } + resultDTO.setList(list); return resultDTO; } @@ -435,18 +478,48 @@ public class IcHouseServiceImpl extends BaseServiceImpl type = new HashMap<>(); + resultDTO.setTotal(0); if (dto.getOrgType().equals("community") || dto.getOrgType().equals("street") ||dto.getOrgType().equals("district") ||dto.getOrgType().equals("city")){ dto.setOrgType("agency"); } - resultDTO.setList(baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd())); + List list =baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()); resultDTO.getList().forEach( - result->resultDTO.setTotal(resultDTO.getTotal()+result.getCount()) + result->{ + type.put(result.getType(),result.getType()); + resultDTO.setTotal(resultDTO.getTotal()+result.getCount()); + } + ); + HouseCountPictureListResultDTO houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + if (type.get("1") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("1"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("2") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("2"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("3") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("3"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + }else if (type.get("0") == null){ + houseCountPictureListResultDTO = new HouseCountPictureListResultDTO(); + houseCountPictureListResultDTO.setType("0"); + houseCountPictureListResultDTO.setCount(0); + list.add(houseCountPictureListResultDTO); + } + resultDTO.setList(list); + return resultDTO; } From 8eb3267532e1775ca9937ba6e199595da05fc131 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Tue, 18 Apr 2023 16:00:47 +0800 Subject: [PATCH 009/177] =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerAgencyServiceImpl.java | 3 ++- .../service/impl/IcHouseServiceImpl.java | 27 ++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) 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 42205950d8..4585f7481d 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 @@ -1699,7 +1699,8 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl Date: Tue, 18 Apr 2023 16:08:08 +0800 Subject: [PATCH 010/177] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcHouseServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 02edf85863..9c844639ec 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 @@ -494,7 +494,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl list =baseDao.getHouseStatusCount(dto.getOrgId(),dto.getOrgType(),dto.getTimeStart(),dto.getTimeEnd()); - resultDTO.getList().forEach( + list.forEach( result->{ type.put(result.getType(),result.getType()); resultDTO.setTotal(resultDTO.getTotal()+result.getCount()); From d3e4887835ae011306f451d0dace7c220454bb24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com> Date: Tue, 18 Apr 2023 16:13:01 +0800 Subject: [PATCH 011/177] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/StaffLoginLogController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java index 12bb6d4cb4..c8c7267101 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffLoginLogController.java @@ -194,11 +194,9 @@ public class StaffLoginLogController { PageData res = staffLoginLogService.getAccountActivityInfo(formDTO); if (!CollectionUtils.isEmpty(res.getList())) { if("1".equals(formDTO.getIsActivity())){ -// List accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountActivityExcel.class); - ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountActivityExcel.class); + ExcelUtils.exportExcelToTarget(response, "社区活跃数据", res.getList(), AccountActivityExcel.class); }else { -// List accountActivityExcels = ConvertUtils.sourceToTarget(res.getList(), AccountInactivityExcel.class); - ExcelUtils.exportExcelToTarget(response, null, res.getList(), AccountInactivityExcel.class); + ExcelUtils.exportExcelToTarget(response, "社区不活跃数据", res.getList(), AccountInactivityExcel.class); } } From a7e0d2e89800080a114ff89def346875e9c3b699 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 18 Apr 2023 16:28:58 +0800 Subject: [PATCH 012/177] =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=83=85=E5=86=B5=EF=BC=8C=E5=B7=A6=E4=B8=8B=E8=A7=92=E4=B8=8B?= =?UTF-8?q?=E7=BA=A7=E7=A4=BE=E5=8C=BA=E8=B4=A6=E5=8F=B7=E7=99=BB=E5=BD=95?= =?UTF-8?q?=E6=AC=A1=E6=95=B0=E5=B1=95=E7=A4=BA=E5=89=8D10=EF=BC=8C?= =?UTF-8?q?=E4=B8=94=E4=B8=8D=E5=B1=95=E7=A4=BA=E6=AC=A1=E6=95=B00?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/yt/CommunityLoginFormDTO.java | 6 ++++++ .../src/main/java/com/epmet/dao/StaffLoginLogDao.java | 4 +++- .../com/epmet/service/impl/StaffLoginLogServiceImpl.java | 4 ++-- .../src/main/resources/mapper/StaffLoginLogDao.xml | 9 ++++++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java index 5fc00d0691..81b4135d52 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityLoginFormDTO.java @@ -37,5 +37,11 @@ public class CommunityLoginFormDTO extends PageFormDTO { @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss") private Date endDate; + + /** + * exclude_zero:不展示登录次数为0的社区 + * all：全部展示 + */ + private String dataRange; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java index e3f1252b8f..0bd7263a29 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/StaffLoginLogDao.java @@ -27,11 +27,13 @@ public interface StaffLoginLogDao extends BaseDao { * @param orgId * @param startDate * @param endDate + * @param dataRange exclude_zero:不展示登录次数为0的社区 all：全部展示 * @return */ List pageCommunityCount(@Param("orgId") String orgId, @Param("startDate") Date startDate, - @Param("endDate") Date endDate); + @Param("endDate") Date endDate, + @Param("dataRange")String dataRange); List selectCommunityCount(@Param("orgId") String orgId, @Param("startDate") Date startDate, diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java index 37e27b83b1..d295661263 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffLoginLogServiceImpl.java @@ -223,12 +223,12 @@ public class StaffLoginLogServiceImpl extends BaseServiceImpl list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); + List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange()); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), formDTO.getPageSize()); } // 不分页 - List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate()); + List list = baseDao.pageCommunityCount(formDTO.getOrgId(), formDTO.getStartDate(), formDTO.getEndDate(),formDTO.getDataRange()); int total = CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size(); return new PageData<>(list, total, total); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml index 9eddf595fa..98d0c99cf1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/StaffLoginLogDao.xml @@ -48,7 +48,14 @@ and l.LOGIN_TIME <= #{endDate} - GROUP BY ca.id + + + GROUP BY ca.id having count( l.id )>0 + + + GROUP BY ca.id + + order by count(l.id) desc,ca.CREATED_TIME desc From c31da6b3515b78af48b8f7c84ea8681aaa2bd14a Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 19 Apr 2023 10:37:28 +0800 Subject: [PATCH 013/177] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=95=B0=E7=BB=9F?= =?UTF-8?q?=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/CustomerAgencyDao.java | 2 + .../epmet/service/impl/AgencyServiceImpl.java | 9 +- .../resources/mapper/CustomerAgencyDao.xml | 196 +++++++++--------- 3 files changed, 111 insertions(+), 96 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java index 1b21c0059c..b17ddb6de6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CustomerAgencyDao.java @@ -436,6 +436,8 @@ public interface CustomerAgencyDao extends BaseDao { List agencyCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); + Integer communityCount(@Param("pids") String pids); + Integer agencyGridCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); Integer agencyStaffCount(@Param("pids") String pids,@Param("timeStart")Date timeStart,@Param("timeEnd")Date timeEnd); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index 31d49852b7..a972cd9797 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -1147,12 +1147,15 @@ public class AgencyServiceImpl implements AgencyService { calendar.set(Calendar.MILLISECOND, 0); Date endTime = calendar.getTime(); - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); +/* AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); agencyOrgIdPath = getOrgIdPath(agencyInfo.getPids(), agencyInfo.getId()); - List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, null); + List currentUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, null);*/ // List preferUsingCommunityList = customerAgencyDao.getUsingCommunityList(customerId, orgId, agencyOrgIdPath, endTime); // return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), currentUsingCommunityList.size() - preferUsingCommunityList.size()); - return new UsingCommunityStatsResultDTO(currentUsingCommunityList.size(), 0); + CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(orgId); + String pids = PidUtils.convertPid2OrgIdPath(customerAgency.getId(),customerAgency.getPids()); + + return new UsingCommunityStatsResultDTO(customerAgencyDao.communityCount(pids), 0); } else if ("grid".equals(orgType)) { // 网格下不会有该数据，给个0 return new UsingCommunityStatsResultDTO(0, 0); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml index 0329a58092..8005814843 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml @@ -899,6 +899,16 @@ + + - + + + - - - - + (SELECT ca.ID as id, ca.ORGANIZATION_NAME as label, - ca.LONGITUDE as longitude, - ca.LATITUDE as latitude, - ca.`LEVEL` as level, - ca.PID as pId, - 'agency' AS orgType - FROM - customer_agency ca - WHERE - ca.ID = #{agencyId} - AND ca.DEL_FLAG = '0' - - - - - - - + ca.LONGITUDE as longitude, + ca.LATITUDE as latitude, + ca.`LEVEL` as level, + ca.PID as pId, + 'agency' AS orgType + FROM customer_agency ca + WHERE ca.PID = #{agencyId} + AND ca.DEL_FLAG = '0' + ORDER BY CAST(ca.organization_name AS SIGNED), CONVERT(ca.organization_name using gbk)) + union all + (SELECT cg.id, + cg.GRID_NAME AS label, + cg.LONGITUDE, + cg.LATITUDE, + 'grid' AS LEVEL, + cg.PID, + 'grid' AS orgType + FROM customer_grid cg + WHERE cg.DEL_FLAG = '0' + AND cg.PID = #{agencyId} + ORDER BY cg.sort, CAST(cg.GRID_NAME AS SIGNED), CONVERT(cg.GRID_NAME using gbk)) + + + + + SELECT - CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label, - b.id AS buildingId, - b.BUILDING_NAME AS buildingName, - n.id AS neighborhoodId, - n.NEIGHBOR_HOOD_NAME AS neighborhoodName, - n.GRID_ID, - g.GRID_NAME, - a.ALL_PARENT_NAME, - a.ORGANIZATION_NAME AS AGENCY_NAME, - n.CUSTOMER_ID - FROM - ic_building b - LEFT JOIN ic_neighbor_hood n ON b.NEIGHBOR_HOOD_ID = n.id - LEFT JOIN customer_grid g ON n.GRID_ID = g.id - LEFT JOIN customer_agency a ON a.id = g.pid + CONCAT( n.NEIGHBOR_HOOD_NAME, b.BUILDING_NAME ) AS label, + b.id AS buildingId, + b.BUILDING_NAME AS buildingName, + n.id AS neighborhoodId, + n.NEIGHBOR_HOOD_NAME AS neighborhoodName, + n.GRID_ID, + g.GRID_NAME, + a.ALL_PARENT_NAME, + a.ORGANIZATION_NAME AS AGENCY_NAME, + n.CUSTOMER_ID + FROM ic_building b + LEFT JOIN ic_neighbor_hood n + ON b.NEIGHBOR_HOOD_ID = n.id + LEFT JOIN customer_grid g + ON n.GRID_ID = g.id + LEFT JOIN customer_agency a + ON a.id = g.pid WHERE - n.DEL_FLAG = '0' - AND b.DEL_FLAG = '0' - AND g.DEL_FLAG = '0' - AND a.DEL_FLAG = '0' - AND n.CUSTOMER_ID = #{customerId} - - AND n.GRID_ID = #{gridId} - - - AND (n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') OR b.BUILDING_NAME LIKE CONCAT('%', #{buildingName}, '%')) - - - AND ( - n.AGENCY_ID = #{agencyId} - OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) - + n.DEL_FLAG = '0' + AND b.DEL_FLAG = '0' + AND g.DEL_FLAG = '0' + AND a.DEL_FLAG = '0' + AND n.CUSTOMER_ID = #{customerId} + + AND n.GRID_ID = #{gridId} + + + AND n.NEIGHBOR_HOOD_NAME LIKE CONCAT('%', #{buildingName}, '%') + + + AND ( + n.AGENCY_ID = #{agencyId} + OR n.AGENCY_PIDS LIKE CONCAT('%', #{agencyId}, '%')) + + order by n.CREATED_TIME asc,n.id asc + + \ No newline at end of file From 1f675bf4c46a6118fbc7de229769065402df8f5e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 12:30:06 +0800 Subject: [PATCH 021/177] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=94=BB=E5=83=8F?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=AD=A6=E5=8E=86sql=E5=88=A4=E6=96=AD?= =?UTF-8?q?=E5=86=99=E6=AD=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 32 +++++++++---------- .../main/resources/mapper/IcResiUserDao.xml | 12 +++++++ 2 files changed, 28 insertions(+), 16 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 d87b068e73..1d9b9a8a25 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 @@ -4046,13 +4046,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); - if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); - } - Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); + // DictListFormDTO dictFormDTO = new DictListFormDTO(); + // dictFormDTO.setDictType(DictTypeEnum.EDUCATION.getCode()); + // Result> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); + // if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { + // throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); + // } + // Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); @@ -4073,7 +4073,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl { // 学历名称 - resi.setEducationName(educationMap.get(resi.getEducationCode())); + // resi.setEducationName(educationMap.get(resi.getEducationCode())); GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(resi.getGridId()); if (null != gridInfoCache) { resi.setGridName(gridInfoCache.getGridNamePath()); @@ -4106,13 +4106,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> dictResult = epmetAdminOpenFeignClient.dictList(dictFormDTO); if (!dictResult.success() || CollectionUtils.isEmpty(dictResult.getData())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "学历字典获取失败", "学历字典获取失败"); } - Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel)); + Map educationMap = dictResult.getData().stream().collect(Collectors.toMap(DictListResultDTO::getValue, DictListResultDTO::getLabel));*/ if (StringUtils.isBlank(orgId)) { orgId = CustomerStaffRedis.getStaffInfo(customerId, staffId).getAgencyId(); @@ -4124,12 +4124,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = baseDao.selectPortrayalResiList(customerId, orgId, orgType,orgIdPath,codeType, code); - if(CollectionUtils.isNotEmpty(list)){ - list.forEach(resi -> { - // 学历名称 - resi.setEducationName(educationMap.get(resi.getEducationCode())); - }); - } + // if(CollectionUtils.isNotEmpty(list)){ + // list.forEach(resi -> { + // // 学历名称 + // resi.setEducationName(educationMap.get(resi.getEducationCode())); + // }); + // } PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(), pageSize); } 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 5db97e1f5e..b5e5b604d2 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 @@ -1673,6 +1673,18 @@ ( CASE WHEN u.GENDER = '1' THEN '男' WHEN u.GENDER = '2' THEN '女' ELSE '未知' END ) AS genderName, YEAR (NOW())- SUBSTR( u.BIRTHDAY, 1, 4 ) AS age, u.CULTURE AS educationCode, + ( + case when u.CULTURE='0' then '小学及文盲' + when u.CULTURE='1' then '初中' + when u.CULTURE='2' then '高中' + when u.CULTURE='3' then '大专' + when u.CULTURE='4' then '本科' + when u.CULTURE='5' then '硕士' + when u.CULTURE='6' then '博士' + when u.CULTURE='7' then '中专' + else '' + end + )as educationName, '' AS educationName, IFNULL(u.CULTURE,'')AS educationCode, u.BIRTHDAY AS birthday From cda40ad9d556f7d0b9ad9ef1df9b9b5415af6f78 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 14:03:08 +0800 Subject: [PATCH 022/177] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=8E=8B=E7=AB=A5?= =?UTF-8?q?=E7=9A=84=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partyOrg/service/IcPartyOrgService.java | 8 ++ .../service/impl/IcPartyOrgServiceImpl.java | 24 ++++++ .../controller/IcPartyMemberController.java | 81 ++++++++++--------- .../service/IcPartyMemberService.java | 8 ++ .../impl/IcPartyMemberServiceImpl.java | 13 ++- .../dto/form/IcPartyMemberListFormDTO.java | 11 +++ .../dto/result/PartyMemberAgeResultDTO.java | 9 +++ .../result/PartyMemberEducationResultDTO.java | 7 ++ .../resi/PartymemberPortraitResultDTO.java | 19 +++++ 9 files changed, 139 insertions(+), 41 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java index aa13fbfec8..5764d703d3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/IcPartyOrgService.java @@ -158,4 +158,12 @@ public interface IcPartyOrgService extends BaseService { */ void editPrincipal(EditPrincipalFormDTO formDTO); + /** + * 获取工作人员所属组织下的党组织 + * @param customerId + * @param staffId + * @return + */ + IcPartyOrgEntity getIcPartyOrg(String customerId,String staffId); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java index 0b18281ce5..b13a9b573a 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java @@ -503,4 +503,28 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl orgWrapper = new LambdaQueryWrapper<>(); + orgWrapper.eq(IcPartyOrgEntity::getCustomerId, customerId); + orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); + orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); + IcPartyOrgEntity icPartyOrgEntity = baseDao.selectOne(orgWrapper); + if (null == icPartyOrgEntity) { + log.warn("当前工作人员所属组织下，暂无党组织，当前"); + } + return icPartyOrgEntity; + } } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 7628cfbb82..1965fd546b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -4,21 +4,18 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.write.metadata.WriteSheet; import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; 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.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.dto.result.OptionDataResultDTO; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; @@ -33,8 +30,9 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; +import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; import com.epmet.modules.partymember.service.IcPartyMemberService; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; @@ -79,8 +77,10 @@ public class IcPartyMemberController implements ResultDataResolver { @Autowired private IcPartyMemberService icPartyMemberService; + // @Autowired + // private IcPartyOrgDao icPartyOrgDao; @Autowired - private IcPartyOrgDao icPartyOrgDao; + private IcPartyOrgService icPartyOrgService; @RequestMapping("page") @MaskResponse(fieldNames = { "mobile", "idCard" }, fieldsMaskType = { MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD }) @@ -230,6 +230,26 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result(); } + + /** + * @describe: 统计分析-党员年龄范围统计 + * @author wangtong + * @date 2022/5/23 10:19 + * @params [formDTO] + * @return com.epmet.commons.tools.utils.Result> + */ + @PostMapping("partymemberagestatistics") + public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { + if(StringUtils.isBlank(formDTO.getOrgId())){ + IcPartyOrgEntity org =icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); + if (null == org) { + return new Result>().ok(new ArrayList<>()); + } + formDTO.setOrgId(org.getId()); + } + return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); + } + /** * @describe: 统计分析-党员学历统计 * @author wangtong @@ -240,7 +260,7 @@ public class IcPartyMemberController implements ResultDataResolver { @PostMapping("partymembereducationstatistics") public Result> partyMemberEducationStatistics(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new ArrayList<>()); } @@ -260,7 +280,7 @@ public class IcPartyMemberController implements ResultDataResolver { @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberAgelist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } @@ -280,7 +300,7 @@ public class IcPartyMemberController implements ResultDataResolver { @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) public Result> partyMemberEducationlist(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberListFormDTO formDTO) { if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } @@ -290,42 +310,23 @@ public class IcPartyMemberController implements ResultDataResolver { } /** - * @describe: 统计分析-党员年龄范围统计 - * @author wangtong - * @date 2022/5/23 10:19 - * @params [formDTO] - * @return com.epmet.commons.tools.utils.Result> - */ - @PostMapping("partymemberagestatistics") - public Result> partyMemberAgeStatistics(@LoginUser TokenDto tokenDto,@RequestBody IcPartyMemberFormDTO formDTO) { - if(StringUtils.isBlank(formDTO.getOrgId())){ - IcPartyOrgEntity org = setOrgId(tokenDto); + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("partymember-portrait-list") + @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) + public Result> queryPartymemberPortraitList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberListFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOrgId())) { + // 当前工作人员所属组织下的，党组织 + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); if (null == org) { - return new Result>().ok(new ArrayList<>()); + return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); } formDTO.setOrgId(org.getId()); } - return new Result>().ok(icPartyMemberService.partyMemberAgeStatistics(formDTO)); - } - - /** - * @describe: 组装党组织信息 - * @author wangtong - * @date 2022/7/8 16:46 - * @params [tokenDto, formDTO] - * @return com.epmet.modules.partyOrg.entity.IcPartyOrgEntity - */ - public IcPartyOrgEntity setOrgId(TokenDto tokenDto){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == staffInfo) { - throw new EpmetException("获取工作人员信息失败"); - } - //获取工作人员所属组织同级的党组织 - LambdaQueryWrapper orgWrapper = new LambdaQueryWrapper<>(); - orgWrapper.eq(IcPartyOrgEntity::getCustomerId, tokenDto.getCustomerId()); - orgWrapper.eq(IcPartyOrgEntity::getAgencyId, staffInfo.getAgencyId()); - orgWrapper.ne(IcPartyOrgEntity::getPartyOrgType, NumConstant.FIVE_STR); - return icPartyOrgDao.selectOne(orgWrapper); + return new Result>().ok(icPartyMemberService.queryPartymemberPortraitList(formDTO)); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index c88113ae6a..a02c753a8c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -8,6 +8,7 @@ import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; @@ -150,4 +151,11 @@ public interface IcPartyMemberService extends BaseService { void execAsyncExcelImport(Path filePath, String importTaskId); IcPartyInfoResultDTO partyInfo(TokenDto tokenDto); + + /** + * 烟台管理平台党员画像，列表查询 + * @param formDTO + * @return + */ + PageData queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index d9d43ea387..db0f496c26 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -32,6 +32,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; +import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; @@ -734,5 +735,15 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO) { + // todo + return null; + } } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java index b2dbe3f596..93eea73c4e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcPartyMemberListFormDTO.java @@ -15,9 +15,20 @@ public class IcPartyMemberListFormDTO extends PageFormDTO implements Serializabl private static final long serialVersionUID = -6085134769034337175L; + /** + * 党组织id + */ private String orgId; private String code; private String agencyId; + + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 年龄：age + * 学历：education + * 如果不传默认查询所有党员 + */ + private String codeType; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java index a700a87a91..baf2e68550 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberAgeResultDTO.java @@ -14,7 +14,16 @@ public class PartyMemberAgeResultDTO implements Serializable { private static final long serialVersionUID = 3421162784157903637L; private String userId; private String name; + + private String age; + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 在这个dto里增加了education + */ + private String education; + + private String mobile; private String icResiUser; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java index f686a1ce43..3df9d895ac 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/PartyMemberEducationResultDTO.java @@ -14,6 +14,13 @@ public class PartyMemberEducationResultDTO implements Serializable { private static final long serialVersionUID = -5042362121277863249L; private String userId; private String name; + + /** + * 烟台党员画像列表接口，将上方两个接口，合为一个 + * 在这个dto里增加了age + */ + private String age; + private String education; private String mobile; private String icResiUser; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java new file mode 100644 index 0000000000..6c55a6e8d0 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.result.resi; + +import lombok.Data; + +/** + * @Description 烟台管理平台党员画像 + * @Author yzm + * @Date 2023/4/20 13:32 + */ +@Data +public class PartymemberPortraitResultDTO { + private String userId; + private String name; + private String age; + private String education; + private String mobile; + private String icResiUser; +} + From a80f024c3fd2e1e96382470ce040740ca8543345 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 14:06:03 +0800 Subject: [PATCH 023/177] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=88=97=E8=A1=A8=E8=BF=94=E5=8F=82dto?= =?UTF-8?q?=E5=9B=9E=E5=BD=92=E6=AD=A3=E5=B8=B8=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/partymember/result}/PartymemberPortraitResultDTO.java | 2 +- .../modules/partymember/controller/IcPartyMemberController.java | 2 +- .../epmet/modules/partymember/service/IcPartyMemberService.java | 2 +- .../partymember/service/impl/IcPartyMemberServiceImpl.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename {epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi => epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result}/PartymemberPortraitResultDTO.java (84%) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java similarity index 84% rename from epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java rename to epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java index 6c55a6e8d0..b66a0adf0a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/resi/PartymemberPortraitResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.dto.result.resi; +package com.epmet.resi.partymember.dto.partymember.result; import lombok.Data; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 1965fd546b..10c6f302f9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -30,7 +30,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index a02c753a8c..2fd029d03e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -8,7 +8,7 @@ import com.epmet.dto.form.IcPartyMemberFormDTO; import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partymember.entity.IcPartyMemberEntity; import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index db0f496c26..296fbad057 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -32,7 +32,7 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; import com.epmet.dto.result.UploadImgResultDTO; -import com.epmet.dto.result.resi.PartymemberPortraitResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.feign.*; import com.epmet.modules.partyOrg.dao.IcPartyOrgDao; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; From b9605d967d3eda9730634767d6af3875478ac66b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 20 Apr 2023 15:52:31 +0800 Subject: [PATCH 024/177] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=85=9A=E5=91=98?= =?UTF-8?q?=E7=94=BB=E5=83=8F=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/PartymemberPortraitResultDTO.java | 24 +++- .../controller/IcPartyMemberController.java | 119 +++++++++++++++--- .../partymember/dao/IcPartyMemberDao.java | 5 +- .../service/IcPartyMemberService.java | 2 +- .../impl/IcPartyMemberServiceImpl.java | 64 +++++++--- .../mapper/partymember/IcPartyMemberDao.xml | 54 ++++++-- .../dto/result/PartyMemberAgeResultDTO.java | 1 + .../result/PartyMemberEducationResultDTO.java | 2 +- 8 files changed, 221 insertions(+), 50 deletions(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java index b66a0adf0a..9989ef8f5e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/PartymemberPortraitResultDTO.java @@ -1,5 +1,8 @@ package com.epmet.resi.partymember.dto.partymember.result; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; /** @@ -9,11 +12,30 @@ import lombok.Data; */ @Data public class PartymemberPortraitResultDTO { + @ExcelIgnore private String userId; + + @ColumnWidth(15) + @ExcelProperty(value = "姓名",order = 1) private String name; + + @ColumnWidth(20) + @ExcelProperty(value = "手机号",order = 2) + private String mobile; + + @ColumnWidth(20) + @ExcelProperty(value = "证件号",order = 3) + private String idCard; + + @ColumnWidth(15) + @ExcelProperty(value = "年龄",order = 4) private String age; + + @ColumnWidth(15) + @ExcelProperty(value = "学历",order = 5) private String education; - private String mobile; + + @ExcelIgnore private String icResiUser; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java index 10c6f302f9..0330f3b9d3 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartyMemberController.java @@ -30,7 +30,6 @@ import com.epmet.dto.form.IcPartyMemberListFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.PartyMemberAgeResultDTO; import com.epmet.dto.result.PartyMemberEducationResultDTO; -import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.modules.partyOrg.entity.IcPartyOrgEntity; import com.epmet.modules.partyOrg.service.IcPartyOrgService; import com.epmet.modules.partymember.excel.IcPartyMemberExcel; @@ -39,6 +38,7 @@ import com.epmet.resi.partymember.dto.partymember.IcPartyMemberDTO; import com.epmet.resi.partymember.dto.partymember.form.IcPartyMemberFromDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyInfoResultDTO; import com.epmet.resi.partymember.dto.partymember.result.IcPartyMemberResultDTO; +import com.epmet.resi.partymember.dto.partymember.result.PartymemberPortraitResultDTO; import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -57,10 +57,7 @@ import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; import java.nio.file.Path; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.UUID; +import java.util.*; import java.util.concurrent.atomic.AtomicInteger; @@ -309,24 +306,116 @@ public class IcPartyMemberController implements ResultDataResolver { return new Result>().ok(icPartyMemberService.getPartyMemberEducationList(formDTO)); } + /** * 烟台党员画像列表接口，将上方两个接口，合为一个 - * @param tokenDto * @param formDTO * @return */ @PostMapping("partymember-portrait-list") - @MaskResponse(fieldNames = {"mobile"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE}) - public Result> queryPartymemberPortraitList(@LoginUser TokenDto tokenDto, @RequestBody IcPartyMemberListFormDTO formDTO) { - if (StringUtils.isBlank(formDTO.getOrgId())) { - // 当前工作人员所属组织下的，党组织 - IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(tokenDto.getCustomerId(),tokenDto.getUserId()); - if (null == org) { - return new Result>().ok(new PageData<>(Collections.emptyList(), 0)); + @MaskResponse(fieldNames = {"mobile","idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE,MaskResponse.MASK_TYPE_ID_CARD}) + public Result> queryPartyMemberPortraitList(@RequestBody IcPartyMemberListFormDTO formDTO) { + return new Result>().ok(icPartyMemberService.queryPartyMemberPortraitList(formDTO)); + } + + + /** + * 烟台党员画像列表-导出 + * @param formDTO + * @return + */ + @NoRepeatSubmit + @PostMapping("partymember-portrait-export") + public void partymemberPortraitExport(@RequestBody IcPartyMemberListFormDTO formDTO, HttpServletResponse response) throws Exception { + ExcelWriter excelWriter = null; + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + formDTO.setIsPage(true); + String fileName=getPartymemberPortraitFileName(formDTO.getCodeType(),formDTO.getCode()); + try { + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), PartymemberPortraitResultDTO.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = icPartyMemberService.queryPartyMemberPortraitList(formDTO); + list = data.getList(); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(list) && list.size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("党员画像列表导出exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + /** + * 烟台党员画像列表-导出 + * @return 返回导出excel的文件名 + */ + private String getPartymemberPortraitFileName(String codeType, String code) { + String name = "党员画像"; + if ("age".equals(codeType)) { + switch (code) { + case NumConstant.ZERO_STR: + name = "50岁以下党员信息"; + break; + case NumConstant.ONE_STR: + name = "50-59岁党员信息"; + break; + case NumConstant.TWO_STR: + name = "60-69岁党员信息"; + break; + case NumConstant.THREE_STR: + name = "70-79岁党员信息"; + break; + case NumConstant.FOUR_STR: + name = "80岁以上党员信息"; + break; + default: + name = ""; + break; + } + }else if ("education".equals(codeType)) { + switch (code) { + case NumConstant.ZERO_STR: + name = "小学及文盲党员信息"; + break; + case NumConstant.ONE_STR: + name = "初中学历党员信息"; + break; + case NumConstant.TWO_STR: + name = "高中学历党员信息"; + break; + case NumConstant.THREE_STR: + name = "大专学历党员信息"; + break; + case NumConstant.FOUR_STR: + name = "本科学历党员信息"; + break; + case NumConstant.FIVE_STR: + name = "硕士学历党员信息"; + break; + case NumConstant.SIX_STR: + name = "博士学历党员信息"; + break; + default: + name = "党员画像"; + break; } - formDTO.setOrgId(org.getId()); } - return new Result>().ok(icPartyMemberService.queryPartymemberPortraitList(formDTO)); + String fileName=name+DateUtils.format(new Date()) + ".xlsx"; + return fileName; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java index 0f18a60ac5..740128a912 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/IcPartyMemberDao.java @@ -65,7 +65,10 @@ public interface IcPartyMemberDao extends BaseDao { * @params [orgId, code] * @return java.util.List */ - List getPartyMemberEducationList(@Param("agencyId") String agencyId,@Param("orgId") String orgId,@Param("code") String code); + List getPartyMemberEducationList(@Param("agencyId") String agencyId, + @Param("orgId") String orgId, + @Param("code") String code, + @Param("codeType") String codeType); /** * @describe: 党员年龄范围统计 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java index 2fd029d03e..1ff8c2dece 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartyMemberService.java @@ -157,5 +157,5 @@ public interface IcPartyMemberService extends BaseService { * @param formDTO * @return */ - PageData queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO); + PageData queryPartyMemberPortraitList(IcPartyMemberListFormDTO formDTO); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java index 296fbad057..07a405b0a4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartyMemberServiceImpl.java @@ -451,7 +451,7 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); } List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); @@ -461,23 +461,23 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl getPartyMemberEducationList(IcPartyMemberListFormDTO formDTO) { if (formDTO.getIsPage()) { PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); - List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); - Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode(),"education"); PageInfo pageInfo = new PageInfo<>(list); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); - }); - } - return new PageData<>(list, pageInfo.getTotal()); - } - List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode()); - Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); - if (CollectionUtils.isNotEmpty(list)) { - list.forEach(item -> { - item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); - }); - } + // Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + // if (CollectionUtils.isNotEmpty(list)) { + // list.forEach(item -> { + // item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + // }); + // } + return new PageData<>(list, pageInfo.getTotal(),formDTO.getPageSize()); + } + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(),formDTO.getOrgId(), formDTO.getCode(),"education"); + // Result> mapResult = epmetAdminOpenFeignClient.dictMap(DictTypeEnum.EDUCATION.getCode()); + // if (CollectionUtils.isNotEmpty(list)) { + // list.forEach(item -> { + // item.setEducation(null == mapResult.getData().get(item.getEducation()) ? "" : mapResult.getData().get(item.getEducation())); + // }); + // } return new PageData<>(list, null == list?NumConstant.ZERO:list.size()); } @@ -742,8 +742,32 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl queryPartymemberPortraitList(IcPartyMemberListFormDTO formDTO) { - // todo - return null; + public PageData queryPartyMemberPortraitList(IcPartyMemberListFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getOrgId())) { + // 当前工作人员所属组织下的，党组织 + IcPartyOrgEntity org= icPartyOrgService.getIcPartyOrg(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + if (null == org) { + return new PageData<>(Collections.emptyList(), 0, formDTO.getPageSize()); + } + formDTO.setOrgId(org.getId()); + } + if ("age".equals(formDTO.getCodeType())) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberAgeList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode()); + PageInfo pageInfo = new PageInfo<>(list); + + List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); + return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); + + } + // else if ("education".equals(formDTO.getCodeType())) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = baseDao.getPartyMemberEducationList(formDTO.getAgencyId(), formDTO.getOrgId(), formDTO.getCode(),formDTO.getCodeType()); + PageInfo pageInfo = new PageInfo<>(list); + + List resultDTOList = ConvertUtils.sourceToTarget(list, PartymemberPortraitResultDTO.class); + return new PageData<>(resultDTOList, pageInfo.getTotal(), formDTO.getPageSize()); } + + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml index a9d4f8c583..962f962a8b 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/IcPartyMemberDao.xml @@ -164,7 +164,9 @@ NAME, MOBILE, age, - IC_RESI_USER + IC_RESI_USER, + ID_CARD, + education FROM ( SELECT @@ -172,14 +174,16 @@ NAME, MOBILE, age, - CASE + (CASE WHEN age < 50 THEN '0' WHEN age >= 50 AND age <= 59 THEN '1' WHEN age >= 60 AND age <= 69 THEN '2' WHEN age >= 70 AND age <= 79 THEN '3' ELSE '4' - END AS ageGroup, - IC_RESI_USER + END )AS ageGroup, + IC_RESI_USER, + ID_CARD, + education FROM ( SELECT @@ -187,7 +191,20 @@ NAME, MOBILE, YEAR (FROM_DAYS(DATEDIFF(NOW(),SUBSTRING( ID_CARD, 7, 8 )))) AS age, - IC_RESI_USER + IC_RESI_USER, + ID_CARD, + ( + case when CULTURE='0' then '小学及文盲' + when CULTURE='1' then '初中' + when CULTURE='2' then '高中' + when CULTURE='3' then '大专' + when CULTURE='4' then '本科' + when CULTURE='5' then '硕士' + when CULTURE='6' then '博士' + when CULTURE='7' then '中专' + else '' + end + )as education FROM ic_party_member WHERE @@ -205,22 +222,37 @@ WHERE ageGroup = #{code} - ORDER BY CONVERT(NAME USING GBK) ASC + ORDER BY ID ASC diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml index d7e0d5ff39..546c52b88f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/IcEventDao.xml @@ -247,7 +247,7 @@ #{secondId} - order by ie.created_time desc, ie.latest_operated_time desc + order by ie.happen_time desc, ie.latest_operated_time desc select * from ic_resi_user where del_flag='0' and id=#{icResiUserId} and customer_id=#{customerId} From 53acd4d5fc75d38bc341506c56e024f0b74c46a0 Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 24 Apr 2023 10:49:29 +0800 Subject: [PATCH 038/177] =?UTF-8?q?1.=E5=A2=9E=E5=8A=A0=EF=BC=9AEpmetUserR?= =?UTF-8?q?emoteService=E7=94=A8=E4=BA=8E=E8=8E=B7=E5=8F=96=E5=BD=93?= =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/remote/EpmetUserRemoteService.java | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java new file mode 100644 index 0000000000..29758a6edf --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/remote/EpmetUserRemoteService.java @@ -0,0 +1,35 @@ +package com.epmet.remote; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dto.form.LoginUserDetailsFormDTO; +import com.epmet.dto.result.LoginUserDetailsResultDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * epmet用户远程服务工具 + */ +@Component +public class EpmetUserRemoteService implements ResultDataResolver { + + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + + /** + * 查询当前登录用户信息 + * @return + */ + public LoginUserDetailsResultDTO getLoginUserDetails() { + // 不传组织id，则基于当前组织查询 + LoginUserDetailsFormDTO loinUserForm = new LoginUserDetailsFormDTO(); + loinUserForm.setApp(EpmetRequestHolder.getLoginUserApp()); + loinUserForm.setClient(EpmetRequestHolder.getLoginUserClient()); + loinUserForm.setUserId(EpmetRequestHolder.getLoginUserId()); + LoginUserDetailsResultDTO loginUserDetailsResultDTO = getResultDataOrThrowsException(epmetUserOpenFeignClient.getLoginUserDetails(loinUserForm), ServiceConstant.GOV_ORG_SERVER, + null, null, "查询当前工作人员所属组织信息失败"); + return loginUserDetailsResultDTO; + } +} From f4f89692ffc2f7a547f903d27278b8c12756f49b Mon Sep 17 00:00:00 2001 From: wxz Date: Mon, 24 Apr 2023 13:10:35 +0800 Subject: [PATCH 039/177] =?UTF-8?q?1.=E7=BB=9F=E4=B8=80=E8=B0=83=E6=95=B4L?= =?UTF-8?q?ogback=E6=97=A5=E5=BF=97=E8=BE=93=E5=87=BA=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E6=89=A7=E8=A1=8Cjvm=E5=8F=82=E6=95=B0=E4=BC=A0?= =?UTF-8?q?=E5=85=A5=E3=80=82=E9=BB=98=E8=AE=A4./logs/myservice=E3=80=82?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8C=87=E5=AE=9A=E6=96=B9=E5=BC=8F=EF=BC=9A?= =?UTF-8?q?-Dlog.dir=3D/Volumes/data/epmetlog=EF=BC=8C=E5=88=99=E4=BC=9A?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E5=88=B0/Volumes/data/epmetlog/myservice?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-admin-server/src/main/resources/logback-spring.xml | 3 ++- epmet-auth/src/main/resources/logback-spring.xml | 3 ++- epmet-gateway/src/main/resources/logback-spring.xml | 3 ++- .../src/main/resources/logback-spring.xml | 3 ++- .../data-report-server/src/main/resources/logback-spring.xml | 3 ++- .../src/main/resources/logback-spring.xml | 3 ++- .../src/main/resources/logback-spring.xml | 3 ++- .../src/main/resources/logback-spring.xml | 3 ++- .../epmet-demo-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-ext-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-heart-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-job-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-message-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-oss-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-point-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-third-server/src/main/resources/logback-spring.xml | 3 ++- .../gov-access-server/src/main/resources/logback-spring.xml | 3 ++- .../gov-grid-server/src/main/resources/logback-spring.xml | 3 ++- .../gov-issue-server/src/main/resources/logback-spring.xml | 3 ++- .../gov-mine-server/src/main/resources/logback-spring.xml | 3 ++- .../gov-org-server/src/main/resources/logback-spring.xml | 3 ++- .../gov-project-server/src/main/resources/logback-spring.xml | 3 ++- .../gov-voice-server/src/main/resources/logback-spring.xml | 3 ++- .../src/main/resources/logback-spring.xml | 3 ++- .../oper-access-server/src/main/resources/logback-spring.xml | 3 ++- .../oper-crm-server/src/main/resources/logback-spring.xml | 3 ++- .../src/main/resources/logback-spring.xml | 3 ++- .../resi-group-server/src/main/resources/logback-spring.xml | 3 ++- .../resi-guide-server/src/main/resources/logback-spring.xml | 3 ++- .../resi-hall-server/src/main/resources/logback-spring.xml | 3 ++- .../resi-home-server/src/main/resources/logback-spring.xml | 3 ++- .../resi-mine-server/src/main/resources/logback-spring.xml | 3 ++- .../src/main/resources/logback-spring.xml | 3 ++- .../resi-voice-server/src/main/resources/logback-spring.xml | 3 ++- .../epmet-user-server/src/main/resources/logback-spring.xml | 3 ++- 35 files changed, 70 insertions(+), 35 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml index 3d27fa4d07..2b7d942e79 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml +++ b/epmet-admin/epmet-admin-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-auth/src/main/resources/logback-spring.xml b/epmet-auth/src/main/resources/logback-spring.xml index 3ddc774384..10e7129112 100644 --- a/epmet-auth/src/main/resources/logback-spring.xml +++ b/epmet-auth/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-gateway/src/main/resources/logback-spring.xml b/epmet-gateway/src/main/resources/logback-spring.xml index 1e050e9686..652ce500c4 100644 --- a/epmet-gateway/src/main/resources/logback-spring.xml +++ b/epmet-gateway/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml index c639482221..d1cb010d4f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml index 86de057fc6..53c7e59c69 100644 --- a/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-report/data-report-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml index 7d2b7648a3..c320f80c0d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml index 280e9f4bb2..c639444cee 100644 --- a/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-activiti/epmet-activiti-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml index dbd4fe85bb..9102439017 100644 --- a/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-common-service/common-service-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml index 1b8b94ba78..4f79c1b027 100644 --- a/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-demo/epmet-demo-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml index 8f428f8d5f..aa0f9f0a7b 100644 --- a/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-ext/epmet-ext-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml index b03ee98c4c..2239f625db 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml index 36cbaf8d12..999b42342b 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-job/epmet-job-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml index 338e0b9495..ddb20915c4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml index 8a71d1a810..d18ef07d28 100644 --- a/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-oss/epmet-oss-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml index e279b43303..81366ebe09 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml index f8e2164fb7..70dde2e876 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml index 9070f33f63..521b890c6c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml index b54d66f380..d0e5f2b64c 100644 --- a/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-grid/gov-grid-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml index 26e92fef88..d31ef9d410 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml index 33466c3178..31d1a8af02 100644 --- a/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-mine/gov-mine-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml index f366605fba..5371a1f541 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml index a1e8c5f1b0..ad19a235ae 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml index 6c230be6bf..c26e31a513 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml index 36ddc6f222..03c538fdc0 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml index e22bb16a66..080c035973 100644 --- a/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml +++ b/epmet-module/oper-access/oper-access-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml index b670ba07bf..5a0f538ff1 100644 --- a/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml +++ b/epmet-module/oper-crm/oper-crm-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml index cedd663d22..40a734010f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml index 6a517afaff..bbc34e798a 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml index 126316c645..a42f347111 100644 --- a/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-guide/resi-guide-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml index a5db66cb09..049506c162 100644 --- a/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-hall/resi-hall-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml index 0b5eedfde0..490067bb31 100644 --- a/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-home/resi-home-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml index f797654dbd..a0c67122f7 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-mine/resi-mine-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml index b8b3161188..1bc47d8520 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml index 408ee874df..a69c72cdd0 100644 --- a/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml +++ b/epmet-module/resi-voice/resi-voice-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + diff --git a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml index 899eed6c7a..a3b40f72e6 100644 --- a/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml +++ b/epmet-user/epmet-user-server/src/main/resources/logback-spring.xml @@ -3,7 +3,8 @@ - + + From de5dc99ba7b10f83ecfb2b250ccd3e1ef8014768 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 24 Apr 2023 17:54:05 +0800 Subject: [PATCH 040/177] fix --- .../src/main/resources/mapper/ArticleContentDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml index 52007cee9e..9a7b45fc31 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml +++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleContentDao.xml @@ -11,7 +11,7 @@ article_content ac WHERE ac.DEL_FLAG = '0' - AND ac.ID = #{articleId} + AND ac.ARTICLE_ID = #{articleId} \ No newline at end of file From 6be81b4f594c309f7aa6a6a8de26aec1f950fad9 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 25 Apr 2023 15:47:25 +0800 Subject: [PATCH 041/177] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A7=81=E6=9C=89?= =?UTF-8?q?=E5=8C=96=E9=83=A8=E7=BD=B2=E7=9A=84=E4=B8=80=E7=82=B9=E6=96=87?= =?UTF-8?q?=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- doc/epmet-cloud.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/epmet-cloud.md b/doc/epmet-cloud.md index 43cd0d2f63..e47ddfc70e 100644 --- a/doc/epmet-cloud.md +++ b/doc/epmet-cloud.md @@ -10,4 +10,11 @@ 例如：有A、B2个服务，并且A调用B，如果我们只需要开发A服务，那本地只启动A服务即可，A调用B的时候，会调用服务器的B服务。 如果需要开发AB2个服务，那么将A中的FeignClient的url属性指向localhost。 PS:目前正在测试通过负载均衡器和本地环境变量实现动态修改目标服务IP，成功之后就不需要再修改FeignClient的url，配置一下环境变量即可，到时候具体说 -``` \ No newline at end of file +``` + + +## 私有化部署 +##### 需要开放哪些域名 + +- epmet-cloud.elinkservice.cn 微信交互代理 +- dysmsapi.aliyuncs.com 阿里云短信 \ No newline at end of file From f18bb7b8cababf53a398f493cfaf9af1019beec9 Mon Sep 17 00:00:00 2001 From: wxz Date: Tue, 25 Apr 2023 15:57:44 +0800 Subject: [PATCH 042/177] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8F=98=E6=9B=B4=E8=AE=B0=E5=BD=95=E4=B8=AD?= =?UTF-8?q?=E7=9A=84customerId=EF=BC=8CstaffId=E7=9A=84=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 30 +++++++++++-------- 1 file changed, 18 insertions(+), 12 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 c49ecc7554..7b9434043a 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 @@ -708,7 +708,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl", resiUserId)); } //2022-1-18 信息修改判断基础信息表人员网格、小区、楼栋、单元、房屋维度数据以及十八类的类别数据是否变化，相应生成变更记录和变更明细数据 sun start - icUserChangeRecord(tokenDto, entity, map); + icUserChangeRecord(entity, map); //2022-1-18 sun end //2.更新主表数据 if (map.size() > NumConstant.ONE) { @@ -789,10 +789,16 @@ public class IcResiUserServiceImpl extends BaseServiceImpl map) { + * @description: 生成居民变更记录 + * @param null: + * @return + * @author: sun + */ + public void icUserChangeRecord(IcResiUserEntity entity, LinkedHashMap map) { + // prepare + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + String staffId = EpmetRequestHolder.getLoginUserId(); + java.util.Date date = new java.util.Date(); //1.判断维度数据是否修改【网格、小区、楼栋、单元、房间有变化则先走人员调动逻辑】 if ((map.containsKey("GRID_ID") && !entity.getGridId().equals(map.get("GRID_ID"))) || (map.containsKey("VILLAGE_ID") && !entity.getVillageId().equals(map.get("VILLAGE_ID"))) @@ -809,13 +815,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> categoryListResult = operCustomizeOpenFeignClient.getCategoryList(sfdto); if (!categoryListResult.success()) { throw new RenException("居民信息修改，获取客户居民类别预警配置表数据失败"); @@ -840,7 +846,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl NumConstant.ZERO) { //变更记录 - CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); - changeRecordEntity.setCustomerId(tokenDto.getCustomerId()); - changeRecordEntity.setOperatorId(tokenDto.getUserId()); + CustomerStaffInfoCacheResult staffInfoCache = CustomerStaffRedis.getStaffInfo(customerId, staffId); + changeRecordEntity.setCustomerId(customerId); + changeRecordEntity.setOperatorId(staffId); changeRecordEntity.setIcUserId(entity.getId()); changeRecordEntity.setOperatorName(staffInfoCache.getRealName()); changeRecordEntity.setIcUserName(map.containsKey("NAME") ? map.get("NAME") : entity.getName()); From da489b7150250675613c3da3c1f77d8fbdf88258 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Apr 2023 17:31:56 +0800 Subject: [PATCH 043/177] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E8=B0=83=E6=95=B4=EF=BC=8C=E5=BE=AE=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/HouseServiceImpl.java | 4 +- .../impl/IcResiCollectServiceImpl.java | 168 ++++++++++++------ 2 files changed, 116 insertions(+), 56 deletions(-) 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 baf6ad7abd..92fb0d2116 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 @@ -272,10 +272,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { houseChangeRecordCollect(formDTO.getId(), formDTO.getCustomerId(), icHouseDTO); icHouseDao.updateById(entity); - IcHouseDTO houseDTO = icHouseService.get(formDTO.getId()); + // IcHouseDTO houseDTO = icHouseService.get(formDTO.getId()); //删除房屋缓存 - icHouseRedis.delHouseInfo(formDTO.getId(), houseDTO.getCustomerId()); + icHouseRedis.delHouseInfo(formDTO.getId(), formDTO.getCustomerId()); } /** diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index bfecfa4671..ee5d24e8a1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -9,10 +9,12 @@ import com.epmet.commons.tools.enums.RelationshipEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerIcHouseRedis; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.PidUtils; @@ -43,6 +45,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.function.Function; @@ -421,6 +424,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl resultDTOResult = govOrgFeignClient.getHouseInfoToCollect(getHouseInfoToCollectFormDTO); IcHouseInfoCollectResultDTO icHouseInfoCollectResultDTO = resultDTOResult.getData(); - + if(null==icHouseInfoCollectResultDTO){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"房屋不存在","房屋不存在，请先新建同名房屋"); + } // 新增房屋后需要collect更新上房屋ID // log icResiCollectEntity.setHomeId(icHouseInfoCollectResultDTO.getId()); @@ -462,7 +468,9 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, icResiCollectEntity.getHomeId()); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .ne(IcResiUserEntity::getIdCard,icResiCollectMemDetailDTO.getIdNum()); List entityList = icResiUserDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { - String errorMsg = "房屋下已存在户主"; - throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg); + String errorMsg = "当前房屋下已存在户主"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } } - AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId()); - if (null == agencyInfoCache) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常"); - } - // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身 - userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids())); - userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); - userEntity.setGridId(icResiCollectEntity.getGridId()); - userEntity.setVillageId(icResiCollectEntity.getVillageId()); - userEntity.setBuildId(icResiCollectEntity.getBuildId()); - userEntity.setUnitId(icResiCollectEntity.getUnitId()); - userEntity.setHomeId(icResiCollectEntity.getHomeId()); - userEntity.setName(icResiCollectMemDetailDTO.getName()); - userEntity.setMobile(icResiCollectMemDetailDTO.getMobile()); - userEntity.setIdCard(icResiCollectMemDetailDTO.getIdNum()); - userEntity.setYhzgx(icResiCollectMemDetailDTO.getRelationship()); - userEntity.setGzdw(icResiCollectMemDetailDTO.getWorkPlace()); - userEntity.setRemarks(icResiCollectMemDetailDTO.getRemark()); - userEntity.setHjszd(icResiCollectMemDetailDTO.getDomicilePlace()); - icResiUserDao.updateById(userEntity); - // 判断是否需要更新记录 if(isUpdateLog){ //变更记录表 IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); changeRecordEntity.setOperatorId(formDTO.getUserId()); - changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setIcUserId(existedUserEntity.getId()); changeRecordEntity.setOperatorName(formDTO.getRealName()); - changeRecordEntity.setIcUserName(userEntity.getName()); - changeRecordEntity.setType("update"); - changeRecordEntity.setTypeName("修改"); + changeRecordEntity.setIcUserName(existedUserEntity.getName()); + changeRecordEntity.setType("transfer"); + changeRecordEntity.setTypeName("调动"); changeRecordEntity.setBeforeChangeName("-"); + HouseInfoCache originHouseInfoCache= CustomerIcHouseRedis.getHouseInfo(icResiCollectEntity.getCustomerId(),existedUserEntity.getHomeId()); + if(null!=originHouseInfoCache){ + changeRecordEntity.setBeforeChangeName(originHouseInfoCache.getAgencyPathName().concat(StrConstant.HYPHEN).concat(originHouseInfoCache.getGridName()).concat(StrConstant.HYPHEN).concat(originHouseInfoCache.getAllName())); + } changeRecordEntity.setAfterChangeName("-"); + HouseInfoCache newHouseInfoCache = CustomerIcHouseRedis.getHouseInfo(icResiCollectEntity.getCustomerId(), icResiCollectEntity.getHomeId()); + if (null != newHouseInfoCache) { + //信息采集时居民自己填写的房屋 以他填写的为准！！！！！！ + changeRecordEntity.setAfterChangeName(newHouseInfoCache.getAgencyPathName().concat(StrConstant.HYPHEN).concat(newHouseInfoCache.getGridName()).concat(StrConstant.HYPHEN).concat(newHouseInfoCache.getAllName())); + } changeRecordEntity.setChangeTime(new java.util.Date()); + changeRecordEntity.setReason("来源于信息采集：更新居民所属房屋信息"); icUserChangeRecordService.insert(changeRecordEntity); } + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId()); + if (null == agencyInfoCache) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常"); + } + // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身 + existedUserEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids())); + // 组织Id + existedUserEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + // 网格id + existedUserEntity.setGridId(icResiCollectEntity.getGridId()); + // 小区id + existedUserEntity.setVillageId(icResiCollectEntity.getVillageId()); + // 楼栋id + existedUserEntity.setBuildId(icResiCollectEntity.getBuildId()); + // 单元id + existedUserEntity.setUnitId(icResiCollectEntity.getUnitId()); + // 房屋id + existedUserEntity.setHomeId(icResiCollectEntity.getHomeId()); + // 姓名 + existedUserEntity.setName(icResiCollectMemDetailDTO.getName()); + // 手机号 + existedUserEntity.setMobile(icResiCollectMemDetailDTO.getMobile()); + // 身份证号 + existedUserEntity.setIdCard(icResiCollectMemDetailDTO.getIdNum()); + // 与户主关系 + existedUserEntity.setYhzgx(icResiCollectMemDetailDTO.getRelationship()); + // 工作单位 + existedUserEntity.setGzdw(icResiCollectMemDetailDTO.getWorkPlace()); + // 备注 + existedUserEntity.setRemarks(icResiCollectMemDetailDTO.getRemark()); + // 户籍所在地 + existedUserEntity.setHjszd(icResiCollectMemDetailDTO.getDomicilePlace()); + icResiUserDao.updateById(existedUserEntity); } /** @@ -542,49 +576,65 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, icResiCollectEntity.getHomeId()); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .ne(IcResiUserEntity::getIdCard,icResiCollectMemDetailDTO.getIdNum()); List entityList = icResiUserDao.selectList(wrapper); + // 已经存在户主了，当前成员填写的也是户主... 暂不处理 if (CollectionUtils.isNotEmpty(entityList)) { - String errorMsg = "房屋下已存在户主"; - throw new EpmetException(EpmetErrorCode.ORG_ADD_FAILED.getCode(), errorMsg, errorMsg); + String errorMsg = "当前房屋下已存在户主"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg); } } // 新增人员 - IcResiUserEntity userEntity = new IcResiUserEntity(); + IcResiUserEntity insertUserEntity = new IcResiUserEntity(); AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(icResiCollectEntity.getAgencyId()); if (null == agencyInfoCache) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所属组织查询异常,agencyId:" + icResiCollectEntity.getAgencyId(), "所属组织查询异常"); } + // 组织的pids 含agencyId本身 // userEntity.setPids(icResiCollectEntity.getPids() + ":" + icResiCollectEntity.getAgencyId()); // ic_resi_user表的组织的pids 含agencyId本身 !!! - userEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids())); - userEntity.setAgencyId(icResiCollectEntity.getAgencyId()); - userEntity.setGridId(icResiCollectEntity.getGridId()); - userEntity.setVillageId(icResiCollectEntity.getVillageId()); - userEntity.setBuildId(icResiCollectEntity.getBuildId()); - userEntity.setUnitId(icResiCollectEntity.getUnitId()); - userEntity.setHomeId(icResiCollectEntity.getHomeId()); - userEntity.setName(icResiCollectMemDetailDTO.getName()); - userEntity.setMobile(icResiCollectMemDetailDTO.getMobile()); - userEntity.setIdCard(icResiCollectMemDetailDTO.getIdNum()); - userEntity.setYhzgx(icResiCollectMemDetailDTO.getRelationship()); - userEntity.setGzdw(icResiCollectMemDetailDTO.getWorkPlace()); - userEntity.setRemarks(icResiCollectMemDetailDTO.getRemark()); - userEntity.setCustomerId(icResiCollectMemDetailDTO.getCustomerId()); - userEntity.setHjszd(icResiCollectMemDetailDTO.getDomicilePlace()); - icResiUserDao.insert(userEntity); + insertUserEntity.setPids(PidUtils.convertPid2OrgIdPath(icResiCollectEntity.getAgencyId(), agencyInfoCache.getPids())); + // 网格所属组织id + insertUserEntity.setAgencyId(icResiCollectEntity.getAgencyId()); + // 网格id + insertUserEntity.setGridId(icResiCollectEntity.getGridId()); + // 小区id + insertUserEntity.setVillageId(icResiCollectEntity.getVillageId()); + // 楼栋id + insertUserEntity.setBuildId(icResiCollectEntity.getBuildId()); + //单元id + insertUserEntity.setUnitId(icResiCollectEntity.getUnitId()); + //房屋id + insertUserEntity.setHomeId(icResiCollectEntity.getHomeId()); + //姓名 + insertUserEntity.setName(icResiCollectMemDetailDTO.getName()); + //手机号 + insertUserEntity.setMobile(icResiCollectMemDetailDTO.getMobile()); + insertUserEntity.setIdCard(icResiCollectMemDetailDTO.getIdNum()); + //与户主关系 + insertUserEntity.setYhzgx(icResiCollectMemDetailDTO.getRelationship()); + //工作单位 + insertUserEntity.setGzdw(icResiCollectMemDetailDTO.getWorkPlace()); + // 备注 + insertUserEntity.setRemarks(icResiCollectMemDetailDTO.getRemark()); + insertUserEntity.setCustomerId(icResiCollectMemDetailDTO.getCustomerId()); + // 户籍所在地 + insertUserEntity.setHjszd(icResiCollectMemDetailDTO.getDomicilePlace()); + icResiUserDao.insert(insertUserEntity); //变更记录表 IcUserChangeRecordEntity changeRecordEntity = new IcUserChangeRecordEntity(); changeRecordEntity.setCustomerId(icResiCollectEntity.getCustomerId()); changeRecordEntity.setOperatorId(formDTO.getUserId()); - changeRecordEntity.setIcUserId(userEntity.getId()); + changeRecordEntity.setIcUserId(insertUserEntity.getId()); changeRecordEntity.setOperatorName(formDTO.getRealName()); - changeRecordEntity.setIcUserName(userEntity.getName()); + changeRecordEntity.setIcUserName(insertUserEntity.getName()); changeRecordEntity.setType("add"); changeRecordEntity.setTypeName("新增"); changeRecordEntity.setBeforeChangeName("-"); changeRecordEntity.setAfterChangeName("-"); + changeRecordEntity.setReason("来源于信息采集"); changeRecordEntity.setChangeTime(new java.util.Date()); icUserChangeRecordService.insert(changeRecordEntity); @@ -602,11 +652,21 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl queryOriginUserByHomeId(String homeId,String customerId) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcResiUserEntity::getHomeId, homeId); query.eq(IcResiUserEntity::getCustomerId, customerId); List originUserList = icResiUserDao.selectList(query); + if(CollectionUtils.isEmpty(originUserList)){ + return new HashMap<>(); + } Map memMap = originUserList.stream().collect(Collectors.toMap(IcResiUserEntity::getIdCard, Function.identity())); return memMap; } From b83cb8ad354d30a0dc653426a97c4e6ed36eb6d2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Apr 2023 17:56:31 +0800 Subject: [PATCH 044/177] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E6=8C=87=E5=8D=97?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=8Cpids=E5=80=BC=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/GuideDTO.java | 1 + .../epmet/service/impl/GuideServiceImpl.java | 35 +++++++++++++++---- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java index f5fe57d143..db7177a3fa 100644 --- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java +++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/GuideDTO.java @@ -66,6 +66,7 @@ public class GuideDTO implements Serializable { /** * 所有上级组织ID,英文:隔开 + * orgId的orgIdPath */ private String pids; diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java index eadca17c92..661dd1a6c7 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java @@ -25,21 +25,23 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.PidUtils; import com.epmet.commons.tools.utils.SpringContextUtils; -import com.epmet.constant.OrgInfoConstant; import com.epmet.dao.GuideDao; import com.epmet.dto.GuideDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.GuideDetailResultDTO; import com.epmet.dto.result.GuideListResultDTO; -import com.epmet.dto.result.OrgResultDTO; import com.epmet.entity.*; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.*; @@ -184,7 +186,7 @@ public class GuideServiceImpl extends BaseServiceImpl imp orgFormDTO.setOrgId(formDTO.getOrgId()); orgFormDTO.setOrgType(formDTO.getOrgType()); //获取组织的pId和pIds - Result result = govOrgOpenFeignClient.getAgencyInfo(orgFormDTO); + /*Result result = govOrgOpenFeignClient.getAgencyInfo(orgFormDTO); if (!result.success() || null == result.getData()) { throw new RenException(result.getCode(), result.getMsg()); } @@ -193,7 +195,16 @@ public class GuideServiceImpl extends BaseServiceImpl imp } else { guideDTO.setPid(result.getData().getAgencyId()); } - guideDTO.setPids(result.getData().getPids().concat(":").concat(result.getData().getAgencyId())); + guideDTO.setPids(result.getData().getPids().concat(":").concat(result.getData().getAgencyId()));*/ + if(OrgTypeEnum.GRID.getCode().equals(formDTO.getOrgType())){ + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(formDTO.getOrgId()); + guideDTO.setPid(gridInfoCache.getPid()); + guideDTO.setPids(gridInfoCache.getPids().concat(StrConstant.COLON).concat(gridInfoCache.getId())); + }else{ + AgencyInfoCache agencyInfoCache=CustomerOrgRedis.getAgencyInfo(formDTO.getOrgId()); + guideDTO.setPid(agencyInfoCache.getPid()); + guideDTO.setPids(PidUtils.convertPid2OrgIdPath(agencyInfoCache.getId(),agencyInfoCache.getPids())); + } insert(guideDTO); //保存办事指南内容模块 if (CollectionUtils.isNotEmpty(formDTO.getModuleList())) { @@ -273,7 +284,7 @@ public class GuideServiceImpl extends BaseServiceImpl imp orgFormDTO.setOrgType(formDTO.getOrgType()); guideDTO.setOrgName(formDTO.getOrgName()); //获取组织的pId和pIds - Result result = govOrgOpenFeignClient.getAgencyInfo(orgFormDTO); + /*Result result = govOrgOpenFeignClient.getAgencyInfo(orgFormDTO); if (!result.success() || null == result.getData()) { throw new RenException(result.getCode(), result.getMsg()); } @@ -282,7 +293,17 @@ public class GuideServiceImpl extends BaseServiceImpl imp } else { guideDTO.setPid(result.getData().getAgencyId()); } - guideDTO.setPids(result.getData().getPids().concat(":").concat(result.getData().getAgencyId())); + guideDTO.setPids(result.getData().getPids().concat(":").concat(result.getData().getAgencyId()));*/ + + if(OrgTypeEnum.GRID.getCode().equals(formDTO.getOrgType())){ + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(formDTO.getOrgId()); + guideDTO.setPid(gridInfoCache.getPid()); + guideDTO.setPids(gridInfoCache.getPids().concat(StrConstant.COLON).concat(gridInfoCache.getId())); + }else{ + AgencyInfoCache agencyInfoCache=CustomerOrgRedis.getAgencyInfo(formDTO.getOrgId()); + guideDTO.setPid(agencyInfoCache.getPid()); + guideDTO.setPids(PidUtils.convertPid2OrgIdPath(agencyInfoCache.getId(),agencyInfoCache.getPids())); + } update(guideDTO); //保存办事指南内容模块 if (CollectionUtils.isNotEmpty(formDTO.getModuleList())) { From f8b5bad49cad389e8e2699238d48a56d8cd188e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 25 Apr 2023 17:58:25 +0800 Subject: [PATCH 045/177] =?UTF-8?q?=E5=8A=9E=E4=BA=8B=E6=8C=87=E5=8D=97?= =?UTF-8?q?=E5=8F=91=E5=B8=83=EF=BC=8Cpids=E5=80=BC=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/GuideServiceImpl.java | 3 --- 1 file changed, 3 deletions(-) diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java index 661dd1a6c7..b02baa9609 100644 --- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java +++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/GuideServiceImpl.java @@ -43,7 +43,6 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.GuideDetailResultDTO; import com.epmet.dto.result.GuideListResultDTO; import com.epmet.entity.*; -import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.*; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -68,8 +67,6 @@ import java.util.stream.Collectors; @Service public class GuideServiceImpl extends BaseServiceImpl implements GuideService { - @Resource - private GovOrgOpenFeignClient govOrgOpenFeignClient; @Resource private GuideModuleService guideModuleService; @Resource From dc8d20f7de9c003d24bc4a2cf71fbfaee3da9515 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Apr 2023 11:32:33 +0800 Subject: [PATCH 046/177] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=BF=94=E5=9B=9E=E4=B8=8E=E6=88=B7=E4=B8=BB?= =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/CollectHouseInfoResultDTO.java | 3 +- .../dto/result/CollectListResultDTO.java | 20 +++++++++-- .../impl/IcResiCollectServiceImpl.java | 34 +++++++++++++------ .../service/impl/IcResiUserServiceImpl.java | 18 ++++++---- .../resources/mapper/IcResiCollectDao.xml | 2 ++ 5 files changed, 57 insertions(+), 20 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectHouseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectHouseInfoResultDTO.java index 6e9fa340ee..8677b71c5a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectHouseInfoResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectHouseInfoResultDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.result; import lombok.Data; import java.io.Serializable; -import java.util.List; /** * @Author wgf @@ -54,4 +53,6 @@ public class CollectHouseInfoResultDTO implements Serializable { * 房主姓名 */ private String ownerName; + + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java index 9851be6340..44edef865e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectListResultDTO.java @@ -1,6 +1,5 @@ package com.epmet.dto.result; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -26,7 +25,8 @@ public class CollectListResultDTO implements Serializable { // 组织Id private String agencyId; - + private String gridId; + private String gridName; /** * 居住地址 */ @@ -113,7 +113,21 @@ public class CollectListResultDTO implements Serializable { * 与户主关系 */ private String relationship; - + /** + * 来源于字典表 + * 暂不清楚：0 + * 本人：1 + * 配偶：2 + * 子女：3 + * 父母：4 + * 岳父母或公婆：5 + * 祖父母：6 + * 媳婿：7 + * 孙子女：8 + * 兄弟姐妹：9 + * 其他：10 + */ + private String relationShipName; /** * 人脸照片 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java index ee5d24e8a1..47971cdf45 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java @@ -5,6 +5,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.enums.RelationshipEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -29,7 +30,7 @@ import com.epmet.entity.IcResiCollectEntity; import com.epmet.entity.IcResiMemberEntity; import com.epmet.entity.IcResiUserEntity; import com.epmet.entity.IcUserChangeRecordEntity; -import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.GovOrgFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.IcResiCollectService; @@ -65,19 +66,15 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl collectList = baseDao.getCollectList(formDTO); result.setList(collectList); } + result.getList().forEach(collectDTO->{ + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(collectDTO.getGridId()); + if(null!=gridInfoCache){ + collectDTO.setGridName(gridInfoCache.getGridNamePath()); + } + }); return result; } @@ -152,7 +155,18 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl list = baseDao.getCollectList(formDTO); if (CollectionUtils.isNotEmpty(list)) { - return list.get(NumConstant.ZERO); + CollectListResultDTO resultDTO=list.get(NumConstant.ZERO); + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(resultDTO.getGridId()); + if(null!=gridInfoCache){ + resultDTO.setGridName(gridInfoCache.getGridNamePath()); + } + Result> relationShipRes=adminOpenFeignClient.dictMap(DictTypeEnum.RELATIONSHIP.getCode()); + for(CollectListResultDTO.CollectListMemberResultDTO member:resultDTO.getList()){ + if(StringUtils.isNotBlank(member.getRelationship())&&relationShipRes.success()&&relationShipRes.getData().containsKey(member.getRelationship())){ + member.setRelationShipName(relationShipRes.getData().get(member.getRelationship())); + } + } + return resultDTO; } return null; } @@ -518,13 +532,13 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, map.get("HOME_ID")); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); List entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { String errorMsg = "房屋下已存在户主"; @@ -597,7 +598,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, entity.getHomeId()); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); List entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { String errorMsg = "房屋下已存在户主"; @@ -2770,7 +2772,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, dto.getHomeId()); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); List entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { String errorMsg = "房屋下已存在户主"; @@ -2792,7 +2795,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, dto.getHomeId()); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); List entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { String errorMsg = "房屋下已存在户主"; @@ -2842,7 +2846,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); List entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { String errorMsg = "房屋下已存在户主"; @@ -2874,7 +2879,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcResiUserEntity::getHomeId, houseInfo.getHouseId()); - wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()); + wrapper.eq(IcResiUserEntity::getYhzgx, RelationshipEnum.SELF.getCode()) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); List entityList = baseDao.selectList(wrapper); if (CollectionUtils.isNotEmpty(entityList)) { String errorMsg = "房屋下已存在户主"; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 35090d4a12..5a1d341845 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -19,6 +19,7 @@ + @@ -32,6 +33,7 @@ c.HOME_ID as homeId, c.CHECK_STATE as checkState, c.AGENCY_ID as agencyId, + c.GRID_ID as gridId, #{domicilePlace} as domicile_place FROM ic_resi_collect c left join ic_resi_member m on(c.id=m.IC_RESI_COLLECT_ID and m.del_flag='0') From 4dadc8c3346a2c0e1588d85a6dbb845cafc82d47 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 26 Apr 2023 11:59:25 +0800 Subject: [PATCH 047/177] =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=87=87=E9=9B=86?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=88=97=E8=A1=A8=E6=A0=B9=E6=8D=AE=E6=88=B7?= =?UTF-8?q?=E4=B8=BB=E3=80=81=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/CollectListFormDTO.java | 9 +++++++++ .../src/main/resources/mapper/IcResiCollectDao.xml | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java index 99957503cf..8e0a581428 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectListFormDTO.java @@ -29,6 +29,15 @@ public class CollectListFormDTO extends PageFormDTO { */ private String domicilePlace; + /** + * 审核状态：0待审核 1审核不通过 2审核通过 + */ + private String checkState; + /** + * 户主姓名 + */ + private String houseHolderName; + private String userId; private String customerId; diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml index 5a1d341845..ea43232174 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml @@ -56,6 +56,12 @@ AND m.DOMICILE_PLACE LIKE CONCAT('%',#{domicilePlace},'%') + + AND c.CHECK_STATE = #{checkState} + + + AND c.HOUSE_HOLDER_NAME like concat('%', #{houseHolderName},'%') + ORDER BY c.CREATED_TIME DESC + select r.* from ic_resi_user r where r.id = #{icResiUserId} + From 2e1dfe9277598dd0fd9f4c7d34160c71653935d6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 28 Apr 2023 16:18:44 +0800 Subject: [PATCH 056/177] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=92=E5=BA=8F=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcResiUserDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 950f135680..b2b6b36861 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 @@ -255,7 +255,7 @@ ORDER BY - IC_RESI_USER.GRID_ID desc, + IC_RESI_USER.GRID_ID asc, IC_RESI_USER.VILLAGE_ID ASC, IC_RESI_USER.BUILD_ID ASC, IC_RESI_USER.UNIT_ID ASC, From a6db5f9810a28b79c14b54b8b233c6865eb70633 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 28 Apr 2023 17:39:01 +0800 Subject: [PATCH 057/177] =?UTF-8?q?=E3=80=90=E5=B0=8F=E7=BB=84=E3=80=91?= =?UTF-8?q?=E5=88=9B=E5=BB=BA=E5=B0=8F=E7=BB=84-=E5=A2=9E=E5=8A=A0orgIdpat?= =?UTF-8?q?h,agencyId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/group/entity/ResiGroupEntity.java | 3 +++ .../group/service/impl/ResiGroupServiceImpl.java | 11 +++++++---- .../V0.0.28__group_add_orgidpath_agencyid.sql | 2 ++ 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__group_add_orgidpath_agencyid.sql diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java index cc35c91b5b..23279882cb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/entity/ResiGroupEntity.java @@ -98,4 +98,7 @@ Ps: 如果一个小组被拒绝，当前小组的状态将永久停留在“审 * 小组等级 */ private Integer level; + private String agencyId; + + private String orgIdPath; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java index 8c2d43f75f..63065ee322 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java @@ -30,6 +30,8 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.scan.param.ImgScanParamDTO; import com.epmet.commons.tools.scan.param.ImgTaskDTO; import com.epmet.commons.tools.scan.param.TextScanParamDTO; @@ -37,10 +39,7 @@ import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.utils.ScanContentUtils; +import com.epmet.commons.tools.utils.*; import com.epmet.constant.ReadFlagConstant; import com.epmet.constant.UserMessageTypeConstant; import com.epmet.dto.form.*; @@ -609,6 +608,10 @@ public class ResiGroupServiceImpl extends BaseServiceImpl Date: Thu, 4 May 2023 13:43:57 +0800 Subject: [PATCH 058/177] =?UTF-8?q?/resi/partymember/icPartyOrg/editPrinci?= =?UTF-8?q?pal=E6=8E=A5=E5=8F=A3principalStaffId=E4=B8=8D=E5=BF=85?= =?UTF-8?q?=E5=A1=AB=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/dto/partyOrg/form/EditPrincipalFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java index c518b0ef7e..403c68016e 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/form/EditPrincipalFormDTO.java @@ -31,6 +31,6 @@ public class EditPrincipalFormDTO implements Serializable { @NotBlank(message = "principalMobile不能为空",groups = AddGroup.class) private String principalMobile; - @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class) + // @NotBlank(message = "principalStaffId不能为空",groups = AddGroup.class) private String principalStaffId; } From 1b7c69afc22e9fdc6387afe8423522e3ed2b893d Mon Sep 17 00:00:00 2001 From: wxz Date: Thu, 4 May 2023 15:08:25 +0800 Subject: [PATCH 059/177] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81=E6=AD=A3=E5=88=99=E8=A7=A3=E6=9E=90=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E5=A2=9E=E5=8A=A0=E5=87=BA=E7=94=9F=E6=97=A5?= =?UTF-8?q?=E6=9C=9F[LocalDate=E7=B1=BB=E5=9E=8B]=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/utils/DateUtils.java | 37 +++++++++++++++++++ .../commons/tools/utils/IdCardRegexUtils.java | 7 +++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java index 8ddbea5066..f13ecd1297 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/DateUtils.java @@ -22,6 +22,8 @@ import org.joda.time.format.DateTimeFormatter; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.LocalDateTime; import java.time.ZoneId; import java.util.*; @@ -1112,4 +1114,39 @@ public class DateUtils { cal.setTime(date); return str.contains(String.valueOf(cal.get(Calendar.DAY_OF_WEEK))); } + + /** + * @description: java.time.LocalDate转Date + * @param localDate: + * @return + * @author: WangXianZhang + * @date: 2023/5/4 3:00 PM + */ + public static Date localDate2Date(java.time.LocalDate localDate) { + Instant instant = localDate.atStartOfDay().atZone(ZoneId.systemDefault()).toInstant(); + return Date.from(instant); + } + + /** + * @description: java.time.LocalDateTime转Date + * @param localDate: + * @return + * @author: WangXianZhang + * @date: 2023/5/4 3:00 PM + */ + public static Date localDateTime2Date(java.time.LocalDateTime localDate) { + Instant instant = localDate.atZone(ZoneId.systemDefault()).toInstant(); + return Date.from(instant); + } + + /** + * @description: date转化为DateTime + * @param date: + * @return + * @author: WangXianZhang + * @date: 2023/5/4 3:04 PM + */ + public static java.time.LocalDateTime date2LocalDateTime(Date date) { + return LocalDateTime.ofInstant(date.toInstant(), ZoneId.systemDefault()); + } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java index ff1f0b0549..78c061b395 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/IdCardRegexUtils.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import java.time.DateTimeException; import java.time.LocalDate; import java.time.Period; +import java.util.Date; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -56,6 +57,7 @@ public class IdCardRegexUtils { private String birthdayDay; private String sex; private Integer age; + private LocalDate birthday; } /** @@ -122,17 +124,18 @@ public class IdCardRegexUtils { String month = matcher.group("month"); String day = matcher.group("day"); String sex = matcher.group("sex"); + LocalDate birthday; // ------- 年龄Start---------- Integer age; try { - LocalDate birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + birthday = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); age = Period.between(birthday, LocalDate.now()).getYears(); } catch (DateTimeException e) { throw new EpmetException("身份证号解析年龄失败:" + ExceptionUtils.getErrorStackTrace(e)); } // ------- 年龄End---------- - return new ParsedContent(year, month, day, sex, age); + return new ParsedContent(year, month, day, sex, age, birthday); } // 其他类型暂时不可解析 From 0b71ba8f79ca8ce7f0419b7a8351b48cc2b989fb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 4 May 2023 16:32:17 +0800 Subject: [PATCH 060/177] =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=9C=AA=E5=AE=8C=E5=BE=85=E7=BB=AD.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/OrganizationMessageDTO.java | 100 ++++++++++++++++++ .../OrganizationMessagePublishRangeDTO.java | 89 ++++++++++++++++ .../form/OrganizationMessagePageFormDTO.java | 30 ++++++ .../result/OrganizationMessageResultDTO.java | 65 ++++++++++++ .../OrganizationMessageController.java | 49 +++++++++ .../com/epmet/dao/OrganizationMessageDao.java | 16 +++ .../OrganizationMessagePublishRangeDao.java | 16 +++ .../entity/OrganizationMessageEntity.java | 69 ++++++++++++ ...OrganizationMessagePublishRangeEntity.java | 56 ++++++++++ .../service/OrganizationMessageService.java | 27 +++++ .../impl/OrganizationMessageServiceImpl.java | 42 ++++++++ .../mapper/OrganizationMessageDao.xml | 26 +++++ .../OrganizationMessagePublishRangeDao.xml | 24 +++++ 13 files changed, 609 insertions(+) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml create mode 100644 epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java new file mode 100644 index 0000000000..547bcb6f8b --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java @@ -0,0 +1,100 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +public class OrganizationMessageDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + private String content; + + /** + * 发布人staffId + */ + private String publishStaffId; + + /** + * 发布人姓名 + */ + private String publishStaffName; + + /** + * 发布人所属组织id + */ + private String publishOrgId; + + /** + * org_id_path + */ + private String publishOrgIdPath; + + /** + * 发布人所属组织名称 + */ + private String publishOrgName; + + /** + * 发布时间 + */ + private Date publishTime; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer 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-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java new file mode 100644 index 0000000000..4350a479c9 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java @@ -0,0 +1,89 @@ +package com.epmet.dto; + +import java.io.Serializable; +import java.util.Date; +import lombok.Data; + + +/** + * 消息发布范围（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +public class OrganizationMessagePublishRangeDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private String id; + + /** + * 客户Id + */ + private String customerId; + + /** + * 消息id:organization_message.id + */ + private String messageId; + + /** + * 组织或者网格id + */ + private String orgId; + + /** + * 组织：agency；网格：grid + */ + private String orgType; + + /** + * org_id的父级 + */ + private String pid; + + /** + * org_id的全路径，包含org_id + */ + private String orgIdPath; + + /** + * 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格 + */ + private String orgName; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer 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-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java new file mode 100644 index 0000000000..1e5b23d884 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/OrganizationMessagePageFormDTO.java @@ -0,0 +1,30 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description 烟台消息管理，列表查询入参 + * @Author yzm + * @Date 2023/5/4 16:05 + */ +@Data +public class OrganizationMessagePageFormDTO extends PageFormDTO { + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + /** + * 发布范围，组织id或者网格id + */ + private String orgId; + /** + * yyyy-MM-dd + */ + private String startDate; + /** + * yyyy-MM-dd + */ + private String endDate; +} + diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java new file mode 100644 index 0000000000..0d68bafe6d --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -0,0 +1,65 @@ +package com.epmet.dto.result; + +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.util.Date; + +/** + * @Description 烟台消息管理，列表查询 + * @Author yzm + * @Date 2023/5/4 16:06 + */ +@Data +public class OrganizationMessageResultDTO { + /** + * 消息id + */ + private String messageId; + + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + private String content; + /** + * 发布范围 + */ + private String publishRangeName; + + /** + * 发布时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date publishTime; + + /** + * 发布人staffId + */ + private String publishStaffId; + + /** + * 发布人姓名 + */ + private String publishStaffName; + + /** + * 发布人所属组织id + */ + private String publishOrgId; + + /** + * org_id_path + */ + private String publishOrgIdPath; + + /** + * 发布人所属组织名称 + */ + private String publishOrgName; +} + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java new file mode 100644 index 0000000000..d36e1c74af --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java @@ -0,0 +1,49 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.OrganizationMessagePageFormDTO; +import com.epmet.dto.result.OrganizationMessageResultDTO; +import com.epmet.service.OrganizationMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@RestController +@RequestMapping("organization/message") +public class OrganizationMessageController { + + @Autowired + private OrganizationMessageService organizationMessageService; + + /** + * 列表查询 + * + * @param formDTO + * @return + */ + @PostMapping("list") + public Result> pageList(@RequestBody OrganizationMessagePageFormDTO formDTO) { + return new Result>().ok(organizationMessageService.pageList(formDTO.getPageNo(), formDTO.getPageSize(), + formDTO.getPublishDitch(), + formDTO.getOrgId(), + formDTO.getStartDate(), + formDTO.getEndDate())); + } + + + + + + + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java new file mode 100644 index 0000000000..3cec0ac2fc --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.OrganizationMessageEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Mapper +public interface OrganizationMessageDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java new file mode 100644 index 0000000000..94a9a65100 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessagePublishRangeDao.java @@ -0,0 +1,16 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.entity.OrganizationMessagePublishRangeEntity; +import org.apache.ibatis.annotations.Mapper; + +/** + * 消息发布范围（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Mapper +public interface OrganizationMessagePublishRangeDao extends BaseDao { + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java new file mode 100644 index 0000000000..383720be2a --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java @@ -0,0 +1,69 @@ +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; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("organization_message") +public class OrganizationMessageEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 发布渠道：0：专属app + */ + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + private String content; + + /** + * 发布人staffId + */ + private String publishStaffId; + + /** + * 发布人姓名 + */ + private String publishStaffName; + + /** + * 发布人所属组织id + */ + private String publishOrgId; + + /** + * org_id_path + */ + private String publishOrgIdPath; + + /** + * 发布人所属组织名称 + */ + private String publishOrgName; + + /** + * 发布时间 + */ + private Date publishTime; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java new file mode 100644 index 0000000000..5080cfe16f --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessagePublishRangeEntity.java @@ -0,0 +1,56 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 消息发布范围（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("organization_message_publish_range") +public class OrganizationMessagePublishRangeEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id + */ + private String customerId; + + /** + * 消息id:organization_message.id + */ + private String messageId; + + /** + * 组织或者网格id + */ + private String orgId; + + /** + * 组织：agency；网格：grid + */ + private String orgType; + + /** + * org_id的父级 + */ + private String pid; + + /** + * org_id的全路径，包含org_id + */ + private String orgIdPath; + + /** + * 组织名称或者网格名称；如果是网格名称，存储的是XXX社区-XX网格 + */ + private String orgName; + +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java new file mode 100644 index 0000000000..794f2725b9 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java @@ -0,0 +1,27 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.result.OrganizationMessageResultDTO; +import com.epmet.entity.OrganizationMessageEntity; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +public interface OrganizationMessageService extends BaseService { + + /** + * 分页列表 + * @param pageNo + * @param pageSize + * @param publishDitch 发布渠道；0：专属app + * @param orgId 发布范围，组织id或者网格id + * @param startDate yyyy-MM-dd + * @param endDate yyyy-MM-dd + * @return + */ + PageData pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate); +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java new file mode 100644 index 0000000000..0ddb025c07 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -0,0 +1,42 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dao.OrganizationMessageDao; +import com.epmet.dto.result.OrganizationMessageResultDTO; +import com.epmet.entity.OrganizationMessageEntity; +import com.epmet.service.OrganizationMessageService; +import com.github.pagehelper.PageHelper; +import org.springframework.stereotype.Service; + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Service +public class OrganizationMessageServiceImpl extends BaseServiceImpl implements OrganizationMessageService { + /** + * 分页列表 + * + * @param pageNo + * @param pageSize + * @param publishDitch 发布渠道；0：专属app + * @param orgId 发布范围，组织id或者网格id + * @param startDate yyyy-MM-dd + * @param endDate yyyy-MM-dd + * @return + */ + @Override + public PageData pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) { + CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + PageHelper.startPage(pageNo,pageSize); + //todo + // List list=baseDao.pageList(staffOrgIdPath,publishDitch,orgId,startDate,endDate); + return null; + } +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml new file mode 100644 index 0000000000..49ee7aa52e --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml new file mode 100644 index 0000000000..18e02ac73f --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessagePublishRangeDao.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 208d516403f04203e452061e1731754fc501bd5b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 4 May 2023 16:49:25 +0800 Subject: [PATCH 061/177] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0pid,orgIdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/dto/result/CustomerStaffInfoCacheResult.java | 9 +++++++++ .../tools/redis/common/bean/CustomerStaffInfoCache.java | 9 ++++++++- .../dto/epmetuser/result/CustomerStaffResultDTO.java | 9 ++++++++- .../epmet/dataaggre/controller/EpmetUserController.java | 2 +- .../service/epmetuser/impl/EpmetUserServiceImpl.java | 8 ++++---- 5 files changed, 30 insertions(+), 7 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java index 81c74a4c38..6e9944c316 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/CustomerStaffInfoCacheResult.java @@ -22,6 +22,15 @@ public class CustomerStaffInfoCacheResult implements Serializable { */ private String agencyId; + /** + * agencyId的上级 + */ + private String pid; + /** + * 工作人员所属组织的org_id_path + */ + private String orgIdPath; + /** * 工作人员所属组织ID的pids */ diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java index 87e53edcb0..012d38321a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/common/bean/CustomerStaffInfoCache.java @@ -21,7 +21,14 @@ public class CustomerStaffInfoCache implements Serializable { * 工作人员所属组织ID */ private String agencyId; - + /** + * agencyId的上级 + */ + private String pid; + /** + * 工作人员所属组织的org_id_path + */ + private String orgIdPath; /** * 工作人员所属组织ID的pids */ diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java index 3269ebcb26..0bc9203d45 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/CustomerStaffResultDTO.java @@ -20,7 +20,14 @@ public class CustomerStaffResultDTO implements Serializable { * 工作人员所属组织ID */ private String agencyId; - + /** + * agencyId的上级 + */ + private String pid; + /** + * 工作人员所属组织的org_id_path + */ + private String orgIdPath; /** * 工作人员所属组织ID的pids */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java index 24d9c5a738..2498606f80 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetUserController.java @@ -268,7 +268,7 @@ public class EpmetUserController { * remark: */ @PostMapping("getStaffInfo/{staffId}") - public Result getStaffInfo(@PathVariable(name = "staffId") String staffId){ + public Result getStaffInfo(@PathVariable(name = "staffId") String staffId){ return new Result().ok(epmetUserService.getStaffInfo(staffId)); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index 75f863dd58..ea9980e7af 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -18,10 +18,7 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; import com.epmet.commons.tools.redis.common.bean.IcResiUserInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.IpUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.constant.BadgeConstant; import com.epmet.constant.NeighborhoodConstant; import com.epmet.constant.OrgInfoConstant; @@ -650,6 +647,9 @@ public class EpmetUserServiceImpl implements EpmetUserService { } result.setStaffId(staffEntity.getUserId()); result.setAgencyId(agencyDTO.getId()); + //新增pid,orgIdPath + result.setPid(agencyDTO.getPid()); + result.setOrgIdPath(PidUtils.convertPid2OrgIdPath(agencyDTO.getId(),agencyDTO.getPids())); result.setAgencyName(agencyDTO.getOrganizationName()); result.setAgencyPIds(agencyDTO.getPids()); result.setLevel(agencyDTO.getLevel()); From 09fc9988fb77217ab24fb94dfec882fd19792a3d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 4 May 2023 18:32:22 +0800 Subject: [PATCH 062/177] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E4=BA=86=E5=86=85?= =?UTF-8?q?=E5=AE=B9=EF=BC=8C=E8=BF=98=E6=B2=A1=E5=8F=91=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/OrganizationMessageDTO.java | 100 ------------------ .../epmet/dto/OrganizationMessageFormDTO.java | 52 +++++++++ .../OrganizationMessagePublishRangeDTO.java | 36 +------ .../OrganizationMessageController.java | 40 +++++-- .../com/epmet/dao/OrganizationMessageDao.java | 22 +++- .../service/OrganizationMessageService.java | 15 +++ .../impl/OrganizationMessageServiceImpl.java | 88 ++++++++++++++- .../mapper/OrganizationMessageDao.xml | 37 ++++++- 8 files changed, 245 insertions(+), 145 deletions(-) delete mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java deleted file mode 100644 index 547bcb6f8b..0000000000 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageDTO.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.epmet.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.util.Date; - - -/** - * 组织发布消息（烟台） - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2023-05-04 - */ -@Data -public class OrganizationMessageDTO implements Serializable { - - private static final long serialVersionUID = 1L; - - /** - * 主键 - */ - private String id; - - /** - * 客户Id - */ - private String customerId; - - /** - * 发布渠道：0：专属app - */ - private String publishDitch; - - /** - * 消息内容；最多输入500 - */ - private String content; - - /** - * 发布人staffId - */ - private String publishStaffId; - - /** - * 发布人姓名 - */ - private String publishStaffName; - - /** - * 发布人所属组织id - */ - private String publishOrgId; - - /** - * org_id_path - */ - private String publishOrgIdPath; - - /** - * 发布人所属组织名称 - */ - private String publishOrgName; - - /** - * 发布时间 - */ - private Date publishTime; - - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer 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-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java new file mode 100644 index 0000000000..cc42aa46ba --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessageFormDTO.java @@ -0,0 +1,52 @@ +package com.epmet.dto; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import java.io.Serializable; +import java.util.List; + + +/** + * 组织发布消息（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-04 + */ +@Data +public class OrganizationMessageFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + public interface AddShowGroup extends CustomerClientShowGroup { + } + /** + * 发布渠道：0：专属app + */ + @NotBlank(message = "发布渠道不能为空", groups = {AddShowGroup.class}) + private String publishDitch; + + /** + * 消息内容；最多输入500 + */ + @NotBlank(message = "内容不能为空", groups = {AddShowGroup.class}) + @Length(max = 500, message = "内容输入500字", groups = {AddShowGroup.class}) + private String content; + + @Valid + @NotEmpty(message = "发布范围不能为空", groups = {AddShowGroup.class}) + private List rangeList; + + /** + * 客户Id + */ + private String customerId; + /** + * 发布人staffId + */ + private String publishStaffId; +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java index 4350a479c9..2b51910c48 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/OrganizationMessagePublishRangeDTO.java @@ -1,9 +1,10 @@ package com.epmet.dto; -import java.io.Serializable; -import java.util.Date; import lombok.Data; +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + /** * 消息发布范围（烟台） @@ -34,11 +35,13 @@ public class OrganizationMessagePublishRangeDTO implements Serializable { /** * 组织或者网格id */ + @NotBlank(message = "orgId不能为空",groups = {OrganizationMessageFormDTO.AddShowGroup.class}) private String orgId; /** * 组织：agency；网格：grid */ + @NotBlank(message = "orgType不能为空",groups = {OrganizationMessageFormDTO.AddShowGroup.class}) private String orgType; /** @@ -56,34 +59,5 @@ public class OrganizationMessagePublishRangeDTO implements Serializable { */ private String orgName; - /** - * 删除标识：0.未删除 1.已删除 - */ - private Integer 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-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java index d36e1c74af..ea14265f47 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java @@ -1,15 +1,17 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.OrganizationMessageFormDTO; import com.epmet.dto.form.OrganizationMessagePageFormDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.service.OrganizationMessageService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; /** @@ -40,10 +42,32 @@ public class OrganizationMessageController { formDTO.getEndDate())); } + /** + * 查询消息详情 + * + * @param messageId + * @return + */ + @PostMapping("detail/{messageId}") + public Result getDetail(@PathVariable("messageId") String messageId) { + if (StringUtils.isBlank(messageId)) { + return new Result<>(); + } + return new Result().ok(organizationMessageService.getDetail(messageId)); + } - - - - + /** + * 发布消息 + * + * @param formDTO + * @return 返回消息id + */ + @PostMapping("publish") + public Result publish(@LoginUser TokenDto tokenDto, @RequestBody OrganizationMessageFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setPublishStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, OrganizationMessageFormDTO.AddShowGroup.class); + return new Result().ok(organizationMessageService.publish(formDTO)); + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java index 3cec0ac2fc..f13e230f0c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/OrganizationMessageDao.java @@ -1,8 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 组织发布消息（烟台） @@ -12,5 +16,21 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface OrganizationMessageDao extends BaseDao { - + + /** + * + * @param staffOrgIdPath 工作人员所属组织的orgIdPath + * @param publishDitch 发布渠道；0：专属app + * @param orgId 发布范围，组织id或者网格id + * @param startDate yyyy-MM-dd + * @param endDate yyyy-MM-dd + * @return + */ + List pageList(@Param("customerId")String customerId, + @Param("staffOrgIdPath") String staffOrgIdPath, + @Param("publishDitch")String publishDitch, + @Param("orgId")String orgId, + @Param("startDate")String startDate, + @Param("endDate")String endDate, + @Param("messageId")String messageId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java index 794f2725b9..18299bb1c5 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.OrganizationMessageFormDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; @@ -24,4 +25,18 @@ public interface OrganizationMessageService extends BaseService pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate); + + /** + * 查询详情 + * @param messageId + * @return + */ + OrganizationMessageResultDTO getDetail(String messageId); + + /** + * 发布消息 + * @param formDTO + * @return 返回消息id + */ + String publish(OrganizationMessageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 0ddb025c07..cfc8daef6a 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -1,16 +1,34 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.PidUtils; import com.epmet.dao.OrganizationMessageDao; +import com.epmet.dao.OrganizationMessagePublishRangeDao; +import com.epmet.dto.OrganizationMessageFormDTO; +import com.epmet.dto.OrganizationMessagePublishRangeDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; +import com.epmet.entity.OrganizationMessagePublishRangeEntity; import com.epmet.service.OrganizationMessageService; import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Date; +import java.util.List; /** * 组织发布消息（烟台） @@ -20,6 +38,9 @@ import org.springframework.stereotype.Service; */ @Service public class OrganizationMessageServiceImpl extends BaseServiceImpl implements OrganizationMessageService { + @Autowired + private OrganizationMessagePublishRangeDao organizationMessagePublishRangeDao; + /** * 分页列表 * @@ -33,10 +54,69 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) { - CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); - PageHelper.startPage(pageNo,pageSize); - //todo - // List list=baseDao.pageList(staffOrgIdPath,publishDitch,orgId,startDate,endDate); + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + String staffOrgIdPath = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()); + PageHelper.startPage(pageNo, pageSize); + List list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } + + /** + * 查询详情 + * + * @param messageId + * @return + */ + @Override + public OrganizationMessageResultDTO getDetail(String messageId) { + List list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),null, null, null, null, null,messageId); + if(CollectionUtils.isNotEmpty(list)){ + return list.get(NumConstant.ZERO); + } return null; } + + /** + * 发布消息 + * + * @param formDTO + * @return 返回消息id + */ + @Transactional(rollbackFor = Exception.class) + @Override + public String publish(OrganizationMessageFormDTO formDTO) { + OrganizationMessageEntity messageEntity = ConvertUtils.sourceToTarget(formDTO, OrganizationMessageEntity.class); + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getPublishStaffId()); + messageEntity.setPublishStaffName(staffInfoCacheResult.getRealName()); + messageEntity.setPublishOrgId(staffInfoCacheResult.getAgencyId()); + messageEntity.setPublishOrgIdPath(PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds())); + messageEntity.setPublishOrgName(staffInfoCacheResult.getAgencyName()); + messageEntity.setPublishTime(new Date()); + baseDao.insert(messageEntity); + for (OrganizationMessagePublishRangeDTO dto : formDTO.getRangeList()) { + OrganizationMessagePublishRangeEntity rangeEntity = new OrganizationMessagePublishRangeEntity(); + rangeEntity.setCustomerId(messageEntity.getCustomerId()); + rangeEntity.setMessageId(messageEntity.getId()); + rangeEntity.setOrgId(dto.getOrgId()); + rangeEntity.setOrgType(dto.getOrgType()); + if (OrgTypeEnum.GRID.getCode().equals(dto.getOrgType())) { + GridInfoCache gridInfoCache = CustomerOrgRedis.getGridInfo(dto.getOrgId()); + rangeEntity.setPid(gridInfoCache.getPid()); + rangeEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(dto.getOrgId(), gridInfoCache.getPids())); + rangeEntity.setOrgName(gridInfoCache.getGridNamePath()); + } else if (OrgTypeEnum.AGENCY.getCode().equals(dto.getOrgType())) { + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(dto.getOrgId()); + rangeEntity.setPid(agencyInfoCache.getPid()); + rangeEntity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(dto.getOrgId(), agencyInfoCache.getPids())); + rangeEntity.setOrgName(agencyInfoCache.getOrganizationName()); + } + organizationMessagePublishRangeDao.insert(rangeEntity); + } + String messageId = messageEntity.getId(); + // todo 发送消息 发布范围下有哪些网格，网格下所有的注册居民，每人发送一条消息 + return messageId; + } + + } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml index 49ee7aa52e..742421c739 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -22,5 +22,40 @@ - + \ No newline at end of file From f8c5ae7324170d45e0946e49642206c2c322d1a0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 10:48:17 +0800 Subject: [PATCH 063/177] =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/OrganizationMessageResultDTO.java | 9 ++ .../epmet-message-server/pom.xml | 5 - .../entity/OrganizationMessageEntity.java | 10 +- .../impl/OrganizationMessageServiceImpl.java | 93 ++++++++++++++++++- .../mapper/OrganizationMessageDao.xml | 2 + .../dto/form/RegisterRelationPageFormDTO.java | 33 +++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 8 ++ .../EpmetUserOpenFeignClientFallback.java | 11 +++ .../RegisterRelationController.java | 18 ++++ .../com/epmet/dao/RegisterRelationDao.java | 5 + .../service/RegisterRelationService.java | 12 +++ .../impl/RegisterRelationServiceImpl.java | 20 ++++ .../resources/mapper/RegisterRelationDao.xml | 17 +++- 13 files changed, 234 insertions(+), 9 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java index 0d68bafe6d..08b6d88924 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -61,5 +61,14 @@ public class OrganizationMessageResultDTO { * 发布人所属组织名称 */ private String publishOrgName; + + /** + * 发送结果 + */ + private String sendMsgRes; + /** + * 共发送出多少条消息 + */ + private Integer totalReceiver; } diff --git a/epmet-module/epmet-message/epmet-message-server/pom.xml b/epmet-module/epmet-message/epmet-message-server/pom.xml index fef8b6bded..daa811ed8e 100644 --- a/epmet-module/epmet-message/epmet-message-server/pom.xml +++ b/epmet-module/epmet-message/epmet-message-server/pom.xml @@ -101,11 +101,6 @@ flyway-core - - com.epmet - epmet-user-client - 2.0.0 - com.epmet epmet-third-client diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java index 383720be2a..416f66793b 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java @@ -65,5 +65,13 @@ public class OrganizationMessageEntity extends BaseEpmetEntity { * 发布时间 */ private Date publishTime; - + /** + * 发送结果 + * sending发送中；failed失败；success成功 + */ + private String sendMsgRes; + /** + * 共发送出多少条消息 + */ + private Integer totalReceiver; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index cfc8daef6a..616228fc59 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -1,9 +1,15 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; @@ -12,18 +18,26 @@ import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.PidUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.OrganizationMessageDao; import com.epmet.dao.OrganizationMessagePublishRangeDao; +import com.epmet.dao.UserMessageDao; import com.epmet.dto.OrganizationMessageFormDTO; import com.epmet.dto.OrganizationMessagePublishRangeDTO; +import com.epmet.dto.RegisterRelationDTO; +import com.epmet.dto.form.RegisterRelationPageFormDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; import com.epmet.entity.OrganizationMessagePublishRangeEntity; +import com.epmet.entity.UserMessageEntity; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.OrganizationMessageService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -36,10 +50,16 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2023-05-04 */ +@Slf4j @Service public class OrganizationMessageServiceImpl extends BaseServiceImpl implements OrganizationMessageService { @Autowired private OrganizationMessagePublishRangeDao organizationMessagePublishRangeDao; + @Autowired + private UserMessageDao userMessageDao; + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + /** * 分页列表 @@ -93,6 +113,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl rangeList, String customerId) { + String result = "success"; + int totalMsg = NumConstant.ZERO; + try { + for (OrganizationMessagePublishRangeDTO rangeDto : rangeList) { + RegisterRelationPageFormDTO pageFormDTO=new RegisterRelationPageFormDTO(); + pageFormDTO.setCustomerId(customerId); + pageFormDTO.setFirstRegister(NumConstant.ONE_STR); + pageFormDTO.setPageNo(NumConstant.ONE); + pageFormDTO.setPageSize(NumConstant.TWO); + // pageFormDTO.setPageSize(NumConstant.ONE_THOUSAND); + if (OrgTypeEnum.GRID.getCode().equals(rangeDto.getOrgType())) { + // 查询该网格下的注册居民 + pageFormDTO.setGridId(rangeDto.getOrgId()); + } else { + // 查询该组织下的注册居民 + pageFormDTO.setAgencyIdPath(rangeDto.getOrgIdPath()); + } + List list=null; + do { + Result> regRes = epmetUserOpenFeignClient.pageQueryRegisterUser(pageFormDTO); + list = regRes.getData().getList(); + for (RegisterRelationDTO regUser : list) { + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper(); + queryWrapper.eq(UserMessageEntity::getCustomerId,customerId) + .eq(UserMessageEntity::getTargetId,messageId) + .eq(UserMessageEntity::getUserId,regUser.getUserId()); + UserMessageEntity origin=userMessageDao.selectOne(queryWrapper); + if(null==origin){ + UserMessageEntity userMessageEntity = new UserMessageEntity(); + userMessageEntity.setCustomerId(customerId); + userMessageEntity.setGridId(regUser.getGridId()); + userMessageEntity.setUserId(regUser.getUserId()); + userMessageEntity.setApp(AppClientConstant.APP_RESI); + userMessageEntity.setTitle("您有一条社区消息！"); + userMessageEntity.setMessageContent(content); + userMessageEntity.setReadFlag(Constant.UNREAD); + userMessageEntity.setReferer(StrConstant.EPMETY_STR); + userMessageEntity.setMessageType("organization_message"); + userMessageEntity.setTargetId(messageId); + userMessageEntity.setCreatedBy(publishStaffId); + userMessageEntity.setUpdatedBy(publishStaffId); + userMessageDao.insert(userMessageEntity); + totalMsg += 1; + } + } + pageFormDTO.setPageNo(pageFormDTO.getPageNo() + NumConstant.ONE); + } while (CollectionUtils.isNotEmpty(list) && list.size() == pageFormDTO.getPageSize()); + } + } catch (Exception e) { + log.error(String.format("messageId:%s,发送消息异常:%s", messageId, ExceptionUtils.getErrorStackTrace(e))); + result = "failed"; + } finally { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(OrganizationMessageEntity::getId, messageId) + .set(OrganizationMessageEntity::getSendMsgRes, result) + .set(OrganizationMessageEntity::getTotalReceiver, totalMsg) + .set(OrganizationMessageEntity::getUpdatedTime,new Date()); + baseDao.update(null, updateWrapper); + } + } + + } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml index 742421c739..8e8bd51ad6 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -32,6 +32,8 @@ om.PUBLISH_ORG_ID as publishStaffName, om.PUBLISH_ORG_ID_PATH as publishOrgIdPath, OM.PUBLISH_ORG_NAME as publishOrgName, + om.SEND_MSG_RES as sendMsgRes, + om.TOTAL_RECEIVER as totalReceiver, GROUP_CONCAT(r.ORG_NAME) as publishRangeName from organization_message om left join organization_message_publish_range r diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java new file mode 100644 index 0000000000..bd1e28d424 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RegisterRelationPageFormDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/5 9:47 + */ +@Data +public class RegisterRelationPageFormDTO extends PageFormDTO { + /** + * 客户Id (customer.id) + */ + private String customerId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + + /** + * 网格Id (customer_grid.id) + */ + private String gridId; + + /** + * 首次注册用户 0表示不参与计数 1表示参与计数 + */ + private String firstRegister; +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java index c80eab326e..ddc7a635e7 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java @@ -1033,4 +1033,12 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/icNat/clearNatRecords") Result clearNatRecords(@RequestBody Map map); + + /** + * 分页查询注册居民 + * @param pageFormDTO + * @return + */ + @PostMapping("/epmetuser/registerrelation/pageQueryRegisterUser") + Result> pageQueryRegisterUser(@RequestBody RegisterRelationPageFormDTO pageFormDTO); } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java index 4d3d56b76c..3bba7ced02 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java @@ -756,4 +756,15 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien public Result clearNatRecords(Map map) { return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "clearNatRecords", map); } + + /** + * 分页查询注册居民 + * + * @param pageFormDTO + * @return + */ + @Override + public Result> pageQueryRegisterUser(RegisterRelationPageFormDTO pageFormDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "pageQueryRegisterUser", pageFormDTO); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java index d801a5e6e9..77dd78bf9d 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/RegisterRelationController.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.RegisterRelationDTO; import com.epmet.dto.form.AllResiByGridFormDTO; import com.epmet.dto.form.EnterGridFormDTO; +import com.epmet.dto.form.RegisterRelationPageFormDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.excel.RegisterRelationExcel; import com.epmet.service.RegisterRelationService; @@ -120,4 +121,21 @@ public class RegisterRelationController { ValidatorUtils.validateEntity(formDTO, AllResiByGridFormDTO.AllResiByGridForm.class); return new Result().ok(registerRelationService.getAllResiByGrid(formDTO)); } + + /** + * 分页查询注册居民信息 + * @param pageFormDTO + * @return + */ + @PostMapping("pageQueryRegisterUser") + public Result> pageQueryRegisterUser(@RequestBody RegisterRelationPageFormDTO pageFormDTO){ + return new Result>().ok(registerRelationService.pageQueryRegisterUser(pageFormDTO.getPageNo(), + pageFormDTO.getPageSize(), + pageFormDTO.getCustomerId(), + pageFormDTO.getGridId(), + pageFormDTO.getAgencyIdPath(), + pageFormDTO.getFirstRegister())); + } + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java index f5f4cdfd35..83ac08f940 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java @@ -71,4 +71,9 @@ public interface RegisterRelationDao extends BaseDao { * @date 2022/10/8 10:48 */ Integer getAllResiByGrid(@Param("gridId")String gridId); + + List pageQueryRegisterUser(@Param("customerId") String customerId, + @Param("gridId") String gridId, + @Param("agencyIdPath") String agencyIdPath, + @Param("firstRegister") String firstRegister); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java index 7179b78530..ed39bd6441 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java @@ -123,4 +123,16 @@ public interface RegisterRelationService extends BaseService pageQueryRegisterUser(Integer pageNo, Integer pageSize, String customerId, String gridId, String agencyIdPath, String firstRegister); } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java index 11cca8346e..6091ab7cdb 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java @@ -48,6 +48,8 @@ import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.service.GridVisitedService; import com.epmet.service.RegisterRelationService; import com.epmet.util.ModuleConstant; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -389,4 +391,22 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl pageQueryRegisterUser(Integer pageNo, Integer pageSize, String customerId, String gridId, String agencyIdPath, String firstRegister) { + PageHelper.startPage(pageNo,pageSize); + List resList=baseDao.pageQueryRegisterUser(customerId,gridId,agencyIdPath,firstRegister); + PageInfo pageInfo = new PageInfo<>(resList); + return new PageData<>(resList, pageInfo.getTotal()); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml index c43cea28cc..f2e0506de3 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml @@ -97,5 +97,20 @@ AND grid_id = #{gridId} - + From 30c353f013d243b83309381bbca992294447d1da Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 12:27:15 +0800 Subject: [PATCH 064/177] bugfix --- .../result/OrganizationMessageResultDTO.java | 4 ++++ .../OrganizationMessageController.java | 5 ++++- .../service/OrganizationMessageService.java | 5 +++++ .../impl/OrganizationMessageServiceImpl.java | 18 ++++++++++-------- .../mapper/OrganizationMessageDao.xml | 2 ++ 5 files changed, 25 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java index 08b6d88924..86ec079f87 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -1,9 +1,11 @@ package com.epmet.dto.result; +import com.epmet.dto.OrganizationMessagePublishRangeDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; +import java.util.List; /** * @Description 烟台消息管理，列表查询 @@ -70,5 +72,7 @@ public class OrganizationMessageResultDTO { * 共发送出多少条消息 */ private Integer totalReceiver; + + private List rangeList; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java index ea14265f47..fac7d6d6d2 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/OrganizationMessageController.java @@ -67,7 +67,10 @@ public class OrganizationMessageController { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setPublishStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, OrganizationMessageFormDTO.AddShowGroup.class); - return new Result().ok(organizationMessageService.publish(formDTO)); + String messageId=organizationMessageService.publish(formDTO); + // 发送消息 发布范围下有哪些网格，网格下所有的注册居民，每人发送一条消息 + organizationMessageService.sendUserMsg(messageId,formDTO.getContent(),formDTO.getPublishStaffId(),formDTO.getRangeList(),formDTO.getCustomerId()); + return new Result().ok(messageId); } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java index 18299bb1c5..8932b557b4 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/OrganizationMessageService.java @@ -3,9 +3,12 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.OrganizationMessageFormDTO; +import com.epmet.dto.OrganizationMessagePublishRangeDTO; import com.epmet.dto.result.OrganizationMessageResultDTO; import com.epmet.entity.OrganizationMessageEntity; +import java.util.List; + /** * 组织发布消息（烟台） * @@ -39,4 +42,6 @@ public interface OrganizationMessageService extends BaseService rangeList, String customerId); } \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 616228fc59..51b1924af7 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -15,10 +15,7 @@ import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.PidUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.dao.OrganizationMessageDao; import com.epmet.dao.OrganizationMessagePublishRangeDao; import com.epmet.dao.UserMessageDao; @@ -79,7 +76,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),pageSize); } /** @@ -92,7 +89,13 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),null, null, null, null, null,messageId); if(CollectionUtils.isNotEmpty(list)){ - return list.get(NumConstant.ZERO); + OrganizationMessageResultDTO resultDTO=list.get(NumConstant.ZERO); + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(OrganizationMessagePublishRangeEntity::getMessageId,messageId) + .orderByAsc(OrganizationMessagePublishRangeEntity::getCreatedTime); + List rangeList=organizationMessagePublishRangeDao.selectList(queryWrapper); + resultDTO.setRangeList(ConvertUtils.sourceToTarget(rangeList,OrganizationMessagePublishRangeDTO.class)); + return resultDTO; } return null; } @@ -138,13 +141,12 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl rangeList, String customerId) { String result = "success"; int totalMsg = NumConstant.ZERO; diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml index 8e8bd51ad6..a1e5dcb6c8 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/OrganizationMessageDao.xml @@ -30,6 +30,7 @@ om.PUBLISH_TIME as publishTime, om.PUBLISH_STAFF_ID as publishStaffId, om.PUBLISH_ORG_ID as publishStaffName, + om.PUBLISH_ORG_ID as publishOrgId, om.PUBLISH_ORG_ID_PATH as publishOrgIdPath, OM.PUBLISH_ORG_NAME as publishOrgName, om.SEND_MSG_RES as sendMsgRes, @@ -58,6 +59,7 @@ and om.id =#{messageId} + group by om.id order by om.PUBLISH_TIME desc \ No newline at end of file From 330e2bfc8211ac5decac0892d4101f572a78c222 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 14:10:59 +0800 Subject: [PATCH 065/177] /message/organization/message/list;NullPointerException --- .../epmet/service/impl/OrganizationMessageServiceImpl.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 51b1924af7..29c9a9bf48 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -9,6 +9,8 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -72,6 +74,9 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl pageList(Integer pageNo, Integer pageSize, String publishDitch, String orgId, String startDate, String endDate) { CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + if (null == staffInfoCacheResult) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "customerId:" + EpmetRequestHolder.getLoginUserCustomerId() + "staffId:" + EpmetRequestHolder.getLoginUserId(), "获取工作人员信息异常"); + } String staffOrgIdPath = PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds()); PageHelper.startPage(pageNo, pageSize); List list = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(),staffOrgIdPath, publishDitch, orgId, startDate, endDate,null); From b511b7a6671ef1d09d9495ef53bd8f24c4cdbdf4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 May 2023 14:27:50 +0800 Subject: [PATCH 066/177] FINISH_SEND_TIME --- .../com/epmet/dto/result/OrganizationMessageResultDTO.java | 6 ++++++ .../java/com/epmet/entity/OrganizationMessageEntity.java | 5 +++++ .../epmet/service/impl/OrganizationMessageServiceImpl.java | 1 + .../src/main/resources/mapper/OrganizationMessageDao.xml | 1 + 4 files changed, 13 insertions(+) diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java index 86ec079f87..94b89ded76 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/result/OrganizationMessageResultDTO.java @@ -73,6 +73,12 @@ public class OrganizationMessageResultDTO { */ private Integer totalReceiver; + /** + * 发送完成时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date finishSendTime; + private List rangeList; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java index 416f66793b..15c07c0851 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/entity/OrganizationMessageEntity.java @@ -74,4 +74,9 @@ public class OrganizationMessageEntity extends BaseEpmetEntity { * 共发送出多少条消息 */ private Integer totalReceiver; + + /** + * 发送完成时间 + */ + private Date finishSendTime; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java index 29c9a9bf48..65580da84c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/OrganizationMessageServiceImpl.java @@ -209,6 +209,7 @@ public class OrganizationMessageServiceImpl extends BaseServiceImpl Date: Fri, 5 May 2023 17:59:23 +0800 Subject: [PATCH 067/177] =?UTF-8?q?resi-group=E8=84=9A=E6=9C=AC28-29?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ath_agencyid.sql => V0.0.29__group_add_orgidpath_agencyid.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/{V0.0.28__group_add_orgidpath_agencyid.sql => V0.0.29__group_add_orgidpath_agencyid.sql} (100%) diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__group_add_orgidpath_agencyid.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.29__group_add_orgidpath_agencyid.sql similarity index 100% rename from epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.28__group_add_orgidpath_agencyid.sql rename to epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.29__group_add_orgidpath_agencyid.sql From d131fd9581086e0aa9ad7d7dacdc015a228b1df0 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 10:52:52 +0800 Subject: [PATCH 068/177] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/AddStaffV2FromDTO.java | 34 +++++++++++++++++++ .../epmet/dto/form/StaffSubmitFromDTO.java | 33 ++++++++++++++++++ .../java/com/epmet/dto/CustomerStaffDTO.java | 25 ++++++++++++++ .../com/epmet/entity/CustomerStaffEntity.java | 28 +++++++++++++++ .../impl/CustomerStaffServiceImpl.java | 24 +++++++++++++ 5 files changed, 144 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java index 7bc3b93076..4250c5ca61 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddStaffV2FromDTO.java @@ -78,4 +78,38 @@ public class AddStaffV2FromDTO implements Serializable { * 烟台用：当前登录用户 */ private String currentUserId; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + /** + * 居住地址 + */ + private String address; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java index f39bde7aab..a3ecf0f06f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/StaffSubmitFromDTO.java @@ -74,4 +74,37 @@ public class StaffSubmitFromDTO implements Serializable { * 社会自组织: community_org */ private String deptType; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + /** + * 居住地址 + */ + private String address; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java index cd042877ab..fddf4fc83d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerStaffDTO.java @@ -150,4 +150,29 @@ public class CustomerStaffDTO implements Serializable { */ private String idCard; + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java index aa19464f9e..3d26a85c76 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/CustomerStaffEntity.java @@ -111,4 +111,32 @@ public class CustomerStaffEntity extends BaseEpmetEntity { * 身份证号 */ private String idCard; + + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 1ff4560c99..0212da4168 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -370,6 +370,30 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 13:04:35 +0800 Subject: [PATCH 069/177] =?UTF-8?q?ic=5Fproperty=5Fmanagement=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcPropertyManagementDTO.java | 10 ++++++++ .../dto/form/IcPropertyManagementFormDTO.java | 12 +++++++++ .../PropertyManagementController.java | 15 +++++++++-- .../entity/IcPropertyManagementEntity.java | 9 +++++++ .../impl/PropertyManagementServiceImpl.java | 25 ++++++++++++++++--- 5 files changed, 66 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index a276e36387..171cbeb01c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -48,6 +48,16 @@ public class IcPropertyManagementDTO implements Serializable { */ private String customerId; + /** + * 烟台需求：物业联系人姓名 + */ + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + private String contactMobile; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java index bbc2cd7152..220a2b7488 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java @@ -52,6 +52,18 @@ public class IcPropertyManagementFormDTO implements Serializable { @Length(max = 50, message = "物业名称不能超过50个字", groups = {AddShowGroup.class}) private String name; + /** + * 烟台需求：物业联系人姓名 + */ + @Length(max = 30, message = "物业联系人不能超过30个字", groups = {AddShowGroup.class, UpdateShowGroup.class}) + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + @Length(max = 30, message = "联系电话不能超过30个字",groups = {AddShowGroup.class, UpdateShowGroup.class}) + private String contactMobile; + private String customerId; @NotNull(message = "pageNo不能为空", groups = PageGroup.class) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index ba24389143..047a98d802 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -49,8 +49,9 @@ public class PropertyManagementController { @Autowired private PropertyManagementService propertyManagementService; + /** - * 分页查询物业列表 + * 物业管理-分页查询物业列表 */ @PostMapping("page") public Result> page(@RequestBody IcPropertyManagementFormDTO formDTO){ @@ -68,7 +69,7 @@ public class PropertyManagementController { } /** - * 新增物业 + * 物业管理-新增物业 * 新增小区页面，添加小区也调用此接口 * @param tokenDTO * @param formDTO @@ -84,6 +85,11 @@ public class PropertyManagementController { return new Result().ok(map); } + /** + * 物业管理-修改 + * @param formDTO + * @return + */ @PostMapping("update") public Result update(@RequestBody IcPropertyManagementFormDTO formDTO){ //效验数据 @@ -92,6 +98,11 @@ public class PropertyManagementController { return new Result(); } + /** + * 物业管理-删除 + * @param formDTO + * @return + */ @PostMapping("delete") public Result delete(@RequestBody IcPropertyManagementFormDTO formDTO){ //效验数据 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java index 239fce61cc..c0ea9df16d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java @@ -40,4 +40,13 @@ public class IcPropertyManagementEntity extends BaseEpmetEntity { */ private String name; private String customerId; + /** + * 烟台需求：物业联系人姓名 + */ + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + private String contactMobile; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 41d2f7bfbc..cb782f36d7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.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.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -22,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; +import java.util.Date; import java.util.List; @Slf4j @@ -73,6 +75,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService return icPropertyManagementEntity.getId(); } + /** + * 物业管理-修改 + * @param formDTO + */ @Override @Transactional(rollbackFor = Exception.class) public void update(IcPropertyManagementFormDTO formDTO) { @@ -80,8 +86,14 @@ public class PropertyManagementServiceImpl implements PropertyManagementService if (null != entity) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业名称已存在","物业名称已存在"); } - IcPropertyManagementEntity icPropertyManagementEntity = ConvertUtils.sourceToTarget(formDTO, IcPropertyManagementEntity.class); - icPropertyManagementDao.updateById(icPropertyManagementEntity); + LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcPropertyManagementEntity::getId,formDTO.getId()) + .set(IcPropertyManagementEntity::getName,formDTO.getName()) + .set(IcPropertyManagementEntity::getContactName,formDTO.getContactName()) + .set(IcPropertyManagementEntity::getContactMobile,formDTO.getContactMobile()) + .set(IcPropertyManagementEntity::getUpdatedTime,new Date()) + .set(IcPropertyManagementEntity::getUpdatedBy,EpmetRequestHolder.getLoginUserId()); + icPropertyManagementDao.update(null,updateWrapper); } /** @@ -99,11 +111,18 @@ public class PropertyManagementServiceImpl implements PropertyManagementService icPropertyManagementDao.deleteById(formDTO.getId()); } + /** + * 物业管理-列表查询 + * @param pageNo + * @param pageSize + * @param name + * @return + */ @Override public PageData page(Integer pageNo, Integer pageSize, String name) { PageHelper.startPage(pageNo,pageSize); List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal()); + return new PageData<>(list, pageInfo.getTotal(),pageSize); } } From 8ae98006d230d3f8c95b33e9cd18aa468629d632 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 13:27:12 +0800 Subject: [PATCH 070/177] =?UTF-8?q?=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E3=80=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/epmetuser/CustomerStaffDTO.java | 35 +++++++++++++++++ .../dto/govorg/form/StaffDetailV2FormDTO.java | 39 +++++++++++++++++++ .../epmet/dto/result/StaffInitResultDTO.java | 29 ++++++++++++++ .../impl/CustomerStaffServiceImpl.java | 13 +++++++ 4 files changed, 116 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java index dec7a89cc7..61df5ba791 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/CustomerStaffDTO.java @@ -134,4 +134,39 @@ public class CustomerStaffDTO implements Serializable { */ private String password; + /** + * 烟台用：当前登录用户 + */ + private String currentUserId; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java index ea1763af18..5e75cbdeab 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/StaffDetailV2FormDTO.java @@ -48,4 +48,43 @@ public class StaffDetailV2FormDTO implements Serializable { private List szsqRoles; private String customerId; + /** + * 烟台用：当前登录用户 + */ + private String currentUserId; + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + /** + * 身份证 + */ + private String idCard; + + /** + * 居住地址 + */ + private String address; + + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java index 87b641b564..90e325a2f1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffInitResultDTO.java @@ -55,4 +55,33 @@ public class StaffInitResultDTO implements Serializable { * xxx-xxx */ private String agencyName; + + + /** + * 烟台需求：党组织职务 + */ + private String partyPosition; + + /** + * 烟台需求：村居委员职务 + */ + private String viliagePosition; + + /** + * 烟台需求：工作职责 + */ + private String duty; + + /** + * 烟台需求：备注 + */ + private String remark; + /** + * 文化程度 + */ + private String culture; + + private String address; + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 0212da4168..8f308d06ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -304,6 +304,12 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 13:29:43 +0800 Subject: [PATCH 071/177] =?UTF-8?q?gov/org/propertymanagement/page?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/PropertyManagementController.java | 3 ++- .../main/java/com/epmet/dao/IcPropertyManagementDao.java | 5 ++++- .../java/com/epmet/service/PropertyManagementService.java | 2 +- .../epmet/service/impl/PropertyManagementServiceImpl.java | 2 +- .../src/main/resources/mapper/IcPropertyManagementDao.xml | 6 ++++++ 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 047a98d802..d65ba66296 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -56,7 +56,8 @@ public class PropertyManagementController { @PostMapping("page") public Result> page(@RequestBody IcPropertyManagementFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO,IcPropertyManagementFormDTO.PageGroup.class); - return new Result>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName())); + return new Result>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName(), + formDTO.getContactName(),formDTO.getContactMobile())); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java index 915b2f6d7d..69124d0459 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcPropertyManagementDao.java @@ -59,5 +59,8 @@ public interface IcPropertyManagementDao extends BaseDao selectPropertyNameList(String neighborhoodId); - List queryList(@Param("customerId") String customerId,@Param("name")String name); + List queryList(@Param("customerId") String customerId, + @Param("name")String name, + @Param("contactName") String contactName, + @Param("contactMobile") String contactMobile); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index f3f77cde27..cae9715bd1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -39,5 +39,5 @@ public interface PropertyManagementService { void update(IcPropertyManagementFormDTO formDTO); void delete(IcPropertyManagementFormDTO formDTO); - PageData page(Integer pageNo, Integer pageSize, String name); + PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index cb782f36d7..643cdbacb9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -119,7 +119,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService * @return */ @Override - public PageData page(Integer pageNo, Integer pageSize, String name) { + public PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) { PageHelper.startPage(pageNo,pageSize); List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name); PageInfo pageInfo = new PageInfo<>(list); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml index 045514482f..2035e53020 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml @@ -80,6 +80,12 @@ and m.name like concat('%',#{name},'%') + + and m.CONTACT_NAME like concat('%',#{contactName},'%') + + + and m.CONTACT_MOBILE like concat('%',#{contactMobile},'%') + order by m.CREATED_TIME desc \ No newline at end of file From 31fee9c480500ecdbc4aa1ca3e9ee3e4d88f9210 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 14:26:36 +0800 Subject: [PATCH 072/177] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E7=BB=84=E7=BB=87=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/AddAgencyV2FormDTO.java | 26 ++++++++++++++++++ .../epmet/entity/CustomerAgencyEntity.java | 27 +++++++++++++++++++ 2 files changed, 53 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java index 63bf3c6e55..1427330c53 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddAgencyV2FormDTO.java @@ -124,4 +124,30 @@ public class AddAgencyV2FormDTO implements Serializable { */ @Length(max = 500,message ="最多输入500字",groups =DefaultUserShowGroup.class ) private String remark; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java index a2668ae5fd..236a8c3181 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CustomerAgencyEntity.java @@ -149,4 +149,31 @@ public class CustomerAgencyEntity extends BaseEpmetEntity { */ private String remark; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; + } From 2a2511d3e12135455b23fe6d2d7c5f9181b39d8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 14:33:08 +0800 Subject: [PATCH 073/177] =?UTF-8?q?gov/org/propertymanagement/page?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA=EF=BC=8C=E8=81=94?= =?UTF-8?q?=E7=B3=BB=E7=94=B5=E8=AF=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/PropertyManagementServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 643cdbacb9..e816556e07 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -121,7 +121,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService @Override public PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) { PageHelper.startPage(pageNo,pageSize); - List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name); + List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name,contactName,contactMobile); PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal(),pageSize); } From 0efcc3578f48c3b0e8221af89475eb5a275598d5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 14:58:57 +0800 Subject: [PATCH 074/177] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.yml | 2 +- .../CommunityBuildingManagerPageFormDTO.java | 80 ++++++++++ .../result/CommunityBuildingManagerDTO.java | 110 +++++++++++++ .../yt/CommunityBuildingManagerResultDTO.java | 102 +++++++++++++ .../CommunityBuildingManagerController.java | 111 ++++++++++++++ .../dao/CommunityBuildingManagerDao.java | 50 ++++++ .../CommunityBuildingManagerEntity.java | 86 +++++++++++ .../CommunityBuildingManagerService.java | 66 ++++++++ .../CommunityBuildingManagerServiceImpl.java | 144 ++++++++++++++++++ .../mapper/CommunityBuildingManagerDao.xml | 94 ++++++++++++ 10 files changed, 844 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml diff --git a/epmet-cloud-generator/src/main/resources/application.yml b/epmet-cloud-generator/src/main/resources/application.yml index 86b39b69c8..186ba27276 100644 --- a/epmet-cloud-generator/src/main/resources/application.yml +++ b/epmet-cloud-generator/src/main/resources/application.yml @@ -9,7 +9,7 @@ spring: type: com.alibaba.druid.pool.DruidDataSource #MySQL配置 driverClassName: com.mysql.jdbc.Driver - url: jdbc:mysql://118.190.150.119:43306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false + url: jdbc:mysql://192.168.1.140:3306/epmet_gov_org?useUnicode=true&characterEncoding=UTF-8&useSSL=false username: root password: root #oracle配置 diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java new file mode 100644 index 0000000000..f4fd8bbbda --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/yt/CommunityBuildingManagerPageFormDTO.java @@ -0,0 +1,80 @@ +package com.epmet.dto.form.yt; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/6 13:53 + */ +@Data +public class CommunityBuildingManagerPageFormDTO extends PageFormDTO { + // start + private String customerId; + private String staffId; + /** + * 工作人员所属组织的org_id_path + * 列表数据应查询本组织及下级 + * 网格的全路径，包含网格id + */ + private String orgIdPath; + // end + + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String phone; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + private String districtId; + + /** + * 所属街道id；取名字关联customer_agency + */ + private String streetId; + + /** + * 所属社区id；取名字关联customer_agency + */ + private String communityId; + + /** + * 所属网格id；取名字关联customer_grid + */ + private String gridId; + + /** + * 所属小区id + */ + private String viliageId; + + /** + * 所属楼栋id + */ + private String buildingId; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; +} + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java new file mode 100644 index 0000000000..062fe0b7b7 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java @@ -0,0 +1,110 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Data +public class CommunityBuildingManagerDTO implements Serializable { + + private static final long serialVersionUID = -2526419541953300212L; + public interface AddShowGroup extends CustomerClientShowGroup { + } + + public interface UpdateShowGroup extends CustomerClientShowGroup { + } + /** + * 主键（烟台需求） + */ + @NotBlank(message ="id不能为空" ,groups = {UpdateShowGroup.class}) + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 姓名 + */ + @Length(max = 50,message = "姓名最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class}) + @NotBlank(message ="姓名不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String name; + + /** + * 联系电话 + */ + @Length(max = 50,message = "联系电话最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class}) + @NotBlank(message ="联系电话不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String phone; + + /** + * 身份证号 + */ + @Length(max = 50,message = "身份证号最多输入50字",groups = {AddShowGroup.class,UpdateShowGroup.class}) + @NotBlank(message ="身份证号不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + @NotBlank(message ="类型不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + @NotBlank(message ="所属区县不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String districtId; + + /** + * 所属街道id；取名字关联customer_agency + */ + @NotBlank(message ="所属街道不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String streetId; + + /** + * 所属社区id；取名字关联customer_agency + */ + @NotBlank(message ="所属社区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String communityId; + + /** + * 所属网格id；取名字关联customer_grid + */ + @NotBlank(message ="所属网格不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String gridId; + + /** + * 网格的全路径，包含网格id + */ + private String orgIdPath; + + /** + * 所属小区id + */ + @NotBlank(message ="所属小区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String viliageId; + + /** + * 所属楼栋id + */ + @NotBlank(message ="楼栋不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) + private String buildingId; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java new file mode 100644 index 0000000000..1d2df38f08 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java @@ -0,0 +1,102 @@ +package com.epmet.dto.result.yt; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Data +public class CommunityBuildingManagerResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 主键（烟台需求） + */ + private String id; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String phone; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + private String districtId; + private String districtName; + /** + * 所属街道id；取名字关联customer_agency + */ + private String streetId; + private String streetName; + + /** + * 所属社区id；取名字关联customer_agency + */ + private String communityId; + private String communityName; + + /** + * 所属网格id；取名字关联customer_grid + */ + private String gridId; + private String gridName; + + /** + * 网格的全路径，包含网格id + */ + private String orgIdPath; + + /** + * 所属小区id + */ + private String viliageId; + /** + * 所属小区id + */ + private String viliageName; + + /** + * 所属楼栋id + */ + private String buildingId; + private String buildingName; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitName; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java new file mode 100644 index 0000000000..264e37c895 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -0,0 +1,111 @@ +package com.epmet.controller; + +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.service.CommunityBuildingManagerService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@RestController +@RequestMapping("communityBuildingManager") +public class CommunityBuildingManagerController { + + @Autowired + private CommunityBuildingManagerService communityBuildingManagerService; + + /** + * 列表分页查询 + * @param formDTO + * @return + */ + @RequestMapping("page") + public Result> page(@LoginUser TokenDto tokenDto, @RequestBody CommunityBuildingManagerPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + PageData page = communityBuildingManagerService.page(formDTO); + return new Result>().ok(page); + } + + /** + * 查看详情 + * @param id + * @return + */ + @RequestMapping(value = "detail/{id}",method = {RequestMethod.POST}) + public Result get(@PathVariable("id") String id){ + CommunityBuildingManagerResultDTO data = communityBuildingManagerService.get(id); + return new Result().ok(data); + } + + /** + * 新增楼长/单元长 + * todo: 同步到具体的楼栋 + * @param dto + * @return + */ + @NoRepeatSubmit + @PostMapping("save") + public Result save(@LoginUser TokenDto tokenDto,@RequestBody CommunityBuildingManagerDTO dto){ + dto.setCustomerId(tokenDto.getCustomerId()); + ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.AddShowGroup.class); + //类型：0楼长；1单元长 + if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); + } + communityBuildingManagerService.save(dto); + return new Result(); + } + + /** + * 编辑楼长/单元长 + * todo: 同步到具体的楼栋 + * @param dto + * @return + */ + @NoRepeatSubmit + @PostMapping("update") + public Result update(@RequestBody CommunityBuildingManagerDTO dto){ + ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.UpdateShowGroup.class); + //类型：0楼长；1单元长 + if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); + } + communityBuildingManagerService.update(dto); + return new Result(); + } + + /** + * 批量删除楼长/单元长 + * todo: 同时清空楼栋表里的信息 + * @param ids + * @return + */ + @PostMapping("delete") + public Result delete(@RequestBody List ids){ + if(!CollectionUtils.isEmpty(ids)){ + communityBuildingManagerService.delete(ids); + } + return new Result(); + } + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java new file mode 100644 index 0000000000..e6c19b0d26 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/CommunityBuildingManagerDao.java @@ -0,0 +1,50 @@ +package com.epmet.dao; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.entity.CommunityBuildingManagerEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Mapper +public interface CommunityBuildingManagerDao extends BaseDao { + /** + * 楼长单元长分页列表查询 + * @param customerId + * @param orgIdPath + * @param name + * @param phone + * @param idCard + * @param type + * @param districtId + * @param streetId + * @param communityId + * @param gridId + * @param viliageId + * @param buildingId + * @param unitId + * @return + */ + List pageList(@Param("customerId") String customerId, + @Param("orgIdPath")String orgIdPath, + @Param("name")String name, + @Param("phone")String phone, + @Param("idCard")String idCard, + @Param("type")String type, + @Param("districtId")String districtId, + @Param("streetId")String streetId, + @Param("communityId")String communityId, + @Param("gridId")String gridId, + @Param("viliageId")String viliageId, + @Param("buildingId")String buildingId, + @Param("unitId")String unitId, + @Param("id")String id); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java new file mode 100644 index 0000000000..c2ac9184b9 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java @@ -0,0 +1,86 @@ +package com.epmet.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("community_building_manager") +public class CommunityBuildingManagerEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户Id customer.id + */ + private String customerId; + + /** + * 姓名 + */ + private String name; + + /** + * 联系电话 + */ + private String phone; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + private String type; + + /** + * 所属区县id；取名字关联customer_agency + */ + private String districtId; + + /** + * 所属街道id；取名字关联customer_agency + */ + private String streetId; + + /** + * 所属社区id；取名字关联customer_agency + */ + private String communityId; + + /** + * 所属网格id；取名字关联customer_grid + */ + private String gridId; + + /** + * 网格的全路径，包含网格id + */ + private String orgIdPath; + + /** + * 所属小区id + */ + private String viliageId; + + /** + * 所属楼栋id + */ + private String buildingId; + + /** + * 所属单元id; 单元长时必填此列 + */ + private String unitId; + +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java new file mode 100644 index 0000000000..b67d4d0d35 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -0,0 +1,66 @@ +package com.epmet.service; + +import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.entity.CommunityBuildingManagerEntity; + +import java.util.List; + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +public interface CommunityBuildingManagerService extends BaseService { + + /** + * 默认分页 + * + * @param formDTO + * @return PageData + * @author generator + * @date 2023-05-06 + */ + PageData page(CommunityBuildingManagerPageFormDTO formDTO); + + /** + * 查看详情 + * + * @param id + * @return CommunityBuildingManagerResultDTO + * @author generator + * @date 2023-05-06 + */ + CommunityBuildingManagerResultDTO get(String id); + + /** + * 新增楼长/单元长 + * todo: 同步到具体的楼栋表 + * + * @param dto + * @return + */ + void save(CommunityBuildingManagerDTO dto); + + /** + * 编辑楼长/单元长 + * todo: 同步到具体的楼栋 + * + * @param dto + * @return + */ + void update(CommunityBuildingManagerDTO dto); + + /** + * 批量删除楼长/单元长 + * todo: 同时清空楼栋表里的信息 + * + * @param ids + * @return + */ + void delete(List ids); +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java new file mode 100644 index 0000000000..4693ce14b3 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -0,0 +1,144 @@ +package com.epmet.service.impl; + +import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.PidUtils; +import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.dao.CommunityBuildingManagerDao; +import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; +import com.epmet.entity.CommunityBuildingManagerEntity; +import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.service.CustomerGridService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; + +import java.util.List; + +/** + * 楼长单元长信息表（烟台） + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2023-05-06 + */ +@Service +public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { + + /** + * 列表分页查询 + * + * @param formDTO + * @return + */ + @Override + public PageData page(CommunityBuildingManagerPageFormDTO formDTO) { + // 默认查询本组织及下级 + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfoCacheResult) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询工作人员信息异常staffId:" + formDTO.getStaffId(), "查询工作人员信息异常"); + } + formDTO.setOrgIdPath(PidUtils.convertPid2OrgIdPath(staffInfoCacheResult.getAgencyId(), staffInfoCacheResult.getAgencyPIds())); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List resList = baseDao.pageList(formDTO.getCustomerId(), + formDTO.getOrgIdPath(), + formDTO.getName(), + formDTO.getPhone(), + formDTO.getIdCard(), + formDTO.getType(), + formDTO.getDistrictId(), + formDTO.getStreetId(), + formDTO.getCommunityId(), + formDTO.getGridId(), + formDTO.getViliageId(), + formDTO.getBuildingId(), + formDTO.getUnitId(), null); + PageInfo pageInfo = new PageInfo<>(resList); + return new PageData<>(resList, pageInfo.getTotal()); + } + + /** + * 查看详情 + * + * @param id + * @return + */ + @Override + public CommunityBuildingManagerResultDTO get(String id) { + List resList = baseDao.pageList(EpmetRequestHolder.getLoginUserCustomerId(), + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, + null, id); + if (CollectionUtils.isEmpty(resList)) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "community_building_manager表记录不存在：id:" + id, "记录不存在"); + } + return resList.get(NumConstant.ZERO); + } + + /** + * 新增楼长/单元长 + * todo: 同步到具体的楼栋表 + * + * @param addFormDto + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void save(CommunityBuildingManagerDTO addFormDto) { + // 唯一性判断，同一个楼可以有多个楼长吗？待定。。。 + CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(addFormDto, CommunityBuildingManagerEntity.class); + CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(addFormDto.getGridId()); + entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids())); + insert(entity); + } + + /** + * 编辑楼长/单元长 + * todo: 同步到具体的楼栋 + * + * @param updateFormDto + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void update(CommunityBuildingManagerDTO updateFormDto) { + CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(updateFormDto, CommunityBuildingManagerEntity.class); + CustomerGridDTO gridDTO = SpringContextUtils.getBean(CustomerGridService.class).get(updateFormDto.getGridId()); + entity.setOrgIdPath(PidUtils.convertPid2OrgIdPath(gridDTO.getId(), gridDTO.getPids())); + updateById(entity); + } + + /** + * 批量删除楼长/单元长 + * todo: 同时清空楼栋表里的信息 + * + * @param ids + * @return + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(List ids) { + baseDao.deleteBatchIds(ids); + } + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml new file mode 100644 index 0000000000..74b789763b --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 6349bdc821d42a926785efe12841e56fcafaaa32 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 14:59:05 +0800 Subject: [PATCH 075/177] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E3=80=81=E6=96=B0=E5=A2=9E=E5=B0=8F=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcNeighborHoodDTO.java | 16 ++++++++++++++++ .../dto/form/IcNeighborHoodAddFormDTO.java | 17 ++++++++++++++++- .../com/epmet/entity/IcNeighborHoodEntity.java | 17 +++++++++++++++++ 3 files changed, 49 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java index 8e39699670..66c41f6342 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcNeighborHoodDTO.java @@ -165,4 +165,20 @@ public class IcNeighborHoodDTO implements Serializable { */ private String buildingName; + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java index 854462c6e1..f975c75048 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java @@ -113,6 +113,21 @@ public class IcNeighborHoodAddFormDTO extends PageFormDTO { * 实有楼栋数 */ private Integer realBuilding; - + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java index 26e278fd16..2d67d4259b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcNeighborHoodEntity.java @@ -121,4 +121,21 @@ public class IcNeighborHoodEntity extends BaseEpmetEntity { * 二维码地址 */ private String qrcodeUrl; + + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } From 1d6f0a78549c9c02f05cdfd3e63bbeb19df314a5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 15:25:18 +0800 Subject: [PATCH 076/177] =?UTF-8?q?=E6=A5=BC=E6=A0=8B=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BFfix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java | 3 --- .../service/impl/CommunityBuildingManagerServiceImpl.java | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java index 1d2df38f08..ffb2fc69c8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/yt/CommunityBuildingManagerResultDTO.java @@ -78,9 +78,6 @@ public class CommunityBuildingManagerResultDTO implements Serializable { * 所属小区id */ private String viliageId; - /** - * 所属小区id - */ private String viliageName; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 4693ce14b3..0d7593f50c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -65,7 +65,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(resList); - return new PageData<>(resList, pageInfo.getTotal()); + return new PageData<>(resList, pageInfo.getTotal(),formDTO.getPageSize()); } /** From 6453e1c29626c844a9a89ee3e0ad4bfefafa47ef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 15:43:52 +0800 Subject: [PATCH 077/177] =?UTF-8?q?=E5=8C=BA=E5=8E=BF=E3=80=81=E8=A1=97?= =?UTF-8?q?=E9=81=93=E3=80=81=E7=A4=BE=E5=8C=BA=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CustomerAgencyController.java | 54 +++++++++++++++++++ .../impl/CustomerAgencyServiceImpl.java | 20 +++---- 2 files changed, 65 insertions(+), 9 deletions(-) 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 3d26395c0e..fad4233d80 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 @@ -19,6 +19,9 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.AppClientConstant; +import com.epmet.commons.tools.enums.OrgLevelEnum; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; @@ -41,6 +44,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -564,4 +568,54 @@ public class CustomerAgencyController { return new Result>().ok(customerAgencyService.getCommunityList(dto)); } + /** + * 返回区县列表 + * @param tokenDto + * @return + */ + @PostMapping("districtList") + public Result> districtList(@LoginUser TokenDto tokenDto){ + Map params=new HashMap<>(); + params.put("CUSTOMER_ID",tokenDto.getCustomerId()); + params.put("LEVEL",OrgLevelEnum.DISTRICT.getCode()); + params.put("PID",null); + return new Result>().ok(customerAgencyService.list(params)); + } + + /** + * 返回街道列表，必传区县 + * @param tokenDto + * @param districtId + * @return + */ + @PostMapping("streetList/{districtId}") + public Result> streetList(@LoginUser TokenDto tokenDto,@PathVariable("districtId")String districtId){ + if(StringUtils.isBlank(districtId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"districtId为空","请先选择区县"); + } + Map params=new HashMap<>(); + params.put("CUSTOMER_ID",tokenDto.getCustomerId()); + params.put("LEVEL",OrgLevelEnum.STREET.getCode()); + params.put("PID",districtId); + return new Result>().ok(customerAgencyService.list(params)); + } + + /** + * 返回社区列表，街道必传 + * @param tokenDto + * @param streetId + * @return + */ + @PostMapping("communityList/{streetId}") + public Result> communityList(@LoginUser TokenDto tokenDto,@PathVariable("streetId")String streetId){ + if(StringUtils.isBlank(streetId)){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"streetId为空","请先选择街道"); + } + Map params=new HashMap<>(); + params.put("CUSTOMER_ID",tokenDto.getCustomerId()); + params.put("LEVEL",OrgLevelEnum.COMMUNITY.getCode()); + params.put("PID",streetId); + return new Result>().ok(customerAgencyService.list(params)); + } + } 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 4585f7481d..87f0555690 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 @@ -18,7 +18,6 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; @@ -45,7 +44,6 @@ import com.epmet.constant.CustomerGridConstant; import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; -import com.epmet.dto.region.LogOperationResultDTO; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerDepartmentEntity; @@ -136,12 +134,16 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl getWrapper(Map params) { - String id = (String) params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - + private LambdaQueryWrapper getWrapper(Map map) { + String id = map.containsKey(FieldConstant.ID_HUMP) ? (String) map.get(FieldConstant.ID_HUMP) : null; + String customerId = map.containsKey("CUSTOMER_ID") ? (String) map.get("CUSTOMER_ID") : null; + String level = map.containsKey("LEVEL") ? (String) map.get("LEVEL") : null; + String pid = map.containsKey("PID") ? (String) map.get("PID") : null; + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), CustomerAgencyEntity::getId, id) + .eq(StringUtils.isNotBlank(customerId), CustomerAgencyEntity::getCustomerId, customerId) + .eq(StringUtils.isNotBlank(level), CustomerAgencyEntity::getLevel, level) + .eq(StringUtils.isNotBlank(pid), CustomerAgencyEntity::getPid, pid); return wrapper; } @@ -1244,7 +1246,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl agencyList, List gridList) { From 6f58e991382e0f2490b5e88c3a886bc12f4b206e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 16:10:43 +0800 Subject: [PATCH 078/177] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/IcHouseAddFormDTO.java | 8 ++++++++ .../src/main/java/com/epmet/entity/IcHouseEntity.java | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java index aa4e6a999b..11d5ce0295 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java @@ -112,5 +112,13 @@ public class IcHouseAddFormDTO implements Serializable { * 房屋可编辑编码 */ private String coding; + /** + * 所在楼层 + */ + private String floor; + /** + * 面积 + */ + private String area; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java index 96e993c865..983b876709 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcHouseEntity.java @@ -136,4 +136,12 @@ public class IcHouseEntity extends BaseEpmetEntity { * 房屋可编辑编码 */ private String coding; + /** + * 所在楼层 + */ + private String floor; + /** + * 面积 + */ + private String area; } From d3009dfeaf3c9819ca4d92a60d4a60e2d019d97e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 18:01:52 +0800 Subject: [PATCH 079/177] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=92=8C=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E5=B1=85=E6=B0=91=EF=BC=8C=E8=AF=81=E4=BB=B6=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/processor/YanTaiTripReportSyncProcessor.java | 4 +--- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 8 ++++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java index 6b1d4a028d..1bb4afd991 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/processor/YanTaiTripReportSyncProcessor.java @@ -6,17 +6,15 @@ import com.epmet.service.DataSyncConfigService; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import static com.epmet.constant.EpidemicConstant.JOB_TYPE_TRIP_REPORT; -import static com.epmet.constant.EpidemicConstant.JOB_TYPE_VACCINE; /** * @Description 烟台行程上报数据同步处理器 * @Author zxc * @Date 2022/11/22 14:08 */ -@Component +// @Component @Slf4j public class YanTaiTripReportSyncProcessor extends AbstractDataSyncJobProcessor { 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 b10ab41c03..98c22b85ff 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 @@ -366,8 +366,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 18:28:45 +0800 Subject: [PATCH 080/177] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/EditAgencyFormDTO.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java index 2d0da966d0..af4e9a36e2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditAgencyFormDTO.java @@ -113,4 +113,30 @@ public class EditAgencyFormDTO implements Serializable { @Length(max = 500,message = "最多输入500字",groups =DefaultUserShowGroup.class ) private String remark; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; } \ No newline at end of file From 05f60d37787427a90f37dc378997f54eeba3409e Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 18:31:14 +0800 Subject: [PATCH 081/177] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/result/AgencysResultDTO.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java index f95c6349a4..7ca182856f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/AgencysResultDTO.java @@ -137,4 +137,30 @@ public class AgencysResultDTO implements Serializable { private String remark; private String coordinates; + + /** + * 村居/社区书记姓名 + */ + private String secretaryName; + /** + * 村居/社区书记电话 + */ + private String secretaryMobile; + /** + * 值班电话 + */ + private String dutyMobile; + /** + * 统一社会信用代码 + */ + private String unifiedSocialCreditCode; + /** + * 统一社会信用代码证书（图片附件） + */ + private String unifiedSocialCreditCodeCertificate; + + /** + * 详细地址 + */ + private String fullAddress; } \ No newline at end of file From 1de597c2c244c6bf87ccd461bdc4a11d5ad50c3d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 18:48:06 +0800 Subject: [PATCH 082/177] dictOption/{dictType} --- .../controller/SysDictDataController.java | 13 ++++++++ .../com/epmet/service/SysDictDataService.java | 2 ++ .../service/impl/SysDictDataServiceImpl.java | 31 +++++++++++++++++++ 3 files changed, 46 insertions(+) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java index ce18026bf8..1a51f32c0e 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/controller/SysDictDataController.java @@ -20,6 +20,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.SysDictDataDTO; import com.epmet.service.SysDictDataService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -118,6 +119,18 @@ public class SysDictDataController { return new Result>().ok(sysDictDataService.getNationOption()); } + /** + * 字典下拉框接口 + * @param dictType + * @return + */ + @PostMapping("dictOption/{dictType}") + public Result> getDictOption(@PathVariable("dictType")String dictType) { + if(StringUtils.isBlank(dictType)){ + return new Result<>(); + } + return new Result>().ok(sysDictDataService.getDictOption(dictType)); + } /** * @Description 人员关系 * @Param diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java index 6277ab6d2f..52de66b46d 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/SysDictDataService.java @@ -92,4 +92,6 @@ public interface SysDictDataService extends BaseService { List dictListTree(String dictType); List getDictDataList(String dictType); + + List getDictOption(String dictType); } diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java index a7b6bff903..52c44b78f6 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/service/impl/SysDictDataServiceImpl.java @@ -19,13 +19,17 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.TreeUtils; import com.epmet.dao.SysDictDataDao; +import com.epmet.dao.SysDictTypeDao; import com.epmet.dto.SysDictDataDTO; import com.epmet.entity.SysDictDataEntity; +import com.epmet.entity.SysDictTypeEntity; import com.epmet.service.SysDictDataService; 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.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -38,6 +42,9 @@ import java.util.stream.Collectors; */ @Service public class SysDictDataServiceImpl extends BaseServiceImpl implements SysDictDataService { + @Autowired + private SysDictTypeDao sysDictTypeDao; + @Override public PageData page(Map params) { @@ -230,4 +237,28 @@ public class SysDictDataServiceImpl extends BaseServiceImpl getDictOption(String dictType) { + LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); + queryWrapper.eq(SysDictTypeEntity::getDictType,dictType); + SysDictTypeEntity sysDictTypeEntity=sysDictTypeDao.selectOne(queryWrapper); + if(null==sysDictTypeEntity){ + return new ArrayList<>(); + } + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysDictDataEntity::getDictTypeId,sysDictTypeEntity.getId() ); + wrapper.orderByAsc(SysDictDataEntity::getSort); + List list = baseDao.selectList(wrapper); + return list.stream().map(item -> { + OptionResultDTO dto = new OptionResultDTO(); + dto.setValue(item.getDictValue()); + dto.setLabel(item.getDictLabel()); + return dto; + }).collect(Collectors.toList()); + } } From 049c9b47af35b34ff4e996f7e286f5e621364a89 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sat, 6 May 2023 19:38:53 +0800 Subject: [PATCH 083/177] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/CustomerStaffServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 8f308d06ac..213f990d83 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -389,7 +389,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Sat, 6 May 2023 20:43:04 +0800 Subject: [PATCH 084/177] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=A2=9E=E5=8A=A0=E9=87=8D=E7=82=B9=E4=BA=BA?= =?UTF-8?q?=E7=BE=A4=E3=80=81=E5=9B=BD=E7=B1=8D=E3=80=81=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=95=B4=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E6=94=B9=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcResiUserDTO.java | 25 +++++++++++++++++++ .../com/epmet/entity/IcResiUserEntity.java | 24 ++++++++++++++++-- 2 files changed, 47 insertions(+), 2 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index bf93b3b225..d16310d77c 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -105,6 +105,11 @@ public class IcResiUserDTO implements Serializable { */ private String idCard; + /** + * 证件类型。烟台需求：来源于字典表dict_type=yt_id_card_type;1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他 + */ + private String idCardType; + /** * 出生日期 */ @@ -125,6 +130,26 @@ public class IcResiUserDTO implements Serializable { */ private String contactsMobile; + /** + * 烟台需求：重点人群；名称对应字典表，dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求：国籍 + */ + private String nationality; + + /** + * 烟台需求：人口类型；名称对应字典表，dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求：政治面貌；名称对应字典表，dict_type:yt_politics_status + */ + private String politicsStatus; + /** * 九小场所url */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index a78fae885d..eda20ac933 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -102,7 +102,7 @@ public class IcResiUserEntity extends BaseEpmetEntity { private String idCard; /** - * 证件类型。1：身份证号；2：护照 + * 证件类型。烟台需求：来源于字典表dict_type=yt_id_card_type;1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他 */ private String idCardType; @@ -126,7 +126,27 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String contactsMobile; - /** + /** + * 烟台需求：重点人群；名称对应字典表，dict_type:yt_key_point_user_type + */ + private String keyPointUserType; + + /** + * 烟台需求：国籍 + */ + private String nationality; + + /** + * 烟台需求：人口类型；名称对应字典表，dict_type:yt_population_type + */ + private String populationType; + + /** + * 烟台需求：政治面貌；名称对应字典表，dict_type:yt_politics_status + */ + private String politicsStatus; + + /** * 九小场所url */ private String ninePlace; From 6e771a6d2db0211d300adde4001173f8acd71f5c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sat, 6 May 2023 21:15:07 +0800 Subject: [PATCH 085/177] =?UTF-8?q?=E7=83=9F=E5=8F=B0=E9=9C=80=E6=B1=82?= =?UTF-8?q?=EF=BC=9A=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3=E7=B3=BB=EF=BC=88?= =?UTF-8?q?60=EF=BC=89=E5=AF=B9=E5=BA=94=E5=AD=97=E5=85=B8=E8=A1=A8dict=5F?= =?UTF-8?q?type:yt=5FHouseholder=5Frelationship=5Ftype?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcResiUserDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/IcResiUserEntity.java | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index d16310d77c..3098207e44 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -490,6 +490,11 @@ public class IcResiUserDTO implements Serializable { */ private String jtxxRemakes; + /** + * 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type + */ + private String yt_yhzgx; + /** * 用户状态【0:正常;1:迁出;2:注销】 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index eda20ac933..33037d487c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -480,6 +480,11 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String jtxxRemakes; + /** + * 烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type + */ + private String yt_yhzgx; + /** * 用户状态【0:正常;1:迁出;2:注销】 */ From 00de29ab2806b8e45ea4dac7385c5add38bb7267 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 09:17:26 +0800 Subject: [PATCH 086/177] =?UTF-8?q?=E6=88=B7=E7=B1=8D=E6=89=80=E5=9C=A8?= =?UTF-8?q?=E5=9C=B0=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B3=A8=E9=87=8A=EF=BC=8C?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E6=B5=AA=E6=BD=AE=E9=82=A3=E7=9A=84=E6=88=B7?= =?UTF-8?q?=E7=B1=8D=E8=AF=A6=E7=BB=86=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcResiUserDTO.java | 4 ++-- .../src/main/java/com/epmet/entity/IcResiUserEntity.java | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 3098207e44..31a6740e6b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -426,9 +426,9 @@ public class IcResiUserDTO implements Serializable { private String jg; /** - * 户籍所在地 + * 户籍所在地;烟台需求：对应户籍详细地址 */ - private String hjszd; + private String hjszd; /** * 现居住地 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 33037d487c..427d18a897 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -415,9 +415,9 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String jg; - /** - * 户籍所在地 - */ + /** + * 户籍所在地;烟台需求：对应户籍详细地址 + */ private String hjszd; /** From c4dd042be2033c924a1d6d8f67544863f2a395fa Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 09:19:52 +0800 Subject: [PATCH 087/177] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AFic?= =?UTF-8?q?=5Fresi=5Fuser=E5=A2=9E=E5=8A=A0=E6=88=B7=E7=B1=8D=E3=80=81?= =?UTF-8?q?=E5=B1=85=E4=BD=8F=E7=AD=8921=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/IcResiUserDTO.java | 105 ++++++++++++++++++ .../com/epmet/entity/IcResiUserEntity.java | 105 ++++++++++++++++++ 2 files changed, 210 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java index 31a6740e6b..62541c7469 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/IcResiUserDTO.java @@ -440,6 +440,111 @@ public class IcResiUserDTO implements Serializable { */ private String rhzk; + /** + * 烟台需求：是否现居住；0否；1是，对应字典表dict_type: + */ + private String isNowLive; + + /** + * 烟台需求：居住省 + */ + private String livingProvince; + + /** + * 烟台需求：居住市 + */ + private String livingCity; + + /** + * 烟台需求：居住区 + */ + private String livingArea; + + /** + * 烟台需求：居住街道 + */ + private String livingStreet; + + /** + * 烟台需求：居住社区 + */ + private String livingCommunity; + + /** + * 烟台需求：居住小区 + */ + private String livingViliageName; + + /** + * 烟台需求：居住楼号 + */ + private String livingBuildingNo; + + /** + * 烟台需求：居住单元号 + */ + private String livingUnitNo; + + /** + * 烟台需求：居住房间号 + */ + private String livingHouseNo; + + /** + * 烟台需求：户籍所在省 + */ + private String registerProvince; + + /** + * 烟台需求：户籍所在市 + */ + private String registerCity; + + /** + * 烟台需求：户籍所在区县 + */ + private String registerArea; + + /** + * 烟台需求：户籍所在街道 + */ + private String registerStreet; + + /** + * 烟台需求：户籍所在社区 + */ + private String registerCommunity; + + /** + * 烟台需求：户籍所在小区名称 + */ + private String registerViliageName; + + /** + * 烟台需求：户籍楼号 + */ + private String registerBuildingNo; + + /** + * 烟台需求：户籍单元号 + */ + private String registerUnitNo; + + /** + * 烟台需求：户籍房间号 + */ + private String registerHouseNo; + + /** + * 烟台需求：户别；对应字典表dict_type:yt_household_category + */ + private String householdCategory; + + /** + * 烟台需求：户号 + */ + private String houseHoldId; + /** * 居住信息备注 */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java index 427d18a897..961f69dfe9 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/IcResiUserEntity.java @@ -430,6 +430,111 @@ public class IcResiUserEntity extends BaseEpmetEntity { */ private String rhzk; + /** + * 烟台需求：是否现居住；0否；1是，对应字典表dict_type: + */ + private String isNowLive; + + /** + * 烟台需求：居住省 + */ + private String livingProvince; + + /** + * 烟台需求：居住市 + */ + private String livingCity; + + /** + * 烟台需求：居住区 + */ + private String livingArea; + + /** + * 烟台需求：居住街道 + */ + private String livingStreet; + + /** + * 烟台需求：居住社区 + */ + private String livingCommunity; + + /** + * 烟台需求：居住小区 + */ + private String livingViliageName; + + /** + * 烟台需求：居住楼号 + */ + private String livingBuildingNo; + + /** + * 烟台需求：居住单元号 + */ + private String livingUnitNo; + + /** + * 烟台需求：居住房间号 + */ + private String livingHouseNo; + + /** + * 烟台需求：户籍所在省 + */ + private String registerProvince; + + /** + * 烟台需求：户籍所在市 + */ + private String registerCity; + + /** + * 烟台需求：户籍所在区县 + */ + private String registerArea; + + /** + * 烟台需求：户籍所在街道 + */ + private String registerStreet; + + /** + * 烟台需求：户籍所在社区 + */ + private String registerCommunity; + + /** + * 烟台需求：户籍所在小区名称 + */ + private String registerViliageName; + + /** + * 烟台需求：户籍楼号 + */ + private String registerBuildingNo; + + /** + * 烟台需求：户籍单元号 + */ + private String registerUnitNo; + + /** + * 烟台需求：户籍房间号 + */ + private String registerHouseNo; + + /** + * 烟台需求：户别；对应字典表dict_type:yt_household_category + */ + private String householdCategory; + + /** + * 烟台需求：户号 + */ + private String houseHoldId; + /** * 居住信息备注 */ From f9031d61c540a0d96b7338927a5ccef40bdc4e48 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:01:52 +0800 Subject: [PATCH 088/177] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E3=80=81=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4=E3=80=81=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=E3=80=81=E6=98=AF=E5=90=A6=E7=8E=B0=E5=B1=85=E4=BD=8F=E3=80=81?= =?UTF-8?q?=E6=88=B7=E5=88=AB,=E8=AF=95=E8=AF=95=E5=8F=AF=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcResiUserImportServiceImpl.java | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 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 e0b5c91837..71dd1ada0c 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; @@ -1457,11 +1456,38 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res optionTypeName = "所属支部"; options = this.listBranchOptions(); break; + case "/sys/dict/data/dictOption/yt_Householder_relationship_type": + optionTypeName = "与户主关系"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_id_card_type": + optionTypeName = "证件类型"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_key_point_user_type": + optionTypeName = "重点人群"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_population_type": + optionTypeName = "人口类型"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_politics_status": + optionTypeName = "政治面貌"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_is_now_live": + optionTypeName = "是否现居住"; + options = null; + break; + case "/sys/dict/data/dictOption/yt_household_category": + optionTypeName = "户别"; + options = null; + break; default: log.warn("listRemoteOptions url is not supported"); } - if (options == null) { return null; } From 44a487f2059c918ea33ac732daf698629c932fe5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:06:28 +0800 Subject: [PATCH 089/177] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=9A=84=E4=B8=8E=E6=88=B7=E4=B8=BB=E5=85=B3?= =?UTF-8?q?=E7=B3=BB=E3=80=81=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B=E3=80=81?= =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4=E3=80=81=E4=BA=BA=E5=8F=A3?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E3=80=81=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C?= =?UTF-8?q?=E3=80=81=E6=98=AF=E5=90=A6=E7=8E=B0=E5=B1=85=E4=BD=8F=E3=80=81?= =?UTF-8?q?=E6=88=B7=E5=88=AB,=E8=AF=95=E8=AF=95=E5=8F=AF=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E5=AF=BC=E5=87=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/EpmetAdminOpenFeignClient.java | 9 +++++++++ .../EpmetAdminOpenFeignClientFallback.java | 12 ++++++++++++ .../service/impl/IcResiUserImportServiceImpl.java | 14 +++++++------- 3 files changed, 28 insertions(+), 7 deletions(-) diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java index 59eb1e1e40..3999b45089 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/EpmetAdminOpenFeignClient.java @@ -105,4 +105,13 @@ public interface EpmetAdminOpenFeignClient { @PostMapping("/sys/dict/data/dictDataList/{dictType}") Result> dictDataList(@PathVariable("dictType") String dictType); + + /** + * 字典下拉框 + * 根据dictType查询字典 + * @param dictType + * @return + */ + @PostMapping("/sys/dict/data/dictOption/{dictType}") + public Result> getDictOption(@PathVariable("dictType")String dictType); } diff --git a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java index 98e7e7f0f0..0184d2a100 100644 --- a/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java +++ b/epmet-admin/epmet-admin-client/src/main/java/com/epmet/feign/fallback/EpmetAdminOpenFeignClientFallback.java @@ -65,4 +65,16 @@ public class EpmetAdminOpenFeignClientFallback implements EpmetAdminOpenFeignCli public Result> dictDataList(String dictType) { return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "dictDataList", dictType); } + + /** + * 字典下拉框 + * 根据dictType查询字典 + * + * @param dictType + * @return + */ + @Override + public Result> getDictOption(String dictType) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_ADMIN_SERVER, "getDictOption", dictType); + } } 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 71dd1ada0c..80d337f65d 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 @@ -1458,31 +1458,31 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res break; case "/sys/dict/data/dictOption/yt_Householder_relationship_type": optionTypeName = "与户主关系"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_Householder_relationship_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_id_card_type": optionTypeName = "证件类型"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_id_card_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_key_point_user_type": optionTypeName = "重点人群"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_key_point_user_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_population_type": optionTypeName = "人口类型"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_population_type"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_politics_status": optionTypeName = "政治面貌"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_politics_status"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_is_now_live": optionTypeName = "是否现居住"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_is_now_live"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; case "/sys/dict/data/dictOption/yt_household_category": optionTypeName = "户别"; - options = null; + options = getResultDataOrThrowsException(adminOpenFeignClient.getDictOption("yt_household_category"), ServiceConstant.EPMET_ADMIN_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); break; default: log.warn("listRemoteOptions url is not supported"); From 99a15a1eb97be99e2d79a9b08e4e196bdac2f460 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:25:34 +0800 Subject: [PATCH 090/177] =?UTF-8?q?=E4=B8=BA=E4=BA=86=E6=B5=AA=E6=BD=AE?= =?UTF-8?q?=E5=8A=A0=E7=9A=84=E4=B8=80=E4=BA=9B=E5=AD=97=E6=AE=B5=EF=BC=8C?= =?UTF-8?q?=E7=94=A8=E5=88=B0=E7=9A=84=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=8C=E4=BD=BF=E7=94=A8flyway=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V0.0.27__add_dict_for_langchao.sql | 103 ++++++++++++++++++ 1 file changed, 103 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql new file mode 100644 index 0000000000..33cea85fe6 --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql @@ -0,0 +1,103 @@ +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654829394234654722', 'yt_Householder_relationship_type', '与户主关系', '【烟台需求】居民信息-与户主关系（60）', 0, 0, 0, '1', '2023-05-06 20:44:07', '1', '2023-05-07 08:49:11'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017423142338562', 'yt_household_category', '户别', '【烟台需求】居住信息', 0, 0, 0, '1', '2023-05-07 09:11:17', '1', '2023-05-07 09:11:17'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803329994932225', 'yt_id_card_type', '证件类型', '【烟台需求】居民信息：证件类型；因烟台需求增加', 0, 0, 0, '1', '2023-05-06 19:00:33', '1', '2023-05-06 19:20:52'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017027942432770', 'yt_is_now_live', '是否现居住', '【烟台需求】居住信息', 0, 0, 0, '1', '2023-05-07 09:09:43', '1', '2023-05-07 09:09:43'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654808342884466689', 'yt_key_point_user_type', '重点人群', '【烟台需求】：居民信息-重点人群', 0, 0, 0, '1', '2023-05-06 19:20:28', '1', '2023-05-06 19:21:01'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813824277757953', 'yt_politics_status', '政治面貌', '【烟台需求】居民信息-政治面貌', 0, 0, 0, '1', '2023-05-06 19:42:15', '1', '2023-05-06 19:42:15'); +INSERT INTO `epmet_admin`.`sys_dict_type` (`id`, `dict_type`, `dict_name`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654809078326312962', 'yt_population_type', '人口类型', '【烟台需求】居民信息-人口类型', 0, 0, 0, '1', '2023-05-06 19:23:24', '1', '2023-05-06 19:23:24'); + + +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837838383628290', 1654829394234654722, '弟', 'di', '0', '', 47, 0, 0, '1', '2023-05-06 21:17:41', '1', '2023-05-06 21:17:41'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837906998247426', 1654829394234654722, '弟媳', 'dixi', '0', '', 48, 0, 0, '1', '2023-05-06 21:17:57', '1', '2023-05-06 21:17:57'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654838406774734850', 1654829394234654722, '独生女', 'dushegnnv', '0', '', 15, 0, 0, '1', '2023-05-06 21:19:56', '1', '2023-05-06 21:19:56'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654831181419200514', 1654829394234654722, '长子', 'eldest_son', '0', '', 7, 0, 0, '1', '2023-05-06 20:51:14', '1', '2023-05-06 20:51:14'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654838530770944002', 1654829394234654722, '二女', 'ernv', '0', '', 15, 0, 0, '1', '2023-05-06 21:20:26', '1', '2023-05-06 21:20:26'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654832115159351297', 1654829394234654722, '五子', 'five_son', '0', '', 11, 0, 0, '1', '2023-05-06 20:54:56', '1', '2023-05-06 20:58:20'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654831817560899585', 1654829394234654722, '四子', 'fourth_son', '0', '', 10, 0, 0, '1', '2023-05-06 20:53:45', '1', '2023-05-06 20:58:10'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835876648927233', 1654829394234654722, '父母', 'fumu', '0', '', 25, 0, 0, '1', '2023-05-06 21:09:53', '1', '2023-05-06 21:09:53'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835969879916545', 1654829394234654722, '父亲', 'fuqin', '0', '', 26, 0, 0, '1', '2023-05-06 21:10:15', '1', '2023-05-06 21:10:15'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836121109741570', 1654829394234654722, '公公', 'gonggong', '0', '', 28, 0, 0, '1', '2023-05-06 21:10:51', '1', '2023-05-06 21:10:51'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654829713467326465', 1654829394234654722, '户主', 'householder', '0', '', 0, 0, 0, '1', '2023-05-06 20:45:24', '1', '2023-05-06 20:46:46'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654830288644816898', 1654829394234654722, '夫', 'hubby', '0', '', 3, 0, 0, '1', '2023-05-06 20:47:41', '1', '2023-05-06 20:47:41'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836063958155265', 1654829394234654722, '母亲', 'muqin', '0', '', 27, 0, 0, '1', '2023-05-06 21:10:38', '1', '2023-05-06 21:10:38'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654838316743999489', 1654829394234654722, '女', 'nv', '0', '', 15, 0, 0, '1', '2023-05-06 21:19:35', '1', '2023-05-06 21:19:35'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654834501059821570', 1654829394234654722, '女婿', 'nvxu', '0', '', 13, 0, 0, '1', '2023-05-06 21:04:25', '1', '2023-05-06 21:04:25'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654830916922195970', 1654829394234654722, '独生子', 'only_child', '0', '', 6, 0, 0, '1', '2023-05-06 20:50:11', '1', '2023-05-06 20:50:11'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837022348230657', 1654829394234654722, '配偶的祖父母或外祖父母', 'peigoudezhufumu', '0', '', 39, 0, 0, '1', '2023-05-06 21:14:26', '1', '2023-05-06 21:14:26'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837542756499457', 1654829394234654722, '配偶的曾祖父母', 'peioudezengzhufuwu', '0', '', 42, 0, 0, '1', '2023-05-06 21:16:30', '1', '2023-05-06 21:16:30'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836180257816578', 1654829394234654722, '婆婆', 'popo', '0', '', 29, 0, 0, '1', '2023-05-06 21:11:05', '1', '2023-05-06 21:11:05'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837996081070082', 1654829394234654722, '迁出或死亡', 'qianchuhuosiwagn', '0', '', 49, 0, 0, '1', '2023-05-06 21:18:18', '1', '2023-05-06 21:18:18'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654834610833145857', 1654829394234654722, '其他儿子', 'qitaerzi', '0', '', 14, 0, 0, '1', '2023-05-06 21:04:51', '1', '2023-05-06 21:05:24'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836584563556354', 1654829394234654722, '其他父母关系', 'qitafumuguanxi', '0', '', 34, 0, 0, '1', '2023-05-06 21:12:42', '1', '2023-05-06 21:12:42'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835786156818433', 1654829394234654722, '其他孙子或外孙子', 'qitasunzi', '0', '', 24, 0, 0, '1', '2023-05-06 21:09:31', '1', '2023-05-06 21:09:31'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837613787037697', 1654829394234654722, '其他祖父母或外祖父母关系', 'qitazhufumu', '0', '', 43, 0, 0, '1', '2023-05-06 21:16:47', '1', '2023-05-06 21:16:47'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654838597863030785', 1654829394234654722, '三女', 'sannv', '0', '', 15, 0, 0, '1', '2023-05-06 21:20:42', '1', '2023-05-06 21:20:42'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837786110017537', 1654829394234654722, '嫂', 'sao', '0', '', 46, 0, 0, '1', '2023-05-06 21:17:28', '1', '2023-05-06 21:17:28'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654831393202192386', 1654829394234654722, '次子', 'second_son', '0', '', 8, 0, 0, '1', '2023-05-06 20:52:04', '1', '2023-05-06 20:52:04'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654838660240719873', 1654829394234654722, '四女', 'sinv', '0', '', 15, 0, 0, '1', '2023-05-06 21:20:57', '1', '2023-05-06 21:20:57'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654830757131796482', 1654829394234654722, '子', 'son', '0', '', 5, 0, 0, '1', '2023-05-06 20:49:32', '1', '2023-05-06 20:49:32'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654829941117370370', 1654829394234654722, '配偶', 'spouse', '0', '', 1, 0, 0, '1', '2023-05-06 20:46:18', '1', '2023-05-06 20:46:58'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835172760829953', 1654829394234654722, '孙女', 'sunnv', '0', '', 17, 0, 0, '1', '2023-05-06 21:07:05', '1', '2023-05-06 21:07:05'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835574851977217', 1654829394234654722, '孙女婿或外孙女婿', 'sunnvxu', '0', '', 21, 0, 0, '1', '2023-05-06 21:08:41', '1', '2023-05-06 21:08:41'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835098777501697', 1654829394234654722, '孙子', 'sunzi', '0', '', 16, 0, 0, '1', '2023-05-06 21:06:48', '1', '2023-05-06 21:06:48'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654834879696420865', 1654829394234654722, '孙子、孙女或外孙子、 外孙女', 'szsnhwszwsn', '0', '', 15, 0, 0, '1', '2023-05-06 21:05:55', '1', '2023-05-06 21:06:05'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654831637797224450', 1654829394234654722, '三子', 'third_son', '0', '', 9, 0, 0, '1', '2023-05-06 20:53:02', '1', '2023-05-06 20:57:59'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835238154223617', 1654829394234654722, '外孙女', 'waisunnv', '0', '', 18, 0, 0, '1', '2023-05-06 21:07:21', '1', '2023-05-06 21:07:21'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835506849726465', 1654829394234654722, '外媳妇或外孙媳妇', 'waisunxifu', '0', '', 20, 0, 0, '1', '2023-05-06 21:08:25', '1', '2023-05-06 21:08:25'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835316738703362', 1654829394234654722, '外孙子', 'waisunzi', '0', '', 19, 0, 0, '1', '2023-05-06 21:07:40', '1', '2023-05-06 21:07:40'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836879225995265', 1654829394234654722, '外祖父', 'waizhufu', '0', '', 37, 0, 0, '1', '2023-05-06 21:13:52', '1', '2023-05-06 21:13:52'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836936633434114', 1654829394234654722, '外祖母', 'waizhumu', '0', '', 38, 0, 0, '1', '2023-05-06 21:14:06', '1', '2023-05-06 21:14:06'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654830377236905985', 1654829394234654722, '妻', 'wife', '0', '', 4, 0, 0, '1', '2023-05-06 20:48:02', '1', '2023-05-06 20:48:09'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837736759836673', 1654829394234654722, '兄', 'xiong', '0', '', 45, 0, 0, '1', '2023-05-06 21:17:16', '1', '2023-05-06 21:17:16'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837671941062658', 1654829394234654722, '兄弟姐妹', 'xiongdijiemei', '0', '', 44, 0, 0, '1', '2023-05-06 21:17:01', '1', '2023-05-06 21:17:01'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836453831294978', 1654829394234654722, '养父或继父', 'yangfuhuojifu', '0', '', 32, 0, 0, '1', '2023-05-06 21:12:11', '1', '2023-05-06 21:12:11'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836517219811330', 1654829394234654722, '养母或继母', 'yangmuhuojimu', '0', '', 33, 0, 0, '1', '2023-05-06 21:12:26', '1', '2023-05-06 21:12:26'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836243453394945', 1654829394234654722, '岳父', 'yuefu', '0', '', 30, 0, 0, '1', '2023-05-06 21:11:20', '1', '2023-05-06 21:11:31'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836362152198145', 1654829394234654722, '岳母', 'yuemu', '0', '', 31, 0, 0, '1', '2023-05-06 21:11:49', '1', '2023-05-06 21:11:49'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654834368284934145', 1654829394234654722, '养子或继子', 'yzhjz', '0', '', 12, 0, 0, '1', '2023-05-06 21:03:53', '1', '2023-05-06 21:04:02'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835725985333249', 1654829394234654722, '曾孙女或曾外孙女', 'zengsunnv', '0', '', 23, 0, 0, '1', '2023-05-06 21:09:17', '1', '2023-05-06 21:09:17'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654835645924458497', 1654829394234654722, '曾孙子或曾外孙子', 'zengsunzi', '0', '', 22, 0, 0, '1', '2023-05-06 21:08:58', '1', '2023-05-06 21:08:58'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837100391645185', 1654829394234654722, '曾祖父', 'zengzhufu', '0', '', 40, 0, 0, '1', '2023-05-06 21:14:45', '1', '2023-05-06 21:14:45'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654837458128027649', 1654829394234654722, '曾祖母', 'zengzhumu', '0', '', 41, 0, 0, '1', '2023-05-06 21:16:10', '1', '2023-05-06 21:16:10'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654838466149302273', 1654829394234654722, '长女', 'zhangnv', '0', '', 15, 0, 0, '1', '2023-05-06 21:20:10', '1', '2023-05-06 21:20:10'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836710568837121', 1654829394234654722, '祖父', 'zhufu', '0', '', 35, 0, 0, '1', '2023-05-06 21:13:12', '1', '2023-05-06 21:13:12'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836785378443265', 1654829394234654722, '祖母', 'zhumu', '0', '', 36, 0, 0, '1', '2023-05-06 21:13:30', '1', '2023-05-06 21:13:30'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654836652540641281', 1654829394234654722, '祖母或外祖母', 'zhumuhuowaizhumu', '0', '', 34, 0, 0, '1', '2023-05-06 21:12:58', '1', '2023-05-06 21:12:58'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017525068120065', 1655017423142338562, '家庭户', 'jiatinghu', '0', '家庭户', 1, 0, 0, '1', '2023-05-07 09:11:41', '1', '2023-05-07 09:12:12'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017594743898113', 1655017423142338562, '集体户', 'jitihu', '0', '集体户', 2, 0, 0, '1', '2023-05-07 09:11:58', '1', '2023-05-07 09:11:58'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017720258445313', 1655017423142338562, '空挂户', 'kongguahu', '0', '空挂户', 3, 0, 0, '1', '2023-05-07 09:12:28', '1', '2023-05-07 09:12:28'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017773593214977', 1655017423142338562, '团结户', 'tuanjiehu', '0', '团结户', 4, 0, 0, '1', '2023-05-07 09:12:41', '1', '2023-05-07 09:12:41'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803510186426370', 1654803329994932225, '身份证号111', '1', '0', '身份证号', 1, 0, 0, '1', '2023-05-06 19:01:16', '1', '2023-05-06 19:05:20'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803553832353793', 1654803329994932225, '护照', '2', '0', '护照', 2, 0, 0, '1', '2023-05-06 19:01:27', '1', '2023-05-06 19:01:27'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803595087527937', 1654803329994932225, '港澳通行证', '3', '0', '港澳通行证', 3, 0, 0, '1', '2023-05-06 19:01:36', '1', '2023-05-06 19:01:36'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803649835778049', 1654803329994932225, '军人证', '4', '0', '军人证', 4, 0, 0, '1', '2023-05-06 19:01:50', '1', '2023-05-06 19:01:50'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803737236684802', 1654803329994932225, '其他', '6', '0', '其他', 6, 0, 0, '1', '2023-05-06 19:02:10', '1', '2023-05-06 19:02:10'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803693234241537', 1654803329994932225, '台胞证', '台胞证', '0', '台胞证', 5, 0, 0, '1', '2023-05-06 19:02:00', '1', '2023-05-06 19:02:00'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017197153239042', 1655017027942432770, '否', '0', '0', '否', 2, 0, 0, '1', '2023-05-07 09:10:23', '1', '2023-05-07 09:10:23'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017153138212865', 1655017027942432770, '是', '1', '0', '是', 1, 0, 0, '1', '2023-05-07 09:10:13', '1', '2023-05-07 09:10:13'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654808917751578626', 1654808342884466689, '监管对象', 'jianguanduixiang', '0', '监管对象', 4, 0, 0, '1', '2023-05-06 19:22:46', '1', '2023-05-06 19:22:46'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654808584195358722', 1654808342884466689, '否', 'no', '0', '', 1, 0, 0, '1', '2023-05-06 19:21:26', '1', '2023-05-06 20:15:33'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654808858024689665', 1654808342884466689, '视线对象', 'shixianduixiang', '0', '', 3, 0, 0, '1', '2023-05-06 19:22:31', '1', '2023-05-06 19:22:31'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654808655167176705', 1654808342884466689, '重点人员', 'zhongdianrenyuan', '0', '', 2, 0, 0, '1', '2023-05-06 19:21:43', '1', '2023-05-06 19:21:43'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654815948533350402', 1654813824277757953, '九三学社社员', 'jsxssy', '0', '九三学社社员', 11, 0, 0, '1', '2023-05-06 19:50:42', '1', '2023-05-06 19:50:42'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654814620180496385', 1654813824277757953, '群众', 'qunzhong', '0', '群众', 1, 0, 0, '1', '2023-05-06 19:45:25', '1', '2023-05-06 19:45:25'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654816041563013121', 1654813824277757953, '台湾民主自治同盟盟员', 'twmzzztmmy', '0', '台湾民主自治同盟盟员', 12, 0, 0, '1', '2023-05-06 19:51:04', '1', '2023-05-06 19:51:04'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654816151323754497', 1654813824277757953, '无党派民主人士', 'wdpmzrs', '0', '无党派民主人士', 13, 0, 0, '1', '2023-05-06 19:51:30', '1', '2023-05-06 19:51:30'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654814740867399682', 1654813824277757953, '中国共产党党员', 'zggcddy', '0', '中国共产党党员', 2, 0, 0, '1', '2023-05-06 19:45:54', '1', '2023-05-06 19:45:54'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654814827379113986', 1654813824277757953, '中国共产党预备党员', 'zggcdybdy', '0', '中国共产党预备党员', 3, 0, 0, '1', '2023-05-06 19:46:14', '1', '2023-05-06 19:46:14'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654814930802262018', 1654813824277757953, '中国共产主义青年团团员', 'zggczyqntty', '0', '中国共产主义青年团团员', 4, 0, 0, '1', '2023-05-06 19:46:39', '1', '2023-05-06 19:46:39'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654815140559405057', 1654813824277757953, '中国国民党革命委员会会员', 'zggmdgmwyhhy', '0', '中国国民党革命委员会会员', 5, 0, 0, '1', '2023-05-06 19:47:29', '1', '2023-05-06 19:47:29'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654815461771788290', 1654813824277757953, '中国民主促进会会员', 'zgmzcjhhy', '0', '中国民主促进会会员', 8, 0, 0, '1', '2023-05-06 19:48:46', '1', '2023-05-06 19:48:46'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654815380884635650', 1654813824277757953, '中国民主建国会会员', 'zgmzghhy', '0', '中国民主建国会会员', 7, 0, 0, '1', '2023-05-06 19:48:26', '1', '2023-05-06 19:48:26'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654815285199978497', 1654813824277757953, '中国民主同盟盟员', 'zgmztmmy', '0', '中国民主同盟盟员', 6, 0, 0, '1', '2023-05-06 19:48:04', '1', '2023-05-06 19:48:04'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654815553366999041', 1654813824277757953, '中国农工民主党党员', 'zgngmzddy', '0', '中国农工民主党党员', 9, 0, 0, '1', '2023-05-06 19:49:08', '1', '2023-05-06 19:49:08'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654815880791146497', 1654813824277757953, '中国致公党党员', 'zgzgddy', '0', '中国致公党党员', 10, 0, 0, '1', '2023-05-06 19:50:26', '1', '2023-05-06 19:50:26'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813111699062786', 1654809078326312962, '常住人口', 'changzhurenkou', '0', '常住人口', 2, 0, 0, '1', '2023-05-06 19:39:25', '1', '2023-05-06 19:39:25'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813223993163777', 1654809078326312962, '户籍常住人口', 'hujichangzhurenkou', '0', '户籍常住人口', 3, 0, 0, '1', '2023-05-06 19:39:52', '1', '2023-05-06 19:39:52'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654812924658270210', 1654809078326312962, '户籍人口', 'hujirenkou', '0', '户籍人口', 1, 0, 0, '1', '2023-05-06 19:38:41', '1', '2023-05-06 19:38:41'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813508635410433', 1654809078326312962, '境外人口', 'jingwairenkou', '0', '境外人口', 7, 0, 0, '1', '2023-05-06 19:41:00', '1', '2023-05-06 19:41:00'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813451265720321', 1654809078326312962, '空挂人口', 'kongguarenkou', '0', '空挂人口', 6, 0, 0, '1', '2023-05-06 19:40:46', '1', '2023-05-06 19:40:46'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813283262873601', 1654809078326312962, '流动人口', 'liudongrenkou', '0', '流动人口', 4, 0, 0, '1', '2023-05-06 19:40:06', '1', '2023-05-06 19:40:06'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813676109774849', 1654809078326312962, '其他', 'other', '0', '其他', 9, 0, 0, '1', '2023-05-06 19:41:40', '1', '2023-05-06 19:41:40'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813338686406658', 1654809078326312962, '外出人口', 'waichurenkou', '0', '外出人口', 5, 0, 0, '1', '2023-05-06 19:40:20', '1', '2023-05-06 19:40:20'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654813576394391553', 1654809078326312962, '未落户人口', 'weiluohurenkou', '0', '未落户人口', 8, 0, 0, '1', '2023-05-06 19:41:16', '1', '2023-05-06 19:41:16'); From 4246c53a0db34b791f2d10046d1db44dd158fc49 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:31:50 +0800 Subject: [PATCH 091/177] =?UTF-8?q?=E9=87=8D=E7=82=B9=E4=BA=BA=E7=BE=A4?= =?UTF-8?q?=E3=80=81=E5=9B=BD=E7=B1=8D=E3=80=81=E4=BA=BA=E5=8F=A3=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=BB=A5=E5=8F=8A=E5=B1=85=E4=BD=8F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E7=AD=89=E7=AD=89=E9=82=A3=E4=B9=88=E9=9C=80=E8=A6=81=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9A=84=E5=AD=97=E6=AE=B5=EF=BC=8C=E8=B5=B0flyway?= =?UTF-8?q?=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0.0.95__modify_icresiuser_for_langchao.sql | 40 +++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.95__modify_icresiuser_for_langchao.sql diff --git a/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.95__modify_icresiuser_for_langchao.sql b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.95__modify_icresiuser_for_langchao.sql new file mode 100644 index 0000000000..0775c35af5 --- /dev/null +++ b/epmet-user/epmet-user-server/src/main/resources/db/migration/V0.0.95__modify_icresiuser_for_langchao.sql @@ -0,0 +1,40 @@ +-- 【1】修改证件号备注 +alter table ic_resi_user MODIFY column `ID_CARD_TYPE` char(1) DEFAULT NULL COMMENT '证件类型。烟台需求：来源于字典表dict_type=yt_id_card_type;1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他'; +-- 【2】居民信息-基础信息增加这些列 +alter table ic_resi_user add column `KEY_POINT_USER_TYPE` VARCHAR(32) DEFAULT NULL COMMENT '烟台需求：重点人群；名称对应字典表，dict_type:yt_key_point_user_type' AFTER CONTACTS_MOBILE; +alter table ic_resi_user ADD column `NATIONALITY` VARCHAR(32) DEFAULT NULL COMMENT '烟台需求：国籍' AFTER KEY_POINT_USER_TYPE; +alter table ic_resi_user ADD column `POPULATION_TYPE` VARCHAR(32) DEFAULT NULL COMMENT '烟台需求：人口类型；名称对应字典表，dict_type:yt_population_type' AFTER NATIONALITY; +alter table ic_resi_user ADD column `POLITICS_STATUS` VARCHAR(32) DEFAULT NULL COMMENT '烟台需求：政治面貌；名称对应字典表，dict_type:yt_politics_status' AFTER POPULATION_TYPE; + + +alter table ic_resi_user add COLUMN YT_YHZGX VARCHAR(64) DEFAULT NULL COMMENT '烟台需求：与户主关系（60）对应字典表dict_type:yt_Householder_relationship_type'after JTXX_REMAKES; + + +-- 【3】居住信息增加一下几列 +alter table ic_resi_user add COLUMN IS_NOW_LIVE VARCHAR(32) DEFAULT NULL COMMENT '烟台需求：是否现居住；0否；1是，对应字典表dict_type:yt_is_now_live' after RHZK; + +alter table ic_resi_user add COLUMN LIVING_PROVINCE VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住省' after IS_NOW_LIVE; +alter table ic_resi_user add COLUMN LIVING_CITY VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住市' after LIVING_PROVINCE; +alter table ic_resi_user add COLUMN LIVING_AREA VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住区' after LIVING_CITY; +alter table ic_resi_user add COLUMN LIVING_STREET VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住街道' after LIVING_AREA; +alter table ic_resi_user add COLUMN LIVING_COMMUNITY VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住社区' after LIVING_STREET; +alter table ic_resi_user add COLUMN LIVING_VILIAGE_NAME VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住小区' after LIVING_COMMUNITY; +alter table ic_resi_user add COLUMN LIVING_BUILDING_NO VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住楼号' after LIVING_VILIAGE_NAME; +alter table ic_resi_user add COLUMN LIVING_UNIT_NO VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住单元号' after LIVING_BUILDING_NO; +alter table ic_resi_user add COLUMN LIVING_HOUSE_NO VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：居住房间号' after LIVING_UNIT_NO; + +alter table ic_resi_user add COLUMN REGISTER_PROVINCE VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍所在省' after LIVING_HOUSE_NO; +alter table ic_resi_user add COLUMN REGISTER_CITY VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍所在市' after REGISTER_PROVINCE; +alter table ic_resi_user add COLUMN REGISTER_AREA VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍所在区县' after REGISTER_CITY; +alter table ic_resi_user add COLUMN REGISTER_STREET VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍所在街道' after REGISTER_AREA; +alter table ic_resi_user add COLUMN REGISTER_COMMUNITY VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍所在社区' after REGISTER_STREET; +alter table ic_resi_user add COLUMN REGISTER_VILIAGE_NAME VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍所在小区名称' after REGISTER_COMMUNITY; +alter table ic_resi_user add COLUMN REGISTER_BUILDING_NO VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍楼号' after REGISTER_VILIAGE_NAME; +alter table ic_resi_user add COLUMN REGISTER_UNIT_NO VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍单元号' after REGISTER_BUILDING_NO; +alter table ic_resi_user add COLUMN REGISTER_HOUSE_NO VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户籍房间号' after REGISTER_UNIT_NO; +alter table ic_resi_user MODIFY COLUMN `HJSZD` varchar(256) DEFAULT NULL COMMENT '户籍所在地;烟台需求：对应户籍详细地址'; + +alter table ic_resi_user add COLUMN HOUSEHOLD_CATEGORY VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户别；对应字典表dict_type:yt_household_category' after REGISTER_HOUSE_NO; +alter table ic_resi_user add COLUMN HOUSE_HOLD_ID VARCHAR(255) DEFAULT NULL COMMENT '烟台需求：户号' after HOUSEHOLD_CATEGORY; + + From c3a7799e8aeaa4df70ee693fc8640e809423fcc2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:34:02 +0800 Subject: [PATCH 092/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E8=A1=A8=E8=B0=83=E6=95=B4=EF=BC=8C=E8=B5=B0flyway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.50__modify_wuye.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.50__modify_wuye.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.50__modify_wuye.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.50__modify_wuye.sql new file mode 100644 index 0000000000..a0cd82c5bd --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.50__modify_wuye.sql @@ -0,0 +1,2 @@ +alter table epmet_gov_org.ic_property_management add COLUMN `CONTACT_NAME` varchar(32) DEFAULT NULL COMMENT '烟台需求：物业联系人姓名' AFTER CUSTOMER_ID; +alter table epmet_gov_org.ic_property_management add COLUMN `CONTACT_MOBILE` varchar(32) DEFAULT NULL COMMENT '烟台需求：物业联系人电话' AFTER CONTACT_NAME; \ No newline at end of file From e96b331b10e3e4f9aa7c0ac0ffb7e86491290493 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 10:36:13 +0800 Subject: [PATCH 093/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E4=BF=A1=E6=81=AF=E8=A1=A8=EF=BC=88=E7=83=9F=E5=8F=B0?= =?UTF-8?q?=EF=BC=89=EF=BC=8C=E5=88=9B=E5=BB=BA=E8=A1=A8=E8=AF=AD=E5=8F=A5?= =?UTF-8?q?=E8=B5=B0flyway?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ....51__create_community_building_manager.sql | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.51__create_community_building_manager.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.51__create_community_building_manager.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.51__create_community_building_manager.sql new file mode 100644 index 0000000000..5d9829210d --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.51__create_community_building_manager.sql @@ -0,0 +1,24 @@ +CREATE TABLE `community_building_manager` ( + `ID` varchar(64) NOT NULL COMMENT '主键（烟台需求）', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户Id customer.id', + `NAME` varchar(64) NOT NULL COMMENT '姓名', + `PHONE` varchar(32) NOT NULL COMMENT '联系电话', + `ID_CARD` varchar(32) NOT NULL COMMENT '身份证号', + `TYPE` varchar(32) NOT NULL COMMENT '类型：0楼长；1单元长', + `DISTRICT_ID` varchar(64) NOT NULL COMMENT '所属区县id；取名字关联customer_agency', + `STREET_ID` varchar(64) NOT NULL COMMENT '所属街道id；取名字关联customer_agency', + `COMMUNITY_ID` varchar(64) NOT NULL COMMENT '所属社区id；取名字关联customer_agency', + `GRID_ID` varchar(64) NOT NULL COMMENT '所属网格id；取名字关联customer_grid', + `ORG_ID_PATH` varchar(512) NOT NULL COMMENT '网格的全路径，包含网格id', + `VILIAGE_ID` varchar(64) NOT NULL COMMENT '所属小区id', + `BUILDING_ID` varchar(64) NOT NULL COMMENT '所属楼栋id', + `UNIT_ID` varchar(64) DEFAULT NULL COMMENT '所属单元id; 单元长时必填此列', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标识', + `REVISION` int(10) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`), + KEY `idx_community_building_manager` (`ORG_ID_PATH`) COMMENT 'org_id_path' +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='楼长单元长信息表（烟台）'; \ No newline at end of file From 111ff0f642d7787bfa1e582b2f5e712e70f90e39 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 11:05:21 +0800 Subject: [PATCH 094/177] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=AF=81=E4=BB=B6?= =?UTF-8?q?=E7=B1=BB=E5=9E=8Bitem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migration/V0.0.41__add_idcardtype_item.sql | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.41__add_idcardtype_item.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.41__add_idcardtype_item.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.41__add_idcardtype_item.sql new file mode 100644 index 0000000000..3d02e58ddd --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.41__add_idcardtype_item.sql @@ -0,0 +1,18 @@ +-- 删除原来的证件类型 +update ic_form_item i set i.DEL_FLAG='1',i.UPDATED_TIME='2023-05-06 01:01:01',i.UPDATED_BY='烟台需求0506' where i.ID='6da7739161d116caacfbb218846ac713'; + +-- 证件类型。1：身份证号；2：护照；3：港澳通行证；4：军人证；5：台胞证；6：其他 +SET @customerId='1535072605621841922'; +set @areaCode ='370600'; +set @formId='20220610103408_1'; +set @itemGroupId='1535072605621841922_0'; + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', '0', '证件类型', 'select', @itemGroupId, 1, '', NULL, 'remote', '/sys/dict/data/dictOption/yt_id_card_type', 801, '请选择证件号类型', 1, 1, 1, 0, 1, 'ID_CARD_TYPE', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + + + + + + From 2d7abb2dcb48525d2416b470408935a2bf4305f1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 11:07:15 +0800 Subject: [PATCH 095/177] =?UTF-8?q?=E5=9B=BD=E7=B1=8D=E3=80=81=E9=87=8D?= =?UTF-8?q?=E7=82=B9=E4=BA=BA=E7=BE=A4=E3=80=81=E4=BA=BA=E5=8F=A3=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E3=80=81=E6=94=BF=E6=B2=BB=E9=9D=A2=E8=B2=8C4?= =?UTF-8?q?=E4=B8=AAitem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.42__add_guoji4item.sql | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.42__add_guoji4item.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.42__add_guoji4item.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.42__add_guoji4item.sql new file mode 100644 index 0000000000..673e8e6905 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.42__add_guoji4item.sql @@ -0,0 +1,26 @@ +-- 烟台 +SET @customerId='1535072605621841922'; +set @areaCode ='370600'; +set @formId='20220610103408_1'; +set @itemGroupId='1535072605621841922_0'; + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', '0', '重点人群', 'select', @itemGroupId, 0, '', NULL, 'remote', '/sys/dict/data/dictOption/yt_key_point_user_type', 1301, '请选择', 1, 1, 1, 0, 1, 'KEY_POINT_USER_TYPE', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', '0', '国籍', 'input', @itemGroupId, 0, '', NULL, '', '', 1302, '请选择', 1, 1, 1, 0, 1, 'NATIONALITY', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', '0', '人口类型', 'select', @itemGroupId, 1, '', NULL, 'remote', '/sys/dict/data/dictOption/yt_population_type', 1303, '请选择', 1, 1, 1, 0, 1, 'POPULATION_TYPE', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', '0', '政治面貌', 'select', @itemGroupId, 0, '', NULL, 'remote', '/sys/dict/data/dictOption/yt_politics_status', 1304, '请选择', 1, 1, 1, 0, 1, 'POLITICS_STATUS', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + + From 43ee441e44585ec116776ef0d440d1fa94821334 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 11:09:44 +0800 Subject: [PATCH 096/177] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BA=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=EF=BC=8C=E8=BA=AB=E4=BB=BD=E8=AF=81=EF=BC=9B=E5=8F=B0?= =?UTF-8?q?=E8=83=9E=E8=AF=815?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.27__add_dict_for_langchao.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql index 33cea85fe6..6e17ec0ce3 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.27__add_dict_for_langchao.sql @@ -67,12 +67,12 @@ INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, ` INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017594743898113', 1655017423142338562, '集体户', 'jitihu', '0', '集体户', 2, 0, 0, '1', '2023-05-07 09:11:58', '1', '2023-05-07 09:11:58'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017720258445313', 1655017423142338562, '空挂户', 'kongguahu', '0', '空挂户', 3, 0, 0, '1', '2023-05-07 09:12:28', '1', '2023-05-07 09:12:28'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017773593214977', 1655017423142338562, '团结户', 'tuanjiehu', '0', '团结户', 4, 0, 0, '1', '2023-05-07 09:12:41', '1', '2023-05-07 09:12:41'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803510186426370', 1654803329994932225, '身份证号111', '1', '0', '身份证号', 1, 0, 0, '1', '2023-05-06 19:01:16', '1', '2023-05-06 19:05:20'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803510186426370', 1654803329994932225, '身份证号', '1', '0', '身份证号', 1, 0, 0, '1', '2023-05-06 19:01:16', '1', '2023-05-06 19:05:20'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803553832353793', 1654803329994932225, '护照', '2', '0', '护照', 2, 0, 0, '1', '2023-05-06 19:01:27', '1', '2023-05-06 19:01:27'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803595087527937', 1654803329994932225, '港澳通行证', '3', '0', '港澳通行证', 3, 0, 0, '1', '2023-05-06 19:01:36', '1', '2023-05-06 19:01:36'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803649835778049', 1654803329994932225, '军人证', '4', '0', '军人证', 4, 0, 0, '1', '2023-05-06 19:01:50', '1', '2023-05-06 19:01:50'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803737236684802', 1654803329994932225, '其他', '6', '0', '其他', 6, 0, 0, '1', '2023-05-06 19:02:10', '1', '2023-05-06 19:02:10'); -INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803693234241537', 1654803329994932225, '台胞证', '台胞证', '0', '台胞证', 5, 0, 0, '1', '2023-05-06 19:02:00', '1', '2023-05-06 19:02:00'); +INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654803693234241537', 1654803329994932225, '台胞证', '5', '0', '台胞证', 5, 0, 0, '1', '2023-05-06 19:02:00', '1', '2023-05-06 19:02:00'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017197153239042', 1655017027942432770, '否', '0', '0', '否', 2, 0, 0, '1', '2023-05-07 09:10:23', '1', '2023-05-07 09:10:23'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1655017153138212865', 1655017027942432770, '是', '1', '0', '是', 1, 0, 0, '1', '2023-05-07 09:10:13', '1', '2023-05-07 09:10:13'); INSERT INTO `epmet_admin`.`sys_dict_data` (`id`, `dict_type_id`, `dict_label`, `dict_value`, `dict_p_value`, `remark`, `sort`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1654808917751578626', 1654808342884466689, '监管对象', 'jianguanduixiang', '0', '监管对象', 4, 0, 0, '1', '2023-05-06 19:22:46', '1', '2023-05-06 19:22:46'); From be50f2713410b025975f4ba73afee86c573b893f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 11:12:02 +0800 Subject: [PATCH 097/177] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E4=BF=A1=E6=81=AF-?= =?UTF-8?q?=E5=A9=9A=E5=A7=BB=E7=8A=B6=E5=86=B5=E5=A2=9E=E5=8A=A02?= =?UTF-8?q?=E4=B8=AA=E4=B8=8B=E6=8B=89=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.43__add_jiatingxinxi.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.43__add_jiatingxinxi.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.43__add_jiatingxinxi.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.43__add_jiatingxinxi.sql new file mode 100644 index 0000000000..3645218aa3 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.43__add_jiatingxinxi.sql @@ -0,0 +1,17 @@ +-- 与业主关系 +set @huzhuItemId='20220610103408_1066'; +update ic_form_item i set i.LABEL='与业主关系',i.UPDATED_BY='烟台需求0506',i.UPDATED_TIME='2023-05-06 01:01:01' where i.ID=@huzhuItemId; + + + +-- 婚姻状况增加2个下拉值 +SET @customerId='1535072605621841922'; +set @formId='20220610103408_1'; +set @hunyinItemId='20220610103408_1068'; +INSERT INTO `epmet_oper_customize`.`ic_form_item_options` (`ID`, `CUSTOMER_ID`, `FORM_ID`, `FORM_CODE`, `ITEM_ID`, `OPTION_LABEL`, `OPTION_VALUE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @formId, 'resi_base_info', @hunyinItemId, '丧偶', 'sangou', 6, 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item_options` (`ID`, `CUSTOMER_ID`, `FORM_ID`, `FORM_CODE`, `ITEM_ID`, `OPTION_LABEL`, `OPTION_VALUE`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @formId, 'resi_base_info', @hunyinItemId, '未说明的婚姻状况', 'no_desc', 7, 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + From 09366a89fe476c31f146ba9701451becc7a84e16 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 11:14:14 +0800 Subject: [PATCH 098/177] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=8E=E6=88=B7?= =?UTF-8?q?=E4=B8=BB=E5=85=B3=E7=B3=BB=EF=BC=8860=EF=BC=89=E4=B8=AA?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.44__add_huzhuguanxi.sql | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.44__add_huzhuguanxi.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.44__add_huzhuguanxi.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.44__add_huzhuguanxi.sql new file mode 100644 index 0000000000..e20706ee8d --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.44__add_huzhuguanxi.sql @@ -0,0 +1,12 @@ +-- 家庭信息信息增加与户主关系 +SET @customerId='1535072605621841922'; +set @areaCode ='370600'; +set @formId='20220610103408_1'; +set @itemGroupId='20220610103408_108'; +set @parentItemId='20220610103408_0'; + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', '0', '与户主关系', 'select', @itemGroupId, 1, '', NULL, 'remote', '/sys/dict/data/dictOption/yt_Householder_relationship_type', 201, '请选择', 1, 1, 1, 0, 1, 'YT_YHZGX', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + + From dc60431e123293f5929224b9eb8ef2decfc9eba8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 11:16:08 +0800 Subject: [PATCH 099/177] =?UTF-8?q?=E5=B1=85=E4=BD=8F=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=96=B0=E5=A2=9E21=E4=B8=AA=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.45__add_juzhuxinxi.sql | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.45__add_juzhuxinxi.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.45__add_juzhuxinxi.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.45__add_juzhuxinxi.sql new file mode 100644 index 0000000000..5f4b816e04 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.45__add_juzhuxinxi.sql @@ -0,0 +1,79 @@ +-- 居住信息增加21列 +SET @customerId='1535072605621841922'; +set @areaCode ='370600'; +set @formId='20220610103408_1'; +set @itemGroupId='20220610103408_107'; +set @parentItemId ='20220610103408_0'; + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '是否现居住', 'radio', @itemGroupId, 0, NULL, NULL, 'remote', '/sys/dict/data/dictOption/yt_is_now_live', 401, NULL, 0, 0, 0, 0, 1, 'IS_NOW_LIVE', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住省', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 402, NULL, 0, 0, 0, 0, 1, 'LIVING_PROVINCE', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住市', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 403, NULL, 0, 0, 0, 0, 1, 'LIVING_CITY', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住区', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 404, NULL, 0, 0, 0, 0, 1, 'LIVING_AREA', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住街道', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 405, NULL, 0, 0, 0, 0, 1, 'LIVING_STREET', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住社区', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 406, NULL, 0, 0, 0, 0, 1, 'LIVING_COMMUNITY', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住小区', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 407, NULL, 0, 0, 0, 0, 1, 'LIVING_VILIAGE_NAME', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住楼号', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 408, NULL, 0, 0, 0, 0, 1, 'LIVING_BUILDING_NO', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住单元号', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 409, NULL, 0, 0, 0, 0, 1, 'LIVING_UNIT_NO', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '居住房间号', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 410, NULL, 0, 0, 0, 0, 1, 'LIVING_HOUSE_NO', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍所在省', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 411, NULL, 0, 0, 0, 0, 1, 'REGISTER_PROVINCE', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍所在市', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 412, NULL, 0, 0, 0, 0, 1, 'REGISTER_CITY', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍所在区县', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 413, NULL, 0, 0, 0, 0, 1, 'REGISTER_AREA', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍所在街道', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 414, NULL, 0, 0, 0, 0, 1, 'REGISTER_STREET', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍所在社区', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 415, NULL, 0, 0, 0, 0, 1, 'REGISTER_COMMUNITY', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍所在小区', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 416, NULL, 0, 0, 0, 0, 1, 'REGISTER_VILIAGE_NAME', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍楼号', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 417, NULL, 0, 0, 0, 0, 1, 'REGISTER_BUILDING_NO', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍单元号', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 418, NULL, 0, 0, 0, 0, 1, 'REGISTER_UNIT_NO', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户籍房间号', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 419, NULL, 0, 0, 0, 0, 1, 'REGISTER_HOUSE_NO', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户别', 'select', @itemGroupId, 0, NULL, NULL, 'remote', '/sys/dict/data/dictOption/yt_household_category', 420, NULL, 0, 0, 0, 0, 1, 'HOUSEHOLD_CATEGORY', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); + +INSERT INTO `epmet_oper_customize`.`ic_form_item` (`ID`, `CUSTOMER_ID`, `AREA_CODE`, `FORM_ID`, `FORM_CODE`, `PARENT_ITEM_ID`, `LABEL`, `ITEM_TYPE`, `ITEM_GROUP_ID`, `REQUIRED`, `VALID_TYPE`, `DEFAULT_VALUE`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_VALUE`, `SORT`, `PLACEHOLDER`, `SEARCH_DISPLAY`, `LIST_DISPLAY`, `ZHZL_LIST_DISPLAY`, `DATA_ANALYSE`, `EXPORT_FLAG`, `COLUMN_NAME`, `COLUMN_NUM`, `DYNAMIC`, `MULTI_SELECT`, `POLICY_FLAG`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) +VALUES (UUID(), @customerId, @areaCode, @formId, 'resi_base_info', @parentItemId, '户号', 'input', @itemGroupId, 0, NULL, NULL, 'local', '', 421, NULL, 0, 0, 0, 0, 1, 'HOUSE_HOLD_ID', 0, 1, 0, '1', 0, 0, '烟台需求0506', '2023-05-06 01:01:01', '烟台需求0506', '2023-05-06 01:01:01'); \ No newline at end of file From eee252b0eb40ac46a23e7287b6722c23dab48ad4 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Sun, 7 May 2023 14:25:46 +0800 Subject: [PATCH 100/177] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/AgencyServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java index a972cd9797..b39c2e9d66 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java @@ -167,6 +167,12 @@ public class AgencyServiceImpl implements AgencyService { originalEntity.setContacts(formDTO.getContacts()); originalEntity.setMobile(formDTO.getMobile()); originalEntity.setRemark(formDTO.getRemark()); + originalEntity.setSecretaryName(formDTO.getSecretaryName()); + originalEntity.setSecretaryMobile(formDTO.getSecretaryMobile()); + originalEntity.setDutyMobile(formDTO.getDutyMobile()); + originalEntity.setUnifiedSocialCreditCode(formDTO.getUnifiedSocialCreditCode()); + originalEntity.setUnifiedSocialCreditCodeCertificate(formDTO.getUnifiedSocialCreditCodeCertificate()); + originalEntity.setFullAddress(formDTO.getFullAddress()); //利用mybatis 拦截器填充值 originalEntity.setUpdatedTime(null); originalEntity.setUpdatedBy(null); From 7a8cd6135ceca65541112a87c8c5e2b670eca681 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Sun, 7 May 2023 14:39:47 +0800 Subject: [PATCH 101/177] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=EF=BC=8C=E4=B8=BA=E6=B5=AA=E6=BD=AE=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BA=86=E5=BE=88=E5=A4=9A=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 75776 -> 77824 bytes .../excel/ic_resi_import_template_bak0507.xls | Bin 0 -> 75776 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_bak0507.xls diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index fc10d33a70cdcdd919c973abd4d2f66f973b99b0..1eb11e2f002f1b8c235f38ee57af2c189cbd5bea 100644 GIT binary patch delta 6580 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 Bq__Y8 delta 4637 zcmb7|3s98T701uLyRhu?elM_#sQ5$$frua?YN8!)Hd1-MiW!5lg39?`oG^U7s+HCd*DdQfS9FCQ&-G1l(#;$JfJI&?jP@D$5 z!2PDa&X}F^-Mo@ZJVDUizDx2e4JAe-h6k}`@pxPUTcwpPB5PEP_;%cA*WVLA zH}gBQMQ2W2M$2N%P6oEH*j942u%UcjS#|NUEt@Esc2r76TVj{Fv15wm64*QVinOEHnSuB#e0$ZVV73@@7Xmcp%a3)m-X(-!77MJfmFK z*1SR7r~}EZ*Nb!dp`tr~h@r)MCpxx?fP#;#oLF$(r`0-QC652CJ6_<`+sLcTc*zx6 zSjqGO1!Rw@c@F)UW>yAdfIHvM=TR`duf zBJ!tcnmZZy1_glJ{efu7VY(2ZL_y-DEj%&GBa4Pi+XhW1M(J44(rY>+QCh|N(xEkD zJv!qc^U`E~C=)^Q8t;)Nqb=umTaf~CTak*ELDLFA`5ef7P4vjq!9JQiOf;5;8na=q z8C(Q=Lzzw7DBT>`Od;rz<1ySTMeD+t)@BM&!ZNgbg)~|3W`w_3$iF01hOiM1I3E67e8q2n`j*R z64Vokw1&ngN`h>xqVb?Uy=2fhB})M%DoO<EAP!a&)I!a-9N zMS!MB3PW6S#90eX2X>JSWESt1B?w2Eo~;p$W#JwZd(F?*hL<_mM9+H$#F+loe|rY)Dj;b>*=#!BLi-4xB`%H*HSetGK1d?q+qW(FYz zWY`nJT?Q#39A%ghC2J8yh#eUPgx$}^DjD=5wYr$*qUM@R)=XqwC=?A9aYN0>N7)mF zOV-i2WF3P`))un3j#Uh1p~qN=c4%p15Iz}t{KflKF(SEUgbs(eI8v1qDyP#y<^@;D zI*=kfSnL|PX1&R@A77>kn}{}V#aG7z*L$zo zb*xOpZYg`_T`5Nkf(>lDkr^NbbtgzITt@m6wz-6tv7$^m<;9 zDB9Dm>y7`TyF0`$?KAn7H?SQ!OziyqQgP+h_5p9p-Hsa5on1r^_7K&*qj_Y>zH%L_ z5f!I~iP0Sy&+L`u%4F%4T1C<;*ndyNORv-`l3rP%NP49~k@SkazgHTSPkU*Nq=lioqSz-K$9-c(BQH*qx(tHO-hRg}Dy8 zI(+znBfTEKGeB>@EfSkdqWrOs>5s?p)%ORYMSs#f?l^IU*>CRfZU z7=&c;PzY#}>(c3>P}6@tMGpUssP=;9>V!)}bgWerTz9opiKN~J&(H#N6%vWA6{nzbo4=P`=WPqmWp5B9B4Wm@!~wdS`ni zyC;_S>=O5zQ{Q4^!sX8Z^4^IMc>{MF?l(UuW`|k3JxGjQwWsqhoULGNy>qgj$z%T6 zB71}LuAWUv->3r65AUeg6#0X2ihF`H0Q56OfuPNu4PNZOft>q^yWJ_y-Qg^fap%!+ zmd|;-XunqPtdC$nH}H7*HYdEd+wmO$ZvsmUWDt%N+Q{?Xb_ zYdrgn&e<@6;oGFsG?J}i&aH#lNT*{oGw&M0^v=Db*j{hidj>z=bY_iaP0WytKN L()m#Wo2mal^v>~G diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_bak0507.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template_bak0507.xls new file mode 100644 index 0000000000000000000000000000000000000000..fc10d33a70cdcdd919c973abd4d2f66f973b99b0 GIT binary patch literal 75776 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�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 d3ik|sPWAd{=&~Z2KlAl7NlVXu{< Date: Mon, 8 May 2023 13:34:31 +0800 Subject: [PATCH 102/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=87=BA+=E4=B8=8B=E8=BD=BD=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcPropertyManagementDTO.java | 28 +++++ .../dto/form/IcPropertyManagementFormDTO.java | 13 +- .../PropertyManagementController.java | 114 +++++++++++++++++- .../epmet/dao/IcNeighborHoodPropertyDao.java | 10 +- .../service/PropertyManagementService.java | 17 ++- .../impl/PropertyManagementServiceImpl.java | 32 ++++- .../yantai/ic_property_management_temp.xlsx | Bin 0 -> 10172 bytes .../mapper/IcNeighborHoodPropertyDao.xml | 14 ++- 8 files changed, 205 insertions(+), 23 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index 171cbeb01c..6190e3d6d1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -17,6 +17,10 @@ package com.epmet.dto; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -37,58 +41,82 @@ public class IcPropertyManagementDTO implements Serializable { /** * 物业id */ + @ExcelIgnore private String id; /** * 物业名称 */ + @ExcelProperty(value = "物业名称") + @ColumnWidth(30) private String name; /** * 客户id */ + @ExcelIgnore private String customerId; /** * 烟台需求：物业联系人姓名 */ + @ExcelProperty(value = "物业联系人") + @ColumnWidth(30) private String contactName; /** * 烟台需求：物业联系人电话 */ + @ExcelProperty(value = "联系电话") + @ColumnWidth(30) private String contactMobile; + /** + * 导出时候用 + * 该物业关联的小区 + */ + @JsonIgnore + @ExcelProperty(value = "关联小区") + @ColumnWidth(60) + private String neighborHoodNames; + /** * 删除标识 0未删除、1已删除 */ + @ExcelIgnore private String delFlag; /** * 乐观锁 */ + @ExcelIgnore private Integer revision; /** * 创建人 */ + @ExcelIgnore private String createdBy; /** * 创建时间 */ + @ExcelIgnore private Date createdTime; /** * 更新人 */ + @ExcelIgnore private String updatedBy; /** * 更新时间 */ + @ExcelIgnore private Date updatedTime; /** * 关联的小区数量 */ + @ExcelIgnore private Integer totalNeighborHood; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java index 220a2b7488..938307b9b3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java @@ -17,17 +17,17 @@ package com.epmet.dto.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; import lombok.Data; import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.io.Serializable; @Data -public class IcPropertyManagementFormDTO implements Serializable { +public class IcPropertyManagementFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -40,8 +40,8 @@ public class IcPropertyManagementFormDTO implements Serializable { public interface UpdateShowGroup extends CustomerClientShowGroup { } - public interface PageGroup extends CustomerClientShowGroup { - } + // public interface PageGroup extends CustomerClientShowGroup { + // } @NotBlank(message = "物业id不能为空", groups = {DeleteGroup.class, UpdateShowGroup.class}) private String id; @@ -66,9 +66,4 @@ public class IcPropertyManagementFormDTO implements Serializable { private String customerId; - @NotNull(message = "pageNo不能为空", groups = PageGroup.class) - private Integer pageNo; - @NotNull(message = "pageSize不能为空", groups = PageGroup.class) - private Integer pageSize; - } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index d65ba66296..09c1266eec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -17,21 +17,44 @@ package com.epmet.controller; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.write.metadata.WriteSheet; +import com.alibaba.excel.write.metadata.style.WriteCellStyle; +import com.alibaba.excel.write.style.HorizontalCellStyleStrategy; +import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetErrorCode; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; import com.epmet.service.PropertyManagementService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.io.IOUtils; +import org.apache.poi.ss.usermodel.IndexedColors; +import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.http.HttpHeaders; +import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.InputStream; +import java.io.PrintWriter; +import java.net.URLEncoder; +import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -43,6 +66,7 @@ import java.util.Map; * @author generator generator@elink-cn.com * @since v1.0.0 2021-10-25 */ +@Slf4j @RestController @RequestMapping("propertymanagement") public class PropertyManagementController { @@ -55,9 +79,8 @@ public class PropertyManagementController { */ @PostMapping("page") public Result> page(@RequestBody IcPropertyManagementFormDTO formDTO){ - ValidatorUtils.validateEntity(formDTO,IcPropertyManagementFormDTO.PageGroup.class); return new Result>().ok(propertyManagementService.page(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getName(), - formDTO.getContactName(),formDTO.getContactMobile())); + formDTO.getContactName(),formDTO.getContactMobile(),"page-query")); } /** @@ -112,4 +135,83 @@ public class PropertyManagementController { return new Result(); } + /** + * 物业管理-下载导入模板 + * @param response + * @throws IOException + */ + @RequestMapping(value = "download-tem", method = {RequestMethod.GET, RequestMethod.POST}) + public void downloadTemplate(HttpServletResponse response) throws IOException { + response.setCharacterEncoding("UTF-8"); + response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); + //response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.ms-excel"); + response.setHeader(HttpHeaders.CONTENT_TYPE, "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); + response.setHeader(HttpHeaders.CONTENT_DISPOSITION, "attachment;filename=" + URLEncoder.encode("物业管理导入模版", "UTF-8") + ".xlsx"); + + InputStream is = this.getClass().getClassLoader().getResourceAsStream("excel/ic_property_management_temp.xlsx"); + try { + ServletOutputStream os = response.getOutputStream(); + IOUtils.copy(is, os); + } finally { + if (is != null) { + is.close(); + } + } + } + + + /** + * 物业管理-列表导出 + * + * @param tokenDto + * @param formDTO + * @param response + * @return + * @throws IOException + */ + @PostMapping("export") + public void exportEnterprise(@LoginUser TokenDto tokenDto, @RequestBody IcPropertyManagementFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + ExcelWriter excelWriter = null; + formDTO.setPageNo(NumConstant.ONE); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + try { + String fileName = "物业管理" + DateUtils.format(new Date()) + ".xlsx"; + WriteCellStyle headWriteCellStyle = new WriteCellStyle(); + headWriteCellStyle.setFillForegroundColor(IndexedColors.PALE_BLUE.getIndex()); + WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); + contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); + HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + FreezeAndFilter writeHandler = new FreezeAndFilter(); + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), IcPropertyManagementDTO.class) + .registerWriteHandler(horizontalCellStyleStrategy) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .registerWriteHandler(writeHandler).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + do { + data = propertyManagementService.page(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getName(), formDTO.getContactName(), formDTO.getContactMobile(),"export"); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(data.getList(), writeSheet); + } while (CollectionUtils.isNotEmpty(data.getList()) && data.getList().size() == formDTO.getPageSize()); + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "application/json; charset=UTF-8"); + PrintWriter printWriter = response.getWriter(); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); + printWriter.write(JSON.toJSONString(result)); + printWriter.close(); + } catch (Exception e) { + log.error("物业管理导出异常export exception", e); + } finally { + if (excelWriter != null) { + excelWriter.finish(); + } + } + } + + + + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java index 79a71a11b8..0d27ae9d56 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodPropertyDao.java @@ -18,9 +18,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.entity.IcNeighborHoodPropertyEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 小区物业关系表 * @@ -29,5 +32,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcNeighborHoodPropertyDao extends BaseDao { - + /** + * 查询物业下的小区名称 + * @param propertyId 物业id + * @return + */ + List getNeighborHoodList(String propertyId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index cae9715bd1..949269d16f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -39,5 +39,20 @@ public interface PropertyManagementService { void update(IcPropertyManagementFormDTO formDTO); void delete(IcPropertyManagementFormDTO formDTO); - PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile); + /** + * 物业管理-列表查询 + * @param pageNo + * @param pageSize + * @param name 物业名称 + * @param contactName 物业联系人 + * @param contactMobile 联系电话 + * @param queryType 列表查询：page-query；导出：export + * @return + */ + PageData page(Integer pageNo, + Integer pageSize, + String name, + String contactName, + String contactMobile, + String queryType); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index e816556e07..a61155a910 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.page.PageData; @@ -9,6 +10,7 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dao.IcNeighborHoodPropertyDao; import com.epmet.dao.IcPropertyManagementDao; +import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; @@ -18,6 +20,8 @@ import com.epmet.service.PropertyManagementService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -25,6 +29,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.stream.Collectors; @Slf4j @Service @@ -113,16 +118,33 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 物业管理-列表查询 + * * @param pageNo * @param pageSize - * @param name + * @param name 物业名称 + * @param contactName 物业联系人 + * @param contactMobile 联系电话 + * @param queryType 列表查询：page-query；导出：export * @return */ @Override - public PageData page(Integer pageNo, Integer pageSize, String name,String contactName,String contactMobile) { - PageHelper.startPage(pageNo,pageSize); - List list=icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(),name,contactName,contactMobile); + public PageData page(Integer pageNo, Integer pageSize, String name, String contactName, String contactMobile, String queryType) { + PageHelper.startPage(pageNo, pageSize); + List list = icPropertyManagementDao.queryList(EpmetRequestHolder.getLoginUserCustomerId(), name, contactName, contactMobile); PageInfo pageInfo = new PageInfo<>(list); - return new PageData<>(list, pageInfo.getTotal(),pageSize); + // 导出时需要导出关联的小区名称 + if ("export".equals(queryType)) { + pageInfo.getList().forEach(result -> { + List neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(result.getId()); + List neighborHoodNames = neighborHoodList.stream() + .map(IcNeighborHoodDTO::getNeighborHoodName) + .distinct().collect(Collectors.toList()); + result.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); + }); + } + return new PageData<>(list, pageInfo.getTotal(), pageSize); } + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/ic_property_management_temp.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..f0611d26b02afacb2c68d0be54f50c135b9baf1c GIT binary patch literal 10172 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 IC^CqL5o;)^2Cb=%kq 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 literal 0 HcmV?d00001 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml index 749861cc9a..db8211a0ce 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml @@ -15,5 +15,17 @@ - + \ No newline at end of file From 96a1c8e62806e143fb7a8b4dce0655c6ddadc6a4 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 14:10:55 +0800 Subject: [PATCH 103/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/IcPropertyManagementDTO.java | 4 + .../dto/form/IcPropertyManagementFormDTO.java | 7 ++ .../PropertyManagementController.java | 14 ++++ .../service/PropertyManagementService.java | 7 ++ .../impl/PropertyManagementServiceImpl.java | 78 +++++++++++++++---- .../mapper/IcNeighborHoodPropertyDao.xml | 2 +- 6 files changed, 97 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index 6190e3d6d1..5a34eab3cb 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -25,6 +25,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -79,6 +80,9 @@ public class IcPropertyManagementDTO implements Serializable { @ColumnWidth(60) private String neighborHoodNames; + @ExcelIgnore + List neighborHoodList; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java index 938307b9b3..0b3f3ea9b4 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPropertyManagementFormDTO.java @@ -24,6 +24,7 @@ import org.hibernate.validator.constraints.Length; import javax.validation.constraints.NotBlank; import java.io.Serializable; +import java.util.List; @Data @@ -64,6 +65,12 @@ public class IcPropertyManagementFormDTO extends PageFormDTO implements Serializ @Length(max = 30, message = "联系电话不能超过30个字",groups = {AddShowGroup.class, UpdateShowGroup.class}) private String contactMobile; + /** + * 管理小区id + */ + private List neighborHoodIdList; + + private String customerId; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 09c1266eec..e7175b3e82 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -42,6 +42,7 @@ import com.epmet.service.PropertyManagementService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; @@ -211,6 +212,19 @@ public class PropertyManagementController { } } + /** + * 获取物业详情 + * + * @param id + * @return + */ + @PostMapping("detail/{id}") + public Result getDetail(@PathVariable("id") String id) { + if (StringUtils.isBlank(id)) { + return new Result<>(); + } + return new Result().ok(propertyManagementService.getDetail(id)); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index 949269d16f..4e6e1a71e4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -55,4 +55,11 @@ public interface PropertyManagementService { String contactName, String contactMobile, String queryType); + + /** + * 查看物业详情 + * @param id + * @return + */ + IcPropertyManagementDTO getDetail(String id); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index a61155a910..324f9e3fff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -35,6 +35,9 @@ import java.util.stream.Collectors; @Service public class PropertyManagementServiceImpl implements PropertyManagementService { + /** + * 物业表 + */ @Resource private IcPropertyManagementDao icPropertyManagementDao; @Resource @@ -62,43 +65,68 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 新增物业 * 名称客户下唯一 + * * @param formDTO * @return */ @Override @Transactional(rollbackFor = Exception.class) public String add(IcPropertyManagementFormDTO formDTO) { - //物业名字平台内唯一 - //如果输入的物业名字已经存在，直接返回物业id + // 物业名字平台内唯一 + // 如果输入的物业名字已经存在，直接返回物业id formDTO.setName(formDTO.getName().trim()); - IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(formDTO.getCustomerId(),formDTO.getName(),null); + IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(formDTO.getCustomerId(), formDTO.getName(), null); if (null != entity) { - return entity.getId(); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业名称已存在", "物业名称已存在"); } IcPropertyManagementEntity icPropertyManagementEntity = ConvertUtils.sourceToTarget(formDTO, IcPropertyManagementEntity.class); icPropertyManagementDao.insert(icPropertyManagementEntity); + if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) { + formDTO.getNeighborHoodIdList().forEach(neighborHoodId -> { + // 插入小区物业关系表 + IcNeighborHoodPropertyEntity neighborHoodPropertyEntity = new IcNeighborHoodPropertyEntity(); + neighborHoodPropertyEntity.setPropertyId(icPropertyManagementEntity.getId()); + neighborHoodPropertyEntity.setNeighborHoodId(neighborHoodId); + icNeighborHoodPropertyDao.insert(neighborHoodPropertyEntity); + }); + } return icPropertyManagementEntity.getId(); } /** * 物业管理-修改 + * * @param formDTO */ @Override @Transactional(rollbackFor = Exception.class) public void update(IcPropertyManagementFormDTO formDTO) { - IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(EpmetRequestHolder.getLoginUserCustomerId(),formDTO.getName(),formDTO.getId()); + IcPropertyManagementEntity entity = icPropertyManagementDao.selectByName(EpmetRequestHolder.getLoginUserCustomerId(), formDTO.getName(), formDTO.getId()); if (null != entity) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业名称已存在","物业名称已存在"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业名称已存在", "物业名称已存在"); + } + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcPropertyManagementEntity::getId, formDTO.getId()) + .set(IcPropertyManagementEntity::getName, formDTO.getName()) + .set(IcPropertyManagementEntity::getContactName, formDTO.getContactName()) + .set(IcPropertyManagementEntity::getContactMobile, formDTO.getContactMobile()) + .set(IcPropertyManagementEntity::getUpdatedTime, new Date()) + .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icPropertyManagementDao.update(null, updateWrapper); + if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) { + formDTO.getNeighborHoodIdList().forEach(neighborHoodId -> { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) + .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, neighborHoodId); + if (icNeighborHoodPropertyDao.selectCount(queryWrapper) < 1) { + // 插入小区物业关系表 + IcNeighborHoodPropertyEntity neighborHoodPropertyEntity = new IcNeighborHoodPropertyEntity(); + neighborHoodPropertyEntity.setPropertyId(formDTO.getId()); + neighborHoodPropertyEntity.setNeighborHoodId(neighborHoodId); + icNeighborHoodPropertyDao.insert(neighborHoodPropertyEntity); + } + }); } - LambdaUpdateWrapper updateWrapper=new LambdaUpdateWrapper<>(); - updateWrapper.eq(IcPropertyManagementEntity::getId,formDTO.getId()) - .set(IcPropertyManagementEntity::getName,formDTO.getName()) - .set(IcPropertyManagementEntity::getContactName,formDTO.getContactName()) - .set(IcPropertyManagementEntity::getContactMobile,formDTO.getContactMobile()) - .set(IcPropertyManagementEntity::getUpdatedTime,new Date()) - .set(IcPropertyManagementEntity::getUpdatedBy,EpmetRequestHolder.getLoginUserId()); - icPropertyManagementDao.update(null,updateWrapper); } /** @@ -140,11 +168,33 @@ public class PropertyManagementServiceImpl implements PropertyManagementService .map(IcNeighborHoodDTO::getNeighborHoodName) .distinct().collect(Collectors.toList()); result.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); + result.setNeighborHoodList(neighborHoodList); }); } return new PageData<>(list, pageInfo.getTotal(), pageSize); } + /** + * 查看物业详情 + * + * @param id + * @return + */ + @Override + public IcPropertyManagementDTO getDetail(String id) { + IcPropertyManagementEntity icPropertyManagementEntity = icPropertyManagementDao.selectById(id); + if (null == icPropertyManagementEntity) { + return null; + } + IcPropertyManagementDTO resultDto = ConvertUtils.sourceToTarget(icPropertyManagementEntity, IcPropertyManagementDTO.class); + List neighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id); + List neighborHoodNames = neighborHoodList.stream() + .map(IcNeighborHoodDTO::getNeighborHoodName) + .distinct().collect(Collectors.toList()); + resultDto.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); + resultDto.setNeighborHoodList(neighborHoodList); + return resultDto; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml index db8211a0ce..12a20f286c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml @@ -21,7 +21,7 @@ h.NEIGHBOR_HOOD_NAME FROM ic_neighbor_hood_property p - INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID ) + INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID ) WHERE p.PROPERTY_ID = #{propertyId} AND p.DEL_FLAG = '0' From 546954b098392f84b51eb84d3173c274ca9562dc Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 8 May 2023 14:18:44 +0800 Subject: [PATCH 104/177] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/StaffController.java | 38 ++++++++++++++++++ .../excel/customer_staff_import_template.xlsx | Bin 0 -> 9722 bytes 2 files changed, 38 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index bcc8e2f55e..d424f60202 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -8,16 +8,23 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.enums.RequirePermissionEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.service.StaffService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.InputStream; +import java.net.URLEncoder; import java.util.List; /** @@ -25,6 +32,7 @@ import java.util.List; * @author zhaoqifeng * @date 2020/4/23 17:59 */ +@Slf4j @RestController @RequestMapping("staff") public class StaffController { @@ -251,4 +259,34 @@ public class StaffController { return new Result>().ok(staffService.staffOrgList(tokenDto)); } + /** + * 下载工作人员导入excel模板 + * + * @return + */ + @PostMapping("import/download-template") + public void downloadIcResiDownloadTemplate(HttpServletResponse response) { + InputStream is = null; + ServletOutputStream os = null; + try { + os = response.getOutputStream(); + + is = this.getClass().getClassLoader().getResourceAsStream("excel/customer_staff_import_template.xlsx"); + + response.setHeader("Access-Control-Expose-Headers", "Content-Disposition"); + response.setHeader("content-Type", "application/vnd.ms-excel"); + response.setHeader("Content-Disposition", "attachment;fileName=" + URLEncoder.encode("工作人员导入模板.xlsx", "UTF-8")); + + IOUtils.copy(is, os); + } catch (Exception e) { + String errorStackTrace = ExceptionUtils.getErrorStackTrace(e); + log.error("下载工作人员导入模板失败:{}", errorStackTrace); + + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "下载工作人员导入模板失败"); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..df7f4126472dc1f67d5a60445662f9fa0475343e GIT binary patch literal 9722 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 m&iwbjhBw|{R_p&a-oLsW Date: Mon, 8 May 2023 14:38:52 +0800 Subject: [PATCH 105/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/constants/ImportTaskConstants.java | 5 + .../PropertyManagementController.java | 65 ++++++++- .../IcPropertyManagementImportListener.java | 120 +++++++++++++++++ .../IcPropertyManagementImportExcelData.java | 58 ++++++++ .../service/IcPropertyManagementService.java | 9 ++ .../service/PropertyManagementService.java | 8 ++ .../impl/IcPropertyManagementServiceImpl.java | 7 + .../impl/PropertyManagementServiceImpl.java | 126 +++++++++++++++++- 8 files changed, 390 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index 204845c1fb..f7b664de4b 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -83,4 +83,9 @@ public interface ImportTaskConstants { * 未做核酸比对 */ String IC_NAT_COMPARE_RECORD="ic_nat_compare_record"; + + /** + * 物业表：ic_property_management + */ + String IC_PROPERTY_MANAGEMENT="ic_property_management"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index e7175b3e82..e342791fb2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -26,19 +26,26 @@ import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.service.PropertyManagementService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.IOUtils; @@ -48,17 +55,17 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.nio.file.Path; +import java.util.*; /** @@ -70,7 +77,7 @@ import java.util.Map; @Slf4j @RestController @RequestMapping("propertymanagement") -public class PropertyManagementController { +public class PropertyManagementController implements ResultDataResolver { @Autowired private PropertyManagementService propertyManagementService; @@ -226,6 +233,54 @@ public class PropertyManagementController { return new Result().ok(propertyManagementService.getDetail(id)); } + /** + * 导入excel + * + * @return + */ + @PostMapping("import") + public Result importExcel(MultipartFile file) { + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.IC_PROPERTY_MANAGEMENT, "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【物业管理导入】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + + InputStream is = null; + FileOutputStream os = null; + + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error(ImportTaskConstants.IC_PROPERTY_MANAGEMENT + "表 importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.IC_PROPERTY_MANAGEMENT), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "物业管理导入excel错误", + "物业管理导入excel错误"); + + // 3.执行导入 + propertyManagementService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java new file mode 100644 index 0000000000..c591d54331 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java @@ -0,0 +1,120 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ObjectUtil; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.entity.IcPropertyManagementEntity; +import com.epmet.excel.yt.IcPropertyManagementImportExcelData; +import com.epmet.service.impl.IcPropertyManagementServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2023/5/8 14:23 + */ +@Slf4j +public class IcPropertyManagementImportListener implements ReadListener { + + // 最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String currentCustomerId; + private IcPropertyManagementServiceImpl propertyManagementService; + // 错误项列表 + private List errorRows = new ArrayList<>(); + // 要插入的数据 + private List insertDatas = new ArrayList<>(); + private List updateDatas = new ArrayList<>(); + + public IcPropertyManagementImportListener(String customerId, IcPropertyManagementServiceImpl propertyManagementService) { + this.currentCustomerId = customerId; + this.propertyManagementService = propertyManagementService; + } + + @Override + public void invoke(IcPropertyManagementImportExcelData data, AnalysisContext analysisContext) { + try { + // log.warn("有数据吗？"+JSON.toJSONString(data)); + // 不能为空先校验数据 + ValidatorUtils.validateEntity(data); + // 去除空格 + ObjectUtil.objectToTrim(data); + //物业名称唯一 + IcPropertyManagementEntity origin=propertyManagementService.getByName(currentCustomerId, data.getName()); + + IcPropertyManagementEntity propertyManagementEntity = ConvertUtils.sourceToTarget(data, IcPropertyManagementEntity.class); + propertyManagementEntity.setCustomerId(currentCustomerId); + if (null != origin) { + origin.setContactMobile(data.getContactMobile()); + origin.setContactName(data.getContactName()); + insertDatas.add(origin); + } else { + insertDatas.add(propertyManagementEntity); + } + + if (insertDatas.size() == MAX_THRESHOLD) { + execPersist(); + } + if (updateDatas.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else if (e instanceof EpmetException) { + errorMsg = ((EpmetException) e).getInternalMsg(); + } else { + errorMsg = "未知错误"; + log.error("【物业管理表ic_property_management导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + IcPropertyManagementImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(data, IcPropertyManagementImportExcelData.ErrorRow.class); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(insertDatas)) { + propertyManagementService.insertBatch(insertDatas); + } + + if (CollectionUtils.isNotEmpty(updateDatas)) { + propertyManagementService.updateBatchById(updateDatas); + } + } finally { + insertDatas.clear(); + updateDatas.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java new file mode 100644 index 0000000000..e172260c16 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -0,0 +1,58 @@ +package com.epmet.excel.yt; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/8 14:24 + */ +@Data +public class IcPropertyManagementImportExcelData { + /** + * 物业名称 + */ + @ExcelProperty(value = "物业名称") + private String name; + + /** + * 烟台需求：物业联系人姓名 + */ + @ExcelProperty(value = "物业联系人") + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + @ExcelProperty(value = "联系电话") + private String contactMobile; + + @Data + public static class ErrorRow { + /** + * 物业名称 + */ + @ExcelProperty(value = "物业名称") + private String name; + + /** + * 烟台需求：物业联系人姓名 + */ + @ExcelProperty(value = "物业联系人") + private String contactName; + + /** + * 烟台需求：物业联系人电话 + */ + @ExcelProperty(value = "联系电话") + private String contactMobile; + + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java index bc808af034..83ea49e041 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcPropertyManagementService.java @@ -92,4 +92,13 @@ public interface IcPropertyManagementService extends BaseService wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPropertyManagementEntity::getCustomerId,customerId).eq(IcPropertyManagementEntity::getName,name); + return baseDao.selectOne(wrapper); + } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 324f9e3fff..557692cc65 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -1,34 +1,56 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.commons.tools.utils.*; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcNeighborHoodPropertyDao; import com.epmet.dao.IcPropertyManagementDao; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcPropertyManagementDTO; import com.epmet.dto.form.IcPropertyManagementFormDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.IcPropertyManagementResultDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.entity.IcNeighborHoodPropertyEntity; import com.epmet.entity.IcPropertyManagementEntity; +import com.epmet.excel.handler.IcPropertyManagementImportListener; +import com.epmet.excel.yt.IcPropertyManagementImportExcelData; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.PropertyManagementService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; import java.util.stream.Collectors; @Slf4j @@ -42,6 +64,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService private IcPropertyManagementDao icPropertyManagementDao; @Resource private IcNeighborHoodPropertyDao icNeighborHoodPropertyDao; + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private OssFeignClient ossFeignClient; /** * 查询当前客户下的物业 @@ -118,7 +144,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, neighborHoodId); - if (icNeighborHoodPropertyDao.selectCount(queryWrapper) < 1) { + if (icNeighborHoodPropertyDao.selectCount(queryWrapper) < NumConstant.ONE) { // 插入小区物业关系表 IcNeighborHoodPropertyEntity neighborHoodPropertyEntity = new IcNeighborHoodPropertyEntity(); neighborHoodPropertyEntity.setPropertyId(formDTO.getId()); @@ -196,5 +222,99 @@ public class PropertyManagementServiceImpl implements PropertyManagementService return resultDto; } + /** + * 执行Excel导入 + * + * @param filePath + * @param importTaskId + */ + @Async + @Override + public void execAsyncExcelImport(Path filePath, String importTaskId) { + String userId = null; + try { + userId = EpmetRequestHolder.getLoginUserId(); + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + + IcPropertyManagementImportListener listener = new IcPropertyManagementImportListener(customerId, SpringContextUtils.getBean(IcPropertyManagementServiceImpl.class)); + + EasyExcel.read(filePath.toFile(), IcPropertyManagementImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); + + String errorDesFileUrl = null; + + List errorRows = listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + + // 合并到一起写入 + // errorRows.addAll(otherRows); + + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.IC_PROPERTY_MANAGEMENT, "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcPropertyManagementImportExcelData.ErrorRow.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e) { + log.error("【物业管理表ic_property_management】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + + if (!result.success()) { + log.error("【物业管理表ic_property_management】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【物业管理表ic_property_management】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(userId); + importFinishTaskForm.setResultDesc("城市管理图层导入失败:系统异常，请查看系统日志"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【物业管理表ic_property_management】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + } + } From 6cf3547b0134fe54b28a9823dbd963c956ff3424 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 14:54:11 +0800 Subject: [PATCH 106/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E6=9F=A5=E7=9C=8B=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcPropertyManagementDTO.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java index 5a34eab3cb..490cc35f90 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPropertyManagementDTO.java @@ -20,7 +20,6 @@ package com.epmet.dto; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; -import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -75,7 +74,6 @@ public class IcPropertyManagementDTO implements Serializable { * 导出时候用 * 该物业关联的小区 */ - @JsonIgnore @ExcelProperty(value = "关联小区") @ColumnWidth(60) private String neighborHoodNames; From f5bbb9314fdd8775bf784262c63b49d7d210084b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 14:56:13 +0800 Subject: [PATCH 107/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E7=AE=A1=E7=90=86?= =?UTF-8?q?=EF=BC=8C=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcPropertyManagementDao.xml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml index 2035e53020..71046c4bb0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml @@ -72,7 +72,12 @@ SELECT p.NEIGHBOR_HOOD_ID, @@ -24,7 +25,7 @@ INNER JOIN ic_neighbor_hood h ON ( p.NEIGHBOR_HOOD_ID = h.ID ) WHERE p.PROPERTY_ID = #{propertyId} - AND (h.AGENCY_ID =#{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') ) + AND (h.AGENCY_ID = #{agencyId} or h.AGENCY_PIDS like concat('%',#{agencyId},'%') ) AND p.DEL_FLAG = '0' AND h.DEL_FLAG = '0' order by h.CREATED_TIME asc From 92cfd3d0c95964eea210fe9b0aaa92f750b16efa Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Mon, 8 May 2023 16:20:01 +0800 Subject: [PATCH 111/177] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/IcNeighborHoodResultDTO.java | 8 ++++++++ .../src/main/resources/mapper/IcNeighborHoodDao.xml | 6 +++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java index d775552bbf..112ace5fbf 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java @@ -28,4 +28,12 @@ public class IcNeighborHoodResultDTO extends PageFormDTO { private String propertyId; private String agencyName; private String longitude; + + private String viliageTypeName; + + private String area; + + private String openTypeName; + + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 326940bdd9..b61da5e7ab 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -130,7 +130,11 @@ d.PROPERTY_ID as propertyId , a.LOCATION as location, a.LONGITUDE as longitude, - a.LATITUDE as latitude + a.LATITUDE as latitude, + a.AREA as area, + a.BUILD_YEAR as buildYear, + if(a.VILIAGE_TYPE = 1,'住宅小区',if(a.VILIAGE_TYPE = 1,'自然村','')) as viliageTypeName, + if(a.OPEN_TYPE = 1,'封闭式',if(a.OPEN_TYPE = 1,'开放式','')) as openTypeName from ic_neighbor_hood a left join customer_agency b on a.AGENCY_ID = b.ID and b.DEL_FLAG='0' From ac12e2d18903fc100314a8851ff6c2f7846a22cb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 8 May 2023 16:39:15 +0800 Subject: [PATCH 112/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=B0=8F=E5=8C=BAid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcNeighborHoodController.java | 15 +++++++++++++ .../java/com/epmet/dao/IcNeighborHoodDao.java | 13 +++++++++++ .../epmet/service/IcNeighborHoodService.java | 7 ++++++ .../impl/IcNeighborHoodServiceImpl.java | 21 +++++++++++++----- .../resources/mapper/IcNeighborHoodDao.xml | 22 +++++++++++++++++++ .../mapper/IcNeighborHoodPropertyDao.xml | 2 +- 6 files changed, 74 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 1faa0d9221..2e39b1f211 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -174,6 +174,21 @@ public class IcNeighborHoodController { return new Result>().ok(list); } + /** + * 入参：gridId、agencyId + * 返回当前组织及下级下的所有小区 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("neighborhood-options-yantai") + public Result> queryNeighborHoodOptionsYanTai(@LoginUser TokenDto tokenDto, @RequestBody NeighborHoodOptionFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + List list=icNeighborHoodService.queryNeighborHoodOptionsYanTai(formDTO); + return new Result>().ok(list); + } + /** * 获取用户组织下小区列表 * diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index 2fd4f25eee..b97fdf0f03 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -224,4 +224,17 @@ public interface IcNeighborHoodDao extends BaseDao { IcNeighborHoodEntity getNeighborHoodInfoByName(CheckHouseInfoFormDTO formDTO); List queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO); + + /** + * label: xxx网格-xxx小区 + * @param customerId + * @param agencyId + * @param gridId + * @param neighborHoodName + * @return + */ + List queryNeighborHoodOptionsYanTai(@Param("customerId") String customerId, + @Param("agencyId") String agencyId, + @Param("gridId") String gridId, + @Param("neighborHoodName") String neighborHoodName); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index e5766ce0d3..5313886414 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -203,4 +203,11 @@ public interface IcNeighborHoodService extends BaseService * @return */ List queryNeighborHoodOptions(NeighborHoodOptionFormDTO formDTO); + + /** + * 小区下拉框，小区名：xxx网格-xxx小区 + * @param formDTO + * @return + */ + List queryNeighborHoodOptionsYanTai(NeighborHoodOptionFormDTO formDTO); } 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 3b6a79691c..d2f2dc4776 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 @@ -856,9 +856,20 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl queryNeighborHoodOptionsYanTai(NeighborHoodOptionFormDTO formDTO) { + if (StringUtils.isBlank(formDTO.getGridId()) && StringUtils.isBlank(formDTO.getAgencyId())) { + // 默认查询当前工作人员所属组织及下级的 + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + formDTO.setAgencyId(staffInfoCacheResult.getAgencyId()); + } + List list = baseDao.queryNeighborHoodOptionsYanTai(formDTO.getCustomerId(),formDTO.getAgencyId(),formDTO.getGridId(),formDTO.getNeighborHoodName()); + return list; + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 326940bdd9..0a4f7db95b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -695,4 +695,26 @@ ORDER BY h.NEIGHBOR_HOOD_NAME ASC + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml index 4ea353272f..9e5f9b0bf9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodPropertyDao.xml @@ -18,7 +18,7 @@ SELECT m.*, + ( + case when m.type='0' then '楼长' + when m.type='1' then '单元长' + else '-' + end + )as typeName, d.ORGANIZATION_NAME AS districtName, s.ORGANIZATION_NAME AS streetName, c.ORGANIZATION_NAME AS communityName, From a01720c755d3eae1a24dfbcbbfc3550bfffe854c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 10:26:07 +0800 Subject: [PATCH 122/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E8=BF=99=EF=BC=8C=E6=96=B0=E5=A2=9E=E6=88=96=E8=80=85?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=AE=BA=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E6=98=AF=E5=95=A5=EF=BC=8C=E5=8D=95=E5=85=83=E9=83=BD?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E4=B8=8D=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommunityBuildingManagerController.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 771bcb1006..2240faba43 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -25,7 +25,6 @@ import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; @@ -92,10 +91,10 @@ public class CommunityBuildingManagerController { public Result save(@LoginUser TokenDto tokenDto,@RequestBody CommunityBuildingManagerDTO dto){ dto.setCustomerId(tokenDto.getCustomerId()); ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.AddShowGroup.class); - //类型：0楼长；1单元长 + /* //类型：0楼长；1单元长 if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); - } + }*/ communityBuildingManagerService.save(dto); return new Result(); } @@ -110,10 +109,10 @@ public class CommunityBuildingManagerController { @PostMapping("update") public Result update(@RequestBody CommunityBuildingManagerDTO dto){ ValidatorUtils.validateEntity(dto, CommunityBuildingManagerDTO.UpdateShowGroup.class); - //类型：0楼长；1单元长 + /* //类型：0楼长；1单元长 if("1".equals(dto.getType())&& StringUtils.isBlank(dto.getUnitId())){ throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"单元长必须选择所属单元","单元长必须选择所属单元"); - } + }*/ communityBuildingManagerService.update(dto); return new Result(); } From a8025880e7dd941277528b5a6e12cb74bf1a0941 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 10:41:01 +0800 Subject: [PATCH 123/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E8=BF=99=EF=BC=8C=E5=90=8C=E4=B8=80=E4=B8=AA=E6=A5=BC?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E5=85=81=E8=AE=B8=E6=9C=89=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=A5=BC=E9=95=BF=EF=BC=8C=E5=90=8C=E4=B8=80=E4=B8=AA=E5=8D=95?= =?UTF-8?q?=E5=85=83=EF=BC=8C=E5=8F=AA=E5=85=81=E8=AE=B8=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=8D=95=E5=85=83=E9=95=BF=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerServiceImpl.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 0d7593f50c..24fedd15ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -1,10 +1,12 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -21,6 +23,7 @@ import com.epmet.service.CommunityBuildingManagerService; import com.epmet.service.CustomerGridService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; @@ -105,13 +108,27 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl countQuery=new LambdaQueryWrapper<>(); + countQuery.eq(CommunityBuildingManagerEntity::getType,type) + .eq(CommunityBuildingManagerEntity::getBuildingId,buildingId) + .eq(StringUtils.isNotBlank(unitId),CommunityBuildingManagerEntity::getUnitId,unitId) + .ne(StringUtils.isNotBlank(id),CommunityBuildingManagerEntity::getId,id); + if(baseDao.selectCount(countQuery)>NumConstant.ZERO){ + throw new ValidateException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)"); + } + } + /** * 编辑楼长/单元长 * todo: 同步到具体的楼栋 @@ -122,6 +139,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl Date: Tue, 9 May 2023 11:16:45 +0800 Subject: [PATCH 124/177] /gov/org/communityBuildingManager/export --- .../com/epmet/controller/CommunityBuildingManagerController.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 2240faba43..4378e9bf8b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -167,6 +167,7 @@ public class CommunityBuildingManagerController { @PostMapping("export") public void exportCommunityBuildingManager(@LoginUser TokenDto tokenDto, @RequestBody CommunityBuildingManagerPageFormDTO formDTO, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); ExcelWriter excelWriter = null; formDTO.setPageNo(NumConstant.ONE); formDTO.setPageSize(NumConstant.TEN_THOUSAND); From a6015e0aed5b927e5942a182f8457b7e55f291e7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 11:21:06 +0800 Subject: [PATCH 125/177] /gov/org/communityBuildingManager/export --- .../service/impl/CommunityBuildingManagerServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 24fedd15ec..9f8e9bbf09 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -6,7 +6,6 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.exception.ValidateException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; @@ -125,7 +124,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImplNumConstant.ZERO){ - throw new ValidateException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)"); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)","所选楼栋(单元)已存在楼长(单元长)"); } } From 2be44668f27270120b3a7feb213b27e3abe13156 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 11:23:29 +0800 Subject: [PATCH 126/177] /gov/org/propertymanagement/page --- .../com/epmet/service/impl/PropertyManagementServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 16fdde6f25..23ec2b19ff 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -210,6 +210,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService .distinct().collect(Collectors.toList()); result.setNeighborHoodNames(CollectionUtils.isNotEmpty(neighborHoodList) ? StringUtils.join(neighborHoodNames, StrConstant.COMMA_ZH) : StrConstant.EPMETY_STR); result.setNeighborHoodList(neighborHoodList); + result.setTotalNeighborHood(CollectionUtils.isNotEmpty(neighborHoodList)?neighborHoodList.size():NumConstant.ZERO); }); return new PageData<>(list, pageInfo.getTotal(), pageSize); } From 3d68e3a2a0684b1201c5dc483634c85440980f45 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 11:53:51 +0800 Subject: [PATCH 127/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=EF=BC=8C=E5=90=8D=E7=A7=B0=E4=B8=80=E8=87=B4=EF=BC=8C=E8=A6=86?= =?UTF-8?q?=E7=9B=96=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9A=84=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5excel=E5=A1=AB=E5=86=99=E7=9A=84=E4=B8=BA?= =?UTF-8?q?=E5=87=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/handler/IcPropertyManagementImportListener.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java index c591d54331..096f586ee1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcPropertyManagementImportListener.java @@ -56,7 +56,7 @@ public class IcPropertyManagementImportListener implements ReadListener Date: Tue, 9 May 2023 12:06:08 +0800 Subject: [PATCH 128/177] /gov/org/propertymanagement/update --- .../impl/PropertyManagementServiceImpl.java | 32 +++++++++++-------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 23ec2b19ff..77f30363d4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -141,21 +141,24 @@ public class PropertyManagementServiceImpl implements PropertyManagementService .set(IcPropertyManagementEntity::getUpdatedTime, new Date()) .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); icPropertyManagementDao.update(null, updateWrapper); + CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); + + // 查询当前物业，在本组织及下级范围内，管理的小区 + List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(formDTO.getId(), staffInfoCacheResult.getAgencyId()); + // 原来存在关联的小区，现在取消勾选了，需要删除物业小区关系表 + originNeighborHoodList.forEach(origin -> { + // 举例：原来管理A小区，现在取消勾选 + if (!formDTO.getNeighborHoodIdList().contains(origin.getId())) { + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) + .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, origin.getId()) + .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) + .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icNeighborHoodPropertyDao.update(null, updateWrapper1); + } + }); if (CollectionUtils.isNotEmpty(formDTO.getNeighborHoodIdList())) { - CustomerStaffInfoCacheResult staffInfoCacheResult= CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(),EpmetRequestHolder.getLoginUserId()); - List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(formDTO.getId(),staffInfoCacheResult.getAgencyId()); - //原来关联的，现在清除的小区，删除物业小区关系表 - originNeighborHoodList.forEach(origin->{ - if(!formDTO.getNeighborHoodIdList().contains(origin.getId())){ - LambdaUpdateWrapper updateWrapper1=new LambdaUpdateWrapper<>(); - updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId,formDTO.getId()) - .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId,origin.getId()) - .set(IcNeighborHoodPropertyEntity::getDelFlag,NumConstant.ONE_STR) - .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) - .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); - icNeighborHoodPropertyDao.update(null,updateWrapper1); - } - }); formDTO.getNeighborHoodIdList().forEach(neighborHoodId -> { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, formDTO.getId()) @@ -167,6 +170,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService neighborHoodPropertyEntity.setNeighborHoodId(neighborHoodId); icNeighborHoodPropertyDao.insert(neighborHoodPropertyEntity); } + //原本已经存在小区和物业的关系，不用再插入 }); } } From 90f0ddbff1c8d32b60b76cd0bccbf23aa287e12b Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:18:11 +0800 Subject: [PATCH 129/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/excel/yt/IcPropertyManagementImportExcelData.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java index 55196ffa18..cf9ad9d66b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -4,6 +4,8 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * @Description * @Author yzm @@ -14,6 +16,7 @@ public class IcPropertyManagementImportExcelData { /** * 物业名称 */ + @NotBlank(message = "物业名称必填") @ExcelProperty(value = "*物业名称") private String name; From 73a98fe99edde529a4ee11a46f0d72f7a37cacf8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:23:29 +0800 Subject: [PATCH 130/177] /gov/org/communityBuildingManager/import --- .../epmet/constants/ImportTaskConstants.java | 5 ++ .../CommunityBuildingManagerController.java | 60 ++++++++++++++++++- .../CommunityBuildingManagerService.java | 3 + .../CommunityBuildingManagerServiceImpl.java | 39 ++++++++---- 4 files changed, 96 insertions(+), 11 deletions(-) diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java index f7b664de4b..f25fd4269a 100644 --- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java +++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/constants/ImportTaskConstants.java @@ -88,4 +88,9 @@ public interface ImportTaskConstants { * 物业表：ic_property_management */ String IC_PROPERTY_MANAGEMENT="ic_property_management"; + + /** + * 楼长单元长 + */ + String COMMUNITY_BUILDING_MANAGER="community_building_manager"; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 4378e9bf8b..21f5cbfca9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -10,19 +10,26 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.IndexedColors; @@ -31,15 +38,19 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; +import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -51,7 +62,7 @@ import java.util.List; @Slf4j @RestController @RequestMapping("communityBuildingManager") -public class CommunityBuildingManagerController { +public class CommunityBuildingManagerController implements ResultDataResolver { @Autowired private CommunityBuildingManagerService communityBuildingManagerService; @@ -207,6 +218,53 @@ public class CommunityBuildingManagerController { } } + /** + * 导入excel + * + * @return + */ + @PostMapping("import") + public Result importExcel(MultipartFile file) { + // 1.暂存文件 + String originalFilename = file.getOriginalFilename(); + String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); + + Path fileSavePath; + try { + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.COMMUNITY_BUILDING_MANAGER, "import"); + fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); + } catch (IOException e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【楼长单元长导入】创建临时存储文件失败:{}", errorMsg); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "文件上传失败", "文件上传失败"); + } + + InputStream is = null; + FileOutputStream os = null; + + try { + is = file.getInputStream(); + os = new FileOutputStream(fileSavePath.toString()); + IOUtils.copy(is, os); + } catch (Exception e) { + log.error(ImportTaskConstants.COMMUNITY_BUILDING_MANAGER + "表 importExcel exception", e); + } finally { + org.apache.poi.util.IOUtils.closeQuietly(is); + org.apache.poi.util.IOUtils.closeQuietly(os); + } + + // 2.生成导入任务记录 + ImportTaskCommonResultDTO rstData = getResultDataOrThrowsException( + ImportTaskUtils.createImportTask(originalFilename, ImportTaskConstants.COMMUNITY_BUILDING_MANAGER), + ServiceConstant.EPMET_COMMON_SERVICE, + EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), + "楼长单元长导入excel错误", + "楼长单元长导入excel错误"); + + // 3.执行导入 + communityBuildingManagerService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); + return new Result(); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java index b67d4d0d35..eb32743443 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -7,6 +7,7 @@ import com.epmet.dto.result.CommunityBuildingManagerDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.entity.CommunityBuildingManagerEntity; +import java.nio.file.Path; import java.util.List; /** @@ -63,4 +64,6 @@ public interface CommunityBuildingManagerService extends BaseService ids); + + void execAsyncExcelImport(Path fileSavePath, String taskId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 9f8e9bbf09..817d435c9b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -22,11 +22,14 @@ import com.epmet.service.CommunityBuildingManagerService; import com.epmet.service.CustomerGridService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.nio.file.Path; import java.util.List; /** @@ -35,6 +38,7 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2023-05-06 */ +@Slf4j @Service public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { @@ -67,7 +71,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl pageInfo = new PageInfo<>(resList); - return new PageData<>(resList, pageInfo.getTotal(),formDTO.getPageSize()); + return new PageData<>(resList, pageInfo.getTotal(), formDTO.getPageSize()); } /** @@ -108,7 +112,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl countQuery=new LambdaQueryWrapper<>(); - countQuery.eq(CommunityBuildingManagerEntity::getType,type) - .eq(CommunityBuildingManagerEntity::getBuildingId,buildingId) - .eq(StringUtils.isNotBlank(unitId),CommunityBuildingManagerEntity::getUnitId,unitId) - .ne(StringUtils.isNotBlank(id),CommunityBuildingManagerEntity::getId,id); - if(baseDao.selectCount(countQuery)>NumConstant.ZERO){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"所选楼栋(单元)已存在楼长(单元长)","所选楼栋(单元)已存在楼长(单元长)"); + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(CommunityBuildingManagerEntity::getType, type) + .eq(CommunityBuildingManagerEntity::getBuildingId, buildingId) + .eq(StringUtils.isNotBlank(unitId), CommunityBuildingManagerEntity::getUnitId, unitId) + .ne(StringUtils.isNotBlank(id), CommunityBuildingManagerEntity::getId, id); + if (baseDao.selectCount(countQuery) > NumConstant.ZERO) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "所选楼栋(单元)已存在楼长(单元长)", "所选楼栋(单元)已存在楼长(单元长)"); } } @@ -138,7 +142,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl Date: Tue, 9 May 2023 12:27:11 +0800 Subject: [PATCH 131/177] =?UTF-8?q?/gov/org/communityBuildingManager/impor?= =?UTF-8?q?t,=E6=9C=AA=E5=AE=8C=E5=BE=85=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerController.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 21f5cbfca9..01e62c31f4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -10,26 +10,20 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; -import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.FileUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; -import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.IndexedColors; @@ -42,15 +36,12 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; -import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; -import java.nio.file.Path; import java.util.Date; import java.util.List; -import java.util.UUID; /** @@ -225,7 +216,8 @@ public class CommunityBuildingManagerController implements ResultDataResolver { */ @PostMapping("import") public Result importExcel(MultipartFile file) { - // 1.暂存文件 + return new Result(); + /*// 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); @@ -263,7 +255,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { // 3.执行导入 communityBuildingManagerService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); - return new Result(); + return new Result();*/ } From dd8eb84ecbe9484b9776c9b90802c31bd88891c9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:33:50 +0800 Subject: [PATCH 132/177] =?UTF-8?q?/gov/org/communityBuildingManager/impor?= =?UTF-8?q?t,=E6=9C=AA=E5=AE=8C=E5=BE=85=E7=BB=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/CommunityBuildingManagerController.java | 2 +- .../java/com/epmet/controller/PropertyManagementController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 01e62c31f4..7c4f1fef3c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -215,7 +215,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(MultipartFile file) { + public Result importExcel(@RequestPart("file") MultipartFile file) { return new Result(); /*// 1.暂存文件 String originalFilename = file.getOriginalFilename(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index c3bff703b0..9adff02f7f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -239,7 +239,7 @@ public class PropertyManagementController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(MultipartFile file) { + public Result importExcel(@RequestPart("file") MultipartFile file) { // 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); From e46992190554c6a7797bad2d7d8a1faf20034240 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 12:58:07 +0800 Subject: [PATCH 133/177] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=9A/gov/org/propertymanagement/delete-b?= =?UTF-8?q?atch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PropertyManagementController.java | 15 +++++++- .../service/PropertyManagementService.java | 12 ++++++- .../impl/PropertyManagementServiceImpl.java | 34 ++++++++++++++++--- 3 files changed, 55 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 9adff02f7f..4c77e5472c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -139,7 +139,20 @@ public class PropertyManagementController implements ResultDataResolver { public Result delete(@RequestBody IcPropertyManagementFormDTO formDTO){ //效验数据 ValidatorUtils.validateEntity(formDTO, IcPropertyManagementFormDTO.DeleteGroup.class); - propertyManagementService.delete(formDTO); + propertyManagementService.delete(formDTO.getId()); + return new Result(); + } + + /** + * 物业批量删除 + * @param ids + * @return + */ + @PostMapping("delete-batch") + public Result deleteBatch( @RequestBody List ids) { + if (CollectionUtils.isNotEmpty(ids)) { + propertyManagementService.deleteBatch(ids); + } return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index 301b730072..ccd2b27a38 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -38,7 +38,11 @@ public interface PropertyManagementService { String add(IcPropertyManagementFormDTO formDTO); void update(IcPropertyManagementFormDTO formDTO); - void delete(IcPropertyManagementFormDTO formDTO); + /** + * 物业管理批量删除 + * @param id + */ + void delete(String id); /** * 物业管理-列表查询 @@ -68,4 +72,10 @@ public interface PropertyManagementService { * @param taskId */ void execAsyncExcelImport(Path fileSavePath, String taskId); + + /** + * 物业管理批量删除 + * @param ids + */ + void deleteBatch(List ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 77f30363d4..3e34e3c845 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -177,19 +177,45 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 单个删除 - * @param formDTO + * @param id */ @Override @Transactional(rollbackFor = Exception.class) - public void delete(IcPropertyManagementFormDTO formDTO) { + public void delete(String id) { LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId,formDTO.getId()); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId,id); if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业存在与小区关联，无法删除","已与小区关联，无法删除"); } - icPropertyManagementDao.deleteById(formDTO.getId()); + icPropertyManagementDao.deleteById(id); } + /** + * 物业管理批量删除 + * @param ids + */ + @Override + @Transactional(rollbackFor = Exception.class) + public void deleteBatch(List ids) { + if (CollectionUtils.isEmpty(ids)) { + return; + } + int failedNum = NumConstant.ZERO; + for (String id : ids) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); + if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { + failedNum += 1; + } else { + icPropertyManagementDao.deleteById(id); + } + } + if (failedNum > NumConstant.ZERO) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业存在与小区关联，无法删除", String.format("%s个物业已与小区关联，无法批量删除,请先解除与小区关联关系", failedNum)); + } + } + + /** * 物业管理-列表查询 * From de6311a50b1e8451f9d6eb8d3dd9854617a19c30 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:16:52 +0800 Subject: [PATCH 134/177] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=9A/gov/org/propertymanagement/delete-b?= =?UTF-8?q?atch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PropertyManagementController.java | 13 +++-- .../service/PropertyManagementService.java | 6 ++- .../impl/PropertyManagementServiceImpl.java | 49 +++++++++++++------ 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 4c77e5472c..50767693ed 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -144,14 +144,19 @@ public class PropertyManagementController implements ResultDataResolver { } /** - * 物业批量删除 + * 物业管理-批量删除 + * * @param ids - * @return + * @return 返回失败的id列表 */ @PostMapping("delete-batch") - public Result deleteBatch( @RequestBody List ids) { + public Result> deleteBatch(@RequestBody List ids) { if (CollectionUtils.isNotEmpty(ids)) { - propertyManagementService.deleteBatch(ids); + List failedIdList = propertyManagementService.deleteBatch(ids); + Result result = new Result>().ok(failedIdList); + result.setMsg("部门物业删除失败"); + result.setCode(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode()); + return result; } return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index ccd2b27a38..3f50a0658c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -42,7 +42,7 @@ public interface PropertyManagementService { * 物业管理批量删除 * @param id */ - void delete(String id); + Boolean delete(String id); /** * 物业管理-列表查询 @@ -75,7 +75,9 @@ public interface PropertyManagementService { /** * 物业管理批量删除 + * * @param ids + * @return 返回失败的id列表 */ - void deleteBatch(List ids); + List deleteBatch(List ids); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 3e34e3c845..d91fb52d38 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -177,42 +177,59 @@ public class PropertyManagementServiceImpl implements PropertyManagementService /** * 单个删除 + * * @param id */ @Override @Transactional(rollbackFor = Exception.class) - public void delete(String id) { - LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId,id); + public Boolean delete(String id) { + Boolean delResFlag=true; + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); + // 查询当前物业，在本组织及下级范围内，管理的小区 + List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId()); + // 如果存在记录，则解除物业与小区关联关系 + originNeighborHoodList.forEach(origin -> { + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id) + .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, origin.getId()) + .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) + .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icNeighborHoodPropertyDao.update(null, updateWrapper1); + }); + // 再查询是否存在其他组织下的小区，与该物业有关联，存在则不允许删除 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"物业存在与小区关联，无法删除","已与小区关联，无法删除"); + delResFlag=false; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除"); } + // 删除物业表 icPropertyManagementDao.deleteById(id); + return delResFlag; } + /** * 物业管理批量删除 + * * @param ids + * @return 返回失败的id列表 */ @Override @Transactional(rollbackFor = Exception.class) - public void deleteBatch(List ids) { + public List deleteBatch(List ids) { if (CollectionUtils.isEmpty(ids)) { - return; + return new ArrayList<>(); } - int failedNum = NumConstant.ZERO; + List failedIdList = new ArrayList<>(); for (String id : ids) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); - if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - failedNum += 1; - } else { - icPropertyManagementDao.deleteById(id); + Boolean res = delete(id); + if (!res) { + failedIdList.add(id); } } - if (failedNum > NumConstant.ZERO) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "物业存在与小区关联，无法删除", String.format("%s个物业已与小区关联，无法批量删除,请先解除与小区关联关系", failedNum)); - } + return failedIdList; } From 5a79a055643d898cc8da60fe36e2bbc1d2b4bfa5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:34:54 +0800 Subject: [PATCH 135/177] =?UTF-8?q?=E6=89=B9=E9=87=8F=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=9A/gov/org/propertymanagement/delete-b?= =?UTF-8?q?atch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/PropertyManagementService.java | 2 +- .../service/impl/PropertyManagementServiceImpl.java | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java index 3f50a0658c..6966cf38a1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/PropertyManagementService.java @@ -42,7 +42,7 @@ public interface PropertyManagementService { * 物业管理批量删除 * @param id */ - Boolean delete(String id); + void delete(String id); /** * 物业管理-列表查询 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index d91fb52d38..8e4d6331b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -182,8 +182,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService */ @Override @Transactional(rollbackFor = Exception.class) - public Boolean delete(String id) { - Boolean delResFlag=true; + public void delete(String id) { CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); // 查询当前物业，在本组织及下级范围内，管理的小区 List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId()); @@ -201,12 +200,10 @@ public class PropertyManagementServiceImpl implements PropertyManagementService LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - delResFlag=false; throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除"); } // 删除物业表 icPropertyManagementDao.deleteById(id); - return delResFlag; } @@ -224,7 +221,13 @@ public class PropertyManagementServiceImpl implements PropertyManagementService } List failedIdList = new ArrayList<>(); for (String id : ids) { - Boolean res = delete(id); + Boolean res =true; + try{ + //调用单挑删除方法 + delete(id); + }catch(EpmetException e){ + res=false; + } if (!res) { failedIdList.add(id); } From fcb374a34f600ab48856f632ae937a2396a2b2d5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:45:57 +0800 Subject: [PATCH 136/177] 111 --- .../com/epmet/excel/yt/IcPropertyManagementImportExcelData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java index cf9ad9d66b..7a318bbad7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/IcPropertyManagementImportExcelData.java @@ -37,7 +37,7 @@ public class IcPropertyManagementImportExcelData { /** * 物业名称 */ - @ExcelProperty(value = "物业名称") + @ExcelProperty(value = "*物业名称") private String name; /** From 9b920e5256789e85b4b952bce9d963f6449190e8 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 13:47:40 +0800 Subject: [PATCH 137/177] 111 --- .../com/epmet/controller/PropertyManagementController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java index 50767693ed..c6bfacb04e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/PropertyManagementController.java @@ -153,6 +153,9 @@ public class PropertyManagementController implements ResultDataResolver { public Result> deleteBatch(@RequestBody List ids) { if (CollectionUtils.isNotEmpty(ids)) { List failedIdList = propertyManagementService.deleteBatch(ids); + if(CollectionUtils.isEmpty(failedIdList)){ + return new Result<>(); + } Result result = new Result>().ok(failedIdList); result.setMsg("部门物业删除失败"); result.setCode(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode()); From 9608a4fb868b0ba9ad058b7a1676e594ce95287c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 14:25:50 +0800 Subject: [PATCH 138/177] =?UTF-8?q?=E7=BB=8F=E4=B8=8E=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=8F=E7=90=86=E7=A1=AE=E8=AE=A4=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=EF=BC=8C=E7=9B=B4=E6=8E=A5=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=97=A0=E9=9C=80=E5=88=A4=E6=96=AD=E4=B8=8B=E9=9D=A2=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=85=B3=E8=81=94=E5=B0=8F=E5=8C=BA=E3=80=82=20?= =?UTF-8?q?=E4=B8=94=E5=88=AB=E7=9A=84=E7=A4=BE=E5=8C=BA=E5=9C=A8=E7=94=A8?= =?UTF-8?q?=E6=AD=A4=E7=89=A9=E4=B8=9A=EF=BC=8C=E4=B9=9F=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=82=E6=B8=85=E9=99=A4=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=9A=84=E5=85=B3=E7=B3=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/PropertyManagementServiceImpl.java | 34 ++++++++----------- 1 file changed, 14 insertions(+), 20 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 8e4d6331b7..6ead260319 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -183,27 +183,21 @@ public class PropertyManagementServiceImpl implements PropertyManagementService @Override @Transactional(rollbackFor = Exception.class) public void delete(String id) { - CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(EpmetRequestHolder.getLoginUserCustomerId(), EpmetRequestHolder.getLoginUserId()); - // 查询当前物业，在本组织及下级范围内，管理的小区 - List originNeighborHoodList = icNeighborHoodPropertyDao.getNeighborHoodList(id, staffInfoCacheResult.getAgencyId()); - // 如果存在记录，则解除物业与小区关联关系 - originNeighborHoodList.forEach(origin -> { - LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); - updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id) - .eq(IcNeighborHoodPropertyEntity::getNeighborHoodId, origin.getId()) - .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) - .set(IcNeighborHoodPropertyEntity::getUpdatedTime, new Date()) - .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); - icNeighborHoodPropertyDao.update(null, updateWrapper1); - }); - // 再查询是否存在其他组织下的小区，与该物业有关联，存在则不允许删除 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(IcNeighborHoodPropertyEntity::getPropertyId, id); - if (icNeighborHoodPropertyDao.selectCount(queryWrapper) > 0) { - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "当前物业已与其他组织下的小区关联，无法删除", "当前物业已与其他组织下的小区关联，无法删除"); - } + Date now = new Date(); + // 删除物业与小区关联关系表 + LambdaUpdateWrapper updateWrapper1 = new LambdaUpdateWrapper<>(); + updateWrapper1.eq(IcNeighborHoodPropertyEntity::getPropertyId, id) + .set(IcNeighborHoodPropertyEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcNeighborHoodPropertyEntity::getUpdatedTime, now) + .set(IcNeighborHoodPropertyEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icNeighborHoodPropertyDao.update(null, updateWrapper1); // 删除物业表 - icPropertyManagementDao.deleteById(id); + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcPropertyManagementEntity::getId, id) + .set(IcPropertyManagementEntity::getDelFlag, NumConstant.ONE_STR) + .set(IcPropertyManagementEntity::getUpdatedTime, now) + .set(IcPropertyManagementEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()); + icPropertyManagementDao.update(null, updateWrapper); } From 4d2ba136e8f0b1db96891b9e5f51aca972ca3e30 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 14:49:08 +0800 Subject: [PATCH 139/177] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=A5=BC=E9=95=BF?= =?UTF-8?q?=EF=BC=8C=20=E5=90=8C=E6=97=B6=E6=B8=85=E7=A9=BAic=5Fbuilding?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CommunityBuildingManagerServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 817d435c9b..c6cf2f0eb3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.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.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -30,6 +31,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.nio.file.Path; +import java.util.Date; import java.util.List; /** @@ -159,7 +161,16 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl ids) { - baseDao.deleteBatchIds(ids); + Date now=new Date(); + ids.forEach(id->{ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(CommunityBuildingManagerEntity::getId, id) + .set(CommunityBuildingManagerEntity::getDelFlag, NumConstant.ONE_STR) + .set(CommunityBuildingManagerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(CommunityBuildingManagerEntity::getUpdatedTime, now); + baseDao.update(null, updateWrapper); + // todo + }); } From 8db4108269878c4f1baa5ed6d9b1a71f27b973e0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 15:48:35 +0800 Subject: [PATCH 140/177] =?UTF-8?q?ic=5Fbuilding=E6=96=B0=E5=A2=9EBUILDING?= =?UTF-8?q?=5FLEADER=5FID=5FCARD=E3=80=81BUILDING=5FLEADER=5FTYPE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcBuildingDTO.java | 10 ++++++++++ .../main/java/com/epmet/entity/IcBuildingEntity.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java index 52567226eb..702294f7ea 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcBuildingDTO.java @@ -96,6 +96,16 @@ public class IcBuildingDTO implements Serializable { */ private String buildingLeaderMobile; + /** + * 烟台需求：楼长身份证号 + */ + private String buildingLeaderIdCard; + + /** + * 烟台需求：类型：0楼长；1单元长 + */ + private String buildingLeaderType; + /** * 中心点位：经度 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java index 801267e2dd..117a7ea6e5 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcBuildingEntity.java @@ -92,6 +92,16 @@ public class IcBuildingEntity extends BaseEpmetEntity { */ private String buildingLeaderMobile; + /** + * 烟台需求：楼长身份证号 + */ + private String buildingLeaderIdCard; + + /** + * 烟台需求：类型：0楼长；1单元长 + */ + private String buildingLeaderType; + /** * 中心点位：经度 */ From 3e8fde72eafb875d77d9fafa51e36b94a3803da3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 16:03:04 +0800 Subject: [PATCH 141/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=3D=E3=80=8B=E6=A5=BC=E6=A0=8B=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerServiceImpl.java | 64 +++++++++++++++---- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index c6cf2f0eb3..6461489107 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -14,17 +15,20 @@ import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.PidUtils; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.dao.CommunityBuildingManagerDao; +import com.epmet.dao.IcBuildingDao; import com.epmet.dto.CustomerGridDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.entity.CommunityBuildingManagerEntity; +import com.epmet.entity.IcBuildingEntity; import com.epmet.service.CommunityBuildingManagerService; import com.epmet.service.CustomerGridService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -43,6 +47,8 @@ import java.util.List; @Slf4j @Service public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { + @Autowired + private IcBuildingDao icBuildingDao; /** * 列表分页查询 @@ -105,7 +111,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingUpdate = new LambdaUpdateWrapper<>(); + buildingUpdate.eq(IcBuildingEntity::getId, entity.getBuildingId()) + .set(IcBuildingEntity::getBuildingLeaderName, entity.getName()) + .set(IcBuildingEntity::getBuildingLeaderMobile, entity.getPhone()) + .set(IcBuildingEntity::getBuildingLeaderIdCard, entity.getIdCard()) + .set(IcBuildingEntity::getBuildingLeaderType, entity.getType()) + .set(IcBuildingEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(IcBuildingEntity::getUpdatedTime, new Date()); + icBuildingDao.update(null, buildingUpdate); } private void checkUnqiue(String type, String buildingId, String unitId, String id) { @@ -136,7 +152,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingUpdate = new LambdaUpdateWrapper<>(); + buildingUpdate.eq(IcBuildingEntity::getId, updateFormDto.getBuildingId()) + .set(IcBuildingEntity::getBuildingLeaderName, updateFormDto.getName()) + .set(IcBuildingEntity::getBuildingLeaderMobile, updateFormDto.getPhone()) + .set(IcBuildingEntity::getBuildingLeaderIdCard, updateFormDto.getIdCard()) + .set(IcBuildingEntity::getBuildingLeaderType, updateFormDto.getType()) + .set(IcBuildingEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(IcBuildingEntity::getUpdatedTime, new Date()); + icBuildingDao.update(null, buildingUpdate); } /** * 批量删除楼长/单元长 - * todo: 同时清空楼栋表里的信息 + * 同时清空楼栋表里的信息 * * @param ids * @return @@ -161,15 +187,29 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl ids) { - Date now=new Date(); - ids.forEach(id->{ - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.eq(CommunityBuildingManagerEntity::getId, id) - .set(CommunityBuildingManagerEntity::getDelFlag, NumConstant.ONE_STR) - .set(CommunityBuildingManagerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) - .set(CommunityBuildingManagerEntity::getUpdatedTime, now); - baseDao.update(null, updateWrapper); - // todo + Date now = new Date(); + ids.forEach(id -> { + CommunityBuildingManagerEntity origin = baseDao.selectById(id); + if (null != origin) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(CommunityBuildingManagerEntity::getId, id) + .set(CommunityBuildingManagerEntity::getDelFlag, NumConstant.ONE_STR) + .set(CommunityBuildingManagerEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(CommunityBuildingManagerEntity::getUpdatedTime, now); + baseDao.update(null, updateWrapper); + if (StringUtils.isNotBlank(origin.getBuildingId())) { + // 清空楼栋表的楼长4列信息 + LambdaUpdateWrapper buildingUpdate = new LambdaUpdateWrapper<>(); + buildingUpdate.eq(IcBuildingEntity::getId, origin.getBuildingId()) + .set(IcBuildingEntity::getBuildingLeaderName, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getBuildingLeaderMobile, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getBuildingLeaderIdCard, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getBuildingLeaderType, StrConstant.EPMETY_STR) + .set(IcBuildingEntity::getUpdatedBy, EpmetRequestHolder.getLoginUserId()) + .set(IcBuildingEntity::getUpdatedTime, now); + icBuildingDao.update(null, buildingUpdate); + } + } }); } From 5298d0fc702dd08d1c3b46fc7e9d06e7e3bac173 Mon Sep 17 00:00:00 2001 From: "LAPTOP-S8RC53DH\\Mia" <1976590620@qq.com> Date: Tue, 9 May 2023 17:22:14 +0800 Subject: [PATCH 142/177] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/excel/house_template.xlsx | Bin 9675 -> 9744 bytes .../resources/excel/neighbor_template.xlsx | Bin 11674 -> 11819 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index c722017f3109410cd9fdfa55dc7a89acd840f0b5..3e0871987e755c23909b20e839b61d8d34733012 100644 GIT binary patch delta 5753 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 BruYB= delta 5717 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx index 36297ea510f4e9d917b11d0da6106ac096d05a27..dfdc0d92c067b773d62748b36ec67ce94690cf24 100644 GIT binary patch literal 11819 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 BF9-kt literal 11674 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 Date: Tue, 9 May 2023 18:02:40 +0800 Subject: [PATCH 143/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/CommunityBuildingManagerDTO.java | 7 +- .../CommunityBuildingManagerController.java | 27 +- .../CommunityBuildingManagerEntity.java | 2 +- ...ommunityBuildingManagerImportListener.java | 117 +++++++++ ...mmunityBuildingManagerImportExcelData.java | 116 +++++++++ .../CommunityBuildingManagerService.java | 2 + .../com/epmet/service/IcBuildingService.java | 6 + .../CommunityBuildingManagerServiceImpl.java | 234 +++++++++++++++++- .../service/impl/IcBuildingServiceImpl.java | 20 ++ .../impl/PropertyManagementServiceImpl.java | 2 +- 10 files changed, 516 insertions(+), 17 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java create mode 100644 epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java index 062fe0b7b7..8022d3334c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CommunityBuildingManagerDTO.java @@ -60,6 +60,7 @@ public class CommunityBuildingManagerDTO implements Serializable { */ @NotBlank(message ="类型不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String type; + private String typeName; /** * 所属区县id；取名字关联customer_agency @@ -84,6 +85,7 @@ public class CommunityBuildingManagerDTO implements Serializable { */ @NotBlank(message ="所属网格不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String gridId; + private String gridName; /** * 网格的全路径，包含网格id @@ -95,16 +97,19 @@ public class CommunityBuildingManagerDTO implements Serializable { */ @NotBlank(message ="所属小区不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String viliageId; + private String viliageName; /** * 所属楼栋id */ @NotBlank(message ="楼栋不能为空" ,groups = {AddShowGroup.class,UpdateShowGroup.class}) private String buildingId; + private String buildingName; /** - * 所属单元id; 单元长时必填此列 + * 所属单元id */ private String unitId; + private String unitName; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 7c4f1fef3c..cf2cc27574 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -10,20 +10,28 @@ import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgLevelEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.DateUtils; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.utils.*; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.constants.ImportTaskConstants; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.service.CustomerAgencyService; +import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; import org.apache.poi.ss.usermodel.IndexedColors; @@ -36,12 +44,15 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; +import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.io.PrintWriter; import java.net.URLEncoder; +import java.nio.file.Path; import java.util.Date; import java.util.List; +import java.util.UUID; /** @@ -215,9 +226,11 @@ public class CommunityBuildingManagerController implements ResultDataResolver { * @return */ @PostMapping("import") - public Result importExcel(@RequestPart("file") MultipartFile file) { - return new Result(); - /*// 1.暂存文件 + public Result importExcel(@LoginUser TokenDto tokenDto,@RequestPart("file") MultipartFile file) { + // 只有社区级账号可以导入 + communityBuildingManagerService.checkImportPermission(tokenDto.getCustomerId(),tokenDto.getUserId()); + + // 1.暂存文件 String originalFilename = file.getOriginalFilename(); String extName = originalFilename.substring(originalFilename.lastIndexOf(".")); @@ -255,7 +268,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { // 3.执行导入 communityBuildingManagerService.execAsyncExcelImport(fileSavePath, rstData.getTaskId()); - return new Result();*/ + return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java index c2ac9184b9..dc2e57bd94 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/CommunityBuildingManagerEntity.java @@ -79,7 +79,7 @@ public class CommunityBuildingManagerEntity extends BaseEpmetEntity { private String buildingId; /** - * 所属单元id; 单元长时必填此列 + * 所属单元id */ private String unitId; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java new file mode 100644 index 0000000000..8609096b6f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java @@ -0,0 +1,117 @@ +package com.epmet.excel.handler; + +import com.alibaba.excel.context.AnalysisContext; +import com.alibaba.excel.read.listener.ReadListener; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; +import com.epmet.commons.tools.exception.ValidateException; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.ObjectUtil; +import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.excel.yt.CommunityBuildingManagerImportExcelData; +import com.epmet.service.impl.CommunityBuildingManagerServiceImpl; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2023/5/9 16:26 + */ +@Slf4j +public class CommunityBuildingManagerImportListener implements ReadListener { + + // 最大条数阈值 + public static final int MAX_THRESHOLD = 200; + private String customerId; + private String staffId; + private String agencyId; + private String districtId; + private String streetId; + private String rediPrex; + private CommunityBuildingManagerServiceImpl communityBuildingManagerService; + // 错误项列表 + private List errorRows = new ArrayList<>(); + // 要插入的数据 + private List excelDataList = new ArrayList<>(); + + public CommunityBuildingManagerImportListener(String customerId, String staffId, String agencyId,String districtId,String streetId,String rediPrex,CommunityBuildingManagerServiceImpl communityBuildingManagerService) { + this.customerId = customerId; + this.staffId = staffId; + this.agencyId=agencyId; + this.districtId=districtId; + this.streetId=streetId; + this.rediPrex=rediPrex; + this.communityBuildingManagerService = communityBuildingManagerService; + } + + + @Override + public void invoke(CommunityBuildingManagerImportExcelData data, AnalysisContext analysisContext) { + try { + // log.warn("有数据吗？"+JSON.toJSONString(data)); + // 不能为空先校验数据 + ValidatorUtils.validateEntity(data); + // 去除空格 + ObjectUtil.objectToTrim(data); + + CommunityBuildingManagerDTO communityBuildingManagerDTO = ConvertUtils.sourceToTarget(data, CommunityBuildingManagerDTO.class); + communityBuildingManagerDTO.setCustomerId(customerId); + communityBuildingManagerDTO.setCommunityId(agencyId); + communityBuildingManagerDTO.setType("单元长".equals(data.getTypeName()) ? NumConstant.ONE_STR : NumConstant.ZERO_STR); + excelDataList.add(communityBuildingManagerDTO); + if (excelDataList.size() == MAX_THRESHOLD) { + execPersist(); + } + } catch (Exception e) { + String errorMsg = null; + if (e instanceof ValidateException) { + errorMsg = ((ValidateException) e).getMsg(); + } else if (e instanceof EpmetException) { + errorMsg = ((EpmetException) e).getInternalMsg(); + } else { + errorMsg = "未知错误"; + log.error("【楼长单元长ic_property_management导入】出错:{}", ExceptionUtils.getErrorStackTrace(e)); + } + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(data, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo(errorMsg); + errorRows.add(errorRow); + } + } + + @Override + public void doAfterAllAnalysed(AnalysisContext analysisContext) { + // 最后几条达不到阈值，这里必须再调用一次 + execPersist(); + } + + /** + * 执行持久化 + */ + private void execPersist() { + try { + if (CollectionUtils.isNotEmpty(excelDataList)) { + communityBuildingManagerService.handleImportExcelData(customerId,staffId,agencyId, districtId, streetId,rediPrex,excelDataList,this); + } + } finally { + excelDataList.clear(); + } + } + + /** + * 获取错误行 + * + * @return + */ + public List getErrorRows() { + return errorRows; + } + + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java new file mode 100644 index 0000000000..469532c38f --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/yt/CommunityBuildingManagerImportExcelData.java @@ -0,0 +1,116 @@ +package com.epmet.excel.yt; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotBlank; + +/** + * @Description + * @Author yzm + * @Date 2023/5/9 16:13 + */ +@Data +public class CommunityBuildingManagerImportExcelData { + + /** + * 姓名 + */ + @ExcelProperty(value = "*姓名") + @Length(max = 50, message = "姓名最多输入50字") + @NotBlank(message = "姓名不能为空") + private String name; + + /** + * 联系电话 + */ + @ExcelProperty(value = "*联系电话") + @Length(max = 50, message = "联系电话最多输入50字") + @NotBlank(message = "联系电话不能为空") + private String phone; + + /** + * 身份证号 + */ + @ExcelProperty(value = "*身份证号") + @Length(max = 50, message = "身份证号最多输入50字") + @NotBlank(message = "身份证号不能为空") + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + @ExcelProperty(value = "*类型") + @NotBlank(message = "类型不能为空") + private String typeName; + + @ExcelProperty(value = "*所属网格") + @NotBlank(message = "所属网格不能为空") + private String gridName; + + @ExcelProperty(value = "*所属小区") + @NotBlank(message = "所属小区不能为空") + private String viliageName; + + @ExcelProperty(value = "*楼栋") + @NotBlank(message = "楼栋不能为空") + private String buildingName; + + @ExcelProperty(value = "单元") + private String unitName; + + @Data + public static class ErrorRow { + /** + * 姓名 + */ + @ExcelProperty(value = "*姓名") + @ColumnWidth(20) + private String name; + + /** + * 联系电话 + */ + @ExcelProperty(value = "*联系电话") + @ColumnWidth(20) + private String phone; + + /** + * 身份证号 + */ + @ExcelProperty(value = "*身份证号") + @ColumnWidth(25) + private String idCard; + + /** + * 类型：0楼长；1单元长 + */ + @ExcelProperty(value = "*类型") + @ColumnWidth(15) + private String typeName; + + @ExcelProperty(value = "*所属网格") + @ColumnWidth(30) + private String gridName; + + @ExcelProperty(value = "*所属小区") + @ColumnWidth(30) + private String viliageName; + + @ExcelProperty(value = "*楼栋") + @ColumnWidth(20) + private String buildingName; + + @ExcelProperty(value = "单元") + @ColumnWidth(20) + private String unitName; + + @ColumnWidth(60) + @ExcelProperty("错误信息") + private String errorInfo; + } + +} + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java index eb32743443..fc48ab538f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -66,4 +66,6 @@ public interface CommunityBuildingManagerService extends BaseService ids); void execAsyncExcelImport(Path fileSavePath, String taskId); + + void checkImportPermission(String customerId, String userId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index cde64d4da0..bac9041896 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -133,4 +133,10 @@ public interface IcBuildingService extends BaseService { * @return com.epmet.commons.tools.utils.Result */ Result getBuildingDetail(String buildingId); + + /** + * 更新ic_building的楼长信息那4列：building_leader_name、building_leader_mobile、building_leader_id_card、building_leader_type + * @param updateList + */ + void updateBuildingLeader(List updateList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 6461489107..63c0209d4f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -1,42 +1,66 @@ package com.epmet.service.impl; +import com.alibaba.excel.EasyExcel; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.OrgLevelEnum; +import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.PidUtils; -import com.epmet.commons.tools.utils.SpringContextUtils; +import com.epmet.commons.tools.utils.*; +import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.CommunityBuildingManagerDao; import com.epmet.dao.IcBuildingDao; +import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; +import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.entity.CommunityBuildingManagerEntity; import com.epmet.entity.IcBuildingEntity; +import com.epmet.excel.handler.CommunityBuildingManagerImportListener; +import com.epmet.excel.yt.CommunityBuildingManagerImportExcelData; +import com.epmet.excel.yt.IcPropertyManagementImportExcelData; +import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.OssFeignClient; import com.epmet.service.CommunityBuildingManagerService; +import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; +import com.epmet.utils.ImportTaskUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; +import org.apache.http.entity.ContentType; +import org.apache.poi.util.IOUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.multipart.commons.CommonsMultipartFile; +import java.io.IOException; +import java.io.OutputStream; +import java.nio.file.Files; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * 楼长单元长信息表（烟台） @@ -49,7 +73,12 @@ import java.util.List; public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl implements CommunityBuildingManagerService { @Autowired private IcBuildingDao icBuildingDao; - + @Autowired + private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; + @Autowired + private OssFeignClient ossFeignClient; + + /** * 列表分页查询 * @@ -213,6 +242,14 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl errorRows = listener.getErrorRows(); + + boolean failed = errorRows.size() > 0; + + // 合并到一起写入 + // errorRows.addAll(otherRows); + + // 生成并上传描述文件 + OutputStream os = null; + FileItem fileItem = null; + if (errorRows.size() > 0) { + try { + // 文件生成 + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir(ImportTaskConstants.COMMUNITY_BUILDING_MANAGER, "import", "error_des"); + String fileName = UUID.randomUUID().toString().concat(".xlsx"); + + fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) + .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); + os = fileItem.getOutputStream(); + + EasyExcel.write(os, IcPropertyManagementImportExcelData.ErrorRow.class).sheet("信息列表").doWrite(errorRows); + // 文件上传oss + Result errorDesFileUploadResult = ossFeignClient.uploadImportTaskDescFile(new CommonsMultipartFile(fileItem)); + if (errorDesFileUploadResult.success()) { + errorDesFileUrl = errorDesFileUploadResult.getData().getUrl(); + } + + } finally { + IOUtils.closeQuietly(os); + if (!fileItem.isInMemory()) { + try { + fileItem.delete(); + } catch (Exception e) { + log.error("【楼长单元长表community_building_manager】删除错误描述临时文件失败:{}", ExceptionUtils.getErrorStackTrace(e)); + } + } + } + } + + Result result = ImportTaskUtils.finishImportTask( + importTaskId, + failed ? ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL : ImportTaskConstants.PROCESS_STATUS_FINISHED_SUCCESS, + errorDesFileUrl, + ""); + + if (!result.success()) { + log.error("【楼长单元长表community_building_manager】finishImportTask失败"); + } + } catch (Exception e) { + String errorMsg = ExceptionUtils.getErrorStackTrace(e); + log.error("【楼长单元长表community_building_manager】出错:{}", errorMsg); + + ImportTaskCommonFormDTO importFinishTaskForm = new ImportTaskCommonFormDTO(); + importFinishTaskForm.setTaskId(importTaskId); + importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); + importFinishTaskForm.setOperatorId(staffId); + importFinishTaskForm.setResultDesc("物业管理表导入失败:系统异常，请查看系统日志"); + + Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); + if (!result.success()) { + log.error("【楼长单元长表community_building_manager】导入记录状态修改为'完成'失败"); + } + } finally { + // 删除临时文件 + if (Files.exists(filePath)) { + try { + Files.delete(filePath); + } catch (IOException e) { + e.printStackTrace(); + } + } + // todo 删除 网格缓存、小区缓存、楼栋缓存、单元缓存 + + } + + + } + + /** + * @param customerId + * @param staffId + * @param agencyId + * @param rediPrex + * @param excelDataList + * @param listener + */ + public void handleImportExcelData(String customerId, + String staffId, + String agencyId, + String districtId, + String streetId, + String rediPrex, + List excelDataList, + CommunityBuildingManagerImportListener listener) { + List insertList = new ArrayList<>(); + List updateList = new ArrayList<>(); + for (CommunityBuildingManagerDTO dto : excelDataList) { + try { + CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerEntity.class); + entity.setDistrictId(districtId); + entity.setStreetId(streetId); + //查询当前社区下的网格列表 + // 所属网格 + String gridId = ""; + if (StringUtils.isBlank(gridId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("网格不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + // todo + entity.setOrgIdPath(CustomerOrgRedis.getOrgIdPath(gridId, OrgTypeEnum.GRID.getCode())); + + //查询当前网格下的小区 + // 所属小区 + String viliageId = ""; + if (StringUtils.isBlank(viliageId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("小区不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + entity.setViliageId(viliageId); + + //查询当前小区下的楼栋 + // 所属楼栋 + String buildingId = ""; + if (StringUtils.isBlank(buildingId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("楼栋不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + entity.setBuildingId(buildingId); + + // 所属单元 + String unitId = ""; + if (StringUtils.isNotBlank(dto.getUnitName())) { + // 查询楼栋下的单元列表 + if (StringUtils.isBlank(unitId)) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("单元不存在"); + listener.getErrorRows().add(errorRow); + continue; + } + entity.setUnitId(unitId); + } + + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(CommunityBuildingManagerEntity::getType, entity.getType()) + .eq(CommunityBuildingManagerEntity::getBuildingId, buildingId) + .eq(StringUtils.isNotBlank(unitId), CommunityBuildingManagerEntity::getUnitId, unitId) + .ne(CommunityBuildingManagerEntity::getId, null); + CommunityBuildingManagerEntity origin = baseDao.selectOne(countQuery); + if (null == origin) { + insertList.add(entity); + } else { + entity.setId(origin.getId()); + updateList.add(entity); + } + } catch (Exception e) { + CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); + errorRow.setErrorInfo("数据处理异常"); + listener.getErrorRows().add(errorRow); + } + } + // 同步到ic_building + this.insertBatch(insertList); + this.updateBatchById(updateList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 577e77c787..4e201a5336 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -19,6 +19,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; @@ -173,4 +174,23 @@ public class IcBuildingServiceImpl extends BaseServiceImpl().ok(baseDao.getBuildingDetail(buildingId)); } + /** + * 更新ic_building的楼长信息那4列：building_leader_name、building_leader_mobile、building_leader_id_card、building_leader_type + * + * @param updateList + */ + @Override + public void updateBuildingLeader(List updateList) { + updateList.forEach(dto -> { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(IcBuildingEntity::getId, dto.getId()) + .set(IcBuildingEntity::getBuildingLeaderName, dto.getBuildingLeaderName()) + .set(IcBuildingEntity::getBuildingLeaderMobile, dto.getBuildingLeaderMobile()) + .set(IcBuildingEntity::getBuildingLeaderIdCard, dto.getBuildingLeaderIdCard()) + .set(IcBuildingEntity::getBuildingLeaderType, dto.getBuildingLeaderType()) + .set(IcBuildingEntity::getUpdatedBy, dto.getUpdatedBy()) + .set(IcBuildingEntity::getUpdatedTime, dto.getUpdatedTime()); + baseDao.update(null, updateWrapper); + }); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java index 6ead260319..558383ed73 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/PropertyManagementServiceImpl.java @@ -359,7 +359,7 @@ public class PropertyManagementServiceImpl implements PropertyManagementService importFinishTaskForm.setTaskId(importTaskId); importFinishTaskForm.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); importFinishTaskForm.setOperatorId(userId); - importFinishTaskForm.setResultDesc("城市管理图层导入失败:系统异常，请查看系统日志"); + importFinishTaskForm.setResultDesc("物业管理表导入失败:系统异常，请查看系统日志"); Result result = commonServiceOpenFeignClient.finishImportTask(importFinishTaskForm); if (!result.success()) { From 21760c66f77515e32f5070287f2917d8c3c893dc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 9 May 2023 18:10:05 +0800 Subject: [PATCH 144/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E5=AF=BC=E5=85=A5=EF=BC=8C=E6=9C=AA=E5=AE=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CommunityBuildingManagerController.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index cf2cc27574..2597949a7d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -11,26 +11,24 @@ import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; -import com.epmet.commons.tools.enums.OrgLevelEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; -import com.epmet.commons.tools.utils.*; +import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.ExcelUtils; +import com.epmet.commons.tools.utils.FileUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; -import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; import com.epmet.dto.result.CommunityBuildingManagerDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.yt.CommunityBuildingManagerResultDTO; import com.epmet.service.CommunityBuildingManagerService; -import com.epmet.service.CustomerAgencyService; import com.epmet.utils.ImportTaskUtils; import lombok.extern.slf4j.Slf4j; import org.apache.commons.io.IOUtils; From 81a7d52559b009f248633d476d7162c4863cc0e5 Mon Sep 17 00:00:00 2001 From: "LAPTOP-S8RC53DH\\Mia" <1976590620@qq.com> Date: Tue, 9 May 2023 18:33:43 +0800 Subject: [PATCH 145/177] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/excel/house_template.xlsx | Bin 9744 -> 9788 bytes .../resources/excel/neighbor_template.xlsx | Bin 11819 -> 11942 bytes ...ommunity_building_manager_import_temp.xlsx | Bin 10704 -> 10711 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index 3e0871987e755c23909b20e839b61d8d34733012..1587a5cb7ea5f6c14e7bf2f4df795b17bd928f48 100644 GIT binary patch delta 4817 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 delta 4784 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 K2J;~R0000E7#UUo diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx index dfdc0d92c067b773d62748b36ec67ce94690cf24..6c8ceb27889ef8b871cf444fd8053488070f76df 100644 GIT binary patch delta 5695 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx index fe4242960d6c8691ed7a67875317c48a550c202b..b7da61b8104a52453c477688a28722d5532a418c 100644 GIT binary patch delta 5968 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 Date: Wed, 10 May 2023 09:26:40 +0800 Subject: [PATCH 146/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerController.java | 6 +++--- .../service/CommunityBuildingManagerService.java | 12 +++++++++--- .../impl/CommunityBuildingManagerServiceImpl.java | 4 ++-- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java index 2597949a7d..379af23a48 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CommunityBuildingManagerController.java @@ -93,7 +93,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { /** * 新增楼长/单元长 - * todo: 同步到具体的楼栋 + * 同步到具体的楼栋 * @param dto * @return */ @@ -112,7 +112,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { /** * 编辑楼长/单元长 - * todo: 同步到具体的楼栋 + * 同步到具体的楼栋 * @param dto * @return */ @@ -130,7 +130,7 @@ public class CommunityBuildingManagerController implements ResultDataResolver { /** * 批量删除楼长/单元长 - * todo: 同时清空楼栋表里的信息 + * 同时清空楼栋表里的信息 * @param ids * @return */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java index fc48ab538f..1e90100266 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/CommunityBuildingManagerService.java @@ -40,7 +40,7 @@ public interface CommunityBuildingManagerService extends BaseService buildingUpdate = new LambdaUpdateWrapper<>(); buildingUpdate.eq(IcBuildingEntity::getId, entity.getBuildingId()) .set(IcBuildingEntity::getBuildingLeaderName, entity.getName()) @@ -194,7 +194,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingUpdate = new LambdaUpdateWrapper<>(); buildingUpdate.eq(IcBuildingEntity::getId, updateFormDto.getBuildingId()) .set(IcBuildingEntity::getBuildingLeaderName, updateFormDto.getName()) From 6f25c600baf4eea7a9dd76c43a656c89eed5d40d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 10 May 2023 10:05:17 +0800 Subject: [PATCH 147/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=831?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ommunityBuildingManagerImportListener.java | 9 ++- .../CommunityBuildingManagerServiceImpl.java | 79 ++++++++++++------- 2 files changed, 56 insertions(+), 32 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java index 8609096b6f..d496c0b2cb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CommunityBuildingManagerImportListener.java @@ -17,6 +17,7 @@ import org.apache.commons.collections4.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * @Description @@ -28,6 +29,7 @@ public class CommunityBuildingManagerImportListener implements ReadListener gridMap; private String customerId; private String staffId; private String agencyId; @@ -40,7 +42,8 @@ public class CommunityBuildingManagerImportListener implements ReadListener excelDataList = new ArrayList<>(); - public CommunityBuildingManagerImportListener(String customerId, String staffId, String agencyId,String districtId,String streetId,String rediPrex,CommunityBuildingManagerServiceImpl communityBuildingManagerService) { + public CommunityBuildingManagerImportListener(Map gridMap,String customerId, String staffId, String agencyId, String districtId, String streetId, String rediPrex, CommunityBuildingManagerServiceImpl communityBuildingManagerService) { + this.gridMap=gridMap; this.customerId = customerId; this.staffId = staffId; this.agencyId=agencyId; @@ -73,7 +76,7 @@ public class CommunityBuildingManagerImportListener implements ReadListener gridList=customerGridService.getGridOption(staffInfoCacheResult.getAgencyId(), "addorupdate"); + Map gridMap = gridList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + String uuid = IdWorker.getIdStr(); try { - staffId = EpmetRequestHolder.getLoginUserId(); - String customerId = EpmetRequestHolder.getLoginUserCustomerId(); - CustomerStaffInfoCacheResult staffInfoCacheResult=CustomerStaffRedis.getStaffInfo(customerId,staffId); - // todo - String districtId=""; - String streetId=""; - String uuid= IdWorker.getIdStr(); - CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,uuid, + CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(gridMap,customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,uuid, SpringContextUtils.getBean(CommunityBuildingManagerServiceImpl.class)); EasyExcel.read(filePath.toFile(), CommunityBuildingManagerImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); @@ -362,7 +370,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl gridMap, + String customerId, String staffId, String agencyId, String districtId, @@ -377,50 +386,62 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl viliageList = SpringContextUtils.getBean(IcNeighborHoodService.class).queryNeighborHoodOptions(neighborHoodOptionFormDTO); + Map viliageMap = viliageList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + if (MapUtils.isEmpty(viliageMap) || !viliageMap.containsKey(dto.getViliageName()) || StringUtils.isBlank(viliageMap.get(dto.getViliageName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); errorRow.setErrorInfo("小区不存在"); listener.getErrorRows().add(errorRow); continue; } + String viliageId = viliageMap.get(dto.getViliageName()); entity.setViliageId(viliageId); - //查询当前小区下的楼栋 + + // 查询当前小区下的楼栋 // 所属楼栋 - String buildingId = ""; - if (StringUtils.isBlank(buildingId)) { + List buildingList = SpringContextUtils.getBean(IcBuildingService.class).getBuildingOptions(viliageId); + Map buildingMap = buildingList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + if (MapUtils.isEmpty(buildingMap) || !buildingMap.containsKey(dto.getBuildingName()) || StringUtils.isBlank(buildingMap.get(dto.getBuildingName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); errorRow.setErrorInfo("楼栋不存在"); listener.getErrorRows().add(errorRow); continue; } + String buildingId = buildingMap.get(dto.getBuildingName()); entity.setBuildingId(buildingId); // 所属单元 String unitId = ""; if (StringUtils.isNotBlank(dto.getUnitName())) { // 查询楼栋下的单元列表 - if (StringUtils.isBlank(unitId)) { + List unitList = SpringContextUtils.getBean(IcBuildingUnitService.class).getUnitOptions(buildingId); + Map unitMap = unitList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); + if (MapUtils.isEmpty(unitMap) || !unitMap.containsKey(dto.getUnitName()) || StringUtils.isBlank(unitMap.get(dto.getUnitName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); errorRow.setErrorInfo("单元不存在"); listener.getErrorRows().add(errorRow); continue; } + unitId = unitMap.get(dto.getUnitName()); entity.setUnitId(unitId); } From bb16b9ff7deb5019e8290d574038b828a8c7c700 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 10 May 2023 11:09:02 +0800 Subject: [PATCH 148/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=8312?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CommunityBuildingManagerServiceImpl.java | 81 ++++++++++++++++--- .../service/impl/IcBuildingServiceImpl.java | 2 +- 2 files changed, 69 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java index 05a906abe5..538671377e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CommunityBuildingManagerServiceImpl.java @@ -15,6 +15,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.*; @@ -23,6 +24,7 @@ import com.epmet.dao.CommunityBuildingManagerDao; import com.epmet.dao.IcBuildingDao; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.CustomerGridDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.form.NeighborHoodOptionFormDTO; import com.epmet.dto.form.yt.CommunityBuildingManagerPageFormDTO; @@ -78,7 +80,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl gridList=customerGridService.getGridOption(staffInfoCacheResult.getAgencyId(), "addorupdate"); Map gridMap = gridList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); String uuid = IdWorker.getIdStr(); + String redisKey = "community_building_manager_import".concat(StrConstant.COLON).concat(uuid); + try { - CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(gridMap,customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,uuid, + CommunityBuildingManagerImportListener listener = new CommunityBuildingManagerImportListener(gridMap,customerId,staffId,staffInfoCacheResult.getAgencyId(),districtId,streetId,redisKey, SpringContextUtils.getBean(CommunityBuildingManagerServiceImpl.class)); EasyExcel.read(filePath.toFile(), CommunityBuildingManagerImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); @@ -355,8 +360,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl insertList = new ArrayList<>(); List updateList = new ArrayList<>(); + List buildingUpdateList=new ArrayList<>(); for (CommunityBuildingManagerDTO dto : excelDataList) { try { CommunityBuildingManagerEntity entity = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerEntity.class); @@ -399,12 +405,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl viliageList = SpringContextUtils.getBean(IcNeighborHoodService.class).queryNeighborHoodOptions(neighborHoodOptionFormDTO); + List viliageList =queryViliageList(customerId,staffId,agencyId,gridId,rediPrex); Map viliageMap = viliageList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); if (MapUtils.isEmpty(viliageMap) || !viliageMap.containsKey(dto.getViliageName()) || StringUtils.isBlank(viliageMap.get(dto.getViliageName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); @@ -418,7 +419,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl buildingList = SpringContextUtils.getBean(IcBuildingService.class).getBuildingOptions(viliageId); + List buildingList=queryBuildingList(viliageId,rediPrex); Map buildingMap = buildingList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); if (MapUtils.isEmpty(buildingMap) || !buildingMap.containsKey(dto.getBuildingName()) || StringUtils.isBlank(buildingMap.get(dto.getBuildingName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); @@ -433,7 +434,7 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl unitList = SpringContextUtils.getBean(IcBuildingUnitService.class).getUnitOptions(buildingId); + List unitList=queryUnitList(buildingId,rediPrex); Map unitMap = unitList.stream().collect(Collectors.toMap(OptionResultDTO::getLabel, OptionResultDTO::getValue)); if (MapUtils.isEmpty(unitMap) || !unitMap.containsKey(dto.getUnitName()) || StringUtils.isBlank(unitMap.get(dto.getUnitName()))) { CommunityBuildingManagerImportExcelData.ErrorRow errorRow = ConvertUtils.sourceToTarget(dto, CommunityBuildingManagerImportExcelData.ErrorRow.class); @@ -442,8 +443,8 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl countQuery = new LambdaQueryWrapper<>(); countQuery.eq(CommunityBuildingManagerEntity::getType, entity.getType()) @@ -457,6 +458,17 @@ public class CommunityBuildingManagerServiceImpl extends BaseServiceImpl queryViliageList(String customerId, String staffId, String agencyId, String gridId, String rediPrex) { + String redisKey = rediPrex.concat(StrConstant.COLON).concat("viliage_list").concat(StrConstant.COLON).concat(gridId); + List viliageList = redisUtils.lrange(redisKey, NumConstant.ZERO, NumConstant.ONE_NEG, OptionResultDTO.class); + if (!CollectionUtils.isEmpty(viliageList)) { + return viliageList; + } + NeighborHoodOptionFormDTO neighborHoodOptionFormDTO = new NeighborHoodOptionFormDTO(); + neighborHoodOptionFormDTO.setCustomerId(customerId); + neighborHoodOptionFormDTO.setStaffId(staffId); + neighborHoodOptionFormDTO.setAgencyId(agencyId); + neighborHoodOptionFormDTO.setGridId(gridId); + List resultList = SpringContextUtils.getBean(IcNeighborHoodService.class).queryNeighborHoodOptions(neighborHoodOptionFormDTO); + // 有效时间1小时 + redisUtils.leftPush(redisKey, resultList, RedisUtils.HOUR_ONE_EXPIRE); + return resultList; + } + + private List queryBuildingList(String viliageId, String rediPrex) { + String redisKey = rediPrex.concat(StrConstant.COLON).concat("building_List").concat(StrConstant.COLON).concat(viliageId); + List buildingList = redisUtils.lrange(redisKey, NumConstant.ZERO, NumConstant.ONE_NEG, OptionResultDTO.class); + if (!CollectionUtils.isEmpty(buildingList)) { + return buildingList; + } + List resultList = SpringContextUtils.getBean(IcBuildingService.class).getBuildingOptions(viliageId); + // 有效时间1小时 + redisUtils.leftPush(redisKey, resultList, RedisUtils.HOUR_ONE_EXPIRE); + return resultList; + } + + private List queryUnitList(String buildingId, String rediPrex) { + String redisKey = rediPrex.concat(StrConstant.COLON).concat("unit_List").concat(StrConstant.COLON).concat(buildingId); + List unitList = redisUtils.lrange(redisKey, NumConstant.ZERO, NumConstant.ONE_NEG, OptionResultDTO.class); + if (!CollectionUtils.isEmpty(unitList)) { + return unitList; + } + List resultList = SpringContextUtils.getBean(IcBuildingUnitService.class).getUnitOptions(buildingId); + // 有效时间1小时 + redisUtils.leftPush(redisKey, resultList, RedisUtils.HOUR_ONE_EXPIRE); + return resultList; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 4e201a5336..fa8737e051 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -189,7 +189,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl Date: Wed, 10 May 2023 13:28:37 +0800 Subject: [PATCH 149/177] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 27 ++++++++++++++++++ .../epmet/model/NeighborHoodInfoModel.java | 12 ++++++++ .../impl/IcNeighborHoodServiceImpl.java | 21 ++++++++++++++ .../resources/excel/neighbor_template.xlsx | Bin 11674 -> 11413 bytes .../excel/neighbor_template_0510.xlsx | Bin 0 -> 11674 bytes .../resources/mapper/IcNeighborHoodDao.xml | 20 +++++++++++++ 6 files changed, 80 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template_0510.xlsx diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index df0f6b0530..dca6c1244b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -183,4 +183,31 @@ public class ImportGeneralDTO implements Serializable { */ private Boolean buildingUpdateStatus = false; private Boolean neighborHoodUpdateStatus = false; + + /** + * 烟台需求：自然村/小区 + */ + private String viliageType; + + /** + * 烟台需求：自然村/小区 + */ + private String viliageTypeName; + /** + * 烟台需求：面积 + */ + private String area; + /** + * 烟台需求：开放类型 + */ + private String openType; + + /** + * 烟台需求：开放类型 + */ + private String openTypeName; + /** + * 烟台需求：建筑年代 + */ + private String buildYear; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java index 63260ee190..b1f33f409b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java @@ -21,6 +21,18 @@ public class NeighborHoodInfoModel { @ExcelProperty(value = "小区名称") private String neighborHoodName; + @ExcelProperty(value = "小区/自然村类型") + private String viliageTypeName; + + @ExcelProperty(value = "面积") + private String area; + + @ExcelProperty(value = "开放类型") + private String openTypeName; + + @ExcelProperty(value = "建筑年代") + private String buildYear; + @ExcelProperty(value = "关联物业") private String propertyName; 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 c253f154c5..55d7d172e5 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 @@ -795,6 +795,27 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl needUpdateList) { + + needUpdateList.forEach( + needUpdate->{ + if (StringUtils.isNotBlank(needUpdate.getOpenTypeName())){ + if (needUpdate.getOpenTypeName().equals("自然村")){ + needUpdate.setOpenType("2"); + } + if (needUpdate.getOpenTypeName().equals("住宅小区")){ + needUpdate.setOpenType("1"); + } + } + if (StringUtils.isNotBlank(needUpdate.getViliageTypeName())){ + if (needUpdate.getViliageTypeName().equals("封闭式")){ + needUpdate.setViliageTypeName("1"); + } + if (needUpdate.getViliageTypeName().equals("开放式")){ + needUpdate.setViliageTypeName("2"); + } + } + }); + if (CollectionUtils.isNotEmpty(needUpdateList)){ baseDao.updateNeighborHood(needUpdateList); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx index 36297ea510f4e9d917b11d0da6106ac096d05a27..6cf2b7957e2ae12805b1ebea85d4c8c93c0b1585 100644 GIT binary patch literal 11413 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 JE9B4G{|{5RXjA|I literal 11674 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 + + + when id = #{l.neighborHoodId} then #{l.area} + + + + + when id = #{l.neighborHoodId} then #{l.buildYear} + + + + + when id = #{l.neighborHoodId} then #{l.viliageType} + + + + + when id = #{l.neighborHoodId} then #{l.openType} + + UPDATED_TIME = NOW() WHERE DEL_FLAG = '0' From eaee037d039b7f1392c1926bb435475309b1354f Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Wed, 10 May 2023 13:47:04 +0800 Subject: [PATCH 150/177] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/excel/IcNeighborHoodExcel.java | 13 +++++++++++++ .../main/resources/excel/neighbor_export.xlsx | Bin 12931 -> 11704 bytes .../resources/excel/neighbor_export_0510.xlsx | Bin 0 -> 12931 bytes .../resources/mapper/IcNeighborHoodDao.xml | 4 ++++ 4 files changed, 17 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export_0510.xlsx diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java index e9306fa5d7..227ed90e4a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java @@ -18,6 +18,7 @@ package com.epmet.excel; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.alibaba.excel.annotation.ExcelProperty; import com.epmet.util.ExcelVerifyInfo; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; @@ -108,6 +109,18 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable @Length(max=50,message = "不能超过50个字") private String neighborHoodName; + @Excel(name = "小区/自然村类型") + private String viliageTypeName; + + @Excel(name = "面积") + private String area; + + @Excel(name = "开放类型") + private String openTypeName; + + @Excel(name = "建筑年代") + private String buildYear; + @Excel(name = "关联物业") private String propertyName; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx index 2a1b3237d9de0b9f071d4c7ebfcc9fb0df6ef6cb..2d89d9255729ab7c6c41c736ad33386460df8c27 100644 GIT binary patch literal 11704 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 literal 12931 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

9`#A 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

9`#A z^g$5_AJ$!|Y>})zK+PMVe5R$TV`@E_*c8Dq{PeY)szpDzb}fnt zlJqQL^6E=U8+O;jl#!x~tWS#<3vkt(#!(Av>*S>eN|*tz)ooZYWXEGK8W!h;60q=s zb~8Bna6$|UOZ}Q(@J!^03CrZwJ(?AT%qPS5LQxli<0Luz?pv$gX`@EqyiH&f)$%BW z!q3a-TPwl9Pkr5t%evg5n|RLCdvjxU|KP>q5i>Lb&z*1B2ZYxOKvW%ce3E*6Fn?Tq zi#ywxkJqF?+&hVV(mi^;dA2cF8@5m?ZH?70SAiAzj&keW)4i*b=u)}#5(9;zxK4wNiTy z*TSRh>J!*VZSUHbbybZ+6BJD9T&@`Zl}!Qb;N)5$Z(;yq6e_5tXlP>~Z*ODkz-VA& zZ}c;!1E~bIU*)eJuS(Qes z1CzOKUPGzzP(KfY(68UwWTwKJarpSVBhOM>tfwl+4$2|3=%Rh$AQn_8?rvT0JiRX{ zzrsvA`;j+TA11a^3Fug}mbj`z8&%03+l-^PfVtE4wTtOL06aGJ9G%if<+0GY;LHeO zI4QUGEr(#;%$NCgZC+kN)kz&QGUtv=|_59kkUU;8w|7-}D`+eH8S0T*6vWt$J8 zq!j4*1OAngdbYOzWh97-e}2+prL5;cJ=!ZMdzcS*N!2ePKL|2YoeE%4>$gi@Dw!Li zW{ZDFgLNK_k->(t_bate#oA_;lnAE3s@kzOe*8Kb$(qNxJVjwP4s&4HlOG#LZW>Qp zt8KE+*T%I~8V}D^+$pQB;6Of1;j}VZQ*J0}ov{HtB=zeIxZ`p}{$Q5)kA$FQQ9rFQ#j+ohuEs zOu1$-iBsmYcCblV_8Fl(Z^Jxy43-b;O`cA+`)NvjdM_s?Efh54+J|aLbopa1!3AQ+ zPA%U{!H@(jdK!B^xLYZLtuXRT65XKWDy+}YQm73U_%VF1WQZBPKfk|wyu3f#3tdql zGWX)Ne$jg?GIAG)L-5KO8bS;M8O}ilx>LIeQqCJJBl3esAec+Lx=JwHi?ai953@@f zGvXJ^#hFSQcj4Qr^S!pq8;5AH%P{ZNFiPNgucZ6TYA=7x8$-t z2vIthqb4UMxa8JE`#Cxh@-Xh?2$t7+6;=mT4sW%nw^u>%Hx)_3_%=H2ti$YtW@<^Qq?wB_A!gZP#D> zv*B{8ahDOZ?YF-ir=lZQaJHLLr8+k8`KMl^f*4z#^YEf^;;^@V2nJ=7?}s;&pQj! zK9riPs%_rxw%@Id>yv`2=Isu~#9HtQunnAKf#iHWA6oQ$m_tnAEA-$Qk)LYe7+<+; z9`?FoV5y+T53(RDh+vVGQ-6%jgX2&L$BMf*hNy@f;s>qP9~=V%rw0Xt|2{eXdrANJ z_Ahhf@=|{X`1`!-UjYU|PWdm>tIrLePwo9SeFV+%J)7ZsZv6N0rr)Lj02-*;_J0pM zJ;!-I SELECT - d.id, - d.`NAME`, - d.ID_CARD, - d.DEATH_DATE, - d.AGE, - d.ADDRESS, - d.IC_RESI_USER_ID, - d.GRID_ID, - d.AGENCY_ID, - d.CREMATION_TIME, - d.ORGAN_NAME + d.* FROM data_sync_record_death d WHERE From 947072e7046e2273d0731cd70b8b6b2bc3d0828a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 May 2023 15:05:41 +0800 Subject: [PATCH 165/177] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DataSyncRecordDeathServiceImpl.java | 54 ++++++++++++++----- 1 file changed, 40 insertions(+), 14 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java index 75403760af..d64ac4b252 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java @@ -14,16 +14,20 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; +import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.SpringContextUtils; import com.epmet.dao.DataSyncRecordDeathDao; +import com.epmet.dao.IcResiUserDao; import com.epmet.dto.ChangeDeathDTO; import com.epmet.dto.DataSyncRecordDeathDTO; import com.epmet.dto.form.dataSync.DataSyncRecordDeathPageFormDTO; import com.epmet.entity.DataSyncRecordDeathEntity; +import com.epmet.entity.IcResiUserEntity; import com.epmet.service.DataSyncRecordDeathService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,6 +42,8 @@ import java.util.Map; */ @Service public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl implements DataSyncRecordDeathService { + @Autowired + private IcResiUserDao icResiUserDao; /** * 列表查询 @@ -124,27 +130,47 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcResiUserEntity::getIdCard, entity.getIdCard()) + .eq(IcResiUserEntity::getCustomerId, entity.getCustomerId()) + .eq(IcResiUserEntity::getDelFlag, NumConstant.ZERO_STR) + .select(IcResiUserEntity::getId); + IcResiUserEntity icResiUserEntity = icResiUserDao.selectOne(queryWrapper); + if (null == icResiUserEntity) { + existedFlag = false; + entity.setIcResiUserId(null); + entity.setDealResult("居民信息表不存在此居民"); + }else{ + entity.setIcResiUserId(icResiUserEntity.getId()); + } + if(existedFlag){ + ChangeDeathDTO changeDeathDTO = new ChangeDeathDTO(); + changeDeathDTO.setStaffId(userId); + changeDeathDTO.setUserId(entity.getIcResiUserId()); + changeDeathDTO.setGridId(entity.getGridId()); + changeDeathDTO.setName(entity.getName()); + changeDeathDTO.setIdCard(entity.getIdCard()); + // 手机号没有值 + changeDeathDTO.setMobile(StrConstant.EPMETY_STR); + changeDeathDTO.setDeathDate(DateUtils.stringToDate(entity.getDeathDate(), "yyyy-MM-dd")); + changeDeathDTO.setJoinReason("来源于数据比对-死亡人员数据"); + Result result=SpringContextUtils.getBean(ChangeDeathServiceImpl.class).save(changeDeathDTO); + if(!result.success()){ + entity.setDealStatus(NumConstant.TWO); + entity.setDealResult("同步死亡人员返回失败"); + } + } } catch (EpmetException epmetException) { - + //0:未处理；1:处理成功；2处理失败 entity.setDealStatus(NumConstant.TWO); entity.setDealResult("系统内部异常:" + epmetException.getMsg()); epmetException.printStackTrace(); } catch (Exception e) { - + //0:未处理；1:处理成功；2处理失败 entity.setDealStatus(NumConstant.TWO); entity.setDealResult("未知错误"); From d3f281a32184d97b78bf7b75b88ae85960ab3cb0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 May 2023 15:58:49 +0800 Subject: [PATCH 166/177] =?UTF-8?q?=E6=AD=BB=E4=BA=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=80=BB=E8=BE=91=E8=B0=83=E6=95=B4:?= =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AD=98=E5=9C=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java index d64ac4b252..012d9cf1f2 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/DataSyncRecordDeathServiceImpl.java @@ -141,6 +141,7 @@ public class DataSyncRecordDeathServiceImpl extends BaseServiceImpl Date: Thu, 11 May 2023 16:01:11 +0800 Subject: [PATCH 167/177] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmetuser/impl/EpmetUserServiceImpl.java | 8 +++++ .../excel/CustomerStaffImportExcelData.java | 4 +-- .../epmet/service/impl/StaffServiceImpl.java | 2 +- .../impl/CustomerStaffServiceImpl.java | 35 ++++++++++--------- 4 files changed, 29 insertions(+), 20 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java index ea9980e7af..0a6f640a1f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/EpmetUserServiceImpl.java @@ -723,6 +723,14 @@ public class EpmetUserServiceImpl implements EpmetUserService { formDTO.setPageNo(pageIndex); //1.分页查询排好序的工作人员Id列表【原本1/2步可以用一个sql，但涉及2需要按1的顺序排序，sql复杂且效率低，所以拆开】 LinkedList staffIds = customerStaffDao.selectOrderRole(formDTO); + if (staffIds!=null && formDTO.getStaffIds()!=null){ + formDTO.getStaffIds().forEach( + staffId->{ + if (!staffIds.contains(staffId)){ + staffIds.add(staffId); + } + }); + } //2.批量查询工作人员信息，按传入顺序排序 if(CollectionUtils.isEmpty(staffIds)){ return new ArrayList<>(); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java index b5a1b08e1d..d724dc35b4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java @@ -29,10 +29,10 @@ public class CustomerStaffImportExcelData { private String idCard; @ExcelProperty("村居委员职务") - private Date viliagePosition; + private String viliagePosition; @ExcelProperty("党组织职务") - private Date partyPosition; + private String partyPosition; @NotBlank(message = "居住地址为必填项") @ExcelProperty("居住地址※") diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java index 7a3e7db3fc..c45dc5d646 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java @@ -774,7 +774,7 @@ public class StaffServiceImpl implements StaffService { CustomerStaffImportListener listener = new CustomerStaffImportListener(userRemoteService.getLoginUserDetails().getUserId(), userRemoteService.getLoginUserDetails().getCustomerId(), orgType,orgId,this); - EasyExcel.read(filePath.toFile(), CustomerStaffImportExcelData.class, listener).headRowNumber(2).sheet(0).doRead(); + EasyExcel.read(filePath.toFile(), CustomerStaffImportExcelData.class, listener).headRowNumber(1).sheet(0).doRead(); String errorDesFileUrl = null; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 9238d9d20d..dbaf7171e1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -402,29 +402,30 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl { - StaffRoleEntity staffRoleEntity = new StaffRoleEntity(); - staffRoleEntity.setStaffId(userEntity.getId()); - staffRoleEntity.setRoleId(role); - staffRoleEntity.setOrgId(fromDTO.getAgencyId()); - staffRoleEntity.setCustomerId(fromDTO.getCustomerId()); - staffRoleService.insert(staffRoleEntity); - }); + if (fromDTO.getRoles()!=null){ + fromDTO.getRoles().forEach(role -> { + StaffRoleEntity staffRoleEntity = new StaffRoleEntity(); + staffRoleEntity.setStaffId(userEntity.getId()); + staffRoleEntity.setRoleId(role); + staffRoleEntity.setOrgId(fromDTO.getAgencyId()); + staffRoleEntity.setCustomerId(fromDTO.getCustomerId()); + staffRoleService.insert(staffRoleEntity); + }); + // 角色放缓存 + List roleKeyValue = govStaffRoleDao.selectRoleKeyName(fromDTO.getRoles()); + Map m = new HashMap(16); + roleKeyValue.forEach(r -> { + m.put(r.getRoleKey(), r.getRoleName()); + }); + dto.setRoles(m); + } - // 角色放缓存 - CustomerAgencyUserRoleDTO dto = new CustomerAgencyUserRoleDTO(); - List roleKeyValue = govStaffRoleDao.selectRoleKeyName(fromDTO.getRoles()); dto.setCustomerId(fromDTO.getCustomerId()); dto.setStaffId(userEntity.getId()); dto.setAgencyId(fromDTO.getAgencyId()); - Map m = new HashMap(16); - roleKeyValue.forEach(r -> { - m.put(r.getRoleKey(), r.getRoleName()); - }); - dto.setRoles(m); CustomerStaffRedis.delStaffInfoFormCache(dto.getCustomerId(), dto.getStaffId()); - return new Result().ok(ConvertUtils.sourceToTarget(staffEntity, CustomerStaffDTO.class)); } From 17b309f8cb2981a63fefded5c5eb89d82c063923 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 11 May 2023 16:30:24 +0800 Subject: [PATCH 168/177] =?UTF-8?q?=E6=A5=BC=E5=BC=A0=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E5=AF=BC=E5=85=A5=E6=A8=A1=E6=9D=BF=E8=B0=83=E6=95=B4?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ommunity_building_manager_import_temp.xlsx | Bin 9463 -> 10742 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/yantai/community_building_manager_import_temp.xlsx index 46c532d2b5df5eb27f9fd0230f5822602f697803..e8ceae9aa1ff6720df536d9991372ae86a1c18c6 100644 GIT binary patch delta 7654 zcmeHsWl$X3x9{NYuEXFE2tk8OU~mr*2<{LFI(T4$GgyEb+zAA?0KuK0feaFy;2tzs zf<1EnRrlO;s^0tZKHM*NS9N!F_u6asUca^0?)_VrDi_ZagmF@8q<%@D006HNrKzDw z-KuE(ovz^3s|ofE+?>Uo;r zr-z3lfs0vmJ@)%$tOTOfl`6XqY1*iYb0(R#s(h5ip)9JBs_>BsTIF3#$!yrIRF0T& zs60VV820+}mS+{kv3?C9s=qC3G~A%L``j=~h?-r@vqz$}dmm6kowHaY@u#ubBj0Gd zqB*K(iCirs7t2zr}V=T6CzH&BQ8S7hKwHfY_a7>zJF1*D{MOd=y4DN%j3&hqnd z;faZHFf7>${5FE{nJ$(21YAtT<@;ry`)v9+D)8ZA$b=D>)kXli7?a_UApg5@BXM`7 z!SM)O&7Zomu_<}uqH{~IG<>7d6@_F{#E`5+3M*vLCblXz5!9byDks-q&(ITHrwgT+ znk~+-R+$sdMkBz62%D?&px4 zQuc}IMfDPu>lbrb4OZJ`I~9Tk`kVTp>=C0!>oL10j&)_3u-^vw+NAE30vJ;WZlm^& zz&4pc>1Cy+7nOWz&tHGIn61OV>NXYl<=<>9C8>DTXyvZ)I|XO4)~`q8R#6N{&sao; zKxd_HviZt(&2`diK~CynMD%^H`e#G9mDC+jVOeXa1Vk9nN5JIh;d&3-p!=tZ!@_|t z;7n*B=!j~sEP2Fb$Puw!?iV&HK{ge~#~AMU76%4BHWQcvf|ho=ylbrzMF#Gxim8!5 zf1ccK+l;*6_s6Ol&9fnNd;4~P?fDXukC^X##VxsS|EG^mN^E|F@r!S5-2;=Q9E9Cp zW4TC1Ca_}#I2B`rMI1CcXsk?6y!I~wJ1v#?XhY9$yL>BWd7A1Im=Llebmd_(fva8V zjiR%i%o3k9z3p1XG&LIsrB{`zsl0bQjtvI%O$RtHROBB4SxkNl6+V?#C1GYOorZjC zLvs}m$2qonWOBanYTpp6mAaV9+DnIo)>3^WjFq*(t3LXf>Ljak61S<6#!YN5e$arR z?>P5Wv9>QsOF)~CRBQU22V=j>$T^Wrh}D`keN!=}C@#tEC}vKT*PZPNN&+oB6kQJ2 zYqV&!0}TK`!G({ZGeJk<7evUHsCHzqO(5TtKLD-YIf)G#uB%65VvE0S*;208z-QxT zwH>uFhRoSY=R1}ruNRC54W= zZylKc8!h9ew03hLYpo_1QUCjK{RGk!5S1kt9}MIzK{=`12UZn42vHt}Mg0C2yjd21 zfiNNGODqgC+xH(+ja|%SXUw_SQ#0ZTCzUuDU?wneynS39x^Ix{xQHhtYoNMeo!A-D zB_?#)B|7=_6LhJCsZ7g#_~Y4#$uD;UeRoCT94tLo+#)b7i3ZZ&_Qgsl{&aa5N{rpE zl!_0?KQz^c4Bb2CYS5u{Y%7PI=n^q$IEh{uBFPer1!5#PW=KwJBNgLo+>cx_PDZo-l=d=! z35Hu$LQhMNq4*5HbAF5oNAjcChW*)Gd0_I>us5KS`qPNo)BYIGqtuZIo=?uy`-`6P ztKe{RedySeoGhxCphT*FvgFseHwuM=vT<8nuxmQ`%}#Q6aFeFs|u<<-_Z~ zPw&ziNL;U@%0<@3K(gW*jXyC-09ph_dEF=x3x?nMxCSm^9!Equszc_SsVS_61lVufO(K9%pmQ#QjErJ0$8??E* zO;2b&hEQZ&H9@tvRl_dr*0I1XnKeuss ze9aTo^g+%JMxtr9sEv#@3|3MYi%fK%IUvVrR| zIm>VP9h4|=2m#v>Y%z{F|FC;7As>xS0?O;p!u6qptlKX^L)@m`H+35rmNx5;SRIo?23u(M+^GDXyDM0BL0wZ+p~zzA zxczv>>h_)1^W5M&K^~S{OE)T#9|g_r6VW+IOJHIoo<045GXzwAP!|nHsjR|4LhZ1_ z>>jC{mMK4V+Xm|kacjD__;2O&{wk(;_j&5B)B>M_Kl3o)oo^bgc}CJU8Me^W}hjkCpPX?2o~Y4(sNA-lOTcS}zOJkVShG_5p>WF>L$ms?SW4C0jQtz=dpnTi?+L z;>C8mmdj;MFckE6^i4YIJ=uJAhSb3D5}HqHh_vW+meM=a|0leH{|oQ`B)rf5|KUww ztV_ZEh6#08QlR(61ptBqvcy%Klze! zg$ym-#>AhEkWJyt1c3d?DP|ck3pJkmFbG&EH#&oZy?8(V=v{lgRD)p( zzY|PkhVFINcmg-tU$l@rel94Xj=B=RYzw-CW<5NdZdmUqU;GprydE%`)MCWN^=am$ zHQoowbG!4QVVsjIwC2ETq3UREbOI*DX}WNC(fA2-73Q=oT7RG&%-$wf2ceEodNHyo zw~ah(#LB!&Jm}8O0iG>@vM{kWyLBuYThSDzd`4at={~w#h<`Ev{WK!597u?WmpOy> z*bPPTaczw4n>LlCkWaiEISS!yL>zIw=zwmjZl;{lir?*GLNAtbiEfV@2u?$Duey1Q z^x_Rq4qiCPRtY{G3Ri!&Gx~{v88Z6^<)VTZnCd)A1*d)&tZ#y^Z|%qu;@#sIgrmSJ5+v z3mdTUxoUICfVa8g&RA%&K+qHcguwcp^qh~Rj4ahi*Z_Gk?m9XBkEd#sH|1S25V1$C zV!WL%$zn24)SxIVZf{CRAZm?!4eE-%UUqhP_#F^Ca^*S6Or25?Y9@O9R5UhJImIj8 zK;3c{5D};L%}qv5{*{Il++#1ib(4pg56LSiuBBZWOisc)##X+?N}cqq$R)p1ecD8! zeedHpvRIf#qq;TjqFrrBL28Gj^_W0?)r^neRxG%U!!qi0s_2y{N9<OO#W|z#~FV5e}Qa|Irphx3`X422ZmD`#sg_E1ieHVWfna|)$nZx$Eam+Y>)u5xVF{-V>IwBo7 zd(v`IOF$7sK;>?$39CTmIIiZu^IBQfc8XK%6@pL*zGS{{Ds*o6a^qDA4XOI@{fQH8 ziAlH17x0X~6Q57#R!sS9b;`F_o9~^HEk(^u9o4In1rZ7*{RfSt6-Lu_AY#p1ng7PY}s>5@DGZ2d)IX zrXn060iVTiT9V*RmuD0m6IVY?6f3)Ua<+>rPa~yZtQAN(@)oQN4J7Z2EmRLo;jGJh zT#s%w2`i-?)h*l+R!jJ>#Piv9r|EsZ41)jT-k^@nWFpI835!yqzLK_V#1=M3VCz2q zH4+Wma6KeemVQ;5fgA5*RBv&xoknbnPAQ#!rJ{3=e!DVJ{)mo34Q#&R@doF|<^-0( zooDfD1>)Yfs~t`Q(2n6kTkg?{oKjX&jpvRZ_cB7*#DF6qMO>0`1eSgzUsQEi&%zB5(+$58aKiEE>^Y8Ys4sAwgeSCghX+2Zt^U7Q6`C zIu5$68W_Sfv3R|FR;JkZCkNU~?FiafK$WINfsl^_^?DpFVaP$fXv=F&D#)b!GrX@d`7&iZv^H}kY@-Y?KCwZOBAPB z8Y9huw1>r$b#bWSSk|J*0KN9(a9Tj_S_Li{ofC(^d|<1cfuikM2J8#PIBH71N!H}D z0uSF)=C1EJ&H6Dc%vALNR3o%!{2`Q6VHoa0_F(dAXtbkZa(TYxr6>nml*~Ya+96BZ z0eYzi(Baf5@{zQDzI9hz@?3O`FE>3EnO&Oi5g_VSWmvkvi9}4%1nX*m7gI4mH4%kln|FVf{FT=Z9=88R>aJk2R@R!5SWy z%^tHQG-+RSUfjl|vL-$ANHknStSupYR8*23FVo#ujZ)-KFX#T%u&Ei)`p(0PHntZz z?!z~y5=ODx)2sVe{;|+Nj06K8B-dli<0epg1wI zRc>FA70Q+x(miq}5l=!)(bO)!rkO1o!MS6NKRU6qJ2|v|*%Z_w12OT93{}9GT@uoG z^6PSae9|XK_m`0ZTF{Eaan89TZRIJ0tvpTO`Q`@DXP{GtLCVkfZjJ+P9+)pX2IW9O zJqPw1avbF!=vE+?mlZOa-s2{tC=# zzqx83!hb;`u3Hy>e?IeblE^xR86xY910j8l{sY@)Jc-Dj)f6}8q_}uH_f{@gi7OGC z?R5C4z5~tyrMbP3-{D->x}zkEKF(hbOZVVerG!Tjhd4^Wa^M5Gp^nggA4aWOGE2SW zwJ2^XEGuM0Bledr6>8mr*;rrAFcjHjRH<<~epgAS?u_x1szt|M-S0emQM19NRn!VN-j3IA+YLI&Jv&yW_SlUdU-`Z=_OmiWR^;VKlTNmM`l0?pE%&YC z?XBxtozafqv$tKO^L&`4n}TVwLFF)N8%BPy1tM6 zcdMBKZ_qM?2-%0bGf3nxF%i^a{4=$73T@p0tqJu4A$}7Gi7RxYRcta_T!(i03;Ev0 zleFjAvLCnN@T^p(5`8)1i4)|0VOsnwDGXK!sIgOc(-ZHYA_%*%7>!B`4~$E)W8Ld> z084@%lXD@wbM6gM7O0v92O&Kdv-x=JBtxrO#757l_=+MoA@t z(ApIhCq4zzcksXU>0Eh1gQ;0}7So>H(%fqANEbJ(Y2AxF*o!b)np-NNt;}9B9jS0g zp5_DPk5Umr z<;3)vu(oA|H#UeDYEWZ~M40xnir9a$rs0tmw^eo`6j7}Y;jb&xPTb_F$A<$-9cFMQ z--f)^` z+jV-v_?PYXt>}ct1k!Zim;ofgUE)pU$imM;daV3R?2T+`XlFBJq~FTp_7vqwF@%8t zXRa2D(awQ8F{k)9PDL>fi zlvyb-FdtmfL`Ac+<>~A)QzL|$_lHdb!g6|#-n}O z;Lb}l+Y-1|iT3yn8u80yXpK<2*2~Aj4A^*=z=%>Oqi%R^zttBBK!xM&$hq* zoK4bvW!a*|_3XK}$XDuuh`C3Dfn>)Ov73GyY*ev##Djb01p%o?5+|ZGW|AFFLLm*t z$~=oNZ4%vz?5JK4>=K8_HQx7C5EdWl!LJw_+kG$&r!=HrTg{B4aE;!2LB-U|-J1?A}g-Hbw z8w+IY_ClAtW11pXT+~HE(&a95#=+OUS~F#Q_*1_2OfW0$9S?J%DuH8n|3F_%u(PS9 z@e#7?EqdgSJD2;2O50`yuSqy5g%akgt)ODzO=0g8=H>Trm0fvzqhak`==Uvq<9y9^ z-|}8_f;qJ}Q16|q=FPt!lX z*nk*u>G@-=Qr1l84;@MJXgl6i~% zXyQe*ZB9HS>ht|Bq`FHxWpG5$aCU+qKgRbX@1v%A_P03M+Dxqf)z41b3YVQY z7`bhR*8MF#2<~-S9@WUFHlZh>Vg6e_T^|nP3QmebY z4p?}3ZkhE83}@k(8_?se%C%!@agZ8Mj{6bg;=Ro)hbRRE=n;N4yT&fZeeA*%ox_CH zqSv+FI3xa+(-ZZ|_V&l*yphvv&^*GwOdIStwlcu`Y(B8earwL|v89u95vg?F6MXY+ z-~f8Pa^emQdPo;2sN{gZi%|at>H#YN3V`Y1T*?B+1j(SIfdBybGBYLI97K!C0fGmB z^!_dg!e>Fk^ncZ{9&d(7c={y#poZf{omCT iJdi^Vq|m?B{KWujt6@CEW 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 Date: Thu, 11 May 2023 16:43:26 +0800 Subject: [PATCH 169/177] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/controller/StaffController.java | 2 +- .../excel/CustomerStaffImportExcelData.java | 7 +++++ .../handler/CustomerStaffImportListener.java | 28 +++++++++++++++++-- .../epmet/service/impl/StaffServiceImpl.java | 4 +-- 4 files changed, 36 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java index 23807cd908..1495e595a0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/StaffController.java @@ -259,7 +259,7 @@ public class StaffController implements ResultDataResolver { Path fileSavePath; try { - Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import"); + Path importPath = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import"); fileSavePath = importPath.resolve(UUID.randomUUID().toString().concat(extName)); } catch (IOException e) { String errorMsg = ExceptionUtils.getErrorStackTrace(e); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java index d724dc35b4..c667472284 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/CustomerStaffImportExcelData.java @@ -60,6 +60,13 @@ public class CustomerStaffImportExcelData { @Data public static class RowRemarkMessage { + @ColumnWidth(60) + @ExcelProperty("姓名") + private String name; + + @ColumnWidth(60) + @ExcelProperty("联系电话") + private String mobile; @ColumnWidth(60) @ExcelProperty("错误信息") diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java index 28d91229af..7a8406eb8f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/CustomerStaffImportListener.java @@ -38,6 +38,8 @@ public class CustomerStaffImportListener implements ReadListener 0) { try { // 文件生成 - Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("ic_nat", "import", "error_des"); + Path errorDescDir = FileUtils.getAndCreateDirUnderEpmetFilesDir("staff", "import", "error_des"); String timeMillis = String.valueOf(System.currentTimeMillis()); - String fileName = "icnat_import_error_".concat(timeMillis).concat(".xlsx"); + String fileName = "staff_import_error_".concat(timeMillis).concat(".xlsx"); fileItem = new DiskFileItemFactory(DiskFileItemFactory.DEFAULT_SIZE_THRESHOLD, errorDescDir.toFile()) .createItem("file", ContentType.APPLICATION_OCTET_STREAM.toString(), false, fileName); From a9af7fa940f4607f8a03258b27a7e476562b8efc Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Thu, 11 May 2023 16:53:29 +0800 Subject: [PATCH 170/177] =?UTF-8?q?excel=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/customer_staff_import_template.xlsx | Bin 9594 -> 9646 bytes .../main/resources/excel/house_template.xlsx | Bin 9801 -> 9864 bytes .../resources/excel/neighbor_template.xlsx | Bin 11577 -> 11817 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/customer_staff_import_template.xlsx index 75678505187e1fc06269d98c4168f447e4c92451..4b9b2f1fce4c258bfe08fc043128233f56b86a07 100644 GIT binary patch delta 4520 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 G0002V^Lmp2 delta 4487 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 Z000000RSKX00766eI+XfT_FGf007X1f&c&j diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index b325adef252fcb610cbddc046297653fd12c9052..5aca0af7a6fc4863b5895aea6d75ab11722d4d7b 100644 GIT binary patch delta 4958 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_template.xlsx index 31c08448700469717ae43da077772129b6e087b0..d98c075d9cc2bd770616a0d787958d8c5f098f22 100644 GIT binary patch delta 5363 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 delta 5127 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 TAn-p5n!iy1`imiW{>lCeF~FTv From bb15cb04acdcfb9976ffe67d3325353aed4193e1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 May 2023 09:11:23 +0800 Subject: [PATCH 171/177] =?UTF-8?q?=E8=AF=81=E4=BB=B6=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=EF=BC=8C=E4=B8=8D=E6=98=AF=E8=AF=81=E4=BB=B6=E5=8F=B7=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.47__add_query_item.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.47__add_query_item.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.47__add_query_item.sql index 3cec8c4093..0522519a3e 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.47__add_query_item.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.47__add_query_item.sql @@ -10,7 +10,7 @@ VALUES (UUID(), @customerId, where i.LABEL='证件类型' and i.customer_id=@customerId and i.DEL_FLAG='0'), - '证件号类型', 'resi_base_info', 'select', 'equal', NULL, NULL, 0, 901, 0, 0, '烟台需求0511', '2023-05-11 01:01:01', '烟台需求0511', '2023-05-11 01:01:01'); + '证件类型', 'resi_base_info', 'select', 'equal', NULL, NULL, 0, 901, 0, 0, '烟台需求0511', '2023-05-11 01:01:01', '烟台需求0511', '2023-05-11 01:01:01'); INSERT INTO `ic_form_query_builder` (`ID`, `CUSTOMER_ID`, `FORM_ITEM_ID`, `LABEL`, `FORM_CODE`, `ITEM_TYPE`, `QUERY_TYPE`, `FUN_TYPE`, `VALID_TYPE`, `MULTI_SELECT`, `SORT`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) From f2786fcdb780e8f205ade4535f88f84cc7c50408 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 11:09:03 +0800 Subject: [PATCH 172/177] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E5=B0=8F=E5=8C=BA?= =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=85=B3=E8=81=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/ImportGeneralDTO.java | 5 +++++ .../entity/IcPropertyManagementEntity.java | 3 +++ .../com/epmet/excel/IcNeighborHoodExcel.java | 6 ++++++ .../model/ImportNeighborHoodInfoListener.java | 7 +++++++ .../epmet/model/NeighborHoodInfoModel.java | 6 ++++++ .../main/resources/excel/neighbor_export.xlsx | Bin 11704 -> 11817 bytes .../resources/excel/neighbor_template.xlsx | Bin 11817 -> 11856 bytes .../resources/mapper/IcNeighborHoodDao.xml | 2 ++ 8 files changed, 29 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java index 1c25e75f50..d617ad39dd 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java @@ -223,4 +223,9 @@ public class ImportGeneralDTO implements Serializable { private String buildingLeaderTypeNum; + + private String propertyUserName; + + private String propertyUserMobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java index c0ea9df16d..81a75f86ec 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPropertyManagementEntity.java @@ -17,6 +17,8 @@ package com.epmet.entity; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import lombok.Data; @@ -39,6 +41,7 @@ public class IcPropertyManagementEntity extends BaseEpmetEntity { * 物业名称 */ private String name; + @TableField(fill = FieldFill.INSERT) private String customerId; /** * 烟台需求：物业联系人姓名 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java index 227ed90e4a..0406b33490 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcNeighborHoodExcel.java @@ -124,6 +124,12 @@ public class IcNeighborHoodExcel extends ExcelVerifyInfo implements Serializable @Excel(name = "关联物业") private String propertyName; + @Excel(name = "物业联系人") + private String propertyUserName; + + @Excel(name = "联系电话") + private String propertyUserMobile; + @Excel(name = "详细地址") @NotBlank(message = "不能为空") private String address; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java index 5bacafb1fe..f4fe33adb2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java @@ -185,6 +185,13 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener { IcPropertyManagementEntity e = new IcPropertyManagementEntity(); e.setName(name); + for (ImportGeneralDTO importGeneralDTO : notExistList) { + if (importGeneralDTO.getPropertyName().equals(name)){ + e.setContactMobile(importGeneralDTO.getPropertyUserMobile()); + e.setContactName(importGeneralDTO.getPropertyUserName()); + break; + } + } propertyManagementEntities.add(e); }); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java index b1f33f409b..374f367a2e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/NeighborHoodInfoModel.java @@ -36,6 +36,12 @@ public class NeighborHoodInfoModel { @ExcelProperty(value = "关联物业") private String propertyName; + @ExcelProperty(value = "物业联系人") + private String propertyUserName; + + @ExcelProperty(value = "联系电话") + private String propertyUserMobile; + @ExcelProperty(value = "详细地址") private String address; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/neighbor_export.xlsx index 2d89d9255729ab7c6c41c736ad33386460df8c27..91a9637774b3ec0d1524f1b61864c5f699114f2a 100644 GIT binary patch delta 5473 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 Qz;a{=FAt6z=idSU0?&yr%K!iX delta 5340 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 delta 5700 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 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index 7f51133503..574d29a6ae 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -197,6 +197,8 @@ a.ADDRESS as address, a.REMARK as remark, e.NAME as propertyName, + e.CONTACT_NAME as propertyUserName, + e.CONTACT_MOBILE as propertyUserMobile, b.ORGANIZATION_NAME as agencyName, c.GRID_NAME as gridName from ic_neighbor_hood a From 770d2d6e524c172a2e8345ad28190436c9f01f36 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 15:38:03 +0800 Subject: [PATCH 173/177] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/BuildingServiceImpl.java | 112 +++++++++++++++++- 1 file changed, 108 insertions(+), 4 deletions(-) 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 5f16fb2c62..8eb14781f5 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 @@ -92,6 +92,8 @@ public class BuildingServiceImpl implements BuildingService { private IcOrganizationCodeInfoDao icOrganizationCodeInfoDao; @Autowired private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl; + @Autowired + private CommunityBuildingManagerDao communityBuildingManagerDao; @Override @@ -103,8 +105,8 @@ public class BuildingServiceImpl implements BuildingService { if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } - IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); - count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), null); + IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), null); if (null != count && count > 0) { throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); } @@ -121,6 +123,57 @@ public class BuildingServiceImpl implements BuildingService { IcBuildingEntity entity = ConvertUtils.sourceToTarget(icBuildingDTO, IcBuildingEntity.class); icBuildingDao.insert(entity); + + LambdaQueryWrapper manager = new LambdaQueryWrapper().eq(CommunityBuildingManagerEntity::getBuildingId,entity.getId()); + CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager); + + + if (StringUtils.isNotBlank(entity.getBuildingLeaderType())&& + StringUtils.isNotBlank(entity.getBuildingLeaderIdCard())&& + StringUtils.isNotBlank(entity.getBuildingLeaderMobile())&& + StringUtils.isNotBlank(entity.getBuildingLeaderName())){ + + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(entity.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(entity.getBuildingLeaderName()); + communityBuildingManagerDao.updateById(communityBuildingManagerEntity); + }else{ + communityBuildingManagerEntity= new CommunityBuildingManagerEntity(); + communityBuildingManagerEntity.setIdCard(entity.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(entity.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(entity.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(entity.getBuildingLeaderName()); + communityBuildingManagerEntity.setBuildingId(entity.getId()); + communityBuildingManagerEntity.setViliageId(entity.getNeighborHoodId()); + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(entity.getNeighborHoodId()); + communityBuildingManagerEntity.setGridId(neighborHood.getGridId()); + communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId()); + + List agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":"))); + agencyIds.add(neighborHood.getAgencyId()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().in(CustomerAgencyEntity::getId,agencyIds); + List customerAgencyEntities = customerAgencyDao.selectList(queryWrapper); + for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) { + if (customerAgencyEntity.getLevel().equals("community")){ + communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("street")){ + communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("district")){ + communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId()); + } + } + communityBuildingManagerDao.insert(communityBuildingManagerEntity); + } + }else{ + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerDao.deleteById(communityBuildingManagerEntity); + } + } + //设置楼宇单元 Integer totalUnitNum = formDTO.getTotalUnitNum(); List unitList = new ArrayList<>(); @@ -657,8 +710,8 @@ public class BuildingServiceImpl implements BuildingService { if (null != count && count > 0) { throw new RenException(EpmetErrorCode.BUILDING_NAME_EXITED.getCode(), EpmetErrorCode.BUILDING_NAME_EXITED.getMsg()); } - IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); - count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId()); + IcNeighborHoodEntity neighborHood1 = icNeighborHoodDao.selectById(formDTO.getNeighborHoodId()); + count = icBuildingDao.checkBuildNameV2(formDTO.getAgencyId(), neighborHood1.getNeighborHoodName(), formDTO.getBuildingName(), formDTO.getBuildingId()); if (null != count && count > 0) { throw new EpmetException(EpmetErrorCode.BUILDING_NAME_EXITED_IN_GRID.getCode()); } @@ -684,6 +737,57 @@ public class BuildingServiceImpl implements BuildingService { icBuildingDTO.setCustomerId(customerId); icBuildingService.update(icBuildingDTO); + + LambdaQueryWrapper manager = new LambdaQueryWrapper().eq(CommunityBuildingManagerEntity::getBuildingId,icBuildingDTO.getId()); + CommunityBuildingManagerEntity communityBuildingManagerEntity = communityBuildingManagerDao.selectOne(manager); + + + if (StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderType())&& + StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderIdCard())&& + StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderMobile())&& + StringUtils.isNotBlank(icBuildingDTO.getBuildingLeaderName())){ + + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName()); + communityBuildingManagerDao.updateById(communityBuildingManagerEntity); + }else{ + communityBuildingManagerEntity= new CommunityBuildingManagerEntity(); + communityBuildingManagerEntity.setIdCard(icBuildingDTO.getBuildingLeaderIdCard()); + communityBuildingManagerEntity.setPhone(icBuildingDTO.getBuildingLeaderMobile()); + communityBuildingManagerEntity.setType(icBuildingDTO.getBuildingLeaderType()); + communityBuildingManagerEntity.setName(icBuildingDTO.getBuildingLeaderName()); + communityBuildingManagerEntity.setBuildingId(icBuildingDTO.getId()); + communityBuildingManagerEntity.setViliageId(icBuildingDTO.getNeighborHoodId()); + IcNeighborHoodEntity neighborHood = icNeighborHoodDao.selectById(icBuildingDTO.getNeighborHoodId()); + communityBuildingManagerEntity.setGridId(neighborHood.getGridId()); + communityBuildingManagerEntity.setOrgIdPath(neighborHood.getAgencyPids()+":"+neighborHood.getAgencyId()+":"+neighborHood.getGridId()); + + List agencyIds = new ArrayList<>(Arrays.asList(neighborHood.getAgencyPids().split(":"))); + agencyIds.add(neighborHood.getAgencyId()); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper().in(CustomerAgencyEntity::getId,agencyIds); + List customerAgencyEntities = customerAgencyDao.selectList(queryWrapper); + for (CustomerAgencyEntity customerAgencyEntity : customerAgencyEntities) { + if (customerAgencyEntity.getLevel().equals("community")){ + communityBuildingManagerEntity.setCommunityId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("street")){ + communityBuildingManagerEntity.setStreetId(customerAgencyEntity.getId()); + } + if (customerAgencyEntity.getLevel().equals("district")){ + communityBuildingManagerEntity.setDistrictId(customerAgencyEntity.getId()); + } + } + communityBuildingManagerDao.insert(communityBuildingManagerEntity); + } + }else{ + if (communityBuildingManagerEntity!=null){ + communityBuildingManagerDao.deleteById(communityBuildingManagerEntity); + } + } + // 更新房屋名称 icHouseDao.houseUpdateHouseName(formDTO.getBuildingId()); //更新楼宇单元 From 3b6c6202e15ad270a6192ac2b00e38d48aeb6052 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 May 2023 15:38:57 +0800 Subject: [PATCH 174/177] =?UTF-8?q?=E7=89=A9=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=8C=89=E7=85=A7=E7=AE=A1=E7=90=86=E5=B0=8F=E5=8C=BA=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E9=99=8D=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/IcPropertyManagementDao.xml | 42 ++++++++++++------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml index 88c1b8e2a0..64c35920e1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPropertyManagementDao.xml @@ -71,19 +71,33 @@ \ No newline at end of file From aecd032441d9057603157fab8294e97eddcbdde6 Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 15:47:20 +0800 Subject: [PATCH 175/177] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A5=BC=E6=B4=9E?= =?UTF-8?q?=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 34d1023fa6..853d3dc59d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -463,7 +463,7 @@ SELECT b.BUILDING_LEADER_ID_CARD as buildingLeaderIdCard, b.BUILDING_LEADER_TYPE as buildingLeaderType, - if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长','')) as buildingLeaderTypeName, + if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName, b.ID AS buildingId, b.BUILDING_NAME, b.NEIGHBOR_HOOD_ID, From cf2d8be960e019504aad05fdafdd2b32bb030f8d Mon Sep 17 00:00:00 2001 From: lichao <326994889@qq.com> Date: Fri, 12 May 2023 15:54:31 +0800 Subject: [PATCH 176/177] =?UTF-8?q?=E6=A5=BC=E6=B4=9E=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-org-server/src/main/resources/mapper/IcBuildingDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 853d3dc59d..eb810ac14e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -463,7 +463,7 @@ SELECT b.BUILDING_LEADER_ID_CARD as buildingLeaderIdCard, b.BUILDING_LEADER_TYPE as buildingLeaderType, - if(b.BUILDING_LEADER_TYPE = 0,'楼长',if(b.BUILDING_LEADER_TYPE = 1,'单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName, + if(b.BUILDING_LEADER_TYPE = '0','楼长',if(b.BUILDING_LEADER_TYPE = '1','单元长',if(b.BUILDING_LEADER_TYPE = '0,1','楼长/单元长',if(b.BUILDING_LEADER_TYPE = '1,0','楼长/单元长','')))) as buildingLeaderTypeName, b.ID AS buildingId, b.BUILDING_NAME, b.NEIGHBOR_HOOD_ID, From 9f179cfe597ce0c2a18304927ea98b0d16fffb6f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 12 May 2023 16:15:58 +0800 Subject: [PATCH 177/177] =?UTF-8?q?=E6=A5=BC=E9=95=BF=E5=8D=95=E5=85=83?= =?UTF-8?q?=E9=95=BF=E7=B1=BB=E5=9E=8B=EF=BC=8C=E5=A4=9A=E9=80=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/CommunityBuildingManagerDao.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml index 1e826a9101..23b0f682e9 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CommunityBuildingManagerDao.xml @@ -33,6 +33,7 @@ ( case when m.type='0' then '楼长' when m.type='1' then '单元长' + when m.type='0,1' or m.type='1,0' then '楼长,单元长' else '-' end )as typeName,