From d6d2c516c7eee254372d33cd69fccbc942265712 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Jul 2022 15:18:56 +0800 Subject: [PATCH 001/288] =?UTF-8?q?=E8=A7=92=E8=89=B2=E3=80=81=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E8=A7=92=E8=89=B2=E7=9A=84crud=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/GovRoleController.java | 6 +++--- .../java/com/epmet/controller/GovRoleMenuController.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java index d6f866dbe2..16f4be91d8 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java @@ -67,7 +67,7 @@ public class GovRoleController { return new Result().ok(data); } - @PostMapping + @PostMapping("save") public Result save(@RequestBody GovRoleDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -75,7 +75,7 @@ public class GovRoleController { return new Result(); } - @PutMapping + @PostMapping("edit") public Result update(@RequestBody GovRoleDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -83,7 +83,7 @@ public class GovRoleController { return new Result(); } - @DeleteMapping + @PostMapping("del") public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleMenuController.java index 8b8a7d8aed..11c4e6e414 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleMenuController.java @@ -57,7 +57,7 @@ public class GovRoleMenuController { return new Result().ok(data); } - @PostMapping + @PostMapping("save") public Result save(@RequestBody GovRoleMenuDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); @@ -65,7 +65,7 @@ public class GovRoleMenuController { return new Result(); } - @PutMapping + @PostMapping("edit") public Result update(@RequestBody GovRoleMenuDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); @@ -73,7 +73,7 @@ public class GovRoleMenuController { return new Result(); } - @DeleteMapping + @PostMapping("del") public Result delete(@RequestBody String[] ids){ //效验数据 AssertUtils.isArrayEmpty(ids, "id"); From 94e6cb5350daf748e6209f86bb93aea512d16783 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Jul 2022 15:33:46 +0800 Subject: [PATCH 002/288] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dao/GovRoleMenuDao.java | 9 ++++ .../java/com/epmet/entity/GovMenuEntity.java | 6 +++ .../service/impl/GovMenuServiceImpl.java | 46 ++++++++++++++++--- .../main/resources/mapper/GovRoleMenuDao.xml | 10 ++++ 4 files changed, 64 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java index dc0559acb3..d7aeb80836 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleMenuDao.java @@ -11,6 +11,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.entity.GovRoleMenuEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -28,6 +29,14 @@ public interface GovRoleMenuDao extends BaseDao { */ List getMenuIdList(String roleId); + /** + * Desc: 根据角色IDs，获取菜单IDs列表 + * @param roleIds + * @author zxc + * @date 2022/7/12 14:45 + */ + List getMenuIdsList(@Param("ids") List roleIds); + /** * 根据角色id，删除角色菜单关系 * @param roleId 角色id diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java index fcb8a5fa38..9c1c3922ed 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovMenuEntity.java @@ -66,4 +66,10 @@ public class GovMenuEntity extends BaseEpmetEntity { */ private Integer showFlag; + /** + * 筛选使用，跟角色菜单匹配上为true + */ + @TableField(exist = false) + private Boolean roleStatus = false; + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index 2dbb4abe05..d7e78dcdf7 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -30,6 +30,9 @@ import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.HttpContextUtils; import com.epmet.commons.tools.utils.TreeUtils; import com.epmet.dao.GovMenuDao; +import com.epmet.dao.GovRoleDao; +import com.epmet.dao.GovRoleMenuDao; +import com.epmet.dao.GovRoleUserDao; import com.epmet.dto.GovMenuDTO; import com.epmet.entity.GovMenuEntity; import com.epmet.enums.MenuTypeEnum; @@ -45,6 +48,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import java.util.*; +import java.util.stream.Collectors; /** * 菜单管理 @@ -67,6 +71,12 @@ public class GovMenuServiceImpl extends BaseServiceImpl page(Map params) { @@ -218,7 +228,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl getCustomerMenuList(String customerId, Integer type, String tableName) { - List govMenuDTOS = govCustomerMenuRedis.getCustomerMenuList(customerId,type,tableName); + private List getCustomerMenuList(String customerId, Integer type, String tableName,String userId) { + /*List govMenuDTOS = govCustomerMenuRedis.getCustomerMenuList(customerId,type,tableName); if (!CollectionUtils.isEmpty(govMenuDTOS)){ return govMenuDTOS; - } + }*/ List menuList = baseDao.getCustomerMenuList(customerId, type, HttpContextUtils.getLanguage(),tableName); - List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); - govMenuDTOS = TreeUtils.buildTree(dtoList); - govCustomerMenuRedis.setCustomerMenuList(customerId,type,govMenuDTOS,tableName); + disposeGovMenu(menuList,userId); + Map> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus)); + List dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class); + List govMenuDTOS = TreeUtils.buildTree(dtoList); +// govCustomerMenuRedis.setCustomerMenuList(customerId,type,govMenuDTOS,tableName); return govMenuDTOS; } + public void disposeGovMenu(List menuList,String userId){ + List roleIdList = govRoleUserDao.getRoleIdList(userId); + if (CollectionUtils.isEmpty(roleIdList)){ + menuList = new ArrayList<>(); + return; + } + List menuIdsList = govRoleMenuDao.getMenuIdsList(roleIdList); + if (CollectionUtils.isEmpty(menuIdsList)){ + menuList = new ArrayList<>(); + return; + } + for (String id : menuIdsList) { + for (GovMenuEntity m : menuList) { + if (m.getId().equals(id)){ + m.setRoleStatus(true); + } + } + } + } + @Override public Set getUserPermissions(TokenDto tokenDto) { //用户权限列表 diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml index 862679b5de..38864a7bfe 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml @@ -7,6 +7,16 @@ select menu_id from gov_role_menu where role_id = #{value} + + update gov_role_menu set del_flag = 1 where del_flag = 0 and role_id in From c2bcf30a89eae0f3556f8fefbdc1d363a5738165 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Jul 2022 16:33:31 +0800 Subject: [PATCH 003/288] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E3=80=81=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BA=BA=E5=91=98=E6=96=B0=E5=A2=9E=E6=95=B0=E5=AD=97?= =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/GovAccessFeignClient.java | 11 ++++++++ .../GovAccessFeignClientFallBack.java | 6 +++++ .../controller/GovRoleUserController.java | 13 ++++++++++ .../com/epmet/service/GovRoleUserService.java | 9 +++++++ .../service/impl/GovRoleUserServiceImpl.java | 25 +++++++++++++++++++ .../com/epmet/dto/form/AddStaffV2FromDTO.java | 2 ++ .../epmet/dto/form/StaffSubmitFromDTO.java | 2 ++ epmet-module/gov-org/gov-org-server/pom.xml | 5 ++++ .../epmet/service/impl/StaffServiceImpl.java | 16 ++++++++++++ 9 files changed, 89 insertions(+) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java index 5e3a2e0fcb..f516612353 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.InitDefaultOperationsFormDTO; import com.epmet.dto.form.ListOpePermsFormDTO; +import com.epmet.dto.form.RoleUserFormDTO; import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -29,4 +30,14 @@ public interface GovAccessFeignClient { */ @PostMapping("/gov/access/access/listoperationpermissions") Result> listOperationPermissions(@RequestBody ListOpePermsFormDTO listOpePermsFormDTO); + + /** + * Desc: 保存角色 + * @param formDTO + * @author zxc + * @date 2022/7/12 16:14 + */ + @PostMapping("/gov/access/govroleuser/roleUser") + Result roleUser(@RequestBody RoleUserFormDTO formDTO); + } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java index 3bf8d2f111..d7be3adf99 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.InitDefaultOperationsFormDTO; import com.epmet.dto.form.ListOpePermsFormDTO; +import com.epmet.dto.form.RoleUserFormDTO; import com.epmet.feign.GovAccessFeignClient; import java.util.Set; @@ -26,4 +27,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient { public Result> listOperationPermissions(ListOpePermsFormDTO listOpePermsFormDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "listOperationPermissions", listOpePermsFormDTO); } + + @Override + public Result roleUser(RoleUserFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "roleUser", formDTO); + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java index fcd5733a4d..30eb4405b1 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java @@ -25,6 +25,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.GovRoleUserDTO; +import com.epmet.dto.form.RoleUserFormDTO; import com.epmet.service.GovRoleUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -129,4 +130,16 @@ public class GovRoleUserController { return new Result(); } + /** + * Desc: 保存角色 + * @param formDTO + * @author zxc + * @date 2022/7/12 16:14 + */ + @PostMapping("roleUser") + public Result roleUser(@RequestBody RoleUserFormDTO formDTO){ + govRoleUserService.roleUser(formDTO); + return new Result(); + } + } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java index ff67c7d239..68b5b9d81b 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.GovRoleUserDTO; +import com.epmet.dto.form.RoleUserFormDTO; import com.epmet.entity.GovRoleUserEntity; import java.util.List; @@ -130,4 +131,12 @@ public interface GovRoleUserService extends BaseService { * @param userIds 用户ids */ void deleteByUserIds(String[] userIds); + + /** + * Desc: 保存角色 + * @param formDTO + * @author zxc + * @date 2022/7/12 16:14 + */ + void roleUser(RoleUserFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java index 21b796cc3b..2bbfd622cd 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java @@ -26,6 +26,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.GovRoleUserDao; import com.epmet.dto.GovRoleUserDTO; +import com.epmet.dto.form.RoleUserFormDTO; import com.epmet.entity.GovRoleUserEntity; import com.epmet.redis.GovRoleUserRedis; import com.epmet.service.GovRoleUserService; @@ -33,7 +34,9 @@ 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 org.springframework.util.CollectionUtils; +import java.util.ArrayList; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -153,4 +156,26 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl entityList = new ArrayList<>(); + formDTO.getRoleIds().forEach(r -> { + GovRoleUserEntity entity = new GovRoleUserEntity(); + entity.setUserId(formDTO.getUserId()); + entity.setRoleId(r); + entityList.add(entity); + }); + insertBatch(entityList); + } + } + } \ No newline at end of file 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 5f369289e9..705ddfaadb 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 @@ -71,4 +71,6 @@ public class AddStaffV2FromDTO implements Serializable { * 来源client(PC端:web、微信小程序:wxmp) */ private String client; + + private List newRoles; } 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 284880f6d5..0f9f35a2f6 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 @@ -66,4 +66,6 @@ public class StaffSubmitFromDTO implements Serializable { * 来源client(PC端:web、微信小程序:wxmp) */ private String client; + + private List newRoles; } diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml index e937308c22..401f05c967 100644 --- a/epmet-module/gov-org/gov-org-server/pom.xml +++ b/epmet-module/gov-org/gov-org-server/pom.xml @@ -18,6 +18,11 @@ gov-org-client 2.0.0 + + com.epmet + gov-access-client + 2.0.0 + com.epmet oper-crm-client 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 c6013c1332..d603bc3e5d 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 @@ -4,6 +4,7 @@ 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; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; @@ -78,6 +79,8 @@ public class StaffServiceImpl implements StaffService { private CustomerStaffRedis customerStaffRedis; @Resource private StaffOrgRelationDao staffOrgRelationDao; + @Autowired + private GovAccessFeignClient govAccessFeignClient; @Override public Result getStaffInfoForHome(StaffsInAgencyFromDTO fromDTO) { @@ -190,6 +193,12 @@ public class StaffServiceImpl implements StaffService { } return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg()); } + if (CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){ + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId())); + if (!roleUserAccess.success()){ + throw new EpmetException("save data to gov-role-user failure"); + } + } //2021.8.24 sun 人员信息编辑时删除工作人员的缓存信息 CustomerStaffRedis.delStaffInfoFormCache(fromDTO.getCustomerId(), fromDTO.getStaffId()); return result; @@ -578,6 +587,13 @@ public class StaffServiceImpl implements StaffService { staffOrgRelationEntity.setOrgType(fromDTO.getOrgType()); staffOrgRelationService.insert(staffOrgRelationEntity); + if (CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){ + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), customerStaffAgencyEntity.getUserId())); + if (!roleUserAccess.success()){ + throw new EpmetException("save data to gov-role-user failure"); + } + } + return new Result(); } From 009821adba1587fcb35bc1d92d7b55fa0fb17043 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Jul 2022 16:35:11 +0800 Subject: [PATCH 004/288] =?UTF-8?q?=E6=BC=8F=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/RoleUserFormDTO.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java new file mode 100644 index 0000000000..fb977449cd --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java @@ -0,0 +1,25 @@ +package com.epmet.dto.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/7/12 16:11 + * @DESC + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class RoleUserFormDTO implements Serializable { + + private static final long serialVersionUID = 7503477804419017109L; + + private List roleIds; + + private String userId; +} From 8dd4b7bd3e4ee2b5882537a35840c088b8d211b7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 12 Jul 2022 16:47:11 +0800 Subject: [PATCH 005/288] =?UTF-8?q?=E8=A1=A8=E6=96=B0=E5=A2=9E=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/GovRoleDTO.java | 10 ++++++++++ .../src/main/java/com/epmet/dto/GovRoleMenuDTO.java | 5 +++++ .../src/main/java/com/epmet/dto/GovRoleUserDTO.java | 5 +++++ .../java/com/epmet/controller/GovRoleController.java | 5 ++++- .../main/java/com/epmet/entity/GovRoleEntity.java | 10 ++++++++++ .../java/com/epmet/entity/GovRoleMenuEntity.java | 5 +++++ .../java/com/epmet/entity/GovRoleUserEntity.java | 5 +++++ .../epmet/service/impl/GovRoleMenuServiceImpl.java | 5 +++++ .../com/epmet/service/impl/GovRoleServiceImpl.java | 12 ++++++++++-- 9 files changed, 59 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java index efe6643df6..4f9aed2c68 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java @@ -40,6 +40,16 @@ public class GovRoleDTO implements Serializable { */ private String id; + /** + * 客户id + */ + private String customerId; + + /** + * 是否是默认角色【0:否 1:是】 默认角色不能删除 + */ + private String isDefault; + /** * 角色名称 */ diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java index eacde30cf3..e13df4f520 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleMenuDTO.java @@ -39,6 +39,11 @@ public class GovRoleMenuDTO implements Serializable { */ private String id; + /** + * 客户id + */ + private String customerId; + /** * 角色ID */ diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java index d3881edeb2..4a6cd5ea64 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleUserDTO.java @@ -39,6 +39,11 @@ public class GovRoleUserDTO implements Serializable { */ private String id; + /** + * 客户id + */ + private String customerId; + /** * 角色ID */ diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java index 16f4be91d8..a6a0a452cb 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java @@ -17,7 +17,9 @@ 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.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -51,7 +53,8 @@ public class GovRoleController { private GovRoleMenuService govRoleMenuService; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@LoginUser TokenDto tokenDto, @RequestParam Map params){ + params.put("customerId",tokenDto.getCustomerId()); PageData page = govRoleService.page(params); return new Result>().ok(page); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java index 4bc4575836..0474fb65de 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java @@ -41,4 +41,14 @@ public class GovRoleEntity extends BaseEpmetEntity { @TableField(fill = FieldFill.INSERT) private Long deptId; + /** + * 客户id + */ + private String customerId; + + /** + * 是否是默认角色【0:否 1:是】 默认角色不能删除 + */ + private String isDefault; + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java index 6ea4d1f2a5..03fd31b1e1 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleMenuEntity.java @@ -33,4 +33,9 @@ public class GovRoleMenuEntity extends BaseEpmetEntity { */ private String menuId; + /** + * 客户id + */ + private String customerId; + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java index 599ca7f3e2..16d26bbc84 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleUserEntity.java @@ -34,4 +34,9 @@ public class GovRoleUserEntity extends BaseEpmetEntity { */ private String userId; + /** + * 客户id + */ + private String customerId; + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java index ec31c69146..6a882d2e92 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleMenuServiceImpl.java @@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.GovRoleMenuDao; import com.epmet.dto.GovRoleMenuDTO; @@ -51,6 +52,9 @@ public class GovRoleMenuServiceImpl extends BaseServiceImpl page(Map params) { @@ -125,6 +129,7 @@ public class GovRoleMenuServiceImpl extends BaseServiceImpl getWrapper(Map params){ String id = (String)params.get(FieldConstant.ID_HUMP); String name = (String)params.get(FieldConstant.NAME_HUMP); + String customerId = (String)params.get(FieldConstant.CUSTOMER_ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID_HUMP, customerId); return wrapper; } @@ -107,7 +111,11 @@ public class GovRoleServiceImpl extends BaseServiceImpl Date: Tue, 12 Jul 2022 17:17:09 +0800 Subject: [PATCH 006/288] emm --- .../main/java/com/epmet/dto/form/RoleUserFormDTO.java | 1 + .../java/com/epmet/service/impl/GovMenuServiceImpl.java | 9 ++++----- .../com/epmet/service/impl/GovRoleUserServiceImpl.java | 1 + .../java/com/epmet/service/impl/StaffServiceImpl.java | 4 ++-- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java index fb977449cd..8a7c8569f9 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/RoleUserFormDTO.java @@ -22,4 +22,5 @@ public class RoleUserFormDTO implements Serializable { private List roleIds; private String userId; + private String customerId; } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index d7e78dcdf7..4eeef93692 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -242,16 +242,15 @@ public class GovMenuServiceImpl extends BaseServiceImpl getCustomerMenuList(String customerId, Integer type, String tableName,String userId) { - /*List govMenuDTOS = govCustomerMenuRedis.getCustomerMenuList(customerId,type,tableName); + List govMenuDTOS = govCustomerMenuRedis.getCustomerMenuList(customerId,type,tableName); if (!CollectionUtils.isEmpty(govMenuDTOS)){ return govMenuDTOS; - }*/ + } List menuList = baseDao.getCustomerMenuList(customerId, type, HttpContextUtils.getLanguage(),tableName); - disposeGovMenu(menuList,userId); Map> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus)); List dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class); - List govMenuDTOS = TreeUtils.buildTree(dtoList); -// govCustomerMenuRedis.setCustomerMenuList(customerId,type,govMenuDTOS,tableName); + govMenuDTOS = TreeUtils.buildTree(dtoList); + govCustomerMenuRedis.setCustomerMenuList(customerId,type,govMenuDTOS,tableName); return govMenuDTOS; } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java index 2bbfd622cd..49ff30eb14 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java @@ -171,6 +171,7 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl { GovRoleUserEntity entity = new GovRoleUserEntity(); entity.setUserId(formDTO.getUserId()); + entity.setCustomerId(formDTO.getCustomerId()); entity.setRoleId(r); entityList.add(entity); }); 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 d603bc3e5d..20b9b6b518 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 @@ -194,7 +194,7 @@ public class StaffServiceImpl implements StaffService { return new Result().error(EpmetErrorCode.STAFF_EDIT_FAILED.getCode(), EpmetErrorCode.STAFF_EDIT_FAILED.getMsg()); } if (CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){ - Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId())); + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(),fromDTO.getCustomerId())); if (!roleUserAccess.success()){ throw new EpmetException("save data to gov-role-user failure"); } @@ -588,7 +588,7 @@ public class StaffServiceImpl implements StaffService { staffOrgRelationService.insert(staffOrgRelationEntity); if (CollectionUtils.isNotEmpty(fromDTO.getNewRoles())){ - Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), customerStaffAgencyEntity.getUserId())); + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), customerStaffAgencyEntity.getUserId(),fromDTO.getCustomerId())); if (!roleUserAccess.success()){ throw new EpmetException("save data to gov-role-user failure"); } From 8ab028af171b73d8e3ec4ab9cc5f97ee03f35b12 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 12 Jul 2022 17:27:51 +0800 Subject: [PATCH 007/288] xin kai --- .../com/epmet/controller/GovMenuController.java | 6 ++++++ .../main/java/com/epmet/service/GovMenuService.java | 1 + .../com/epmet/service/impl/GovMenuServiceImpl.java | 13 +++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index 20636cfc3a..ce89f2c7d8 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -114,6 +114,12 @@ public class GovMenuController { return new Result>().ok(list); } + @GetMapping("navDigitalCommunity") + public Result> navDigitalCommunity(@LoginUser TokenDto tokenDto, String tableName){ + List list = govMenuService.navDigitalCommunity(tokenDto,tableName); + return new Result>().ok(list); + } + /** * 权限标识 * @param tokenDto token diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java index 0e87946dc5..fd09359551 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java @@ -129,6 +129,7 @@ public interface GovMenuService extends BaseService { * @return java.util.List */ List getUserMenuNavList(TokenDto tokenDto, String tableName); + List navDigitalCommunity(TokenDto tokenDto, String tableName); /** * 获取用户权限标识 diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index 4eeef93692..5e7969a100 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -231,6 +231,16 @@ public class GovMenuServiceImpl extends BaseServiceImpl navDigitalCommunity(TokenDto tokenDto, String tableName) { + tableName = getTableName(tableName); + List menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName); + Map> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus)); + List dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class); + List govMenuDTOS = TreeUtils.buildTree(dtoList); + return govMenuDTOS; + } + /** * 获取客户，配置的 菜单信息 * @@ -247,8 +257,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl menuList = baseDao.getCustomerMenuList(customerId, type, HttpContextUtils.getLanguage(),tableName); - Map> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus)); - List dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class); + List dtoList = ConvertUtils.sourceToTarget(menuList, GovMenuDTO.class); govMenuDTOS = TreeUtils.buildTree(dtoList); govCustomerMenuRedis.setCustomerMenuList(customerId,type,govMenuDTOS,tableName); return govMenuDTOS; From c8bda44bce3d8f2742027e6b4a2ff23e78c07508 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 13 Jul 2022 09:15:51 +0800 Subject: [PATCH 008/288] =?UTF-8?q?=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/GovRoleController.java | 2 +- .../java/com/epmet/service/impl/GovRoleServiceImpl.java | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java index a6a0a452cb..c11faba160 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java @@ -54,7 +54,7 @@ public class GovRoleController { @GetMapping("page") public Result> page(@LoginUser TokenDto tokenDto, @RequestParam Map params){ - params.put("customerId",tokenDto.getCustomerId()); + params.put("customerId", tokenDto.getCustomerId()); PageData page = govRoleService.page(params); return new Result>().ok(page); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index bd2f2169ab..5caacc5c23 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -24,6 +24,7 @@ import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.GovRoleDao; import com.epmet.dto.GovRoleDTO; @@ -56,6 +57,8 @@ public class GovRoleServiceImpl extends BaseServiceImpl page(Map params) { @@ -68,6 +71,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl list(Map params) { + params.put("customerId", loginUserUtil.getLoginUserCustomerId()); List entityList = baseDao.selectList(getWrapper(params)); return ConvertUtils.sourceToTarget(entityList, GovRoleDTO.class); @@ -79,7 +83,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id).like(StringUtils.isNotBlank(name), FieldConstant.NAME, name) - .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID_HUMP, customerId); + .eq(StringUtils.isNotBlank(customerId), FieldConstant.CUSTOMER_ID, customerId); return wrapper; } From d34a9a49fdad8db3eafe6e354e69028435bef5d9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 13 Jul 2022 09:18:08 +0800 Subject: [PATCH 009/288] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index 5e7969a100..6fa40a13b8 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -235,6 +235,7 @@ public class GovMenuServiceImpl extends BaseServiceImpl navDigitalCommunity(TokenDto tokenDto, String tableName) { tableName = getTableName(tableName); List menuList = baseDao.getCustomerMenuList(tokenDto.getCustomerId(), MenuTypeEnum.MENU.value(), HttpContextUtils.getLanguage(),tableName); + disposeGovMenu(menuList,tokenDto.getUserId()); Map> groupByStatus = menuList.stream().collect(Collectors.groupingBy(GovMenuEntity::getRoleStatus)); List dtoList = ConvertUtils.sourceToTarget(CollectionUtils.isEmpty(groupByStatus.get(true)) ? new ArrayList<>() : groupByStatus.get(true), GovMenuDTO.class); List govMenuDTOS = TreeUtils.buildTree(dtoList); From 514e0af217cf97d703f1a6f200187dd33839a1df Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 13 Jul 2022 10:27:27 +0800 Subject: [PATCH 010/288] =?UTF-8?q?=E8=A7=92=E8=89=B2=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/GetStaffExistRoleFormDTO.java | 19 +++++++++ .../epmet/dto/result/UserRoleResultDTO.java | 40 +++++++++++++++++++ .../com/epmet/feign/GovAccessFeignClient.java | 12 ++++++ .../GovAccessFeignClientFallBack.java | 8 ++++ .../controller/GovRoleUserController.java | 13 ++++++ .../main/java/com/epmet/dao/GovRoleDao.java | 12 ++++++ .../com/epmet/service/GovRoleUserService.java | 10 +++++ .../service/impl/GovRoleUserServiceImpl.java | 32 +++++++++++++++ .../src/main/resources/mapper/GovRoleDao.xml | 10 +++++ .../epmet/dto/result/StaffInitResultDTO.java | 1 + .../epmet/dto/result/StaffRoleResultDTO.java | 2 + .../impl/CustomerStaffServiceImpl.java | 15 ++++++- 12 files changed, 173 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetStaffExistRoleFormDTO.java create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetStaffExistRoleFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetStaffExistRoleFormDTO.java new file mode 100644 index 0000000000..19f9bb3d12 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetStaffExistRoleFormDTO.java @@ -0,0 +1,19 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/13 09:58 + * @DESC + */ +@Data +public class GetStaffExistRoleFormDTO implements Serializable { + + private static final long serialVersionUID = 8877632229886141531L; + + private String customerId; + private String staffId; +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java new file mode 100644 index 0000000000..0565b0e81c --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java @@ -0,0 +1,40 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/13 09:56 + * @DESC + */ +@Data +public class UserRoleResultDTO implements Serializable { + + private static final long serialVersionUID = -7761042062413503637L; + + private String roleId; + /** + * 角色key + */ + private String roleKey; + /** + * 角色名称 + */ + private String roleName; + + private Integer isDefault; + + /** + * 是否选中(选中的是true) + */ + private Boolean selected; + + public UserRoleResultDTO() { + this.roleId = ""; + this.roleKey = ""; + this.roleName = ""; + this.selected = false; + } +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java index f516612353..d7f415d85f 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -2,14 +2,17 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.InitDefaultOperationsFormDTO; import com.epmet.dto.form.ListOpePermsFormDTO; import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.List; import java.util.Set; //@FeignClient(name = ServiceConstant.GOV_ACCESS_SERVER, fallbackFactory = GovAccessFeignClientFallBackFactory.class, url = "http://localhost:8099") @@ -40,4 +43,13 @@ public interface GovAccessFeignClient { @PostMapping("/gov/access/govroleuser/roleUser") Result roleUser(@RequestBody RoleUserFormDTO formDTO); + /** + * Desc: 获取工作人员已经存在的新角色 + * @param formDTO + * @author zxc + * @date 2022/7/13 09:59 + */ + @PostMapping("/gov/access/govroleuser/getStaffExistRole") + Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO); + } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java index d7be3adf99..1c87c2030f 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java @@ -3,11 +3,14 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.InitDefaultOperationsFormDTO; import com.epmet.dto.form.ListOpePermsFormDTO; import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.feign.GovAccessFeignClient; +import java.util.List; import java.util.Set; /** @@ -32,4 +35,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient { public Result roleUser(RoleUserFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "roleUser", formDTO); } + + @Override + public Result> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getStaffExistRole", formDTO); + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java index 30eb4405b1..8d6b30ec04 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java @@ -25,7 +25,9 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.GovRoleUserDTO; +import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.service.GovRoleUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -142,4 +144,15 @@ public class GovRoleUserController { return new Result(); } + /** + * Desc: 获取工作人员已经存在的新角色 + * @param formDTO + * @author zxc + * @date 2022/7/13 09:59 + */ + @PostMapping("getStaffExistRole") + public Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO){ + return new Result>().ok(govRoleUserService.getStaffExistRole(formDTO)); + } + } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java index 768fc42792..b12ac15692 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java @@ -9,8 +9,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.GovRoleEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 角色管理 @@ -21,4 +25,12 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface GovRoleDao extends BaseDao { + /** + * Desc: 获取客户下所有角色 + * @param customerId + * @author zxc + * @date 2022/7/13 10:09 + */ + List getCustomerRoles(@Param("customerId")String customerId); + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java index 68b5b9d81b..b0b21e4573 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java @@ -20,7 +20,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.GovRoleUserDTO; +import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.GovRoleUserEntity; import java.util.List; @@ -139,4 +141,12 @@ public interface GovRoleUserService extends BaseService { * @date 2022/7/12 16:14 */ void roleUser(RoleUserFormDTO formDTO); + + /** + * Desc: 获取工作人员已经存在的新角色 + * @param formDTO + * @author zxc + * @date 2022/7/13 09:59 + */ + List getStaffExistRole(GetStaffExistRoleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java index 49ff30eb14..1f969e438f 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java @@ -24,9 +24,12 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.GovRoleDao; import com.epmet.dao.GovRoleUserDao; import com.epmet.dto.GovRoleUserDTO; +import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.GovRoleUserEntity; import com.epmet.redis.GovRoleUserRedis; import com.epmet.service.GovRoleUserService; @@ -54,6 +57,8 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl page(Map params) { @@ -179,4 +184,31 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { + List result = new ArrayList<>(); + result = govRoleDao.getCustomerRoles(formDTO.getCustomerId()); + if (CollectionUtils.isEmpty(result)){ + return result; + } + List roleIdList = govRoleUserDao.getRoleIdList(formDTO.getStaffId()); + if (roleIdList.isEmpty()){ + return result; + } + for (String id : roleIdList) { + for (UserRoleResultDTO r : result) { + if (id.equals(r.getRoleId())){ + r.setSelected(true); + } + } + } + return result; + } + } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml index 2de28e07bf..59b207e920 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml @@ -3,4 +3,14 @@ + + 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 393dd91771..c3d0f85a22 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 @@ -37,4 +37,5 @@ public class StaffInitResultDTO implements Serializable { * 职责列表 */ private List roleList; + private List newRoleList; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java index 7962be5504..d51032930a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffRoleResultDTO.java @@ -36,4 +36,6 @@ public class StaffRoleResultDTO implements Serializable { private Boolean selected; private String description; + + private Integer isDefault; } 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 024d3aed37..e5c5e65c6a 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 @@ -25,6 +25,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; 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.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -49,6 +50,7 @@ import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.StaffRoleEntity; import com.epmet.entity.UserEntity; import com.epmet.feign.AuthFeignClient; +import com.epmet.feign.GovAccessFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OperCrmOpenFeignClient; import com.epmet.service.CustomerStaffService; @@ -94,6 +96,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl page(Map params) { @@ -283,7 +287,16 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO); + if (!staffExistRole.success()){ + throw new EpmetException("getStaffExistRole method is failure"); + } + if (!CollectionUtils.isEmpty(staffExistRole.getData())){ + List staffRoleResultDTOS = ConvertUtils.sourceToTarget(staffExistRole.getData(), StaffRoleResultDTO.class); + resultDTO.setNewRoleList(staffRoleResultDTOS); + } return new Result().ok(resultDTO); } From c990efda8995c15657a2f394f0fd05967e3302da Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 13 Jul 2022 10:46:16 +0800 Subject: [PATCH 011/288] =?UTF-8?q?=E9=87=8D=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...oleResultDTO.java => NewUserRoleResultDTO.java} | 4 ++-- .../java/com/epmet/feign/GovAccessFeignClient.java | 4 ++-- .../fallback/GovAccessFeignClientFallBack.java | 4 ++-- .../epmet/controller/GovRoleUserController.java | 6 +++--- .../src/main/java/com/epmet/dao/GovRoleDao.java | 4 ++-- .../java/com/epmet/service/GovRoleUserService.java | 4 ++-- .../epmet/service/impl/GovRoleUserServiceImpl.java | 8 ++++---- .../src/main/resources/mapper/GovRoleDao.xml | 2 +- .../com/epmet/controller/UserRoleController.java | 10 +++++----- .../src/main/java/com/epmet/dao/UserRoleDao.java | 8 ++++---- .../java/com/epmet/service/UserRoleService.java | 8 ++++---- .../service/impl/CustomerStaffServiceImpl.java | 3 ++- .../service/impl/RegisterRelationServiceImpl.java | 6 +++--- .../service/impl/UserBaseInfoServiceImpl.java | 2 +- .../epmet/service/impl/UserRoleServiceImpl.java | 14 +++++++------- .../src/main/resources/mapper/UserRoleDao.xml | 6 +++--- 16 files changed, 47 insertions(+), 46 deletions(-) rename epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/{UserRoleResultDTO.java => NewUserRoleResultDTO.java} (86%) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/NewUserRoleResultDTO.java similarity index 86% rename from epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java rename to epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/NewUserRoleResultDTO.java index 0565b0e81c..44b9c64d7d 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/UserRoleResultDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/result/NewUserRoleResultDTO.java @@ -10,7 +10,7 @@ import java.io.Serializable; * @DESC */ @Data -public class UserRoleResultDTO implements Serializable { +public class NewUserRoleResultDTO implements Serializable { private static final long serialVersionUID = -7761042062413503637L; @@ -31,7 +31,7 @@ public class UserRoleResultDTO implements Serializable { */ private Boolean selected; - public UserRoleResultDTO() { + public NewUserRoleResultDTO() { this.roleId = ""; this.roleKey = ""; this.roleName = ""; diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java index d7f415d85f..36ccf542bb 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -6,7 +6,7 @@ import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.InitDefaultOperationsFormDTO; import com.epmet.dto.form.ListOpePermsFormDTO; import com.epmet.dto.form.RoleUserFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; @@ -50,6 +50,6 @@ public interface GovAccessFeignClient { * @date 2022/7/13 09:59 */ @PostMapping("/gov/access/govroleuser/getStaffExistRole") - Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO); + Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO); } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java index 1c87c2030f..bfb9acbc3b 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java @@ -7,7 +7,7 @@ import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.InitDefaultOperationsFormDTO; import com.epmet.dto.form.ListOpePermsFormDTO; import com.epmet.dto.form.RoleUserFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.feign.GovAccessFeignClient; import java.util.List; @@ -37,7 +37,7 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient { } @Override - public Result> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { + public Result> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getStaffExistRole", formDTO); } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java index 8d6b30ec04..6544a7a37b 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleUserController.java @@ -27,7 +27,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.GovRoleUserDTO; import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.RoleUserFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.service.GovRoleUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -151,8 +151,8 @@ public class GovRoleUserController { * @date 2022/7/13 09:59 */ @PostMapping("getStaffExistRole") - public Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO){ - return new Result>().ok(govRoleUserService.getStaffExistRole(formDTO)); + public Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO){ + return new Result>().ok(govRoleUserService.getStaffExistRole(formDTO)); } } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java index b12ac15692..526dbf9b37 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java @@ -9,7 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.GovRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -31,6 +31,6 @@ public interface GovRoleDao extends BaseDao { * @author zxc * @date 2022/7/13 10:09 */ - List getCustomerRoles(@Param("customerId")String customerId); + List getCustomerRoles(@Param("customerId")String customerId); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java index b0b21e4573..d4eba65037 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleUserService.java @@ -22,7 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.dto.GovRoleUserDTO; import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.RoleUserFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.GovRoleUserEntity; import java.util.List; @@ -148,5 +148,5 @@ public interface GovRoleUserService extends BaseService { * @author zxc * @date 2022/7/13 09:59 */ - List getStaffExistRole(GetStaffExistRoleFormDTO formDTO); + List getStaffExistRole(GetStaffExistRoleFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java index 1f969e438f..df693351f6 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleUserServiceImpl.java @@ -29,7 +29,7 @@ import com.epmet.dao.GovRoleUserDao; import com.epmet.dto.GovRoleUserDTO; import com.epmet.dto.form.GetStaffExistRoleFormDTO; import com.epmet.dto.form.RoleUserFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.GovRoleUserEntity; import com.epmet.redis.GovRoleUserRedis; import com.epmet.service.GovRoleUserService; @@ -191,8 +191,8 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { - List result = new ArrayList<>(); + public List getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { + List result = new ArrayList<>(); result = govRoleDao.getCustomerRoles(formDTO.getCustomerId()); if (CollectionUtils.isEmpty(result)){ return result; @@ -202,7 +202,7 @@ public class GovRoleUserServiceImpl extends BaseServiceImpl - SELECT ID AS roleId, `name` AS roleName, diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 99b07f9c36..8c4ab25a2e 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java @@ -28,7 +28,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.excel.UserRoleExcel; import com.epmet.service.UserRoleService; import org.springframework.beans.factory.annotation.Autowired; @@ -102,7 +102,7 @@ public class UserRoleController { * @Date 2020.03.30 15:35 **/ @PostMapping("getuserroleinfo") - public Result> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO) { + public Result> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO) { ValidatorUtils.validateEntity(userRoleFormDTO); @@ -130,7 +130,7 @@ public class UserRoleController { * @Date 14:24 2020-07-23 **/ @GetMapping(value = "getuserroleinfobyuserid/{userId}") - public Result> getUserRoleInfoByUserId(@PathVariable("userId") String userId) { + public Result> getUserRoleInfoByUserId(@PathVariable("userId") String userId) { return userRoleService.getUserRoleInfoByUserId(userId); } @@ -153,7 +153,7 @@ public class UserRoleController { * @return com.epmet.commons.tools.utils.Result */ @PostMapping("getresidentrole") - public Result getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) { - return new Result().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId())); + public Result getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) { + return new Result().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId())); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index e8a47ab9a1..f9a8f2dd66 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -21,7 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.GetRoleKeyListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.PartyMemberUserIdsResultDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -43,7 +43,7 @@ public interface UserRoleDao extends BaseDao { * @Author wangc * @Date 2020.03.30 15:35 **/ - List getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + List getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); /** * @Description 根据用户Id、网格Id、客户Id查询用户角色key列表 @@ -62,7 +62,7 @@ public interface UserRoleDao extends BaseDao { * @Author zhangyong * @Date 14:24 2020-07-23 **/ - List getUserRoleInfoByUserId(@Param("userId") String userId); + List getUserRoleInfoByUserId(@Param("userId") String userId); /** * @param formDTO @@ -96,5 +96,5 @@ public interface UserRoleDao extends BaseDao { * @param userId * @return java.util.List */ - UserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId); + NewUserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java index ae47c9291a..7c44014e65 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java @@ -22,7 +22,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserRoleFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import java.util.List; @@ -103,7 +103,7 @@ public interface UserRoleService extends BaseService { * @Author wangc * @Date 2020.03.30 15:35 **/ - Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); + Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO); /** * 添加用户角色关系 @@ -121,7 +121,7 @@ public interface UserRoleService extends BaseService { * @Author zhangyong * @Date 14:24 2020-07-23 **/ - Result> getUserRoleInfoByUserId(String userId); + Result> getUserRoleInfoByUserId(String userId); /** * @Description 查询此人是不是党员，true是党员，false不是党员 @@ -139,5 +139,5 @@ public interface UserRoleService extends BaseService { * @param userId * @return com.epmet.dto.result.UserRoleResultDTO */ - UserRoleResultDTO getUserResidentRole(String customerId, String userId); + NewUserRoleResultDTO getUserResidentRole(String customerId, String userId); } 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 e5c5e65c6a..c9c416d63c 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 @@ -45,6 +45,7 @@ import com.epmet.dao.StaffRoleDao; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.CustomerStaffEntity; import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.StaffRoleEntity; @@ -289,7 +290,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO); + Result> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO); if (!staffExistRole.success()){ throw new EpmetException("getStaffExistRole method is failure"); } 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 0ab2d16b99..d63921e97a 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 @@ -36,7 +36,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.UserBaseInfoResultDTO; import com.epmet.dto.result.UserInfoOnEnterGridResultDTO; import com.epmet.dto.result.UserResiInfoResultDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.RegisterRelationEntity; import com.epmet.entity.UserCustomerEntity; import com.epmet.feign.GovOrgFeignClient; @@ -324,9 +324,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl roleList = userRoleDao.getUserRoleInfo(userRoleFormDTO); + List roleList = userRoleDao.getUserRoleInfo(userRoleFormDTO); List roleListString = new ArrayList<>(); - for(UserRoleResultDTO role : roleList){ + for(NewUserRoleResultDTO role : roleList){ roleListString.add(role.getRoleKey()); } resultObj.setUserRoleList(roleListString); 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 6785817934..4cccbd7bf4 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 @@ -464,7 +464,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl roleList = userRoleDao.getUserRoleInfo(roleParam); + List roleList = userRoleDao.getUserRoleInfo(roleParam); List roleListFormat = new LinkedList<>(); if(null != roleList && !roleList.isEmpty()){ roleList.forEach(role -> { diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 242a6c8a46..8631c36114 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -29,7 +29,7 @@ import com.epmet.dao.UserRoleDao; import com.epmet.dto.RoleDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserRoleFormDTO; -import com.epmet.dto.result.UserRoleResultDTO; +import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import com.epmet.service.RoleService; import com.epmet.service.UserRoleService; @@ -114,8 +114,8 @@ public class UserRoleServiceImpl extends BaseServiceImpl> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { - return new Result>().ok(baseDao.getUserRoleInfo(userRoleFormDTO)); + public Result> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) { + return new Result>().ok(baseDao.getUserRoleInfo(userRoleFormDTO)); } @Override @@ -131,9 +131,9 @@ public class UserRoleServiceImpl extends BaseServiceImpl> getUserRoleInfoByUserId(String userId) { - List list = baseDao.getUserRoleInfoByUserId(userId); - return new Result>().ok(list); + public Result> getUserRoleInfoByUserId(String userId) { + List list = baseDao.getUserRoleInfoByUserId(userId); + return new Result>().ok(list); } /** @@ -158,7 +158,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl - SELECT er.ROLE_NAME, er.ROLE_KEY From 64eea8a862ba06e42535fe1a7cac4531a318d94b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 13 Jul 2022 10:55:52 +0800 Subject: [PATCH 012/288] =?UTF-8?q?=E4=B8=8D=E8=A6=81=E5=9C=A8=E6=94=B9?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/GovRoleDTO.java | 5 ----- .../src/main/java/com/epmet/entity/GovRoleEntity.java | 5 ----- .../main/java/com/epmet/service/impl/GovRoleServiceImpl.java | 5 ----- 3 files changed, 15 deletions(-) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java index 4f9aed2c68..f4b7ce74e9 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java @@ -45,11 +45,6 @@ public class GovRoleDTO implements Serializable { */ private String customerId; - /** - * 是否是默认角色【0:否 1:是】 默认角色不能删除 - */ - private String isDefault; - /** * 角色名称 */ diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java index 0474fb65de..654bee9ce6 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java @@ -46,9 +46,4 @@ public class GovRoleEntity extends BaseEpmetEntity { */ private String customerId; - /** - * 是否是默认角色【0:否 1:是】 默认角色不能删除 - */ - private String isDefault; - } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index 5caacc5c23..72a542c9e7 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -115,11 +115,6 @@ public class GovRoleServiceImpl extends BaseServiceImpl Date: Wed, 13 Jul 2022 11:18:28 +0800 Subject: [PATCH 013/288] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/GovRoleMenuDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml index 38864a7bfe..f2e09830ca 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleMenuDao.xml @@ -4,7 +4,7 @@ + From 6cb04c0599875de74952d3b68667ee8a293c3c99 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 13 Jul 2022 14:41:58 +0800 Subject: [PATCH 015/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BD=91=E6=A0=BC?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E7=BB=84=E7=BB=87=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4epmet:org:temp:orgtree*=E7=9B=B8=E5=85=B3key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/redis/RedisKeys.java | 14 ++++++++++++-- .../com/epmet/commons/tools/redis/RedisUtils.java | 11 +++++++++++ .../service/govorg/impl/GovOrgServiceImpl.java | 2 +- .../epmet/controller/CustomerAgencyController.java | 2 +- .../java/com/epmet/controller/GridController.java | 1 - .../epmet/controller/ServiceProjectController.java | 2 +- .../epmet/controller/UserHouseScopeController.java | 2 +- .../java/com/epmet/redis/CustomerAgencyRedis.java | 3 +++ .../com/epmet/service/CustomerAgencyService.java | 3 +-- .../com/epmet/service/ServiceProjectService.java | 4 +--- .../com/epmet/service/UserHouseScopeService.java | 2 +- .../com/epmet/service/impl/AgencyServiceImpl.java | 5 ++++- .../service/impl/CustomerAgencyServiceImpl.java | 6 +++--- .../service/impl/CustomerGridServiceImpl.java | 4 +++- .../service/impl/ServiceProjectServiceImpl.java | 8 ++------ .../service/impl/UserHouseScopeServiceImpl.java | 4 ++-- 16 files changed, 47 insertions(+), 26 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index b9795ef8dc..a126ba254e 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -644,8 +644,18 @@ public class RedisKeys { * @param agencyId * @return */ - public static String getOrgTreeCacheKey(String agencyId) { - return rootPrefix.concat("org:temp:orgtree").concat(agencyId); + public static String getOrgTreeCacheKey(String agencyId,String customerId) { + return rootPrefix.concat("org:temp:orgtree").concat(customerId).concat(StrConstant.COLON).concat(agencyId); + } + + /** + * 与getOrgTreeCacheKey一致，用于模糊删除 + * @param customerId + * @return + */ + public static String getOrgTreeCachePrexKey(String customerId) { + // return "epmet:org:temp:orgtree".concat(StrConstant.STAR); + return rootPrefix.concat("org:temp:orgtree").concat(customerId).concat(StrConstant.STAR); } public static String getHouseInfoCacheKey(String houseId,String customerId){ diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index 27636e435a..7fc8b75347 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java @@ -444,4 +444,15 @@ public class RedisUtils { public Long getTTL(String treeCacheKey) { return redisTemplate.getExpire(treeCacheKey); } + + /** + * 根据前缀模糊删除 + * @param prex + */ + public void deleteByPrex(String prex) { + Set keys = redisTemplate.keys(prex); + if (!CollectionUtils.isEmpty(keys)) { + redisTemplate.delete(keys); + } + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 0c2533a7c9..64144cd813 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -566,7 +566,7 @@ public class GovOrgServiceImpl implements GovOrgService { String agencyId = staffInfo.getAgencyId(); String client = formDTO.getClient(); //组织缓存key - String treeCacheKey = RedisKeys.getOrgTreeCacheKey(agencyId).concat(StrConstant.COLON).concat(client); + String treeCacheKey = RedisKeys.getOrgTreeCacheKey(agencyId,tokenDto.getCustomerId()).concat(StrConstant.COLON).concat(client); Long expiryTime = redisUtils.getTTL(treeCacheKey); List orgTreeResultDTOS = (List) redisUtils.get(treeCacheKey); //如果接近过期或已经过期且缓存数据不为空 则异步查询 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 ec9d682d76..73316bad52 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 @@ -396,7 +396,7 @@ public class CustomerAgencyController { @PostMapping("agencygridtree") public Result getOrgTreeData(@LoginUser TokenDto tokenDTO) { //tokenDTO.setUserId("dffe71e021a61b900f9025f4f07f6955"); - return new Result().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId())); + return new Result().ok(customerAgencyService.getOrgTreeData(tokenDTO.getUserId(),tokenDTO.getCustomerId())); } /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index 8f026e9f44..abcf908367 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -92,7 +92,6 @@ public class GridController { return result; } - /** * 删除网格 */ diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ServiceProjectController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ServiceProjectController.java index 6bae4e8f2f..db5b040103 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ServiceProjectController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/ServiceProjectController.java @@ -29,7 +29,7 @@ public class ServiceProjectController { */ @RequestMapping("service/serviceScopeTree") public Result getServiceScopeTree(@LoginUser TokenDto loginInfo) { - ServiceProjectScopeResultDTO r = serviceProjectService.getServiceScopeTree(loginInfo.getUserId()); + ServiceProjectScopeResultDTO r = serviceProjectService.getServiceScopeTree(loginInfo.getUserId(),loginInfo.getCustomerId()); return new Result().ok(r); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/UserHouseScopeController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/UserHouseScopeController.java index 3a5e67704f..3ad215bbf7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/UserHouseScopeController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/UserHouseScopeController.java @@ -26,7 +26,7 @@ public class UserHouseScopeController { */ @RequestMapping("service/serviceScopeTree") public Result getServiceScopeTree(@LoginUser TokenDto loginInfo) { - UserHouseScopeResultDTO r = userHouseScopeService.getServiceScopeTree(loginInfo.getUserId()); + UserHouseScopeResultDTO r = userHouseScopeService.getServiceScopeTree(loginInfo.getUserId(),loginInfo.getCustomerId()); return new Result().ok(r); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java index a4be0f2703..c41d5eae0e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java @@ -59,4 +59,7 @@ public class CustomerAgencyRedis { return BeanUtil.mapToBean(resultMap, AgencyInfoCache.class, true); } + public void deleteByPrex(String orgTreeCachePrexKey) { + redisUtils.deleteByPrex(orgTreeCachePrexKey); + } } 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 21e6f17320..bec4188167 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 @@ -24,7 +24,6 @@ import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; import java.util.Map; @@ -270,7 +269,7 @@ public interface CustomerAgencyService extends BaseService * @param staffId * @return */ - AgencyTreeResultDTO getOrgTreeData(String staffId); + AgencyTreeResultDTO getOrgTreeData(String staffId,String customerId); /** * @Description 【事件】社区服务热线 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ServiceProjectService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ServiceProjectService.java index 22058470de..c09a6411b1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ServiceProjectService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/ServiceProjectService.java @@ -1,9 +1,7 @@ package com.epmet.service; -import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.result.ServiceProjectScopeResultDTO; -import com.epmet.entity.IcPlaceOrgEntity; public interface ServiceProjectService { - ServiceProjectScopeResultDTO getServiceScopeTree(String staffId); + ServiceProjectScopeResultDTO getServiceScopeTree(String staffId,String customerId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/UserHouseScopeService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/UserHouseScopeService.java index 31fb3be5b8..210b0e7dad 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/UserHouseScopeService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/UserHouseScopeService.java @@ -3,5 +3,5 @@ package com.epmet.service; import com.epmet.dto.result.UserHouseScopeResultDTO; public interface UserHouseScopeService { - UserHouseScopeResultDTO getServiceScopeTree(String staffId); + UserHouseScopeResultDTO getServiceScopeTree(String staffId,String customerId); } 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 cf2016de58..dafc9da5d5 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 @@ -27,6 +27,7 @@ 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.RenException; +import com.epmet.commons.tools.redis.RedisKeys; 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; @@ -237,7 +238,9 @@ public class AgencyServiceImpl implements AgencyService { //5.redis缓存 customerAgencyRedis.delete(formDTO.getAgencyId()); - + //6.一些下拉组织树的缓存要清除掉 + String orgTreeCachePrexKey = RedisKeys.getOrgTreeCachePrexKey(formDTO.getCustomerId()); + customerAgencyRedis.deleteByPrex(orgTreeCachePrexKey); return result; } 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 d7f4e95ac1..4354be6b51 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 @@ -1175,7 +1175,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl Date: Wed, 13 Jul 2022 14:52:42 +0800 Subject: [PATCH 016/288] : --- .../main/java/com/epmet/commons/tools/redis/RedisKeys.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index a126ba254e..c0ce2acbb7 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -645,7 +645,7 @@ public class RedisKeys { * @return */ public static String getOrgTreeCacheKey(String agencyId,String customerId) { - return rootPrefix.concat("org:temp:orgtree").concat(customerId).concat(StrConstant.COLON).concat(agencyId); + return rootPrefix.concat("org:temp:orgtree:").concat(customerId).concat(StrConstant.COLON).concat(agencyId); } /** @@ -655,7 +655,7 @@ public class RedisKeys { */ public static String getOrgTreeCachePrexKey(String customerId) { // return "epmet:org:temp:orgtree".concat(StrConstant.STAR); - return rootPrefix.concat("org:temp:orgtree").concat(customerId).concat(StrConstant.STAR); + return rootPrefix.concat("org:temp:orgtree:").concat(customerId).concat(StrConstant.STAR); } public static String getHouseInfoCacheKey(String houseId,String customerId){ From ccba5b12d49aa865323ec05c4f9749364b6eebc8 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 13 Jul 2022 15:16:28 +0800 Subject: [PATCH 017/288] =?UTF-8?q?=E9=87=8D=E5=90=8DDTO=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/UserRoleController.java | 5 +++-- .../src/main/java/com/epmet/dao/UserRoleDao.java | 5 +++-- .../src/main/java/com/epmet/service/UserRoleService.java | 3 ++- .../java/com/epmet/service/impl/UserRoleServiceImpl.java | 3 ++- .../src/main/resources/mapper/UserRoleDao.xml | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java index 8c4ab25a2e..dd1cd558a6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java @@ -29,6 +29,7 @@ import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.excel.UserRoleExcel; import com.epmet.service.UserRoleService; import org.springframework.beans.factory.annotation.Autowired; @@ -153,7 +154,7 @@ public class UserRoleController { * @return com.epmet.commons.tools.utils.Result */ @PostMapping("getresidentrole") - public Result getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) { - return new Result().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId())); + public Result getUserResidentRole(@RequestBody UserResiInfoFormDTO formDTO) { + return new Result().ok(userRoleService.getUserResidentRole(formDTO.getCustomerId(), formDTO.getUserId())); } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java index f9a8f2dd66..62e59d9b98 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserRoleDao.java @@ -20,8 +20,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.form.GetRoleKeyListFormDTO; import com.epmet.dto.form.UserRoleFormDTO; -import com.epmet.dto.result.PartyMemberUserIdsResultDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.PartyMemberUserIdsResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -96,5 +97,5 @@ public interface UserRoleDao extends BaseDao { * @param userId * @return java.util.List */ - NewUserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId); + UserRoleResultDTO selectResidentRole(@Param("customerId") String customerId, @Param("userId") String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java index 7c44014e65..38f9ff02ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java @@ -23,6 +23,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import java.util.List; @@ -139,5 +140,5 @@ public interface UserRoleService extends BaseService { * @param userId * @return com.epmet.dto.result.UserRoleResultDTO */ - NewUserRoleResultDTO getUserResidentRole(String customerId, String userId); + UserRoleResultDTO getUserResidentRole(String customerId, String userId); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 8631c36114..efb6eac3b5 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -30,6 +30,7 @@ import com.epmet.dto.RoleDTO; import com.epmet.dto.UserRoleDTO; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.NewUserRoleResultDTO; +import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.entity.UserRoleEntity; import com.epmet.service.RoleService; import com.epmet.service.UserRoleService; @@ -158,7 +159,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl - SELECT er.ROLE_NAME, er.ROLE_KEY From 6654c75f5ec280a6c6a13f86770abd754b591e15 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 13 Jul 2022 15:18:22 +0800 Subject: [PATCH 018/288] =?UTF-8?q?=EF=BC=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.7__alter_gov_role.sql | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.7__alter_gov_role.sql diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.7__alter_gov_role.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.7__alter_gov_role.sql new file mode 100644 index 0000000000..c67ca9f27c --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.7__alter_gov_role.sql @@ -0,0 +1,16 @@ + + +ALTER TABLE `gov_role` +ADD COLUMN `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID' AFTER `id`; + + +ALTER TABLE `gov_role_menu` +ADD COLUMN `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID' AFTER `id`; + + +ALTER TABLE `gov_role_user` +ADD COLUMN `CUSTOMER_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '客户ID' AFTER `id`; + + + + From 2ea13f98eeb34e7ce2d662b32228b672d2baf3b7 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 13 Jul 2022 15:38:08 +0800 Subject: [PATCH 019/288] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gov-access-server/src/main/resources/mapper/GovRoleDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml index 55158c31ef..3078bf4cdf 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/GovRoleDao.xml @@ -7,8 +7,7 @@ + + + + + + + + + + + + + + + + + + + + From ebae47dd8f0074aa38e48e5cd1c41d6b87cd6a6f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 19 Jul 2022 12:27:29 +0800 Subject: [PATCH 028/288] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=81=E7=BB=9F=E8=AE=A1=E4=BF=A1=E6=81=AF=E4=B8=8B=E6=8B=89?= =?UTF-8?q?=E6=A1=86=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/policy/IcPolicyItemResultDTO.java | 79 +++++++++++++++++++ .../IcPolicyCategoryController.java | 73 ----------------- .../epmet/controller/IcPolicyController.java | 59 +++----------- .../controller/IcPolicyRuleController.java | 70 ---------------- .../IcPolicyRuleDetailController.java | 70 ---------------- .../main/java/com/epmet/dao/IcPolicyDao.java | 13 ++- .../com/epmet/service/IcPolicyService.java | 67 ++-------------- .../service/impl/IcPolicyServiceImpl.java | 78 +++++------------- .../src/main/resources/mapper/IcPolicyDao.xml | 22 +++++- 9 files changed, 151 insertions(+), 380 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/policy/IcPolicyItemResultDTO.java delete mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyCategoryController.java delete mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleController.java delete mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleDetailController.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/policy/IcPolicyItemResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/policy/IcPolicyItemResultDTO.java new file mode 100644 index 0000000000..ee75325f26 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/policy/IcPolicyItemResultDTO.java @@ -0,0 +1,79 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; + + +/** + * + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-19 + */ +@Data +public class IcPolicyItemResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * + */ + private String id; + + /** + * + */ + private String customerId; + + /** + * house:房屋信息，stat:统计信息 + */ + private String groupType; + + /** + * 选项名；例如：房屋类型，房屋状态，人均收入 + */ + private String label; + + /** + * 表名 + */ + private String tableName; + + /** + * 房屋信息存储列名；统计信息定义好key放在这里 + */ + private String colKey; + + /** + * + */ + private String itemType; + + /** + * 排序 + */ + private Integer sort; + + /** + * 备注 + */ + private String remark; + + /** + * 值来源;需要接口获取：remote。 + */ + private String optionSourceType; + + /** + * 动态url； + */ + private String optionSourceUrl; + + /** + * 动态url的入参；存储json串 + */ + private String optionSourceParam; + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyCategoryController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyCategoryController.java deleted file mode 100644 index 37a78aed67..0000000000 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyCategoryController.java +++ /dev/null @@ -1,73 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ExcelUtils; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IcPolicyCategoryDTO; -import com.epmet.service.IcPolicyCategoryService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import javax.servlet.http.HttpServletResponse; -import java.util.List; -import java.util.Map; - - -/** - * 政策匹配资源类型 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-07-18 - */ -@RestController -@RequestMapping("icPolicyCategory") -public class IcPolicyCategoryController { - - @Autowired - private IcPolicyCategoryService icPolicyCategoryService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPolicyCategoryService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPolicyCategoryDTO data = icPolicyCategoryService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPolicyCategoryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPolicyCategoryService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPolicyCategoryDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPolicyCategoryService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPolicyCategoryService.delete(ids); - return new Result(); - } - -} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index c675263718..1cebba0484 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -1,19 +1,12 @@ package com.epmet.controller; -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.IcPolicyDTO; +import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.service.IcPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.Map; +import java.util.List; /** @@ -23,48 +16,22 @@ import java.util.Map; * @since v1.0.0 2022-07-18 */ @RestController -@RequestMapping("icPolicy") +@RequestMapping("policy") public class IcPolicyController { @Autowired private IcPolicyService icPolicyService; - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPolicyService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPolicyDTO data = icPolicyService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPolicyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPolicyService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPolicyDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPolicyService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPolicyService.delete(ids); - return new Result(); + /** + * 房屋信息、统计信息查询有哪些可选项 + * @param customerId + * @param groupType + * @return + */ + @PostMapping("item-list/{groupType}") + public Result> itemList(@RequestHeader("customerId") String customerId, @PathVariable("groupType") String groupType) { + List list = icPolicyService.itemList(customerId, groupType); + return new Result>().ok(list); } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleController.java deleted file mode 100644 index a2706981e7..0000000000 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.dto.IcPolicyRuleDTO; -import com.epmet.service.IcPolicyRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 政策匹配规则 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-07-18 - */ -@RestController -@RequestMapping("icPolicyRule") -public class IcPolicyRuleController { - - @Autowired - private IcPolicyRuleService icPolicyRuleService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPolicyRuleService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPolicyRuleDTO data = icPolicyRuleService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPolicyRuleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPolicyRuleService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPolicyRuleDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPolicyRuleService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPolicyRuleService.delete(ids); - return new Result(); - } - -} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleDetailController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleDetailController.java deleted file mode 100644 index a0221221a5..0000000000 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyRuleDetailController.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.epmet.controller; - -import com.epmet.commons.tools.aop.NoRepeatSubmit; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.Result; -import com.epmet.commons.tools.validator.AssertUtils; -import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; -import com.epmet.commons.tools.validator.group.DefaultGroup; -import com.epmet.dto.IcPolicyRuleDetailDTO; -import com.epmet.service.IcPolicyRuleDetailService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.Map; - - -/** - * 政策匹配规则明细 - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-07-18 - */ -@RestController -@RequestMapping("icPolicyRuleDetail") -public class IcPolicyRuleDetailController { - - @Autowired - private IcPolicyRuleDetailService icPolicyRuleDetailService; - - @RequestMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icPolicyRuleDetailService.page(params); - return new Result>().ok(page); - } - - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ - IcPolicyRuleDetailDTO data = icPolicyRuleDetailService.get(id); - return new Result().ok(data); - } - - @NoRepeatSubmit - @PostMapping("save") - public Result save(@RequestBody IcPolicyRuleDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icPolicyRuleDetailService.save(dto); - return new Result(); - } - - @NoRepeatSubmit - @PostMapping("update") - public Result update(@RequestBody IcPolicyRuleDetailDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icPolicyRuleDetailService.update(dto); - return new Result(); - } - - @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icPolicyRuleDetailService.delete(ids); - return new Result(); - } - -} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java index 58dd84bf8d..2da10a4941 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java @@ -1,8 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.entity.IcPolicyEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 政策表 @@ -12,5 +16,12 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPolicyDao extends BaseDao { - + + /** + * 房屋信息、统计信息查询有哪些可选项 + * @param customerId + * @param groupType + * @return + */ + List selectItemList(@Param("customerId") String customerId, @Param("groupType") String groupType); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index 6f8eacf71a..86a984760f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -1,12 +1,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; -import com.epmet.commons.tools.page.PageData; -import com.epmet.dto.IcPolicyDTO; +import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.entity.IcPolicyEntity; import java.util.List; -import java.util.Map; /** * 政策表 @@ -15,64 +13,11 @@ import java.util.Map; * @since v1.0.0 2022-07-18 */ public interface IcPolicyService extends BaseService { - - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2022-07-18 - */ - PageData page(Map params); - - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2022-07-18 - */ - List list(Map params); - - /** - * 单条查询 - * - * @param id - * @return IcPolicyDTO - * @author generator - * @date 2022-07-18 - */ - IcPolicyDTO get(String id); - - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2022-07-18 - */ - void save(IcPolicyDTO dto); - - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2022-07-18 - */ - void update(IcPolicyDTO dto); - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2022-07-18 + * 房屋信息、统计信息查询有哪些可选项 + * @param customerId + * @param groupType + * @return */ - void delete(String[] ids); + List itemList(String customerId, String groupType); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 25bff0ed12..90162b4231 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -1,22 +1,17 @@ package com.epmet.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; -import com.epmet.commons.tools.constant.FieldConstant; -import com.epmet.commons.tools.page.PageData; -import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.constant.Constant; import com.epmet.dao.IcPolicyDao; -import com.epmet.dto.IcPolicyDTO; +import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.entity.IcPolicyEntity; import com.epmet.service.IcPolicyService; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; +import java.util.ArrayList; import java.util.List; -import java.util.Map; /** * 政策表 @@ -27,56 +22,23 @@ import java.util.Map; @Service public class IcPolicyServiceImpl extends BaseServiceImpl implements IcPolicyService { - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, IcPolicyDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, IcPolicyDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } + /** + * 房屋信息、统计信息查询有哪些可选项 + * + * @param customerId + * @param groupType + * @return + */ @Override - public IcPolicyDTO get(String id) { - IcPolicyEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, IcPolicyDTO.class); + public List itemList(String customerId, String groupType) { + if(StringUtils.isBlank(groupType)){ + return new ArrayList<>(); + } + List resultList=baseDao.selectItemList(customerId,groupType); + if(CollectionUtils.isEmpty(resultList)){ + return baseDao.selectItemList(Constant.DEFAULT_CUSTOMER,groupType); + } + return resultList; } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(IcPolicyDTO dto) { - IcPolicyEntity entity = ConvertUtils.sourceToTarget(dto, IcPolicyEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(IcPolicyDTO dto) { - IcPolicyEntity entity = ConvertUtils.sourceToTarget(dto, IcPolicyEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } - } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml index 9be6fc19d2..f02037127c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml @@ -21,5 +21,25 @@ - + \ No newline at end of file From 45f49766cbbcb2387b031cfb327a11e14300cb82 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Jul 2022 13:45:18 +0800 Subject: [PATCH 029/288] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=88=BF=E5=B1=8B?= =?UTF-8?q?=E5=86=85=E5=AE=B6=E5=BA=AD=E6=88=90=E5=91=98=E6=9C=88=E6=94=B6?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.36__house_add_avgysr.sql | 1 + .../gov-org-server/src/main/resources/mapper/IcHouseDao.xml | 1 + 2 files changed, 2 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql new file mode 100644 index 0000000000..73b95459ce --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql @@ -0,0 +1 @@ +alter table ic_house add column AVG_RSR decimal(10, 4) comment '人均月收入' after RESI_NUMBER; \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index f770ddfa8e..ac7c0fc342 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -25,6 +25,7 @@ + From e7f9b111bc1f7c23936ca9e76762545a3e7d464c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 19 Jul 2022 15:05:25 +0800 Subject: [PATCH 030/288] commityixia --- .../commons/tools/constant/Constant.java | 16 ++ .../dto/form/policy/IcPolicyFormDTO.java | 99 +++++++++++ .../form/policy/IcPolicyRuleDetailDTO.java | 60 +++++++ .../dto/form/policy/IcPolicyRuleFormDTO.java | 37 ++++ .../epmet/controller/IcPolicyController.java | 36 ++++ .../entity/IcPolicyRuleDetailEntity.java | 5 +- .../com/epmet/service/IcPolicyService.java | 15 ++ .../service/impl/IcPolicyServiceImpl.java | 158 +++++++++++++++++- 8 files changed, 416 insertions(+), 10 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java index 77875d5415..95cc929784 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/Constant.java @@ -174,4 +174,20 @@ public interface Constant { String OPITON_SOURCE_REMOTE = "remote"; String OPITON_SOURCE_LOCAL = "local"; + + /** + * 附件状态（审核中：auditing； + auto_passed: 自动通过； + review：结果不确定，需要人工审核； + block: 结果违规； + rejected：人工审核驳回; + approved：人工审核通过） + 现在图片是同步审核的，所以图片只有auto_passed一种状态 + */ + String AUDITING="auditing"; + String AUTO_PASSED="auto_passed"; + String REVIEW="review"; + String BLOCK="block"; + String REJECTED="rejected"; + String APPROVED="approved"; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java new file mode 100644 index 0000000000..c605e8b062 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java @@ -0,0 +1,99 @@ +package com.epmet.dto.form.policy; + +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import com.epmet.dto.IcPolicyCategoryDTO; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.Valid; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotEmpty; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/7/19 13:09 + */ + +@Data +public class IcPolicyFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + public interface UpdateUserInternalGroup { + } + @NotBlank(message = "政策id不能为空",groups = UpdateUserInternalGroup.class) + private String policyId; + /** + * 政策创建人，所属组织id + */ + @NotBlank(message = "orgId不能为空",groups = UpdateUserInternalGroup.class) + private String orgId; + + /** + * AGENCY_ID的全路径，含agency_id + */ + @NotBlank(message = "orgIdPath不能为空",groups = UpdateUserInternalGroup.class) + private String orgIdPath; + + + /** + * 客户id + */ + @NotBlank(message = "客户id不能为空", groups = AddUserInternalGroup.class) + private String customerId; + private String staffId; + + /** + * 政策级别，0市级；1区级；2街道级 + */ + @NotBlank(message = "政策级别不能为空", groups = AddUserShowGroup.class) + private String policyLevel; + + /** + * 生效起止日期 + */ + @JsonFormat(pattern="yyyy-MM-dd") + @NotNull(message = "政策开始日期不能为空", groups = AddUserShowGroup.class) + private Date startDate; + + /** + * 截止日期 + */ + @JsonFormat(pattern="yyyy-MM-dd") + @NotNull(message = "政策截止日期不能为空", groups = AddUserShowGroup.class) + private Date endDate; + + /** + * 政策标题 + */ + @NotBlank(message = "政策标题不能为空", groups = AddUserShowGroup.class) + @Length(max = 100, groups = AddUserShowGroup.class, message = "政策标题最多输入100字") + private String title; + + /** + * 政策内容 + */ + @NotBlank(message = "政策内容不能为空", groups = AddUserShowGroup.class) + @Length(max = 2000, groups = AddUserShowGroup.class, message = "政策内容最多输入2000字") + private String content; + + private List categoryList; + + // @Valid + private List attachmentList; + + @Valid + @NotEmpty(message = "政策细则不能为空",groups =AddUserShowGroup.class ) + private List ruleList; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java new file mode 100644 index 0000000000..b88ac693c6 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java @@ -0,0 +1,60 @@ +package com.epmet.dto.form.policy; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Description + * @Author yzm + * @Date 2022/7/19 13:32 + */ +@Data +public class IcPolicyRuleDetailDTO { + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + /** + * 规则描述文字，例如：基础信息性别等于女 + */ + private String ruleDesc; + + /** + * 与上一条的关系；and、or + */ + private String lastLogicalRel; + + /** + * 分组id；人员信息有值； + */ + private String itemGroupId; + + /** + * 表名；人员信息有值；房屋信息也有值 + */ + private String itemId; + + /** + * 查询类型：等于、不等于....;来源于字典表sql_query_type + */ + @NotBlank(message = "查询类型不能为空", groups = AddUserShowGroup.class) + private String queryType; + + /** + * 表名；人员信息有值； + */ + private String colTable; + + /** + * 人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧 + */ + @NotBlank(message = "条件不能为空", groups = AddUserShowGroup.class) + private String colKey; + + /** + * 参数值 + */ + @NotBlank(message = "参数值不能为空", groups = AddUserShowGroup.class) + private String colVal; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java new file mode 100644 index 0000000000..99ed14eb4e --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java @@ -0,0 +1,37 @@ +package com.epmet.dto.form.policy; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/7/19 13:31 + */ +@Data +public class IcPolicyRuleFormDTO implements Serializable { + + /** + * 细则名称 + */ + @NotBlank(message = "细则名称不能为空", groups = IcPolicyFormDTO.AddUserShowGroup.class) + private String ruleName; + /** + * 人员信息 + */ + // @Valid + // @NotEmpty + private List resiRuleList; + /** + * 房屋信息 + */ + private List houseRuleList; + /** + * 统计信息 + */ + private List statRuleList; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 1cebba0484..8b17d4d6ed 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -1,7 +1,11 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +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.IcPolicyItemResultDTO; +import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.service.IcPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,4 +38,36 @@ public class IcPolicyController { return new Result>().ok(list); } + /** + * 政策管理-新增/修改 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("add") + public Result add(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, IcPolicyFormDTO.AddUserShowGroup.class, IcPolicyFormDTO.AddUserInternalGroup.class); + icPolicyService.addPolicy(formDTO); + return new Result(); + } + + /** + * 编辑政策 + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("update") + public Result update(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyFormDTO formDTO) { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, IcPolicyFormDTO.AddUserShowGroup.class, IcPolicyFormDTO.AddUserInternalGroup.class,IcPolicyFormDTO.UpdateUserInternalGroup.class); + icPolicyService.updatePolicy(formDTO); + return new Result(); + } + + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java index 57d8f91ab1..ee959255b0 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java @@ -1,13 +1,10 @@ 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; - /** * 政策匹配规则明细 * @@ -67,7 +64,7 @@ public class IcPolicyRuleDetailEntity extends BaseEpmetEntity { private String queryType; /** - * 表名；人员信息有值； + * 表名；人员信息有值；房屋信息也有值 */ private String colTable; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index 86a984760f..b464facd1a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -2,6 +2,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dto.IcPolicyItemResultDTO; +import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.entity.IcPolicyEntity; import java.util.List; @@ -15,9 +16,23 @@ import java.util.List; public interface IcPolicyService extends BaseService { /** * 房屋信息、统计信息查询有哪些可选项 + * * @param customerId * @param groupType * @return */ List itemList(String customerId, String groupType); + + /** + * 政策管理-新增/修改 + * + * @param formDTO + */ + void addPolicy(IcPolicyFormDTO formDTO); + + /** + * 修改政策 + * @param formDTO + */ + void updatePolicy(IcPolicyFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 90162b4231..183a1d4cad 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -2,13 +2,26 @@ package com.epmet.service.impl; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; -import com.epmet.dao.IcPolicyDao; +import com.epmet.commons.tools.constant.StrConstant; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +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.redis.common.CustomerStaffRedis; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.dao.*; +import com.epmet.dto.IcPolicyCategoryDTO; import com.epmet.dto.IcPolicyItemResultDTO; -import com.epmet.entity.IcPolicyEntity; +import com.epmet.dto.form.policy.IcPolicyFormDTO; +import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO; +import com.epmet.dto.form.policy.IcPolicyRuleFormDTO; +import com.epmet.entity.*; import com.epmet.service.IcPolicyService; import org.apache.commons.collections4.CollectionUtils; 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.List; @@ -22,6 +35,15 @@ import java.util.List; @Service public class IcPolicyServiceImpl extends BaseServiceImpl implements IcPolicyService { + @Autowired + private IcPolicyCategoryDao icPolicyCategoryDao; + @Autowired + private IcPolicyRuleDao icPolicyRuleDao; + @Autowired + private HeartAttachmentDao heartAttachmentDao; + @Autowired + private IcPolicyRuleDetailDao icPolicyRuleDetailDao; + /** * 房屋信息、统计信息查询有哪些可选项 @@ -32,13 +54,137 @@ public class IcPolicyServiceImpl extends BaseServiceImpl itemList(String customerId, String groupType) { - if(StringUtils.isBlank(groupType)){ + if (StringUtils.isBlank(groupType)) { return new ArrayList<>(); } - List resultList=baseDao.selectItemList(customerId,groupType); - if(CollectionUtils.isEmpty(resultList)){ - return baseDao.selectItemList(Constant.DEFAULT_CUSTOMER,groupType); + List resultList = baseDao.selectItemList(customerId, groupType); + if (CollectionUtils.isEmpty(resultList)) { + return baseDao.selectItemList(Constant.DEFAULT_CUSTOMER, groupType); } return resultList; } + + /** + * 政策管理-新增/修改 + * + * @param formDTO + */ + @Transactional(rollbackFor = Exception.class) + @Override + public void addPolicy(IcPolicyFormDTO formDTO) { + // 校验参数 + checkAddFormDTO(formDTO); + // 设置所属组织 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常"); + } + IcPolicyEntity icPolicyEntity = ConvertUtils.sourceToTarget(formDTO, IcPolicyEntity.class); + icPolicyEntity.setOrgId(staffInfo.getAgencyId()); + icPolicyEntity.setOrgIdPath(StringUtils.isNotBlank(staffInfo.getAgencyPIds()) ? staffInfo.getAgencyPIds().concat(StrConstant.COLON).concat(staffInfo.getAgencyId()) : staffInfo.getAgencyId()); + // 插入政策主表 + baseDao.insert(icPolicyEntity); + // 插入细则 + int ruleSort = 1; + for (IcPolicyRuleFormDTO rule : formDTO.getRuleList()) { + IcPolicyRuleEntity ruleEntity = new IcPolicyRuleEntity(); + ruleEntity.setCustomerId(formDTO.getCustomerId()); + ruleEntity.setIcPolicyId(icPolicyEntity.getId()); + ruleEntity.setRuleName(rule.getRuleName()); + ruleEntity.setSort(ruleSort); + icPolicyRuleDao.insert(ruleEntity); + if (CollectionUtils.isNotEmpty(rule.getResiRuleList())) { + int resiRuleSort = 1; + for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getResiRuleList()) { + IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class); + icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId()); + icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId()); + icPolicyRuleDetailEntity.setRuleId(ruleEntity.getId()); + icPolicyRuleDetailEntity.setSort(resiRuleSort); + icPolicyRuleDetailEntity.setGroupType("resi"); + icPolicyRuleDetailDao.insert(icPolicyRuleDetailEntity); + resiRuleSort++; + } + } + if (CollectionUtils.isNotEmpty(rule.getHouseRuleList())) { + int houseRuleSort = 1; + for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getHouseRuleList()) { + IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class); + icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId()); + icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId()); + icPolicyRuleDetailEntity.setRuleId(ruleEntity.getId()); + icPolicyRuleDetailEntity.setSort(houseRuleSort); + icPolicyRuleDetailEntity.setGroupType("house"); + icPolicyRuleDetailDao.insert(icPolicyRuleDetailEntity); + houseRuleSort++; + } + } + if (CollectionUtils.isNotEmpty(rule.getStatRuleList())) { + int statRuleSort = 1; + for (IcPolicyRuleDetailDTO ruleDetailDTO : rule.getStatRuleList()) { + IcPolicyRuleDetailEntity icPolicyRuleDetailEntity = ConvertUtils.sourceToTarget(ruleDetailDTO, IcPolicyRuleDetailEntity.class); + icPolicyRuleDetailEntity.setCustomerId(formDTO.getCustomerId()); + icPolicyRuleDetailEntity.setIcPolicyId(icPolicyEntity.getId()); + icPolicyRuleDetailEntity.setRuleId(ruleEntity.getId()); + icPolicyRuleDetailEntity.setSort(statRuleSort); + icPolicyRuleDetailEntity.setGroupType("stat"); + icPolicyRuleDetailDao.insert(icPolicyRuleDetailEntity); + statRuleSort++; + } + } + } + // 插入分类 + if (CollectionUtils.isNotEmpty(formDTO.getCategoryList())) { + for (IcPolicyCategoryDTO categoryDTO : formDTO.getCategoryList()) { + IcPolicyCategoryEntity icPolicyCategoryEntity = new IcPolicyCategoryEntity(); + icPolicyCategoryEntity.setCustomerId(formDTO.getCustomerId()); + icPolicyCategoryEntity.setIcPolicyId(icPolicyEntity.getId()); + icPolicyCategoryEntity.setCategoryCode(categoryDTO.getCategoryCode()); + icPolicyCategoryEntity.setCodePath(categoryDTO.getCodePath()); + icPolicyCategoryDao.insert(icPolicyCategoryEntity); + } + } + // 插入附件 + if (CollectionUtils.isNotEmpty(formDTO.getAttachmentList())) { + int sort = 1; + for (FileCommonDTO fileCommonDTO : formDTO.getAttachmentList()) { + HeartAttachmentEntity heartAttachment = new HeartAttachmentEntity(); + heartAttachment.setCustomerId(formDTO.getCustomerId()); + heartAttachment.setBusinessId(icPolicyEntity.getId()); + heartAttachment.setAttachTo("ic_policy"); + heartAttachment.setAttachmentName(fileCommonDTO.getName()); + heartAttachment.setAttachmentFormat(fileCommonDTO.getFormat()); + heartAttachment.setAttachmentType(fileCommonDTO.getType()); + heartAttachment.setAttachmentUrl(fileCommonDTO.getUrl()); + heartAttachment.setSort(sort); + heartAttachment.setStatus(Constant.AUTO_PASSED); + heartAttachment.setDuration(fileCommonDTO.getDuration()); + heartAttachmentDao.insert(heartAttachment); + sort++; + } + } + } + + + private void checkAddFormDTO(IcPolicyFormDTO formDTO) { + List ruleList = formDTO.getRuleList(); + for (IcPolicyRuleFormDTO rule : ruleList) { + if (CollectionUtils.isEmpty(rule.getResiRuleList()) + && CollectionUtils.isEmpty(rule.getHouseRuleList()) + && CollectionUtils.isEmpty(rule.getStatRuleList())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "人员信息、房屋信息、统计信息任意选择一项填写", "请填写细则明细"); + } + } + // 政策文件最多3个先不限制了吧，前端控制下 + } + + /** + * 修改政策 + * + * @param formDTO + */ + @Override + public void updatePolicy(IcPolicyFormDTO formDTO) { + // todo + } } \ No newline at end of file From 05baa8c94f8aa8dc70ddb040df752a21784379cb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 19 Jul 2022 15:09:23 +0800 Subject: [PATCH 031/288] =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/redis/RedisKeys.java | 12 ++++ .../dto/form/ServiceRecordV2ListFormDTO.java | 55 ++++++++++++++++ .../result/ServiceRecordV2ListResultDTO.java | 66 +++++++++++++++++++ .../IcCommunitySelfOrganizationConstant.java | 4 ++ .../IcServiceRecordV2Controller.java | 17 +++++ .../dao/IcCommunitySelfOrganizationDao.java | 3 + .../com/epmet/dao/IcServiceRecordV2Dao.java | 14 +++- .../com/epmet/redis/IcPartyUnitRedis.java | 33 ++++++++++ .../service/IcServiceRecordV2Service.java | 9 +++ .../impl/IcServiceRecordV2ServiceImpl.java | 40 +++++++++++ .../mapper/IcCommunitySelfOrganizationDao.xml | 7 ++ .../resources/mapper/IcServiceRecordV2Dao.xml | 58 ++++++++++------ 12 files changed, 297 insertions(+), 21 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2ListResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 579f8ee9cf..97dfa853b7 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -817,4 +817,16 @@ public class RedisKeys { } return rootPrefix.concat("datasync:").concat(bizType); } + + /** + * Desc: 服务组织名称 + * @param customerId + * @param serviceOrgType + * @param serviceOrgId + * @author zxc + * @date 2022/7/19 14:08 + */ + public static String getServiceOrgNameKey(String customerId,String serviceOrgType,String serviceOrgId){ + return rootPrefix.concat("serviceOrgName:").concat(serviceOrgType).concat(":").concat(customerId).concat(":").concat(serviceOrgId); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java new file mode 100644 index 0000000000..675bd575b4 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java @@ -0,0 +1,55 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/19 10:10 + * @DESC + */ +@Data +public class ServiceRecordV2ListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 88592831607216246L; + + /** + * 服务名称 + */ + private String serviceName; + + /** + * 服务组织ID + */ + private String serviceOrgId; + + /** + * 起始服务时间yyyy-MM-dd + */ + private String serviceTimeStart; + + /** + * 终止服务时间yyyy-MM-dd + */ + private String serviceTimeEnd; + + /** + * in_service服务中；completed:已完成；cancel：取消 + */ + private String serviceStatus; + + /** + * 满意度 0：不满意，1：基本满意，2：非常满意 + */ + private String satisfaction; + private String customerId; + private String userId; + + /** + * 当前工作人员所属组织ID + */ + private String orgId; + +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2ListResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2ListResultDTO.java new file mode 100644 index 0000000000..d4c591a469 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2ListResultDTO.java @@ -0,0 +1,66 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/19 10:16 + * @DESC + */ +@Data +public class ServiceRecordV2ListResultDTO implements Serializable { + + private static final long serialVersionUID = -7486208970876756573L; + + /** + * 服务ID + */ + private String serviceRecordId; + + /** + * 政策ID + */ + private String policyId; + + /** + * 服务组织类别 + */ + private String serviceOrgType; + + /** + * 服务组织ID + */ + private String serviceOrgId; + + /** + * 服务组织名字 + */ + private String serviceOrgName; + + /** + * 服务名字 + */ + private String serviceName; + + /** + * 起始服务时间yyyy-MM-dd + */ + private String serviceTimeStart; + + /** + * 终止服务时间yyyy-MM-dd + */ + private String serviceTimeEnd; + + /** + * 服务状态 + */ + private String serviceStatus; + + /** + * 服务人数 + */ + private Integer servicePeopleNumber; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/IcCommunitySelfOrganizationConstant.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/IcCommunitySelfOrganizationConstant.java index ffd87124bf..a94b3304b1 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/IcCommunitySelfOrganizationConstant.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/constant/IcCommunitySelfOrganizationConstant.java @@ -8,4 +8,8 @@ package com.epmet.constant; public interface IcCommunitySelfOrganizationConstant { String ORG_TYPE_AGENCY = "agency"; + + String SERVICE_ORG_TYPE_COMMUNITY_ORG = "community_org"; + String SERVICE_ORG_TYPE_IC_USER_VOLUNTEEr = "ic_user_volunteer"; + String SERVICE_ORG_TYPE_PARTY_UNIT = "party_unit"; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java index dc1ea6ce52..aa8b978b4c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; 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.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +11,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcServiceRecordV2DTO; +import com.epmet.dto.form.ServiceRecordV2ListFormDTO; import com.epmet.service.IcServiceRecordV2Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -67,4 +70,18 @@ public class IcServiceRecordV2Controller { return new Result(); } + /** + * Desc:【服务管理】列表 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/7/19 10:24 + */ + @PostMapping("list") + public Result serviceRecordV2List(@LoginUser TokenDto tokenDto, @RequestBody ServiceRecordV2ListFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(icServiceRecordV2Service.serviceRecordV2List(formDTO)); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java index 3ba576777b..e97091463e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcCommunitySelfOrganizationDao.java @@ -75,4 +75,7 @@ public interface IcCommunitySelfOrganizationDao extends BaseDao queryCoordinateList(CategorySelfOrgFormDTO formDTO); List selectByIds(@Param("communityOrgIds") List communityOrgIds); + + String getCommunityOrgName(@Param("id") String id); + String getPartyUnitName(@Param("id") String id); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordV2Dao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordV2Dao.java index 340747b8a0..55ae94e6aa 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordV2Dao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceRecordV2Dao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.ServiceRecordV2ListFormDTO; +import com.epmet.dto.result.ServiceRecordV2ListResultDTO; import com.epmet.entity.IcServiceRecordV2Entity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 服务记录表 * @@ -12,5 +16,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcServiceRecordV2Dao extends BaseDao { - + + /** + * Desc:【服务管理】列表 + * @param formDTO + * @author zxc + * @date 2022/7/19 10:24 + */ + List serviceRecordV2List(ServiceRecordV2ListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/IcPartyUnitRedis.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/IcPartyUnitRedis.java index 83113e7903..8ce4a285ce 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/IcPartyUnitRedis.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/redis/IcPartyUnitRedis.java @@ -17,7 +17,14 @@ package com.epmet.redis; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.constant.IcCommunitySelfOrganizationConstant; +import com.epmet.dao.IcCommunitySelfOrganizationDao; +import com.epmet.dto.IcResiUserDTO; +import com.epmet.feign.EpmetUserOpenFeignClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -31,6 +38,10 @@ import org.springframework.stereotype.Component; public class IcPartyUnitRedis { @Autowired private RedisUtils redisUtils; + @Autowired + private IcCommunitySelfOrganizationDao communitySelfOrganizationDao; + @Autowired + private EpmetUserOpenFeignClient userOpenFeignClient; public void delete(Object[] ids) { @@ -44,4 +55,26 @@ public class IcPartyUnitRedis { return null; } + public String getServiceOrgName(String customerId,String serviceOrgType,String serviceOrgId){ + String serviceOrgNameKey = RedisKeys.getServiceOrgNameKey(customerId, serviceOrgType, serviceOrgId); + Object o = redisUtils.get(serviceOrgNameKey); + if (null != o){ + return o.toString(); + } + String name = ""; + if (serviceOrgType.equals(IcCommunitySelfOrganizationConstant.SERVICE_ORG_TYPE_COMMUNITY_ORG)){ + name = communitySelfOrganizationDao.getCommunityOrgName(serviceOrgId); + }else if (serviceOrgType.equals(IcCommunitySelfOrganizationConstant.SERVICE_ORG_TYPE_PARTY_UNIT)){ + name = communitySelfOrganizationDao.getPartyUnitName(serviceOrgId); + }else if (serviceOrgType.equals(IcCommunitySelfOrganizationConstant.SERVICE_ORG_TYPE_IC_USER_VOLUNTEEr)){ + Result icResiUserDTO = userOpenFeignClient.getIcResiUserDTO(serviceOrgId); + if (!icResiUserDTO.success()){ + throw new EpmetException("getIcResiUserDTO method is failure"); + } + name = icResiUserDTO.getData().getName(); + } + redisUtils.set(serviceOrgNameKey,name,RedisUtils.DEFAULT_EXPIRE); + return name; + } + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java index c2065d0107..f10012c762 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcServiceRecordV2DTO; +import com.epmet.dto.form.ServiceRecordV2ListFormDTO; import com.epmet.entity.IcServiceRecordV2Entity; import java.util.List; @@ -75,4 +76,12 @@ public interface IcServiceRecordV2Service extends BaseService implements IcServiceRecordV2Service { + @Autowired + private IcPartyUnitRedis partyUnitRedis; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -79,4 +94,29 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl result = new PageData<>(new ArrayList<>(), NumConstant.ZERO_L); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到工作人员信息+"+formDTO.getUserId()); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.serviceRecordV2List(formDTO)); + result.setList(pageInfo.getList()); + result.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + if (CollectionUtils.isNotEmpty(result.getList())){ + result.getList().forEach(r -> { + r.setServiceOrgName(partyUnitRedis.getServiceOrgName(formDTO.getCustomerId(), r.getServiceOrgType(),r.getServiceOrgId())); + }); + } + return result; + } + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index fd457a3628..872caf9999 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -196,4 +196,11 @@ ) + + + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml index 38033e4e4a..7c8a86b911 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml @@ -3,26 +3,44 @@ - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file From f4aea85b12dafe3a1b9d87a6ba0ac849f3a82eab Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 19 Jul 2022 15:25:10 +0800 Subject: [PATCH 032/288] =?UTF-8?q?dto=E5=92=8Centity=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/HeartAttachmentDTO.java | 8 ++++---- .../main/java/com/epmet/entity/HeartAttachmentEntity.java | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartAttachmentDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartAttachmentDTO.java index 6c87b6d3d6..ff807d1da3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartAttachmentDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/HeartAttachmentDTO.java @@ -40,22 +40,22 @@ public class HeartAttachmentDTO implements Serializable { /** * 附件名 */ - private String attachmentName; + private String name; /** * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） */ - private String attachmentFormat; + private String format; /** * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） */ - private String attachmentType; + private String type; /** * 附件地址 */ - private String attachmentUrl; + private String url; /** * 排序字段 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartAttachmentEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartAttachmentEntity.java index f0eb7f7fd5..c96dc8d6cf 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartAttachmentEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/HeartAttachmentEntity.java @@ -36,22 +36,22 @@ public class HeartAttachmentEntity extends BaseEpmetEntity { /** * 附件名 */ - private String attachmentName; + private String name; /** * 文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS） */ - private String attachmentFormat; + private String format; /** * 附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc）） */ - private String attachmentType; + private String type; /** * 附件地址 */ - private String attachmentUrl; + private String url; /** * 排序字段 From 084fb6ed6ec43ebb488a762ed451d2e1c65c5dd5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 19 Jul 2022 15:31:24 +0800 Subject: [PATCH 033/288] commityixia --- .../epmet/controller/IcPolicyController.java | 4 +- .../com/epmet/dao/HeartAttachmentDao.java | 3 +- .../com/epmet/dao/IcPolicyCategoryDao.java | 3 +- .../java/com/epmet/dao/IcPolicyRuleDao.java | 3 +- .../com/epmet/dao/IcPolicyRuleDetailDao.java | 3 +- .../com/epmet/service/IcPolicyService.java | 8 +--- .../service/impl/IcPolicyServiceImpl.java | 39 ++++++++++--------- .../resources/mapper/HeartAttachmentDao.xml | 4 +- .../resources/mapper/IcPolicyCategoryDao.xml | 4 +- .../main/resources/mapper/IcPolicyRuleDao.xml | 4 +- .../mapper/IcPolicyRuleDetailDao.xml | 3 ++ 11 files changed, 44 insertions(+), 34 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 8b17d4d6ed..49e144a4e5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -50,7 +50,7 @@ public class IcPolicyController { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, IcPolicyFormDTO.AddUserShowGroup.class, IcPolicyFormDTO.AddUserInternalGroup.class); - icPolicyService.addPolicy(formDTO); + icPolicyService.addOrUpdatePolicy(formDTO); return new Result(); } @@ -65,7 +65,7 @@ public class IcPolicyController { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, IcPolicyFormDTO.AddUserShowGroup.class, IcPolicyFormDTO.AddUserInternalGroup.class,IcPolicyFormDTO.UpdateUserInternalGroup.class); - icPolicyService.updatePolicy(formDTO); + icPolicyService.addOrUpdatePolicy(formDTO); return new Result(); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/HeartAttachmentDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/HeartAttachmentDao.java index e42ae13d94..6dba23af2b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/HeartAttachmentDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/HeartAttachmentDao.java @@ -12,5 +12,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface HeartAttachmentDao extends BaseDao { - + + int deleteByBusinessId(String businessId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyCategoryDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyCategoryDao.java index 5a48211281..e81d230a1b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyCategoryDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyCategoryDao.java @@ -12,5 +12,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPolicyCategoryDao extends BaseDao { - + + int deleteByIcPolicyId(String icPolicyId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDao.java index c69ad22f47..adb211432f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDao.java @@ -12,5 +12,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPolicyRuleDao extends BaseDao { - + + int deleteByIcPolicyId(String policyId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDetailDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDetailDao.java index c776a5a386..41147f9eae 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDetailDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyRuleDetailDao.java @@ -12,5 +12,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcPolicyRuleDetailDao extends BaseDao { - + + int deleteByRuleId(String ruleId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index b464facd1a..6f12cfbb66 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -28,11 +28,5 @@ public interface IcPolicyService extends BaseService { * * @param formDTO */ - void addPolicy(IcPolicyFormDTO formDTO); - - /** - * 修改政策 - * @param formDTO - */ - void updatePolicy(IcPolicyFormDTO formDTO); + void addOrUpdatePolicy(IcPolicyFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 183a1d4cad..78b1a5eec7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -71,7 +71,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl - + + delete from heart_attachment where BUSINESS_ID=#{businessId} + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyCategoryDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyCategoryDao.xml index 58145c7134..b862cc8112 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyCategoryDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyCategoryDao.xml @@ -17,5 +17,7 @@ - + + delete from ic_policy_category where IC_POLICY_ID=#{icPolicyId} + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml index 9c83835fdf..777da08654 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDao.xml @@ -17,5 +17,7 @@ - + + delete from ic_policy_rule where IC_POLICY_ID=#{policyId} + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDetailDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDetailDao.xml index df78f56e7e..82a78d96f5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDetailDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyRuleDetailDao.xml @@ -26,5 +26,8 @@ + + delete from ic_policy_rule_detail where RULE_ID=#{ruleId} + \ No newline at end of file From 7c4a16df19db0ec8238843193de78446169d3a5b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 Jul 2022 15:40:36 +0800 Subject: [PATCH 034/288] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=8F=8D=E9=A6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcServiceFeedbackV2AddFormDTO.java | 96 +++++++++++++++++++ .../IcServiceFeedbackV2Controller.java | 12 ++- .../service/IcServiceFeedbackV2Service.java | 3 +- .../impl/IcServiceFeedbackV2ServiceImpl.java | 62 +++++++++++- 4 files changed, 165 insertions(+), 8 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java new file mode 100644 index 0000000000..9a82fc9872 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceFeedbackV2AddFormDTO.java @@ -0,0 +1,96 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.UpdateGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + + +/** + * 服务记录反馈表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-18 + */ +@Data +public class IcServiceFeedbackV2AddFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 服务ID + */ + @NotBlank(message = "服务Id不能为空", groups = {UpdateGroup.class}) + private String serviceRecordId; + /** + * 服务目标 + */ + private String serviceGoal; + /** + * 服务效果 + */ + private String serviceEffect; + /** + * 服务人数 + */ + private Integer servicePeopleNumber; + /** + * 满意度。满意度 - 不满意:bad、基本满意:good、非常满意:perfect + */ + private String satisfaction; + /** + * 服务状态[服务状态，cancel：取消，closed：已关闭，underway：进行中] + */ + private String serviceStatus; + /** + * 地址 + */ + private String address; + /** + * 地址经度 + */ + private String longitude; + /** + * 地址纬度 + */ + private String latitude; + /** + * 地址纬度 + */ + private List fileList; + + private String customerId; + private String userId; + + @Data + public static class FileDTO { + + /** + * 文件名 + */ + private String name; + /** + * url地址 + */ + private String url; + /** + * 文件类型(图片 - image、 视频 - video、 语音 - voice、 文档 - doc) + */ + private String type; + /** + * 后缀名 + */ + private String format; + /** + * 文件大小 kb + */ + private Integer size; + /** + * 语音或视频文件时长，单位秒 + */ + private Integer duration; + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java index 1ecb5fec9d..01cc032b9b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceFeedbackV2Controller.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.aop.NoRepeatSubmit; 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.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +11,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcServiceFeedbackV2DTO; +import com.epmet.dto.form.IcServiceFeedbackV2AddFormDTO; import com.epmet.service.IcServiceFeedbackV2Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -43,10 +46,11 @@ public class IcServiceFeedbackV2Controller { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcServiceFeedbackV2DTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icServiceFeedbackV2Service.save(dto); + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcServiceFeedbackV2AddFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icServiceFeedbackV2Service.save(formDTO); return new Result(); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceFeedbackV2Service.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceFeedbackV2Service.java index e1b949bc33..d9a40725bd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceFeedbackV2Service.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceFeedbackV2Service.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcServiceFeedbackV2DTO; +import com.epmet.dto.form.IcServiceFeedbackV2AddFormDTO; import com.epmet.entity.IcServiceFeedbackV2Entity; import java.util.List; @@ -54,7 +55,7 @@ public interface IcServiceFeedbackV2Service extends BaseService implements IcServiceFeedbackV2Service { + @Autowired + private IcServiceRecordV2Service icServiceRecordV2Service; + @Autowired + private HeartAttachmentService heartAttachmentService; + @Override public PageData page(Map params) { @@ -60,9 +79,46 @@ public class IcServiceFeedbackV2ServiceImpl extends BaseServiceImpl%s", formDTO.getServiceRecordId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增服务反馈记录失败,未查询到服务记录"); + } + + //2.校验是否已存在服务反馈 + LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); + tWrapper.eq(IcServiceFeedbackV2Entity::getServiceRecordId, formDTO.getServiceRecordId()); + List feedbackList = baseDao.selectList(tWrapper); + if (!CollectionUtils.isEmpty(feedbackList)) { + log.error(String.format("新增服务反馈记录失败，当前服务记录已存在反馈记录，服务记录Id->%s", formDTO.getServiceRecordId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增服务反馈记录失败,当前服务记录已存在反馈记录"); + } + + //3.更新服务记录表数据状态 + recordV2Entity.setServiceStatus(formDTO.getServiceStatus()); + icServiceRecordV2Service.updateById(recordV2Entity); + + //4.新增服务反馈记录 + IcServiceFeedbackV2Entity feedback = ConvertUtils.sourceToTarget(formDTO, IcServiceFeedbackV2Entity.class); + feedback.setCustomerId(formDTO.getCustomerId()); + feedback.setServiceRecordId(formDTO.getServiceRecordId()); + baseDao.insert(feedback); + List AttachmentList = new ArrayList<>(); + if (!CollectionUtils.isEmpty(formDTO.getFileList())) { + int sort = 0; + for (IcServiceFeedbackV2AddFormDTO.FileDTO file : formDTO.getFileList()) { + HeartAttachmentEntity attachment = ConvertUtils.sourceToTarget(file, HeartAttachmentEntity.class); + attachment.setCustomerId(formDTO.getCustomerId()); + attachment.setBusinessId(feedback.getId()); + attachment.setAttachTo("ic_service_record_v2"); + attachment.setSort(sort++); + attachment.setStatus("auto_passed"); + AttachmentList.add(attachment); + } + heartAttachmentService.insertBatch(AttachmentList); + } } @Override From 72b4dc5898aa643c87697548c263a186435021b5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 19 Jul 2022 15:56:01 +0800 Subject: [PATCH 035/288] commityixia --- .../main/java/com/epmet/dto/IcPolicyDTO.java | 50 +++---------------- .../dto/form/policy/IcPolicyPageFormDTO.java | 39 +++++++++++++++ .../epmet/controller/IcPolicyController.java | 19 +++++++ .../main/java/com/epmet/dao/IcPolicyDao.java | 4 ++ .../com/epmet/service/IcPolicyService.java | 10 ++++ .../service/impl/IcPolicyServiceImpl.java | 24 +++++++++ .../src/main/resources/mapper/IcPolicyDao.xml | 29 +++++++++++ 7 files changed, 131 insertions(+), 44 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java index dfd47f23bc..2037ce05c7 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -16,26 +18,13 @@ public class IcPolicyDTO implements Serializable { private static final long serialVersionUID = 1L; - /** - * 主键 - */ - private String id; - - /** - * 客户id - */ - private String customerId; + private String policyId; /** * 政策创建人，所属组织id */ private String orgId; - /** - * AGENCY_ID的全路径，含agency_id - */ - private String orgIdPath; - /** * 政策级别，0市级；1区级；2街道级 */ @@ -44,11 +33,13 @@ public class IcPolicyDTO implements Serializable { /** * 生效起止日期 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date startDate; /** * 截止日期 */ + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date endDate; /** @@ -61,34 +52,5 @@ public class IcPolicyDTO implements Serializable { */ private String content; - /** - * 删除标识 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-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java new file mode 100644 index 0000000000..c1b3591b7c --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.form.policy; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/7/19 15:36 + */ +@Data +public class IcPolicyPageFormDTO extends PageFormDTO implements Serializable { + /** + * 客户id + */ + private String customerId; + private String staffId; + + /** + * 政策标题 + */ + private String title; + + /** + * 政策内容 + */ + private String content; + + /** + * 是否过期；1：已过期；0：未过期 + */ + private String expiredFlag; + + private String agencyId; + +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 49e144a4e5..5211d232c2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -1,11 +1,15 @@ package com.epmet.controller; import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.dto.form.PageFormDTO; +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.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; +import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.service.IcPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -69,5 +73,20 @@ public class IcPolicyController { return new Result(); } + /** + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("list") + public Result> policyList(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class,PageFormDTO.AddUserShowGroup.class); + PageData page = icPolicyService.policyList(formDTO); + return new Result>().ok(page); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java index 2da10a4941..d2e34e23f4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java @@ -1,7 +1,9 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; +import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.entity.IcPolicyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -24,4 +26,6 @@ public interface IcPolicyDao extends BaseDao { * @return */ List selectItemList(@Param("customerId") String customerId, @Param("groupType") String groupType); + + List policyList(IcPolicyPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index 6f12cfbb66..63e0d0636b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -1,8 +1,11 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; +import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.entity.IcPolicyEntity; import java.util.List; @@ -29,4 +32,11 @@ public interface IcPolicyService extends BaseService { * @param formDTO */ void addOrUpdatePolicy(IcPolicyFormDTO formDTO); + + /** + * 列表查询 + * @param formDTO + * @return + */ + PageData policyList(IcPolicyPageFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 78b1a5eec7..93d04fe879 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -7,16 +7,21 @@ import com.epmet.commons.tools.dto.form.FileCommonDTO; 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.dao.*; import com.epmet.dto.IcPolicyCategoryDTO; +import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; +import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO; import com.epmet.dto.form.policy.IcPolicyRuleFormDTO; import com.epmet.entity.*; import com.epmet.service.IcPolicyService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -190,4 +195,23 @@ public class IcPolicyServiceImpl extends BaseServiceImpl policyList(IcPolicyPageFormDTO formDTO) { + // 设置所属组织 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.policyList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml index f02037127c..6727f2cb81 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml @@ -42,4 +42,33 @@ and i.GROUP_TYPE = #{groupType} order by i.SORT asc + + \ No newline at end of file From 37f8ed1b591a04a9998bfa09a146d2f1cef112f6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 Jul 2022 16:36:59 +0800 Subject: [PATCH 036/288] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=91=E8=B5=B7?= =?UTF-8?q?=E3=80=81=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/IcServiceRecordV2AddEditFormDTO.java | 91 +++++++++++++++++++ .../IcServiceRecordV2Controller.java | 15 +-- .../service/IcServiceRecordV2Service.java | 5 +- .../impl/IcServiceRecordServiceImpl.java | 2 +- .../impl/IcServiceRecordV2ServiceImpl.java | 80 +++++++++++++++- 5 files changed, 178 insertions(+), 15 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java new file mode 100644 index 0000000000..615e9b7a20 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java @@ -0,0 +1,91 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.AddGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + + +/** + * 服务记录反馈表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-07-18 + */ +@Data +public class IcServiceRecordV2AddEditFormDTO implements Serializable { + private static final long serialVersionUID = 1L; + + /** + * 服务Id + */ + @NotBlank(message = "服务Id不能为空", groups = {UpdateGroup.class}) + private String serviceRecordId; + /** + * 服务名称 + */ + @NotBlank(message = "服务名称不能为空", groups = {AddGroup.class}) + private String serviceName; + /** + * 服务组织类型 社区自组织：community_org， 志愿者：ic_user_volunteer， 联建单位：party_unit + */ + @NotBlank(message = "服务名称不能为空", groups = {AddGroup.class}) + private String serviceOrgType; + /** + * 服务组织Id + */ + @NotBlank(message = "服务名称不能为空", groups = {AddGroup.class}) + private String serviceOrgId; + /** + * 服务范围集合 + */ + private List objList; + /** + * 政策依据Id + */ + private Integer policyId; + /** + * 经办人姓名 + */ + private String principalName; + /** + * 联系方式 + */ + private String principalContact; + /** + * 起始服务时间 + */ + @NotNull(message = "起始服务时间不能为空", groups = {AddGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd") + private String serviceTimeStart; + /** + * 终止服务时间 + */ + @NotNull(message = "终止服务时间不能为空", groups = {AddGroup.class}) + @JsonFormat(pattern = "yyyy-MM-dd") + private String serviceTimeEnd; + /** + * 备注信息 + */ + private String remark; + /** + * 反馈记录数据 + */ + private IcServiceFeedbackV2AddFormDTO feedback; + + private String customerId; + private String userId; + + @Data + public static class ObjList { + private String objectType; + private String objectId; + private String objectName; + } + +} \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java index aa8b978b4c..538bee258d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java @@ -7,10 +7,10 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; -import com.epmet.commons.tools.validator.group.AddGroup; -import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; +import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcServiceRecordV2DTO; +import com.epmet.dto.form.IcServiceRecordV2AddEditFormDTO; import com.epmet.dto.form.ServiceRecordV2ListFormDTO; import com.epmet.service.IcServiceRecordV2Service; import org.springframework.beans.factory.annotation.Autowired; @@ -46,16 +46,17 @@ public class IcServiceRecordV2Controller { @NoRepeatSubmit @PostMapping("save") - public Result save(@RequestBody IcServiceRecordV2DTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icServiceRecordV2Service.save(dto); + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcServiceRecordV2AddEditFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, UpdateGroup.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + icServiceRecordV2Service.save(formDTO); return new Result(); } @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody IcServiceRecordV2DTO dto){ + public Result update(@RequestBody IcServiceRecordV2AddEditFormDTO dto){ //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icServiceRecordV2Service.update(dto); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java index f10012c762..a88b4f1a13 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java @@ -3,6 +3,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcServiceRecordV2DTO; +import com.epmet.dto.form.IcServiceRecordV2AddEditFormDTO; import com.epmet.dto.form.ServiceRecordV2ListFormDTO; import com.epmet.entity.IcServiceRecordV2Entity; @@ -55,7 +56,7 @@ public interface IcServiceRecordV2Service extends BaseService implements IcServiceRecordV2Service { @Autowired private IcPartyUnitRedis partyUnitRedis; + @Autowired + private IcServiceScopeV2Service icServiceScopeV2Service; + @Autowired + private IcServiceRecordServiceImpl icServiceRecordServiceImpl; + @Autowired + private IcServiceFeedbackV2Service icServiceFeedbackV2Service; + @Autowired + private HeartAttachmentService heartAttachmentService; + @Override public PageData page(Map params) { @@ -75,15 +93,67 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl scopeList = new ArrayList<>(); + formDTO.getObjList().stream().forEach(s -> { + String[] scopeObjectIdPathAndName = icServiceRecordServiceImpl.getScopeObjectIdPath(s.getObjectType(), s.getObjectId()); + IcServiceScopeV2Entity scope = new IcServiceScopeV2Entity(); + scope.setCustomerId(formDTO.getCustomerId()); + scope.setServiceRecordId(entity.getId()); + scope.setObjectType(s.getObjectType()); + scope.setObjectId(s.getObjectId()); + scope.setObjectIdPath(scopeObjectIdPathAndName[0]); + scope.setObjectName(scopeObjectIdPathAndName[1]); + scopeList.add(scope); + }); + + //4.新增服务反馈数据feedback + if(null != formDTO.getFeedback()){ + IcServiceFeedbackV2Entity feedback = ConvertUtils.sourceToTarget(formDTO.getFeedback(), IcServiceFeedbackV2Entity.class); + feedback.setCustomerId(formDTO.getCustomerId()); + feedback.setServiceRecordId(entity.getId()); + icServiceFeedbackV2Service.insert(feedback); + // 反馈附件列表 + if (CollectionUtils.isNotEmpty(formDTO.getFeedback().getFileList())) { + List attachmentList = new ArrayList<>(); + int[] sort = {0}; + formDTO.getFeedback().getFileList().forEach(f->{ + HeartAttachmentEntity attachment = ConvertUtils.sourceToTarget(f, HeartAttachmentEntity.class); + attachment.setCustomerId(formDTO.getCustomerId()); + attachment.setBusinessId(feedback.getId()); + attachment.setAttachTo("ic_service_record_v2"); + attachment.setSort(sort[0]); + attachment.setStatus("auto_passed"); + sort[0]++; + attachmentList.add(attachment); + }); + heartAttachmentService.insertBatch(attachmentList); + } + } + } @Override @Transactional(rollbackFor = Exception.class) - public void update(IcServiceRecordV2DTO dto) { - IcServiceRecordV2Entity entity = ConvertUtils.sourceToTarget(dto, IcServiceRecordV2Entity.class); + public void update(IcServiceRecordV2AddEditFormDTO formDTO) { + //1.校验数据是否存在 + if (null == baseDao.selectById(formDTO.getServiceRecordId())) { + log.error(String.format("修改服务记录失败，未查询到服务记录，服务记录Id->%s", formDTO.getServiceRecordId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "修改服务记录失败，未查询到服务记录"); + } + IcServiceRecordV2Entity entity = ConvertUtils.sourceToTarget(formDTO, IcServiceRecordV2Entity.class); + entity.setId(formDTO.getServiceRecordId()); updateById(entity); } From bbfe442096b9b4e5ea1335fa6b7bb7d8d6209a9b Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 Jul 2022 16:43:18 +0800 Subject: [PATCH 037/288] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=8F=96=E6=B6=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/IcServiceRecordV2Controller.java | 9 +++++++++ .../com/epmet/service/IcServiceRecordV2Service.java | 2 ++ .../service/impl/IcServiceRecordV2ServiceImpl.java | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java index 538bee258d..92a3966962 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java @@ -63,6 +63,15 @@ public class IcServiceRecordV2Controller { return new Result(); } + @NoRepeatSubmit + @PostMapping("cancel") + public Result cancel(@RequestBody IcServiceRecordV2AddEditFormDTO dto){ + //效验数据 + ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); + icServiceRecordV2Service.cancel(dto); + return new Result(); + } + @PostMapping("delete") public Result delete(@RequestBody String[] ids){ //效验数据 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java index a88b4f1a13..6d7860ea1c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java @@ -85,4 +85,6 @@ public interface IcServiceRecordV2Service extends BaseService%s", formDTO.getServiceRecordId())); + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "取消服务记录失败，未查询到服务记录"); + } + entity.setServiceStatus("cancel"); + baseDao.updateById(entity); + } + @Override @Transactional(rollbackFor = Exception.class) public void delete(String[] ids) { From 63b31e8618c57aeb43dfac5a11f9cd81d9202ed2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 19 Jul 2022 16:44:17 +0800 Subject: [PATCH 038/288] 140 --- .../commons/tools/enums/DictTypeEnum.java | 1 + .../main/java/com/epmet/dto/IcPolicyDTO.java | 12 +++ .../java/com/epmet/dto/IcPolicyRuleDTO.java | 10 ++- .../dto/form/policy/IcPolicyRuleFormDTO.java | 5 ++ .../epmet/controller/IcPolicyController.java | 28 ++++++- .../com/epmet/service/IcPolicyService.java | 5 ++ .../service/impl/IcPolicyServiceImpl.java | 81 ++++++++++++++++++- 7 files changed, 139 insertions(+), 3 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java index f552db723a..e900f79875 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/DictTypeEnum.java @@ -27,6 +27,7 @@ public enum DictTypeEnum { IC_EVENT_SOURCE_TYPE("ic_event_source_type","事件管理",19), IC_SERVICE_TYPE("ic_service_type","服务类别",20), IC_DANGER_TYPE("ic_danger_type","危化品种类",24), + POLICY_LEVEL("policy_level","政策级别",25), ; private final String code; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java index 2037ce05c7..e3822ddf27 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java @@ -1,10 +1,13 @@ package com.epmet.dto; +import com.epmet.commons.tools.dto.form.FileCommonDTO; +import com.epmet.dto.form.policy.IcPolicyRuleFormDTO; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -30,6 +33,11 @@ public class IcPolicyDTO implements Serializable { */ private String policyLevel; + /** + * 政策级别，0市级；1区级；2街道级 + */ + private String policyLevelName; + /** * 生效起止日期 */ @@ -52,5 +60,9 @@ public class IcPolicyDTO implements Serializable { */ private String content; + //以下三个详情接口返回 + private List categoryList; + private List attachmentList; + private List ruleList; } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDTO.java index be1c02628d..112474a76f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDTO.java @@ -1,8 +1,10 @@ package com.epmet.dto; +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -44,31 +46,37 @@ public class IcPolicyRuleDTO implements Serializable { /** * 删除标记 0：未删除，1：已删除 */ + @JsonIgnore private String delFlag; /** * 乐观锁 */ + @JsonIgnore private Integer revision; /** * 创建人 */ + @JsonIgnore private String createdBy; /** * 创建时间 */ + @JsonIgnore private Date createdTime; /** * 更新人 */ + @JsonIgnore private String updatedBy; /** * 更新时间 */ + @JsonIgnore private Date updatedTime; } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java index 99ed14eb4e..e35df132dd 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java @@ -33,5 +33,10 @@ public class IcPolicyRuleFormDTO implements Serializable { * 统计信息 */ private List statRuleList; + + /** + * ruleId + */ + private String id; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 5211d232c2..44432ab0ee 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; +import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.service.IcPolicyService; @@ -74,7 +75,7 @@ public class IcPolicyController { } /** - * + * 政策列表 * @param tokenDto * @param formDTO * @return @@ -88,5 +89,30 @@ public class IcPolicyController { return new Result>().ok(page); } + /** + * 细则列表 + * @param customerId + * @param policyId + * @return + */ + @PostMapping("rulelist/{policyId}") + public Result> ruleList(@RequestHeader("customerId") String customerId,@PathVariable("policyId") String policyId) { + return new Result>().ok(icPolicyService.ruleList(customerId,policyId)); + } + + /** + * 删除政策 + * @param policyId + * @return + */ + @PostMapping("delete/{policyId}") + public Result deletePolicy(@PathVariable("policyId") String policyId) { + icPolicyService.deleteById(policyId); + return new Result<>(); + } + @PostMapping("detail/{policyId}") + public Result policyDetail(@LoginUser TokenDto tokenDto,@PathVariable("policyId") String policyId) { + return new Result().ok(icPolicyService.policyDetail(tokenDto.getCustomerId(),policyId)); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index 63e0d0636b..60564097ec 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -4,6 +4,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; +import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.entity.IcPolicyEntity; @@ -39,4 +40,8 @@ public interface IcPolicyService extends BaseService { * @return */ PageData policyList(IcPolicyPageFormDTO formDTO); + + List ruleList(String customerId,String policyId); + + IcPolicyDTO policyDetail(String customerId,String policyId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 93d04fe879..64648b3358 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -1,35 +1,43 @@ 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.Constant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.DictTypeEnum; 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.Result; import com.epmet.dao.*; import com.epmet.dto.IcPolicyCategoryDTO; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; +import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO; import com.epmet.dto.form.policy.IcPolicyRuleFormDTO; import com.epmet.entity.*; +import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.IcPolicyService; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; 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.HashMap; import java.util.List; +import java.util.Map; /** * 政策表 @@ -48,7 +56,8 @@ public class IcPolicyServiceImpl extends BaseServiceImpl list = baseDao.policyList(formDTO); + if (CollectionUtils.isNotEmpty(list)) { + for (IcPolicyDTO icPolicyDTO : list) { + // 查询字典表 + Result> levelRes = adminOpenFeignClient.dictMap(DictTypeEnum.POLICY_LEVEL.getCode()); + Map levelMap = levelRes.success() && MapUtils.isNotEmpty(levelRes.getData()) ? levelRes.getData() : new HashMap<>(); + icPolicyDTO.setPolicyLevelName(MapUtils.isNotEmpty(levelMap) && levelMap.containsKey(icPolicyDTO.getPolicyLevel()) ? levelMap.get(icPolicyDTO.getPolicyLevel()) : StrConstant.EPMETY_STR); + } + } PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + @Override + public List ruleList(String customerId, String policyId) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPolicyRuleEntity::getCustomerId, customerId) + .eq(IcPolicyRuleEntity::getIcPolicyId, policyId) + .orderByAsc(IcPolicyRuleEntity::getSort); + List list = icPolicyRuleDao.selectList(wrapper); + return ConvertUtils.sourceToTarget(list, IcPolicyRuleDTO.class); + } + + @Override + public IcPolicyDTO policyDetail(String customerId, String policyId) { + IcPolicyEntity policyEntity = baseDao.selectById(policyId); + IcPolicyDTO icPolicyDTO = ConvertUtils.sourceToTarget(policyEntity, IcPolicyDTO.class); + if (null != icPolicyDTO) { + icPolicyDTO.setPolicyId(policyId); + + LambdaQueryWrapper attWrapper = new LambdaQueryWrapper<>(); + attWrapper.eq(HeartAttachmentEntity::getBusinessId, policyId) + .orderByAsc(HeartAttachmentEntity::getSort); + List attList = heartAttachmentDao.selectList(attWrapper); + icPolicyDTO.setAttachmentList(CollectionUtils.isNotEmpty(attList) ? ConvertUtils.sourceToTarget(attList, FileCommonDTO.class) : new ArrayList<>()); + + LambdaQueryWrapper cateWrapper = new LambdaQueryWrapper<>(); + cateWrapper.eq(IcPolicyCategoryEntity::getIcPolicyId, policyId); + List cateList = icPolicyCategoryDao.selectList(cateWrapper); + icPolicyDTO.setCategoryList(CollectionUtils.isNotEmpty(cateList) ? ConvertUtils.sourceToTarget(cateList, IcPolicyCategoryDTO.class) : new ArrayList<>()); + + List ruleDTOList = ruleList(customerId, policyId); + List ruleList = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(ruleDTOList)) { + ruleList = ConvertUtils.sourceToTarget(ruleDTOList, IcPolicyRuleFormDTO.class); + for (IcPolicyRuleFormDTO rule : ruleList) { + LambdaQueryWrapper ruleDetailWrapper = new LambdaQueryWrapper<>(); + ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) + .eq(IcPolicyRuleDetailEntity::getGroupType, "resi") + .orderByAsc(IcPolicyRuleDetailEntity::getSort); + List resiList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); + List resiRuleList = CollectionUtils.isNotEmpty(resiList) ? ConvertUtils.sourceToTarget(resiList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); + rule.setResiRuleList(resiRuleList); + + ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) + .eq(IcPolicyRuleDetailEntity::getGroupType, "house") + .orderByAsc(IcPolicyRuleDetailEntity::getSort); + List houseList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); + List houseRuleList = CollectionUtils.isNotEmpty(houseList) ? ConvertUtils.sourceToTarget(houseList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); + rule.setHouseRuleList(houseRuleList); + + ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) + .eq(IcPolicyRuleDetailEntity::getGroupType, "stat") + .orderByAsc(IcPolicyRuleDetailEntity::getSort); + List statList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); + List statRuleList = CollectionUtils.isNotEmpty(statList) ? ConvertUtils.sourceToTarget(statList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); + ; + rule.setStatRuleList(statRuleList); + } + } + icPolicyDTO.setRuleList(ruleList); + } + return icPolicyDTO; + } } \ No newline at end of file From e3e2c148cf591ab0864b69d2fc9a187b4a820402 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 19 Jul 2022 17:05:39 +0800 Subject: [PATCH 039/288] =?UTF-8?q?=E5=9B=BD=E4=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcPolicyDTO.java | 5 +++++ .../src/main/resources/mapper/IcPolicyDao.xml | 14 ++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java index e3822ddf27..8c7fc33767 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java @@ -60,6 +60,11 @@ public class IcPolicyDTO implements Serializable { */ private String content; + /** + * 是否过期；1：已过期；0：未过期 + */ + private String expiredFlag; + //以下三个详情接口返回 private List categoryList; private List attachmentList; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml index 6727f2cb81..9ab37dc06a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml @@ -51,7 +51,12 @@ ip.START_DATE, ip.END_DATE, ip.TITLE, - ip.CONTENT + ip.CONTENT, + ( + case when ip.END_DATE < now() then '1' + when ip.END_DATE >= now() then '0' + end + )as expiredFlag FROM ic_policy ip WHERE @@ -64,11 +69,12 @@ and ip.CONTENT like concat('%',#{content},'%') - + and ip.END_DATE < now() - + and ip.END_DATE >= now() - + order by ip.CREATED_TIME desc + \ No newline at end of file From 60cf5478e37654b75a339d4f125d2fc740f9f709 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 19 Jul 2022 17:30:19 +0800 Subject: [PATCH 040/288] detail --- .../com/epmet/dto/IcServiceFeedbackV2DTO.java | 3 + .../form/ServiceRecordV2DetailFormDTO.java | 24 +++++++ .../ServiceRecordV2DetailResultDTO.java | 71 +++++++++++++++++++ .../IcServiceRecordV2Controller.java | 14 ++++ .../com/epmet/dao/IcServiceFeedbackV2Dao.java | 6 +- .../java/com/epmet/dao/IcServiceScopeDao.java | 3 + .../service/IcServiceRecordV2Service.java | 10 +++ .../impl/IcServiceRecordV2ServiceImpl.java | 38 +++++++++- .../mapper/IcServiceFeedbackV2Dao.xml | 37 ++++++++++ .../resources/mapper/IcServiceScopeDao.xml | 11 +++ 10 files changed, 213 insertions(+), 4 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2DetailFormDTO.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java index 54e7469c7c..b0a39730f3 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceFeedbackV2DTO.java @@ -4,6 +4,7 @@ import lombok.Data; import java.io.Serializable; import java.util.Date; +import java.util.List; /** @@ -97,4 +98,6 @@ public class IcServiceFeedbackV2DTO implements Serializable { */ private Integer delFlag; + private List fileList; + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2DetailFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2DetailFormDTO.java new file mode 100644 index 0000000000..7b783d0628 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2DetailFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/19 16:34 + * @DESC + */ +@Data +public class ServiceRecordV2DetailFormDTO implements Serializable { + + private static final long serialVersionUID = 476430342315532314L; + + public interface ServiceRecordV2DetailForm{} + + @NotBlank(message = "serviceRecordId不能为空",groups = ServiceRecordV2DetailForm.class) + private String serviceRecordId; + + +} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java new file mode 100644 index 0000000000..7043ddfc0a --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java @@ -0,0 +1,71 @@ +package com.epmet.dto.result; + +import com.epmet.dto.IcServiceFeedbackV2DTO; +import com.epmet.dto.IcServiceScopeV2DTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/7/19 16:34 + * @DESC + */ +@Data +public class ServiceRecordV2DetailResultDTO implements Serializable { + + private static final long serialVersionUID = 3385425608362604836L; + + private String serviceRecordId; + + private String serviceName; + + /** + * 服务组织类型 + 社区自组织：community_org， + 志愿者：ic_user_volunteer， + 联建单位：party_unit + */ + private String serviceOrgType; + + /** + * 服务组织ID + */ + private String serviceOrgId; + + /** + * 经办人姓名 + */ + private String principalName; + + /** + * 联系方式 + */ + private String principalContact; + + /** + * 服务时间 + */ + private Date serviceTimeStart; + + /** + * 服务截止时间 + */ + private Date serviceTimeEnd; + + /** + * in_service服务中；completed:已完成；cancel：取消 + */ + private String serviceStatus; + + /** + * 备注 + */ + private String remark; + + private List gridIdList; + + private IcServiceFeedbackV2DTO feedback; +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java index 92a3966962..8698c3d08c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java @@ -7,11 +7,14 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; +import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.IcServiceRecordV2DTO; +import com.epmet.dto.form.ServiceRecordV2DetailFormDTO; import com.epmet.dto.form.IcServiceRecordV2AddEditFormDTO; import com.epmet.dto.form.ServiceRecordV2ListFormDTO; +import com.epmet.dto.result.ServiceRecordV2DetailResultDTO; import com.epmet.service.IcServiceRecordV2Service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -94,4 +97,15 @@ public class IcServiceRecordV2Controller { return new Result().ok(icServiceRecordV2Service.serviceRecordV2List(formDTO)); } + /** + * Desc: 详情 + * @param formDTO + * @author zxc + * @date 2022/7/19 16:37 + */ + @PostMapping("detail") + public Result serviceRecordV2Detail(@RequestBody ServiceRecordV2DetailFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO,ServiceRecordV2DetailFormDTO.ServiceRecordV2DetailForm.class); + return new Result().ok(icServiceRecordV2Service.serviceRecordV2Detail(formDTO)); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackV2Dao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackV2Dao.java index a3d4eb7831..43a90f357d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackV2Dao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceFeedbackV2Dao.java @@ -1,8 +1,10 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcServiceFeedbackV2DTO; import com.epmet.entity.IcServiceFeedbackV2Entity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 服务记录反馈表 @@ -12,5 +14,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcServiceFeedbackV2Dao extends BaseDao { - + + IcServiceFeedbackV2DTO getFeedbackV2(@Param("serviceRecordId") String serviceRecordId); + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceScopeDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceScopeDao.java index c2fc96cfd9..6b4123134c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceScopeDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcServiceScopeDao.java @@ -1,6 +1,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.IcServiceScopeV2DTO; import com.epmet.dto.result.IcServiceScopeDTO; import com.epmet.entity.IcServiceScopeEntity; import org.apache.ibatis.annotations.Mapper; @@ -20,4 +21,6 @@ public interface IcServiceScopeDao extends BaseDao { int update(@Param("serviceId") String serviceId, @Param("userId") String userId); List selectList(String serviceRecordId); + + List selectListV2(@Param("serviceRecordId") String serviceRecordId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java index 6d7860ea1c..4682517a00 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcServiceRecordV2Service.java @@ -3,8 +3,10 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.IcServiceRecordV2DTO; +import com.epmet.dto.form.ServiceRecordV2DetailFormDTO; import com.epmet.dto.form.IcServiceRecordV2AddEditFormDTO; import com.epmet.dto.form.ServiceRecordV2ListFormDTO; +import com.epmet.dto.result.ServiceRecordV2DetailResultDTO; import com.epmet.entity.IcServiceRecordV2Entity; import java.util.List; @@ -86,5 +88,13 @@ public interface IcServiceRecordV2Service extends BaseService page(Map params) { @@ -201,4 +212,25 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl scopeV2DTOS = serviceScopeDao.selectListV2(formDTO.getServiceRecordId()); + result.setGridIdList(scopeV2DTOS); + IcServiceFeedbackV2DTO feedbackV2 = serviceFeedbackV2Dao.getFeedbackV2(formDTO.getServiceRecordId()); + result.setFeedback(feedbackV2); + return result; + } + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackV2Dao.xml index 82d136814b..5443852817 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackV2Dao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceFeedbackV2Dao.xml @@ -22,5 +22,42 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml index 026d8c6ac4..0cb231d71c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceScopeDao.xml @@ -39,4 +39,15 @@ s.DEL_FLAG = '0' AND s.SERVICE_RECORD_ID = #{serviceRecordId} + \ No newline at end of file From fda99cf1ecb1df3daa025799ac6743fef0bf237e Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 19 Jul 2022 17:35:50 +0800 Subject: [PATCH 041/288] =?UTF-8?q?=E6=9C=8D=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcServiceFeedbackV2ServiceImpl.java | 4 ++++ .../impl/IcServiceRecordV2ServiceImpl.java | 19 +++++++++---------- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java index 70525915ac..d1bdf326cc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceFeedbackV2ServiceImpl.java @@ -86,6 +86,10 @@ public class IcServiceFeedbackV2ServiceImpl extends BaseServiceImpl%s", formDTO.getServiceRecordId())); throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "新增服务反馈记录失败,未查询到服务记录"); } + if (!"in_service".equals(recordV2Entity.getServiceStatus())) { + String msg = "服务状态不是进行中的，不允许反馈"; + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), msg, msg); + } //2.校验是否已存在服务反馈 LambdaQueryWrapper tWrapper = new LambdaQueryWrapper<>(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java index 9071a364bc..f817137bde 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; import com.epmet.commons.tools.constant.NumConstant; @@ -105,17 +106,12 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl scopeList = new ArrayList<>(); formDTO.getObjList().stream().forEach(s -> { String[] scopeObjectIdPathAndName = icServiceRecordServiceImpl.getScopeObjectIdPath(s.getObjectType(), s.getObjectId()); @@ -129,8 +125,9 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl Date: Tue, 19 Jul 2022 17:40:26 +0800 Subject: [PATCH 042/288] =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=A0=BC=E5=BC=8F?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java | 4 ++-- .../com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java index 7043ddfc0a..536e292c70 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/ServiceRecordV2DetailResultDTO.java @@ -48,12 +48,12 @@ public class ServiceRecordV2DetailResultDTO implements Serializable { /** * 服务时间 */ - private Date serviceTimeStart; + private String serviceTimeStart; /** * 服务截止时间 */ - private Date serviceTimeEnd; + private String serviceTimeEnd; /** * in_service服务中；completed:已完成；cancel：取消 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java index f817137bde..bf5997a1b8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java @@ -12,6 +12,7 @@ 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.DateUtils; import com.epmet.dao.IcServiceFeedbackV2Dao; import com.epmet.dao.IcServiceRecordV2Dao; import com.epmet.dao.IcServiceScopeDao; @@ -224,6 +225,8 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl scopeV2DTOS = serviceScopeDao.selectListV2(formDTO.getServiceRecordId()); result.setGridIdList(scopeV2DTOS); From dfafac2facdfea3f0ccde5e06a2e81004312b21a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 19 Jul 2022 17:52:15 +0800 Subject: [PATCH 043/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BDdemo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ResisByPolicyRulesFormDTO.java | 69 +++++++++++++++++ .../epmetuser/result/ResiInfoResultDTO.java | 21 ++++++ .../feign/DataAggregatorOpenFeignClient.java | 8 ++ ...DataAggregatorOpenFeignClientFallback.java | 6 ++ .../controller/IcUserController.java | 31 ++++++++ .../dao/epmetuser/IcResiUserDao.java | 12 +++ .../epmet/dataaggre/service/ResiService.java | 24 ++++++ .../service/epmetuser/EpmetUserService.java | 3 + .../epmetuser/impl/EpmetUserServiceImpl.java | 5 +- .../service/govorg/GovOrgService.java | 5 ++ .../govorg/impl/GovOrgServiceImpl.java | 35 +++++++++ .../service/impl/ResiServiceImpl.java | 74 +++++++++++++++++++ .../mapper/epmetuser/IcResiUserDao.xml | 24 ++++++ .../resi/HeartResisByPolicyRulesFormDTO.java | 69 +++++++++++++++++ .../epmet-heart/epmet-heart-server/pom.xml | 5 ++ .../epmet/controller/IcPolicyController.java | 10 +++ .../com/epmet/service/IcPolicyService.java | 2 + .../service/impl/IcPolicyServiceImpl.java | 32 ++++++++ 18 files changed, 434 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java new file mode 100644 index 0000000000..d47d8fdde1 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dataaggre.dto.epmetuser.form; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Comparator; +import java.util.Map; +import java.util.Set; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ResisByPolicyRulesFormDTO { + + private Integer pageNo = 1; + private Integer pageSize = 20; + + /** + * 规则map + */ + private Map> rules; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class PolicyRule implements Comparator { + private String customerId; + /** + * resi:人员信息,house:房屋信息，stat:统计信息 + */ + private String groupType; + + /** + * 与上一条的关系；and、or + */ + private String lastLogicalRel; + + /** + * 查询类型：等于、不等于....;来源于字典表sql_query_type + */ + private String queryType; + + /** + * 表名；人员信息有值； + */ + private String colTable; + + /** + * 人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧 + */ + private String colKey; + + /** + * 参数值 + */ + private String colVal; + + /** + * 排序字段;同一group_type升序 + */ + private Integer sort; + + @Override + public int compare(Integer o1, Integer o2) { + return o1.compareTo(o2); + } + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java new file mode 100644 index 0000000000..04793b3a71 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java @@ -0,0 +1,21 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ResiInfoResultDTO { + + private String name; + private String mobile; + private String idCard; + /** + * 小区全名，包含小区前面的属性，比如网格等 + */ + private String neighborhoodFullName; + private Integer age; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java index a164b0c020..d29b42173e 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java @@ -3,6 +3,7 @@ package com.epmet.dataaggre.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.feign.impl.DataAggregatorOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -21,4 +22,11 @@ public interface DataAggregatorOpenFeignClient { @PostMapping(value = "data/aggregator/org/export-send-msg") Result exportGridLiveRes(@RequestBody GridLivelyFormDTO form); + /** + * 政策人员预览 + * @param input + * @return + */ + @PostMapping("data/aggregator/icuser/listByPolicyRules") + Result listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input); } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java index ea2bfebddf..b50b31441f 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java @@ -3,6 +3,7 @@ package com.epmet.dataaggre.feign.impl; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; @@ -16,4 +17,9 @@ public class DataAggregatorOpenFeignClientFallback implements DataAggregatorOpen public Result exportGridLiveRes(GridLivelyFormDTO form) { return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "pcworkRecordListExportSendMsg",form); } + + @Override + public Result listByPolicyRules(ResisByPolicyRulesFormDTO input) { + return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "listByPolicyRules", input); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 15c0473ba0..715fbc7501 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -6,8 +6,11 @@ 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.dataaggre.dto.epmetuser.form.IcUserCategoryFormDTO; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.IcUserCategoryResultDTO; +import com.epmet.dataaggre.service.ResiService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -15,6 +18,8 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import java.util.List; +import java.util.Map; +import java.util.Set; @RestController @RequestMapping("icuser") @@ -23,6 +28,8 @@ public class IcUserController { @Autowired private EpmetUserService epmetUserService; + @Autowired + private ResiService icResiService; /** * 【人员类别分析】-各类别人数 @@ -38,5 +45,29 @@ public class IcUserController { return new Result>().ok(epmetUserService.queryIcUserCategoryData(formDTO)); } + /** + * 政策人员预览 + * @param input + * @return + */ + @PostMapping("listByPolicyRules") + public Result listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { + Integer pageNo = input.getPageNo(); + Integer pageSize = input.getPageSize(); + + Map> rules = input.getRules(); + Set resiRule = rules.get("resi"); + Set houseRule = rules.get("house"); + Set houseStat = rules.get("stat"); + + if (CollectionUtils.isEmpty(resiRule) + && CollectionUtils.isEmpty(houseRule) + && CollectionUtils.isEmpty(houseStat)) { + return new Result(); + } + + icResiService.listByPolicyRules(pageNo, pageSize, resiRule, houseRule, houseStat); + return new Result(); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index 78e7b7d4b7..82d13c9094 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -18,7 +18,9 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiInfoResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dto.IcResiUserDTO; @@ -26,6 +28,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Set; /** * 用户基础信息 @@ -59,4 +62,13 @@ public interface IcResiUserDao extends BaseDao { @Param("queryPids") String queryPids, @Param("categoryKey") String categoryKey, @Param("search") String search); + + /** + * 政策查找居民 + * @param houseIds + * @return + */ + List listByPolicyRules(@Param("customerId") String customerId, + @Param("resiRules") Set resiRules, + @Param("houseIds") List houseIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java new file mode 100644 index 0000000000..286f299186 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java @@ -0,0 +1,24 @@ +package com.epmet.dataaggre.service; + +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiInfoResultDTO; + +import java.util.List; +import java.util.Set; + +/** + * 居民的service + */ +public interface ResiService { + + /** + * 政策人员预览 + * @param pageNo + * @param pageSize + * @param resiRule + * @param houseRule + */ + List listByPolicyRules(Integer pageNo, Integer pageSize, Set resiRule, + Set houseRule, + Set houseStat); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index dec1415a20..834ffd051e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -13,6 +13,7 @@ import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; import java.util.List; +import java.util.Set; /** * @Author zxc @@ -199,4 +200,6 @@ public interface EpmetUserService { * @return */ List staffSelectList(List staffIds); + + List listByPolicyRules(String customerId, Set resiRule, List houseIds); } 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 e0a3760bed..ef4ad9c699 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 @@ -844,5 +844,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { return customerStaffDao.staffSelectList(staffIds); } - + @Override + public List listByPolicyRules(String customerId, Set resiRule, List houseIds) { + return icResiUserDao.listByPolicyRules(customerId, resiRule, houseIds); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 140b909a71..746be2acd2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.service.govorg; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO; @@ -10,9 +11,11 @@ import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import javax.servlet.http.HttpServletResponse; import java.util.List; +import java.util.Set; /** * @Author zxc @@ -212,4 +215,6 @@ public interface GovOrgService { * @return */ CustomerAgencyEntity getRootAgencyByCustomerId(String customerId); + + List listHousesByRules(Set houseRule, Set houseStat, Integer pageNo, Integer pageSize); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 0c2533a7c9..076191a1f1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -5,6 +5,7 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.Constant; @@ -26,10 +27,12 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; 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.EpmetRequestHolder; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.govorg.*; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; @@ -38,6 +41,7 @@ import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dataaggre.excel.GridLivelyDetailExcel; import com.epmet.dataaggre.excel.GridLivelyExcel; import com.epmet.dataaggre.service.commonservice.AreaCodeService; @@ -48,6 +52,7 @@ import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.OssFeignClient; +import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.fileupload.FileItem; @@ -107,6 +112,8 @@ public class GovOrgServiceImpl implements GovOrgService { private RedisUtils redisUtils; @Autowired private ExecutorService executorService; + @Autowired + private IcHouseDao houseDao; /** * @param staffId @@ -1079,4 +1086,32 @@ public class GovOrgServiceImpl implements GovOrgService { query.eq(CustomerAgencyEntity::getPid, "0"); // 跟组织的pid为"0" return customerAgencyDao.selectOne(query); } + + @Override + public List listHousesByRules(Set houseRule, Set statRule, Integer pageNo, Integer pageSize) { + if (CollectionUtils.isEmpty(houseRule) && CollectionUtils.isEmpty(statRule)) { + return new ArrayList<>(); + } + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + + QueryWrapper query = new QueryWrapper<>(); + query.eq("CUSTOMER_ID", customerId); + + // 房屋属性 + if (CollectionUtils.isNotEmpty(houseRule)) { + for (ResisByPolicyRulesFormDTO.PolicyRule rule : houseRule) { + query.eq(rule.getColKey(), rule.getColVal()); + } + } + + // 房屋的统计属性 + if (CollectionUtils.isNotEmpty(statRule)) { + for (ResisByPolicyRulesFormDTO.PolicyRule rule : statRule) { + query.eq(rule.getColKey(), rule.getColVal()); + } + } + + PageHelper.startPage(pageNo, pageSize); + return houseDao.selectList(query); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java new file mode 100644 index 0000000000..716fff932e --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -0,0 +1,74 @@ +package com.epmet.dataaggre.service.impl; + +import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiInfoResultDTO; +import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dataaggre.service.ResiService; +import com.epmet.dataaggre.service.epmetuser.EpmetUserService; +import com.epmet.dataaggre.service.govorg.GovOrgService; +import org.apache.commons.collections4.CollectionUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +@Service +public class ResiServiceImpl implements ResiService { + + @Autowired + private EpmetUserService epmetUserService; + + @Autowired + private GovOrgService govOrgService; + + @Override + public List listByPolicyRules(Integer pageNo, Integer pageSize, + Set resiRule, + Set houseRule, + Set houseStat) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + + // 结果集 + List resultResis = new ArrayList<>(); + + int housePageNo = 0; + do { + // houseIds 为null，说明用户没有指定house和统计的规则，则不应该使用这两项来查询，sql中不应该有这方面的条件 + List houseIds = null; + + // 拿到房屋id列表，去查询居民列表 + if (CollectionUtils.isNotEmpty(houseRule) || CollectionUtils.isNotEmpty(houseStat)) { + List houseEntities = govOrgService.listHousesByRules(houseRule, houseStat, housePageNo, 50); + houseIds = houseEntities.stream().map(icHouseEntity -> icHouseEntity.getId()).collect(Collectors.toList()); + } + + if (houseIds != null && houseIds.size() == 0) { + // 用户使用了房屋和统计相关的条件，但是没查到房屋，我看就没有走下去了的必要了吧.. + break; + } + + // 查询居民 + List resis = epmetUserService.listByPolicyRules(customerId, resiRule, houseIds); + resultResis.addAll(resis); + + // 满了20个，或者查不到居民和房屋了(数据空了)，则跳出 + // 没有用house的条件，没有循环的必要，查一次居民信息即可，跳出 + if (resultResis.size() >= pageSize || houseIds == null ) { + break; + } + + housePageNo ++; + } while (true); + + // 够了20个，那就截取前20个，否则直接返回 + if (resultResis.size() > 20) { + return resultResis.subList(0, 20); + } + return resultResis; + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index c5f04ae7bd..1017c1f37a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -69,4 +69,28 @@ and resi.STATUS='0' + + + diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java new file mode 100644 index 0000000000..5dbf1cfba1 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto.form.resi; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Comparator; +import java.util.Map; +import java.util.Set; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class HeartResisByPolicyRulesFormDTO { + + private Integer pageNo = 1; + private Integer pageSize = 20; + + /** + * 规则map + */ + private Set rules; + + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class PolicyRule implements Comparator { + private String customerId; + /** + * resi:人员信息,house:房屋信息，stat:统计信息 + */ + private String groupType; + + /** + * 与上一条的关系；and、or + */ + private String lastLogicalRel; + + /** + * 查询类型：等于、不等于....;来源于字典表sql_query_type + */ + private String queryType; + + /** + * 表名；人员信息有值； + */ + private String colTable; + + /** + * 人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧 + */ + private String colKey; + + /** + * 参数值 + */ + private String colVal; + + /** + * 排序字段;同一group_type升序 + */ + private Integer sort; + + @Override + public int compare(Integer o1, Integer o2) { + return o1.compareTo(o2); + } + } +} diff --git a/epmet-module/epmet-heart/epmet-heart-server/pom.xml b/epmet-module/epmet-heart/epmet-heart-server/pom.xml index 5d1c230a1c..f90e54c36b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/pom.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/pom.xml @@ -12,6 +12,11 @@ jar + + com.epmet + data-aggregator-client + 2.0.0 + com.epmet epmet-heart-client diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 1cebba0484..f9eda02bdc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -1,7 +1,9 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcPolicyItemResultDTO; +import com.epmet.dto.form.resi.HeartResisByPolicyRulesFormDTO; import com.epmet.service.IcPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -34,4 +36,12 @@ public class IcPolicyController { return new Result>().ok(list); } + @PostMapping("resiuserlist") + public Result listResiUserByPolicyRules(@RequestBody HeartResisByPolicyRulesFormDTO input) { + //todo + String ruleId = "a"; + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + icPolicyService.listResiUserByPolicyRules(customerId, ruleId, 1, 20); + return null; + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index 86a984760f..ccc0f06a39 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -20,4 +20,6 @@ public interface IcPolicyService extends BaseService { * @return */ List itemList(String customerId, String groupType); + + void listResiUserByPolicyRules(String customerId, String ruleId, Integer pageNo, Integer pageSize); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 90162b4231..6da00f89eb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -1,17 +1,27 @@ 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.Constant; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcPolicyDao; +import com.epmet.dao.IcPolicyRuleDetailDao; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.entity.IcPolicyEntity; +import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.service.IcPolicyService; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; /** * 政策表 @@ -22,6 +32,11 @@ import java.util.List; @Service public class IcPolicyServiceImpl extends BaseServiceImpl implements IcPolicyService { + @Autowired + private IcPolicyRuleDetailDao policyRuleDetailDao; + + @Autowired + private DataAggregatorOpenFeignClient dataAggregatorOpenFeignClient; /** * 房屋信息、统计信息查询有哪些可选项 @@ -41,4 +56,21 @@ public class IcPolicyServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper(); + query.eq(IcPolicyRuleDetailEntity::getCustomerId, customerId); + query.eq(IcPolicyRuleDetailEntity::getRuleId, ruleId); + + List rules = policyRuleDetailDao.selectList(query); + + // 将查询出的数据转化成aggre服务能接受的格式 + Map> rulesMap = rules.stream().map((r) -> new ResisByPolicyRulesFormDTO.PolicyRule( + customerId, r.getGroupType(), r.getLastLogicalRel(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal(), r.getSort()) + ).collect(Collectors.groupingBy(ResisByPolicyRulesFormDTO.PolicyRule::getGroupType, Collectors.toSet())); + + ResisByPolicyRulesFormDTO aggForm = new ResisByPolicyRulesFormDTO(pageNo, pageSize, rulesMap); + Result result = dataAggregatorOpenFeignClient.listByPolicyRules(aggForm); + } } \ No newline at end of file From ee9a262d38e99b8cb287a5977c26898555df1969 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 09:09:39 +0800 Subject: [PATCH 044/288] =?UTF-8?q?=E6=94=BF=E7=AD=96=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.21__policy_dict.sql | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.21__policy_dict.sql diff --git a/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.21__policy_dict.sql b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.21__policy_dict.sql new file mode 100644 index 0000000000..22a626d92a --- /dev/null +++ b/epmet-admin/epmet-admin-server/src/main/resources/db/migration/V0.0.21__policy_dict.sql @@ -0,0 +1,34 @@ +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 ('1549241609500921857', 'house_purpose', '房屋用途', '', 31, 0, 0, '1', '2022-07-19 11:55:58', '1', '2022-07-19 11:55:58'); + +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 ('1549241262669729794', 'house_type', '房屋类型', '楼房、平房、别墅', 30, 0, 0, '1', '2022-07-19 11:54:35', '1', '2022-07-19 11:54:35'); + +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 ('1548958559042969601', 'policy_level', '政策级别', '政策级别；与服务项目的政策级别一致', 29, 0, 0, '1', '2022-07-18 17:11:13', '1', '2022-07-19 11:10:42'); + +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 ('1548956290117443586', 'sql_query_type', 'sql查询条件', '目前应用于政策找人规则查询条件', 28, 0, 0, '1', '2022-07-18 17:02:12', '1', '2022-07-19 11:10: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 ('1548956434175008770', 1548956290117443586, '等于', '=', '0', '等于', 1, 0, 0, '1', '2022-07-18 17:02:47', '1', '2022-07-18 17:02: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 ('1548956518434381826', 1548956290117443586, '不等于', '!=', '0', '不等于', 2, 0, 0, '1', '2022-07-18 17:03:07', '1', '2022-07-18 17:03:07'); +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 ('1548956603855577089', 1548956290117443586, '大于', '>', '0', '大于', 3, 0, 0, '1', '2022-07-18 17:03:27', '1', '2022-07-18 17:03: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 ('1548956681525698561', 1548956290117443586, '大于等于', '>=', '0', '大于等于', 4, 0, 0, '1', '2022-07-18 17:03:46', '1', '2022-07-18 17:03: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 ('1548956755412557826', 1548956290117443586, '小于', '<', '0', '小于', 5, 0, 0, '1', '2022-07-18 17:04:03', '1', '2022-07-18 17:04:03'); +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 ('1548956830482210818', 1548956290117443586, '小于等于', '<=', '0', '<=', 6, 0, 0, '1', '2022-07-18 17:04:21', '1', '2022-07-18 17:04: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 ('1548956956554600450', 1548956290117443586, '包含', 'like', '0', '包含', 7, 0, 0, '1', '2022-07-18 17:04:51', '1', '2022-07-18 17:04: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 ('1548957038305779714', 1548956290117443586, '不包含', 'not like', '0', '不包含', 8, 0, 0, '1', '2022-07-18 17:05:11', '1', '2022-07-18 17:05: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 ('1548958784704913410', 1548958559042969601, '市级', '0', '0', '市级；政策级别ic_policy.POLICY_LEVEL', 1, 0, 0, '1', '2022-07-18 17:12:07', '1', '2022-07-18 17:12:07'); +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 ('1548958823573528578', 1548958559042969601, '区级', '1', '0', '区级；政策级别ic_policy.POLICY_LEVEL', 2, 0, 0, '1', '2022-07-18 17:12:16', '1', '2022-07-18 17:12: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 ('1548958887222091777', 1548958559042969601, '街道级', '2', '0', '街道级；政策级别ic_policy.POLICY_LEVEL', 3, 0, 0, '1', '2022-07-18 17:12:32', '1', '2022-07-18 17:12: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 ('1549241348443246594', 1549241262669729794, '楼房', '1', '0', '房屋类型ic_house.houseType', 1, 0, 0, '1', '2022-07-19 11:54:56', '1', '2022-07-19 11:54: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 ('1549241378726121473', 1549241262669729794, '平房', '2', '0', '房屋类型ic_house.houseType', 2, 0, 0, '1', '2022-07-19 11:55:03', '1', '2022-07-19 11:55:03'); +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 ('1549241467490177025', 1549241262669729794, '别墅', '3', '0', '房屋类型ic_house.houseType', 3, 0, 0, '1', '2022-07-19 11:55:24', '1', '2022-07-19 11:55: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 ('1549241664320475137', 1549241609500921857, '住宅', '1', '0', '房屋用途ic_house.purpose', 1, 0, 0, '1', '2022-07-19 11:56:11', '1', '2022-07-19 11:56: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 ('1549241693034680321', 1549241609500921857, '商业', '2', '0', '房屋用途ic_house.purpose', 2, 0, 0, '1', '2022-07-19 11:56:18', '1', '2022-07-19 11:56: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 ('1549241720020832257', 1549241609500921857, '办公', '3', '0', '房屋用途ic_house.purpose', 3, 0, 0, '1', '2022-07-19 11:56:24', '1', '2022-07-19 11:56: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 ('1549241750299512833', 1549241609500921857, '工业', '4', '0', '房屋用途ic_house.purpose', 4, 0, 0, '1', '2022-07-19 11:56:31', '1', '2022-07-19 11:56: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 ('1549241808101216257', 1549241609500921857, '仓储', '5', '0', '房屋用途ic_house.purpose', 5, 0, 0, '1', '2022-07-19 11:56:45', '1', '2022-07-19 11:56: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 ('1549241873729490946', 1549241609500921857, '商住混用', '6', '0', '房屋用途ic_house.purpose', 6, 0, 0, '1', '2022-07-19 11:57:01', '1', '2022-07-19 11:57: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 ('1549241913411801089', 1549241609500921857, '其他', '7', '0', '房屋用途ic_house.purpose', 7, 0, 0, '1', '2022-07-19 11:57:10', '1', '2022-07-19 11:57:10'); From 5af4be43ed9de0d4c12a55bd2f748455241c1ad2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 09:23:14 +0800 Subject: [PATCH 045/288] =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=B8=8D=E5=B1=95=E7=A4=BA=EF=BC=8C=E5=8D=95=E7=8B=AC=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=B9=B4=E9=BE=84=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/db/migration/V0.0.31__policy_flag.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql index ffbc722586..435565604f 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql @@ -14,5 +14,6 @@ where i.DEL_FLAG='0' and i.DYNAMIC='1' and i.COLUMN_NAME is not null and i.COLUMN_NAME !='' + and i.LABEL !='出生日期' and i.ITEM_TYPE not in('cascader') and label not in ('分割线'); \ No newline at end of file From b775693ead52d90c48bb4f6b1d951953ea05aedd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 10:03:28 +0800 Subject: [PATCH 046/288] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.31__resi_export.sql | 6 ++++++ .../{V0.0.31__policy_flag.sql => V0.0.32__policy_flag.sql} | 0 .../src/main/resources/mapper/IcFormItemDao.xml | 1 + 3 files changed, 7 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql rename epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/{V0.0.31__policy_flag.sql => V0.0.32__policy_flag.sql} (100%) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql new file mode 100644 index 0000000000..bb7b0964f7 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__resi_export.sql @@ -0,0 +1,6 @@ +alter table ic_form_item add COLUMN EXPORT_FLAG tinyint(1) DEFAULT '0' + COMMENT '是否用于自定义导出显示,1展示。0不展示' AFTER DATA_ANALYSE; + +update ic_form_item set EXPORT_FLAG='1' +where DEL_FLAG='0' + and LENGTH(COLUMN_NAME)>0; \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql similarity index 100% rename from epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.31__policy_flag.sql rename to epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index 689a90a30a..b0906de8d1 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -262,6 +262,7 @@ ITEM_GROUP_ID = #{groupId} and ifi.CUSTOMER_ID = #{customerId} and ifi.del_flag='0' AND LENGTH(ifi.COLUMN_NAME)>0 + AND ifi.EXPORT_FLAG='1' ORDER BY ifi.SORT From 61ccd3d3b11bb66ea5f3cf4e078a79afd709403c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 10:05:21 +0800 Subject: [PATCH 047/288] POLICY_FLAG --- .../main/resources/db/migration/V0.0.32__policy_flag.sql | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql index 435565604f..59bb1f75d5 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.32__policy_flag.sql @@ -11,9 +11,7 @@ where DEL_FLAG='0' update ic_form_item i set i.POLICY_FLAG='1' where i.DEL_FLAG='0' - and i.DYNAMIC='1' and i.COLUMN_NAME is not null - and i.COLUMN_NAME !='' - and i.LABEL !='出生日期' -and i.ITEM_TYPE not in('cascader') -and label not in ('分割线'); \ No newline at end of file + and i.COLUMN_NAME !='' + and i.ITEM_TYPE not in('cascader') + and i.label not in ('分割线','出生日期'); \ No newline at end of file From 97537270cdfc939044bf4e9245c13a1890bd09e9 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 20 Jul 2022 10:09:14 +0800 Subject: [PATCH 048/288] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=8F=98=E5=8A=A8?= =?UTF-8?q?=E6=97=B6=20=E6=9B=B4=E6=96=B0=20=E6=88=BF=E5=B1=8B=E5=86=85?= =?UTF-8?q?=E7=9A=84=E4=BA=BA=E5=9D=87=E6=94=B6=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dao/IcHouseDao.java | 4 +++- .../java/com/epmet/service/impl/IcHouseServiceImpl.java | 8 +++++++- .../src/main/resources/mapper/IcHouseDao.xml | 4 +++- .../src/main/java/com/epmet/dao/IcResiUserDao.java | 2 +- .../epmet/service/impl/IcResiUserDataSyncServiceImpl.java | 4 ++-- .../src/main/resources/mapper/IcResiUserDao.xml | 6 +++++- 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 35abf9d798..ac4eba65fd 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -9,6 +9,7 @@ import com.epmet.entity.IcHouseEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import java.math.BigDecimal; import java.util.List; import java.util.Set; @@ -178,9 +179,10 @@ public interface IcHouseDao extends BaseDao { * * @param houseId, * @param resiNumber + * @param avgYsrD * @return */ - int updateIcHouseResiNumber(String houseId, Integer resiNumber); + int updateIcHouseResiNumber(String houseId, Integer resiNumber, BigDecimal avgYsrD); /** * @return com.epmet.entity.IcHouseEntity 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 98e340221c..8b584871e7 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 @@ -43,6 +43,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.math.BigDecimal; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.stream.Collectors; @@ -301,10 +302,15 @@ public class IcHouseServiceImpl extends BaseServiceImpl { Object houseId = o.get("houseId"); Object resiNumber = o.get("resiNumber"); + Object avgYsr = o.get("avgYsr"); if (houseId == null || resiNumber == null) { return; } - int i = baseDao.updateIcHouseResiNumber(houseId.toString(), Integer.valueOf(resiNumber.toString())); + BigDecimal avgYsrD = null; + if (avgYsr != null){ + avgYsrD = new BigDecimal(avgYsr.toString()); + } + int i = baseDao.updateIcHouseResiNumber(houseId.toString(), Integer.valueOf(resiNumber.toString()), avgYsrD); effects.getAndAdd(i); }); log.debug("updateIcHouseResiNumber effectRow:{}", effects.intValue()); diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml index ac7c0fc342..8756c9ea8d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseDao.xml @@ -526,7 +526,9 @@ - UPDATE ic_house SET RESI_NUMBER = #{resiNumber}, UPDATED_TIME = NOW() where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0' + UPDATE ic_house + SET RESI_NUMBER = #{resiNumber}, AVG_YSR = #{avgYsrD}, UPDATED_TIME = NOW() + where ID = #{houseId} and RESI_NUMBER != #{resiNumber} and DEL_FLAG = '0' From 5c16125deac200101f9ae33ba2bac6aa7966faf3 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 20 Jul 2022 13:40:50 +0800 Subject: [PATCH 052/288] =?UTF-8?q?=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcServiceScopeV2DTO.java | 5 ----- .../main/java/com/epmet/entity/IcServiceScopeV2Entity.java | 5 ----- 2 files changed, 10 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceScopeV2DTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceScopeV2DTO.java index aa69855de6..f5bc086fae 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceScopeV2DTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceScopeV2DTO.java @@ -51,11 +51,6 @@ public class IcServiceScopeV2DTO implements Serializable { */ private String objectName; - /** - * 备注 - */ - private String remark; - /** * 乐观锁 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceScopeV2Entity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceScopeV2Entity.java index cbf0dd1392..491aadda15 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceScopeV2Entity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceScopeV2Entity.java @@ -51,9 +51,4 @@ public class IcServiceScopeV2Entity extends BaseEpmetEntity { */ private String objectName; - /** - * 备注 - */ - private String remark; - } From 8f814417f3d529fcb9d9da0029af9f85c4ae39de Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 13:51:56 +0800 Subject: [PATCH 053/288] xionzeng --- .../form/policy/IcPolicyRuleDetailDTO.java | 17 ++++++++++++---- .../dto/form/policy/IcPolicyRuleFormDTO.java | 5 ++++- .../service/impl/IcPolicyServiceImpl.java | 20 +++++++------------ 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java index b88ac693c6..8bbbe1ef5e 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java @@ -12,7 +12,13 @@ import javax.validation.constraints.NotBlank; */ @Data public class IcPolicyRuleDetailDTO { - public interface AddUserShowGroup extends CustomerClientShowGroup { + public interface ResiRulerShowGroup extends CustomerClientShowGroup { + } + + public interface HouseRulerShowGroup extends CustomerClientShowGroup { + } + + public interface StatRulerShowGroup extends CustomerClientShowGroup { } /** * 规则描述文字，例如：基础信息性别等于女 @@ -27,34 +33,37 @@ public class IcPolicyRuleDetailDTO { /** * 分组id；人员信息有值； */ + @NotBlank(message = "itemGroupId不能为空", groups = ResiRulerShowGroup.class) private String itemGroupId; /** * 表名；人员信息有值；房屋信息也有值 */ + @NotBlank(message = "itemId不能为空", groups = ResiRulerShowGroup.class) private String itemId; /** * 查询类型：等于、不等于....;来源于字典表sql_query_type */ - @NotBlank(message = "查询类型不能为空", groups = AddUserShowGroup.class) + @NotBlank(message = "查询类型不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class}) private String queryType; /** * 表名；人员信息有值； */ + @NotBlank(message = "colTable不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class}) private String colTable; /** * 人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧 */ - @NotBlank(message = "条件不能为空", groups = AddUserShowGroup.class) + @NotBlank(message = "条件不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class}) private String colKey; /** * 参数值 */ - @NotBlank(message = "参数值不能为空", groups = AddUserShowGroup.class) + @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class}) private String colVal; } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java index e35df132dd..df8d8689fa 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form.policy; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -22,16 +23,18 @@ public class IcPolicyRuleFormDTO implements Serializable { /** * 人员信息 */ - // @Valid + @Valid // @NotEmpty private List resiRuleList; /** * 房屋信息 */ + @Valid private List houseRuleList; /** * 统计信息 */ + @Valid private List statRuleList; /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index b77a8a31ab..5fe69341dc 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -3,11 +3,6 @@ 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.Constant; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.IcPolicyDao; -import com.epmet.dao.IcPolicyRuleDetailDao; -import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; -import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -18,12 +13,13 @@ 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.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.*; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; import com.epmet.dto.IcPolicyCategoryDTO; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; -import com.epmet.entity.IcPolicyEntity; -import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; @@ -41,13 +37,8 @@ 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.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; -import java.util.Map; /** * 政策表 @@ -137,6 +128,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl Date: Wed, 20 Jul 2022 14:10:03 +0800 Subject: [PATCH 054/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E9=A2=84=E8=A7=88=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ResisByPolicyRulesFormDTO.java | 88 +++++++++--------- .../result/ResiByPolicyInfoResultDTO.java | 26 ++++++ .../feign/DataAggregatorOpenFeignClient.java | 5 +- .../controller/IcUserController.java | 30 +++++-- .../dao/epmetuser/IcResiUserDao.java | 16 +++- .../dao/govorg/IcNeighborhoodDao.java | 13 +++ .../epmet/dataaggre/service/ResiService.java | 11 ++- .../service/epmetuser/EpmetUserService.java | 4 +- .../epmetuser/impl/EpmetUserServiceImpl.java | 7 +- .../service/govorg/GovOrgService.java | 8 +- .../govorg/impl/GovOrgServiceImpl.java | 59 ++++++++++-- .../service/impl/ResiServiceImpl.java | 90 ++++++++++++++----- .../mapper/epmetuser/IcResiUserDao.xml | 45 +++++++++- .../mapper/govorg/IcNeighborhoodDao.xml | 15 ++++ .../resi/HeartResisByPolicyRulesFormDTO.java | 86 +++++++++--------- .../form/resi/ResisByPolicyRulesFormDTO.java | 62 +++++++++++++ .../resi/ResiByPolicyInfoResultDTO.java} | 4 +- .../epmet/controller/IcPolicyController.java | 8 +- .../com/epmet/service/IcPolicyService.java | 4 +- .../service/impl/IcPolicyServiceImpl.java | 72 ++++++++++++--- .../migration/V0.0.36__house_add_avgysr.sql | 2 +- 21 files changed, 498 insertions(+), 157 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcNeighborhoodDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcNeighborhoodDao.xml create mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java rename epmet-module/{data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java => epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java} (81%) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java index d47d8fdde1..cfcedbed03 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Comparator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -12,58 +13,63 @@ import java.util.Set; @NoArgsConstructor @AllArgsConstructor public class ResisByPolicyRulesFormDTO { + private String ruleId; + private String orgId; + private String orgType; + private String neighborHoodId; + private String buildingId; + private String unitId; + private String houseId; + private String name; + private String mobile; + private String idCard; + private RuleList ruleList = new RuleList(); + private Integer pageNo; + private Integer pageSize; - private Integer pageNo = 1; - private Integer pageSize = 20; - - /** - * 规则map - */ - private Map> rules; + @Data + public static class RuleList { + private String ruleName; + private List resiRule; + private List houseRule; + private List statRule; + } @Data @NoArgsConstructor @AllArgsConstructor - public static class PolicyRule implements Comparator { - private String customerId; - /** - * resi:人员信息,house:房屋信息，stat:统计信息 - */ - private String groupType; - - /** - * 与上一条的关系；and、or - */ + public static class ResiRule { + private String ruleDesc; private String lastLogicalRel; - - /** - * 查询类型：等于、不等于....;来源于字典表sql_query_type - */ + private String itemGroupId; + private String itemId; private String queryType; - - /** - * 表名；人员信息有值； - */ private String colTable; - - /** - * 人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧 - */ private String colKey; - - /** - * 参数值 - */ private String colVal; + } - /** - * 排序字段;同一group_type升序 - */ - private Integer sort; + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class HouseRule { + private String colTable; + private String colKey; + private String colVal; + private String ruleDesc; + private String lastLogicalRel; + private String queryType; + } - @Override - public int compare(Integer o1, Integer o2) { - return o1.compareTo(o2); - } + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class StatRule { + private String colKey; + private String colVal; + private String lastLogicalRel; + private String ruleDesc; + private String queryType; + private String colTable; } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java new file mode 100644 index 0000000000..e739baca1d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java @@ -0,0 +1,26 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class ResiByPolicyInfoResultDTO { + + private String icResiUserId; + private String name; + private String mobile; + private String idCard; + /** + * 小区全名，包含小区前面的属性，比如网格等 + */ + private String gridId; + private String neighborhoodId; + private String neighborHoodName; + private Integer age; + private Date birthday; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java index d29b42173e..9bda005a8b 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java @@ -4,12 +4,15 @@ package com.epmet.dataaggre.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.feign.impl.DataAggregatorOpenFeignClientFallbackFactory; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import java.util.List; + @FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory = DataAggregatorOpenFeignClientFallbackFactory.class) // @FeignClient(name = ServiceConstant.DATA_AGGREGATOR_SERVER, fallbackFactory= DataAggregatorOpenFeignClientFallbackFactory.class,url = "localhost:8114") public interface DataAggregatorOpenFeignClient { @@ -28,5 +31,5 @@ public interface DataAggregatorOpenFeignClient { * @return */ @PostMapping("data/aggregator/icuser/listByPolicyRules") - Result listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input); + Result> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 715fbc7501..8e68a00431 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.epmetuser.form.IcUserCategoryFormDTO; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.IcUserCategoryResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.epmet.dataaggre.service.ResiService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import org.apache.commons.collections4.CollectionUtils; @@ -17,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; @@ -51,23 +53,33 @@ public class IcUserController { * @return */ @PostMapping("listByPolicyRules") - public Result listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { + public Result> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); - Map> rules = input.getRules(); - Set resiRule = rules.get("resi"); - Set houseRule = rules.get("house"); - Set houseStat = rules.get("stat"); + List resiRule = input.getRuleList().getResiRule(); + List houseRule = input.getRuleList().getHouseRule(); + List statRule = input.getRuleList().getStatRule(); + String orgId = input.getOrgId(); + String orgType = input.getOrgType(); + String neighborHoodId = input.getNeighborHoodId(); + String buildingId = input.getBuildingId(); + String unitId = input.getUnitId(); + String houseId = input.getHouseId(); + String idCard = input.getIdCard(); + String name = input.getName(); + + // 全都为空，则返回空 if (CollectionUtils.isEmpty(resiRule) && CollectionUtils.isEmpty(houseRule) - && CollectionUtils.isEmpty(houseStat)) { - return new Result(); + && CollectionUtils.isEmpty(statRule)) { + return new Result().ok(new ArrayList<>()); } - icResiService.listByPolicyRules(pageNo, pageSize, resiRule, houseRule, houseStat); - return new Result(); + List resis = icResiService.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule); + return new Result>().ok(resis); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index 82d13c9094..dfbf64daaa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -20,7 +20,7 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.ResiInfoResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dto.IcResiUserDTO; @@ -68,7 +68,15 @@ public interface IcResiUserDao extends BaseDao { * @param houseIds * @return */ - List listByPolicyRules(@Param("customerId") String customerId, - @Param("resiRules") Set resiRules, - @Param("houseIds") List houseIds); + List listByPolicyRules(@Param("customerId") String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId, + @Param("unitId") String unitId, + @Param("houseId") String houseId, + @Param("idCard") String idCard, + @Param("name") String name, + @Param("resiRules") List resiRule, + @Param("houseIds") List houseIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcNeighborhoodDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcNeighborhoodDao.java new file mode 100644 index 0000000000..51a309e135 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcNeighborhoodDao.java @@ -0,0 +1,13 @@ +package com.epmet.dataaggre.dao.govorg; + +import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; +import com.epmet.dto.IcNeighborHoodDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface IcNeighborhoodDao { + List neighborhoodsByIds(@Param("neighborhoodIds") List neighborhoodIds); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java index 286f299186..b15f39e5fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java @@ -1,7 +1,7 @@ package com.epmet.dataaggre.service; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.ResiInfoResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import java.util.List; import java.util.Set; @@ -18,7 +18,10 @@ public interface ResiService { * @param resiRule * @param houseRule */ - List listByPolicyRules(Integer pageNo, Integer pageSize, Set resiRule, - Set houseRule, - Set houseStat); + List listByPolicyRules( + String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + List resiRule, + List houseRule, + List statRule); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 834ffd051e..5a095d6e2f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -201,5 +201,7 @@ public interface EpmetUserService { */ List staffSelectList(List staffIds); - List listByPolicyRules(String customerId, Set resiRule, List houseIds); + List listByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + List resiRule, List houseIds); } 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 ef4ad9c699..2166db1e3d 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 @@ -845,7 +845,10 @@ public class EpmetUserServiceImpl implements EpmetUserService { } @Override - public List listByPolicyRules(String customerId, Set resiRule, List houseIds) { - return icResiUserDao.listByPolicyRules(customerId, resiRule, houseIds); + public List listByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + List resiRule, List houseIds) { + + return icResiUserDao.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index 746be2acd2..237a0cf6f2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -12,6 +12,8 @@ import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dto.IcNeighborHoodDTO; +import com.epmet.dto.result.NeighborHoodListResultDTO; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -216,5 +218,9 @@ public interface GovOrgService { */ CustomerAgencyEntity getRootAgencyByCustomerId(String customerId); - List listHousesByRules(Set houseRule, Set houseStat, Integer pageNo, Integer pageSize); + List listHousesByRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, + String unitId, String houseId, List houseRule, + List statRule, Integer pageNo, Integer pageSize); + + List neighborhoodsByIds(List neighborhoodIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 076191a1f1..945cb2ab59 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -50,6 +50,7 @@ import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; +import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.OssFeignClient; import com.github.pagehelper.PageHelper; @@ -114,6 +115,8 @@ public class GovOrgServiceImpl implements GovOrgService { private ExecutorService executorService; @Autowired private IcHouseDao houseDao; + @Autowired + private IcNeighborhoodDao neighborhoodDao; /** * @param staffId @@ -1087,26 +1090,67 @@ public class GovOrgServiceImpl implements GovOrgService { return customerAgencyDao.selectOne(query); } + public String getOrgIdPath(String orgId, String orgType) { + if ("agency".equals(orgType)) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(orgId); + if (agencyInfo != null) { + String pids = agencyInfo.getPids(); + String id = agencyInfo.getId(); + if (StringUtils.isBlank(pids)) { + return id; + } else { + return pids.concat(":").concat(id); + } + } + } else { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(orgId); + return gridInfo.getPids().concat(":").concat(gridInfo.getId()); + } + return null; + } + @Override - public List listHousesByRules(Set houseRule, Set statRule, Integer pageNo, Integer pageSize) { + public List listHousesByRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, + String unitId, String houseId, List houseRule, + List statRule, Integer pageNo, Integer pageSize) { + if (CollectionUtils.isEmpty(houseRule) && CollectionUtils.isEmpty(statRule)) { return new ArrayList<>(); } - String customerId = EpmetRequestHolder.getLoginUserCustomerId(); QueryWrapper query = new QueryWrapper<>(); - query.eq("CUSTOMER_ID", customerId); + + if (StringUtils.isNotBlank(orgId) && StringUtils.isNotBlank(orgType)) { + String orgIdPath = getOrgIdPath(orgId, orgType); + query.likeRight(StringUtils.isNotBlank(orgIdPath), "ORG_ID_PATH", orgIdPath); + } + + if (StringUtils.isNotBlank(customerId)) { + query.eq("CUSTOMER_ID", customerId); + } + if (StringUtils.isNotBlank(neighborHoodId)) { + query.eq("NEIGHBOR_HOOD_ID", neighborHoodId); + } + if (StringUtils.isNotBlank(buildingId)) { + query.eq("BUILDING_ID", buildingId); + } + if (StringUtils.isNotBlank(unitId)) { + query.eq("BUILDING_UNIT_ID", unitId); + } + if (StringUtils.isNotBlank(houseId)) { + query.eq("ID", houseId); + } // 房屋属性 if (CollectionUtils.isNotEmpty(houseRule)) { - for (ResisByPolicyRulesFormDTO.PolicyRule rule : houseRule) { + for (ResisByPolicyRulesFormDTO.HouseRule rule : houseRule) { query.eq(rule.getColKey(), rule.getColVal()); } } // 房屋的统计属性 if (CollectionUtils.isNotEmpty(statRule)) { - for (ResisByPolicyRulesFormDTO.PolicyRule rule : statRule) { + for (ResisByPolicyRulesFormDTO.StatRule rule : statRule) { query.eq(rule.getColKey(), rule.getColVal()); } } @@ -1114,4 +1158,9 @@ public class GovOrgServiceImpl implements GovOrgService { PageHelper.startPage(pageNo, pageSize); return houseDao.selectList(query); } + + @Override + public List neighborhoodsByIds(List neighborhoodIds) { + return neighborhoodDao.neighborhoodsByIds(neighborhoodIds); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 716fff932e..1e81a3c520 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -1,19 +1,21 @@ package com.epmet.dataaggre.service.impl; +import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.ResiInfoResultDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO; import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dataaggre.service.ResiService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dto.IcNeighborHoodDTO; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; +import java.time.*; +import java.util.*; import java.util.stream.Collectors; @Service @@ -26,38 +28,45 @@ public class ResiServiceImpl implements ResiService { private GovOrgService govOrgService; @Override - public List listByPolicyRules(Integer pageNo, Integer pageSize, - Set resiRule, - Set houseRule, - Set houseStat) { + public List listByPolicyRules(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + List resiRule, + List houseRule, + List statRule) { String customerId = EpmetRequestHolder.getLoginUserCustomerId(); // 结果集 - List resultResis = new ArrayList<>(); + List resultResis = new ArrayList<>(); + // 1.用户没配置house和stat规则，直接按照居民规则查询 + if (CollectionUtils.isEmpty(houseRule) && CollectionUtils.isEmpty(statRule)) { + return epmetUserService.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, pageNo, pageSize, resiRule, null); + } + + // 2.用户至少配置了house和stat规则的一个，那么就先查询房屋出来，然后根据房屋去找居民 int housePageNo = 0; do { - // houseIds 为null，说明用户没有指定house和统计的规则，则不应该使用这两项来查询，sql中不应该有这方面的条件 - List houseIds = null; - // 拿到房屋id列表，去查询居民列表 - if (CollectionUtils.isNotEmpty(houseRule) || CollectionUtils.isNotEmpty(houseStat)) { - List houseEntities = govOrgService.listHousesByRules(houseRule, houseStat, housePageNo, 50); - houseIds = houseEntities.stream().map(icHouseEntity -> icHouseEntity.getId()).collect(Collectors.toList()); - } + List houseEntities = govOrgService.listHousesByRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, houseRule, statRule, housePageNo, 50); + List houseIds = houseEntities.stream().map(icHouseEntity -> icHouseEntity.getId()).collect(Collectors.toList()); - if (houseIds != null && houseIds.size() == 0) { + if (houseIds.size() == 0) { // 用户使用了房屋和统计相关的条件，但是没查到房屋，我看就没有走下去了的必要了吧.. break; } // 查询居民 - List resis = epmetUserService.listByPolicyRules(customerId, resiRule, houseIds); + List resis = epmetUserService.listByPolicyRules( + customerId, orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, pageNo, pageSize, resiRule, houseIds); + resultResis.addAll(resis); // 满了20个，或者查不到居民和房屋了(数据空了)，则跳出 // 没有用house的条件，没有循环的必要，查一次居民信息即可，跳出 - if (resultResis.size() >= pageSize || houseIds == null ) { + if (resultResis.size() >= pageSize) { break; } @@ -66,9 +75,50 @@ public class ResiServiceImpl implements ResiService { // 够了20个，那就截取前20个，否则直接返回 if (resultResis.size() > 20) { - return resultResis.subList(0, 20); + resultResis = resultResis.subList(0, 20); } + + // 补充额外信息 + fillResisExtraInfoForPolicy(resultResis); return resultResis; } + /** + * 补充额外信息 + * @param resultResis + */ + private void fillResisExtraInfoForPolicy(List resultResis) { + List gridIds = new ArrayList<>(); + List neighborhoodIds = new ArrayList<>(); + resultResis.stream().forEach((r) -> { + gridIds.add(r.getGridId()); + neighborhoodIds.add(r.getNeighborhoodId()); + }); + + // 统一收集网格和小区信息 + Map gridIdAndName = govOrgService.gridListByIds(gridIds) + .stream() + .collect(Collectors.toMap(GridsInfoListResultDTO::getGridId, GridsInfoListResultDTO::getName)); + + Map neighborhoodIdAndName = govOrgService.neighborhoodsByIds(neighborhoodIds) + .stream().collect(Collectors.toMap(IcNeighborHoodDTO::getId, IcNeighborHoodDTO::getNeighborHoodName)); + + resultResis.stream().forEach((r) -> { + // 小区名称 + r.setNeighborHoodName(gridIdAndName.get(r.getGridId()).concat("-").concat(neighborhoodIdAndName.get(r.getNeighborhoodId()))); + + // 出生日期 & 年龄 + if (r.getBirthday() != null) { + Integer age = null; + try { + LocalDate birthdayLocalDate = LocalDateTime.ofInstant(r.getBirthday().toInstant(), ZoneId.systemDefault()).toLocalDate(); + age = Period.between(birthdayLocalDate, LocalDate.now()).getYears(); + } catch (DateTimeException e) { + throw new EpmetException("居民生日计算错误"); + } + r.setAge(age); + } + }); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 1017c1f37a..2a0f410795 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -70,20 +70,59 @@ - + select `ID` as icResiUserId, + `GRID_ID`, + `NAME`, + `MOBILE`, + `ID_CARD`, + `VILLAGE_ID` as neighborhoodId, + `BIRTHDAY` from ic_resi_user inner join #{rule.colTable} + ic_resi_user.CUSTOMER_ID=#{customerId} + + + + + and ic_resi_user.AGENCY_ID=#{orgId} + + + and ic_resi_user.GRID_ID=#{orgId} + + + + + + and ic_resi_user.VILLAGE_ID=#{neighborHoodId} + + + and ic_resi_user.BUILD_ID=#{buildingId} + + + and ic_resi_user.UNIT_ID=#{unitId} + + + and ic_resi_user.HOME_ID=#{houseId} + + + and ic_resi_user.ID_CARD like CONCAT('%'#{idCard}, '%') + + + and ic_resi_user.NAME like CONCAT('%'#{name}, '%') + + + ${rule.lastLogicalRel} ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} - + and HOME_ID in diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcNeighborhoodDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcNeighborhoodDao.xml new file mode 100644 index 0000000000..93a43bbb01 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcNeighborhoodDao.xml @@ -0,0 +1,15 @@ + + + + + + + + \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java index 5dbf1cfba1..d195372b96 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java @@ -5,6 +5,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.Comparator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -12,58 +13,57 @@ import java.util.Set; @NoArgsConstructor @AllArgsConstructor public class HeartResisByPolicyRulesFormDTO { - - private Integer pageNo = 1; - private Integer pageSize = 20; - - /** - * 规则map - */ - private Set rules; + private String ruleId; + private String orgId; + private String orgType; + private String neighborHoodId; + private String buildingId; + private String unitId; + private String houseId; + private String name; + private String mobile; + private String idCard; + private RuleList ruleList; + private Integer pageNo; + private Integer pageSize; @Data - @NoArgsConstructor - @AllArgsConstructor - public static class PolicyRule implements Comparator { - private String customerId; - /** - * resi:人员信息,house:房屋信息，stat:统计信息 - */ - private String groupType; + public static class RuleList { + private String ruleName; + private List resiRule; + private List houseRule; + private List statRule; + } - /** - * 与上一条的关系；and、or - */ + @Data + public static class ResiRule { + private String ruleDesc; private String lastLogicalRel; - - /** - * 查询类型：等于、不等于....;来源于字典表sql_query_type - */ + private String itemGroupId; + private String itemId; private String queryType; - - /** - * 表名；人员信息有值； - */ private String colTable; - - /** - * 人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧 - */ private String colKey; - - /** - * 参数值 - */ private String colVal; + } - /** - * 排序字段;同一group_type升序 - */ - private Integer sort; + @Data + public static class HouseRule { + private String colTable; + private String colKey; + private String colVal; + private String ruleDesc; + private String lastLogicalRel; + private String queryType; + } - @Override - public int compare(Integer o1, Integer o2) { - return o1.compareTo(o2); - } + @Data + public static class StatRule { + private String colKey; + private String colVal; + private String lastLogicalRel; + private String ruleDesc; + private String queryType; + private String colTable; } } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java new file mode 100644 index 0000000000..2f9fd654a4 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java @@ -0,0 +1,62 @@ +package com.epmet.dto.form.resi; + +import lombok.Data; + +import java.util.List; + +@Data +public class ResisByPolicyRulesFormDTO { + private String ruleId; + private String orgId; + private String orgType; + private String neighborHoodId; + private String buildingId; + private String unitId; + private String houseId; + private String name; + private String mobile; + private String idCard; + private RuleList ruleList; + private Integer pageNo; + private Integer pageSize; + + @Data + public static class RuleList { + private String ruleName; + private List resiRule; + private List houseRule; + private List statRule; + } + + @Data + public static class ResiRule { + private String ruleDesc; + private String lastLogicalRel; + private String itemGroupId; + private String itemId; + private String queryType; + private String colTable; + private String colKey; + private String colVal; + } + + @Data + public static class HouseRule { + private String colTable; + private String colKey; + private String colVal; + private String ruleDesc; + private String lastLogicalRel; + private String queryType; + } + + @Data + public static class StatRule { + private String colKey; + private String colVal; + private String lastLogicalRel; + private String ruleDesc; + private String queryType; + private String colTable; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java similarity index 81% rename from epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java rename to epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java index 04793b3a71..313f70560b 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java @@ -1,4 +1,4 @@ -package com.epmet.dataaggre.dto.epmetuser.result; +package com.epmet.dto.result.resi; import lombok.AllArgsConstructor; import lombok.Data; @@ -7,7 +7,7 @@ import lombok.NoArgsConstructor; @Data @NoArgsConstructor @AllArgsConstructor -public class ResiInfoResultDTO { +public class ResiByPolicyInfoResultDTO { private String name; private String mobile; diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index aa6a390038..cc444aa24e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -13,6 +13,7 @@ import com.epmet.dto.form.resi.HeartResisByPolicyRulesFormDTO; import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; +import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.service.IcPolicyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -46,11 +47,8 @@ public class IcPolicyController { } @PostMapping("resiuserlist") - public Result listResiUserByPolicyRules(@RequestBody HeartResisByPolicyRulesFormDTO input) { - //todo - String ruleId = "a"; - String customerId = EpmetRequestHolder.getLoginUserCustomerId(); - icPolicyService.listResiUserByPolicyRules(customerId, ruleId, 1, 20); + public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { + icPolicyService.listResiUserByPolicyRules(input); return null; } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index 0c3534e2bb..b0f0fe2636 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -7,6 +7,8 @@ import com.epmet.dto.IcPolicyItemResultDTO; import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; +import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; +import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.IcPolicyEntity; import java.util.List; @@ -45,5 +47,5 @@ public interface IcPolicyService extends BaseService { IcPolicyDTO policyDetail(String customerId,String policyId); - void listResiUserByPolicyRules(String customerId, String ruleId, Integer pageNo, Integer pageSize); + List listResiUserByPolicyRules(ResisByPolicyRulesFormDTO input); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index b77a8a31ab..1d17e462aa 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -3,6 +3,9 @@ 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.Constant; +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; import com.epmet.dao.IcPolicyDao; import com.epmet.dao.IcPolicyRuleDetailDao; @@ -17,11 +20,11 @@ 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.Result; import com.epmet.dao.*; import com.epmet.dto.IcPolicyCategoryDTO; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; +import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.IcPolicyEntity; import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.dto.IcPolicyRuleDTO; @@ -47,7 +50,6 @@ import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import java.util.Map; /** * 政策表 @@ -56,7 +58,7 @@ import java.util.Map; * @since v1.0.0 2022-07-18 */ @Service -public class IcPolicyServiceImpl extends BaseServiceImpl implements IcPolicyService { +public class IcPolicyServiceImpl extends BaseServiceImpl implements IcPolicyService, ResultDataResolver { @Autowired private IcPolicyRuleDetailDao policyRuleDetailDao; @@ -310,19 +312,61 @@ public class IcPolicyServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper(); - query.eq(IcPolicyRuleDetailEntity::getCustomerId, customerId); - query.eq(IcPolicyRuleDetailEntity::getRuleId, ruleId); + public List listResiUserByPolicyRules(com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO input) { + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + String ruleId = input.getRuleId(); + + ResisByPolicyRulesFormDTO aggForm = ConvertUtils.sourceToTarget(input, ResisByPolicyRulesFormDTO.class); + + // 穿了规则id，按照规则id来，忽略规则list + if (StringUtils.isNotBlank(ruleId)) { + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(IcPolicyRuleDetailEntity::getCustomerId, customerId); + query.eq(IcPolicyRuleDetailEntity::getRuleId, ruleId); + List rules = policyRuleDetailDao.selectList(query); + + // 将查询出的数据转化成aggre服务能接受的格式 + Map> ruleMap = rules.stream().collect(Collectors.groupingBy(IcPolicyRuleDetailEntity::getGroupType, Collectors.toList())); + + // resi规则 + List originResiRules = ruleMap.get("resi"); + if (CollectionUtils.isNotEmpty(originResiRules)) { + List resiRules = originResiRules + .stream() + .map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getLastLogicalRel(), r.getItemGroupId(), + r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal())) + .collect(Collectors.toList()); - List rules = policyRuleDetailDao.selectList(query); + aggForm.getRuleList().setResiRule(resiRules); + } + + // house规则 + List originHouseRules = ruleMap.get("house"); + if (CollectionUtils.isNotEmpty(originHouseRules)) { + List houseRules = originHouseRules + .stream() + .map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(), + r.getRuleDesc(), r.getLastLogicalRel(), r.getQueryType())) + .collect(Collectors.toList()); + aggForm.getRuleList().setHouseRule(houseRules); + } - // 将查询出的数据转化成aggre服务能接受的格式 - Map> rulesMap = rules.stream().map((r) -> new ResisByPolicyRulesFormDTO.PolicyRule( - customerId, r.getGroupType(), r.getLastLogicalRel(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal(), r.getSort()) - ).collect(Collectors.groupingBy(ResisByPolicyRulesFormDTO.PolicyRule::getGroupType, Collectors.toSet())); + // stat规则 + List originStatRules = ruleMap.get("stat"); + if (CollectionUtils.isNotEmpty(originStatRules)) { + List statRules = originStatRules + .stream() + .map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getLastLogicalRel(), + r.getRuleDesc(), r.getQueryType(), r.getColTable())) + .collect(Collectors.toList()); + + aggForm.getRuleList().setStatRule(statRules); + } + } - ResisByPolicyRulesFormDTO aggForm = new ResisByPolicyRulesFormDTO(pageNo, pageSize, rulesMap); - Result result = dataAggregatorOpenFeignClient.listByPolicyRules(aggForm); + List resis = getResultDataOrReturnNull(dataAggregatorOpenFeignClient.listByPolicyRules(aggForm), ServiceConstant.DATA_AGGREGATOR_SERVER); + return resis.stream() + .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborhoodFullName(), r.getAge())) + .collect(Collectors.toList()); } } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql index 73b95459ce..b088ca5656 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__house_add_avgysr.sql @@ -1 +1 @@ -alter table ic_house add column AVG_RSR decimal(10, 4) comment '人均月收入' after RESI_NUMBER; \ No newline at end of file +alter table ic_house add column AVG_YSR decimal(10,4) comment '家庭平均月收入' default -1 after RESI_NUMBER; \ No newline at end of file From 2e2364742663c3b36a560a00659ff77bf8479dfe Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Jul 2022 14:35:08 +0800 Subject: [PATCH 055/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/IcPolicyController.java | 38 +++++++++++++++++++ .../service/impl/IcPolicyServiceImpl.java | 2 +- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index cc444aa24e..a383b5ffd9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -15,6 +15,7 @@ import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.service.IcPolicyService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -48,9 +49,46 @@ public class IcPolicyController { @PostMapping("resiuserlist") public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { + // 调整错位的逻辑符号位置 + //adjustMalpositionLogicalOperatorPosition(input); icPolicyService.listResiUserByPolicyRules(input); return null; } + + /** + * 调整错位的逻辑运算符 + * @param input + */ + //private void adjustMalpositionLogicalOperatorPosition(ResisByPolicyRulesFormDTO input) { + // List resiRule = input.getRuleList().getResiRule(); + // List houseRule = input.getRuleList().getHouseRule(); + // List statRule = input.getRuleList().getStatRule(); + // + // if (CollectionUtils.isNotEmpty(resiRule)) { + // for (int i = 1; i < resiRule.size() - 1; i++) { + // ResisByPolicyRulesFormDTO.ResiRule current = resiRule.get(i); + // ResisByPolicyRulesFormDTO.ResiRule last = resiRule.get(i - 1); + // current.setLastLogicalRel(last.getLastLogicalRel()); + // } + // } + // + // if (CollectionUtils.isNotEmpty(houseRule)) { + // for (int i = 1; i < houseRule.size() - 1; i++) { + // ResisByPolicyRulesFormDTO.HouseRule current = houseRule.get(i); + // ResisByPolicyRulesFormDTO.HouseRule last = houseRule.get(i - 1); + // current.setLastLogicalRel(last.getLastLogicalRel()); + // } + // } + // + // if (CollectionUtils.isNotEmpty(statRule)) { + // for (int i = 1; i < statRule.size() - 1; i++) { + // ResisByPolicyRulesFormDTO.StatRule current = statRule.get(i); + // ResisByPolicyRulesFormDTO.StatRule last = statRule.get(i - 1); + // current.setLastLogicalRel(last.getLastLogicalRel()); + // } + // } + //} + /** * 政策管理-新增/修改 * diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index f46a0b0af8..ed96978438 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -369,7 +369,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl resis = getResultDataOrReturnNull(dataAggregatorOpenFeignClient.listByPolicyRules(aggForm), ServiceConstant.DATA_AGGREGATOR_SERVER); return resis.stream() - .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborhoodFullName(), r.getAge())) + .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborHoodName(), r.getAge())) .collect(Collectors.toList()); } } \ No newline at end of file From 608b181774a1759d16cfe005e02f8cb5cb1a2c20 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 14:38:09 +0800 Subject: [PATCH 056/288] nextLogicalRel --- .../com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java | 5 +++-- .../java/com/epmet/entity/IcPolicyRuleDetailEntity.java | 5 +++-- .../java/com/epmet/service/impl/IcPolicyServiceImpl.java | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java index 8bbbe1ef5e..79be9a25ff 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java @@ -26,9 +26,10 @@ public class IcPolicyRuleDetailDTO { private String ruleDesc; /** - * 与上一条的关系；and、or + * 与下一条的关系；and、or + * 如果没有条件的话，此列为空 */ - private String lastLogicalRel; + private String nextLogicalRel; /** * 分组id；人员信息有值； diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java index ee959255b0..7516f2aca6 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPolicyRuleDetailEntity.java @@ -44,9 +44,10 @@ public class IcPolicyRuleDetailEntity extends BaseEpmetEntity { private String groupType; /** - * 与上一条的关系；and、or + * 与下一条的关系；and、or + * 如果没有条件的话，此列为空 */ - private String lastLogicalRel; + private String nextLogicalRel; /** * 分组id；人员信息有值； diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index f46a0b0af8..09d7977b6a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -336,7 +336,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl resiRules = originResiRules .stream() - .map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getLastLogicalRel(), r.getItemGroupId(), + .map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getNextLogicalRel(), r.getItemGroupId(), r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal())) .collect(Collectors.toList()); @@ -349,7 +349,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl houseRules = originHouseRules .stream() .map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(), - r.getRuleDesc(), r.getLastLogicalRel(), r.getQueryType())) + r.getRuleDesc(), r.getNextLogicalRel(), r.getQueryType())) .collect(Collectors.toList()); aggForm.getRuleList().setHouseRule(houseRules); } @@ -359,7 +359,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl statRules = originStatRules .stream() - .map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getLastLogicalRel(), + .map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getNextLogicalRel(), r.getRuleDesc(), r.getQueryType(), r.getColTable())) .collect(Collectors.toList()); From cc2649b85d7ad1f142f55e4e32e970c1452990d9 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Jul 2022 14:39:08 +0800 Subject: [PATCH 057/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/epmetuser/IcResiUserDao.xml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 2a0f410795..651c9c806f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -114,14 +114,6 @@ and ic_resi_user.NAME like CONCAT('%'#{name}, '%') - - - - - ${rule.lastLogicalRel} ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} - - - and HOME_ID in @@ -129,6 +121,13 @@ #{houseId} + + + and + + ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.lastLogicalRel} + + From 31b7f23d8abf77a8ae6d1f1770db560561c4ffe6 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 15:05:04 +0800 Subject: [PATCH 058/288] =?UTF-8?q?=E5=8E=BB=E6=8E=89orgIdPath?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcPolicyDTO.java | 4 ++++ .../com/epmet/dto/form/policy/IcPolicyFormDTO.java | 10 +++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java index 8c7fc33767..947f2faa09 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyDTO.java @@ -28,6 +28,10 @@ public class IcPolicyDTO implements Serializable { */ private String orgId; + /** + * AGENCY_ID的全路径，含agency_id + */ + private String orgIdPath; /** * 政策级别，0市级；1区级；2街道级 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java index c605e8b062..3ebd110fad 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java @@ -39,11 +39,11 @@ public class IcPolicyFormDTO implements Serializable { @NotBlank(message = "orgId不能为空",groups = UpdateUserInternalGroup.class) private String orgId; - /** - * AGENCY_ID的全路径，含agency_id - */ - @NotBlank(message = "orgIdPath不能为空",groups = UpdateUserInternalGroup.class) - private String orgIdPath; + // /** + // * AGENCY_ID的全路径，含agency_id + // */ + // @NotBlank(message = "orgIdPath不能为空",groups = UpdateUserInternalGroup.class) + // private String orgIdPath; /** From 7bad0e5692ec1fc82d6048e4b73b9d530d1c51ad Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Jul 2022 15:21:34 +0800 Subject: [PATCH 059/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/page/PageData.java | 2 ++ .../epmetuser/form/ResisByPolicyRulesFormDTO.java | 6 +++--- .../feign/DataAggregatorOpenFeignClient.java | 3 ++- .../impl/DataAggregatorOpenFeignClientFallback.java | 4 +++- .../epmet/dataaggre/controller/IcUserController.java | 7 ++++--- .../com/epmet/dataaggre/service/ResiService.java | 4 +++- .../dataaggre/service/impl/ResiServiceImpl.java | 10 +++++++--- .../resources/mapper/epmetuser/IcResiUserDao.xml | 2 +- .../java/com/epmet/dto/IcPolicyRuleDetailDTO.java | 2 +- .../form/resi/HeartResisByPolicyRulesFormDTO.java | 6 +++--- .../dto/form/resi/ResisByPolicyRulesFormDTO.java | 6 +++--- .../dto/result/resi/ResiByPolicyInfoResultDTO.java | 8 +++++++- .../com/epmet/controller/IcPolicyController.java | 5 +++-- .../main/java/com/epmet/service/IcPolicyService.java | 2 +- .../com/epmet/service/impl/IcPolicyServiceImpl.java | 12 ++++++++---- 15 files changed, 51 insertions(+), 28 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java index 380d5ec0e5..55a331c4e2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/page/PageData.java @@ -9,6 +9,7 @@ package com.epmet.commons.tools.page; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.List; @@ -20,6 +21,7 @@ import java.util.List; * @since 1.0.0 */ @Data +@NoArgsConstructor public class PageData implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java index cfcedbed03..ea4bd8cb0a 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java @@ -40,7 +40,7 @@ public class ResisByPolicyRulesFormDTO { @AllArgsConstructor public static class ResiRule { private String ruleDesc; - private String lastLogicalRel; + private String nextLogicalRel; private String itemGroupId; private String itemId; private String queryType; @@ -57,7 +57,7 @@ public class ResisByPolicyRulesFormDTO { private String colKey; private String colVal; private String ruleDesc; - private String lastLogicalRel; + private String nextLogicalRel; private String queryType; } @@ -67,7 +67,7 @@ public class ResisByPolicyRulesFormDTO { public static class StatRule { private String colKey; private String colVal; - private String lastLogicalRel; + private String nextLogicalRel; private String ruleDesc; private String queryType; private String colTable; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java index 9bda005a8b..f979ead709 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/DataAggregatorOpenFeignClient.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.feign; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; @@ -31,5 +32,5 @@ public interface DataAggregatorOpenFeignClient { * @return */ @PostMapping("data/aggregator/icuser/listByPolicyRules") - Result> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input); + Result> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input); } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java index b50b31441f..2cec07e6b3 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/feign/impl/DataAggregatorOpenFeignClientFallback.java @@ -1,9 +1,11 @@ package com.epmet.dataaggre.feign.impl; import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; @@ -19,7 +21,7 @@ public class DataAggregatorOpenFeignClientFallback implements DataAggregatorOpen } @Override - public Result listByPolicyRules(ResisByPolicyRulesFormDTO input) { + public Result> listByPolicyRules(ResisByPolicyRulesFormDTO input) { return ModuleUtils.feignConError(ServiceConstant.DATA_AGGREGATOR_SERVER, "listByPolicyRules", input); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 8e68a00431..32f41b81e4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.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; @@ -53,7 +54,7 @@ public class IcUserController { * @return */ @PostMapping("listByPolicyRules") - public Result> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { + public Result> listByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); @@ -77,9 +78,9 @@ public class IcUserController { return new Result().ok(new ArrayList<>()); } - List resis = icResiService.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, + PageData page = icResiService.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule); - return new Result>().ok(resis); + return new Result>().ok(page); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java index b15f39e5fc..ee9feb43c4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java @@ -1,7 +1,9 @@ package com.epmet.dataaggre.service; +import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; +import com.github.pagehelper.PageInfo; import java.util.List; import java.util.Set; @@ -18,7 +20,7 @@ public interface ResiService { * @param resiRule * @param houseRule */ - List listByPolicyRules( + PageData listByPolicyRules( String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, Integer pageNo, Integer pageSize, List resiRule, diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 1e81a3c520..178f70ead8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service.impl; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; @@ -10,6 +11,7 @@ import com.epmet.dataaggre.service.ResiService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dto.IcNeighborHoodDTO; +import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,7 +30,7 @@ public class ResiServiceImpl implements ResiService { private GovOrgService govOrgService; @Override - public List listByPolicyRules(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + public PageData listByPolicyRules(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, Integer pageNo, Integer pageSize, List resiRule, List houseRule, @@ -40,8 +42,9 @@ public class ResiServiceImpl implements ResiService { // 1.用户没配置house和stat规则，直接按照居民规则查询 if (CollectionUtils.isEmpty(houseRule) && CollectionUtils.isEmpty(statRule)) { - return epmetUserService.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, + List resis = epmetUserService.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, pageNo, pageSize, resiRule, null); + return new PageData<>(resis, new PageInfo(resis).getTotal()); } // 2.用户至少配置了house和stat规则的一个，那么就先查询房屋出来，然后根据房屋去找居民 @@ -80,7 +83,8 @@ public class ResiServiceImpl implements ResiService { // 补充额外信息 fillResisExtraInfoForPolicy(resultResis); - return resultResis; + // todo + return new PageData<>(resultResis, 100); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 651c9c806f..f5939ad993 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -125,7 +125,7 @@ and - ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.lastLogicalRel} + ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.nextLogicalRel} diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDetailDTO.java index 8a87279bcf..10e875d312 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDetailDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPolicyRuleDetailDTO.java @@ -49,7 +49,7 @@ public class IcPolicyRuleDetailDTO implements Serializable { /** * 与上一条的关系；and、or */ - private String lastLogicalRel; + private String nextLogicalRel; /** * 分组id；人员信息有值； diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java index d195372b96..11ff13ac65 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java @@ -38,7 +38,7 @@ public class HeartResisByPolicyRulesFormDTO { @Data public static class ResiRule { private String ruleDesc; - private String lastLogicalRel; + private String nextLogicalRel; private String itemGroupId; private String itemId; private String queryType; @@ -53,7 +53,7 @@ public class HeartResisByPolicyRulesFormDTO { private String colKey; private String colVal; private String ruleDesc; - private String lastLogicalRel; + private String nextLogicalRel; private String queryType; } @@ -61,7 +61,7 @@ public class HeartResisByPolicyRulesFormDTO { public static class StatRule { private String colKey; private String colVal; - private String lastLogicalRel; + private String nextLogicalRel; private String ruleDesc; private String queryType; private String colTable; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java index 2f9fd654a4..4437c9de35 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java @@ -31,7 +31,7 @@ public class ResisByPolicyRulesFormDTO { @Data public static class ResiRule { private String ruleDesc; - private String lastLogicalRel; + private String nextLogicalRel; private String itemGroupId; private String itemId; private String queryType; @@ -46,7 +46,7 @@ public class ResisByPolicyRulesFormDTO { private String colKey; private String colVal; private String ruleDesc; - private String lastLogicalRel; + private String nextLogicalRel; private String queryType; } @@ -54,7 +54,7 @@ public class ResisByPolicyRulesFormDTO { public static class StatRule { private String colKey; private String colVal; - private String lastLogicalRel; + private String nextLogicalRel; private String ruleDesc; private String queryType; private String colTable; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java index 313f70560b..2faa7c9b82 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/resi/ResiByPolicyInfoResultDTO.java @@ -4,18 +4,24 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.Date; + @Data @NoArgsConstructor @AllArgsConstructor public class ResiByPolicyInfoResultDTO { + private String icResiUserId; private String name; private String mobile; private String idCard; /** * 小区全名，包含小区前面的属性，比如网格等 */ - private String neighborhoodFullName; + private String gridId; + private String neighborhoodId; + private String neighborHoodName; private Integer age; + private Date birthday; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index a383b5ffd9..d8536ce6c2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -14,6 +14,7 @@ import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; +import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.service.IcPolicyService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -51,8 +52,8 @@ public class IcPolicyController { public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { // 调整错位的逻辑符号位置 //adjustMalpositionLogicalOperatorPosition(input); - icPolicyService.listResiUserByPolicyRules(input); - return null; + PageData page = icPolicyService.listResiUserByPolicyRules(input); + return new Result().ok(page); } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index b0f0fe2636..1b18091b4a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -47,5 +47,5 @@ public interface IcPolicyService extends BaseService { IcPolicyDTO policyDetail(String customerId,String policyId); - List listResiUserByPolicyRules(ResisByPolicyRulesFormDTO input); + PageData listResiUserByPolicyRules(ResisByPolicyRulesFormDTO input); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 2c05ac4565..3f959d9f2d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -315,7 +315,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl listResiUserByPolicyRules(com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO input) { + public PageData listResiUserByPolicyRules(com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO input) { String customerId = EpmetRequestHolder.getLoginUserCustomerId(); String ruleId = input.getRuleId(); @@ -367,9 +367,13 @@ public class IcPolicyServiceImpl extends BaseServiceImpl resis = getResultDataOrReturnNull(dataAggregatorOpenFeignClient.listByPolicyRules(aggForm), ServiceConstant.DATA_AGGREGATOR_SERVER); - return resis.stream() - .map((r) -> new ResiByPolicyInfoResultDTO(r.getName(), r.getMobile(), r.getIdCard(), r.getNeighborHoodName(), r.getAge())) + // 调用aggre服务查询结果 + Result> result = dataAggregatorOpenFeignClient.listByPolicyRules(aggForm); + List list = result.getData().getList().stream() + .map((r) -> new ResiByPolicyInfoResultDTO(r.getIcResiUserId() ,r.getName(), r.getMobile(), r.getIdCard(), r.getGridId() + ,r.getNeighborhoodId(), r.getNeighborHoodName(), r.getAge(), r.getBirthday())) .collect(Collectors.toList()); + + return new PageData(list, result.getData().getTotal()); } } \ No newline at end of file From 85fcaefbc30cc9a55e8047e79441c67012def8be Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 15:22:57 +0800 Subject: [PATCH 060/288] update --- .../service/impl/IcPolicyServiceImpl.java | 24 ++++++++----------- .../main/resources/mapper/IcPolicyRuleDao.xml | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 2c05ac4565..0745a52db3 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -4,22 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.ServiceConstant; -import com.epmet.commons.tools.feign.ResultDataResolver; -import com.epmet.commons.tools.utils.EpmetRequestHolder; -import com.epmet.commons.tools.utils.Result; -import com.epmet.dao.IcPolicyDao; -import com.epmet.dao.IcPolicyRuleDetailDao; -import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; -import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.DictTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.feign.ResultDataResolver; import com.epmet.commons.tools.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.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.*; @@ -28,14 +23,12 @@ import com.epmet.dataaggre.feign.DataAggregatorOpenFeignClient; import com.epmet.dto.IcPolicyCategoryDTO; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; -import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; -import com.epmet.entity.IcPolicyEntity; -import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO; import com.epmet.dto.form.policy.IcPolicyRuleFormDTO; +import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.*; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.IcPolicyService; @@ -48,7 +41,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.stream.Collectors; /** @@ -116,13 +112,13 @@ public class IcPolicyServiceImpl extends BaseServiceImpl - delete from ic_policy_rule where IC_POLICY_ID=#{policyId} + delete from ic_policy_rule where IC_POLICY_ID = #{policyId} \ No newline at end of file From 13eb83e678b13488b18f9342736fdc93bf5543f2 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Jul 2022 15:24:04 +0800 Subject: [PATCH 061/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/IcPolicyServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 3f959d9f2d..22dbcb1c4d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -326,6 +326,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper(); query.eq(IcPolicyRuleDetailEntity::getCustomerId, customerId); query.eq(IcPolicyRuleDetailEntity::getRuleId, ruleId); + query.orderByAsc(IcPolicyRuleDetailEntity::getSort); List rules = policyRuleDetailDao.selectList(query); // 将查询出的数据转化成aggre服务能接受的格式 From 6648d840736728981f443526d3eaa06ca5b63f7a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 20 Jul 2022 15:58:41 +0800 Subject: [PATCH 062/288] detail --- .../epmet/service/impl/IcPolicyServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index b4e99c7588..c8f3edeae9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -3,7 +3,6 @@ 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.Constant; -import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.FileCommonDTO; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -281,6 +280,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl ruleDetailWrapper = new LambdaQueryWrapper<>(); ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) .eq(IcPolicyRuleDetailEntity::getGroupType, "resi") @@ -289,19 +289,22 @@ public class IcPolicyServiceImpl extends BaseServiceImpl resiRuleList = CollectionUtils.isNotEmpty(resiList) ? ConvertUtils.sourceToTarget(resiList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); rule.setResiRuleList(resiRuleList); - ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) + //房屋信息 + LambdaQueryWrapper houseDetailWrapper = new LambdaQueryWrapper<>(); + houseDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) .eq(IcPolicyRuleDetailEntity::getGroupType, "house") .orderByAsc(IcPolicyRuleDetailEntity::getSort); - List houseList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); + List houseList = icPolicyRuleDetailDao.selectList(houseDetailWrapper); List houseRuleList = CollectionUtils.isNotEmpty(houseList) ? ConvertUtils.sourceToTarget(houseList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); rule.setHouseRuleList(houseRuleList); - ruleDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) + //统计信息 + LambdaQueryWrapper statDetailWrapper = new LambdaQueryWrapper<>(); + statDetailWrapper.eq(IcPolicyRuleDetailEntity::getRuleId, rule.getId()) .eq(IcPolicyRuleDetailEntity::getGroupType, "stat") .orderByAsc(IcPolicyRuleDetailEntity::getSort); - List statList = icPolicyRuleDetailDao.selectList(ruleDetailWrapper); + List statList = icPolicyRuleDetailDao.selectList(statDetailWrapper); List statRuleList = CollectionUtils.isNotEmpty(statList) ? ConvertUtils.sourceToTarget(statList, IcPolicyRuleDetailDTO.class) : new ArrayList<>(); - ; rule.setStatRuleList(statRuleList); } } From 41b65f9d34ab3147d4960151c3181ecfeadb8345 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 20 Jul 2022 16:15:10 +0800 Subject: [PATCH 063/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E9=A2=84=E8=A7=88=E5=88=97=E8=A1=A8=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E5=BA=94=E8=AF=A5=E5=B7=AE=E4=B8=8D=E5=A4=9A=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/epmetuser/IcResiUserDao.java | 17 ++++++++ .../service/epmetuser/EpmetUserService.java | 4 ++ .../epmetuser/impl/EpmetUserServiceImpl.java | 5 +++ .../service/impl/ResiServiceImpl.java | 33 +++++++++------- .../mapper/epmetuser/IcResiUserDao.xml | 39 ++++++++++++------- 5 files changed, 72 insertions(+), 26 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index dfbf64daaa..5dd78f714c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -79,4 +79,21 @@ public interface IcResiUserDao extends BaseDao { @Param("name") String name, @Param("resiRules") List resiRule, @Param("houseIds") List houseIds); + + /** + * 政策查找居民 + * @param houseIds + * @return + */ + Integer getTotalByPolicyRules(@Param("customerId") String customerId, + @Param("orgId") String orgId, + @Param("orgType") String orgType, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId, + @Param("unitId") String unitId, + @Param("houseId") String houseId, + @Param("idCard") String idCard, + @Param("name") String name, + @Param("resiRules") List resiRule, + @Param("houseIds") List houseIds); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 5a095d6e2f..ca91cd86e7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -204,4 +204,8 @@ public interface EpmetUserService { List listByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, Integer pageNo, Integer pageSize, List resiRule, List houseIds); + + Integer getTotalByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + String houseId, String idCard, String name, + List resiRule, List houseIds); } 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 2166db1e3d..267af969ea 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 @@ -851,4 +851,9 @@ public class EpmetUserServiceImpl implements EpmetUserService { return icResiUserDao.listByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds); } + + @Override + public Integer getTotalByPolicyRules(String customerId, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, List resiRule, List houseIds) { + return icResiUserDao.getTotalByPolicyRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 178f70ead8..09097b559c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -48,7 +48,8 @@ public class ResiServiceImpl implements ResiService { } // 2.用户至少配置了house和stat规则的一个，那么就先查询房屋出来，然后根据房屋去找居民 - int housePageNo = 0; + int housePageNo = 1; + int total = 0; do { // 拿到房屋id列表，去查询居民列表 List houseEntities = govOrgService.listHousesByRules(customerId, orgId, orgType, neighborHoodId, buildingId, unitId, @@ -60,19 +61,22 @@ public class ResiServiceImpl implements ResiService { break; } - // 查询居民 - List resis = epmetUserService.listByPolicyRules( - customerId, orgId, orgType, neighborHoodId, buildingId, unitId, - houseId, idCard, name, pageNo, pageSize, resiRule, houseIds); - - resultResis.addAll(resis); + // 查询居民，满了20个，不再查询数据,只查询数量 + if (resultResis.size() < pageSize) { + List resis = epmetUserService.listByPolicyRules( + customerId, orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, pageNo, pageSize, resiRule, houseIds); - // 满了20个，或者查不到居民和房屋了(数据空了)，则跳出 - // 没有用house的条件，没有循环的必要，查一次居民信息即可，跳出 - if (resultResis.size() >= pageSize) { - break; + resultResis.addAll(resis); } + // 查询数量 + Integer count = epmetUserService.getTotalByPolicyRules( + customerId, orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, resiRule, houseIds); + + total += count; + housePageNo ++; } while (true); @@ -83,8 +87,7 @@ public class ResiServiceImpl implements ResiService { // 补充额外信息 fillResisExtraInfoForPolicy(resultResis); - // todo - return new PageData<>(resultResis, 100); + return new PageData<>(resultResis, total); } /** @@ -92,6 +95,10 @@ public class ResiServiceImpl implements ResiService { * @param resultResis */ private void fillResisExtraInfoForPolicy(List resultResis) { + if (CollectionUtils.isEmpty(resultResis)) { + return; + } + List gridIds = new ArrayList<>(); List neighborhoodIds = new ArrayList<>(); resultResis.stream().forEach((r) -> { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index f5939ad993..f0c98c7732 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -69,19 +69,7 @@ and resi.STATUS='0' - - + select `ID` as icResiUserId, + `GRID_ID`, + `NAME`, + `MOBILE`, + `ID_CARD`, + `VILLAGE_ID` as neighborhoodId, + `BIRTHDAY` + from ic_resi_user + + inner join #{rule.colTable} + + + + + From f1eb322a40a9155a1f6ba545596e758987d0a1c0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 Jul 2022 09:03:12 +0800 Subject: [PATCH 064/288] guoqi --- .../src/main/resources/mapper/IcPolicyDao.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml index 9ab37dc06a..0bf133236c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml @@ -53,8 +53,8 @@ ip.TITLE, ip.CONTENT, ( - case when ip.END_DATE < now() then '1' - when ip.END_DATE >= now() then '0' + case when ip.END_DATE < DATE_FORMAT(now(),'%Y-%m-%d') then '1' + when ip.END_DATE >= DATE_FORMAT(now(),'%Y-%m-%d') then '0' end )as expiredFlag FROM @@ -70,10 +70,10 @@ and ip.CONTENT like concat('%',#{content},'%') - and ip.END_DATE < now() + and ip.END_DATE < DATE_FORMAT(now(),'%Y-%m-%d') - and ip.END_DATE >= now() + and ip.END_DATE >= DATE_FORMAT(now(),'%Y-%m-%d') order by ip.CREATED_TIME desc From 50d02c096615b2c5b4c6731e15a414fbad70afe3 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 21 Jul 2022 09:25:29 +0800 Subject: [PATCH 065/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=AF=BC=E5=87=BA=EF=BC=8C=E5=81=9A=E4=BA=86?= =?UTF-8?q?=E4=B8=80=E5=8D=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/ResisByPolicyRulesFormDTO.java | 6 +- .../data-aggregator-server/pom.xml | 5 ++ .../controller/IcUserController.java | 20 ++++++ .../dataaggre/excel/ResisByPolicyExcel.java | 21 +++++++ .../epmet/dataaggre/service/ResiService.java | 23 +++++++ .../service/impl/ResiServiceImpl.java | 62 ++++++++++++++++++- .../form/resi/ResisByPolicyRulesFormDTO.java | 15 ++++- .../feign/EpmetHeartOpenFeignClient.java | 8 +++ .../EpmetHeartOpenFeignClientFallback.java | 5 ++ .../epmet/controller/IcPolicyController.java | 55 ++++++++++++++++ .../com/epmet/service/IcPolicyService.java | 10 +++ .../service/impl/IcPolicyServiceImpl.java | 22 ++++--- 12 files changed, 238 insertions(+), 14 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/ResisByPolicyExcel.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java index ea4bd8cb0a..e89f1131cf 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/ResisByPolicyRulesFormDTO.java @@ -24,10 +24,12 @@ public class ResisByPolicyRulesFormDTO { private String mobile; private String idCard; private RuleList ruleList = new RuleList(); - private Integer pageNo; - private Integer pageSize; + private Integer pageNo = 1; + private Integer pageSize = 20; @Data + @NoArgsConstructor + @AllArgsConstructor public static class RuleList { private String ruleName; private List resiRule; diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 4cc34ba06f..efa4bca631 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -13,6 +13,11 @@ data-aggregator-server + + com.epmet + epmet-heart-client + 2.0.0 + com.epmet epmet-commons-tools diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 32f41b81e4..23b6e5f4ec 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -2,6 +2,8 @@ package com.epmet.dataaggre.controller; import com.epmet.commons.tools.annotation.LoginUser; +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; @@ -19,6 +21,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -83,4 +87,20 @@ public class IcUserController { return new Result>().ok(page); } + /** + * 导出政策查找到的居民 + * @param input + */ + @PostMapping("exportByPolicy") + public void exportResisByPolicy(@RequestBody ResisByPolicyRulesFormDTO input, HttpServletResponse response) { + try { + icResiService.exportResisByPolicy( + input.getOrgId(), input.getOrgType(), input.getNeighborHoodId(), input.getBuildingId(), input.getUnitId(), + input.getHouseId(), input.getIdCard(), input.getName(), input.getPageNo(), input.getPageSize(), + input.getRuleId(), input.getRuleList().getResiRule(), input.getRuleList().getHouseRule(), input.getRuleList().getStatRule(), response); + } catch (IOException e) { + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "导出Excel文件失败", "导出Excel文件失败"); + } + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/ResisByPolicyExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/ResisByPolicyExcel.java new file mode 100644 index 0000000000..e5cb9b5022 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/ResisByPolicyExcel.java @@ -0,0 +1,21 @@ +package com.epmet.dataaggre.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import lombok.Data; + +@Data +public class ResisByPolicyExcel { + @ExcelProperty("姓名") + private String name; + @ExcelProperty("手机号") + private String mobile; + @ExcelProperty("身份证号") + private String idCard; + /** + * 小区全名，包含小区前面的属性，比如网格等 + */ + @ExcelProperty("小区名") + private String neighborHoodName; + @ExcelProperty("年龄") + private Integer age; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java index ee9feb43c4..f160f4a8f3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java @@ -5,6 +5,8 @@ import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.github.pagehelper.PageInfo; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.util.List; import java.util.Set; @@ -26,4 +28,25 @@ public interface ResiService { List resiRule, List houseRule, List statRule); + + /** + * 政策找居民导出 + * @param orgId + * @param orgType + * @param neighborHoodId + * @param buildingId + * @param unitId + * @param houseId + * @param idCard + * @param name + * @param pageNo + * @param pageSize + * @param ruleId + */ + void exportResisByPolicy(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + String ruleId, List resiRule, + List houseRule, + List statRule, + HttpServletResponse response) throws IOException; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 09097b559c..b0de4560f1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -1,27 +1,43 @@ package com.epmet.dataaggre.service.impl; +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.excel.EasyExcel; +import com.alibaba.excel.ExcelWriter; +import com.alibaba.excel.support.ExcelTypeEnum; +import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +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.feign.ResultDataResolver; 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.Result; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO; import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dataaggre.excel.ResisByPolicyExcel; import com.epmet.dataaggre.service.ResiService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dto.IcNeighborHoodDTO; +import com.epmet.feign.EpmetHeartOpenFeignClient; import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import javax.servlet.ServletOutputStream; +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; import java.time.*; import java.util.*; import java.util.stream.Collectors; @Service -public class ResiServiceImpl implements ResiService { +public class ResiServiceImpl implements ResiService, ResultDataResolver { @Autowired private EpmetUserService epmetUserService; @@ -29,6 +45,9 @@ public class ResiServiceImpl implements ResiService { @Autowired private GovOrgService govOrgService; + @Autowired + private EpmetHeartOpenFeignClient heartOpenFeignClient; + @Override public PageData listByPolicyRules(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, Integer pageNo, Integer pageSize, @@ -132,4 +151,45 @@ public class ResiServiceImpl implements ResiService { }); } + @Override + public void exportResisByPolicy(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, + String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + String ruleId, List resiRule, + List houseRule, + List statRule, + HttpServletResponse response) throws IOException { + + if (StringUtils.isNotBlank(ruleId)) { + // 从heart取，覆盖形参 + com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO.RuleList ruleList = getResultDataOrThrowsException( + heartOpenFeignClient.listPolicyRules4QueryAndExport(ruleId), + ServiceConstant.EPMET_HEART_SERVER, + EpmetErrorCode.SERVER_ERROR.getCode(), + null, null); + + resiRule = ConvertUtils.sourceToTarget(ruleList.getResiRule(), ResisByPolicyRulesFormDTO.ResiRule.class); + houseRule = ConvertUtils.sourceToTarget(ruleList.getHouseRule(), ResisByPolicyRulesFormDTO.HouseRule.class); + statRule = ConvertUtils.sourceToTarget(ruleList.getStatRule(), ResisByPolicyRulesFormDTO.StatRule.class); + } + + ServletOutputStream ostream = response.getOutputStream(); + ExcelWriterSheetBuilder sheetBuilder = EasyExcel.write(ostream, ResisByPolicyExcel.class).sheet("居民列表"); + + // 循环填充数据 + do { + PageData resis = this.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule); + List list = resis.getList(); + List excelDatas = ConvertUtils.sourceToTarget(list, ResisByPolicyExcel.class); + if (CollectionUtils.isEmpty(excelDatas)) { + break; + } + //sheetBuilder.write(excelDatas); + } while (true); + + + + System.out.println(666); + + } } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java index 4437c9de35..9522159e12 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/ResisByPolicyRulesFormDTO.java @@ -1,10 +1,14 @@ package com.epmet.dto.form.resi; +import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.List; @Data +@NoArgsConstructor +@AllArgsConstructor public class ResisByPolicyRulesFormDTO { private String ruleId; private String orgId; @@ -16,19 +20,22 @@ public class ResisByPolicyRulesFormDTO { private String name; private String mobile; private String idCard; - private RuleList ruleList; + private RuleList ruleList = new RuleList(); private Integer pageNo; private Integer pageSize; @Data + @NoArgsConstructor + @AllArgsConstructor public static class RuleList { - private String ruleName; private List resiRule; private List houseRule; private List statRule; } @Data + @NoArgsConstructor + @AllArgsConstructor public static class ResiRule { private String ruleDesc; private String nextLogicalRel; @@ -41,6 +48,8 @@ public class ResisByPolicyRulesFormDTO { } @Data + @NoArgsConstructor + @AllArgsConstructor public static class HouseRule { private String colTable; private String colKey; @@ -51,6 +60,8 @@ public class ResisByPolicyRulesFormDTO { } @Data + @NoArgsConstructor + @AllArgsConstructor public static class StatRule { private String colKey; private String colVal; diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index f3c8430b3e..9939b88455 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -14,6 +14,7 @@ import com.epmet.dto.form.demand.DemandRecId; import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; +import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; @@ -158,4 +159,11 @@ public interface EpmetHeartOpenFeignClient { @PostMapping("/heart/resi/volunteer/addVolunteer") Result addVolunteer(@RequestBody ResiVolunteerAuthenticateFormDTO formDTO); + + /** + * 为预览和导出提供规则列表查询 + * @return + */ + @PostMapping("/heart/policy/rules4ResiListAndExport/{ruleId}") + Result listPolicyRules4QueryAndExport(@PathVariable("ruleId") String ruleId); } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index 10670de1ab..815bfab92c 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java @@ -16,6 +16,7 @@ import com.epmet.dto.form.demand.IcEventCommentToDemandFromDTO; import com.epmet.dto.form.demand.ServiceItemSelectFormDTO; import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; +import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.form.resi.VolunteerCommonFormDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; @@ -161,4 +162,8 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "addVolunteer", formDTO); } + @Override + public Result listPolicyRules4QueryAndExport(String ruleId) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "listPolicyRules4QueryAndExport", ruleId); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index d8536ce6c2..ad21eb16e4 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -1,5 +1,6 @@ package com.epmet.controller; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.dto.form.PageFormDTO; @@ -15,12 +16,15 @@ import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; +import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.service.IcPolicyService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; /** @@ -48,6 +52,11 @@ public class IcPolicyController { return new Result>().ok(list); } + /** + * 政策找人，居民列表 + * @param input + * @return + */ @PostMapping("resiuserlist") public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { // 调整错位的逻辑符号位置 @@ -162,4 +171,50 @@ public class IcPolicyController { public Result policyDetail(@LoginUser TokenDto tokenDto,@PathVariable("policyId") String policyId) { return new Result().ok(icPolicyService.policyDetail(tokenDto.getCustomerId(),policyId)); } + + /** + * 为预览和导出提供规则列表查询 + * @return + */ + @PostMapping("rules4ResiListAndExport/{ruleId}") + public Result listPolicyRules4QueryAndExport(@PathVariable("ruleId") String ruleId) { + Map> ruleMap = icPolicyService.listPolicyRules4QueryAndExport(EpmetRequestHolder.getLoginUserCustomerId(), ruleId); + ResisByPolicyRulesFormDTO.RuleList data = new ResisByPolicyRulesFormDTO.RuleList(); + // resi规则 + List originResiRules = ruleMap.get("resi"); + if (CollectionUtils.isNotEmpty(originResiRules)) { + List resiRules = originResiRules + .stream() + .map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getNextLogicalRel(), r.getItemGroupId(), + r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal())) + .collect(Collectors.toList()); + + data.setResiRule(resiRules); + } + + // house规则 + List originHouseRules = ruleMap.get("house"); + if (CollectionUtils.isNotEmpty(originHouseRules)) { + List houseRules = originHouseRules + .stream() + .map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(), + r.getRuleDesc(), r.getNextLogicalRel(), r.getQueryType())) + .collect(Collectors.toList()); + data.setHouseRule(houseRules); + } + + // stat规则 + List originStatRules = ruleMap.get("stat"); + if (CollectionUtils.isNotEmpty(originStatRules)) { + List statRules = originStatRules + .stream() + .map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getNextLogicalRel(), + r.getRuleDesc(), r.getQueryType(), r.getColTable())) + .collect(Collectors.toList()); + + data.setStatRule(statRules); + } + + return new Result().ok(data); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index 1b18091b4a..e9e71b24af 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -10,8 +10,10 @@ import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.IcPolicyEntity; +import com.epmet.entity.IcPolicyRuleDetailEntity; import java.util.List; +import java.util.Map; /** * 政策表 @@ -48,4 +50,12 @@ public interface IcPolicyService extends BaseService { IcPolicyDTO policyDetail(String customerId,String policyId); PageData listResiUserByPolicyRules(ResisByPolicyRulesFormDTO input); + + /** + * 政策规则查询 + * @param customerId + * @param ruleId + * @return + */ + Map> listPolicyRules4QueryAndExport(String customerId, String ruleId); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index c8f3edeae9..2fc323a951 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -322,15 +322,7 @@ public class IcPolicyServiceImpl extends BaseServiceImpl query = new LambdaQueryWrapper(); - query.eq(IcPolicyRuleDetailEntity::getCustomerId, customerId); - query.eq(IcPolicyRuleDetailEntity::getRuleId, ruleId); - query.orderByAsc(IcPolicyRuleDetailEntity::getSort); - List rules = policyRuleDetailDao.selectList(query); - - // 将查询出的数据转化成aggre服务能接受的格式 - Map> ruleMap = rules.stream().collect(Collectors.groupingBy(IcPolicyRuleDetailEntity::getGroupType, Collectors.toList())); - + Map> ruleMap = listPolicyRules4QueryAndExport(customerId, ruleId); // resi规则 List originResiRules = ruleMap.get("resi"); if (CollectionUtils.isNotEmpty(originResiRules)) { @@ -376,4 +368,16 @@ public class IcPolicyServiceImpl extends BaseServiceImpl(list, result.getData().getTotal()); } + + public Map> listPolicyRules4QueryAndExport(String customerId, String ruleId) { + ResisByPolicyRulesFormDTO form = new ResisByPolicyRulesFormDTO(); + LambdaQueryWrapper query = new LambdaQueryWrapper(); + query.eq(IcPolicyRuleDetailEntity::getCustomerId, customerId); + query.eq(IcPolicyRuleDetailEntity::getRuleId, ruleId); + query.orderByAsc(IcPolicyRuleDetailEntity::getSort); + List rules = policyRuleDetailDao.selectList(query); + + // 将查询出的数据转化成aggre服务能接受的格式 + return rules.stream().collect(Collectors.groupingBy(IcPolicyRuleDetailEntity::getGroupType, Collectors.toList())); + } } \ No newline at end of file From c59cdc216376e07b74fc3224be0a6d8ce3a637bd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 21 Jul 2022 09:26:29 +0800 Subject: [PATCH 066/288] list --- .../dto/form/policy/IcPolicyPageFormDTO.java | 2 -- .../src/main/java/com/epmet/dao/IcPolicyDao.java | 7 +++++-- .../epmet/service/impl/IcPolicyServiceImpl.java | 3 +-- .../src/main/resources/mapper/IcPolicyDao.xml | 15 +++++++++------ 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java index c1b3591b7c..0db60d639a 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java @@ -33,7 +33,5 @@ public class IcPolicyPageFormDTO extends PageFormDTO implements Serializable { */ private String expiredFlag; - private String agencyId; - } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java index d2e34e23f4..7738a3f38e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/dao/IcPolicyDao.java @@ -3,7 +3,6 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; -import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.entity.IcPolicyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -27,5 +26,9 @@ public interface IcPolicyDao extends BaseDao { */ List selectItemList(@Param("customerId") String customerId, @Param("groupType") String groupType); - List policyList(IcPolicyPageFormDTO formDTO); + List policyList(@Param("customerId")String customerId, + @Param("agencyId")String agencyId, + @Param("title")String title, + @Param("content")String content, + @Param("expiredFlag")String expiredFlag); } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index c8f3edeae9..951cd33f76 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -232,9 +232,8 @@ public class IcPolicyServiceImpl extends BaseServiceImpl list = baseDao.policyList(formDTO); + List list = baseDao.policyList(formDTO.getCustomerId(),staffInfo.getAgencyId(),formDTO.getTitle(),formDTO.getContent(),formDTO.getExpiredFlag()); if (CollectionUtils.isNotEmpty(list)) { for (IcPolicyDTO icPolicyDTO : list) { // 查询字典表 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml index 0bf133236c..57fdfd27cd 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcPolicyDao.xml @@ -43,7 +43,7 @@ order by i.SORT asc - SELECT ip.id AS POLICY_ID, ip.ORG_ID, @@ -69,11 +69,14 @@ and ip.CONTENT like concat('%',#{content},'%') - - and ip.END_DATE < DATE_FORMAT(now(),'%Y-%m-%d') - - - and ip.END_DATE >= DATE_FORMAT(now(),'%Y-%m-%d') + + and 1=1 + + and ip.END_DATE < DATE_FORMAT(now(),'%Y-%m-%d') + + + and ip.END_DATE >= DATE_FORMAT(now(),'%Y-%m-%d') + order by ip.CREATED_TIME desc From 645b0a3101ffa0c8fdeb6bb6f5978190f3c1b055 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 21 Jul 2022 09:53:53 +0800 Subject: [PATCH 067/288] =?UTF-8?q?=E6=94=BF=E7=AD=96=E4=BE=9D=E6=8D=AE?= =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/policy/IcPolicyPageFormDTO.java | 1 + .../com/epmet/controller/IcPolicyController.java | 16 ++++++++++++++-- .../java/com/epmet/service/IcPolicyService.java | 8 ++++++++ .../epmet/service/impl/IcPolicyServiceImpl.java | 10 ++++++++++ .../resources/mapper/IcServiceRecordV2Dao.xml | 2 +- 5 files changed, 34 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java index 0db60d639a..01cf09cfbf 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyPageFormDTO.java @@ -32,6 +32,7 @@ public class IcPolicyPageFormDTO extends PageFormDTO implements Serializable { * 是否过期；1：已过期；0：未过期 */ private String expiredFlag; + private String agencyId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index ad21eb16e4..7b604b4ba8 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -10,7 +10,6 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcPolicyDTO; import com.epmet.dto.IcPolicyItemResultDTO; -import com.epmet.dto.form.resi.HeartResisByPolicyRulesFormDTO; import com.epmet.dto.IcPolicyRuleDTO; import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; @@ -18,7 +17,6 @@ import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.service.IcPolicyService; -import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -145,6 +143,20 @@ public class IcPolicyController { return new Result>().ok(page); } + /** + * Desc: 政策列表下拉选 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/7/21 09:48 + */ + @PostMapping("policyListSelect") + public Result> policyListSelect(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyPageFormDTO formDTO){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + return new Result>().ok(icPolicyService.policyListSelect(formDTO)); + } + /** * 细则列表 * @param customerId diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index e9e71b24af..a392aced64 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -45,6 +45,14 @@ public interface IcPolicyService extends BaseService { */ PageData policyList(IcPolicyPageFormDTO formDTO); + /** + * Desc: 政策列表下拉选 + * @param formDTO + * @author zxc + * @date 2022/7/21 09:48 + */ + List policyListSelect(IcPolicyPageFormDTO formDTO); + List ruleList(String customerId,String policyId); IcPolicyDTO policyDetail(String customerId,String policyId); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 31b7ccb20e..65824d663b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -246,6 +246,16 @@ public class IcPolicyServiceImpl extends BaseServiceImpl(list, pageInfo.getTotal()); } + @Override + public List policyListSelect(IcPolicyPageFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + return baseDao.policyList(formDTO.getCustomerId(), formDTO.getAgencyId(), null,null,null); + } + @Override public List ruleList(String customerId, String policyId) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml index 7c8a86b911..1eae34fe2e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml @@ -16,7 +16,7 @@ sr.SERVICE_STATUS, IFNULL(sf.SERVICE_PEOPLE_NUMBER,0) AS servicePeopleNumber FROM ic_service_record_v2 sr - INNER JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0 + left JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0 INNER JOIN ic_service_scope_v2 ss ON ss.SERVICE_RECORD_ID = sr.ID AND ss.DEL_FLAG = '0' WHERE sr.DEL_FLAG = '0' AND ss.OBJECT_ID_PATH LIKE concat('%',#{orgId},'%') From 433b8c9194ba40cd43161c1f5cd6fda82b906c69 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 21 Jul 2022 10:01:01 +0800 Subject: [PATCH 068/288] =?UTF-8?q?=E7=BC=96=E8=AF=91=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcPolicyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 7b604b4ba8..31003e4e31 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -1,11 +1,10 @@ package com.epmet.controller; -import com.epmet.commons.tools.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dto.IcPolicyDTO; @@ -17,6 +16,7 @@ import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.IcPolicyRuleDetailEntity; import com.epmet.service.IcPolicyService; +import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; From bca00f802799728f7e917a465999673808e638b3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 21 Jul 2022 10:11:46 +0800 Subject: [PATCH 069/288] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/IcPolicyController.java | 6 ++---- .../src/main/java/com/epmet/service/IcPolicyService.java | 2 +- .../java/com/epmet/service/impl/IcPolicyServiceImpl.java | 7 +++---- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 31003e4e31..f27d291844 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -151,10 +151,8 @@ public class IcPolicyController { * @date 2022/7/21 09:48 */ @PostMapping("policyListSelect") - public Result> policyListSelect(@LoginUser TokenDto tokenDto, @RequestBody IcPolicyPageFormDTO formDTO){ - formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setStaffId(tokenDto.getUserId()); - return new Result>().ok(icPolicyService.policyListSelect(formDTO)); + public Result> policyListSelect(@LoginUser TokenDto tokenDto){ + return new Result>().ok(icPolicyService.policyListSelect(tokenDto.getUserId(),tokenDto.getCustomerId())); } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index a392aced64..d57a6ca886 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -51,7 +51,7 @@ public interface IcPolicyService extends BaseService { * @author zxc * @date 2022/7/21 09:48 */ - List policyListSelect(IcPolicyPageFormDTO formDTO); + List policyListSelect(String userId,String customerId); List ruleList(String customerId,String policyId); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 65824d663b..77900d2519 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -247,13 +247,12 @@ public class IcPolicyServiceImpl extends BaseServiceImpl policyListSelect(IcPolicyPageFormDTO formDTO) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + public List policyListSelect(String userId,String customerId) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, userId); if (null == staffInfo || StringUtils.isBlank(staffInfo.getAgencyId())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "工作人员缓存信息异常", "工作人员信息异常"); } - formDTO.setAgencyId(staffInfo.getAgencyId()); - return baseDao.policyList(formDTO.getCustomerId(), formDTO.getAgencyId(), null,null,null); + return baseDao.policyList(customerId, staffInfo.getAgencyId(), null,null,null); } @Override From 6462848d98cff2a2f2945064a54a16f2aa24400c Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 21 Jul 2022 10:15:23 +0800 Subject: [PATCH 070/288] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcServiceRecordV2Dao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml index 1eae34fe2e..15696d8d2b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml @@ -6,7 +6,7 @@ From c7177fd6ccfa70413b0da22bea0baa65a05f1d6a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 21 Jul 2022 17:13:11 +0800 Subject: [PATCH 090/288] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E7=9B=B8=E5=85=B3?= =?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/service/impl/IcUserTransferRecordServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java index 5c3bada17e..2428c39fda 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcUserTransferRecordServiceImpl.java @@ -144,7 +144,7 @@ public class IcUserTransferRecordServiceImpl extends BaseServiceImpl Date: Thu, 21 Jul 2022 17:19:14 +0800 Subject: [PATCH 091/288] policy --- .../db/migration/V0.0.24__ic_policy.sql | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql new file mode 100644 index 0000000000..86d1472abb --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql @@ -0,0 +1,102 @@ +CREATE TABLE `ic_policy` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `ORG_ID` varchar(64) NOT NULL COMMENT '政策创建人，所属组织id', + `ORG_ID_PATH` varchar(255) NOT NULL COMMENT 'AGENCY_ID的全路径，含agency_id', + `POLICY_LEVEL` varchar(1) NOT NULL COMMENT '政策级别，0市级；1区级；2街道级', + `START_DATE` date NOT NULL COMMENT '生效起止日期', + `END_DATE` date NOT NULL COMMENT '截止日期', + `TITLE` varchar(128) NOT NULL COMMENT '政策标题', + `CONTENT` varchar(2048) NOT NULL COMMENT '政策内容', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识 0.未删除 1.已删除', + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='政策表'; + + +CREATE TABLE `ic_policy_category` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `IC_POLICY_ID` varchar(64) NOT NULL COMMENT '政策id', + `CATEGORY_CODE` varchar(64) NOT NULL COMMENT '分类编码', + `CODE_PATH` varchar(128) NOT NULL COMMENT '分类全路径,包含CATEGORY_CODE,英文逗号隔开', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) 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`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='政策匹配资源类型'; + +CREATE TABLE `ic_policy_rule` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `IC_POLICY_ID` varchar(64) NOT NULL COMMENT '政策id', + `RULE_NAME` varchar(128) NOT NULL COMMENT '规则名称', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) 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`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='政策匹配规则'; + + +CREATE TABLE `ic_policy_rule_detail` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `IC_POLICY_ID` varchar(64) NOT NULL COMMENT '政策id', + `RULE_ID` varchar(32) NOT NULL COMMENT '规则id', + `RULE_DESC` varchar(512) DEFAULT NULL COMMENT '规则描述文字，例如：基础信息性别等于女', + `GROUP_TYPE` varchar(10) NOT NULL COMMENT 'resi:人员信息,house:房屋信息，stat:统计信息', + `NEXT_LOGICAL_REL` varchar(4) DEFAULT NULL COMMENT '与下一条的关系；and、or', + `ITEM_GROUP_ID` varchar(64) DEFAULT NULL COMMENT '分组id；人员信息有值；', + `ITEM_ID` varchar(64) DEFAULT NULL COMMENT '组件id；人员信息有值；', + `COL_TABLE` varchar(64) DEFAULT NULL COMMENT '表名；人员信息有值；房屋信息也有值', + `QUERY_TYPE` varchar(32) NOT NULL COMMENT '查询类型：等于、不等于....;来源于字典表sql_query_type', + `COL_KEY` varchar(32) NOT NULL COMMENT '人员信息存储组件对应的列名；房屋信息存储ic_house表的列名；统计信息应该是定义到字典表，这里存储字典key就行吧', + `COL_VAL` varchar(512) NOT NULL COMMENT '参数值', + `SORT` int(1) NOT NULL COMMENT '排序字段;同一group_type升序', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) 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 '更新时间', + `ITEM_GROUP_NAME` varchar(64) DEFAULT NULL COMMENT '用于前端展示：基础信息、教育信息、房屋类型.....', + `ITEM_LABEL` varchar(64) DEFAULT NULL COMMENT '用于前端展示：姓名、手机号、......', + `QUERY_TYPE_NAME` varchar(64) DEFAULT NULL COMMENT '用于前端展示：等于、不等于、大于、小于....', + `COL_VAL_LABEL` varchar(64) DEFAULT NULL COMMENT '用于前端展示：参数值显示值eg:男女', + `NEXT_LOGICAL_REL_NAME` varchar(32) DEFAULT NULL COMMENT '用于前端展示：逻辑：并且、或者', + PRIMARY KEY (`ID`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='政策匹配规则明细'; + + +CREATE TABLE `ic_policy_item` ( + `ID` varchar(64) NOT NULL, + `CUSTOMER_ID` varchar(64) NOT NULL, + `GROUP_TYPE` varchar(10) NOT NULL COMMENT 'house:房屋信息，stat:统计信息', + `LABEL` varchar(255) NOT NULL COMMENT '选项名；例如：房屋类型，房屋状态，人均收入', + `COL_KEY` varchar(64) NOT NULL COMMENT '房屋信息存储列名；统计信息定义好key放在这里', + `ITEM_TYPE` varchar(64) NOT NULL, + `TABLE_NAME` varchar(64) DEFAULT NULL COMMENT '表名', + `SORT` int(11) NOT NULL COMMENT '排序', + `REMARK` varchar(255) DEFAULT NULL COMMENT '备注', + `OPTION_SOURCE_TYPE` varchar(10) DEFAULT NULL COMMENT '值来源;需要接口获取：remote。', + `OPTION_SOURCE_URL` varchar(128) DEFAULT NULL COMMENT '动态url；', + `OPTION_SOURCE_PARAM` varchar(255) DEFAULT NULL COMMENT '动态url的入参；存储json串', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) 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`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='政策找人规则组件表'; \ No newline at end of file From 9532f7db7ad8a2b68a1c632f4295adf3062dd6f3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 21 Jul 2022 17:24:38 +0800 Subject: [PATCH 092/288] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.25__ic_service_v2.sql | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.25__ic_service_v2.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.25__ic_service_v2.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.25__ic_service_v2.sql new file mode 100644 index 0000000000..c52f2abc0d --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.25__ic_service_v2.sql @@ -0,0 +1,81 @@ +CREATE TABLE `ic_service_record_v2` ( + `ID` varchar(64) NOT NULL, + `CUSTOMER_ID` varchar(64) NOT NULL, + `POLICY_ID` varchar(64) NOT NULL COMMENT '政策依据ID', + `SERVICE_NAME` varchar(32) NOT NULL COMMENT '服务名称', + `SERVICE_ORG_TYPE` varchar(64) NOT NULL COMMENT '服务组织类型\n社区自组织：community_org，\n志愿者：ic_user_volunteer，\n联建单位：party_unit', + `SERVICE_ORG_ID` varchar(64) NOT NULL COMMENT '服务组织ID', + `PRINCIPAL_NAME` varchar(32) DEFAULT NULL COMMENT '经办人姓名', + `PRINCIPAL_CONTACT` varchar(64) DEFAULT NULL COMMENT '联系方式', + `SERVICE_TIME_START` datetime NOT NULL COMMENT '服务时间', + `SERVICE_TIME_END` datetime NOT NULL COMMENT '服务截止时间', + `SERVICE_STATUS` varchar(32) NOT NULL COMMENT 'in_service服务中；completed:已完成；cancel：取消', + `REMARK` varchar(255) DEFAULT NULL COMMENT '备注', + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务记录表'; + +CREATE TABLE `ic_service_feedback_v2` ( + `ID` varchar(64) NOT NULL, + `CUSTOMER_ID` varchar(64) NOT NULL, + `SERVICE_RECORD_ID` varchar(64) NOT NULL COMMENT '服务ID', + `SERVICE_GOAL` varchar(2000) DEFAULT NULL COMMENT '服务目标', + `SERVICE_EFFECT` varchar(2000) DEFAULT NULL COMMENT '服务效果', + `SERVICE_PEOPLE_NUMBER` int(10) DEFAULT NULL COMMENT '服务人数', + `SATISFACTION` varchar(30) DEFAULT NULL COMMENT '满意度。满意度 - 不满意:bad、基本满意:good、非常满意:perfect', + `LONGITUDE` varchar(255) DEFAULT NULL COMMENT '地址经度', + `LATITUDE` varchar(255) DEFAULT NULL COMMENT '地址纬度', + `ADDRESS` varchar(64) DEFAULT NULL COMMENT '地址', + `DEL_FLAG` int(11) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务记录反馈表'; + + +CREATE TABLE `ic_service_scope_v2` ( + `ID` varchar(64) NOT NULL, + `CUSTOMER_ID` varchar(64) NOT NULL, + `SERVICE_RECORD_ID` varchar(64) NOT NULL COMMENT '服务记录的ID', + `OBJECT_TYPE` varchar(32) NOT NULL COMMENT 'agency单位；grid网格；neighborhood小区', + `OBJECT_ID` varchar(64) NOT NULL COMMENT '选中的组织的ID', + `OBJECT_ID_PATH` varchar(255) NOT NULL COMMENT '发布范围的组织ID【包含组织、网格、小区本身的全路径】', + `OBJECT_NAME` varchar(32) DEFAULT NULL, + `DEL_FLAG` varchar(1) NOT NULL DEFAULT '0' COMMENT '删除标识', + `REVISION` int(11) NOT NULL DEFAULT '0' COMMENT '乐观锁', + `CREATED_BY` varchar(64) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(64) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='服务范围表'; + +CREATE TABLE `heart_attachment` ( + `ID` varchar(64) NOT NULL COMMENT '主键', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `BUSINESS_ID` varchar(64) NOT NULL COMMENT '业务id', + `ATTACH_TO` varchar(32) DEFAULT NULL COMMENT '政策：ic_policy;服务：ic_service_record_v2', + `NAME` varchar(64) DEFAULT NULL COMMENT '附件名', + `FORMAT` varchar(64) DEFAULT NULL COMMENT '文件格式（JPG、PNG、PDF、JPEG、BMP、MP4、WMA、M4A、MP3、DOC、DOCX、XLS）', + `TYPE` varchar(64) NOT NULL COMMENT '附件类型（（图片 - image、 视频 - video、 语音 - voice、 文档 - doc））', + `URL` varchar(255) NOT NULL COMMENT '附件地址', + `SORT` int(1) NOT NULL COMMENT '排序字段', + `STATUS` varchar(32) NOT NULL DEFAULT 'auto_passed' COMMENT '附件状态（审核中：auditing； \r\nauto_passed: 自动通过；\r\nreview：结果不确定，需要人工审核；\r\nblock: 结果违规；\r\nrejected：人工审核驳回;\r\napproved：人工审核通过）\r\n现在图片是同步审核的，所以图片只有auto_passed一种状态', + `REASON` varchar(255) DEFAULT NULL COMMENT '失败原因', + `DURATION` int(11) DEFAULT NULL COMMENT '语音或视频时长,秒', + `DEL_FLAG` varchar(1) NOT NULL COMMENT '删除标记 0：未删除，1：已删除', + `REVISION` int(11) 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`) USING BTREE +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 ROW_FORMAT=COMPACT COMMENT='heart库附件表'; \ No newline at end of file From 3d221b45d6e026be6c0b5c3f17d744426ae4a51f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 21 Jul 2022 19:53:04 +0800 Subject: [PATCH 093/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E9=B1=BC=E7=83=82=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/dao/govorg/IcHouseDao.java | 24 +++++++++ .../service/govorg/GovOrgService.java | 2 +- .../govorg/impl/GovOrgServiceImpl.java | 39 +-------------- .../service/impl/ResiServiceImpl.java | 50 ++++++++++++++++++- .../mapper/epmetuser/IcResiUserDao.xml | 14 +++--- .../resources/mapper/govorg/IcHouseDao.xml | 35 +++++++++++++ 6 files changed, 117 insertions(+), 47 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java index 5df9a571dc..568e74e5cb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcHouseDao.java @@ -1,8 +1,12 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 房屋信息 @@ -12,4 +16,24 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcHouseDao extends BaseDao { + /** + * 为政策-预览居民，提供房屋id列表查询 + * @param orgIdPath + * @param customerId + * @param neighborHoodId + * @param buildingId + * @param unitId + * @param houseId + * @param houseRule + * @param statRule + * @return + */ + List listHouseIds4PolicyResis(@Param("orgIdPath") String orgIdPath, + @Param("customerId") String customerId, + @Param("neighborHoodId") String neighborHoodId, + @Param("buildingId") String buildingId, + @Param("unitId") String unitId, + @Param("houseId") String houseId, + @Param("houseRule") List houseRule, + @Param("statRule") List statRule); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index c3908fad04..ee502bd493 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -218,7 +218,7 @@ public interface GovOrgService { */ CustomerAgencyEntity getRootAgencyByCustomerId(String customerId); - List listHousesByRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, + List listHouseIdsByRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, List houseRule, List statRule, Integer pageNo, Integer pageSize); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index a57f014463..e869553be3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1110,7 +1110,7 @@ public class GovOrgServiceImpl implements GovOrgService { } @Override - public List listHousesByRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, + public List listHouseIdsByRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, List houseRule, List statRule, Integer pageNo, Integer pageSize) { @@ -1118,47 +1118,12 @@ public class GovOrgServiceImpl implements GovOrgService { return new ArrayList<>(); } - QueryWrapper query = new QueryWrapper<>(); - - // 如果参数里面选了，就用参数选择的来查询，没有选择的话，就查询当前工作人员所属组织的本级及下级 if (StringUtils.isNotBlank(orgId) && StringUtils.isNotBlank(orgType)) { orgIdPath = getOrgIdPath(orgId, orgType); } - query.likeRight(StringUtils.isNotBlank(orgIdPath), "ORG_ID_PATH", orgIdPath); - - if (StringUtils.isNotBlank(customerId)) { - query.eq("CUSTOMER_ID", customerId); - } - if (StringUtils.isNotBlank(neighborHoodId)) { - query.eq("NEIGHBOR_HOOD_ID", neighborHoodId); - } - if (StringUtils.isNotBlank(buildingId)) { - query.eq("BUILDING_ID", buildingId); - } - if (StringUtils.isNotBlank(unitId)) { - query.eq("BUILDING_UNIT_ID", unitId); - } - if (StringUtils.isNotBlank(houseId)) { - query.eq("ID", houseId); - } - - // 房屋属性 - if (CollectionUtils.isNotEmpty(houseRule)) { - for (ResisByPolicyRulesFormDTO.HouseRule rule : houseRule) { - query.eq(rule.getColKey(), rule.getColVal()); - } - } - - // 房屋的统计属性 - if (CollectionUtils.isNotEmpty(statRule)) { - for (ResisByPolicyRulesFormDTO.StatRule rule : statRule) { - query.eq(rule.getColKey(), rule.getColVal()); - } - } - PageHelper.startPage(pageNo, pageSize); - return houseDao.selectList(query); + return houseDao.listHouseIds4PolicyResis(orgIdPath, customerId, neighborHoodId, buildingId, unitId, houseId, houseRule, statRule); } @Override diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 428d87ed3e..32cc0cbfa1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -31,11 +31,15 @@ import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.web.servlet.resource.ResourceUrlEncodingFilter; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.time.*; +import java.time.format.DateTimeFormatter; +import java.time.temporal.ChronoUnit; +import java.time.temporal.TemporalUnit; import java.util.*; import java.util.stream.Collectors; @@ -65,6 +69,9 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { String client = EpmetRequestHolder.getLoginUserClient(); String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + // 对特殊规则进行转换。 + specificRuleConvert(resiRule); + // 查询当前组织及下级id路径 LoginUserDetailsResultDTO userDetail = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(new LoginUserDetailsFormDTO(app, client, userId)), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); @@ -87,9 +94,8 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { int total = 0; do { // 拿到房屋id列表，去查询居民列表 - List houseEntities = govOrgService.listHousesByRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, + List houseIds = govOrgService.listHouseIdsByRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, houseRule, statRule, housePageNo, 50); - List houseIds = houseEntities.stream().map(icHouseEntity -> icHouseEntity.getId()).collect(Collectors.toList()); if (houseIds.size() == 0) { // 用户使用了房屋和统计相关的条件，但是没查到房屋，我看就没有走下去了的必要了吧.. @@ -125,6 +131,46 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { return new PageData<>(resultResis, total); } + /** + * 为特定的规则进行转换 + * @param resiRule + */ + private void specificRuleConvert(List resiRule) { + // 使用年龄计算出生日期 + resiRule.stream().forEach((r) -> { + if ("BIRTHDAY".equals(r.getColKey())) { + LocalDate birthday = LocalDate.now().minus(Long.valueOf(r.getColVal()), ChronoUnit.YEARS); + r.setQueryType(revertQueryType(r.getQueryType())); + r.setColVal(birthday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } + }); + } + + /** + * 翻转逻辑操作符 + * @param oldRel + * @return + */ + private String revertQueryType(String oldRel) { + if (">".equals(oldRel)) { + return "<"; + } + + if (">=".equals(oldRel)) { + return "<="; + } + + if ("<".equals(oldRel)) { + return ">"; + } + + if ("<=".equals(oldRel)) { + return ">="; + } + + return ""; + } + /** * 补充额外信息 * @param resultResis diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index ffb7246583..703bcc2bfa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -124,13 +124,13 @@ + select ic_house.ID + from ic_house + + DEL_FLAG = '0' + and ic_house.CUSTOMER_ID = #{customerId} + and ic_house.ORG_ID_PATH like CONCAT(#{orgIdPath}, '%') + + and ic_house.NEIGHBOR_HOOD_ID = #{neighborHoodId} + + + and ic_house.BUILDING_ID = #{buildingId} + + + and ic_house.BUILDING_UNIT_ID = #{unitId} + + + and ic_house.ID = #{houseId} + + + and + + ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.nextLogicalRel} + + + + + and + + ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.nextLogicalRel} + + + + From d3a1a2d7c4c2706d2ae3b3aeaa35014f4540b53b Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 21 Jul 2022 20:00:47 +0800 Subject: [PATCH 094/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E6=B8=85=E7=90=86=E4=B8=80=E4=BA=9B=E7=A0=B4=E7=83=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resi/HeartResisByPolicyRulesFormDTO.java | 77 ------------------- .../epmet/controller/IcPolicyController.java | 47 ----------- .../com/epmet/service/IcPolicyService.java | 2 - .../service/impl/IcPolicyServiceImpl.java | 56 -------------- 4 files changed, 182 deletions(-) delete mode 100644 epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java deleted file mode 100644 index b02273a16c..0000000000 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/resi/HeartResisByPolicyRulesFormDTO.java +++ /dev/null @@ -1,77 +0,0 @@ -package com.epmet.dto.form.resi; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -@Data -@NoArgsConstructor -@AllArgsConstructor -public class HeartResisByPolicyRulesFormDTO { - private String ruleId; - private String orgId; - private String orgType; - private String neighborHoodId; - private String buildingId; - private String unitId; - private String houseId; - private String name; - private String mobile; - private String idCard; - private RuleList ruleList; - private Integer pageNo; - private Integer pageSize; - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class RuleList { - private String ruleName; - private List resiRuleList; - private List houseRuleList; - private List statRuleList; - } - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class ResiRule { - private String ruleDesc; - private String nextLogicalRel; - private String itemGroupId; - private String itemId; - private String queryType; - private String colTable; - private String colKey; - private String colVal; - } - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class HouseRule { - private String colTable; - private String colKey; - private String colVal; - private String ruleDesc; - private String nextLogicalRel; - private String queryType; - } - - @Data - @NoArgsConstructor - @AllArgsConstructor - public static class StatRule { - private String colKey; - private String colVal; - private String nextLogicalRel; - private String ruleDesc; - private String queryType; - private String colTable; - } -} diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java index 7b73ce9894..53cd8815b5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPolicyController.java @@ -50,53 +50,6 @@ public class IcPolicyController { return new Result>().ok(list); } - /** - * 政策找人，居民列表 - * @param input - * @return - */ - @Deprecated - @PostMapping("resiuserlist") - public Result listResiUserByPolicyRules(@RequestBody ResisByPolicyRulesFormDTO input) { - // 调整错位的逻辑符号位置 - //adjustMalpositionLogicalOperatorPosition(input); - PageData page = icPolicyService.listResiUserByPolicyRules(input); - return new Result().ok(page); - } - - /** - * 调整错位的逻辑运算符 - * @param input - */ - //private void adjustMalpositionLogicalOperatorPosition(ResisByPolicyRulesFormDTO input) { - // List resiRule = input.getRuleList().getResiRule(); - // List houseRule = input.getRuleList().getHouseRule(); - // List statRule = input.getRuleList().getStatRule(); - // - // if (CollectionUtils.isNotEmpty(resiRule)) { - // for (int i = 1; i < resiRule.size() - 1; i++) { - // ResisByPolicyRulesFormDTO.ResiRule current = resiRule.get(i); - // ResisByPolicyRulesFormDTO.ResiRule last = resiRule.get(i - 1); - // current.setLastLogicalRel(last.getLastLogicalRel()); - // } - // } - // - // if (CollectionUtils.isNotEmpty(houseRule)) { - // for (int i = 1; i < houseRule.size() - 1; i++) { - // ResisByPolicyRulesFormDTO.HouseRule current = houseRule.get(i); - // ResisByPolicyRulesFormDTO.HouseRule last = houseRule.get(i - 1); - // current.setLastLogicalRel(last.getLastLogicalRel()); - // } - // } - // - // if (CollectionUtils.isNotEmpty(statRule)) { - // for (int i = 1; i < statRule.size() - 1; i++) { - // ResisByPolicyRulesFormDTO.StatRule current = statRule.get(i); - // ResisByPolicyRulesFormDTO.StatRule last = statRule.get(i - 1); - // current.setLastLogicalRel(last.getLastLogicalRel()); - // } - // } - //} /** * 政策管理-新增/修改 diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java index d57a6ca886..e13fb4722f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPolicyService.java @@ -57,8 +57,6 @@ public interface IcPolicyService extends BaseService { IcPolicyDTO policyDetail(String customerId,String policyId); - PageData listResiUserByPolicyRules(ResisByPolicyRulesFormDTO input); - /** * 政策规则查询 * @param customerId diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 30d6b265ef..194b9561b2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -321,62 +321,6 @@ public class IcPolicyServiceImpl extends BaseServiceImpl listResiUserByPolicyRules(com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO input) { - String customerId = EpmetRequestHolder.getLoginUserCustomerId(); - String ruleId = input.getRuleId(); - - ResisByPolicyRulesFormDTO aggForm = ConvertUtils.sourceToTarget(input, ResisByPolicyRulesFormDTO.class); - - // 穿了规则id，按照规则id来，忽略规则list - if (StringUtils.isNotBlank(ruleId)) { - Map> ruleMap = listPolicyRules4QueryAndExport(customerId, ruleId); - // resi规则 - List originResiRules = ruleMap.get("resi"); - if (CollectionUtils.isNotEmpty(originResiRules)) { - List resiRules = originResiRules - .stream() - .map((r) -> new ResisByPolicyRulesFormDTO.ResiRule(r.getRuleDesc(), r.getNextLogicalRel(), r.getItemGroupId(), - r.getItemId(), r.getQueryType(), r.getColTable(), r.getColKey(), r.getColVal())) - .collect(Collectors.toList()); - - aggForm.getRuleList().setResiRuleList(resiRules); - } - - // house规则 - List originHouseRules = ruleMap.get("house"); - if (CollectionUtils.isNotEmpty(originHouseRules)) { - List houseRules = originHouseRules - .stream() - .map((r) -> new ResisByPolicyRulesFormDTO.HouseRule(r.getColTable(), r.getColKey(), r.getColVal(), - r.getRuleDesc(), r.getNextLogicalRel(), r.getQueryType())) - .collect(Collectors.toList()); - aggForm.getRuleList().setHouseRuleList(houseRules); - } - - // stat规则 - List originStatRules = ruleMap.get("stat"); - if (CollectionUtils.isNotEmpty(originStatRules)) { - List statRules = originStatRules - .stream() - .map((r) -> new ResisByPolicyRulesFormDTO.StatRule(r.getColKey(), r.getColVal(), r.getNextLogicalRel(), - r.getRuleDesc(), r.getQueryType(), r.getColTable())) - .collect(Collectors.toList()); - - aggForm.getRuleList().setStatRuleList(statRules); - } - } - - // 调用aggre服务查询结果 - Result> result = dataAggregatorOpenFeignClient.listByPolicyRules(aggForm); - List list = result.getData().getList().stream() - .map((r) -> new ResiByPolicyInfoResultDTO(r.getIcResiUserId() ,r.getName(), r.getMobile(), r.getIdCard(), r.getGridId() - ,r.getNeighborhoodId(), r.getNeighborHoodName(), r.getAge(), r.getBirthday())) - .collect(Collectors.toList()); - - return new PageData(list, result.getData().getTotal()); - } - public Map> listPolicyRules4QueryAndExport(String customerId, String ruleId) { ResisByPolicyRulesFormDTO form = new ResisByPolicyRulesFormDTO(); LambdaQueryWrapper query = new LambdaQueryWrapper(); From 3954edae0b059d3474ebb88d43a48c38790dd4a0 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Jul 2022 09:29:00 +0800 Subject: [PATCH 095/288] =?UTF-8?q?ic=5Fpolicy=5Fitem=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.24__ic_policy.sql | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql index 86d1472abb..ebf16c860c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.24__ic_policy.sql @@ -99,4 +99,14 @@ CREATE TABLE `ic_policy_item` ( `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', PRIMARY KEY (`ID`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='政策找人规则组件表'; \ No newline at end of file +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='政策找人规则组件表'; + + + +INSERT INTO `epmet_heart`.`ic_policy_item` (`ID`, `CUSTOMER_ID`, `GROUP_TYPE`, `LABEL`, `COL_KEY`, `ITEM_TYPE`, `TABLE_NAME`, `SORT`, `REMARK`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_URL`, `OPTION_SOURCE_PARAM`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('1', 'default', 'house', '房屋类型', 'HOUSE_TYPE', 'select', 'ic_house', 1, '从字典表获取', 'remote', '/sys/dict/data/dictlist', '{\"dictType\":\"house_type\"}', '0', 0, 'APP_USER', '2022-07-19 10:01:39', 'APP_USER', '2022-07-19 10:01:42'); +INSERT INTO `epmet_heart`.`ic_policy_item` (`ID`, `CUSTOMER_ID`, `GROUP_TYPE`, `LABEL`, `COL_KEY`, `ITEM_TYPE`, `TABLE_NAME`, `SORT`, `REMARK`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_URL`, `OPTION_SOURCE_PARAM`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('2', 'default', 'house', '房屋用途', 'PURPOSE', 'select', 'ic_house', 2, '从字典表获取', 'remote', '/sys/dict/data/dictlist', '{\"dictType\":\"house_purpose\"}', '0', 0, 'APP_USER', '2022-07-19 10:02:54', 'APP_USER', '2022-07-19 10:03:01'); +INSERT INTO `epmet_heart`.`ic_policy_item` (`ID`, `CUSTOMER_ID`, `GROUP_TYPE`, `LABEL`, `COL_KEY`, `ITEM_TYPE`, `TABLE_NAME`, `SORT`, `REMARK`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_URL`, `OPTION_SOURCE_PARAM`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('3', 'default', 'house', '房屋状态', 'RENT_FLAG', 'select', 'ic_house', 3, '从字典表获取', 'remote', '/sys/dict/data/dictlist', '{\"dictType\":\"house_status\"}', '0', 0, 'APP_USER', '2022-07-19 10:02:54', 'APP_USER', '2022-07-19 10:03:01'); +INSERT INTO `epmet_heart`.`ic_policy_item` (`ID`, `CUSTOMER_ID`, `GROUP_TYPE`, `LABEL`, `COL_KEY`, `ITEM_TYPE`, `TABLE_NAME`, `SORT`, `REMARK`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_URL`, `OPTION_SOURCE_PARAM`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('4', 'default', 'house', '创建时间', 'CREATED_TIME', 'date', 'ic_house', 4, '日期格式', NULL, NULL, NULL, '0', 0, 'APP_USER', '2022-07-19 10:02:54', 'APP_USER', '2022-07-19 10:03:01'); +INSERT INTO `epmet_heart`.`ic_policy_item` (`ID`, `CUSTOMER_ID`, `GROUP_TYPE`, `LABEL`, `COL_KEY`, `ITEM_TYPE`, `TABLE_NAME`, `SORT`, `REMARK`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_URL`, `OPTION_SOURCE_PARAM`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('5', 'default', 'house', '备注', 'REMARK', 'input', 'ic_house', 5, '文本域', NULL, NULL, NULL, '0', 0, 'APP_USER', '2022-07-19 10:02:54', 'APP_USER', '2022-07-19 10:03:01'); +INSERT INTO `epmet_heart`.`ic_policy_item` (`ID`, `CUSTOMER_ID`, `GROUP_TYPE`, `LABEL`, `COL_KEY`, `ITEM_TYPE`, `TABLE_NAME`, `SORT`, `REMARK`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_URL`, `OPTION_SOURCE_PARAM`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('6', 'default', 'stat', '人均收入', 'AVG_YSR', 'inputNum', '', 1, '只能输入数字，可以是小数', NULL, NULL, NULL, '0', 0, 'APP_USER', '2022-07-19 10:02:54', 'APP_USER', '2022-07-19 10:03:01'); +INSERT INTO `epmet_heart`.`ic_policy_item` (`ID`, `CUSTOMER_ID`, `GROUP_TYPE`, `LABEL`, `COL_KEY`, `ITEM_TYPE`, `TABLE_NAME`, `SORT`, `REMARK`, `OPTION_SOURCE_TYPE`, `OPTION_SOURCE_URL`, `OPTION_SOURCE_PARAM`, `DEL_FLAG`, `REVISION`, `CREATED_BY`, `CREATED_TIME`, `UPDATED_BY`, `UPDATED_TIME`) VALUES ('7', 'default', 'stat', '家庭人数', 'RESI_NUMBER', 'inputNum', '', 2, '只能输入数字', NULL, NULL, NULL, '0', 0, 'APP_USER', '2022-07-19 10:02:54', 'APP_USER', '2022-07-19 10:03:01'); From ec064f96315bd4fbc703ed86f179418af37d91c6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 22 Jul 2022 10:20:37 +0800 Subject: [PATCH 096/288] =?UTF-8?q?=E5=8F=8C=E5=AE=9E=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E5=BD=95=E5=85=A5pidsbug=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/IcResiUserServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 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 f6a476c64e..4aaf942edc 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 @@ -2509,10 +2509,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 22 Jul 2022 10:29:25 +0800 Subject: [PATCH 097/288] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/IcResiUserServiceImpl.java | 39 ++++++++++--------- 1 file changed, 20 insertions(+), 19 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 0fb60b5bdf..4c310afdae 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 @@ -2430,6 +2430,26 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 22 Jul 2022 15:49:24 +0800 Subject: [PATCH 098/288] bugfix --- .../main/resources/db/migration/V0.0.33__policy_flagbugfix.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.33__policy_flagbugfix.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.33__policy_flagbugfix.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.33__policy_flagbugfix.sql new file mode 100644 index 0000000000..ea437f22b7 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.33__policy_flagbugfix.sql @@ -0,0 +1,3 @@ +update ic_form_item i set i.UPDATED_TIME=NOW(),i.POLICY_FLAG='0' +where i.DEL_FLAG='0' + and i.DYNAMIC='0'; \ No newline at end of file From 77d203048cb352efb3d85c56a397e6a2fbeef3ad Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Jul 2022 16:07:06 +0800 Subject: [PATCH 099/288] =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=8F=AF=E4=BB=A5?= =?UTF-8?q?=E4=B8=BA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java index 3ebd110fad..c96aa65540 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java @@ -83,7 +83,7 @@ public class IcPolicyFormDTO implements Serializable { /** * 政策内容 */ - @NotBlank(message = "政策内容不能为空", groups = AddUserShowGroup.class) + // @NotBlank(message = "政策内容不能为空", groups = AddUserShowGroup.class) @Length(max = 2000, groups = AddUserShowGroup.class, message = "政策内容最多输入2000字") private String content; From 495c698ba51cbeb9e27caee4149dd6a073fc9b69 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 22 Jul 2022 16:56:33 +0800 Subject: [PATCH 100/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IssueCategoryDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml index f1027a6759..078661e2a1 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/mapper/IssueCategoryDao.xml @@ -32,7 +32,7 @@ CONCAT(cd.category_name,'-',ip.category_name) AS "name" FROM issue_project_category_dict ip - INNER JOIN issue_project_category_dict cd ON ip.pid = cd.id + INNER JOIN issue_project_category_dict cd ON ip.pid = cd.id AND ip.customer_id = cd.customer_id WHERE ip.del_flag = '0' AND cd.DEL_FLAG = '0' @@ -81,4 +81,4 @@ issue_id = #{issueId} - \ No newline at end of file + From 4ba963ea5ffbf3acd9fde2c1f858c70786b7e86d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 22 Jul 2022 17:23:43 +0800 Subject: [PATCH 101/288] =?UTF-8?q?=E5=86=85=E9=83=A8=E5=A4=87=E6=B3=A8?= =?UTF-8?q?=E5=8F=AF=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java | 2 +- .../main/java/com/epmet/dto/form/ProjectResponseFormDTO.java | 3 +-- .../src/main/java/com/epmet/dto/form/ReturnFromDTO.java | 3 +-- .../src/main/java/com/epmet/dto/form/SendToFormDTO.java | 2 +- .../src/main/java/com/epmet/dto/form/TransferFormDTO.java | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java index 3b2fe63a12..922cb88802 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectApprovalFormDTO.java @@ -26,7 +26,7 @@ public class ProjectApprovalFormDTO implements Serializable { @NotBlank(message = "项目方案不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) @Length(max=1000,message = "项目方案不能超过1000位",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) private String publicReply; - @NotBlank(message = "内部备注不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) + // @NotBlank(message = "内部备注不能为空",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) @Length(max=1000,message = "内部备注不能超过1000位",groups = {ProjectApprovalFormDTO.ApprovalCategory.class}) private String internalRemark; //定位地址[立项项目指的项目发生位置，议题转的项目指的话题发生位置] diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java index 1562997afa..068d449a4a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -35,7 +34,7 @@ public class ProjectResponseFormDTO implements Serializable { /** * 内部流转意见 */ - @NotBlank(message = "内部备注不能为空") + // @NotBlank(message = "内部备注不能为空") @Length(max = 1000, message = "内部备注不能超过1000个字符") private String internalRemark; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java index 1bab0fbe08..9953e31be7 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java @@ -3,7 +3,6 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -36,7 +35,7 @@ public class ReturnFromDTO implements Serializable { /** * 内部流转意见 */ - @NotBlank(message = "内部备注不能为空") + // @NotBlank(message = "内部备注不能为空") @Length(max = 1000, message = "内部备注不能超过1000个字符") private String internalRemark; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java index 479cf64b30..3b52768469 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/SendToFormDTO.java @@ -25,7 +25,7 @@ public class SendToFormDTO implements Serializable { @Length(max=1000,message = "公开答复内容不能超过1000位") private String publicReply; - @NotBlank(message = "内部备注不能为空") + // @NotBlank(message = "内部备注不能为空") @Length(max=1000,message = "内部备注不能超过1000位") private String internalRemark; diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java index da8e7b8f3d..f6033bdd6a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java @@ -25,7 +25,7 @@ public class TransferFormDTO implements Serializable { @Length(max=1000,message = "公开答复内容不能超过1000位") private String publicReply; - @NotBlank(message = "内部备注不能为空") + // @NotBlank(message = "内部备注不能为空") @Length(max=1000,message = "内部备注不能超过1000位") private String internalRemark; From a640cd0c3b52054dd7a6eb95508737ddb44f7044 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 25 Jul 2022 10:28:22 +0800 Subject: [PATCH 102/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ResiByPolicyInfoResultDTO.java | 20 ++++++++ .../controller/IcUserController.java | 6 +-- .../epmet/dataaggre/service/ResiService.java | 4 +- .../service/impl/ResiServiceImpl.java | 48 ++++++++++++------- 4 files changed, 54 insertions(+), 24 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java index e739baca1d..da425762d7 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java @@ -1,5 +1,8 @@ package com.epmet.dataaggre.dto.epmetuser.result; +import com.alibaba.excel.annotation.ExcelIgnore; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -11,16 +14,33 @@ import java.util.Date; @AllArgsConstructor public class ResiByPolicyInfoResultDTO { + @ExcelIgnore private String icResiUserId; + + @ExcelProperty(value = "姓名") + @ColumnWidth(10) private String name; + + @ExcelProperty("手机号") + @ColumnWidth(20) private String mobile; + + @ExcelProperty("身份证号") + @ColumnWidth(30) private String idCard; /** * 小区全名，包含小区前面的属性，比如网格等 */ + @ExcelIgnore private String gridId; + @ExcelIgnore private String neighborhoodId; + @ExcelProperty("小区名称") + @ColumnWidth(30) private String neighborHoodName; + @ExcelProperty("年龄") + @ColumnWidth(10) private Integer age; + @ExcelIgnore private Date birthday; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 1216c2b193..63d686260c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -114,13 +114,13 @@ public class IcUserController implements ResultDataResolver { * 导出政策查找到的居民 * @param input */ - @PostMapping("exportByPolicy") + @PostMapping("exportByPolicyRules") public void exportResisByPolicy(@RequestBody ResisByPolicyRulesFormDTO input, HttpServletResponse response) { try { icResiService.exportResisByPolicy( input.getOrgId(), input.getOrgType(), input.getNeighborHoodId(), input.getBuildingId(), input.getUnitId(), - input.getHouseId(), input.getIdCard(), input.getName(), input.getPageNo(), input.getPageSize(), - input.getRuleId(), input.getRuleList().getResiRuleList(), input.getRuleList().getHouseRuleList(), input.getRuleList().getStatRuleList(), response); + input.getHouseId(), input.getIdCard(), input.getName(), input.getRuleId(), input.getRuleList().getResiRuleList(), + input.getRuleList().getHouseRuleList(), input.getRuleList().getStatRuleList(), response); } catch (IOException e) { throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "导出Excel文件失败", "导出Excel文件失败"); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java index f160f4a8f3..a77e94ceb7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/ResiService.java @@ -39,12 +39,10 @@ public interface ResiService { * @param houseId * @param idCard * @param name - * @param pageNo - * @param pageSize * @param ruleId */ void exportResisByPolicy(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, - String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + String houseId, String idCard, String name, String ruleId, List resiRule, List houseRule, List statRule, diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 32cc0cbfa1..9c613b2c56 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelWriter; import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.write.builder.ExcelWriterSheetBuilder; +import com.alibaba.excel.write.metadata.WriteSheet; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; @@ -12,6 +13,7 @@ import com.epmet.commons.tools.feign.ResultDataResolver; 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.ExcelUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; @@ -215,7 +217,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { @Override public void exportResisByPolicy(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, - String houseId, String idCard, String name, Integer pageNo, Integer pageSize, + String houseId, String idCard, String name, String ruleId, List resiRule, List houseRule, List statRule, @@ -234,24 +236,34 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { statRule = ConvertUtils.sourceToTarget(ruleList.getStatRuleList(), ResisByPolicyRulesFormDTO.StatRule.class); } - ServletOutputStream ostream = response.getOutputStream(); - ExcelWriterSheetBuilder sheetBuilder = EasyExcel.write(ostream, ResisByPolicyExcel.class).sheet("居民列表"); - - // 循环填充数据 - do { - PageData resis = this.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, - houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule); - List list = resis.getList(); - List excelDatas = ConvertUtils.sourceToTarget(list, ResisByPolicyExcel.class); - if (CollectionUtils.isEmpty(excelDatas)) { - break; - } - //sheetBuilder.write(excelDatas); - } while (true); - - + // 模板导出 + ExcelWriter writer = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("政策人员预览信息导出.xlsx", response)) + //.withTemplate(inputStream) + .build(); + + WriteSheet writeSheet = EasyExcel.writerSheet("政策人员列表") + .head(ResiByPolicyInfoResultDTO.class) + .build(); + + Integer pageSize = 500; + Integer pageNo = 1; + + try { + do { + PageData resis = this.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule); + List list = resis.getList(); + List excelDatas = ConvertUtils.sourceToTarget(list, ResisByPolicyExcel.class); + if (CollectionUtils.isEmpty(excelDatas)) { + break; + } - System.out.println(666); + writer.write(resis.getList(), writeSheet); + pageNo++; + } while (true); + } finally { + writer.finish(); + } } } From 0f4c7b659f61eb910eb192a4c7a5be3b9fe4eca3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 25 Jul 2022 13:32:53 +0800 Subject: [PATCH 103/288] =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=B0=8F=E7=A8=8B?= =?UTF-8?q?=E5=BA=8Ftoken=E5=8A=A0=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WeChatNotifyController.java | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java index bacb67e3cf..a10a44b148 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java @@ -1,9 +1,12 @@ package com.epmet.controller; +import com.epmet.commons.tools.distributedlock.DistributedLock; +import com.epmet.commons.tools.exception.ExceptionUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.ModuleConstant; import com.epmet.service.ComponentVerifyTicketService; import lombok.extern.slf4j.Slf4j; +import org.redisson.api.RLock; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,6 +23,8 @@ public class WeChatNotifyController { @Autowired private ComponentVerifyTicketService componentVerifyTicketService; + @Autowired + private DistributedLock distributedLock; /** * @Description 定时获取 (令牌，component_access_token) @@ -53,9 +58,18 @@ public class WeChatNotifyController { */ @PostMapping("refreshtoken") public Result refreshToken(){ - log.info("开始刷新/获取接口调用令牌......"); - componentVerifyTicketService.refreshToken(); - log.info("刷新/获取接口调用令牌......成功了"); + RLock lock = null; + try { + lock = distributedLock.getLock("refresh_authorizer_access_token"); + log.info("开始刷新/获取接口调用令牌......"); + componentVerifyTicketService.refreshToken(); + log.info("刷新/获取接口调用令牌......成功了"); + }catch (Exception e){ + log.error("定时刷新authorizer_access_token失败：".concat(ExceptionUtils.getErrorStackTrace(e))); + throw e; + }finally { + distributedLock.unLock(lock); + } return new Result(); } From 1f227799c3ec9fb22ddb72141e06930a4de85e69 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 25 Jul 2022 13:37:08 +0800 Subject: [PATCH 104/288] =?UTF-8?q?=E5=88=B7=E6=96=B0component=5Faccess=5F?= =?UTF-8?q?token=E5=8A=A0=E9=94=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WeChatNotifyController.java | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java index a10a44b148..9f645d4c27 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java @@ -34,10 +34,19 @@ public class WeChatNotifyController { */ @PostMapping("componentaccesstoken") public Result getComponentAccessToken() { - log.info("开始获取【component_access_token】......"); - String accessTokenCountFlag = ModuleConstant.ACCOUNT_TOKEN_FLAG_TWO; - componentVerifyTicketService.getComponentAccessToken(accessTokenCountFlag); - log.info("已成功获取到【component_access_token】......"); + RLock lock = null; + try { + lock = distributedLock.getLock("refresh_component_access_token"); + log.info("开始获取【component_access_token】......"); + String accessTokenCountFlag = ModuleConstant.ACCOUNT_TOKEN_FLAG_TWO; + componentVerifyTicketService.getComponentAccessToken(accessTokenCountFlag); + log.info("已成功获取到【component_access_token】......"); + }catch (Exception e){ + log.error("定时刷新component_access_token失败：".concat(ExceptionUtils.getErrorStackTrace(e))); + throw e; + }finally { + distributedLock.unLock(lock); + } return new Result(); } From a3b88d9d770d39623fa14277a847678b9ab2616a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 25 Jul 2022 14:08:40 +0800 Subject: [PATCH 105/288] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E7=9B=B8=E5=85=B3?= =?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/IcResiUserServiceImpl.java | 1 + 1 file changed, 1 insertion(+) 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 4c310afdae..63df25db24 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 @@ -2450,6 +2450,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Mon, 25 Jul 2022 16:33:41 +0800 Subject: [PATCH 106/288] =?UTF-8?q?=E9=94=81=E8=8E=B7=E5=8F=96=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/WeChatNotifyController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java index 9f645d4c27..d7b28bd9ba 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java @@ -36,7 +36,7 @@ public class WeChatNotifyController { public Result getComponentAccessToken() { RLock lock = null; try { - lock = distributedLock.getLock("refresh_component_access_token"); + lock = distributedLock.tryLock("refresh_component_access_token"); log.info("开始获取【component_access_token】......"); String accessTokenCountFlag = ModuleConstant.ACCOUNT_TOKEN_FLAG_TWO; componentVerifyTicketService.getComponentAccessToken(accessTokenCountFlag); @@ -69,7 +69,7 @@ public class WeChatNotifyController { public Result refreshToken(){ RLock lock = null; try { - lock = distributedLock.getLock("refresh_authorizer_access_token"); + lock = distributedLock.tryLock("refresh_authorizer_access_token"); log.info("开始刷新/获取接口调用令牌......"); componentVerifyTicketService.refreshToken(); log.info("刷新/获取接口调用令牌......成功了"); From 6f6bb9513a04581a0da37d05597744a37e216a23 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 25 Jul 2022 17:12:23 +0800 Subject: [PATCH 107/288] =?UTF-8?q?log=E7=BA=A7=E5=88=AB=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/controller/WeChatNotifyController.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java index d7b28bd9ba..2b985f6316 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/controller/WeChatNotifyController.java @@ -42,8 +42,7 @@ public class WeChatNotifyController { componentVerifyTicketService.getComponentAccessToken(accessTokenCountFlag); log.info("已成功获取到【component_access_token】......"); }catch (Exception e){ - log.error("定时刷新component_access_token失败：".concat(ExceptionUtils.getErrorStackTrace(e))); - throw e; + log.warn("定时刷新component_access_token失败：".concat(ExceptionUtils.getErrorStackTrace(e))); }finally { distributedLock.unLock(lock); } @@ -74,8 +73,7 @@ public class WeChatNotifyController { componentVerifyTicketService.refreshToken(); log.info("刷新/获取接口调用令牌......成功了"); }catch (Exception e){ - log.error("定时刷新authorizer_access_token失败：".concat(ExceptionUtils.getErrorStackTrace(e))); - throw e; + log.warn("定时刷新authorizer_access_token失败：".concat(ExceptionUtils.getErrorStackTrace(e))); }finally { distributedLock.unLock(lock); } From 57eaea76885a5d0554fdac70bf88c03f2cdaa5a4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 25 Jul 2022 17:41:40 +0800 Subject: [PATCH 108/288] =?UTF-8?q?=E6=96=B0=E5=A2=9EserviceCategoryKey?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=8F=91=E8=B5=B7=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9=EF=BC=8C=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/IcServiceRecordV2DTO.java | 5 ++++- .../com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java | 3 +++ .../java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java | 6 ++++++ .../com/epmet/controller/IcServiceRecordV2Controller.java | 1 + .../main/java/com/epmet/entity/IcServiceRecordV2Entity.java | 2 ++ .../db/migration/V0.0.26__add_service_v2_category.sql | 1 + .../src/main/resources/mapper/IcServiceRecordV2Dao.xml | 1 + 7 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.26__add_service_v2_category.sql diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceRecordV2DTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceRecordV2DTO.java index d86138657e..be41f030b1 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceRecordV2DTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcServiceRecordV2DTO.java @@ -1,8 +1,9 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -109,4 +110,6 @@ public class IcServiceRecordV2DTO implements Serializable { */ private String policyId; + private String serviceCategoryKey; + } \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java index fff02eb997..0de6bc737f 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/IcServiceRecordV2AddEditFormDTO.java @@ -37,6 +37,9 @@ public class IcServiceRecordV2AddEditFormDTO implements Serializable { */ @NotBlank(message = "服务名称不能为空", groups = {AddGroup.class}) private String serviceOrgType; + + @NotBlank(message = "serviceCategoryKey不能为空", groups = {AddGroup.class}) + private String serviceCategoryKey; /** * 服务组织Id */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java index 675bd575b4..a9eea1aa2b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/ServiceRecordV2ListFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; /** @@ -15,11 +16,16 @@ public class ServiceRecordV2ListFormDTO extends PageFormDTO implements Serializa private static final long serialVersionUID = 88592831607216246L; + public interface ServiceRecordV2ListForm{} + /** * 服务名称 */ private String serviceName; + @NotBlank(message = "serviceCategoryKey不能为空",groups = ServiceRecordV2ListForm.class) + private String serviceCategoryKey; + /** * 服务组织ID */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java index f451fafc81..9449689fc2 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcServiceRecordV2Controller.java @@ -92,6 +92,7 @@ public class IcServiceRecordV2Controller { */ @PostMapping("list") public Result serviceRecordV2List(@LoginUser TokenDto tokenDto, @RequestBody ServiceRecordV2ListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, ServiceRecordV2ListFormDTO.ServiceRecordV2ListForm.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); return new Result().ok(icServiceRecordV2Service.serviceRecordV2List(formDTO)); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordV2Entity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordV2Entity.java index e18eda964e..7f32333f2e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordV2Entity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcServiceRecordV2Entity.java @@ -79,4 +79,6 @@ public class IcServiceRecordV2Entity extends BaseEpmetEntity { */ private String policyId; + private String serviceCategoryKey; + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.26__add_service_v2_category.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.26__add_service_v2_category.sql new file mode 100644 index 0000000000..d09a7eca73 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.26__add_service_v2_category.sql @@ -0,0 +1 @@ +alter table ic_service_record_v2 add COLUMN SERVICE_CATEGORY_KEY VARCHAR(64) comment '服务类别KEY' AFTER remark; \ No newline at end of file diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml index 7a7b4f1a68..89f8764a30 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcServiceRecordV2Dao.xml @@ -19,6 +19,7 @@ left JOIN ic_service_feedback_v2 sf ON sf.SERVICE_RECORD_ID = sr.ID AND sf.DEL_FLAG = 0 INNER JOIN ic_service_scope_v2 ss ON ss.SERVICE_RECORD_ID = sr.ID AND ss.DEL_FLAG = '0' WHERE sr.DEL_FLAG = '0' + AND sr.SERVICE_CATEGORY_KEY = #{serviceCategoryKey} AND ss.OBJECT_ID_PATH LIKE concat('%',#{orgId},'%') AND sr.CUSTOMER_ID = #{customerId} From fa150c76dce247396938ac05c1a7df96b7908a30 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 25 Jul 2022 17:54:00 +0800 Subject: [PATCH 109/288] weiyi --- .../epmet/dto/form/policy/IcPolicyFormDTO.java | 2 ++ .../epmet/service/impl/IcPolicyServiceImpl.java | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java index c96aa65540..2e1f6896a0 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyFormDTO.java @@ -95,5 +95,7 @@ public class IcPolicyFormDTO implements Serializable { @Valid @NotEmpty(message = "政策细则不能为空",groups =AddUserShowGroup.class ) private List ruleList; + + private String agencyId; } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java index 194b9561b2..424af6e5ae 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPolicyServiceImpl.java @@ -13,7 +13,6 @@ 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.utils.ConvertUtils; -import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.*; @@ -27,7 +26,6 @@ import com.epmet.dto.form.policy.IcPolicyFormDTO; import com.epmet.dto.form.policy.IcPolicyPageFormDTO; import com.epmet.dto.form.policy.IcPolicyRuleDetailDTO; import com.epmet.dto.form.policy.IcPolicyRuleFormDTO; -import com.epmet.dto.result.resi.ResiByPolicyInfoResultDTO; import com.epmet.entity.*; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.service.IcPolicyService; @@ -98,13 +96,14 @@ public class IcPolicyServiceImpl extends BaseServiceImpl policyEntityLambdaQueryWrapper=new LambdaQueryWrapper<>(); + policyEntityLambdaQueryWrapper.eq(IcPolicyEntity::getTitle,formDTO.getTitle()) + .eq(IcPolicyEntity::getOrgId,formDTO.getAgencyId()); + policyEntityLambdaQueryWrapper.ne(StringUtils.isNotBlank(formDTO.getPolicyId()),IcPolicyEntity::getId,formDTO.getPolicyId()); + int count=baseDao.selectCount(policyEntityLambdaQueryWrapper); + if(count>0){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"当前组织内已经存在相同标题的政策","当前组织内已经存在相同标题的政策"); + } List ruleList = formDTO.getRuleList(); for (IcPolicyRuleFormDTO rule : ruleList) { if (CollectionUtils.isEmpty(rule.getResiRuleList()) From 2a1bc01040d28220d501ea7c5c8ce1ce94cd341c Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 26 Jul 2022 10:10:35 +0800 Subject: [PATCH 110/288] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= 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 ab53f052c8..2ddbbd4278 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 @@ -268,8 +268,8 @@ - group by IC_RESI_USER.id + group by IC_RESI_USER.id ${groupTableName}.ID From 0eeb3edec714076f128ee98339c6709f5dd1e53d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 26 Jul 2022 14:59:01 +0800 Subject: [PATCH 111/288] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=EF=BC=8C=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/db/migration/V0.0.36__add_city_public.sql | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__add_city_public.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__add_city_public.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__add_city_public.sql new file mode 100644 index 0000000000..8c622ec0f8 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__add_city_public.sql @@ -0,0 +1,4 @@ +alter table ic_city_management add COLUMN PRINCIPAL VARCHAR(32) comment '联系人' AFTER ADDRESS; +alter table ic_city_management add COLUMN MOBILE VARCHAR(32) comment '联系方式' AFTER PRINCIPAL; +alter table ic_public_service add COLUMN PRINCIPAL VARCHAR(32) comment '联系人' AFTER ADDRESS; +alter table ic_public_service add COLUMN MOBILE VARCHAR(32) comment '联系方式' AFTER PRINCIPAL; \ No newline at end of file From 8ca9f38655a3b3113e63d7a81fecfef148a90c8f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 26 Jul 2022 15:00:17 +0800 Subject: [PATCH 112/288] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=EF=BC=8C=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...{V0.0.36__add_city_public.sql => V0.0.37__add_city_public.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/{V0.0.36__add_city_public.sql => V0.0.37__add_city_public.sql} (100%) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__add_city_public.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.37__add_city_public.sql similarity index 100% rename from epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.36__add_city_public.sql rename to epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.37__add_city_public.sql From 08a5630c654c343722c58cbceecd5529031b2d59 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 26 Jul 2022 15:26:38 +0800 Subject: [PATCH 113/288] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=EF=BC=8C=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=96=B0=E5=A2=9E=E8=81=94=E7=B3=BB=E4=BA=BA?= =?UTF-8?q?=E5=92=8C=E8=81=94=E7=B3=BB=E7=94=B5=E8=AF=9D=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/govorg/IcCityManagementEntity.java | 10 ++++++++++ .../entity/govorg/IcPublicServiceEntity.java | 10 ++++++++++ .../com/epmet/dto/IcCityManagementDTO.java | 13 ++++++++++++- .../com/epmet/dto/IcPublicServiceDTO.java | 10 ++++++++++ .../form/IcCityManagementAddEditFormDTO.java | 10 ++++++++++ .../form/IcPublicServiceAddEditFormDTO.java | 10 ++++++++++ .../result/IcCityManagementListResultDTO.java | 10 ++++++++++ .../result/IcPublicServiceListResultDTO.java | 10 ++++++++++ .../epmet/entity/IcCityManagementEntity.java | 13 ++++++++++--- .../epmet/entity/IcPublicServiceEntity.java | 13 ++++++++++--- .../epmet/excel/IcCityManagementExcel.java | 8 ++++++++ .../com/epmet/excel/IcPublicServiceExcel.java | 8 ++++++++ .../IcCityManagementExcelImportListener.java | 2 ++ .../IcPublicServiceExcelImportListener.java | 2 ++ .../excel/public_service_template.xlsx | Bin 9096 -> 9133 bytes .../resources/mapper/IcCityManagementDao.xml | 4 +++- .../resources/mapper/IcPublicServiceDao.xml | 4 +++- 17 files changed, 128 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java index a1baff300a..fff25b16f4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCityManagementEntity.java @@ -73,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java index 6a454c446b..1422ac76ad 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcPublicServiceEntity.java @@ -73,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java index 7e36b065b9..a10cbd4ad8 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcCityManagementDTO.java @@ -1,8 +1,9 @@ package com.epmet.dto; +import lombok.Data; + import java.io.Serializable; import java.util.Date; -import lombok.Data; /** @@ -76,6 +77,16 @@ public class IcCityManagementDTO implements Serializable { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + /** * 删除标识 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java index 64045ddd17..d516ccf863 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/IcPublicServiceDTO.java @@ -76,6 +76,16 @@ public class IcPublicServiceDTO implements Serializable { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + /** * 删除标识 */ diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java index ab73efa810..ff0aac0dc2 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcCityManagementAddEditFormDTO.java @@ -62,6 +62,16 @@ public class IcCityManagementAddEditFormDTO implements Serializable { @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + private String customerId; private String userId; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java index fb9cbf6b26..226bb921f1 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcPublicServiceAddEditFormDTO.java @@ -62,6 +62,16 @@ public class IcPublicServiceAddEditFormDTO implements Serializable { @Length(max = 50, message = "地址不能超过50位", groups = AddGroup.class) private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + private String customerId; private String userId; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java index 6c40cb030c..ee36eb853d 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcCityManagementListResultDTO.java @@ -65,4 +65,14 @@ public class IcCityManagementListResultDTO implements Serializable { */ private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java index 859b36faca..3fcae16a22 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcPublicServiceListResultDTO.java @@ -65,4 +65,14 @@ public class IcPublicServiceListResultDTO implements Serializable { */ private String address; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java index 8a90c40380..170449ea1a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCityManagementEntity.java @@ -1,13 +1,10 @@ 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; - /** * 城市管理图层 * @@ -76,4 +73,14 @@ public class IcCityManagementEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java index 5c0e35ec89..30b8513f4b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcPublicServiceEntity.java @@ -1,13 +1,10 @@ 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; - /** * 公共服务图层 * @@ -76,4 +73,14 @@ public class IcPublicServiceEntity extends BaseEpmetEntity { */ private String latitude; + /** + * 联系人 + */ + private String principal; + + /** + * 联系电话 + */ + private String mobile; + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java index ffda552a3f..bdd6f5b587 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcCityManagementExcel.java @@ -38,6 +38,14 @@ public class IcCityManagementExcel { @NotBlank(message = "地址为必填项") private String address; + @ExcelProperty(value = "联系人") + @ColumnWidth(20) + private String principal; + + @ExcelProperty(value = "联系电话") + @ColumnWidth(20) + private String mobile; + @Data public static class RowRemarkMessage { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java index 3b9762b677..872b2fd61b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/IcPublicServiceExcel.java @@ -38,6 +38,14 @@ public class IcPublicServiceExcel { @NotBlank(message = "地址为必填项") private String address; + @ExcelProperty(value = "联系人") + @ColumnWidth(20) + private String principal; + + @ExcelProperty(value = "联系电话") + @ColumnWidth(20) + private String mobile; + @Data public static class RowRemarkMessage { diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java index 5d08ce792c..df763d3c79 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/excel/handler/IcCityManagementExcelImportListener.java @@ -95,6 +95,8 @@ public class IcCityManagementExcelImportListener implements ReadListener%{ohaN{(l0)2wnI^J?Yao`N@tgkBhHHeI5BF|S_ILSLr(yqoiocu%043X#Z`Lmob zn{XDSUV(*-M&o_5MXq>Ani;5DvN$D7hLtXPnX?9*wgrO-mEebI8w7Urx8J%oFE>rU z-BfT&XqXw!_N`#P1MAMfVj7%HUFip2=)--QD*vK+t zpG-#`9S{H6Y}v6Cj1z<9@2Ou{w2V0;vnYD%%Hhhr_glZQvG=Rf6Nga04Vk*#@rs(2 z=*zE~!OfPlp;TXPi|EsgY3~Sk{S&wfe6v7v9#kas>*P~RC-|WrArUpnrBpS4?Xufi?__+7ylFf(G z7aiFvmAx>xaK6fs%ZUi#nbCPOZ&;&ZA@I?N)`%WaxA}6M=Rt^f_on)@Me`s~3M&Rl zq)Jvqgl~isf1lV73FJM7#q_T2rPwYA?Pm>jHV zT3oDcn7a787{*xbCv{Jj#k=I&B)hep9u-H%hl?Eunx1YP^-^s#0V(}LSQBXN!`H;4 zjbe_SHRyy5jew$J;+(3e;aFtJ{AopMYH@n1H;gPCl}~48?P$YSW2aszOlsR%u(M{9 z<}rfetNbKb7F#N~&I-l!rcw8kAefp7?B)m(G|}+plIYYQ#3Ys4%Ju$l$uCZj_=^!- z>+VN~%Pf9bDux%-7E2U@USh4(aBZt2K#4jxtICD2LJG*BZ=Njs489g%hh-_xY zXWv@s{$KL((E@qHs}j@s6#dYH9+|l~%-Dk67CR^ohZNI`4blwcWtbKvd7&rm!7gR3-R`Ox<|~TZ zu{msZH;<^+xz5x^<)4WkD>89#=tifq#?!kgzbZam2wB1h0ZN+>v!{}gNk08Ygmd0= z^=*Y8(fAWw=k8t$o^we`*x(6SPxaisLY_+#-cC5B#v}OLB3l))V=hM}BAgl;1!=@b zNGRdV-jH+c zW2;@zNjuXgj@9;CZ6Tm>EmB{?XT5b=`)sq-o7i|$9y?8RD)~@18{^Z);vD4{KQ+f+ zGCYxuRPQlXXsaI+^L=7CBbfgC{H5EB4CJ&S_2Xm7WO5CmvG+hFy}%KKfuzL9G>#&b zK~cOHXf!Lc8X9kOSo|x~DT^S4P+R>(TeXmZ;JC2wDw@sg}!d!O})X?c^$O|jsq@Fu4{ z_ZBi%nzwN{J`2UfqSd%3WVjN~B@J3BS-iOy%FVI@lH$6b%t7rAe-E zk!&akc_r;FI>}^6w?6GB?ZHSZGjDDNxCYxh)SDfIA00-BD(UVAgm9+6Dw@n?RO&

ig6-J5hylkrAB>3%};838N=tc+QdqY@Eo<3TM3#p^s4?O&CNS z=UC4QK0ncHdBmdk$U3-IL60_c6}71Mh#JZ?M@r)PjWpA^AJrce#ux0-xM>~=D1Zh2 zI(caS=NC@4X!XX&#vn#s>s_)K3dCNtrZ_BO$#oc^cWa)Gde#rijNzikB~p<_ z6W@7$sgD48_<>N91c>MKup3J9UU3d zXJ~|_QnBW@^pdP~MDE6kK%82EsMUoAwoN{v29I0j#BvXB!dN}GS86>#qP0c7fj*?t z1;;6=E?)IbGrl{){_xgXSC`*~3+nNm%JNMgb$7?Paz&p~m$}NyZ~WF>=vCi5)xxgi z;jiXA#OT%(lW5jm=vtBZyWmB)Egw3^ZrJ8Rd1~mZ z`x04z-QBkw^K@Z#$*mTI~ zH4@&9AkeUh#AdyYlW=zgWlH-{`=QJRo>D%qG7#QF3DJ0gERYX0k!)W&NSh;(p7o8$ zx$VH|aLV1=>`&jqFGv*l*q?){NSyf?M|n`%0-x5npWhyuv}A?@39Ug0FXj80SO%Z? zcc$ZYaEa(`e2qnk8|qoCJg+98FsQn}J0`Fc&1m4R%U#Hu@QwJqZLp>j(}Zwmv3glzir9kJhT{?I zCQr>Aw7Ozo;Gy?|pn$}}wMQxjB2Ao#&Pzs<$L?AxXB=P(a!~i~1MNKn>sp;}QR~f0 zA!j~kr|g-TV!Mg1H>?m`D(_BGo`km@v6u5CcAW;D)w~2Su)KtPC57wL-YpMU8rPke z;Mb4(^qmppqasYAiR3=Ak>ovM8w6DE2%Zr=l?arn@IGE|!o&MXWJAs_R!*;+cxhx! zB#DQgkn*xR1xCmh$)zeM#V55;in}SVh0lI6XUfI3D^^|toXPoDQt0@s@2?2<5!npF zq4760k`(~S)!VMf`n!JrT+iRvlroY{j6IlxHb@!w5?|=`5}Tr5#V7r$5*r~| zE_FrQIFfSHaZzuh66B{#cn*MyyIi^7Q4~tgnBSJWnxC%rO)@h~b8?M21fEP~I3~YZ zfAOu`iVGYI3N!!t;)_$yv~t&ZC6i&kMCL&4MC5CrjPKNQAJv&P9?{ zz}UD?D&i3Lf}&nb|Mx(bA)o&>r_P6oOUau7bv}2V_UGr;onwrM<6jdP@aNCxUf_K$ zmM;%4Ut*Fwts4g(hHrU+MJsIh^QF<5JbWU5(ho*qR~Y)<6bd%en2qB@{!RY<2YdIB zMKIv^0jIvTl!LPxyRmXNno3-(zZRX}^C~Ls`-m4&QDP0-`t6A)MS|66m{G_FnFk+| z#<7g= z3^)xsIye5n#bVUMds|yF?gd-7U5Uz+2__RrekX_tH3 zjGkz$YfLyQ%+W5U;U^4;matFfAENX5N-$)MrCUd3-C7eDZ{>RdeO*=6sS0@~EfG0Z z5*WG#=KJC5+_RHM&U}m*rL66t9nliX5QZ;=K^YiHveHEK$L1BZ2;0HLugYczxd3&= zRrx!}6w0&_HKI^_tV!J)mJZp^2}A02$H zpB=v2D~4+f_2+0<x3x&X$$W&lk zAV@jXUwyet=4iM1;$+Vc+tlC!IH#4?FH|wNnN~JB&nc#5jn6F3NLs{|`h?fniwumSR`5* zuMjkW8$ZT4zYD>*ZM*!pTrR65lR5vxGoSsD%zs2Q@DJgH+j!Z(F!u3sa(DcPceM~0$eu6SF(u?hc{$+Kr`&?0LzDEVxEn$N3kiCttL*xzTTzJD0GD0QiV|~Bpsl(Io4i9)85T% zLuVDyy(f)KfIIM+D(_^Mp>j8fT<#wjUPV*x?FQBL-LG*#*EGl}=DMX58Z-XXbJ|;+ zqDs!jdsbc=%~qUNRGbC$>$=xp0d~HCVsl@Sq#vQ;mE}nNb7c0fT95z6%Z>;k&He|g zfj@)lU;NzP!^_3i!^7oohMs6N^am+w9Q2Ut>tZ?PnEQ2>iCXA4VpD=Zxx>=B?-{Nc zsa=k_WP_-Qz!OQu2CFxQ_Zti;jP6>f-xUlkbOUlt{GRuo&rOVo*1n2NQ&WtW4YG;! z^$u=gwUiH%_qW!twxbNz4H*bF+g-akeuG}>BxV3^#n2ZHDHO?J zNne4nRd1WbQ&lUoHg4(DK8)8mva1P-beI%OY;S<_;Q$(>Pri(VsBK`XP+^sg?ieLP z$7(n%3flz}GMH?4G6H*q7`PLL?f8{>#$*H`T_2jYt*}gX8v69~RS6x5Tu;EVN?RqR z6ompuq6N0v?z+RBG|AHAIBcLps1?U5hPDNgbai(T$A$n|PQ{Rr!rvq*tPQ3R6(WLD zcFaCI1Ez{oh{zi9$EWe+X2cwDvVtQqjOyr(hsZZpeQu6cC8{@0vgHuRG%~kD2B$C0O^nzN|2T= z0qK%@-gn=-_uY3s><|0w_1|mlz1LZ1|0)#26su8Kco7@KkIhgiSaitf1Uc1i0gC>E zz@^;vpX~c?F=HM%wJ4m<@Ks*6cSbeps^t3~pvwn0fS*zk96$!#_9%IoP}`O%VrfG3 z`tAL}r~CJ8d!x0JXuLuc9Qy5o&_(tb&gMd%dotd!&#VYy$5VBEK$aE+z4h|sSjXEy z2kInI<)~rL)v%Rv@grG;go|>h?O%jM*^WvSQ1+t-Q)={uJMq@05!hl(1(AXRY69I( zcy5u&VR}lPMwZU`6SPcXp%l;KpcYFfN3qi%22Znz8){dE$p!iM)INVnM|6T}+(+Fe zXoqS~2Q}!sH!qGh4%f>WrqnGPz$Ba`c*SrmL3BjB3B#vRAo4ueE8oyTz-sQ%er^AQ zux{^GUn8ESgBK=L*_s#3cNIo9((>~7D>JX^Q_U;jZZR>6I1~hIgzyRX+aR)?F{Yeg zxbEn?GkvafNF&h^@XfOR%UaC~A5f1lQ>E*>`>0D0Oce*00ssII0zPW2%HC$Dq;X&Y z03_G|z+(UaC4@tTv=0)X2t6RU1}0pm04+W%@Y)$tx6GJjUgXtK3dOT|fGzI*xQso`*NtKc&%^wIjt_U)T4M{$9jO{X5Br1f1aZCsCr$hhq)mAOE4}9yHBn)Sgb4M zN&Q0K)h4~ycX71~e7LYyepK9}VFs0q#)C%wbC6JF&p zPZ2r&kH|S(cK!70VgmizOpwv=?U)|qJ}zIZAdYm&Z<51uVCJ33wr|-GYaK9-78Q;w zM*`ES6|uwt0FDR%0BQirkChhLplcL4sY2>cHG(9>bQTMz4qI)l4u?rPYr#mXMx~W8 z1+y9w9-izi?;d`{;l5<@>f~5)!j&6i%t5~OT;#a#D*dhI;*l|BOiEzgtYd6?cA=|l z7pm{^_&1L%H~R$H(IUPx6R|?i#8ucrdy`+OB3+>^trnj)b-Xleeee<)`>-4Gjh+(6 zhJdxe?&X_`x`3@xfzV)XeapDj0kv_NcYwDzzre zH4nB;n~tXj+XrYU>p?b<8d=6&9W)W?&qq$Pl8nf(Z;=^!oC_>EjwyVvGnC?%&SW)R z3Khs<>H}UjU?(G=HS->U$fDDj;Mp+v8Nsw~pvUgf2f190J$m(G&j9%n<}N+v7~6nS zQpvs}{4`qjMt1=++mcyq_KvGCL~fIhTZcUb^P=v=K zd!BrH&IWJtn`m3UXJ4K?Et+zEznC3ls7hK%S+e!#?ZTulJw(N{EfF9?D4{V1!u8Kz+;tO;51~mEFK!#K{#sRzac;kx>{oyFW$>23P)z5~ zwD-H)9pGV$#^q{0e0xZ-%7pRe_UaNN1M06@Lf)R9URGUzzR1U9RMKy`?h%@_+8z+5mv5zUJi&UxI^r` z0p(px53(BGNzkK)==XN^d|rs6QB`_qSgHWQeq}}ewlBc~*ry++@=@r4 zYxc?#fo>o0YNl%U?^4+@zN`FBza#w)+$-1IB%P(ACza{4-)FgwAYDiN+#4(DW2H74 zA446NJzx3h=uq|_5a3M9Y?myx*uJaReH!upE@um`?Yov{hSJx@+o>vq!cq9vf|y%| zK>+(rNj^j0(fE`h?=MD)e3N<_I`J32f{(hi_(Nk?b9@=fTtu~DKDf98*b-_t`ilD=pIttF~ z{`|6N4~H7XU#|rw@sxK<>t;jn_NQ&!nwmlbMgtKxq*iWL?~!01BlP0Q2c$#oKeKxWp55eD<06H{Ymp8h4a<|g>0)T2%2Cv za@I9tLOpVm_w&8jTT564aZQ%NA)z}%$B?nUnz%m`Z9nIX zbG)s_czT)ry>Z`bSR8 zf$`zH-a8*Cn#o+O-tU%B^=oX;A2vXimZZc3<0F7LNK1-k+611~Yo@)-ZG7t<7i_I% zG*0kp&QNTu*#dQo&2Ve3L&E0y4soT7Qw%+|nCQ_=NgtN!6H7e~{Z}o^c*RCjt%gU>B*Q9H>WqiASLu2E>I5x7z2%)QAzsmT6aKetRJ@!@CP zcSh&~Dz7A9jtttj(e6`NWsE<} zl`>6r=+&-i99((tntmW;w(c8dOtsUT7Z(ki=M#L~V=(s51u>g0?_~_tzaR`F{VUTd zd+#%D?FTo{`WUM&%AMjAY=3aSMRZVBG*r`6Az8|Qro*Y~p9q?IKMCY$6iE6B?7~7k z<8t%t4}8souK&6r-c7w3pZne^?5?kqEKL{RnJ#J>)3HyF>pvRQ)bNt!Dw56Ip2#Ct z!p=9$GyWTdgns#edOL*BK)y+vURA|Rih3jg8z9yBwE*|o@fpJMv&GQdH)Wo;tQ^$^ z(a4ORS`kQ`urEs}MU=kbV$}%Nh)iGsx&n*u{QKwN`HxHJz-Skd!#q zK#avUpfmviesi7Dq}RUEot=DNDe-H*#~z6j)(hU2!Nh?%K}3@{0^`flvT^>NQph<^ z2q-(s3^3Rm)_BPUHF#r1-MKP@bcq5Vra$20F4A}kQPaqQzY*yoOi-XDY+;(%s3rUG z6fudVA0nG}$un#fDbAfP)Z#9X1G!rtV*7YZ8R+=Qc-FjTIe~)nCmJ45RqHDLZJYOL zMaS!H4Jr!mnt4+>f?noz!iU$flt^{30kQIemohf6|BjE|(x9^yVFJbBO*8!zLMl2a)&9Y*9w z|HWO-Yp9&#oA(1eyfDC57E0(f4gMsT^#snQxd(GaOdW|Wr zSugVk?R*k&Ubj<7Ygp-PBE>an?M-=0kJ1k;!CCVmqHUAxtu9hGwJk@meKrvD?6CSA zM;-O^!a%itS6atHIjZv+V9=N!NaPTWgLS2dTW!=qwy=VGWCQsnf+r39p~az@J;KnQ zUsMFXwwMlDJMAHJ8fF0tTwkmWe9yj>z1Ct0vg1T`Zqe2~4?Pz~TFIyS-p%eYdKS0K zWJ-B^-Hj8}nfm3)Lddh3G;5&0)>pdMz3@UL-rt$I9B8owxTGq}W~W37$IFKIvK`Wt z@{A4Kw(w^yX5SoBZ5_1tr-tDNsF7!rVpP&X*z*$2qbHBzI}u=%<|ui+jat8>Xo3I6 z3cE`Qsi62xwVNJNwT=`_i(dm(L%ZI)9^7=E?7W)@Ti&;2e;U0qB=dscK;!<-1eO%}KsL{xtAzDdc6U|6vpI6|4YwD;}m6O6pJ=ro^0L zqPmwMeMb!!{CXmmuTh{SKgeoFM**m61ecv+hwdFfdM$<~+9AFlXa7@BCH!M_u3KyiZa-HzZuvD1IvUkdr4Ym@q zv~&cK&+f=*7JJ^MFZZHIp+v`|PRSG~#nFlD-nK_jadOHnPyf5s9n`Cr1#!%Uu*$d0 z1wD0MHiL0#+8FZDqMMKX)mI4)O1ox!BtN2*o;x9PdT`Kw^!Cto&~P0aW<5`NN1N&j z>R-bKYKIGzr#{*(2!X9G)N9DT#Yj?_DG$dB#pw}l%U$6w*Jl(2z>(F~Fa5j7V9J8% zJ2OmJMu;ms!J2Ke0HMIqet8rynTr-P5M+6)UTWkz#Q!%-IhVRzxVY`>AjIS0_)U#U zqoGZp06NYeDW~$pEd9=UAkdf3+5c|DG`p|y)(R&O2wp9OFt=a2?DwiHx9QujA5S<)_8+B_Nzq~>lbp9bCbReU>&q9V=Vxr}CHINzehZ0| z_l^99cJKY(`#qOzZL^pSk(QV7_Bb;T)!*_zN35TBGZBRzSu--2KM0j?IvBn`Ox3MR z$bJz7t%NcxP-AQ(F2IE&d0Jk8k}49iHl~LNsuNEcAZbs8XatROp==Qdl}7(3Yw0T$HIEzW80d zCCgnzDs$}G_X;0$OD+lWixZ20E6$%pw>(?-p_0n1TiIAp82wa*Y%gBh8NrMe?fcF( zZ(6+{y_U|TE}P!>ZL>c?8MkDq_r4hlEp`QwN}L9~Xu<*f-)cNumHmY!zQX+%5iFp1 zX{nI$LmJ%zqzV^GH$fZH?g=k!KC>s0GBwL3aauX7DqBqP&+>60N5!Am?(QM|C!+@FHZ z9;{Wlqp)*%uyM{*Sv=8sH#AuCVo>o}Iil;t;BtajU9KS} ziC!hw4m>-2CAyt2tD_oD&`##9`9ojCvi3&8Z(QlRLWWw8(_6J`OdkEmE?5$sAj z)BznG7^aGaO#%2f!1>p({_W5|y#F}=l;}W_uyBC>|7!H_`%n~&MFL9)70Duk<%8;C xVW<07r~hgJ|6A#Qwbp4+xU7;`(I{C~X3&2kkAKGfGbI}3%L>M~XZ(lnzW@oafBpaf diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml index 2ed22909f9..051d742db4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml @@ -74,7 +74,9 @@ CONCAT(capacity,'人') capacityName, address address, longitude longitude, - latitude latitude + latitude latitude, + PRINCIPAL AS principal, + MOBILE AS mobile FROM ic_city_management WHERE diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 295ee69e36..3894594840 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -74,7 +74,9 @@ CONCAT(capacity,'人') capacityName, address address, longitude longitude, - latitude latitude + latitude latitude, + PRINCIPAL AS principal, + MOBILE AS mobile FROM ic_public_service WHERE From c0176da35c570b00f5e3c0937475c775285f5fda Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 26 Jul 2022 15:44:06 +0800 Subject: [PATCH 114/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ResiServiceImpl.java | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 9c613b2c56..acc29d12f1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -94,6 +94,11 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { // 2.用户至少配置了house和stat规则的一个，那么就先查询房屋出来，然后根据房屋去找居民 int housePageNo = 1; int total = 0; + + // 只能手动分页了 + int start = (pageNo - 1) * pageSize; + int end = pageNo * pageSize; // 不包含 + do { // 拿到房屋id列表，去查询居民列表 List houseIds = govOrgService.listHouseIdsByRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, @@ -104,30 +109,32 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { break; } + // 查询居民数量 + Integer count = epmetUserService.getTotalByPolicyRules( + customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, + houseId, idCard, name, resiRule, houseIds); + + total += count; + // 查询居民，满了20个，不再查询数据,只查询数量 - if (resultResis.size() < pageSize) { + if (resultResis.size() < end) { List resis = epmetUserService.listByPolicyRules( customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, - houseId, idCard, name, pageNo, pageSize, resiRule, houseIds); + houseId, idCard, name, 1, end, resiRule, houseIds); resultResis.addAll(resis); } - // 查询数量 - Integer count = epmetUserService.getTotalByPolicyRules( - customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, - houseId, idCard, name, resiRule, houseIds); - - total += count; - housePageNo ++; } while (true); - // 够了20个，那就截取前20个，否则直接返回 - if (resultResis.size() > 20) { - resultResis = resultResis.subList(0, 20); + // 查出来所有的数据都没够到这一页的起始条数，返回空 + if (resultResis.size() < start) { + return new PageData<>(new ArrayList<>(), total); } + resultResis = resultResis.subList(start, Math.min(end, resultResis.size())); + // 补充额外信息 fillResisExtraInfoForPolicy(resultResis); return new PageData<>(resultResis, total); From da0bcc370844e66c9069fd8fc96662610d370229 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 26 Jul 2022 15:50:05 +0800 Subject: [PATCH 115/288] =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/city_management_template.xlsx | Bin 9069 -> 9090 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx index 5d98937f402e3b7aff1177e63120896be75cf338..b9db105bdcbd52e1c214660a192579876630fa37 100644 GIT binary patch delta 5055 zcmZ8lWmpv6o1LMXp<}3_q#J4J9ubi45QYZn5C)KLm|6+N z)yvKR{WH;p{qBpB%BYXUiwGO+XG82turc(CGU|(gS1uI>s~Bc9&hamuQLO<2{6|e( ziu;sE2Mr}MBe>eG)vb?fz&W0NmAg2PHX2Ud;#w6a*FqT2RM?rPo-ul=M}oY zgFX|CE#jE2jMf0XVj!;>qKp=NWN$ZSS$xi5$|WuNK~=D_9A~Qb$!#}okMGYjJ(3I! zr3@?LZBIfj?R;N-OLD0wUZKLIjLj$GjM!HiwiZlH+=1izD1EP*15Z?bVQW5oNpNdJ zEx59sc+s6Yf3-6c8V5hX`8LtOj@b_7Y09^)%?}_+&446?&R@7oH1vk8cb3j`)PgW1O4?cJd=dVXg z1P29@l1_){G=*hiN+yh*nw1G131ca}Tt0Ux9N76eY!9Mcs%)ccA?KFG$DCjM`Se6` zPY>EggCiLw!YykeQwI{cWqD!$iiS7KH#j5NZ=*%M3w{tRz%vQsMyg_M;2kfT@b?}Q z;tKZ6e!iz#bO~z{?f&WP+hux!FCU@vt?%iYx$1aTadvQNinic;#kC>Zo>QTZ*_5T< z2ZQcNJ_K5Ef-2Rz_5-%28dLnmlLUu#79$(e(5hBcwk4S2;padsBQ_}42> z(X(rXk2%+7x9|5pWV*pT5<8i{6=a8vl0oBXuG5(>ed!ukEznoGSrU%SY4nJAEJcz= z=hT;vF#!NJJOF?efRJOOhqoFo=`1OLLhHZ68;lGK6FeiLN;N_3QLI$>XG(<<=j>Jv zKgGKbXsvi#A9Uj{?g3RG(mOC#;pbxx9D6g}YO|&b|7~wa$C0~QL>gE-Eg{}XfnkOd zN9E0tsTgxwDl?~R-k@%-+LJBTNT3w9YFo^7;n{Nt4G#c~;}Z839*$);A~&vY1%Mcq z$3X@VIcbpD4y2Fv5P4-GVf1%z_ip!Sq-rS|jd=DM;wZZP!6Z-|{;NY$K!+!ED)?i6T97`M@J#t5rE0I*u_jkPS6SuyqTL9aXaj+a zKw_#94UbQfGZj*BOOeAJh%9oh;kPJ}GD=2yz)hj8VC9Xnm%KWIu*PgbXVKoNoY#@q zWwxu`3#oj9#?kPb4hLA5k3xBRa4x?sRzB&d72)^~$@YlnVm5}R(iF?n7M}qdj#FAdcY>u}dnvAjGUO6g z3f2#_cJh^RguSMm~L8T>u9}i^y@see`LqLKclbEs{)#nKxiSk^M8~suoD@r0)R2+3m zv_U5QLO(*U`=JEz~tW^G9Y}0q4LwHnpcw=ITj#aYl@d zODZ+=^`1v)T$D(D#(hg!z{cl;ArVkU+0!svjIXCD*y|f519*i@oP)$F=xI9Fe#tdN{gsq?(^KYv6R4cqR6}U(n{68i&_u!HUalBZqdFCKnxVHEeM|9{PM^b_Ps)3HyJElr+?JJb`){=3ZQ#(>(^f*=P z@-R=H?rIIpah|$zTwtDHmZECgH_T_PcG_RBvk0UXy`Vx#UvPA%X~uu5Ay5BG>^|JL z8TtP1TkDWoZu9L9vTS$g`%Yi-A@nXRLS$>S+dMCHRXg9!>4$?i+`-l7GR3=lL+N&J zP}y?z43i^D2t#m&*9vCSEHe!254%4F_8z>YAc9=e+77YLI~}S9kT6V>jt+?+(gnB| z{xXJgu&n>>L|W;D-~Nx+iuO2O4&ZmWtexHucA5Vz}8bb zsSQ(<{NitmR}jC^)dPvHnyPbiXYwCFlgJYG85M8jjlg5k?*h>*6vin0tuNgducsP4 z&|g2P37uM2sJAS5ZrtNtccCG2KAKB5hv&s$hI$zDB3g3Z$WIkh3>FqT zvnh85&vM=x(og1ocH5;_C65rfJ-l3=?zVCgTKr%zU! zso52CgB$$ic*Zco&PrUArJATqnBT%}!S7mGo}& z!at=vB_!SLq7zLbWS0a+2}d4Jib~?O!=hQXIq*_IPniNy@y4tHj-_wwD&9kGPW5LxBaSZIlQ?&y=pmuWj&%^A`8F5z6IJr=E&CmZT1&{ol?u~15%RTEM$GFg|@ z);2eCZ!(O@&Vp{dScC8;#j%2u;#k;{;Bj_jNqU{p>&vZ{7dY=KUQEIO2ES8}ai)Q!QhZP8Q#_|Jqka-d6QH-?kT-PwdPi zhP)??_ZXPEMpnVZ=ZEi$Z-^_YPxl`)hGhIXXv7&SYsZvt>4q!=73WH=l{K3ZnBm;` zsr3X^>`MBvol3&#Q5C5Sp9q}to$!C&VZe8`R|y7#iYfE?bY0vPod71-`d^~*O{_R+ zGpLaWc6I*Is!cv?S-n15p>}@I8+LV+(K72t(*>oJP!hy6#uYxAOPH(KNM+{UU;S}`MrJ7-Dp=m^XYe|1I3A@dOvBP?cQ_h$7AV4nbRB(r<{X`n z1oA~M3h468zh#@{#L&?t(-Eoe=&cLt*INjZr^iers@80}`ZDRFYnJYfgd^V$Dds6> z=c=@7$38-qXd7Xobxk)A2@+ST}>bY1=s?GeCohF(zv{ z-(8j-QRYV%5JHS;&fftC^qi6*Sk!^iu`ltX*>d#dn5R(*uk`llgoo{Q!772+ie!dt8rL@P#8`ZQYr^A|&!S z%NqLdGT`I}al8?`Q}{~kZWcz6R5bB~ycZwAvn(JwKBTdMVVLp~vcO?sv(NikwHUkN zQGCko;!V5GSA7Ubzob}r5 zW6i`@FW`gPni7xZK$(&RKFkr*OWkd-L9{GQ6QpqpVk2q$qH$a3LZXp+3c@7ycj_Sm zGxhl*ppgWJq-hN~Z|<&!7L^4|iR1!#_#x>mX_W$MjC^ohP1^j`tE)ecQaho-hc?F1 zQS9Q26g%;2FfDtVSJ%iyDz@pgl|mjAm`F+>>W$deqX*fX?^m9Di=dB5y(ZG&+KuVy z%R4)R50CNj6%fyUL+^d1`yRTFd%F>-{hKXzTy$UJ*u@Vw33WuC50*N3o*a)|J%a0! z(+<9mh{k}&r_87qzA5aH@BD+8aKBm7|1!dE!k|pLJUH?Z^YW97D4CnuI8zh0-k=n; zoGdd1xVBn!RL@jL z-rh!k68xr*mMt^qG6ToK#bHaCGKt8fk9&F!en&NcG#5ZUT5yCk%8E-XGF9(UHOd;6 zxv^(v&PzC9V$GJJ%YwrXfSmS^4Y|{NfXbXZPT`p-Cx&-i#-jl}TWRTxFXNKA9Vo`OA$C(Lx!>oodwG*&BMqGW%Xp@Fd7Kg#6{fU>Y@Fqc z&x(9Lv^2Qjw2b-Un%y*D3VNaoMta&~-|sHoO^p(Jo(P(|c;8xHv*KKGbsf0xv@z>b z^NUM`CHA-teCiLS>=Tcoq5jb?LXeNTo`Em_4EBM|i)azMck7Ap`nP_q@%W9batsN9 zjkvhP%!Sd2#N2K#&ay4%-z+yr%n;uet&&P~9g!ri{+6)}xzC!;-EzELg1z6|M@M%@ zjxK0ifyY`=2|C%=lmfb7g~Vho(kss<_dDkQYlSPS3B+#xem8-Zh#p!n+&!&P=dTx5 z4Pd{Aoaivp0w7Dv*VsouBfDIUc*d<9f;JIAtqMoXz*mj9GQ#3_tTCl`3=Hkh;SoX* zr;&hZxvnp4KMy3mgIS|>H4{k81-zq9k<6b2RB3h!UO(Rq-~O_bo)K9L23Agh< zSM{CVx2nsks_UQ;Esv&qxV@iD+fcEvKc>vR#blFpOx{I<=U-wd|5r$0j}<7&_%|dN zL;Rqlf$NR`11&XT3jzZFe-HKVCUXRcRT{{J&}MxMe1?c*VTK2XgdVbN~PV delta 5001 zcmZ9QbyU>f*2ZUO>FyeGkOm2d9vr$$TDn6@O8nB&HFU=SG6=#@k_t$tAR-_l46P_2 zg7oX}eeYWLy?3v5_FvEW=X3ViYduf2`hi*#5{$2q5Gd?`%m=dqsaY!8gJQHJKcm+w zHox#4NaxH3m1B^&{fQgGJib=Vn%dL{PgwrkxdMHWPvWOw$9t2asub_uu|TFk)VX55|6@iwQAHoqAeQXaL4e@)0x5bBrc7aF9S z6=mkKgy8#T45dzcM1EzI$S8l=Z%?_w@d{sfs*J1+vz}d7Lg!Os`dPRAt9G-WzV0&P z1cr3njBRj>;%MvZ=1cYkebY8Ua%ductu<~-r(T~eJHreG@Z()bm8G|s<1qPWjJiO= zpamwRNc783McbV+{WI~K201r{!7S2&fVy4(_%{FdFc|x(A$2D7c&wD;2ZiPXId82| z)8AKSK#spfMm^;%r`mc(D|B!6Nvn!AZWiq9bVj2OY@m&cM+*Xhh(OQvHk50}o9&@s z5QrQH1foGo;xYodo-xX_h_kpG!h&mAj%N>Im|3L^y4))2!kI=M%rf~6w^p3I35FNu zigdZ>r3c?HzO==JvJvh;T~-APa5fyi5{;RzOhgcu23s+L)r-{Hr^-#$P|TxSF7jZoDWPYJ+&FzqYj|Ig^6elXRb1u>>qUbWv=-7#Gj$9I(Ouex1Gxx62Y@U~EIVXtBE-kwb7N+)<`DE_? zPlfnr%G*FOTo7oD5cvU56u1+M(xc=-AnsD{$0_=L*X(gPkm~-%Xe-!uYmj($142_$ zT(jVny|;J-hnJU|rEY%z@x5T8fGItu0U2v0nUR#(sxQC7OOL8ZFozu=^*MqUr4y^~ z>2i-Fh$H-olf1}El}Lyo=_aJ*!mSx-#l*Jhu(YZHMryQIrb?0wKm(ycA3ev2jLF@%K-l)V0LkInIlFB1bv{bgE}Of)&TmnUAxN<2Q#>BqJ>6ym4?M zJZquE-J{uTH9@oh$(>^u`L2CqtA?71u>{dLF{_3vUkP2Xb;m5*7nCn+7sPau58Lj4wKRbV&wM$&efa^M^VmBZ)_#^? z)NMAsfej z&`V#p*%cx{lG>pn4Zi2~m0+4wo9SahiD_&{3S%SJmGe6{y7!i9b}e60s}$5_H5%L- zlRRTnCV$++i%4$wRH0QZ=ej%*hrM2fH zqV3Bx8s)WLIFu9ZVOR7C59n=)YMgv9dH*+oXnH^e@aR#5T=)Gque<*E2R%98zqou= z^o!&7`u5J^w}}e_dtBE>R@n)Nk}@PZgEt$yk{N}vv^yFuCjk|A-D-IyygRhujqiQT z;@bO*aCNIJJo&g;N8iEtUGyNZE&&($bA_LGfAP}%b445yI+(ju>p$LfE34CV{n`I! z)Fa!JkXIOkX&8oMKZtaQKf4dE-zhYdp@Pd07W*x%`Uu=>3A%A-zaseic_1yCM4SZp zbZZ4*UZf8>GvJxNV$O7v_6}&W?te~K@F^|8FIb`)$)v48Vp)fK~g}yh2BENrDMVmA=P6-sdojaa`L!#eHxu z5M5Y#4?Wm;FfO<9!_AF+PxG0b)Z%WjS_i!$}eN=^qT(Y2(E|GqX zM_=7z@*!MTuwP48=$*VR(l+W<>9(9Bc&DqNTVQee^Nz{7f=y~=cZ__4jO>vjrgq@4=L8Jw(bTihBSQ^YGWm;}fZ75=zMHni{(36RbOhTYBXqfaS`X`hBhADAIpu3JB8oSTZYq%bysbiGJDi? zs|xvTfUub3_eaUM1@{Eo!|Bh<`hn(CeqL{25&8nP&eXJ!M@wKd1c&*%*EajoFE~4X zHGbL9vgIheHyCIk>aN88X~5v(E%58I=^YQEUXCEeVXV5udxSYw%;n@@ko!dDB<(%X z9Eqwg5n)7k_->~SA$h$x;)=m=V2<`Bylv}{=oMF{dk&FAAbV{Rd#ckW>g|PHkUw?g zM)Q~Z0tuOUEmXQkNT#zMX$jhMFDD}ZU)Wi{x#YOq^plb7dt z#j0v@pMq@LsMf(4=aAWm=W+5MtyQe!&Ii16bJ%@cy4@uapQzpQ-{uryd%9~R4Ymnq zD&;wQ4^4B9Kt`}*P#~W<1*I+^#>{Tsml&*OfSj}VLVyBo`Qq(>@>W^inl;i&}G(aWBI7k(rPMhYrnE4&H+?vl_uC~QJJ|w#3y)MT-@O=h z$}wBkLQAB@4$jrk0pA|hNMZ!;R@qLt@G^Q3N$WW0CsBKlPM1BTeogN%#0y3nFPWm4 zJ-)u~!ME?2g&4am;LPUoen{bf>~EcL8|QL{zDN_}DZviY?GVlT_-pn5ZW9>V6!v0q zkjM9azntyBM{Xy|P(|CC6p(#a*3_N-MfDVJjvw!0b!6ifE1+M9kY=-JV6hfWPMQ>} z9PVs3iF6{!VwMSnB6CSOJHw3m*b3kca5mJGdO@}mYhAzJd5+LxEPbp*>9n1^#R`#r zEDIBlK>Mhme54>l-@D1rZy|b&iBl=}}9B%~qYqSZuSE7Ow61eTk z5QTOZuST%7N`Te5pH9rae09I?7RvqJmX#5L88{yTPJRaSzma263Jp2h8<~Fuh=5ZP z^fPLqNaoN5@h^|4>R=H!c29pA>O@g$2$XA1evqnBjv>*Ck|D3AV_SQ3xv_M8^y*pY z(R;#_M7QB6qm7bkcddwu#22nA1s@JCIow6Cx5XpNmFvtAtZKeEm*zo^FcSqRTWFoc z*61)CurX}WDA;w_xw-r@6tja|Nmz-t{qCLi3S3W~8A1aoW z0zpTIS6k{o^;}WMvs7I{$1`uNi+l4DHY;#FNUV$YxGB{+llezpY)e6e_{xfHo?e9C zDQBQMGT{1&Uvp5Rc>e3p^%%J)YR;7v0*y5oIML7fg_2`Zyt~F@-yh+G5z^ z%LR2J_AZ9-5p{_ILrisbyq)(i)CdS%E;j;;QSW#rjHg z{c1`8-Ne=T``x8M(()yVF5`P&rCCRTZ=;UqELPpAM?U%AJi%T__4_(NY{~juKU( z9JAYFJRP+Xl{%jzO=N9STB0%g!D9{TneD6Ey8~@yJbNgr_R9>e_WZ97rQ9C7y^->* z&8Rb(UlzHKzf)AsfDI#fYh=!IF=OI~CNjHK%EsD>gm0)q^Bt9qdU&&SpCyeDka+bfu|0ytt^KYj| z9&`GEy^u~2X)qF51QBNW?-~BLwi=0r@c+v){oR&eQzS1J49tbJ Date: Tue, 26 Jul 2022 16:02:39 +0800 Subject: [PATCH 116/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B6=E4=BB=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/city_management_template.xlsx | Bin 9090 -> 9099 bytes .../excel/public_service_template.xlsx | Bin 9133 -> 9178 bytes 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx index b9db105bdcbd52e1c214660a192579876630fa37..261a5daa08f5f1cf1fd371af10af37bbd9adf1d8 100644 GIT binary patch delta 4030 zcmV;v4?*yPM~g?WlK})ny7K#zmjNGt%SyyB6o&VL?@+RD(~ENi~Hl>>qm#a&3w z%oN+SB+<_727Ce^z@1BR<-&#F%Q)y`n0799P!O`o`Tz6fKZk^aS)N(9AXQq32zic+ zED)^VshC9QJQ>=3WGPJrr&%E&LUT}P5by7WtR$?Ea4L%uq)tIuh9neWWrU`GT9*W4 z#io!`F(%BiNf2HNG8h}KBXw#f2EW(|Nd3>oAg zw8Ea_;UBLCnX5k=8l~mTQ#~)uOzXI9HfJkw>z=7}Ypkluse&ek$?xII(aBjes-22@ zR}4@baz>a0stXx^y*w_TAIu48ajRNyFr!M3%(BNR@WXk$d|NEv?>=4^pHKH8{;eBm zGsB7u+%l=iYKDz+5gZ*SLlpb2@7r$I_IioeC!GW0x>xn{JN@lg%I+vo-^i0e}48JBLaG007_!000;O004MwFL!Tp zYjbF2Wpr~db7*B{bTKY?ZEUqx+iuf95Pe7DAFLJPiTai_X@X-!8wyAuA+FCGdlIj@ z_L|*w+`b~gCmT0lf{_IA$foSE6RgIk9wx7HvP6WNS- zwtq`3$RZK5Y&9d#p6+k$5KC#A#gvN-X55tR2RevKLEQqSnTrb1u&7mDZj&?0@-}vPcRgmfDU)>eR0FRZg5qM`s%K4E-Wl zDU}CBzJ-Q!6t`fU=_4bTgng#Lqd+i*>&g!&KfHr+8|85bP-+`vDdfZcM6jrZhI2;B_u9Z|3Co5||k)P9?U-vLld0|W{H0F#Iu8na0VAO;2e z{FU`BlWqXNzussB`MN-r)wVcJW2^8pt0?B{@+YrbSWfP!CkE8;- zLxF5*=B+~p4C$7wD6p=Dmpv@r)(vaWHR(SSDe_bQg?;B7@?5AxiB2qvwjL}|{BFPR za=vq+Hm)BIUFD7)gpTjERefDk72E6ieaG8tt3SA9f2}oDC5*aWzw7#*-Byq6P`$qS z&2Mak(UEK4+_&vW0Ty1^R`;Xm;98{;_V(>zH(d7*Y!AK}_`$Fn!N*{)5*`G0w;v*+ zp<6LDtzH>+9Z%id@J2&x7==pDA9+z*HR&aVeDh`>E}E)BxOMzKsB&BR_D@HC^v2g; zosc(If0ZlWxpGBY*Rmj-08Xye>wuY=evHOL=Z;cWqif!4sCMBfB5t_FP=TbckOqB5TcI|R!wvb$6kEr z(DD2LU91op*^+|2-L`63){VxtrXh-j;_zLsChS~hy}q0awPzPWob9S=F6{KYt{P=X zi`}KcpJn9|nG;6Aye8r-L}Ib#HNm{*g?dlsxfshu}gFGZ6%7T&OIgQabZ%O2b00i-dAc(t*?TVw0|r z0gh%kD$oT%iL$M6K`DUSg%COu$8~8#3S$jdLCMMiox+ zyh<*Tsjb&q@KPD-nYuKFS%Wol=moKIuYZ{3Mwe<#o+0^UJX0v5hb?mm~o7rOW zi}fb06gyk3PBAX!uwId^mepCdtud}QYUouAu5}heRfyq6t=6pREyL6cOVzjve->Sl zk{C8Dcol{9a;slrlGSN+c8W4-Med7xOgf0Js08E5<`OG??9xts$12LDwG~$cZd6-I zMS^ux(wD6$q_~l8)%LGMK9|zP%4g-X(<*56<6?a!9b`d`DpyigVrHZ8!EhyJa+T{f zdt^MZg{kzeAM|01Nr`uNS}=<$-nwhY+ir1NdCld79a)x%_84anN*`~ro^E$I( zY7Mhy)N!AfTXtehw2ybn1XH#Q^g>}-L2$%4=A^)wW5{z7fO8VxPqwkM~yLMpV^9EQ8e02+tJ?!(1L<4r|?ZA)hUW89Tpgrl= zP!jFl$4bJINI7-nfULqPhH@$i3r7@51LiVJOK4B#xVtd->Vi@bfAe#cT3HNM%athP z1ka)>L6Eedny?hLAgS1=V)5kiMTaQ}i^P>X9p%WvqFZ7(jnbAM&gZbHRwkcw11+cI zWzf;M3?rfe>qaHYaL(Ikz)5-w*c#-tT;+(!#h?M@sGQINKnZg2wwyY0oudJumQzU` zQaC{pj&GJ!OAboCf3*HaDV#tlAPH$crR(MS_v@+?ZX_U3XM5XMXDm`n_I=LRn7UU0;=;>E>_8`YBOI) z(enjpY@(8L>83PXoh(-mWTN)$(!t3!y64EJ!ebS5OR(kIf1*pGF&DCWdD~5{ala(E za`Pe7K9#eLN0FN}CjzdZ{k%a|Sdv?A1I5LsQQ97!cXqi7Kk{%~_cyJUSynm!YC z^_OlqMfE*NcOl!$)Ae&PS_N&(Sv9j-Xi$D$(JXMn&N&*CEhmb+tIMh*H+dHl2Cf(E z=?cI5PWIxte{FczDd+*rwmN?Lbo%%`m71>XjvN=x=Mo^`d`Oz0u6;{cQ^sF@ zG5zPg$sdl#Pad6p^3n9ypDEDl6Z^m-j!6xl!b)>7f3mnhdJ--OJEjUueqE?cTSMiC?H2upzJs^dkjO->9V5a| z)TC)Lf5Qd*8;1+3B#cWHKdqRX4Zt0<5yQ@uLMB0g=^;iO47U>hXPN`jV?D&cgM$X= zVMD_guZ=QP;DCUH&GhsyFHav)$ztfiSs)3C1OcYH7*wK6ysPijfB!sOJ$&4aPe)e+*<;q?E9k{Ofpf_kW3Gyfe>8$b+Tn zXdQokO79n=3Qp|EM0|R8^5>KBgWr$u->}AR1JpT0T`2ES<$58YqAN`#Q6l10))iE;wX!7BcObk}?OBiWbW4&pP zf8hBqBO;H~rHQ7vO8!Xu3DsDP9jQYy%RH5h7qppdSWlE-HhysL#j^)cGtWN!AQ6vG zmN7y(-RGZ8Pro{Qbo%nc_on~7fA;YC^X`Rn+1?~5@~O~scqC^IW79im`lf8gbt@@)P0-ylq>}$qK!g^j>K_nOevdKHVqK~mM4NuZi#G(qZq=e7?WmKrlV*@1#Njfe<0^2 zdXTi9srt~l@U(F5258xI2U`263lDGLlgG5ThrsCDgYL+UZqYB>DtrGu{2&JSD8B1$ z=Z+s?7HyTie+xZqLdw5=7`+w3a})4i83j&T{n^e|qqV(b8EZ{#tGQ-Y?b=$awza)h zGdo+`+g3|6w9dPbG3YnXt{v*;Kg{o*4V_-#hyEa1@4+)H{$Swr?Ac#FYgJmwZ=V5^ zYoQBw1+lTQ@;BMFw#t1V>SMS-Z2&DXq7u^IWZV2dv%VP71_9QSkRLz+K9kWOGXY|g z1t60IL%Q<&lbj&O0g97kAvOWAlbaz&0mqZ$Atwd={FU`BlMf;l0dJEfB02#)lVBn? k0b`SwB0vH3lh`6&3H;wXhe`tg0N|59BRvLg9{>OV0N$dw?f?J) delta 4047 zcmV;=4>0hHM}kMNlK})B0^*{RmjNGt%}T^D6ovPK?@+RD({^S$8rlx1%*p}5isCLL zcgA9ymL%Gl-GEQv1GsZ3u3Wefd>IFQ4Aah!9TbFYa?iP6&b=fYO!LgT1*y_PM96bo zWPxA>PsJocXUWjsLzdE1aGDhYA~XYq2J!Ar$V$Qr2`92BLFyEgWk^C1Rz~Q5O6!tf ztk@OgR5`{Wj5sc2PPMtp2`(wSrW3%v>jpRnO*z#R*Fd}65YY8_cNEBeU#r3jAOeFW%;h_q&hR`RCJph=1z_ z+RU&d1Gh{nvYcV9oOce7k|BzH*Y|BVu)Tibxun-6u6tQOztvx-To&?Gh<}NF+Yb`2 zN4oo@8?=aPK-}cs{u%K%vls)i0S>Wgk8w5w001Kh000;OlUpMif3;QHPTN2beXrDi zuvS%{if@60q)8AYgd!CQ^+KOF_9R|q?KQjW7+x#2|4@nd{s5{F5B(bipV9Fp24h-K zt6H-6cII+sX2<=llaL!rkcx?DKpfL121K6lSu`Jzj~^y$o5WC>Mn2^tf&n=NMYe{| zpY>BA7b*bI25N}Ze}Dv9$34qZUH~CgridZJlbMhq)wq;%OT`kXp9_WDa&5b9g_K34 z(9n}l(II9t=D}EaNeGcHlt|!IqyH*kv07<6@t>s6mo!DLD}U~|I4({qea?ErzmR!S zC^6HfCqk=mt;w=$b!$9Buc7FHV1-mJl6Vaj$4G9OdLvTMw95G1Mow=du^gVF!H29cnVq`g-3bDw5`?zIix^qCLk$RdfVFa8H z$X*M};5fH|Q#4>z7Vgeh)+Tw@52fM5j3!)<1pmZ*9Slg9toGiC^bN3ipwX4KiDf1d z%~=F*VF?@se+HzT8S(^2t@t%UmQ^S*LV8koUubkYW@m#KUZS)JODlN{DjBzw!7(jl zT8`Ov|15-rb3-_;ggU14h|qc|gkve>Za!)W{m3ohxU$rGRH$7Fbt)m(HrrjdWp|1% z9yCK@717LdH>R2n`%h zlrtQ&j$?QtiL$_95b8&UK8>+oa;7vfDCZ*G;WS$0QB#3P_oFz`2cQ(4BP??QH+Q8J zvbI^=f4Q9(P7hyueRHGJMpIc=O*nOiFOL(UUtfJayE(tOy7+u`cKPc1+s~Wx@8#m= z$CvBNa#3LWRwdlG>Ms9=f)5@GDaQ*MgQQwu0Zc)s0NApiJIdg~I z`eWasTujrG*rb8r@L#x$kqf?m!KLE*5Q}@XJg^zYSTYAx&KcGphZ&Ziowq<)bkky? zMVyz_RA}sr`82@4FJSg;6I;zp2)$Zhn=Q^J`DWJMtKa+Z7myyaS_mTse`eyJhd2rV z0NG6d01W^D0C;RKb98xZWpgfgZEV$C-H+Q?6@N$Kf3RG^10oaKalX2fDV@w%T4_Nm zwMa;Ss!Za{SaR&aajKa`D;2tBU{R4!7YeJDSavm(2Rgul*lO8!|CuJuJn=7Z?!ET) zxyg0nwiCxQc^KRA`TCuYe|xU)bvCaZ4P5269Sj}cYpME%rYg4A^?Q!D-%`JS(<(Jo zWf*q6UdQ!4yQLo6L-pF$*T1$o43Ay=#(`~z3b62oE%hJ_53iQX!|s7S=nOafL)(LI z`hGCzgm4<{mxqUe-RTVp(ZDSmnpP_hI*zAqZF-}DH3)}F*B^Ode@iv_C53(SW)Cjv zs=~On{T`@tOZk>^<=a=TXt$I%$nlR#`0SfM8TsKGCH9Zr@ts?WT8>3wzQ!zHM)be0 zPT2t#GxrsiI`<{JkV%QktP+vb4QZH>`eWBfimUD zyIY%m-%FfqXy9dXe`RZP_>OYB<3jxD#6w-*^#dh@Faj^rD_&<{vpdFTzkdGo0ln*> z6AU5x7-7XE*J$iTcMcrS56HzblaVed*xzfZmStV9?`RsKSSpU*^=iT*v+|OY4Ze)_ zj0nUMS49A7@Ml@81~B%PMZ{gCusv*DgK!oCv64xao;47ce_+`F;~J|oZ$8g1*gOHu zd1)6KmJW6tk`+Zt-6Ee%-piN=X~snYD;D|WC=hBF{H;u2m2h5VE-b7mHGPF?J|8Xl zi~>=lG~1BowUs%J=Jc8z*KF6S7wfnMQ9|;qenB|Wc3}veiQ~GwA%&{Wu54`{cEZpO zJPW>7qT`##e}~Yic+emdSC$Fo(!2MA&arOL)XGLM^j)V%wAgRs{s{WI&>=l@N!wuT z_M#gcuV)|G&^XsA3YGVId!i;CIwy_rck^Hsb zUtbsg@l3+7;FC{DL$(!RD2-53S@>wyYvHPI)ZMRn}E1I>V5h-8yMYgtUyHwdvaZ5C(w2**_rv zL;sKr2Ywj(132h8oqgZyxNumGDdPVNC}G747N=Tj&mZl%Hb`U7Ksc80aFssz0iHzA zYs(qfJ!drFa-uSb`f8KRYs|W-)y=9=qrK)Uf69(c3lHeJ88eIvBsc+tF@o{UGdKvh zXN4fQZH-c3|^V6TuL)<=TZ`hrAujE)>avG z+XnfNHZ!X~5yiZnOGHSlTtbo6Mle8DSmHQKOIucLvQ>tdmrUbi;UO!Gh$0(|h#(`3 ze~4lcj8VCT;@!1f_Xeq_Kj`xcZjusy)JKcxuy24Yu#$CpatKdAqeE7%*~!*s$949- zf$hPvtsR6;mn`~r;nZd;wMYGQwq%t)Vq1a5a?Drh93HyI-y03~?7*V?4X76M>NXvF zlJo1a2Fazj13$F8A>9E%)}&uUNwSI`e<=x%uL`OpLQ;phLNSqqr;i-U3TT{Y3GMv? zf9K}k3dDJ$6r3zjYHdMi09XZ5(uAB?UM3il7L=1DM=i*z3w=EE!BuAE3 z-6F$T*g}qd4wKIU`5cY3SV`C%S9m4$!j?>oWO0W?(2RE%LguV6J4hpd-~L0!~m7PBN>wy{>t` zQP_Du8Uu?At4Xr?(#>j6T9I;;f0UrbL7PLEnnblrhbNSyOI8EWP+8>k0^Qf3n5n*_Nf8FQD}`J1QvKY zhj9soBbrje)vRNu*pudAWq9M2R^gSS{sk<@6Q4#M z1jL;XY%%|+5W-#LHEwo>>WD5ZwIBF_^A6NZv?CyWj{t=QfIzzw#Jvd|Hif*)-BQO- zo=hLTr*hMky^-U>%S8+bf7tLbOHk9kp_G*ImtRc(ad-0jlkww+=bwBu{ncj*jG@dv z61@qND%~zK%f(3J0#%N2A=o8cVCpN;MWO|#Cy9>e+53#~j*ZCp>9Yspd#ABPQeYDb zcnM!3(M;1D#4)`|yOVIK(5;D?t>;`wLxQ-lm#$~E|M#Qulb^+Me@U~NP|!WkUrhe~K`fKZjS?dITEnc&)Nld+M&Uv#Ny4QzN4bdyYi3hWP%u$i9y`Ni2oE?Epc zcq%O+ksy$$E=CB)WpDEF$@wRLP!br#z=4GVe~FIMN1vXbyg#|~2#WsX zqrY*1V$4*fI;MJpCm-EDl7u_^t%zAzBfWW!&^m6`aG24!kxa;_6UpWw zV$MXG+|~uXD~vpXRB3jlD$gq_Xp7lE&Py<0X+2l

x5suxbXh$#e%=`>+EqZ_u5` zytjwI=-K_w$PI7uFI#GI{9XDY2KXqt>uu+@A5s=AH93BZylleCzkL+GHG~%y;J-2o zoR<32f8FhRb7$8wN)2thQ8FubwbZO`@06-$dwXZcYHEhoeit%^{N~x!Bi)?)-Lrwy z4g8_s4>!8-4vXLKJ6(JJm(QBzX8hY{z~t)Cg}Z{t*hu*s$+eb>PMG=>E>Igli;XA` z`ERmq{U1hDy`v3p{v)vfG1_8~JnIAv_HIv#OGXYtX4j_{R z9RlK_lcgZX0fCckAvOZ29Fxr)9FxHzDgnNe>>(!`X5ycRI0^s&*-Zcd4FCWD00000 z0RSKX003K)E+RSsD3fU-HUUqQpdvs4>yzOkUJ0>jk8w5w001MCNFzN4Wgh?l008=a Br}F>+ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/public_service_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/public_service_template.xlsx index b6a1f0d2b8aaa5732a158d11203d5702c8d008cf..893bdc99ceca4c5ce6862297de7757a3eeab9ddc 100644 GIT binary patch delta 4090 zcmV%9Vh=1z_TF=msfml<7^_BzB3Ag*(7|BUz>vlj!i0S>!R_{4Yv002h_000;OlYJu^f3;Ri zixfK)-V6SRBFJ5}_3G)T-7U_PbFXj(@wrY{rMtqUDrJ)Dn%NDApch;S_bRRgQ4j>( zxzV5F%s4Cmf+wl2x?Q$917bsUQpxw7obQ~I(>=Pln=orZgrqzjBhPk`MbeN*G@Xyp zt()8D`^b_Crx9j6C1bQlB)T{`e|u(BaIqs}LX-s-QaMJkQrXaPWEhhKOPgmTg`F7} z30Ckb=8nt+!I2>)%<)~f>m-<_sI)K?r?J6jGa8bBhj~I$RT>e5VFmunm}auFwi}(w zUL8*f3cHi=fQ9W z;--{QwP)m_$;gE8ns6qgh(Z{2?kquOV|2+I{^=oDH;CJm6mn&5DLlPF7zq`LAlJy! zIh=C7qk&go$byF5+Z4bx zVMSzybEdX9yF()tkI?{Ce{0uy@fV@MR6JRpV!}~#{3Qp*qU5wYcE9&?QhP~)u_E!mLwP} zl4o~MAb}r75{yfd-~Fi`*foUS{{+|W4*a&;E5Bi5JseIMNt3q#e=9s030_!mUm&D9 z32jhXvg))z`ZKJrxi{=Vm4q67Nf(770Y}2>V&aaR1yn(}M3}N^BD^MIYu$$5LXl_|*FN3yO z#GDbR>x>AjIK*yBe^fyT^ghfOFE$xYcTAjQ%!?~&maD5oN<0Uub_^CT3&BNWvAm8! z&kDR@(6NI4FsN?jWTg9U&akI5QqQYZe=?{)^|lWRo4)@*3!_r~y5G${T1`{(%H>lO@$5BFOKkKP>p`y6Ipe?C4qc>D6p$A_)M{a1(o zJwAH#taWhz{ihF4N*lE_@3hh)64C^--;$^;=$r5?`{s(^lQJ|I*pRJS%=hy2P2!+S zW>7mo35?foG9CD`J#Ac>TAjsG)yy%;TM`feY!S)XPm3*1sZ+1w`~@6 z->?4yOuhn8kpUgEcnBi~1)Txs@lTVW4jO-LkK4u({$8N}fuPZT2&xm`^yZw-_34g4 zfV2o;7bwschEAgH2vFpeqKvx~0o*$7wJBVna9X!PfTjtq?uYu?rbT0X@3hrZXQW=+`Q|saN71S0+&FTaNP#B&QCmHVqT{R8>Zo_*47;PP z;Mnou${+}b-3Y#hht<(>=ydxdBsBD@hNji4!>;SAJKO$vXb+>2(hJ6Z)K)EaN+DNX z>%&P)RY+@{pbw_pQojAuaS*-w#pi$LW?eSuaj0P7*Qm-gf7yTx*yu4jArQO&o)^u`0XnmF4#(eukdLBe<}eX3Sg8)*_2rbk zlv^3~93a=zAv81jq^|=)TZ4a@)Ma#SiCb&cBS6?h9tbR4Glb)mfKetk0mSB7-E)^K zY}n{;opBTJ#OURTr=YEtcl3V*ZCu8R^9ZC8J3lZb3JXbG)Vo#($XQ1a=b0s$vU)B5 zd_t9hTY6#2Oxv^@YlSh5l|>FX6iMWqxz--AB4MIYXI)(mmkT4POkB@n1u2Y;#-6^DNvzCMDYIC4?V zT+y~ja|iSW*Y7(g4iwIHTpLw6!?PN>N~g9}Yr#LW*{U0@rmkUk^4H&recq7%TB5%J z?l<*%v)OD}rjCKm(SO>%(D>5nAg<-8i{_1b;;RY1HfptIO>Y^N-YQ0aL6mAFZf=^= z#ZrofnWJ>E{!>a{uc3dxoGBG|AH#;ff^^xPMrS`~T{MPx+LC`pU?YyURV-EG@Y(yj zt-P}z)zzu*+eL+s8`X-X#X?H;b6sU4`njyW5&iJ+m=vcQ zD%3dr8}YxO-o({t#SY$-=6D{P|G>lb=3)mPHoh`8Z$v*A=8b>oZ@g?7gD18yl|Bf< zJ}faQbakf%vsiL!XWMfI5zJ#k_wWdPM!_+f)dW!#4B?>fb`Jx;>%n0)mWV%>NWzL0 zEKar6elR}p9MDFdJ+g5Qp0DDkXwW87^p*7toxVFBGChmQ-$JuQt6^ykt7g=3>6uw~ z>`ZioSIPueb`5{@hr&`ta8MjGN?^<}ElXfEHNM zIz2jsC!q9@q-*kJXS?gUhyKv>uF^d| z_D;V)9v(QMjrSX1EAZJ}JoY5tug4Z7r``yI$mvCR2LxJ^{t8B-)phE-2{@F~NDfI8 zwi}ewNF9Hwoft~kDZp6?7na1ku=pAn}#RG7ng@I_s7hPIy34B6@Oz7$0*;IHfnTw8@AEvb2K@Z)CYLCPzt~%j>!T zY|bh)qR6J_5Zxt4 z*+TuDFK`@gLbre~nJwHcbcVpC8(>^QzvUJeYa`c_%Z#dpuw3~hi4dVYQ$&sc<(eT{ zDC~b_70A7$6@*=4 z3QT?_wn(gC@~97S^5o^vc*h2He)jCaU|L4)<${_^7DA=4~U&yZ@CAdr|YvJRH?B|3jE@BHHV zlgCV_NITg2ArVRK>`CxM`dLyAOwOM&wIcHj>HVo{nZtPdOad}&Op;hX{ny#_&i`V~ zhDbB=V(C0vC!buf`$bkk`5{yB(Vgj^&nNePKe=~z`oU*RR-}?4WhBaBXP+{Wxg;h{ zd(#ijEY z2wwFT61B9M+2g-Xe)o>Z5p#}TQc|X-L^edh$iVBjB_&&BklOGQ%I3HnG* zH^uZ+lQtvCtSrAl86cQ0g)TJ$%nopwZ>A;%a)B^ta?TB~(iF`zmFp{L&4Ck@CI;Fo z8BNfGbxsD>a$kmR3^ISTBaUmvk~TwiGm2PqOq2V%q;`doN6;$mU8#X$85OMMn}I$r z!GLt@g{%*i3omQnRG3V6ptO&=@bU)UdCY2iAV%LAbjMzFlU;19$?^B_ix?0idele`~40gaRVA2R{5 zlQ1BY1#LxzUt*KUAXEVslN}*I0dA9CAus{ilaC=b0stM8?;ISH;~^>n78#QdA|@N1 z0q5~g3IG7vO#lE5000000000103ZMW0GyLhB02$SlZzrY0g#izB0vE{lLI3>0gsbF sBOx2RQ24}n0{{R=2mk;W000000000103ZMW0K1cXBP#~I9{>OV0FXeyGynhq delta 4047 zcmV;=4>0iBN3BP&lK};O8`wr;lb8W27N+TN)6jLGvXcYBisCIKZ(FfVOA_6a*a0Me zI=7&7lFL3Ko{t=mJQsYUxr9DifJTF8cPHcp<+*}Wl^38)0@|@8 zsVOh|XlhJBG1hzv8PlG1NGpzWl`&(lYJv;Kuh|4};QL*ifnkCfhD)GZG(@yU3f>@# z8##9pePiaas|xfD*AePTs=S76XI62++fPI8QEoz6A*`sX!W*Sz2AMj zEX;P$wi-IojDOLF9@_)k*=CzQ=Dx*{*uu!N4&a^IPzORyu=0tg-qy?O; zh0KYDrQGzC}D_v{rA;ktVCpDW{31DdZX> zlf#t|#|C&8wgO|@0*pnHXtt$?l=B4!t4KYvceo4u_J-yB&Ahqo$Y%Y4L@8a9it9tc zzhbG*7I=!Az0XAbDP@~XgMTX{56VnbnzMr5qg%>>u)rguBoQ2}!avHHsZfk^a^k#q z7NfBj4KYe8rA5BG#m1oJL^}?Qwc`wi-emlK(qKn|u^~;o@QR!EcO)1aQs|AYAb}rN z5{x@iGSihuN0#8kZ=a0={6`4Rbc`LLFgVKeOf}VtTVwW)OATE(E?(( zqPnIO8Xnvwho52g`qj5*zi$8f`qh)Y^T)rP|M>mI z%jb^VY6`EbDWwU^3IAU*bO=h}=_|b|HPfjFX==s1D?$Ir7_`R{isn9%8wOR$=^BbM z@JxS`uD`m47Nsq$mC(>B?KFe$F@?emJOHnS(9HrGuRA-ko3QlT5B~CRkRG##2qOjs zl<)^sF_W(j8h_hw+twL>AF%&{V6Z&|lf|2EspTw|O<+Jb6i5aX*oHusD4PI9dL$Lt zEe2#uGjAO-U`V@cMS*oKyzF7|wr*I1u1WuyNRglVFZ4SX9v(`Elp2c^Z9SNz_}zZr z<$OHnP@C6}hK_W{@&ns*+p@Z$$dcvuyuR)3x8)z-GJh*gSqj3g+wVG_YqjNLE0C{m zefwLRL3r#~HxDc;lz@dBwB>^^JiJz|2E7Ao*bO$kL(7G42A)6chH&cdSA#>}>h=Rf zG<2$(qSULyuI}4l`d84tDBbGQQ z@_)?n3@mk1HybO(a+HlFxK1(6RXQ)jy45>wfptx=u31Pyp%o1IPcIBk6M1hnzQgT8 z0G)~LIIJOsL5p13+C1!rq2;?Kd@a%ATgQjcskqP}BNeKMa^cf3K|i(io7OUJB^~^itBWW&EaUI*G%~2oI{Z;v(sti z-NDQccg5n$x{7><8!Dy|kE&}iv!H&MGjlD~7f%!9*mg5-77{evSXOL(WoEKg@PhL3 zgDpHt?|FV7mYAZ|ofbUBl1p2gj(;@>0af4LKS2LO?+{_^g`qcugTCF}_uQ@nht-H8 z`j04KX$n@M+H!b+SCPn66)k7m8v3BpSw*)}8B0=NeXu%95`f~7-b+#tBNy8U25{&I znN!D+$9#b%eQ&hqSb#bKC~^C%sR2q6!bqQ?)wf5(i;0MM&8SQL8BZvQ{C~NSX5OO< zNfskHuUgJ+l!j5$>LkpUl^x+M%9?mtMTGJKig}C|5C{-nK(VZi$*h?R zSF!I+6Q)V=$`4c~XBL*(5i2s3qgW10j$lbFIf^VBX}N{s-Lo9$CMvUU4p;>@ zPzgU8aO>f)ZvZW@qIG(72!Au6^pKQmaek0N#zVwFgg;p=bJ0Q@S^aYee z3+7Zw9d-zmQ%Md<9TYC7k}#Lcpw!?v))M-o41X8qUlqFESSbkl41cAz*A|53$`rDN zXHl6TNSaVi;v6+0tKzd_@#OOb{9GcZ!}P@Bs#{_>VJfLaXmVp1=W9Sq6R)*K$m(#9m( zKulvY(NsV}Wpt9sK7T0ZW|zZJEA4{9MruCwuFXovb2WV>w4IN4ecczTDWNZ20A7kUjVEIY9Se0Xv_Mwz1(bc?`M(XnVShwJ69TcvH0P_KT;V1MNvhf4b($pveog@;0x z6|9N*xSZRk*zcEN_C*D+m-E4w8=DfnadurQV5mniNJl30uzMM@+(2MnzR?u*0HUF( zJWW3rr0@c0Ni!*}g@)kGDw=?Nyljzg(d34naRmdp(Kpx1^c?n zufCJDcy1Y9dw-=>c2E)kAU247s8YpDYIqCIEEg?}3x9MqgbTth<^m7E0$l`JFnTnq zbM)l3Jg4)km7oEJj zJFESFACI5@GLnm$>X-uWc$*a~fQt!4k2*2A-Vho8^3Tu5zxnm#pYKI7Q8kT;@Y^G^ zGE>6^{C`Ws1yz!mi;nlKF3kqurfia7X9yt^AQ0=3j5ye(BJh8zIUt?tkqkUt7`Uly zSoq?_)fg4nA0W_XdiK|sXOEcVWaz)lJ-_>_7f+usnaQxzgs7(` zd+fYq_!+_&7@t04Vv~^vi@X9;Q^hia@w{XVvVSg2`N_XeCU^fINygLtF$sCGbT(SY zpPjM$lTihWr~*wVpWL1N<#hbu{qg;KlaIb&w8>C{>2d)rs$nOeGm@DiCMcPVPR2qCffYA535}W@^X1p2>z-;bp^wqQE!f2lrk)djK`_{Db!*@pxky zXQ`0xvrngIU!FfYd-=gT)BoK+fB1az`%}gs8BxL{B}g%fWE{a`r9jtIlbMgeDZI(L zkj?bT-^PDJW${<5K;y5;jkPVg1LIi;2iBz$z8NDlvJUj!~&ihT2XMYtH zwB^}A&I{O(w4ST_(7Eumu*DN-~k!sBS?%B}p`Ci}+!i^rh!{QAFcF&ss<+E0` z75(-ZFu4{uaF Date: Tue, 26 Jul 2022 16:02:50 +0800 Subject: [PATCH 117/288] =?UTF-8?q?=E6=88=BF=E4=B8=BB=E7=9B=B8=E5=85=B3?= =?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/dto/result/IcHouseInfoResultDTO.java | 2 +- .../src/main/java/com/epmet/service/impl/HouseServiceImpl.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java index 4548a6c088..c3c77e446f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseInfoResultDTO.java @@ -68,7 +68,7 @@ public class IcHouseInfoResultDTO implements Serializable { /** * 二维码地址 */ - private String houseQrcodeUrl; + private String qrCodeUrl; private String coding; } 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 84c46ef26b..652d1af545 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 @@ -1068,6 +1068,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { result.setOwnerIdCard(house.getOwnerIdCard()); result.setCoding(house.getCoding()); result.setHouseName(cache.getAllName()); + result.setQrCodeUrl(house.getHouseQrcodeUrl()); ResiUserInfoCache userInfo = CustomerResiUserRedis.getUserBaseInfo(formDTO.getUserId()); if (null != userInfo) { if (StringUtils.equals(house.getOwnerIdCard(), userInfo.getIdNum())) { From 99eb05664792b6362f12c71365c4918da01500d3 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 26 Jul 2022 16:13:29 +0800 Subject: [PATCH 118/288] =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/city_management_template.xlsx | Bin 9099 -> 9113 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/city_management_template.xlsx index 261a5daa08f5f1cf1fd371af10af37bbd9adf1d8..392a1dbbe0e2d970625c3cd5a58e64c0f324d046 100644 GIT binary patch delta 4095 zcmV9sN0~>klK}e?d#bFcin{g5RO!-lpxej?i|XvXcYBiQ+9J zZ(FfVOA_sN8~6$Q0Ny-`Cl4M3zl=jahH1Oi4h12Xy#N3G@_&zngL#%(w;)xLiwJp+ zi!2Z<=ZTm`=zKi1`^Zw73Qp5pK!g^c&>-I330Xl{F5y(>1xTHMvJ6Qm!iosZf3z+L z#){1#qslQ3VZ=!;Gpfy1PH{omHJt+XT{plPXv(RkxB}WmOGIlVXDzb0k!cO!3_}VT z2(7T^c=*SwL1yaDhFa-3vqUcnGt)Y5m(5utw(hw~T4Pz3PT8wtnEW2T9G#riquPn6 zcEte2A!me1pgNcF*URJT`N5nJV|S|622-l^$Six306$#BtGDIq{qEy+`T2Ao;@`S~ z)-yC@;Fd{6ni)3AMepc%JVdeY`o8T3w$~rKKH1+Ru6tEIztvx*Yzo;r#J|J?+YiQG zK)fFD`W@m15ZAf4e@6Tbvls)i0Sez88Fl zWhh?R{Y#rPF-d6~qXmWHPraV(o@9s4?rdjfv+b==A3+ej_XR{s1)s*!K89z1+wE3c z6a&f3ocYercg~rU;pS1ujU`CML^L9fX%hn?PxvfajL6$J)71@PC`}`uauLCZ9D^d8 zhBG)ROYavdGo7$eU)`~A= zo)k*Vwdsk_Dne_s>|6Z?&(Lcbx+Pg5l?O?@iiTq(H)EXXf8(4k84vRm?n!Gr^ckih ztDPZXJ|bJr;F&{Eo+I`dr0Uw<&~)}1ICvU-tTi#R8qS0`$bh>jvNPK`AhSq4&6cnO zoR7$M2ixE<_kmk@L^69u6G1~$9x@(NS{=)S0a55Y!PS-rE6lF zi9~Z2!3$Ude@BH8>1K{R!O<%I8X?O%lo%mBDxxnex;?YEP7E(mT7;#SJO{OoTk7DN z7CIfr?7DweLc+NtTq~uX>D-~TRx06ID!ChXdcrtzPq$|f79%JJA)p!hnJzZ5SB@ZfjSDM z%dtJQme>hiiP&xWm*9CPF_s|M2

*@LF`}5Cdk1sy`xcvI1 zJY0S|xj3s1=O^EOe*ajg46WM6&}v5h8zw$@ETkOYX$+ETfqgIoodVzh|5tuH$Pd45 ze%Mx5ah5xG+;4vDE0l}Xx)+-?5FGvsmkDygM(mi(;GZyH^=uO-&Rhsx9dOzfchg*$P5Js?e*6oN9=pyErJ1)588D<>wxYng7GCyY@wRSQgRV*c zOr*%4`WJfc3oq}LE-5;dDB1!nisE^H&bfc*@?L85`q98u?%2W5@x7L+Z)mDwdtJZh zc>68&$G5CfLsf=h$Ln=m-?Lllu{~6;Z+-h)o5S$fwQnBScBlXgZ`e`~!tn4~xjgJ1 z*n`e+!#}h=_@?g%gH8w^gZ=XGFt9tlAtD;MWkb_yzV_9Zr{v(Oa^-thu4o&Yc3XK(^6gJc>E9DB zCGvLtI%e|y+lpF_^y8J$XO*GSG1XOt%A%hH&gp!OS-ymJ)=11`?kisE+?N+nqB5(* zjBA;Fk*}}PSV)~$rqSKn?E79EWJ7<0D5Eo5o5Q!1I~^DBrz2-~eb*0^5MTsR#%H|F zz$RCW&wlsf*+YEQK_?gj`UqjgMCUN}=#>M<^8<9UOk^ZW3ikI}s%2R>>N}c-C>Dyt zSG}6B3z?Ns&Ip+Fp8Fi%vz>V3%u9>agC)4+)D@>g-CxTlW}@h z?NBgNaM-~HLqf!*UHSB7YOwP{+1~)CBvI-0B0>H zVIWCgZsw(0R;w;o*aDy|e-ua(xQdZLkcBfWx14Jr_^nb}3QACJ*O!EU+%62EGjUv( zHKb5v$(gOq!%i65foH+j3O#?mb$ke&iU$oc@t?v2Wv;#rkkBvad{HsP<*Xx5BoL)Wl5tCtUR z5@Pe(4%Z0q@m!KEk%&lwiH@-cs@8iTO{DPONv z8&$n&n0ihqxlu*0+-+S;eXGU3&R0Im$acNGyJBBcS?$`cwQ^ZB`#B8P0mBWw)@U@E zW<|#XWDfai?QS=7t8{FP%r{@DuQ?2_MLz3`w2gdYJ#YV7N;)+aZwxP*y9*VBDs)e-p++25=$4- zT+~(>X5;mQtnuV1=IvY{LSp3timWz5(qV1j9fU{|LdbWCCNusPE`K#OKp8?9>627} zSaV{c`HopPwYq;<72HH6{HV{Zhr_-Bw7`ni>CqwF z0i}neT$2x5n;qBL_Xf5H%eHn9I$gBr+l7xdS*bnhC$mMX|CFr(qb|=^=^P%q$3Gek z_UypI`wg%b`0O?wd*aVGA`RkGZv=j5cSF1b0V2dn%z%oiB`o|`1#%}ExTrh1n8Tu4@s+Gx3Qxk#n&OAMSSik75{)=f za{(LWI9GqJb4cVf1&)guU%0^^yRNW357#_ag!lpo3e#QaXm2QOarMF`H0MgAu%%Il zyp3EbR2^_@O1#BhXtfQm&N&jPThR1Io3SHI3N0^`%oIr3a( zq=B)xB>?69Wk@gZU<3yav#38V=FrZ~c`nIdz)dv_Vbo6tZ@wcIf&pz!gaHexMcNn( zg(SWUx7zNBLucgzktcpuq}XajK>^8Z=#9Dr5jDrG(F08 z!MlF|jkIhRyqjCL7j`I0@*)(_f_RZDN1$vm2Xw9+2{Uy7W{MYc$Zb#{N^S0Tf{-t8 zK1D~d8Z9SZ%KYj(S&QeE;f+^Xg;$RHOIVIa?xGz8gjB#<#Gg2exFvEO=N4U9YCrG; z=Pf9$+>U_cJp$M*;0SJag19$0e{|GGE%|_&2|v{PVp? zChD4EBD~{rmL?G{5MK%xR7qkk75s=$W;Wn%%0`5pDRr5|1F;?=;$UxuB>su!fOM*d z2s~JSya*cxUp(=Qy#gBqBy6T*>_J~Oqp$E73B_t9L#Hx#^gQi%*;Qa2dUOaum zWQwqZ{YMg##AJ_yC&JH^VqkpwjENPIXGpJ46w3^T92cM`P5H^cPbPQ&A4$eD*ElZZ z!O~f@jz2qN*Ndn!q=_~8)q@rigz@%iiRp zlk<=Nq{MCzfdk7Kk|0hWe{z2E?&R)cDEgBR|G@-`n5jy2OpF9eKJbeW2`SvE-YiG( zZnroVtji(A=CGV5KFRM=F;qXw83tBb62gnw1PD z=*Bun19NPN&l7EBE<;=5I5wt~4VBFxV$L8K3L}poRhnIi%Cm|J+VX55=OsQM zX+2l

yGB4f3=ED{Ii&haGr$1MfU$y*&Vik8_pd+ z#4K8BeEd3k*o2gS`zU{WeFzU!z`HUEoR<3b?smPovuhcphPK@(nH9TQYF4**N>#JH zy|ZIAHA8Fv0x|~u=GnC)-JJW~vw_nM{Gs0uH@ff)i{I}%U3>nQ&zj|C^xJ2^^$3~Qg>^IrAz6MZB0|XQR006Vk7|8|!0o9Z2 zAtxKA;S+004jOtDpb? delta 4125 zcmV+&5aREdM~g?WlK}-oy7K#Elb8V>f6Ge5FcgOOg6~kWZ_|r&A+#M(nUw>A6~$dh z&de0sv?S5a>;`-SAHbbUapl5=;LAAZW0-a>c2E$q$@%~DxC5~NN+S%xGOVP%A-e_EFW zW5uSBQ{@@@%2gp>hxnJ+v;A)3 zbx5aAf}lm*0OBV1?$3z70kanavH^em-#dp&0{{Tv2mk;W0001ZY%h0ja%*#FWo2}8 zFLP*RWpptvcx`O8R@-jVKoEUL;vcLP;)(i}G--lkL>mf7AR(^L8+#J3y7rpgb=BU(U2a`tx4?3|g|wS!xSDYw=j6%*Nvc(#8_EXX1e zvurgZ&z|mY?GQ_8n#Gih3})mA6uA{%y%Ll{9;gIBTWBFuGm>bXPaQ`^38YlnB8LoD zmO`df<4~>~l}n(pA*I~$U3cW9lx3v0FqN0FA(l%P!CXW|3Yo5rNZ?eX|0-d*YOEc` zm$Da2TB6p*pK~tG>y_4?H|&4;m$FC-C6?NbMC#P8^;J%sNk?ZI^$h(YSSghUMZSfG za}>8=oarMYmxO@{;UnpULCi1=RqiYa%Ne=tP49XH=MCaHgHoOATbeGO0Eb9JjJYOO zmBWP)2Nm!>PPvtB1E?(0NV7HU0p~Nai)i)I?15d}z-f0l-*0x?H(7swB&`^hwBUMA z@E0uB$&5@$Gxu1O_kgVujjoJrEHhDP&N6raYv4$jkx{i#Bsf~de=B8Gg%T^Jhqd>$ zMSpCMw}}-MN{e)}i*d2#_!|zkWz89Q_Q?M|X|N$-+mOb#cL8a*Az`~A`8yZxgnk%F z*fu*2E+maMq;X5~U3-5t@dxg>{>O!WNSr#FCUt;?7qQp3;dc@9K4Q>C-035RUBrGL zvE4=BdHGq(s6{v!o~FL*c*PjC=ae&Ss~g9PM3G?-h8TqIlBIu-a=b4&Q<_+mb5ZVc znjM&!s6>?av%Js`K`FXISmgvx-jPzs&SZP$!l1fJ3r@Z8`pZJ-o2PHypB;ZZ{rKwi z{ihq>-hDYc{;(OGoxJ|`sTrKUKKc6jZA}TB)<)oT-TlAr`_o;|9qw$8M;NEphd

0(1$0ubqF*%HB0^icen{9)?zABi9cn-Jkmd*BO9KQ7006T%2s#FT{QQ;mEeZet*-Zcd z4FCWDcx*3oba`xLb1ryoY}H)bZ`;-xe;=^_fncyb1hYj_)Gf7~#j*($=!OExfC1YO z$P#4}ph%CT0=q+jY-#4LLk0}#maQnTu7#I9EZ)`)YtS|6KNBhPQ~!m1=N$4}s6&ZP zEQ+=sEK&S!zwdH?zH^~At{)Cv<&GVMj_Y=qH~Yv0_r?MML@Uf5Rmqv+sTr4sh`?O``u_YZ6jz8Uzzup7b0 zV6PG$1a`L{BBG&NF*L1S8Fn2{-Q4g-Lu(j?O3xp8QCl^C=_Q4H^JX6|nyNy$b^Jc4 za$EWKPe*?A#@An+kT+MAE8n?tMO)Xj+sYe~Z-2Zt|9iq^jr_ZQ9W(jvZAGml`ti!> zX=P&RnChw$%Zfh z1K(p#HZ<^mGP<(45x%3`>ADbqIs&`ryMCZV5Juo-e8uYyZF0x>^fxb_J;ZnIcY_e3 zj}TT(bPdN|eCN>d`~Y375E|LiwULZyC@!UXGZ*e^2?1ZiBTETd97^J_}OLa&R2 za!%5L)AVAKu8;waW;iO)1wo0jt#LsqfZK%-IuplrX+sKQ7P+#yanOw-JMb*{T8ZD^ zIy!)VPQ`-;8QEJwlnd|P3%W&<4f zWma|Uw&k1IV)BdiCan}ZTdhtpF6FRZk*$`0)mgT!F|Idi=v54^brwTah~Y-9)~x9* z!_*5))wl{4U6GO)HY|7*h4pf)Ut*HgX>@jqGHFHbi+fBuh_0vv*5J5W=ID7l(f8-ya=EjdA ze+X~-PIu4ux-Pt}BoxX2Ih3$t1)EcCweOF1T^pp4w;vAY2G9m8+NVcvVFfgPOUgC*u({E7ojq@8d$4V52a(f5 zo4!5xXp^1V!$CG%v?m?2HDHsR=c{xN4&0;fkA}N;VBzxySPOi03y(eQ^NmCUcIoZF zkL+HAPe7nO>DN#a?cT>q!jedTId$ZKtimaVaw-W6M-)i|<}yr6Xiw(2yD<0af>IFk zbCg6ty6!*r#Ig`9v)8w#bOOOu1+g7oWxoQF$e9#9Hk14IZ#EaBIui2#jRD%`Ktn| z^HnZZ$*gKKUq{jN1!!!4qLOpzrZilgELRU?qW0|4!O1nc=g6nRV-<8uu;tpKOQJCs zvU+*jO|EgjB)D?(A=EyVvyDfQn=~f^uAu$AK~`9jTW$lz#ivo)9-eo0xe7n>a9sB} zBul$weMy==6Ls~MZa78tJxO;V+so7Sb1_;4ZOd6Tvs!3SeqPakEO5fkIU1BLCyKnQ z%c>(cc^47}t{3d-3cveK_Tss1c;l6J;g!R|1#HKo5hm^-z@@xxw765`fogkh~ps*?E0nD~Ke)@F!_&t@HuI!E+7tZGrAmDsR znxL+IOIcIKUw$!v{pY>OACAXQ9-V#i(e&4!DbVT@`@kZONe!REN^>!?xIlUmE(klO z3QT_`x=6I3^r%{L^yKl$ zFP=W3GR3fegBgj0Bs1BW^ThBor7u$lbpcyjlD ziDbMp&q&CFrRiuLe|}2u7o!SJ?8roXdUx{YlktP!kMG}`eEcP)6+;Pjza+G%h8=%F zNm4~jTJ|O%AD?~lM}@&41`h0H$>co#^z8Wk$=%0)Q1mAs{hbOFW2Pq6F*5*Y^5K(A z3|8_>7-?8zy=ji%`7a|PkJP1!rnpM}Nc#!ZSd1O1Lo&-em5mp)nQT~3lwdY~aPP&l z2T(K5KKvjNk585{LOI>%pG{A{I(u~b^27J0|Gj_q@cHDoCzOF0QPLzONKpzgj^M10 zMAuAzlc|ruDMF!^vY9^l>-cx?i!oA7#g{ZFGb<|{qF`j;<(u+s{rBG>OsVB!dD5jM znb8UINKJ?FmzP|VvXN9)THl}z;2D@w=rTP(^#GH3HZ>`bGXaAp=iC4*Ezx|Wa=C(b z9XL{HVTiMmh6!3)=V;(`#(AQRLWYjSacoR~DVta}4G{pACxT6GiEN3Z7{aL-lV(?@ zqi971ZFxN)=OucOw4SN@(7EumaP9_Z*>ne5`=|>KZ{U;1w6}-A=-Y$t$c=8%FWV}6 z|2_O52KXqx>uu+bA7K`4mA!upJ#0eCzkL|J6~c29@Lw4PPFwxi&Q_zfy<-_`O>L`Q zxn@@F+FGl&wY^p|J6qe^R!cLq&byE?=r_-<9qQ)H@16~vUf_rRAX@LiGc5jK;PmX- zUp{M9TFGyp0h4Q?3wH&vv9a>`(%@}AXEVulL;X}2X6!b0C;RKlK~?f zlWZXl0g97*AvOZB9FyA|9Fxx>DgwtClkpf9lf)tr8~ps0^(_hj0NG6d01W^D00000 z0096X0001QlRP3i0X&m;A~peIldd8_0`wV^@FF__kdrJUAshVPJBLaG007_!000;O b0000000031AOHXWypw1nD+X>K00000dH%`# From 05b6a6b6114c609bdf46b7190e01f962e829656c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 26 Jul 2022 16:27:36 +0800 Subject: [PATCH 119/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5varchar=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84birthday=E6=8E=A5=E6=94=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ResiByPolicyInfoResultDTO.java | 2 +- .../dataaggre/service/impl/ResiServiceImpl.java | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java index da425762d7..822b444390 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/ResiByPolicyInfoResultDTO.java @@ -42,5 +42,5 @@ public class ResiByPolicyInfoResultDTO { @ColumnWidth(10) private Integer age; @ExcelIgnore - private Date birthday; + private String birthday; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index acc29d12f1..1b87efe324 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -43,6 +43,8 @@ import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; import java.time.temporal.TemporalUnit; import java.util.*; +import java.util.regex.Matcher; +import java.util.regex.Pattern; import java.util.stream.Collectors; @Service @@ -60,6 +62,8 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { @Autowired private EpmetUserOpenFeignClient userOpenFeignClient; + public static final Pattern REG_DATE = Pattern.compile("^(\\d{4})-(\\d{2})-(\\d{2})"); + @Override public PageData listByPolicyRules(String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, Integer pageNo, Integer pageSize, @@ -212,8 +216,14 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { if (r.getBirthday() != null) { Integer age = null; try { - LocalDate birthdayLocalDate = LocalDateTime.ofInstant(r.getBirthday().toInstant(), ZoneId.systemDefault()).toLocalDate(); - age = Period.between(birthdayLocalDate, LocalDate.now()).getYears(); + Matcher matcher = REG_DATE.matcher(r.getBirthday()); + if (matcher.matches()) { + String year = matcher.group(1); + String month = matcher.group(2); + String day = matcher.group(3); + LocalDate birthdayLocalDate = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); + age = Period.between(birthdayLocalDate, LocalDate.now()).getYears(); + } } catch (DateTimeException e) { throw new EpmetException("居民生日计算错误"); } From c7d77cffcf43ca52f93870bee2f016bfb7ec5fe7 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 26 Jul 2022 16:38:46 +0800 Subject: [PATCH 120/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=86=E9=A1=B5varchar=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84birthday=E6=8E=A5=E6=94=B6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/service/impl/ResiServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 1b87efe324..35d364e4c5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -223,11 +223,11 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { String day = matcher.group(3); LocalDate birthdayLocalDate = LocalDate.of(Integer.parseInt(year), Integer.parseInt(month), Integer.parseInt(day)); age = Period.between(birthdayLocalDate, LocalDate.now()).getYears(); + r.setAge(age); } } catch (DateTimeException e) { - throw new EpmetException("居民生日计算错误"); + logger.error(r.getIcResiUserId() + "居民生日计算错误"); } - r.setAge(age); } }); } From 09b3ee4ca08b6492017a331622df79b58a55b897 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 26 Jul 2022 16:49:51 +0800 Subject: [PATCH 121/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/impl/ResiServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 35d364e4c5..a74ee4eb2f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -150,13 +150,15 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { */ private void specificRuleConvert(List resiRule) { // 使用年龄计算出生日期 - resiRule.stream().forEach((r) -> { - if ("BIRTHDAY".equals(r.getColKey())) { - LocalDate birthday = LocalDate.now().minus(Long.valueOf(r.getColVal()), ChronoUnit.YEARS); - r.setQueryType(revertQueryType(r.getQueryType())); - r.setColVal(birthday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); - } - }); + if (resiRule != null) { + resiRule.stream().forEach((r) -> { + if ("BIRTHDAY".equals(r.getColKey())) { + LocalDate birthday = LocalDate.now().minus(Long.valueOf(r.getColVal()), ChronoUnit.YEARS); + r.setQueryType(revertQueryType(r.getQueryType())); + r.setColVal(birthday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } + }); + } } /** From 7b159e8d6b066e1a0817fd231ec24ce0c3019fe3 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 26 Jul 2022 17:06:10 +0800 Subject: [PATCH 122/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/epmetuser/IcResiUserDao.xml | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 703bcc2bfa..ffe08008ac 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -132,18 +132,22 @@ ic_resi_user.`VILLAGE_ID` as neighborhoodId, ic_resi_user.`BIRTHDAY` from ic_resi_user - - inner join #{rule.colTable} - + + + inner join #{rule.colTable} + + From c9bd4bf5c2677771ea14f85df758de6e6c3dbe97 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 Jul 2022 17:27:59 +0800 Subject: [PATCH 123/288] temp --- .../dto/result/ZhzlCategorySelectDTO.java | 23 ++++ .../tools/enums/ZhzlResiCategoryEnum.java | 108 ++++++++++++++++++ 2 files changed, 131 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/ZhzlCategorySelectDTO.java create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/ZhzlCategorySelectDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/ZhzlCategorySelectDTO.java new file mode 100644 index 0000000000..94b58de257 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/ZhzlCategorySelectDTO.java @@ -0,0 +1,23 @@ +package com.epmet.commons.tools.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author yzm + * @Date 2022/7/26 16:37 + */ +@Data +public class ZhzlCategorySelectDTO implements Serializable { + private String label; + private String value; + + private String queryType; + private String tableName; + private String columnName; + private String columnValue; + private Integer sort; +} + diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java new file mode 100644 index 0000000000..b57baedf5e --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ZhzlResiCategoryEnum.java @@ -0,0 +1,108 @@ +package com.epmet.commons.tools.enums; + +import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO; + +import java.util.ArrayList; +import java.util.List; + +public enum ZhzlResiCategoryEnum { + // resi_xfry 信访人员 + // anzhibangjiao 安置帮教 + // xiejiaorenyuan 邪教人员 + // buliangqingshaonian 不良青少年 + // shequjiaozheng 社区矫正 + // zhaoshizhaohuojingshenbing 肇事肇祸精神病 + // xidurenyuan 吸毒人员 + + resi_xfry("resi_xfry", "信访人员", "equal", "ic_resi_user", "IS_XFRY", "1", 1), + anzhibangjiao("anzhibangjiao", "安置帮教", "list_equal", "ic_special", "SPECIAL_RQLB", "anzhibangjiao", 2), + xiejiaorenyuan("xiejiaorenyuan", "邪教人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xiejiaorenyuan", 3), + buliangqingshaonian("buliangqingshaonian", "不良青少年", "list_equal", "ic_special", "SPECIAL_RQLB", "buliangqingshaonian", 4), + shequjiaozheng("shequjiaozheng", "社区矫正", "list_equal", "ic_special", "SPECIAL_RQLB", "shequjiaozheng", 5), + zhaoshizhaohuojingshenbing("zhaoshizhaohuojingshenbing", "肇事肇祸精神病", "list_equal", "ic_special", "SPECIAL_RQLB", "zhaoshizhaohuojingshenbing", 6), + xidurenyuan("xidurenyuan", "吸毒人员", "list_equal", "ic_special", "SPECIAL_RQLB", "xidurenyuan", 7); + + private String code; + private String name; + private String queryType; + private String tableName; + private String columnName; + private String columnValue; + private Integer sort; + + + ZhzlResiCategoryEnum(String code, String name, String queryType, String tableName, String columnName, String columnValue, Integer sort) { + this.code = code; + this.name = name; + this.queryType = queryType; + this.tableName = tableName; + this.columnName = columnName; + this.columnValue = columnValue; + this.sort = sort; + } + + public static ZhzlResiCategoryEnum getEnum(String code) { + ZhzlResiCategoryEnum[] values = ZhzlResiCategoryEnum.values(); + for (ZhzlResiCategoryEnum value : values) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + + } + + + /** + * 转为数据 + * + * @return 枚举对象数组 + */ + public static List toSelectList() { + List list = new ArrayList<>(); + for (ZhzlResiCategoryEnum item : ZhzlResiCategoryEnum.values()) { + ZhzlCategorySelectDTO selectDTO = new ZhzlCategorySelectDTO(); + selectDTO.setLabel(item.getName()); + selectDTO.setValue(item.getCode()); + selectDTO.setQueryType(item.getQueryType()); + selectDTO.setTableName(item.getTableName()); + selectDTO.setColumnName(item.getColumnName()); + selectDTO.setColumnValue(item.getColumnValue()); + selectDTO.setSort(item.getSort()); + list.add(selectDTO); + } + return list; + } + + + public String getCode() { + return code; + } + + public String getName() { + return name; + } + + + public String getQueryType() { + return queryType; + } + + public String getTableName() { + return tableName; + } + + public String getColumnName() { + return columnName; + } + + public String getColumnValue() { + return columnValue; + } + + public Integer getSort() { + return sort; + } + + +} From c9aa7ab54c58fbb45771524ca950e3c0a2d5c3e1 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 26 Jul 2022 17:28:42 +0800 Subject: [PATCH 124/288] temp --- .../dataaggre/controller/CoverageController.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 27563e2134..9427a51575 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -1,13 +1,15 @@ package com.epmet.dataaggre.controller; +import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO; +import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.service.CoverageService; -import com.github.pagehelper.PageInfo; import org.apache.commons.collections4.CollectionUtils; 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; @@ -43,4 +45,13 @@ public class CoverageController { return new Result>().ok(page); } + /** + * 综合治理图层页面，居民类别下拉框 + * @return + */ + @PostMapping("zhzl-category-option") + public Result> queryZhzlCategorySelectOptions() { + List list = ZhzlResiCategoryEnum.toSelectList(); + return new Result>().ok(list); + } } From 7433f807bff319884337f79d0f7a406b14107271 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Tue, 26 Jul 2022 17:31:27 +0800 Subject: [PATCH 125/288] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84=E7=BB=87=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CheckStaffInfoFormDTO.java | 49 +++++++++++++ .../dto/result/CheckStaffInfoResultDTO.java | 50 ++++++++++++++ .../controller/DepartmentController.java | 13 ++++ .../com/epmet/service/DepartmentService.java | 7 +- .../service/impl/DepartmentServiceImpl.java | 69 +++++++++++++++++++ .../epmet/feign/EpmetUserOpenFeignClient.java | 4 ++ .../EpmetUserOpenFeignClientFallback.java | 5 ++ .../controller/CustomerStaffController.java | 5 ++ .../epmet/service/CustomerStaffService.java | 2 + .../impl/CustomerStaffServiceImpl.java | 6 +- 10 files changed, 205 insertions(+), 5 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java new file mode 100644 index 0000000000..42e299ae44 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java @@ -0,0 +1,49 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + + +@Data +public class CheckStaffInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + public interface Check extends CustomerClientShowGroup {} + + /** + * 手机号 + */ + @NotBlank(message = "手机号不能为空", groups = Check.class) + private String mobile; + /** + * 人名姓名 + */ + @NotBlank(message = "姓名不能为空", groups = Check.class) + private String personName; + + + private String customerId; + private String staffId; + + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java new file mode 100644 index 0000000000..0f500a0cab --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java @@ -0,0 +1,50 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + + +@Data +public class CheckStaffInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 状态，false为有问题 + */ + private Boolean type = false; + + /** + * 提示文案内容 + */ + private String msg = ""; + + /** + * 数据库中工作人员姓名【返参姓名有值的则需要更新工作人员信息】 + */ + private String personName; + + /** + * 类型，后端使用 + */ + private Boolean key = true; + +} \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java index 79b1975b9a..fac881ed3e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java @@ -161,4 +161,17 @@ public class DepartmentController { List deptList = departmentService.listDepartmentListByStaffId(staffId); return new Result>().ok(deptList); } + + + /** + * @Author sun + * @Description 根据手机号姓名查询人员信息，联建单位、社会自组织新增使用 + */ + @PostMapping("checkstaffinfo") + public Result checkStaffInfo(@LoginUser TokenDto tokenDTO, @RequestBody CheckStaffInfoFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, CheckStaffInfoFormDTO.Check.class); + formDTO.setCustomerId(tokenDTO.getCustomerId()); + formDTO.setStaffId(tokenDTO.getUserId()); + return new Result().ok(departmentService.checkStaffInfo(formDTO)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java index c97f61e6a1..d1f589b26e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java @@ -20,10 +20,7 @@ package com.epmet.service; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.*; -import com.epmet.dto.result.AddDepartmentResultDTO; -import com.epmet.dto.result.DepartmentDetailResultDTO; -import com.epmet.dto.result.DepartmentInAgencyResultDTO; -import com.epmet.dto.result.DepartmentListResultDTO; +import com.epmet.dto.result.*; import java.util.List; @@ -104,4 +101,6 @@ public interface DepartmentService { * @return */ List listDepartmentListByStaffId(String staffId); + + CheckStaffInfoResultDTO checkStaffInfo(CheckStaffInfoFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 0c109e270a..aa8d6c1db8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -19,7 +19,9 @@ package com.epmet.service.impl; 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; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.security.dto.TokenDto; @@ -30,8 +32,10 @@ import com.epmet.constant.CustomerDepartmentConstant; import com.epmet.dao.CustomerAgencyDao; import com.epmet.dao.CustomerDepartmentDao; import com.epmet.dao.CustomerStaffDepartmentDao; +import com.epmet.dao.StaffOrgRelationDao; import com.epmet.dto.CustomerDepartmentDTO; import com.epmet.dto.CustomerIdDTO; +import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.CustomerStaffDepartmentDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -39,6 +43,7 @@ import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerDepartmentEntity; import com.epmet.entity.CustomerStaffDepartmentEntity; import com.epmet.feign.EpmetUserFeignClient; +import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.CustomerDepartmentService; import com.epmet.service.CustomerStaffDepartmentService; import com.epmet.service.DepartmentService; @@ -49,6 +54,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; @@ -76,6 +82,10 @@ public class DepartmentServiceImpl implements DepartmentService { private EpmetUserFeignClient epmetUserFeignClient; @Autowired private LoginUserUtil loginUserUtil; + @Autowired + private EpmetUserOpenFeignClient epmetUserOpenFeignClient; + @Autowired + private StaffOrgRelationDao staffOrgRelationDao; /** * @param formDTO * @return @@ -280,4 +290,63 @@ public class DepartmentServiceImpl implements DepartmentService { public List listDepartmentListByStaffId(String staffId) { return customerDepartmentDao.listDepartmentListByStaffId(staffId); } + + @Override + public CheckStaffInfoResultDTO checkStaffInfo(CheckStaffInfoFormDTO formDTO) { + CheckStaffInfoResultDTO resultDTO = new CheckStaffInfoResultDTO(); + //1.根据手机号查询客户下工作人员信息 + CustomerStaffFormDTO user = new CustomerStaffFormDTO(); + user.setCustomerId(formDTO.getCustomerId()); + user.setMobile(formDTO.getMobile()); + Result userResult = epmetUserOpenFeignClient.staffDetailInfo(user); + if (!userResult.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取工作人员信息失败", "获取工作人员信息失败"); + } + //查不到工作人员就直接返回 + if (null == userResult.getData()) { + return resultDTO; + } + + //2.查询工作人员注册组织关系数据 + List staffIdList = new ArrayList<>(); + staffIdList.add(userResult.getData().getUserId()); + List list = staffOrgRelationDao.selelctStaffOrg(staffIdList); + if (CollectionUtils.isEmpty(list)) { + return resultDTO; + } + + //3.校验工作人员的注册关系【从哪里新增进来的工作人员】 + //获取当前操作人员缓存信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId())); + } + //所属组织信息不同的给提示【所属组织不同时则不新增部门、不新增工作人员】 + if (!list.get(0).getAgencyId().equals(staffInfo.getAgencyId())) { + resultDTO.setMsg("联系电话已存在其他组织工作账号中，请使用其他手机号，否则将无法获取通知信息"); + resultDTO.setKey(false); + return resultDTO; + } + //从网格下添加的人给提示【网格下加的人时则不新增部门、不新增工作人员】 + if ("gridId".equals(list.get(0).getOrgType())) { + resultDTO.setMsg("联系电话已存在其他部门工作账号中，请先将该工作人员调动至本组织下，再次添加"); + resultDTO.setKey(false); + return resultDTO; + } + //账号被禁用的给提示【人员被禁用的则不新增部门、不新增工作人员】 + if ("disabled".equals(userResult.getData().getEnableFlag())) { + resultDTO.setMsg("该工作人员账号已被禁用，请使用其他联系电话，否则将无法获取通知信息"); + resultDTO.setKey(false); + return resultDTO; + } + //姓名不一样的给反馈 + if (!formDTO.getPersonName().equals(userResult.getData().getRealName())) { + resultDTO.setPersonName(userResult.getData().getRealName()); + } + + resultDTO.setType(true); + return resultDTO; + } + + } \ No newline at end of file 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 2dffd84aee..5cd018c37c 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 @@ -855,4 +855,8 @@ public interface EpmetUserOpenFeignClient { */ @PostMapping("/epmetuser/staffrole/getIsRootManager") Result getIsRootManager(@RequestParam("userId") String userId); + + @PostMapping("/epmetuser/customerstaff/staffdetailinfo") + Result staffDetailInfo(@RequestBody CustomerStaffFormDTO formDTO); + } 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 bee7102a73..6491dc477d 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 @@ -646,4 +646,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getIsRootManager", userId); } + @Override + public Result staffDetailInfo(CustomerStaffFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffDetailInfo", formDTO); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index 274cb8ed87..f3a5d6bd99 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -493,5 +493,10 @@ public class CustomerStaffController { return new Result>().ok(customerStaffService.gridMobileList(formDTO.getGridId(), tokenDto.getUserId())); } + @PostMapping(value = "staffdetailinfo") + public Result staffDetailInfo(@RequestBody CustomerStaffFormDTO formDTO) { + return new Result().ok(customerStaffService.staffDetailInfo(formDTO)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index e986aa8f07..16d6e83189 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -347,4 +347,6 @@ public interface CustomerStaffService extends BaseService { * @Description 【事件】网格员服务电话 **/ List gridMobileList(String gridId, String userId); + + CustomerStaffDTO staffDetailInfo(CustomerStaffFormDTO formDTO); } 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 c9c416d63c..1caf9abf5a 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 @@ -45,7 +45,6 @@ import com.epmet.dao.StaffRoleDao; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.CustomerStaffEntity; import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.StaffRoleEntity; @@ -870,4 +869,9 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl Date: Tue, 26 Jul 2022 17:33:51 +0800 Subject: [PATCH 126/288] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E6=A1=A3=E6=A1=88?= =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6=E6=8E=A5=E5=8F=A3=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/PageUserReportEventFormDTO.java | 4 +++- .../com/epmet/service/impl/IcEventServiceImpl.java | 12 +++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java index 0a7b966a62..457a2c8550 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/PageUserReportEventFormDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.form; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import java.io.Serializable; import java.util.List; @@ -19,5 +20,6 @@ public class PageUserReportEventFormDTO implements Serializable { private Integer pageNo; @NotNull(message = "pageSize不能为空",groups = AddUserInternalGroup.class) private Integer pageSize; - + @NotBlank(message = "userId不能为空" , groups = AddUserInternalGroup.class) + private String userId; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java index 7dfdc190be..1f20ff0a39 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java @@ -1612,9 +1612,15 @@ public class IcEventServiceImpl extends BaseServiceImpl icEventPageUserReported(PageUserReportEventFormDTO formDTO) { - if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { - return new PageData(new ArrayList<>(), NumConstant.ZERO); - } + // if (org.apache.commons.collections4.CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())) { + // return new PageData(new ArrayList<>(), NumConstant.ZERO); + // } + List epmetUserIdList=new ArrayList<>(); + epmetUserIdList.add(formDTO.getUserId()); + if(!CollectionUtils.isEmpty(formDTO.getEpmetUserIdList())){ + epmetUserIdList.addAll(formDTO.getEpmetUserIdList()); + } + formDTO.setEpmetUserIdList(epmetUserIdList); PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectUserReported(formDTO)); return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); From 41c95f982372e47dcc21d89658d8998bc971f552 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 26 Jul 2022 17:39:00 +0800 Subject: [PATCH 127/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E3=80=91?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/epmetuser/IcResiUserDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index ffe08008ac..58fc07506f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -134,7 +134,7 @@ from ic_resi_user - inner join #{rule.colTable} + inner join ${rule.colTable} @@ -145,7 +145,7 @@ from ic_resi_user - inner join #{rule.colTable} + inner join ${rule.colTable} From d71dcddbd262531956dcad4d323b8ce3c181d575 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 27 Jul 2022 09:08:47 +0800 Subject: [PATCH 128/288] =?UTF-8?q?=E6=9A=82=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/CoverageHomeSearchFormDTO.java | 20 ++++++ .../result/CoverageHomeSearchResultDTO.java | 32 +++++++++ .../dto/govorg/result/EventInfoResultDTO.java | 46 +++++++++++++ .../govorg/result/ResourceInfoResultDTO.java | 31 +++++++++ .../dto/govorg/result/UserInfoResultDTO.java | 69 +++++++++++++++++++ .../controller/CoverageController.java | 18 +++++ .../dataaggre/service/CoverageService.java | 11 +++ .../service/impl/CoverageServiceImpl.java | 13 ++++ 8 files changed, 240 insertions(+) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java new file mode 100644 index 0000000000..61ff9e4c07 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dataaggre.dto.govorg.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/26 16:25 + * @DESC + */ +@Data +public class CoverageHomeSearchFormDTO implements Serializable { + + private static final long serialVersionUID = 3776954636762201010L; + + private String name; + private String customerId; + private String userId; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java new file mode 100644 index 0000000000..59d65d5741 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java @@ -0,0 +1,32 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/7/26 16:25 + * @DESC + */ +@Data +public class CoverageHomeSearchResultDTO implements Serializable { + + private static final long serialVersionUID = 8922820109004386708L; + + /** + * 居民信息 + */ + private List userInfos; + + /** + * 事件信息 + */ + private List eventInfos; + + /** + * 资源信息 + */ + private List resourceInfos; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java new file mode 100644 index 0000000000..18c6221410 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java @@ -0,0 +1,46 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/26 16:52 + * @DESC 事件本组织及下级难点堵点： 社区治理-事件管理中标记的痛点堵点 + */ +@Data +public class EventInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1645410018462094960L; + + /** + * 事件ID + */ + private String eventId; + + /** + * 所属网格 + */ + private String gridName; + + /** + * 发生时间 yyyy-dd-mm hh:ii:ss + */ + private String happenTime; + + /** + * 事件内容 + */ + private String eventContent; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java new file mode 100644 index 0000000000..772d6fd69f --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java @@ -0,0 +1,31 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/26 16:52 + * @DESC + */ +@Data +public class ResourceInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1645410018462094960L; + + private String resourceId; + private String resourceType; + + private String name; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java new file mode 100644 index 0000000000..971606c625 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.io.Serializable; +import java.util.List; + +/** + * @Author zxc + * @DateTime 2022/7/26 16:52 + * @DESC + */ +@Data +public class UserInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1645410018462094960L; + + private String icUserId; + + /** + * 名字 + */ + private String name; + + /** + * 所属网格 + */ + private String gridName; + + /** + * 所属房屋 + */ + private String houseName; + + /** + * 手机号 + */ + private String mobile; + + /** + * 身份证 + */ + private String idCard; + + /** + * 工作单位 + */ + private String gzdw; + + /** + * 人户情况 + */ + private String rhqk; + + /** + * 人员分类 + */ + private List type; + + /** + * 经度 + */ + private String longitude; + + /** + * 纬度 + */ + private String latitude; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 9427a51575..8ce19a7b9e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -1,11 +1,15 @@ package com.epmet.dataaggre.controller; +import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO; import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum; 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.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; import com.epmet.dataaggre.service.CoverageService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -54,4 +58,18 @@ public class CoverageController { List list = ZhzlResiCategoryEnum.toSelectList(); return new Result>().ok(list); } + /** + * Desc: 五大图层首页搜索 + * @param formDTO + * @param tokenDto + * @author zxc + * @date 2022/7/26 16:29 + */ + @PostMapping("search") + public Result coverageHomeSearch(@RequestBody CoverageHomeSearchFormDTO formDTO, @LoginUser TokenDto tokenDto){ + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setUserId(tokenDto.getUserId()); + return new Result().ok(coverageService.coverageHomeSearch(formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index 8734dcabd2..5674c60c2e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -1,7 +1,9 @@ package com.epmet.dataaggre.service; import com.epmet.commons.tools.page.PageData; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; import java.util.List; @@ -20,4 +22,13 @@ public interface CoverageService { */ PageData analysisDataList(List coverageTypes, List categoryKeys, String search, Integer pageNo, Integer pageSize, Boolean isPage); + + /** + * Desc: 五大图层首页搜索 + * @param formDTO + * @author zxc + * @date 2022/7/26 16:29 + */ + CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index b5f8a0ec3a..2a73095105 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -8,7 +8,9 @@ import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.entity.govorg.*; @@ -195,6 +197,17 @@ public class CoverageServiceImpl implements CoverageService { } } + /** + * Desc: 五大图层首页搜索 + * @param formDTO + * @author zxc + * @date 2022/7/26 16:29 + */ + @Override + public CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO) { + return null; + } + /** * 从staff信息中获取工作人员的PIDS * @param staffInfo From c8156fe4c0692e72859170fe13fa27721ee3b6c9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 27 Jul 2022 09:59:09 +0800 Subject: [PATCH 129/288] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=9F=A5=E8=AF=A21?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CustomerFormQueryDTO.java | 6 + .../epmet/controller/IcFormController.java | 2 +- .../java/com/epmet/dao/IcFormItemDao.java | 2 +- .../com/epmet/service/IcFormItemService.java | 2 +- .../service/impl/IcFormItemServiceImpl.java | 4 +- .../db/migration/V0.0.34__formitem_zhzl.sql | 1 + .../main/resources/mapper/IcFormItemDao.xml | 10 +- .../epmet/dto/form/IcResiUserPageFormDTO.java | 6 +- .../controller/IcResiUserController.java | 23 +++ .../com/epmet/service/IcResiUserService.java | 6 + .../service/impl/IcResiUserServiceImpl.java | 181 +++++++++++++++++- 11 files changed, 233 insertions(+), 10 deletions(-) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java index 1978e3660d..5f3d79cd47 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/CustomerFormQueryDTO.java @@ -30,5 +30,11 @@ public class CustomerFormQueryDTO implements Serializable { * 是否动态 */ private Boolean dynamic; + + /** + * 居民信息列表：resi + * 综合治理图层：zhzl + */ + private String listType; } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java index ef443587d2..dcb08f35e7 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormController.java @@ -140,7 +140,7 @@ public class IcFormController { @PostMapping(value = "queryConditions") Result> queryConditions(@RequestBody CustomerFormQueryDTO formQueryDTO) { ValidatorUtils.validateEntity(formQueryDTO,CustomerFormQueryDTO.AddUserInternalGroup.class); - return new Result>().ok(icFormItemService.queryConditions(formQueryDTO.getCustomerId(),formQueryDTO.getFormCode())); + return new Result>().ok(icFormItemService.queryConditions(formQueryDTO.getCustomerId(),formQueryDTO.getFormCode(),formQueryDTO.getListType())); } /** diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java index 9737ddb90f..df9da799b0 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/dao/IcFormItemDao.java @@ -59,7 +59,7 @@ public interface IcFormItemDao extends BaseDao { * @author yinzuomei * @date 2021/11/1 12:58 下午 */ - List queryConditions(@Param("customerId") String customerId, @Param("formCode") String formCode); + List queryConditions(@Param("customerId") String customerId, @Param("formCode") String formCode,@Param("listType") String listType); /** * 构造出所有子表关联语句 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java index 435e703e33..92058db5c3 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemService.java @@ -47,7 +47,7 @@ public interface IcFormItemService extends BaseService { List queryTableHeaderList(CustomerFormQueryDTO formDto); - List queryConditions(String customerId,String formCode); + List queryConditions(String customerId,String formCode,String listType); List querySubTables(String customerId, String formCode); diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java index c3b2e35991..74cb44a6b4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemServiceImpl.java @@ -137,8 +137,8 @@ public class IcFormItemServiceImpl extends BaseServiceImpl queryConditions(String customerId,String formCode) { - return baseDao.queryConditions(customerId,formCode); + public List queryConditions(String customerId,String formCode,String listType) { + return baseDao.queryConditions(customerId,formCode,listType); } @Override diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql new file mode 100644 index 0000000000..51b502edbb --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql @@ -0,0 +1 @@ +ALTER TABLE ic_form_item ADD COLUMN ZHZL_LIST_DISPLAY TINYINT ( 1 ) DEFAULT '0' COMMENT '综合治理图层列表显示：1展示，0不展示' AFTER LIST_DISPLAY; diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml index b0906de8d1..e2689c4c62 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/mapper/IcFormItemDao.xml @@ -147,7 +147,15 @@ m.DEL_FLAG = '0' AND m.CUSTOMER_ID = #{customerId} and m.FORM_CODE=#{formCode} - AND m.LIST_DISPLAY = '1' + + AND m.LIST_DISPLAY = '1' + + + AND m.LIST_DISPLAY = '1' + + + AND m.ZHZL_LIST_DISPLAY = '1' + )temp diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java index 66ece366cc..7acb58f01b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcResiUserPageFormDTO.java @@ -35,6 +35,10 @@ public class IcResiUserPageFormDTO extends PageFormDTO implements Serializable { * 关键词 */ private String keyword; - + /** + * 居民信息列表：resi + * 综合治理图层：zhzl + */ + private String listType; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 8ed931e7ed..834ac2326c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -374,6 +374,7 @@ public class IcResiUserController implements ResultDataResolver { //pageFormDTO.setCustomerId("45687aa479955f9d06204d415238f7cc"); pageFormDTO.setCustomerId(tokenDto.getCustomerId()); pageFormDTO.setStaffId(tokenDto.getUserId()); + pageFormDTO.setListType("resi"); ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class); if (null == pageFormDTO.getConditions()) { pageFormDTO.setConditions(new ArrayList<>()); @@ -1271,4 +1272,26 @@ public class IcResiUserController implements ResultDataResolver { public Result> getIcUserCount(@RequestBody IcUserCountFormDTO formDTO) { return new Result>().ok(icResiUserService.getIcUserCount(formDTO)); } + + /** + * 综合治理图层：查询居民信息 + * @param tokenDto + * @param pageFormDTO + * @return + */ + @PostMapping("listresi-zhzl") + @MaskResponse(fieldNames = {"MOBILE", "ID_CARD"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + public Result>> listResiZhzl(@LoginUser TokenDto tokenDto, @RequestBody IcResiUserPageFormDTO pageFormDTO) { + pageFormDTO.setCustomerId(tokenDto.getCustomerId()); + pageFormDTO.setStaffId(tokenDto.getUserId()); + pageFormDTO.setListType("zhzl"); + pageFormDTO.setIsPage(true); + ValidatorUtils.validateEntity(pageFormDTO, IcResiUserPageFormDTO.AddUserInternalGroup.class); + if (null == pageFormDTO.getConditions()) { + pageFormDTO.setConditions(new ArrayList<>()); + } + return new Result>>().ok(icResiUserService.listResiZhzl(pageFormDTO)); + } + + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index 97cb5345a5..f68830d81c 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -490,4 +490,10 @@ public interface IcResiUserService extends BaseService { */ Map getIcUserCount(IcUserCountFormDTO formDTO); + /** + * 综合治理图层-查询各类别（信访人员、安置帮教、吸毒人员、社区矫正、不良青少年、肇事肇祸精神病、邪教人员）居民信息 + * @param pageFormDTO + * @return + */ + PageData> listResiZhzl(IcResiUserPageFormDTO pageFormDTO); } 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 57fd9c7d34..6c1ef637b3 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 @@ -787,9 +787,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> pageResiMap(IcResiUserPageFormDTO formDTO) { // 查询列表展示项，如果没有，直接返回 - CustomerFormQueryDTO queryDTO1 = new CustomerFormQueryDTO(); - queryDTO1.setCustomerId(formDTO.getCustomerId()); - queryDTO1.setFormCode(formDTO.getFormCode()); + CustomerFormQueryDTO queryDTO1 = ConvertUtils.sourceToTarget(formDTO,CustomerFormQueryDTO.class); Result> resultColumnRes = operCustomizeOpenFeignClient.queryConditions(queryDTO1); if (!resultColumnRes.success() || CollectionUtils.isEmpty(resultColumnRes.getData())) { log.warn("没有配置列表展示列"); @@ -3045,4 +3043,181 @@ public class IcResiUserServiceImpl extends BaseServiceImpl list = ConvertUtils.sourceToTarget(userList,SendPointNoticeFormDTO.UserListBean.class); return list; } + + /** + * 综合治理图层-查询各类别（信访人员、安置帮教、吸毒人员、社区矫正、不良青少年、肇事肇祸精神病、邪教人员）居民信息 + * + * @param formDTO + * @return + */ + @Override + public PageData> listResiZhzl(IcResiUserPageFormDTO formDTO) { + // 查询列表展示项，如果没有，直接返回 + CustomerFormQueryDTO queryDTO1 = ConvertUtils.sourceToTarget(formDTO,CustomerFormQueryDTO.class); + Result> resultColumnRes = operCustomizeOpenFeignClient.queryConditions(queryDTO1); + if (!resultColumnRes.success() || CollectionUtils.isEmpty(resultColumnRes.getData())) { + log.warn("没有配置列表展示列"); + return new PageData(new ArrayList(), NumConstant.ZERO); + } + List resultColumns = resultColumnRes.getData(); + // 查询结果列对应的表: + Set resultColumnTables = resultColumns.stream().map(IcFormResColumnDTO::getTableName).collect(Collectors.toSet()); + List queryAgencyIdList = formDTO.getConditions().stream() + .filter(o -> IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName()) + && CollectionUtils.isNotEmpty(o.getColumnValue()) && StringUtils.isNotBlank(o.getColumnValue().get(NumConstant.ZERO))) + .flatMap(o -> o.getColumnValue().stream()).collect(Collectors.toList()); + + //添加数据权限 + String staffOrgPath; + String agencyId; + //如果查询条件中 有居民表的agencyId 则匹配查询该组织下的 数据 + if (queryAgencyIdList.isEmpty()){ + CustomerStaffInfoCacheResult staffInfoCacheResult = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + agencyId = staffInfoCacheResult.getAgencyId(); + if (StringUtils.isNotBlank(staffInfoCacheResult.getAgencyPIds()) && !NumConstant.ZERO_STR.equals(staffInfoCacheResult.getAgencyPIds())) { + staffOrgPath = staffInfoCacheResult.getAgencyPIds().concat(":").concat(staffInfoCacheResult.getAgencyId()); + } else { + staffOrgPath = staffInfoCacheResult.getAgencyId(); + } + } else { + formDTO.getConditions().removeIf(o->IcResiUserConstant.IC_RESI_USER.equals(o.getTableName()) && "AGENCY_ID".equals(o.getColumnName())); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(queryAgencyIdList.get(NumConstant.ZERO)); + if (agencyInfo == null){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取组织信息失败"); + } + agencyId = agencyInfo.getId(); + staffOrgPath = agencyInfo.getPids(); + if (StringUtils.isBlank(staffOrgPath)){ + staffOrgPath = agencyId; + }else{ + staffOrgPath = staffOrgPath+StrConstant.COLON+agencyInfo.getId(); + } + } + // 查询列表展示项需要用到哪些子表 + Result> subTablesRes = operCustomizeOpenFeignClient.querySubTables(queryDTO1); + List subTables = subTablesRes.getData(); + log.info("1、所有的子表subTables:"+JSON.toJSONString(subTables,true)); + + //关联哪些子表：查询条件用到的表名+查询的列对应的表 并集去重 + Set whereConditionTables = formDTO.getConditions().stream().map(ResiUserQueryValueDTO::getTableName).collect(Collectors.toSet()); + Set tables = new HashSet<>(); + tables.addAll(whereConditionTables); + tables.addAll(resultColumnTables); + log.info("2、查询条件+查询列对应的tables并集去重:"+ JSON.toJSONString(tables,true)); + //最终关联的子表对应的sql： + List finalSubTables = new ArrayList<>(); + //groupBy用到的表 + Set groupByTables = new HashSet<>(); + subTables.forEach(subTable -> { + if (tables.contains(subTable.getTableName())) { + finalSubTables.add(subTable.getJoinTableSql()); + if (subTable.getSupportAdd()) { + groupByTables.add(subTable.getTableName()); + } + } + }); + + PageInfo> pageInfo = new PageInfo<>(); + if (null == formDTO.getIsPage() || formDTO.getIsPage()) { + //分页 + String finalStaffOrgPath = staffOrgPath; + pageInfo = PageHelper.startPage(formDTO.getPageNo(), + formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectListResiMap(formDTO.getCustomerId(), + formDTO.getFormCode(), + formDTO.getConditions(), + resultColumns, + finalSubTables, + agencyId, finalStaffOrgPath,null, formDTO.getKeyword(), + groupByTables)); + } else { + List> list = baseDao.selectListResiMap(formDTO.getCustomerId(), + formDTO.getFormCode(), + formDTO.getConditions(), + resultColumns, + finalSubTables, + agencyId, + staffOrgPath,null, + formDTO.getKeyword(), + groupByTables); + pageInfo.setTotal(CollectionUtils.isEmpty(list) ? NumConstant.ZERO : list.size()); + pageInfo.setList(list); + } + + List> list = pageInfo.getList(); + //查询网格名称 + List gridIds = new ArrayList<>(); + Set houseIds = new HashSet<>(); + for (Map map : list) { + if (map.containsKey(UserConstant.GRID_ID) && null != map.get(UserConstant.GRID_ID) && StringUtils.isNotBlank(map.get(UserConstant.GRID_ID).toString())) { + gridIds.add(map.get(UserConstant.GRID_ID).toString()); + } + if (map.containsKey(UserConstant.HOME_ID) && null != map.get(UserConstant.HOME_ID) && StringUtils.isNotBlank(map.get(UserConstant.HOME_ID).toString())) { + houseIds.add(map.get(UserConstant.HOME_ID).toString()); + } + } + Result> gridInfoRes = govOrgOpenFeignClient.getGridListByGridIds(gridIds); + List gridInfoList = gridInfoRes.success() && !CollectionUtils.isEmpty(gridInfoRes.getData()) ? gridInfoRes.getData() : new ArrayList<>(); + Map gridInfoMap = gridInfoList.stream().collect(Collectors.toMap(AllGridsByUserIdResultDTO::getGridId, Function.identity())); + + //查询房子名称 + Result> houseInfoRes = govOrgOpenFeignClient.queryListHouseInfo(houseIds, formDTO.getCustomerId()); + List houseInfoDTOList = houseInfoRes.success() && !CollectionUtils.isEmpty(houseInfoRes.getData()) ? houseInfoRes.getData() : new ArrayList<>(); + Map houseInfoMap = houseInfoDTOList.stream().collect(Collectors.toMap(HouseInfoDTO::getHomeId, Function.identity())); + + + for (Map resultMap : list) { + String gridIdValue = null != resultMap.get(UserConstant.GRID_ID) ? resultMap.get(UserConstant.GRID_ID).toString() : StrConstant.EPMETY_STR; + resultMap.put("GRID_ID_VALUE", gridIdValue); + if (gridInfoMap.containsKey(gridIdValue) && null != gridInfoMap.get(gridIdValue)) { + //GRID_NAME + resultMap.put(UserConstant.GRID_ID, gridInfoMap.get(gridIdValue).getGridName()); + } + + String homeId = null != resultMap.get(UserConstant.HOME_ID) ? resultMap.get(UserConstant.HOME_ID).toString() : StrConstant.EPMETY_STR; + resultMap.put("HOME_ID_VALUE", homeId); + if (houseInfoMap.containsKey(homeId) && null != houseInfoMap.get(homeId)) { + HouseInfoDTO houseInfoDTO = houseInfoMap.get(homeId); + String buildName = StringUtils.isNotBlank(houseInfoDTO.getBuildingName()) ? houseInfoDTO.getBuildingName() : StrConstant.EPMETY_STR; + resultMap.put("BUILD_NAME", buildName); + + String neighBorName = StringUtils.isNotBlank(houseInfoDTO.getNeighborHoodName()) ? houseInfoDTO.getNeighborHoodName() : StrConstant.EPMETY_STR; + resultMap.put("VILLAGE_NAME", neighBorName); + + String unitName = StringUtils.isNotBlank(houseInfoDTO.getUnitName()) ? houseInfoDTO.getUnitName() : StrConstant.EPMETY_STR; + resultMap.put("UNIT_NAME", unitName); + + String doorName = StringUtils.isNotBlank(houseInfoDTO.getDoorName()) ? houseInfoDTO.getDoorName() : StrConstant.EPMETY_STR; + resultMap.put("DOOR_NAME", doorName); + + String houseType = StringUtils.isNotBlank(houseInfoDTO.getHouseType()) ? houseInfoDTO.getHouseType() : StrConstant.EPMETY_STR; + //房屋类型，1楼房，2平房，3别墅 + resultMap.put(UserConstant.HOUSE_TYPE_KEY, ""); + if (HouseTypeEnum.LOUFANG.getCode().equals(houseType)) { + resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.LOUFANG.getName()); + } else if (HouseTypeEnum.PINGFANG.getCode().equals(houseType)) { + resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.PINGFANG.getName()); + } else if (HouseTypeEnum.BIESHU.getCode().equals(houseType)) { + resultMap.put(UserConstant.HOUSE_TYPE_KEY, HouseTypeEnum.BIESHU.getName()); + } + resultMap.put(UserConstant.HOME_ID, neighBorName.concat(buildName).concat(unitName).concat(doorName)); + + } + + if (resultMap.containsKey(UserConstant.GENDER)) { + String genderValue = null != resultMap.get(UserConstant.GENDER) ? resultMap.get(UserConstant.GENDER).toString() : StrConstant.EPMETY_STR; + if (GenderEnum.MAN.getCode().equals(genderValue)) { + resultMap.put(UserConstant.GENDER, GenderEnum.MAN.getName()); + } else if (GenderEnum.WOMAN.getCode().equals(genderValue)) { + resultMap.put(UserConstant.GENDER, GenderEnum.WOMAN.getName()); + } else if (GenderEnum.UN_KNOWN.getCode().equals(genderValue)) { + resultMap.put(UserConstant.GENDER, GenderEnum.UN_KNOWN.getName()); + } + } + // 如果是信访人员 + + // 如果是特殊人群，且有特殊人群类别 + } + pageInfo.setList(list); + return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); + } } From 210189e227af3d22f85fe877f881ff79f457117c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 27 Jul 2022 10:09:46 +0800 Subject: [PATCH 130/288] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=9F=A5=E8=AF=A22?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.34__formitem_zhzl.sql | 7 +++++++ .../epmet/service/impl/IcResiUserServiceImpl.java | 15 ++++++++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql index 51b502edbb..9784ebe953 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql @@ -1 +1,8 @@ ALTER TABLE ic_form_item ADD COLUMN ZHZL_LIST_DISPLAY TINYINT ( 1 ) DEFAULT '0' COMMENT '综合治理图层列表显示：1展示，0不展示' AFTER LIST_DISPLAY; + + +update ic_form_item i set i.ZHZL_LIST_DISPLAY='1' +where i.DEL_FLAG='0' + and i.COLUMN_NAME in( + 'GRID_ID','HOME_ID','NAME','MOBILE','ID_CARD','GENDER','BIRTHDAY','REMARKS','IS_XFRY','IS_SPECIAL','SPECIAL_RQLB' + ); \ No newline at end of file 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 6c1ef637b3..a529fe8438 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 @@ -3213,9 +3213,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl zhzlCategoryName=new ArrayList<>(); // 如果是信访人员 - + String isXfry = StringUtils.isNotBlank((String)resultMap.get("IS_XFRY")) ? resultMap.get("IS_XFRY").toString() : StrConstant.EPMETY_STR; + if(NumConstant.ONE_STR.equals(isXfry)){ + zhzlCategoryName.add("信访人员"); + } // 如果是特殊人群，且有特殊人群类别 + String isSpecial = StringUtils.isNotBlank((String)resultMap.get("IS_SPECIAL")) ? resultMap.get("IS_SPECIAL").toString() : StrConstant.EPMETY_STR; + String specialRqlb = StringUtils.isNotBlank((String)resultMap.get("SPECIAL_RQLB")) ? resultMap.get("SPECIAL_RQLB").toString() : StrConstant.EPMETY_STR; + if(NumConstant.ONE_STR.equals(isSpecial)&&StringUtils.isNotBlank(specialRqlb)){ + String[] att=specialRqlb.split(StrConstant.COMMA); + for(String categoryCode:att){ + zhzlCategoryName.add(ZhzlResiCategoryEnum.getEnum(categoryCode).getName()); + } + } + resultMap.put("zhzlCategoryName",zhzlCategoryName.stream().collect(Collectors.joining(StrConstant.COMMA))); } pageInfo.setList(list); return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); From 52c9ceb3d046ac1921654f4f4cb382fefa19b355 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 27 Jul 2022 10:21:50 +0800 Subject: [PATCH 131/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../govorg/IcCoverageCategoryDictEntity.java | 10 ++++++++++ .../govorg/IcCoverageCategoryDictDao.xml | 2 ++ .../entity/IcCoverageCategoryDictEntity.java | 20 ++++++++++++++----- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java index cdaca78b91..dee38b469f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java @@ -43,6 +43,16 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { */ private String placeType; + /** + * 在可视化系统中所属的plact_type，跟COVERAGE_TYPE可能不同，COVERAGE_TYPE是给管理平台用的 + */ + private String placeTypeInAnalysis; + + /** + * 要跟菜单绑定(客户配置了这个菜单，这里才显示) + */ + private String menuUrl; + /** * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml index beb08a1262..25c0704bbd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml @@ -10,6 +10,8 @@ + + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java index c690e4a48a..13a31b9974 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java @@ -37,15 +37,25 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { private String categoryName; /** - * 所属场所类型； -社区自组织：community_org; -优势资源:superior_resource; -城市管理：city_management； -重点危化企业：dangerous_chemicals； + * 所属场所类型； +社区自组织：community_org; +优势资源:superior_resource; +城市管理：city_management； +重点危化企业：dangerous_chemicals； 公共服务：public_service */ private String placeType; + /** + * 在可视化系统中所属的plact_type，跟COVERAGE_TYPE可能不同，COVERAGE_TYPE是给管理平台用的 + */ + private String placeTypeInAnalysis; + + /** + * 要跟菜单绑定(客户配置了这个菜单，这里才显示) + */ + private String menuUrl; + /** * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 */ From d680d49eebbbf145f73180edb4fd9c34ae482609 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 27 Jul 2022 10:27:53 +0800 Subject: [PATCH 132/288] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E5=9B=BE=E5=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcResiUserServiceImpl.java | 9 --------- 1 file changed, 9 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 a529fe8438..07aeab3f53 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 @@ -3190,15 +3190,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Wed, 27 Jul 2022 10:31:26 +0800 Subject: [PATCH 133/288] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=AE=A2=E6=88=B7?= =?UTF-8?q?=E4=B8=8B=E8=8F=9C=E5=8D=95=E5=8A=A0=E4=BA=86=E4=B8=AAfeign?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/GetCustomerMenuListFormDTO.java | 27 +++++++++++++++++++ .../com/epmet/feign/GovAccessFeignClient.java | 15 ++++++++--- .../GovAccessFeignClientFallBack.java | 11 +++++--- .../epmet/controller/GovMenuController.java | 12 +++++++++ .../com/epmet/service/GovMenuService.java | 9 +++++++ .../service/impl/GovMenuServiceImpl.java | 17 ++++++++++++ 6 files changed, 83 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetCustomerMenuListFormDTO.java diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetCustomerMenuListFormDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetCustomerMenuListFormDTO.java new file mode 100644 index 0000000000..a79722fcd4 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GetCustomerMenuListFormDTO.java @@ -0,0 +1,27 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/27 10:13 + * @DESC + */ +@Data +public class GetCustomerMenuListFormDTO implements Serializable { + + private static final long serialVersionUID = 8143715578744359728L; + + private String customerId; + + /** + * 0：菜单；1：按钮 + */ + private Integer type; + + private String language; + + private String tableName; +} diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java index 36ccf542bb..ce7fc27c82 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -2,10 +2,8 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.GetStaffExistRoleFormDTO; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.GovMenuDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -52,4 +50,13 @@ public interface GovAccessFeignClient { @PostMapping("/gov/access/govroleuser/getStaffExistRole") Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO); + /** + * Desc: 获取客户下的菜单 + * @param formDTO + * @author zxc + * @date 2022/7/27 10:22 + */ + @PostMapping("/gov/access/menu/getCustomerMenuList") + Result> getCustomerMenuList(@RequestBody GetCustomerMenuListFormDTO formDTO); + } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java index bfb9acbc3b..ed19d5728c 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java @@ -3,10 +3,8 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.GetStaffExistRoleFormDTO; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.GovMenuDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.feign.GovAccessFeignClient; @@ -40,4 +38,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient { public Result> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getStaffExistRole", formDTO); } + + @Override + public Result> getCustomerMenuList(GetCustomerMenuListFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getCustomerMenuList", formDTO); + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java index ce89f2c7d8..cc94cd91f0 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovMenuController.java @@ -11,6 +11,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.GovMenuDTO; +import com.epmet.dto.form.GetCustomerMenuListFormDTO; import com.epmet.service.GovMenuService; import com.epmet.service.GovResourceService; import org.springframework.beans.factory.annotation.Autowired; @@ -155,4 +156,15 @@ public class GovMenuController { govMenuService.clearOperUserAccess(tokenDto.getApp(), tokenDto.getClient(), tokenDto.getUserId()); return new Result(); } + + /** + * Desc: 获取客户下的菜单 + * @param formDTO + * @author zxc + * @date 2022/7/27 10:22 + */ + @PostMapping("getCustomerMenuList") + public Result> getCustomerMenuList(@RequestBody GetCustomerMenuListFormDTO formDTO){ + return new Result>().ok(govMenuService.getCustomerMenuList(formDTO)); + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java index fd09359551..127f271940 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovMenuService.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.GovMenuDTO; +import com.epmet.dto.form.GetCustomerMenuListFormDTO; import com.epmet.entity.GovMenuEntity; import java.util.List; @@ -145,4 +146,12 @@ public interface GovMenuService extends BaseService { List getListPid(String pid); void clearOperUserAccess(String app, String client, String userId); + + /** + * Desc: 获取客户下的菜单 + * @param formDTO + * @author zxc + * @date 2022/7/27 10:22 + */ + List getCustomerMenuList(GetCustomerMenuListFormDTO formDTO); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java index 92c86a2c1c..a3b63e096b 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovMenuServiceImpl.java @@ -36,6 +36,7 @@ import com.epmet.dao.GovRoleDao; import com.epmet.dao.GovRoleMenuDao; import com.epmet.dao.GovRoleUserDao; import com.epmet.dto.GovMenuDTO; +import com.epmet.dto.form.GetCustomerMenuListFormDTO; import com.epmet.entity.GovMenuEntity; import com.epmet.enums.MenuTypeEnum; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -343,6 +344,22 @@ public class GovMenuServiceImpl extends BaseServiceImpl getCustomerMenuList(GetCustomerMenuListFormDTO formDTO) { + List customerMenuList = baseDao.getCustomerMenuList(formDTO.getCustomerId(), formDTO.getType(), HttpContextUtils.getLanguage(), formDTO.getTableName()); + if (CollectionUtils.isEmpty(customerMenuList)){ + return new ArrayList<>(); + } + return ConvertUtils.sourceToTarget(customerMenuList,GovMenuDTO.class); + + } + private void saveLanguage(String tableName, String tableId, String fieldName, String fieldValue){ govLanguageService.saveOrUpdate(tableName, tableId, fieldName, fieldValue, HttpContextUtils.getLanguage()); } From 0e382024233089f0317a57ec276655b243866d63 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Wed, 27 Jul 2022 15:28:05 +0800 Subject: [PATCH 134/288] =?UTF-8?q?=E7=BB=99=E5=AE=A2=E6=88=B7=E5=8B=BE?= =?UTF-8?q?=E9=80=89=E8=8F=9C=E5=8D=95=E6=97=B6=EF=BC=8C=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/redis/RedisKeys.java | 10 ++++++++++ .../java/com/epmet/commons/tools/redis/RedisUtils.java | 9 +++++++++ .../java/com/epmet/redis/GovCustomerMenuRedis.java | 5 +++++ .../epmet/service/impl/GovCustomerMenuServiceImpl.java | 1 + 4 files changed, 25 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index d6e8a2c245..76585fa96f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -766,6 +766,16 @@ public class RedisKeys { return rootPrefix.concat("gov:access:nav:"); } + /** + * Desc: 新五大图层获取菜单缓存key + * @param + * @author zxc + * @date 2022/7/27 13:42 + */ + public static String getCustomerMenuListFiveCoverage() { + return rootPrefix.concat("customer:govMenu:"); + } + /** * 如果是省列表：epmet:areacode:parentCode:0 * 山东省的下一级：epmet:areacode:parentCode:37 diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java index 2dce88e919..311830ae9f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisUtils.java @@ -375,6 +375,15 @@ public class RedisUtils { return redisTemplate.opsForSet().add(key,value); } + public void listAdd(String key,Object value){ + redisTemplate.opsForList().rightPush(key,value); + } + + public Object listGetAll(String key,Integer start, Integer end){ + List result = redisTemplate.opsForList().range(key, start, end); + return result; + } + /** * @Description 获取 zset 中带score的集合 * @param key diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java index 64dcb0fb1c..274ad0fed3 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java @@ -78,6 +78,11 @@ public class GovCustomerMenuRedis { redisUtils.deleteByPattern(key); } + public void delAllCustomerMenuFiveCoverage(String customerId){ + String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId); + redisUtils.delete(key); + } + private boolean checkParam(String customerId, Integer type) { if (StringUtils.isBlank(customerId) || type == null){ log.warn("checkParam fail, param is null"); diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java index a5933f8e58..0a93c9a4d1 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java @@ -115,6 +115,7 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl Date: Wed, 27 Jul 2022 15:49:47 +0800 Subject: [PATCH 135/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=9F=A5=E8=AF=A2=E5=8F=B3=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/CoverageEnums.java | 47 ++++++++++++ .../tools/enums/CoveragePlaceTypeEnum.java | 1 + .../AnalysisResourceCategoriesResult.java | 69 ++++++++++++++++++ .../controller/CoverageController.java | 11 +++ .../dataaggre/service/CoverageService.java | 6 ++ .../service/govorg/GovOrgCoverageService.java | 2 + .../impl/GovOrgCoverageServiceImpl.java | 9 +++ .../service/impl/CoverageServiceImpl.java | 72 +++++++++++++++++++ 8 files changed, 217 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java new file mode 100644 index 0000000000..0e2e749b16 --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java @@ -0,0 +1,47 @@ +package com.epmet.commons.tools.enums; + +/** + * 图层枚举 + */ +public enum CoverageEnums { + + ZHZL("zhzl", "综合治理图层", 1), + YJCL("yjcl", "应急处置资源", 2), + AQSC("aqsc", "安全生产资源", 2), + CSGL("csgl", "城市管理资源", 2), + GGFW("ggfw", "公共服务资源", 2); + + private String coverageType; + private String coverageName; + + /** 位置，1：左侧，2，右侧**/ + private Integer position; + + CoverageEnums(String coverageType, String coverageName, Integer position) { + this.coverageType = coverageType; + this.coverageName = coverageName; + this.position = position; + } + + public static CoverageEnums getEnum(String coverageType) { + CoverageEnums[] values = CoverageEnums.values(); + for (CoverageEnums value : values) { + if (value.getCoverageType().equals(coverageType)) { + return value; + } + } + return null; + } + + public String getCoverageType() { + return coverageType; + } + + public String getCoverageName() { + return coverageName; + } + + public Integer getPosition() { + return position; + } +} diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java index eb8d25e80f..dbad5fa3c2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java @@ -14,6 +14,7 @@ public enum CoveragePlaceTypeEnum { PUBLIC_SERVICE("public_service", "公共服务"), RESI("resi", "居民"), PARTY_UNIT("party_unit", "联建单位"), + VOLUNTEER("volunteer", "志愿者"), GROUP_RENT("group_rent", "群租房"), EVENT("event", "事件(包括难点堵点)"); diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java new file mode 100644 index 0000000000..216c41f705 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java @@ -0,0 +1,69 @@ +package com.epmet.dataaggre.dto.coverage; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +/** + * 五大图层-可视化-右侧分类树列表 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AnalysisResourceCategoriesResult { + + /** + * 图层类型 + */ + private String coverageType; + /** + * 图层名称 + */ + private String coverageName; + /** + * 个数 + */ + private Integer count; + + /** + * 没有placeTypeInAnalysis，直接属于图层的 + */ + private List categories = new ArrayList<>(); + + /** + * 场所类型，有placeTypeInAnalysis，不直接属于图层的 + */ + private List placeTypesInAnalysis = new ArrayList<>(); + + /** + * 分类 + */ + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class Category { + private String categoryKey; + private String categoryName; + private String coverageType; + private String placeType; + private Integer count = 0; + } + + /** + * 场所类型 + */ + @Data + @NoArgsConstructor + @AllArgsConstructor + public static class PlaceType { + private String placeType; + private String placeTypeName; + private Integer count = 0; + private List categories; + } + + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 8ce19a7b9e..fa68116993 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum; 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.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; @@ -72,4 +73,14 @@ public class CoverageController { return new Result().ok(coverageService.coverageHomeSearch(formDTO)); } + /** + * 五大图层-可视化-右侧分类树列表 + * @return + */ + @PostMapping("analysis/resourceCategories") + public Result> listAnalysisResourceCategories() { + List r = coverageService.listAnalysisResourceCategories(); + return new Result>().ok(r); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index 5674c60c2e..f372f2699c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service; import com.epmet.commons.tools.page.PageData; +import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; @@ -31,4 +32,9 @@ public interface CoverageService { */ CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO); + /** + * 五大图层-可视化-右侧分类树列表 + * @return + */ + List listAnalysisResourceCategories(); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 424cba462d..8168721b71 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -137,4 +137,6 @@ public interface GovOrgCoverageService { * @return */ IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey); + + List listCoverageCategoryEntities(String coverageType); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 85b7d2569c..2f39da60a4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -324,4 +324,13 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { query.ge(IcHouseEntity::getResiNumber, resiNumberBiggerThan); return query; } + + @Override + public List listCoverageCategoryEntities(String coverageType) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCoverageCategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + query.eq(IcCoverageCategoryDictEntity::getCoverageType, coverageType); + query.orderByAsc(IcCoverageCategoryDictEntity::getSort); + return coverageCategoryDictDao.selectList(query); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 2a73095105..dfae8be881 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -1,12 +1,15 @@ package com.epmet.dataaggre.service.impl; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; +import com.epmet.commons.tools.enums.CoverageEnums; +import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; 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.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; @@ -30,8 +33,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @Slf4j @@ -53,6 +58,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private GovProjectService govProjectService; + @Autowired + private GovOrgCoverageService govOrgCoverageService; + /** * 场所类型常量 */ @@ -452,4 +460,68 @@ public class CoverageServiceImpl implements CoverageService { } return new String[]{longitude, latitude}; } + + /** + * 五大图层-可视化-右侧分类树列表 + * @return + */ + @Override + public List listAnalysisResourceCategories() { + + //结果集 + ArrayList results = new ArrayList<>(); + + // 1.查询categoryDict表得到基础数据，每个图层循环一次 + for (CoverageEnums coverage : CoverageEnums.values()) { + + // 只要右边的 + if (!coverage.getPosition().equals(Integer.valueOf(2))) { + continue; + } + + AnalysisResourceCategoriesResult categoriesOfThisCoverage = new AnalysisResourceCategoriesResult(); + HashMap placeTypeMap = new HashMap<>(); + + List categoryDictEntities = govOrgCoverageService.listCoverageCategoryEntities(coverage.getCoverageType()); + + // 2.根据menuUrl过滤 todo + + // 2.计算各类数量 todo + + // 3.对上一步得到的数据进行分组，使用PLACE_TYPE_IN_ANALYSIS分组，然后放入placeType，这一列为空的说明不分组，直接属于coverage + categoryDictEntities.forEach(c -> { + if (StringUtils.isBlank(c.getPlaceTypeInAnalysis())) { + // 没有placetype的 + categoriesOfThisCoverage.getCategories() + .add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), c.getCategoryName(), + c.getCoverageType(), c.getPlaceType(), 0)); + } else { + // 有placetype的 + AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(c.getPlaceTypeInAnalysis()); + if (placeType == null) { + placeType = new AnalysisResourceCategoriesResult.PlaceType( + c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), 0, new ArrayList<>()); + placeTypeMap.put(c.getPlaceTypeInAnalysis(), placeType); + } + placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), + c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), 0)); + + placeType.setCount(placeType.getCount() + 0); // todo 0改为category的count + } + }); + + AtomicReference total = new AtomicReference<>(0); + placeTypeMap.forEach((placeTypeKey, placeType) -> { + categoriesOfThisCoverage.getPlaceTypesInAnalysis().add(placeType); + total.updateAndGet(v -> v + placeType.getCount()); + }); + + categoriesOfThisCoverage.setCoverageType(coverage.getCoverageType()); + categoriesOfThisCoverage.setCoverageName(CoverageEnums.getEnum(coverage.getCoverageType()).getCoverageName()); + categoriesOfThisCoverage.setCount(total.get()); + results.add(categoriesOfThisCoverage); + } + + return results; + } } \ No newline at end of file From 88420ebd9344307d3e1cc8d3a6e8c75c5915cb63 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 27 Jul 2022 16:33:41 +0800 Subject: [PATCH 136/288] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/constant/OrgConstant.java | 3 +- .../dto/govorg/form/OrgStatisticsFormDTO.java | 22 +++ .../result/MemberProjectInfoResultDTO.java | 23 +++ .../dto/govorg/result/OrgCountDTO.java | 17 +++ .../result/OrgProjectDetailResultDTO.java | 24 +++ .../controller/GovOrgController.java | 11 ++ .../dataaggre/dao/datastats/DataStatsDao.java | 6 + .../dataaggre/dao/epmetuser/StaffRoleDao.java | 3 + .../dao/govorg/CustomerAgencyDao.java | 2 + .../dataaggre/dao/govproject/ProjectDao.java | 5 + .../service/datastats/DataStatsService.java | 6 + .../datastats/impl/DataStatsServiceImpl.java | 144 +++++++++++------- .../service/epmetuser/EpmetUserService.java | 11 +- .../epmetuser/impl/EpmetUserServiceImpl.java | 23 ++- .../service/govorg/GovOrgService.java | 26 +++- .../govorg/impl/GovOrgServiceImpl.java | 134 +++++++++++++++- .../service/govproject/GovProjectService.java | 6 +- .../impl/GovProjectServiceImpl.java | 20 +++ .../mapper/datastats/DatsStatsDao.xml | 37 +++++ .../mapper/epmetuser/StaffRoleDao.xml | 19 +++ .../mapper/govorg/CustomerAgencyDao.xml | 10 ++ .../mapper/govproject/ProjectDao.xml | 39 +++++ 22 files changed, 520 insertions(+), 71 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgCountDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java index 5119475926..f6e180eb7f 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java @@ -10,7 +10,8 @@ public interface OrgConstant { String PROVINCE = "province"; String CITY = "city"; String DISTRICT = "district"; - + String STREET = "street"; + String COMMUNITY = "community"; String GRID_ID="GRID_ID"; String GENDER="GENDER"; String HOUSE_TYPE_KEY="HOUSE_TYPE"; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java new file mode 100644 index 0000000000..f6f81f36d7 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.dataaggre.dto.govorg.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/7/27 9:27 + */ +@Data +public class OrgStatisticsFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -1043502365053945317L; + private String agencyId; + private String orgId; + private String orgType; + private String type; + private String startDate; + private String endDate; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java new file mode 100644 index 0000000000..4b4ac940a3 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java @@ -0,0 +1,23 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/7/27 9:33 + */ +@NoArgsConstructor +@Data +public class MemberProjectInfoResultDTO implements Serializable { + + private static final long serialVersionUID = -4880909768378661921L; + private String staffId; + private String staffName; + private String orgName; + private String projectCount; + private String closedCount; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgCountDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgCountDTO.java new file mode 100644 index 0000000000..1163413ab7 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgCountDTO.java @@ -0,0 +1,17 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/7/27 14:56 + */ +@Data +public class OrgCountDTO implements Serializable { + private static final long serialVersionUID = -1875812403619088015L; + private String orgId; + private Integer count; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java new file mode 100644 index 0000000000..302e232d8d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.io.Serializable; + +/** + * @Description + * @Author zhaoqifeng + * @Date 2022/7/27 9:32 + */ +@NoArgsConstructor +@Data +public class OrgProjectDetailResultDTO implements Serializable { + private static final long serialVersionUID = 6333117500929136144L; + private String orgId; + private String orgName; + private Integer memberCount = 0; + private Integer projectCount = 0; + private Integer closedCount = 0; + private Integer projectAve = 0; + private Integer closedAve = 0; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 134278d433..2e5f0bff93 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -439,4 +439,15 @@ public class GovOrgController { } return new Result().ok(govOrgService.queryBuildingInfo(buildingId)); } + + @PostMapping("orgProjectDetailList") + public Result> orgProjectDetailList(@LoginUser TokenDto tokenDto, @RequestBody OrgStatisticsFormDTO formDTO) { + return new Result>().ok(govOrgService.orgProjectDetailList(tokenDto, formDTO)); + } + + @PostMapping("memberProjectInfoList") + public Result> memberProjectInfoList(@LoginUser TokenDto tokenDto, @RequestBody OrgStatisticsFormDTO formDTO) { + return new Result>().ok(govOrgService.memberProjectInfoList(tokenDto, formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index af97c5e52c..2c910a3057 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -26,7 +26,9 @@ import com.epmet.dataaggre.dto.epmetuser.FactIcuserCategoryAnalysisDailyDTO; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; +import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; @@ -373,4 +375,8 @@ public interface DataStatsDao { */ List getGridProejctToProjectMain(GridLivelyFormDTO formDTO); + List getAgencyProjectTotal(OrgStatisticsFormDTO formDTO); + + List getMemberCount(@Param("agencyId")String agencyId, @Param("dateId") String dateId); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java index e508cb2666..1540c564d6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.result.RoleListResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; +import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -74,4 +75,6 @@ public interface StaffRoleDao extends BaseDao { */ List selectStaffByRole(@Param("customerId") String customerId, @Param("roleId") String roleId, @Param("userId") String userId); + List getMemberCount(@Param("customerId") String customerId); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index 076b7af7bd..ba9043c0f4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -106,4 +106,6 @@ public interface CustomerAgencyDao extends BaseDao { */ LinkedList subAgencyListAndGridSumNum(@Param("agencyId") String agencyId); + List getSubAgencyList(@Param("agencyId") String agencyId); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 35dd1601b5..3057cfbb25 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -19,6 +19,8 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; +import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; import com.epmet.dataaggre.dto.govproject.ResiEventDTO; @@ -123,4 +125,7 @@ public interface ProjectDao extends BaseDao { */ List getEventOrgList(@Param("eventIds") List eventIds); List getCategoryCount(ProjectCategoryTotalFormDTO formDTO); + + List getGridProjectCount(OrgStatisticsFormDTO formDTO); + List getGridClosedProjectCount(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 754ee01d50..db0827a62a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -7,6 +7,7 @@ import com.epmet.dataaggre.dto.epmetuser.FactIcuserCategoryAnalysisDailyDTO; import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; @@ -16,6 +17,7 @@ import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; import javax.servlet.http.HttpServletResponse; import java.text.ParseException; import java.util.List; +import java.util.Map; /** * @Author sun @@ -296,4 +298,8 @@ public interface DataStatsService { * @author sun */ List getGridProejctToProjectMain(GridLivelyFormDTO formDTO); + + Map getAgencyProjectTotal(OrgStatisticsFormDTO formDTO); + + Map getMemberMap(String agencyId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 8682ec5876..b89ce1b0c3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -1,63 +1,66 @@ package com.epmet.dataaggre.service.datastats.impl; import cn.afterturn.easypoi.excel.entity.ExportParams; -import com.alibaba.fastjson.JSON; -import com.epmet.commons.dynamic.datasource.annotation.DataSource; -import com.epmet.commons.tools.constant.NumConstant; -import com.epmet.commons.tools.enums.OrgLevelEnum; -import com.epmet.commons.tools.enums.OrgTypeEnum; -import com.epmet.commons.tools.exception.RenException; -import com.epmet.commons.tools.feign.ResultDataResolver; -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.poi.excel.ExportMultiView; -import com.epmet.dataaggre.constant.DataSourceConstant; -import com.epmet.dataaggre.constant.OrgConstant; -import com.epmet.dataaggre.dao.datastats.DataStatsDao; -import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao; -import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO; -import com.epmet.dataaggre.dto.datastats.form.*; -import com.epmet.dataaggre.dto.datastats.result.*; -import com.epmet.dataaggre.dto.epmetuser.FactIcuserCategoryAnalysisDailyDTO; -import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; -import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; -import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult; -import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; -import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; -import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; -import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; -import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; -import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; -import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; -import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; -import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; -import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; -import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; -import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; -import com.epmet.dataaggre.excel.CustomerDataManageExcel; -import com.epmet.dataaggre.service.datastats.DataStatsService; -import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; -import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; -import com.epmet.dataaggre.service.govorg.GovOrgService; -import com.epmet.dataaggre.service.opercrm.CustomerRelation; -import com.github.pagehelper.PageHelper; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.collections4.CollectionUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletResponse; -import java.math.BigDecimal; -import java.math.RoundingMode; -import java.text.NumberFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicReference; -import java.util.stream.Collectors; + import com.alibaba.fastjson.JSON; + import com.epmet.commons.dynamic.datasource.annotation.DataSource; + import com.epmet.commons.tools.constant.NumConstant; + import com.epmet.commons.tools.enums.OrgLevelEnum; + import com.epmet.commons.tools.enums.OrgTypeEnum; + import com.epmet.commons.tools.exception.RenException; + import com.epmet.commons.tools.feign.ResultDataResolver; + 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.poi.excel.ExportMultiView; + import com.epmet.dataaggre.constant.DataSourceConstant; + import com.epmet.dataaggre.constant.OrgConstant; + import com.epmet.dataaggre.dao.datastats.DataStatsDao; + import com.epmet.dataaggre.dao.datastats.FactGridMemberStatisticsDailyDao; + import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO; + import com.epmet.dataaggre.dto.datastats.form.*; + import com.epmet.dataaggre.dto.datastats.result.*; + import com.epmet.dataaggre.dto.epmetuser.FactIcuserCategoryAnalysisDailyDTO; + import com.epmet.dataaggre.dto.epmetuser.form.GridMemberPatrolListFormDTO; + import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; + import com.epmet.dataaggre.dto.epmetuser.result.PatrolDailySumResult; + import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; + import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; + import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; + import com.epmet.dataaggre.dto.evaluationindex.ScreenGovernRankDataDailyDTO; + import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; + import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; + import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; + import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; + import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; + import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; + import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; + import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; + import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; + import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; + import com.epmet.dataaggre.excel.CustomerDataManageExcel; + import com.epmet.dataaggre.service.datastats.DataStatsService; + import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; + import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; + import com.epmet.dataaggre.service.govorg.GovOrgService; + import com.epmet.dataaggre.service.opercrm.CustomerRelation; + import com.github.pagehelper.PageHelper; + import lombok.extern.slf4j.Slf4j; + import org.apache.commons.collections4.CollectionUtils; + import org.apache.commons.lang3.StringUtils; + import org.springframework.beans.factory.annotation.Autowired; + import org.springframework.stereotype.Service; + + import javax.servlet.http.HttpServletResponse; + import java.math.BigDecimal; + import java.math.RoundingMode; + import java.text.NumberFormat; + import java.text.ParseException; + import java.text.SimpleDateFormat; + import java.util.*; + import java.util.concurrent.atomic.AtomicInteger; + import java.util.concurrent.atomic.AtomicReference; + import java.util.function.Function; + import java.util.stream.Collectors; /** * @Author sun @@ -2267,4 +2270,31 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve public List getGridProejctToProjectMain(GridLivelyFormDTO formDTO) { return dataStatsDao.getGridProejctToProjectMain(formDTO); } + + @Override + public Map getAgencyProjectTotal(OrgStatisticsFormDTO formDTO) { + List list = dataStatsDao.getAgencyProjectTotal(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(SubAgencyProjectResultDTO::getAgencyId, Function.identity())); + } + + /** + * 组织下网格的网格员数量统计 + * @Param agencyId + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/27 16:11 + */ + @Override + public Map getMemberMap(String agencyId) { + //当前日期前一天 + String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); + List list = dataStatsDao.getMemberCount(agencyId, dateId); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 01b9dae907..014135e533 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -13,7 +13,7 @@ import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; import java.util.List; -import java.util.Set; +import java.util.Map; /** * @Author zxc @@ -208,4 +208,13 @@ public interface EpmetUserService { Integer getTotalByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, List resiRule, List houseIds); + /** + * 统计各组织下网格员数量 + * + * @Param customerId + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/27 14:58 + */ + Map getMemberCount(String customerId); } 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 000affa6ff..79cb151439 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 @@ -26,10 +26,7 @@ import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; -import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; -import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; -import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO; -import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO; +import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity; @@ -857,4 +854,22 @@ public class EpmetUserServiceImpl implements EpmetUserService { public Integer getTotalByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, List resiRule, List houseIds) { return icResiUserDao.getTotalByPolicyRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds); } + + /** + * 统计各组织下网格员数量 + * + * @param customerId + * @Param customerId + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/27 14:58 + */ + @Override + public Map getMemberCount(String customerId) { + List list = staffRoleDao.getMemberCount(customerId); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index ee502bd493..aee2f7dbd7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.service.govorg; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; @@ -11,13 +12,10 @@ import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; -import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dto.IcNeighborHoodDTO; -import com.epmet.dto.result.NeighborHoodListResultDTO; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Set; /** * @Author zxc @@ -223,4 +221,26 @@ public interface GovOrgService { List statRule, Integer pageNo, Integer pageSize); List neighborhoodsByIds(List neighborhoodIds); + + /** + * 组织项目统计 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link PageData< MemberProjectInfoResultDTO>} + * @Author zhaoqifeng + * @Date 2022/7/27 9:43 + */ + PageData orgProjectDetailList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO); + + /** + * 网格员项目相关统计 + * + * @Param tokenDto + * @Param formDTO + * @Return {@link PageData< MemberProjectInfoResultDTO>} + * @Author zhaoqifeng + * @Date 2022/7/27 9:44 + */ + PageData memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 86999e17bd..fb237d158e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -5,7 +5,6 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.Constant; @@ -18,6 +17,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.exception.RenException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.RedisKeys; import com.epmet.commons.tools.redis.RedisUtils; import com.epmet.commons.tools.redis.common.CustomerOrgRedis; @@ -27,11 +27,12 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; 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.EpmetRequestHolder; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dao.govorg.*; +import com.epmet.dataaggre.dto.datastats.result.SubAgencyProjectResultDTO; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; @@ -41,7 +42,7 @@ import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; -import com.epmet.dataaggre.entity.govorg.IcHouseEntity; +import com.epmet.dataaggre.entity.govorg.CustomerGridEntity; import com.epmet.dataaggre.excel.GridLivelyDetailExcel; import com.epmet.dataaggre.excel.GridLivelyExcel; import com.epmet.dataaggre.service.commonservice.AreaCodeService; @@ -49,11 +50,13 @@ import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.govorg.GovOrgService; +import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.result.UploadImgResultDTO; import com.epmet.feign.OssFeignClient; 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; @@ -66,6 +69,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.commons.CommonsMultipartFile; +import javax.annotation.Resource; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -117,6 +121,8 @@ public class GovOrgServiceImpl implements GovOrgService { private IcHouseDao houseDao; @Autowired private IcNeighborhoodDao neighborhoodDao; + @Resource + private GovProjectService govProjectService; /** * @param staffId @@ -1130,4 +1136,126 @@ public class GovOrgServiceImpl implements GovOrgService { public List neighborhoodsByIds(List neighborhoodIds) { return neighborhoodDao.neighborhoodsByIds(neighborhoodIds); } + + /** + * 组织项目统计 + * + * @param tokenDto + * @param formDTO + * @Param tokenDto + * @Param formDTO + * @Return {@link PageData < MemberProjectInfoResultDTO>} + * @Author zhaoqifeng + * @Date 2022/7/27 9:43 + */ + @Override + public PageData orgProjectDetailList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { + List resultList = new ArrayList<>(); + if (StringUtils.isBlank(formDTO.getAgencyId())) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + } + CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + long total = 0; + if (OrgConstant.COMMUNITY.equals(agencyEntity.getLevel()) && NumConstant.ONE_STR.equals(formDTO.getType())) { + //获取网格列表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CustomerGridEntity::getCustomerId, tokenDto.getCustomerId()); + wrapper.eq(CustomerGridEntity::getPid, formDTO.getAgencyId()); + wrapper.last("ORDER BY CONVERT ( GRID_NAME USING gbk ) ASC"); + List gridList = customerGridDao.selectList(wrapper); + //拼装数据 + if (CollectionUtils.isNotEmpty(gridList)) { + //统计网格项目数 + Map projectMap = govProjectService.getGridProjectMap(formDTO); + //统计网格关闭项目数 + Map closedMap = govProjectService.getGridClosedProjectMap(formDTO); + //网格员统计 + Map memberMap = dataStatsService.getMemberMap(formDTO.getAgencyId()); + resultList = gridList.stream().map(grid -> { + OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); + dto.setOrgId(grid.getId()); + dto.setOrgName(grid.getGridName()); + if (projectMap.containsKey(grid.getId())) { + dto.setProjectCount(projectMap.get(grid.getId())); + } + if (closedMap.containsKey(grid.getId())) { + dto.setClosedCount(closedMap.get(grid.getId())); + } + if (memberMap.containsKey(grid.getId())) { + dto.setMemberCount(memberMap.get(grid.getId())); + dto.setProjectAve(dto.getProjectCount()/memberMap.get(grid.getId())); + dto.setClosedAve(dto.getClosedCount()/memberMap.get(grid.getId())); + } + return dto; + }).collect(Collectors.toList()); + } + //获取统计数据 + PageInfo pageInfo = new PageInfo<>(gridList); + total = pageInfo.getTotal(); + } else { + //获取组织列表 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(CustomerAgencyEntity::getCustomerId, tokenDto.getCustomerId()); + if (NumConstant.ZERO_STR.equals(formDTO.getType())) { + wrapper.eq(CustomerAgencyEntity::getId, formDTO.getAgencyId()); + } else { + wrapper.eq(CustomerAgencyEntity::getPid, formDTO.getAgencyId()); + } + wrapper.last("ORDER BY CONVERT ( ORGANIZATION_NAME USING gbk ) ASC"); + List agencyList = customerAgencyDao.selectList(wrapper); + //拼装数据 + if (CollectionUtils.isNotEmpty(agencyList)) { + //项目相关统计 + Map projectMap = dataStatsService.getAgencyProjectTotal(formDTO); + //网格员统计 + Map memberMap = epmetUserService.getMemberCount(tokenDto.getCustomerId()); + + resultList = agencyList.stream().map(agency -> { + OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); + dto.setOrgId(agency.getId()); + dto.setOrgName(agency.getOrganizationName()); + if (projectMap.containsKey(agency.getId())) { + dto.setProjectCount(projectMap.get(agency.getId()).getProjectTotal()); + dto.setClosedCount(projectMap.get(agency.getId()).getClosedProjectTotal()); + } + //获取当前组织的所有下级组织ID（包含本级） + List agencyIds = customerAgencyDao.getSubAgencyList(agency.getId()); + //将下级组织网格员数加起来 + int memberCount = agencyIds.stream().filter(memberMap::containsKey).mapToInt(memberMap::get).sum(); + dto.setMemberCount(memberCount); + if (memberCount != NumConstant.ZERO) { + dto.setProjectAve(dto.getProjectCount()/memberCount); + dto.setClosedAve(dto.getClosedCount()/memberCount); + } + return dto; + + }).collect(Collectors.toList()); + } + //获取统计数据 + PageInfo pageInfo = new PageInfo<>(agencyList); + total = pageInfo.getTotal(); + } + return new PageData<>(resultList, total); + } + + /** + * 网格员项目相关统计 + * + * @param tokenDto + * @param formDTO + * @Param tokenDto + * @Param formDTO + * @Return {@link PageData< MemberProjectInfoResultDTO>} + * @Author zhaoqifeng + * @Date 2022/7/27 9:44 + */ + @Override + public PageData memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { + return null; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 44ec60c4cd..e7123f51ca 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -2,13 +2,14 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.entity.govproject.IcEventEntity; -import com.sun.org.apache.xpath.internal.operations.Bool; import java.util.LinkedList; import java.util.List; +import java.util.Map; /** * @Author zxc @@ -120,5 +121,6 @@ public interface GovProjectService { */ List searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize); - + Map getGridProjectMap(OrgStatisticsFormDTO formDTO); + Map getGridClosedProjectMap(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index de4c2c2bc5..f491b2f3b2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -26,6 +26,8 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; +import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; import com.epmet.dataaggre.dto.govproject.ResiEventDTO; @@ -665,6 +667,24 @@ public class GovProjectServiceImpl implements GovProjectService { return icEventDao.selectList(query); } + @Override + public Map getGridProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getGridProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + + @Override + public Map getGridClosedProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getGridClosedProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + /** * 构造事件查询 * @param customerId diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index 330f564b25..b35342302d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1206,4 +1206,41 @@ GROUP BY grid_id, date_id + + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml index cbe39ede21..2a5232fd8c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml @@ -93,4 +93,23 @@ AND b.STAFF_ID != #{userId} + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index e5594fdb5e..a77f1f22e0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -298,5 +298,15 @@ AND pid = #{agencyId} ORDER BY created_time ASC + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 8bd1c33ee7..a5ed36af1a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -419,5 +419,44 @@ GROUP BY LEFT(c.CATEGORY_CODE,#{categoryOneLength}) ORDER BY total DESC + + From 0be377f923c7285d53621130b768573de269cda7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 27 Jul 2022 16:58:20 +0800 Subject: [PATCH 137/288] =?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 --- .../java/com/epmet/entity/ServerInfoDTO.java | 15 +++++++ .../impl/IcUserDemandRecServiceImpl.java | 45 ++++++++++++++----- 2 files changed, 48 insertions(+), 12 deletions(-) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java new file mode 100644 index 0000000000..39bdd462f5 --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/ServerInfoDTO.java @@ -0,0 +1,15 @@ +package com.epmet.entity; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2022/7/27 16:23 + */ +@Data +public class ServerInfoDTO { + private String serviceName; + private String mobile; +} + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index c1acbcd859..9458f5ddff 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -414,11 +414,11 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Wed, 27 Jul 2022 17:01:59 +0800 Subject: [PATCH 138/288] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E5=B9=B4=E9=BE=84?= =?UTF-8?q?=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.34__policy_nianling.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql new file mode 100644 index 0000000000..b2792374e8 --- /dev/null +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__policy_nianling.sql @@ -0,0 +1,8 @@ +-- 恢复年龄组件 +UPDATE ic_form_item i +SET i.DEL_FLAG = '0', + i.COLUMN_NAME = 'BIRTHDAY', + i.POLICY_FLAG='1', + i.UPDATED_TIME = NOW() +WHERE + i.LABEL = '年龄'; \ No newline at end of file From d0e24d6670a0d8f2bc623a7e6aa554bc2a472509 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Wed, 27 Jul 2022 17:03:54 +0800 Subject: [PATCH 139/288] =?UTF-8?q?=E5=85=9A=E5=91=98=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E5=8F=AF=E8=A6=86=E7=9B=96=E5=8E=9F=E6=9C=89=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcPartyMemberServiceImpl.java | 28 ++++++++----------- 1 file changed, 12 insertions(+), 16 deletions(-) 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 2b0f70bade..e6e8fd9c44 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 @@ -662,21 +662,6 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcPartyMemberEntity::getCustomerId, customerId); - wrapper.eq(IcPartyMemberEntity::getIdCard, e.getIdCard()); - IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper); - if (null != partyMember) { - String message = "党员已存在"; - IcPartyMemberImportExcel.RowRemarkMessage errorRow = new IcPartyMemberImportExcel.RowRemarkMessage(); - errorRow.setName(name); - errorRow.setMobile(mobile); - errorRow.setIdCard(idCard); - errorRow.setErrorInfo(message); - otherRows.add(errorRow); - return; - } e.setCustomerId(customerId); e.setAgencyId(org.getAgencyId()); e.setAgencyPids(org.getAgencyPids()); @@ -707,7 +692,18 @@ public class IcPartyMemberServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcPartyMemberEntity::getCustomerId, customerId); + wrapper.eq(IcPartyMemberEntity::getIdCard, e.getIdCard()); + IcPartyMemberEntity partyMember = baseDao.selectOne(wrapper); + if (null != partyMember) { + e.setId(partyMember.getId()); + baseDao.updateById(e); + } else { + baseDao.insert(e); + } + } } \ No newline at end of file From fba0a7772b629275c1ef7145706cc0e4e75ab249 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Wed, 27 Jul 2022 17:44:17 +0800 Subject: [PATCH 140/288] =?UTF-8?q?=E6=9F=A5=E8=A7=92=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/form/GovRoleListDTO.java | 49 +++++++++++++++++++ .../com/epmet/feign/GovAccessFeignClient.java | 9 ++-- .../GovAccessFeignClientFallBack.java | 11 +++-- .../epmet/controller/GovRoleController.java | 6 +++ .../main/java/com/epmet/dao/GovRoleDao.java | 2 + .../com/epmet/service/GovRoleService.java | 3 ++ .../service/impl/GovRoleServiceImpl.java | 6 +++ .../src/main/resources/mapper/GovRoleDao.xml | 12 +++++ 8 files changed, 90 insertions(+), 8 deletions(-) create mode 100644 epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GovRoleListDTO.java diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GovRoleListDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GovRoleListDTO.java new file mode 100644 index 0000000000..7ff4de4670 --- /dev/null +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/GovRoleListDTO.java @@ -0,0 +1,49 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.form; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + + +/** + * 角色管理 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-18 + */ +@Data +public class GovRoleListDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 角色名称 + */ + private String name; + + +} \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java index 36ccf542bb..d5b6623ea8 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -2,10 +2,8 @@ package com.epmet.feign; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.GetStaffExistRoleFormDTO; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.GovRoleDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory; import org.springframework.cloud.openfeign.FeignClient; @@ -52,4 +50,7 @@ public interface GovAccessFeignClient { @PostMapping("/gov/access/govroleuser/getStaffExistRole") Result> getStaffExistRole(@RequestBody GetStaffExistRoleFormDTO formDTO); + @PostMapping("/gov/access/govrole/getgovrole") + Result getGovRole(@RequestBody GovRoleListDTO formDTO); + } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java index bfb9acbc3b..9fb58edf69 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java @@ -3,10 +3,8 @@ package com.epmet.feign.fallback; import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.utils.ModuleUtils; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.GetStaffExistRoleFormDTO; -import com.epmet.dto.form.InitDefaultOperationsFormDTO; -import com.epmet.dto.form.ListOpePermsFormDTO; -import com.epmet.dto.form.RoleUserFormDTO; +import com.epmet.dto.GovRoleDTO; +import com.epmet.dto.form.*; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.feign.GovAccessFeignClient; @@ -40,4 +38,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient { public Result> getStaffExistRole(GetStaffExistRoleFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getStaffExistRole", formDTO); } + + @Override + public Result getGovRole(GovRoleListDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getGovRole", formDTO); + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java index c11faba160..0159a8d891 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.GovRoleDTO; +import com.epmet.dto.form.GovRoleListDTO; import com.epmet.service.GovRoleMenuService; import com.epmet.service.GovRoleService; import org.springframework.beans.factory.annotation.Autowired; @@ -102,4 +103,9 @@ public class GovRoleController { return new Result>().ok(data); } + @PostMapping("getgovrole") + public Result getGovRole(@RequestBody GovRoleListDTO fromDTO){ + return new Result().ok(govRoleService.getGovRole(fromDTO)); + } + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java index 526dbf9b37..a70c839a63 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/dao/GovRoleDao.java @@ -9,6 +9,7 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.GovRoleDTO; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.GovRoleEntity; import org.apache.ibatis.annotations.Mapper; @@ -33,4 +34,5 @@ public interface GovRoleDao extends BaseDao { */ List getCustomerRoles(@Param("customerId")String customerId); + GovRoleDTO selectGovRole(@Param("customerId") String customerId, @Param("name") String name); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java index 4fbf7e0f58..b7ca62a420 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.dto.GovRoleDTO; +import com.epmet.dto.form.GovRoleListDTO; import com.epmet.entity.GovRoleEntity; import java.util.List; @@ -92,4 +93,6 @@ public interface GovRoleService extends BaseService { * @date 2020-03-18 */ void delete(String[] ids); + + GovRoleDTO getGovRole(GovRoleListDTO fromDTO); } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index 72a542c9e7..c171d081d9 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -28,6 +28,7 @@ import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.dao.GovRoleDao; import com.epmet.dto.GovRoleDTO; +import com.epmet.dto.form.GovRoleListDTO; import com.epmet.entity.GovRoleEntity; import com.epmet.redis.GovRoleRedis; import com.epmet.service.GovRoleMenuService; @@ -122,4 +123,9 @@ public class GovRoleServiceImpl extends BaseServiceImpl + + + From a209553d82fac426d5770d68a734a3523e7e0cef Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Wed, 27 Jul 2022 18:13:49 +0800 Subject: [PATCH 141/288] =?UTF-8?q?=E6=8C=87=E6=B4=BE=E9=9C=80=E6=B1=82?= =?UTF-8?q?=E5=8F=91=E7=9F=AD=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/IcUserDemandRecServiceImpl.java | 21 ++++++++-- .../com/epmet/dto/form/SendSmsFormDTO.java | 42 +++++++++++++++++++ .../feign/EpmetMessageOpenFeignClient.java | 8 +++- .../EpmetMessageOpenFeignClientFallback.java | 5 +++ .../com/epmet/controller/SmsController.java | 14 +++++++ .../java/com/epmet/service/SysSmsService.java | 2 + .../epmet/service/impl/SysSmsServiceImpl.java | 30 ++++++++++++- ...em_zhzl.sql => V0.0.35__formitem_zhzl.sql} | 0 8 files changed, 116 insertions(+), 6 deletions(-) create mode 100644 epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendSmsFormDTO.java rename epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/{V0.0.34__formitem_zhzl.sql => V0.0.35__formitem_zhzl.sql} (100%) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 9458f5ddff..b85121ff68 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -43,6 +43,7 @@ import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.utils.ScanContentUtils; import com.epmet.constant.ReadFlagConstant; +import com.epmet.constant.SmsTemplateConstant; import com.epmet.constant.UserDemandConstant; import com.epmet.constant.UserMessageTypeConstant; import com.epmet.dao.IcUserDemandOperateLogDao; @@ -431,7 +432,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl smsList=new ArrayList<>(); + SendSmsFormDTO sms = new SendSmsFormDTO(); + sms.setCustomerId(customerId); + sms.setMobile(mobile); + sms.setAliyunTemplateCode(SmsTemplateConstant.PROJECT_TRANSFER); + List paramsContent=new ArrayList<>(); + paramsContent.add(String.format("%s给您指派了一个新的需求，请查看",staffInfoCacheResult.getAgencyName())); + sms.setParamsContent(paramsContent); + smsList.add(sms); + messageOpenFeignClient.sendMsg(smsList); + } /** diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendSmsFormDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendSmsFormDTO.java new file mode 100644 index 0000000000..ee2802f691 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/form/SendSmsFormDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/7/27 17:23 + */ +@Data +public class SendSmsFormDTO implements Serializable { + public interface AddUserInternalGroup { + } + + public interface AddUserShowGroup extends CustomerClientShowGroup { + } + + /** + * 手机号 + */ + @NotBlank(message = "手机号不能为空", groups = {AddUserShowGroup.class}) + private String mobile; + + /** + * 场景： + */ + @NotBlank(message = "短信模板编码不能为空", groups = {AddUserInternalGroup.class}) + private String aliyunTemplateCode; + + /** + * 如果短信模板内有参数，按序传入 + */ + private List paramsContent; + + private String customerId; +} + diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java index 920d508b89..447111aca6 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/EpmetMessageOpenFeignClient.java @@ -21,8 +21,8 @@ import java.util.List; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:47 */ -//@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class, url = "http://127.0.0.1:8085") -@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class) +@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class, url = "http://127.0.0.1:8085") +// @FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallbackFactory = EpmetMessageOpenFeignClientFallbackFactory.class) public interface EpmetMessageOpenFeignClient { /** * 发送短信 @@ -123,4 +123,8 @@ public interface EpmetMessageOpenFeignClient { */ @PostMapping("/message/system/pendding-mq-msg-scan") Result penddingMqMsgScan(); + + + @PostMapping(value = "message/sms/send-msg", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) + Result sendMsg(@RequestBody List formDTO); } diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java index eba096ff0f..2d5c0d9073 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/feign/fallback/EpmetMessageOpenFeignClientFallback.java @@ -73,4 +73,9 @@ public class EpmetMessageOpenFeignClientFallback implements EpmetMessageOpenFeig public Result penddingMqMsgScan() { return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "penddingMqMsgScan"); } + + @Override + public Result sendMsg(List formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "sendMsg",formDTO); + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java index c41ad3195d..47684b67c7 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java @@ -16,6 +16,7 @@ import com.epmet.commons.tools.validator.group.AliyunGroup; import com.epmet.commons.tools.validator.group.QcloudGroup; import com.epmet.dto.SysSmsDTO; import com.epmet.dto.form.ProjectSendMsgFormDTO; +import com.epmet.dto.form.SendSmsFormDTO; import com.epmet.dto.form.SendVerificationCodeFormDTO; import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.enums.PlatformEnum; @@ -128,4 +129,17 @@ public class SmsController { return new Result(); } + /** + * 通用发短信方法，传入短信模板，内容 + * + * @param formDTOList + * @return + */ + @PostMapping("send-msg") + public Result sendMsg(@RequestBody List formDTOList) { + ValidatorUtils.validateEntity(formDTOList, SendSmsFormDTO.AddUserShowGroup.class, SendSmsFormDTO.AddUserInternalGroup.class); + sysSmsService.sendMsg(formDTOList); + return new Result(); + } + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java index 1327aff692..0025768d94 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java @@ -13,6 +13,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.SysSmsDTO; import com.epmet.dto.form.ProjectSendMsgFormDTO; +import com.epmet.dto.form.SendSmsFormDTO; import com.epmet.dto.form.SendVerificationCodeFormDTO; import com.epmet.dto.result.SendVerificationCodeResultDTO; import com.epmet.entity.SysSmsEntity; @@ -77,5 +78,6 @@ public interface SysSmsService extends BaseService { **/ void projectSendMsg(List formDTOList); + void sendMsg(List formDTOList); } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 1fc41bc718..ee4c3be657 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -13,6 +13,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; +import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -25,6 +26,7 @@ import com.epmet.dao.SysSmsDao; import com.epmet.dto.SysSmsDTO; import com.epmet.dto.form.CrmParameterFormDTO; import com.epmet.dto.form.ProjectSendMsgFormDTO; +import com.epmet.dto.form.SendSmsFormDTO; import com.epmet.dto.form.SendVerificationCodeFormDTO; import com.epmet.dto.result.CrmParameterResultDTO; import com.epmet.dto.result.SendVerificationCodeResultDTO; @@ -323,7 +325,33 @@ public class SysSmsServiceImpl extends BaseServiceImpl service.sendSmsMsg(sysSmsDTO); } } catch (Exception e) { - logger.warn(String.format("项目提醒发送短信失败,失败手机号:%s,ErrorCode:%s", sysSmsDTO.getMobile(), e.getMessage())); + logger.warn(String.format("发送短信失败,失败手机号:%s,ErrorCode:%s", sysSmsDTO.getMobile(), e.getMessage())); + } + } + + @Override + public void sendMsg(List formDTOList) { + try { + for(SendSmsFormDTO formDTO:formDTOList){ + SysSmsDTO sysSmsDTO = new SysSmsDTO(); + sysSmsDTO.setMobile(formDTO.getMobile()); + sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode()); + sysSmsDTO.setCustomerId(formDTO.getCustomerId()); + HashMap map = new HashMap<>(); + try{ + if(SmsTemplateConstant.PROJECT_TRANSFER.equals(formDTO.getAliyunTemplateCode())){ + map.put("params1", formDTO.getParamsContent().get(NumConstant.ZERO)); + } + String paramJson = new ObjectMapper().writeValueAsString(map); + sysSmsDTO.setParams(paramJson); + } catch (JsonProcessingException e) { + log.warn("sendMsg JsonProcessingException", e); + } + //推送短信 + this.sendMsg(sysSmsDTO); + } + } catch (Exception e) { + logger.error("sendMsg exception", e); } } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql b/epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.35__formitem_zhzl.sql similarity index 100% rename from epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.34__formitem_zhzl.sql rename to epmet-module/oper-customize/oper-customize-server/src/main/resources/db/migration/V0.0.35__formitem_zhzl.sql From 0dc78a13dc7c12e997a01794a24c70755365dd3c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 27 Jul 2022 18:21:41 +0800 Subject: [PATCH 142/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E4=BF=AE=E5=A4=8D=E5=B9=B4=E9=BE=84->?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E8=BD=AC=E6=8D=A2=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/ResiServiceImpl.java | 2 +- .../main/resources/mapper/epmetuser/IcResiUserDao.xml | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 32cc0cbfa1..d661afd960 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -168,7 +168,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { return ">="; } - return ""; + return oldRel; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 703bcc2bfa..6c8ef4c9a1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -116,7 +116,16 @@ and - ${rule.colTable}.${rule.colKey} ${rule.queryType} #{rule.colVal} ${rule.nextLogicalRel} + ${rule.colTable}.${rule.colKey} ${rule.queryType} + + + CONCAT('%',#{rule.colVal} ,'%') + + + #{rule.colVal} + + + ${rule.nextLogicalRel} From 8d27413c88d3bc5a552a6b31dc0648485f107350 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 27 Jul 2022 23:09:05 +0800 Subject: [PATCH 143/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E4=BF=AE=E5=A4=8D=E5=B9=B4=E9=BE=84->?= =?UTF-8?q?=E5=87=BA=E7=94=9F=E6=97=A5=E6=9C=9F=E9=87=8D=E5=A4=8D=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/IcUserController.java | 6 +++++- .../com/epmet/dataaggre/service/impl/ResiServiceImpl.java | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java index 63d686260c..98432996ce 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/IcUserController.java @@ -17,6 +17,7 @@ import com.epmet.dataaggre.dto.epmetuser.result.IcUserCategoryResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; import com.epmet.dataaggre.service.ResiService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; +import com.epmet.dataaggre.service.impl.ResiServiceImpl; import com.epmet.feign.EpmetHeartOpenFeignClient; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -41,7 +42,7 @@ public class IcUserController implements ResultDataResolver { private EpmetUserService epmetUserService; @Autowired - private ResiService icResiService; + private ResiServiceImpl icResiService; @Autowired private EpmetHeartOpenFeignClient heartOpenFeignClient; @@ -105,6 +106,9 @@ public class IcUserController implements ResultDataResolver { return new Result().ok(new PageData<>(new ArrayList<>(), 0)); } + // 对特殊规则进行转换。 + icResiService.specificRuleConvert(resiRule); + PageData page = icResiService.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, pageNo, pageSize, resiRule, houseRule, statRule); return new Result>().ok(page); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 0df05a3831..8ea7d871d5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -75,9 +75,6 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { String client = EpmetRequestHolder.getLoginUserClient(); String customerId = EpmetRequestHolder.getLoginUserCustomerId(); - // 对特殊规则进行转换。 - specificRuleConvert(resiRule); - // 查询当前组织及下级id路径 LoginUserDetailsResultDTO userDetail = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(new LoginUserDetailsFormDTO(app, client, userId)), ServiceConstant.EPMET_USER_SERVER, EpmetErrorCode.SERVER_ERROR.getCode(), null, null); @@ -148,7 +145,7 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { * 为特定的规则进行转换 * @param resiRule */ - private void specificRuleConvert(List resiRule) { + public void specificRuleConvert(List resiRule) { // 使用年龄计算出生日期 if (resiRule != null) { resiRule.stream().forEach((r) -> { @@ -267,6 +264,9 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { Integer pageSize = 500; Integer pageNo = 1; + // 对特殊规则进行转换。 + specificRuleConvert(resiRule); + try { do { PageData resis = this.listByPolicyRules(orgId, orgType, neighborHoodId, buildingId, unitId, From 7be9b70e2253e3c7d3cdedda4121891fad6047fd Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 28 Jul 2022 00:10:39 +0800 Subject: [PATCH 144/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E8=BF=98=E5=B7=AE=E5=85=AC=E5=85=B1=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/CoverageEnums.java | 52 ++++++++++------- .../tools/enums/CoveragePlaceTypeEnum.java | 4 +- .../AnalysisGovernedTargetsResult.java | 25 ++++++++ .../controller/CoverageController.java | 11 ++++ .../govorg/IcCoverageCategoryDictEntity.java | 2 + .../dataaggre/service/CoverageService.java | 3 + .../service/govorg/GovOrgCoverageService.java | 4 +- .../impl/GovOrgCoverageServiceImpl.java | 13 ++++- .../service/impl/CoverageServiceImpl.java | 57 +++++++++++++++++-- .../govorg/IcCoverageCategoryDictDao.xml | 1 + .../entity/IcCoverageCategoryDictEntity.java | 2 + 11 files changed, 144 insertions(+), 30 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java index 0e2e749b16..02f5504d6a 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoverageEnums.java @@ -6,42 +6,50 @@ package com.epmet.commons.tools.enums; public enum CoverageEnums { ZHZL("zhzl", "综合治理图层", 1), - YJCL("yjcl", "应急处置资源", 2), - AQSC("aqsc", "安全生产资源", 2), - CSGL("csgl", "城市管理资源", 2), - GGFW("ggfw", "公共服务资源", 2); - - private String coverageType; - private String coverageName; - - /** 位置，1：左侧，2，右侧**/ - private Integer position; - - CoverageEnums(String coverageType, String coverageName, Integer position) { - this.coverageType = coverageType; - this.coverageName = coverageName; - this.position = position; + YJCL("yjcl", "应急处置资源", 1), + AQSC("aqsc", "安全生产资源", 1), + CSGL("csgl", "城市管理资源", 1), + GGFW("ggfw", "公共服务资源", 1), + + DATA_TYPE_GOVERNED_TARGET("governedTarget", "被管理对象", 2), + DATA_TYPE_RESOURCES("resources", "资源", 2); + + private String key; + private String name; + /** + * 1:图层，2：数据类型 + */ + private Integer type; + + CoverageEnums(String key, String name, Integer type) { + this.key = key; + this.name = name; + this.type = type; } - public static CoverageEnums getEnum(String coverageType) { + public static CoverageEnums getEnum(String key) { CoverageEnums[] values = CoverageEnums.values(); for (CoverageEnums value : values) { - if (value.getCoverageType().equals(coverageType)) { + if (value.getKey().equals(key)) { return value; } } return null; } - public String getCoverageType() { - return coverageType; + public String getKey() { + return key; } public String getCoverageName() { - return coverageName; + return name; + } + + public String getName() { + return name; } - public Integer getPosition() { - return position; + public Integer getType() { + return type; } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java index dbad5fa3c2..3e68bf0503 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java @@ -8,6 +8,7 @@ public enum CoveragePlaceTypeEnum { SUPERIOR_RESOURCE("superior_resource", "优势资源"), DANGEROUS_CHEMICALS("dangerous_chemicals", "重点危化企业"), ENTERPRISE_PATROL("enterprise_patrol", "企事业单位巡查"), + ENTERPRISE_PATROL_UNQUALIFIED("enterprise_patrol_unqualified", "安全生产隐患"), SPECIAL_RESI("special_resi", "特殊人群"), CITY_MANAGEMENT("city_management", "城市管理"), COMMUNITY_ORG("community_org", "社区自组织"), @@ -16,7 +17,8 @@ public enum CoveragePlaceTypeEnum { PARTY_UNIT("party_unit", "联建单位"), VOLUNTEER("volunteer", "志愿者"), GROUP_RENT("group_rent", "群租房"), - EVENT("event", "事件(包括难点堵点)"); + EVENT("event", "事件(包括难点堵点)"), + ZHZL_RQ("zhzl_rq", "综合治理人群"); private final String code; private final String name; diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java new file mode 100644 index 0000000000..56988054ba --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java @@ -0,0 +1,25 @@ +package com.epmet.dataaggre.dto.coverage; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 五大图层分析-被管理对象分类 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +public class AnalysisGovernedTargetsResult { + + private String categoryKey; + private String categoryName; + private String coverageType; + private String placeType; + private String placeTypeName; + private Integer count = 0; + + private List children; +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index fa68116993..67a4b52d04 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -6,6 +6,7 @@ import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum; 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.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; @@ -83,4 +84,14 @@ public class CoverageController { return new Result>().ok(r); } + /** + * 被管理对象分类列表 + * @return + */ + @PostMapping("analysis/governedTargetCategories") + public Result> listGovernedTargetCategories() { + List r = coverageService.listGovernedTargetCategories(); + return new Result>().ok(r); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java index dee38b469f..bc0ae5c9e2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java @@ -58,6 +58,8 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { */ private String coverageType; + private String dataType; + /** * 排序 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index f372f2699c..651655f2e3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -1,6 +1,7 @@ package com.epmet.dataaggre.service; import com.epmet.commons.tools.page.PageData; +import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; @@ -37,4 +38,6 @@ public interface CoverageService { * @return */ List listAnalysisResourceCategories(); + + List listGovernedTargetCategories(); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 8168721b71..7b1779be57 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -138,5 +138,7 @@ public interface GovOrgCoverageService { */ IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey); - List listCoverageCategoryEntities(String coverageType); + List listResourceCategoryEntities(String coverageType); + + List listGovernedTargetCategoryEntities(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 2f39da60a4..bc64607a7f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.dataaggre.service.govorg.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.enums.CoverageEnums; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.govorg.*; @@ -326,11 +327,21 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { } @Override - public List listCoverageCategoryEntities(String coverageType) { + public List listResourceCategoryEntities(String coverageType) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcCoverageCategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); query.eq(IcCoverageCategoryDictEntity::getCoverageType, coverageType); query.orderByAsc(IcCoverageCategoryDictEntity::getSort); + query.eq(IcCoverageCategoryDictEntity::getDataType, CoverageEnums.DATA_TYPE_RESOURCES.getKey()); + return coverageCategoryDictDao.selectList(query); + } + + @Override + public List listGovernedTargetCategoryEntities() { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcCoverageCategoryDictEntity::getCustomerId, EpmetRequestHolder.getLoginUserCustomerId()); + query.orderByAsc(IcCoverageCategoryDictEntity::getSort); + query.eq(IcCoverageCategoryDictEntity::getDataType, CoverageEnums.DATA_TYPE_GOVERNED_TARGET.getKey()); return coverageCategoryDictDao.selectList(query); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index dfae8be881..3f09b04d77 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -9,6 +9,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; @@ -26,6 +27,7 @@ import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.heart.HeartService; +import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -474,15 +476,18 @@ public class CoverageServiceImpl implements CoverageService { // 1.查询categoryDict表得到基础数据，每个图层循环一次 for (CoverageEnums coverage : CoverageEnums.values()) { - // 只要右边的 - if (!coverage.getPosition().equals(Integer.valueOf(2))) { + if (!coverage.getType().equals(1)) { continue; } AnalysisResourceCategoriesResult categoriesOfThisCoverage = new AnalysisResourceCategoriesResult(); HashMap placeTypeMap = new HashMap<>(); - List categoryDictEntities = govOrgCoverageService.listCoverageCategoryEntities(coverage.getCoverageType()); + List categoryDictEntities = govOrgCoverageService.listResourceCategoryEntities(coverage.getKey()); + + if (CollectionUtils.isEmpty(categoryDictEntities)) { + continue; + } // 2.根据menuUrl过滤 todo @@ -516,12 +521,54 @@ public class CoverageServiceImpl implements CoverageService { total.updateAndGet(v -> v + placeType.getCount()); }); - categoriesOfThisCoverage.setCoverageType(coverage.getCoverageType()); - categoriesOfThisCoverage.setCoverageName(CoverageEnums.getEnum(coverage.getCoverageType()).getCoverageName()); + categoriesOfThisCoverage.setCoverageType(coverage.getKey()); + categoriesOfThisCoverage.setCoverageName(CoverageEnums.getEnum(coverage.getKey()).getCoverageName()); categoriesOfThisCoverage.setCount(total.get()); results.add(categoriesOfThisCoverage); } return results; } + + @Override + public List listGovernedTargetCategories() { + List targetCategories = govOrgCoverageService.listGovernedTargetCategoryEntities(); + + if (CollectionUtils.isEmpty(targetCategories)) { + return new ArrayList<>(); + } + + List results = new ArrayList<>(); + HashMap> placeTypeMap = new HashMap<>(); + + targetCategories.forEach(rc -> { + String placeTypeInAnalysis = rc.getPlaceTypeInAnalysis(); + if (StringUtils.isEmpty(placeTypeInAnalysis)) { + // 只有一层，没有子级 + results.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); + } else { + // 有子级，需要使用placeTypeInAnalysis分组 + List targets = placeTypeMap.get(placeTypeInAnalysis); + if (CollectionUtils.isEmpty(targets)) { + targets = new ArrayList<>(); + placeTypeMap.put(placeTypeInAnalysis, targets); + } + targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); + } + }); + + if (placeTypeMap.size() > 0) { + placeTypeMap.forEach((placeTypeInAnalysis, targetObjects) -> { + AnalysisGovernedTargetsResult tr = new AnalysisGovernedTargetsResult(); + tr.setPlaceType(placeTypeInAnalysis); + tr.setPlaceTypeName(CoveragePlaceTypeEnum.getEnum(placeTypeInAnalysis).getName()); + tr.setChildren(targetObjects); + results.add(tr); + }); + } + + return results; + } } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml index 25c0704bbd..94da6bd60c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml @@ -12,6 +12,7 @@ + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java index 13a31b9974..25a4e47299 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java @@ -61,6 +61,8 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { */ private String coverageType; + private String dataType; + /** * 排序 */ From aafdf59d8b8b46a8bf91c04e3ae9c31f52d0248e Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 28 Jul 2022 09:24:40 +0800 Subject: [PATCH 145/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=EF=BC=8C=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=8A=A0=E4=B8=8A=E4=BA=86=E5=85=AC=E5=85=B1=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E7=BE=A4,=E8=BF=98=E6=9C=89=E5=85=A8?= =?UTF-8?q?=E5=B1=80=E7=9A=84=E6=95=B0=E9=87=8F=E8=A6=81=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../IcResiCategoryWarnConfigDao.java | 9 ++ .../IcResiCategoryWarnConfigEntity.java | 86 +++++++++++++++++++ .../service/impl/CoverageServiceImpl.java | 20 +++++ .../IcResiCategoryWarnService.java | 9 ++ .../impl/IcResiCategoryWarnServiceImpl.java | 28 ++++++ .../IcResiCategoryWarnConfigDao.xml | 5 ++ 6 files changed, 157 insertions(+) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryWarnService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/IcResiCategoryWarnServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/IcResiCategoryWarnConfigDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java new file mode 100644 index 0000000000..d826ee778c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/opercustomize/IcResiCategoryWarnConfigDao.java @@ -0,0 +1,9 @@ +package com.epmet.dataaggre.dao.opercustomize; + +import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface IcResiCategoryWarnConfigDao extends BaseDao { +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java new file mode 100644 index 0000000000..0738f7e37a --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/opercustomize/IcResiCategoryWarnConfigEntity.java @@ -0,0 +1,86 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.entity.opercustomize; + +import com.baomidou.mybatisplus.annotation.TableField; +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 2021-11-04 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@TableName("ic_resi_category_warn_config") +public class IcResiCategoryWarnConfigEntity extends BaseEpmetEntity { + + private static final long serialVersionUID = 1L; + + /** + * 客户id + */ + private String customerId; + + /** + * 项标签 + */ + private String label; + + /** + * 表名 + */ + private String tableName; + + /** + * 列名 + */ + private String columnName; + /** + * 是否预警 1 是 0 否 + */ + private String warn; + + /** + * 排序 + */ + private Integer sort; + + /** + * 等级1阈值 + */ + @TableField(value = "LEVEL_1") + private Integer level1; + + /** + * 等级2阈值 + */ + @TableField(value = "LEVEL_2") + private Integer level2; + + /** + * 等级3阈值 + */ + @TableField(value = "LEVEL_3") + private Integer level3; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 3f09b04d77..dcc72dd756 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -21,12 +21,14 @@ import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.govproject.IcEventEntity; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.heart.HeartService; +import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -63,6 +65,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private GovOrgCoverageService govOrgCoverageService; + @Autowired + private IcResiCategoryWarnService icResiCategoryWarnService; + /** * 场所类型常量 */ @@ -532,6 +537,8 @@ public class CoverageServiceImpl implements CoverageService { @Override public List listGovernedTargetCategories() { + + // 1.从表中取数据出来 List targetCategories = govOrgCoverageService.listGovernedTargetCategoryEntities(); if (CollectionUtils.isEmpty(targetCategories)) { @@ -569,6 +576,19 @@ public class CoverageServiceImpl implements CoverageService { }); } + //2.从oper_customize.ic_resi_category_warn_config表中取18大类居民中需要预警的类出来 + List categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); + List ggfwrqCategories = categoriesNeed2Warn.stream().map(wc -> + new AnalysisGovernedTargetsResult(wc.getColumnName(), wc.getTableName(), + CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getCode(), + 0, new ArrayList<>())).collect(Collectors.toList()); + + AnalysisGovernedTargetsResult ggfwRq = new AnalysisGovernedTargetsResult(); + ggfwRq.setPlaceType(CoveragePlaceTypeEnum.RESI.getCode()); + ggfwRq.setPlaceTypeName(CoveragePlaceTypeEnum.RESI.getName()); + ggfwRq.setChildren(ggfwrqCategories); + + results.add(ggfwRq); return results; } } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryWarnService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryWarnService.java new file mode 100644 index 0000000000..85b43f948a --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryWarnService.java @@ -0,0 +1,9 @@ +package com.epmet.dataaggre.service.opercustomize; + +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; + +import java.util.List; + +public interface IcResiCategoryWarnService { + List listResiCategoriesNeed2Warn(String loginUserCustomerId); +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/IcResiCategoryWarnServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/IcResiCategoryWarnServiceImpl.java new file mode 100644 index 0000000000..c3e52bacec --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/impl/IcResiCategoryWarnServiceImpl.java @@ -0,0 +1,28 @@ +package com.epmet.dataaggre.service.opercustomize.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.opercustomize.IcResiCategoryWarnConfigDao; +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; +import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +@DataSource(DataSourceConstant.OPERCUSTOMIZE) +public class IcResiCategoryWarnServiceImpl implements IcResiCategoryWarnService { + + @Autowired + private IcResiCategoryWarnConfigDao icResiCategoryWarnConfigDao; + + @Override + public List listResiCategoriesNeed2Warn(String customerId) { + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(IcResiCategoryWarnConfigEntity::getCustomerId, customerId); + query.eq(IcResiCategoryWarnConfigEntity::getWarn, "1"); + return icResiCategoryWarnConfigDao.selectList(query); + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/IcResiCategoryWarnConfigDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/IcResiCategoryWarnConfigDao.xml new file mode 100644 index 0000000000..0da1fddf73 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/opercustomize/IcResiCategoryWarnConfigDao.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file From dc78b8884340ad19af1a1f0369d0fa30451dd3d7 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 10:09:46 +0800 Subject: [PATCH 146/288] 11 --- .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index b85121ff68..1e2784349f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -441,6 +441,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Thu, 28 Jul 2022 10:49:57 +0800 Subject: [PATCH 147/288] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84=E7=BB=87=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E5=88=B0=E9=80=9A=E8=AE=AF=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/IcCommunitySelfOrganizationDTO.java | 15 ++ .../java/com/epmet/dto/IcPartyUnitDTO.java | 15 ++ .../feign/EpmetHeartOpenFeignClient.java | 5 + .../EpmetHeartOpenFeignClientFallback.java | 6 + .../controller/IcPartyUnitController.java | 16 +- .../IcCommunitySelfOrganizationEntity.java | 15 ++ .../com/epmet/entity/IcPartyUnitEntity.java | 15 ++ .../com/epmet/service/IcPartyUnitService.java | 7 +- .../service/impl/IcPartyUnitServiceImpl.java | 30 ++++ .../epmet/dto/form/AddDepartmentFormDTO.java | 5 + .../epmet/dto/form/CheckStaffInfoFormDTO.java | 37 ++++- .../epmet/dto/form/StaffSubmitFromDTO.java | 6 + .../dto/result/CheckStaffInfoResultDTO.java | 37 ++++- .../controller/DepartmentController.java | 17 +- .../com/epmet/service/DepartmentService.java | 2 + .../service/impl/DepartmentServiceImpl.java | 150 ++++++++++++++++-- .../epmet/feign/EpmetUserOpenFeignClient.java | 6 + .../EpmetUserOpenFeignClientFallback.java | 10 ++ .../controller/CustomerStaffController.java | 12 ++ .../java/com/epmet/dao/CustomerStaffDao.java | 2 + .../epmet/service/CustomerStaffService.java | 4 + .../impl/CustomerStaffServiceImpl.java | 30 ++++ .../resources/mapper/CustomerStaffDao.xml | 11 ++ 23 files changed, 421 insertions(+), 32 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java index 6364dc08e2..a8cad6d0f6 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcCommunitySelfOrganizationDTO.java @@ -104,6 +104,21 @@ public class IcCommunitySelfOrganizationDTO implements Serializable { */ private String latitude; + /** + * 同步状态【已同步:sync 未同步:not_sync】 + */ + private String syncType; + + /** + * 部门ID customer_department.id + */ + private String deptId; + + /** + * 部门下工作人员Id + */ + private String deptStaffId; + /** * */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java index 2258b94762..5935d564de 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyUnitDTO.java @@ -134,6 +134,21 @@ public class IcPartyUnitDTO implements Serializable { */ private String remark; + /** + * 同步状态【已同步:sync 未同步:not_sync】 + */ + private String syncType; + + /** + * 部门ID customer_department.id + */ + private String deptId; + + /** + * 部门下工作人员Id + */ + private String deptStaffId; + /** * 删除标识 0未删除、1已删除 */ diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java index 9939b88455..e3b04df7bb 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/EpmetHeartOpenFeignClient.java @@ -16,6 +16,7 @@ import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.form.resi.VolunteerCommonFormDTO; +import com.epmet.dto.result.CheckStaffInfoResultDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.resi.PageVolunteerInfoResultDTO; @@ -166,4 +167,8 @@ public interface EpmetHeartOpenFeignClient { */ @PostMapping("/heart/policy/rules4ResiListAndExport/{ruleId}") Result listPolicyRules4QueryAndExport(@PathVariable("ruleId") String ruleId); + + @PostMapping("/heart/icpartyunit/editpartyorcommunity") + Result editPartyOrCommunity(@RequestBody CheckStaffInfoResultDTO formDTO); + } diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java index 815bfab92c..558cd43f2b 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/feign/fallback/EpmetHeartOpenFeignClientFallback.java @@ -18,6 +18,7 @@ import com.epmet.dto.form.demand.UserDemandNameQueryFormDTO; import com.epmet.dto.form.resi.ResiVolunteerAuthenticateFormDTO; import com.epmet.dto.form.resi.ResisByPolicyRulesFormDTO; import com.epmet.dto.form.resi.VolunteerCommonFormDTO; +import com.epmet.dto.result.CheckStaffInfoResultDTO; import com.epmet.dto.result.PartyUnitListResultDTO; import com.epmet.dto.result.demand.IcResiDemandDictDTO; import com.epmet.dto.result.demand.OptionDTO; @@ -166,4 +167,9 @@ public class EpmetHeartOpenFeignClientFallback implements EpmetHeartOpenFeignCli public Result listPolicyRules4QueryAndExport(String ruleId) { return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "listPolicyRules4QueryAndExport", ruleId); } + + @Override + public Result editPartyOrCommunity(CheckStaffInfoResultDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_HEART_SERVER, "editPartyOrCommunity", formDTO); + } } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java index 236e0d3b99..95093177cb 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/controller/IcPartyUnitController.java @@ -22,11 +22,7 @@ import com.epmet.dto.form.PartyUnitFormDTO; import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.*; import com.epmet.dto.form.demand.ServiceQueryFormDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; -import com.epmet.dto.result.PartyTypepercentResultDTO; -import com.epmet.dto.result.PartyUnitDistributionResultDTO; -import com.epmet.dto.result.PartyUnitListResultDTO; -import com.epmet.dto.result.PartyUnitListbrieResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.excel.IcPartyUnitExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -312,4 +308,14 @@ public class IcPartyUnitController { return new Result>().ok(icPartyUnitService.getAssistanceUnitList(tokenDto)); } + /** + * Desc: 联建单位、社会自组织同步/取消同步到通讯录部门后相应的修改业务数据 + * @author sun + */ + @PostMapping("editpartyorcommunity") + public Result editPartyOrCommunity(@RequestBody CheckStaffInfoResultDTO formDTO){ + icPartyUnitService.editPartyOrCommunity(formDTO); + return new Result(); + } + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java index 7098ce83e9..3f35e32184 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcCommunitySelfOrganizationEntity.java @@ -117,4 +117,19 @@ public class IcCommunitySelfOrganizationEntity extends BaseEpmetEntity { */ private String remark; + /** + * 同步状态【已同步:sync 未同步:not_sync】 + */ + private String syncType; + + /** + * 部门ID customer_department.id + */ + private String deptId; + + /** + * 部门下工作人员Id + */ + private String deptStaffId; + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java index 65c11a447f..47210a837a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/entity/IcPartyUnitEntity.java @@ -105,4 +105,19 @@ public class IcPartyUnitEntity extends BaseEpmetEntity { */ private String remark; + /** + * 同步状态【已同步:sync 未同步:not_sync】 + */ + private String syncType; + + /** + * 部门ID customer_department.id + */ + private String deptId; + + /** + * 部门下工作人员Id + */ + private String deptStaffId; + } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java index 53ddf81e19..8cc2d342a7 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcPartyUnitService.java @@ -12,10 +12,7 @@ import com.epmet.dto.form.PartyUnitFormDTO; import com.epmet.dto.form.PartyUnitListFormDTO; import com.epmet.dto.form.PartyUnitListbriefFormDTO; import com.epmet.dto.form.demand.ServiceQueryFormDTO; -import com.epmet.dto.result.PartyTypepercentResultDTO; -import com.epmet.dto.result.PartyUnitDistributionResultDTO; -import com.epmet.dto.result.PartyUnitListResultDTO; -import com.epmet.dto.result.PartyUnitListbrieResultDTO; +import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcPartyUnitEntity; import org.springframework.web.multipart.MultipartFile; @@ -182,4 +179,6 @@ public interface IcPartyUnitService extends BaseService { * @param form */ List getTypepercent(PartyTypepercentFormDTO form); + + void editPartyOrCommunity(CheckStaffInfoResultDTO formDTO); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 91dc0baa57..7b8df1b923 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -55,6 +55,7 @@ import com.epmet.dto.form.demand.ServiceQueryFormDTO; import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.dto.result.demand.ServiceStatDTO; +import com.epmet.entity.IcCommunitySelfOrganizationEntity; import com.epmet.entity.IcPartyUnitEntity; import com.epmet.excel.IcPartyUnitImportExcel; import com.epmet.excel.IcPartyUnitImportFailedExcel; @@ -62,6 +63,7 @@ import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetHeartOpenFeignClient; import com.epmet.feign.OssFeignClient; +import com.epmet.service.IcCommunitySelfOrganizationService; import com.epmet.service.IcPartyUnitService; import com.epmet.service.IcServiceItemDictService; import com.epmet.service.IcUserDemandRecService; @@ -111,6 +113,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl search(PartyUnitFormDTO formDTO) { @@ -711,4 +715,30 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl newRoles; + /** + * 部门类型 + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType; } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java index 0f500a0cab..01619b955a 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/CheckStaffInfoResultDTO.java @@ -17,8 +17,10 @@ package com.epmet.dto.result; +import com.epmet.dto.form.CheckStaffInfoFormDTO; import lombok.Data; +import javax.validation.constraints.NotBlank; import java.io.Serializable; @@ -41,10 +43,41 @@ public class CheckStaffInfoResultDTO implements Serializable { * 数据库中工作人员姓名【返参姓名有值的则需要更新工作人员信息】 */ private String personName; + /** + * 联建单位、社会自组织Id + */ + private String id; + /** + * 部门Id + */ + private String deptId; + /** + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType; + /** + * 部门下工作人员Id + */ + private String deptStaffId; + /** + * 已同步:sync 未同步:not_sync + */ + private String syncType; + + + //token中信息 + private String customerId; + private String userId; /** - * 类型，后端使用 + * 后端使用 */ - private Boolean key = true; + //工作人员添加入口Id(agencyId;deptId;gridId) + private String orgId = ""; + //工作人员添加入口类型(组织:agency;部门:dept;网格:gridId) + private String orgType = ""; + //工作人员Id，后端使用 + private String staffId = ""; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java index fac881ed3e..448181bf74 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java @@ -162,16 +162,27 @@ public class DepartmentController { return new Result>().ok(deptList); } - /** * @Author sun * @Description 根据手机号姓名查询人员信息，联建单位、社会自组织新增使用 */ @PostMapping("checkstaffinfo") public Result checkStaffInfo(@LoginUser TokenDto tokenDTO, @RequestBody CheckStaffInfoFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO, CheckStaffInfoFormDTO.Check.class); + ValidatorUtils.validateEntity(formDTO, CheckStaffInfoFormDTO.CheckAdd.class); formDTO.setCustomerId(tokenDTO.getCustomerId()); - formDTO.setStaffId(tokenDTO.getUserId()); + formDTO.setUserId(tokenDTO.getUserId()); return new Result().ok(departmentService.checkStaffInfo(formDTO)); } + + /** + * @Author sun + * @Description 联建单位、社会自组织同步到通讯录操作 + */ + @PostMapping("addoreditdeptorstaff") + public Result addOrEditDeptOrStaff(@RequestBody CheckStaffInfoFormDTO formDTO) { + return new Result().ok(departmentService.addOrEditDeptOrStaff(formDTO)); + } + + + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java index d1f589b26e..020ef3551e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java @@ -103,4 +103,6 @@ public interface DepartmentService { List listDepartmentListByStaffId(String staffId); CheckStaffInfoResultDTO checkStaffInfo(CheckStaffInfoFormDTO formDTO); + + CheckStaffInfoResultDTO addOrEditDeptOrStaff(CheckStaffInfoFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index aa8d6c1db8..69f3ab9ae2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -17,6 +17,7 @@ package com.epmet.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -39,14 +40,11 @@ import com.epmet.dto.CustomerStaffDTO; import com.epmet.dto.CustomerStaffDepartmentDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.entity.CustomerAgencyEntity; -import com.epmet.entity.CustomerDepartmentEntity; -import com.epmet.entity.CustomerStaffDepartmentEntity; +import com.epmet.entity.*; +import com.epmet.feign.EpmetHeartOpenFeignClient; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.service.CustomerDepartmentService; -import com.epmet.service.CustomerStaffDepartmentService; -import com.epmet.service.DepartmentService; +import com.epmet.service.*; import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -55,6 +53,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.List; @@ -86,6 +85,15 @@ public class DepartmentServiceImpl implements DepartmentService { private EpmetUserOpenFeignClient epmetUserOpenFeignClient; @Autowired private StaffOrgRelationDao staffOrgRelationDao; + @Autowired + private CustomerStaffAgencyService customerStaffAgencyService; + @Autowired + private CustomerAgencyService customerAgencyService; + @Autowired + private StaffOrgRelationService staffOrgRelationService; + @Autowired + private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient; + /** * @param formDTO * @return @@ -294,6 +302,13 @@ public class DepartmentServiceImpl implements DepartmentService { @Override public CheckStaffInfoResultDTO checkStaffInfo(CheckStaffInfoFormDTO formDTO) { CheckStaffInfoResultDTO resultDTO = new CheckStaffInfoResultDTO(); + resultDTO.setCustomerId(formDTO.getCustomerId()); + resultDTO.setUserId(formDTO.getUserId()); + //座机号的直接返回 + if(formDTO.getMobile().startsWith("0")){ + resultDTO.setMsg("座机账号无法创建账号，建议使用填写手机号，否则将无法获取通知信息"); + return resultDTO; + } //1.根据手机号查询客户下工作人员信息 CustomerStaffFormDTO user = new CustomerStaffFormDTO(); user.setCustomerId(formDTO.getCustomerId()); @@ -314,29 +329,29 @@ public class DepartmentServiceImpl implements DepartmentService { if (CollectionUtils.isEmpty(list)) { return resultDTO; } + resultDTO.setOrgId(list.get(0).getOrgId()); + resultDTO.setOrgType(list.get(0).getOrgType()); + resultDTO.setStaffId(list.get(0).getStaffId()); //3.校验工作人员的注册关系【从哪里新增进来的工作人员】 //获取当前操作人员缓存信息 - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); if (null == staffInfo) { - throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getStaffId())); + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); } //所属组织信息不同的给提示【所属组织不同时则不新增部门、不新增工作人员】 if (!list.get(0).getAgencyId().equals(staffInfo.getAgencyId())) { resultDTO.setMsg("联系电话已存在其他组织工作账号中，请使用其他手机号，否则将无法获取通知信息"); - resultDTO.setKey(false); return resultDTO; } //从网格下添加的人给提示【网格下加的人时则不新增部门、不新增工作人员】 - if ("gridId".equals(list.get(0).getOrgType())) { + if (!"agency".equals(list.get(0).getOrgType())) { resultDTO.setMsg("联系电话已存在其他部门工作账号中，请先将该工作人员调动至本组织下，再次添加"); - resultDTO.setKey(false); return resultDTO; } //账号被禁用的给提示【人员被禁用的则不新增部门、不新增工作人员】 if ("disabled".equals(userResult.getData().getEnableFlag())) { resultDTO.setMsg("该工作人员账号已被禁用，请使用其他联系电话，否则将无法获取通知信息"); - resultDTO.setKey(false); return resultDTO; } //姓名不一样的给反馈 @@ -348,5 +363,116 @@ public class DepartmentServiceImpl implements DepartmentService { return resultDTO; } + @Override + public CheckStaffInfoResultDTO addOrEditDeptOrStaff(CheckStaffInfoFormDTO formDTO) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); + } + //1.校验当前数据是否允许操作 + CheckStaffInfoResultDTO resultDTO = checkStaffInfo(formDTO); + if(!resultDTO.getType()){ + return resultDTO; + } + //2.根据校验结果操作数据 + //2-1.没查到人的直接新增部门、人员 + if(StringUtils.isBlank(resultDTO.getOrgType())){ + //一、新增工作人员 + StaffSubmitFromDTO submitDTO = ConvertUtils.sourceToTarget(formDTO, StaffSubmitFromDTO.class); + submitDTO.setName(formDTO.getPersonName()); + submitDTO.setAgencyId(staffInfo.getAgencyId()); + submitDTO.setGender(0); + submitDTO.setWorkType("fulltime"); + Result staffResult = epmetUserOpenFeignClient.deptToAddStaff(submitDTO); + if (!staffResult.success()) { + throw new RenException("人员添加失败" + staffResult.getMsg()); + } + //二、新增部门 + AddDepartmentFormDTO deptDTO = new AddDepartmentFormDTO(); + deptDTO.setAgencyId(staffInfo.getAgencyId()); + deptDTO.setDepartmentDuty(""); + deptDTO.setDepartmentName(formDTO.getDeptName()); + deptDTO.setTotalUser(1); + Result deptResult = addDepartment(deptDTO); + //三、新增组织人员关系数据 + //人员机关关系表 + CustomerStaffAgencyEntity customerStaffAgencyEntity = new CustomerStaffAgencyEntity(); + customerStaffAgencyEntity.setCustomerId(formDTO.getCustomerId()); + customerStaffAgencyEntity.setUserId(staffResult.getData().getUserId()); + customerStaffAgencyEntity.setAgencyId(staffInfo.getAgencyId()); + customerStaffAgencyService.insert(customerStaffAgencyEntity); + //机关总人数加一 + OrgResultDTO orgDTO = customerAgencyDao.selectAgencyDetail(staffInfo.getAgencyId(), "agency"); + CustomerAgencyEntity agencyEntity = new CustomerAgencyEntity(); + agencyEntity.setId(staffInfo.getAgencyId()); + agencyEntity.setTotalUser(orgDTO.getTotalUser() + 1); + customerAgencyService.updateById(agencyEntity); + //工作人员注册组织关系表新增数据 + StaffOrgRelationEntity staffOrgRelationEntity = new StaffOrgRelationEntity(); + staffOrgRelationEntity.setCustomerId(formDTO.getCustomerId()); + staffOrgRelationEntity.setPids(("".equals(orgDTO.getPids()) ? "" : orgDTO.getPids())); + staffOrgRelationEntity.setStaffId(staffResult.getData().getUserId()); + staffOrgRelationEntity.setOrgId(staffInfo.getAgencyId()); + staffOrgRelationEntity.setOrgType("agency"); + staffOrgRelationService.insert(staffOrgRelationEntity); + + //四、部门下新增人员关系数据 + CustomerStaffDepartmentEntity dept = new CustomerStaffDepartmentEntity(); + dept.setCustomerId(formDTO.getCustomerId()); + dept.setUserId(staffResult.getData().getUserId()); + dept.setDepartmentId(deptResult.getData().getDepartmentId()); + customerStaffDepartmentService.insert(dept); + //修改联建单位/社会自组织业务数据 + resultDTO.setId(formDTO.getId()); + resultDTO.setDeptId(deptResult.getData().getDepartmentId()); + resultDTO.setDeptType(formDTO.getDeptType()); + resultDTO.setDeptStaffId(staffResult.getData().getUserId()); + resultDTO.setSyncType("sync"); + Result heartResult = epmetHeartOpenFeignClient.editPartyOrCommunity(resultDTO); + if (!heartResult.success()) { + throw new RenException("修改联建单位/社会自组织业务数据失败" + heartResult.getMsg()); + } + + } + //2-2.查到是组织下的人，新增部门，绑定部门人员关系 + if(("agency".equals(resultDTO.getOrgType()))){ + //一、更新人员基础数据[姓名 手机号信息] + CustomerStaffDTO staffDTO = new CustomerStaffDTO(); + staffDTO.setUserId(resultDTO.getStaffId()); + staffDTO.setRealName(formDTO.getPersonName()); + staffDTO.setMobile(formDTO.getMobile()); + staffDTO.setUpdatedBy(resultDTO.getUserId()); + Result result = epmetUserOpenFeignClient.editToStaff(staffDTO); + if (!result.success()) { + throw new RenException("更新工作人员基础信息失败" + result.getMsg()); + } + //二、新增部门数据 + AddDepartmentFormDTO deptDTO = new AddDepartmentFormDTO(); + deptDTO.setAgencyId(staffInfo.getAgencyId()); + deptDTO.setDepartmentDuty(""); + deptDTO.setDepartmentName(formDTO.getDeptName()); + deptDTO.setTotalUser(1); + Result deptResult = addDepartment(deptDTO); + //三、部门下新增人员关系数据 + CustomerStaffDepartmentEntity dept = new CustomerStaffDepartmentEntity(); + dept.setCustomerId(formDTO.getCustomerId()); + dept.setUserId(resultDTO.getStaffId()); + dept.setDepartmentId(deptResult.getData().getDepartmentId()); + customerStaffDepartmentService.insert(dept); + //修改联建单位/社会自组织业务数据 + resultDTO.setId(formDTO.getId()); + resultDTO.setDeptId(deptResult.getData().getDepartmentId()); + resultDTO.setDeptType(formDTO.getDeptType()); + resultDTO.setDeptStaffId(resultDTO.getStaffId()); + resultDTO.setSyncType("sync"); + Result heartResult = epmetHeartOpenFeignClient.editPartyOrCommunity(resultDTO); + if (!heartResult.success()) { + throw new RenException("修改联建单位/社会自组织业务数据失败" + heartResult.getMsg()); + } + } + + return resultDTO; + } + } \ No newline at end of file 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 5cd018c37c..d6f6215b11 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 @@ -859,4 +859,10 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/customerstaff/staffdetailinfo") Result staffDetailInfo(@RequestBody CustomerStaffFormDTO formDTO); + @PostMapping("/epmetuser/customerstaff/depttoaddstaff") + Result deptToAddStaff(@RequestBody StaffSubmitFromDTO fromDTO); + + @PostMapping("/epmetuser/customerstaff/edittostaff") + Result editToStaff(@RequestBody CustomerStaffDTO formDTO); + } 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 6491dc477d..b6133865ad 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 @@ -651,4 +651,14 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "staffDetailInfo", formDTO); } + @Override + public Result deptToAddStaff(StaffSubmitFromDTO fromDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "deptToAddStaff", fromDTO); + } + + @Override + public Result editToStaff(CustomerStaffDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "editToStaff", formDTO); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java index f3a5d6bd99..cebe012041 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/CustomerStaffController.java @@ -498,5 +498,17 @@ public class CustomerStaffController { return new Result().ok(customerStaffService.staffDetailInfo(formDTO)); } + @PostMapping("depttoaddstaff") + public Result dedittostaffeptToAddStaff(@RequestBody StaffSubmitFromDTO fromDTO){ + Result result = customerStaffService.deptToAddStaff(fromDTO); + return result; + } + + @PostMapping(value = "edittostaff") + public Result editToStaff(@RequestBody CustomerStaffDTO formDTO) { + customerStaffService.editToStaff(formDTO); + return new Result(); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java index 725a456b46..3cce3ff4b6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/CustomerStaffDao.java @@ -229,4 +229,6 @@ public interface CustomerStaffDao extends BaseDao { * @Description 工作人员基本信息 **/ List gridStaffMobileList(List staffIdList); + + void edit(CustomerStaffDTO formDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java index 16d6e83189..6e6000b6db 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/CustomerStaffService.java @@ -349,4 +349,8 @@ public interface CustomerStaffService extends BaseService { List gridMobileList(String gridId, String userId); CustomerStaffDTO staffDetailInfo(CustomerStaffFormDTO formDTO); + + Result deptToAddStaff(StaffSubmitFromDTO fromDTO); + + void editToStaff(CustomerStaffDTO formDTO); } 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 1caf9abf5a..b25d014fc5 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 @@ -60,12 +60,14 @@ import com.epmet.service.UserService; import com.epmet.util.ModuleConstant; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; +import org.apache.ibatis.annotations.Param; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import org.springframework.web.bind.annotation.RequestBody; import java.util.*; import java.util.stream.Collectors; @@ -874,4 +876,32 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl deptToAddStaff(StaffSubmitFromDTO fromDTO) { + //1.查询客户小程序端'工作人员'角色 + GovStaffRoleDTO govRole = govStaffRoleDao.getRoleByCustomerIdAndRoleKey(fromDTO.getCustomerId(), "staff"); + List roles = new ArrayList<>(); + roles.add(govRole.getId()); + fromDTO.setRoles(roles); + + //2.查询客户管理平台对应角色【联建单位负责人、社区自组织负责人】 + GovRoleListDTO roleDTO = new GovRoleListDTO(); + roleDTO.setName("party_unit".equals(fromDTO.getDeptType())?"联建单位负责人":"社区自组织负责人"); + Result resultRole = govAccessFeignClient.getGovRole(roleDTO); + if (!resultRole.success()) { + throw new RenException("人员添加失败" + resultRole.getMsg()); + } + List newRoles = new ArrayList<>(); + newRoles.add(resultRole.getData().getId()); + + //3.新增工作人员 + Result result = addStaff(fromDTO); + return result; + } + + @Override + public void editToStaff(CustomerStaffDTO formDTO) { + baseDao.edit(formDTO); + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 10965b93ce..919b69fe0b 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -456,4 +456,15 @@ + + UPDATE customer_staff + SET real_name = #{realName}, + mobile = #{mobile}, + updated_time = NOW(), + updated_by = #{updatedBy} + WHERE + del_flag = '0' + AND user_id = #{userId} + + From e72fbfc1bdcfb8a49986c709c73b51820b98b7cd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 11:05:02 +0800 Subject: [PATCH 148/288] =?UTF-8?q?=E7=BC=BA=E4=B8=AA=E7=9F=AD=E4=BF=A1?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/IcUserDemandRecService.java | 3 ++ .../impl/IcServiceRecordV2ServiceImpl.java | 51 ++++++++++++++----- .../impl/IcUserDemandRecServiceImpl.java | 11 ++-- .../epmet/constant/SmsTemplateConstant.java | 8 +++ .../com/epmet/dto/form/SendSmsFormDTO.java | 6 +-- .../epmet/service/impl/SysSmsServiceImpl.java | 10 ++-- 6 files changed, 61 insertions(+), 28 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java index 1824e1feb3..68a295422a 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/IcUserDemandRecService.java @@ -25,6 +25,7 @@ import com.epmet.dto.form.demand.*; import com.epmet.dto.result.PointRecordResultDTO; import com.epmet.dto.result.demand.*; import com.epmet.entity.IcUserDemandRecEntity; +import com.epmet.entity.ServerInfoDTO; import java.util.List; import java.util.Map; @@ -262,4 +263,6 @@ public interface IcUserDemandRecService extends BaseService page(Map params) { @@ -156,7 +153,35 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl smsList = new ArrayList<>(); + SendSmsFormDTO sms = new SendSmsFormDTO(); + sms.setCustomerId(customerId); + sms.setMobile(serverInfoDTO.getMobile()); + sms.setAliyunTemplateCode(SmsTemplateConstant.COMMON_SMS_TEM); + Map paramMap = new HashMap<>(); + paramMap.put("content", String.format("%s发起一个【%s】服务，请服务完成后尽快反馈，谢谢合作。", staffInfoCacheResult.getAgencyName(), serviceName)); + sms.setParamMap(paramMap); + smsList.add(sms); + messageOpenFeignClient.sendMsg(smsList); } @Override diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 1e2784349f..355ca9f008 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -453,13 +453,12 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl paramsContent=new ArrayList<>(); - paramsContent.add(String.format("%s给您指派了一个新的需求，请查看",staffInfoCacheResult.getAgencyName())); - sms.setParamsContent(paramsContent); + sms.setAliyunTemplateCode(SmsTemplateConstant.COMMON_SMS_TEM); + Map paramMap = new HashMap<>(); + paramMap.put("content", String.format("%s给您指派了一个新的需求，请查看", staffInfoCacheResult.getAgencyName())); + sms.setParamMap(paramMap); smsList.add(sms); messageOpenFeignClient.sendMsg(smsList); - } /** @@ -468,7 +467,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl paramsContent; - + // private List paramsContent; + private Map paramMap; private String customerId; } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index ee4c3be657..b001fd7978 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -13,7 +13,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; -import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -333,16 +332,15 @@ public class SysSmsServiceImpl extends BaseServiceImpl public void sendMsg(List formDTOList) { try { for(SendSmsFormDTO formDTO:formDTOList){ + if (StringUtils.isBlank(formDTO.getAliyunTemplateCode())) { + continue; + } SysSmsDTO sysSmsDTO = new SysSmsDTO(); sysSmsDTO.setMobile(formDTO.getMobile()); sysSmsDTO.setAliyunTemplateCode(formDTO.getAliyunTemplateCode()); sysSmsDTO.setCustomerId(formDTO.getCustomerId()); - HashMap map = new HashMap<>(); try{ - if(SmsTemplateConstant.PROJECT_TRANSFER.equals(formDTO.getAliyunTemplateCode())){ - map.put("params1", formDTO.getParamsContent().get(NumConstant.ZERO)); - } - String paramJson = new ObjectMapper().writeValueAsString(map); + String paramJson = new ObjectMapper().writeValueAsString(formDTO.getParamMap()); sysSmsDTO.setParams(paramJson); } catch (JsonProcessingException e) { log.warn("sendMsg JsonProcessingException", e); From 9243f4e334917510e1a33be49360589e7484dd47 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 11:13:17 +0800 Subject: [PATCH 149/288] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govorg/form/OrgStatisticsFormDTO.java | 3 + .../result/MemberProjectInfoResultDTO.java | 5 +- .../controller/GovOrgController.java | 103 ++++++++++++++++++ .../dataaggre/dao/datastats/DataStatsDao.java | 3 + .../dataaggre/dao/epmetuser/StaffRoleDao.java | 3 +- .../dataaggre/dao/govproject/ProjectDao.java | 2 + .../excel/MemberProjectInfoExcel.java | 40 +++++++ .../excel/OrgProjectDetailExcel.java | 47 ++++++++ .../service/datastats/DataStatsService.java | 4 + .../datastats/impl/DataStatsServiceImpl.java | 13 +++ .../service/epmetuser/EpmetUserService.java | 13 +++ .../epmetuser/impl/EpmetUserServiceImpl.java | 20 ++++ .../govorg/impl/GovOrgServiceImpl.java | 47 +++++++- .../service/govproject/GovProjectService.java | 30 +++++ .../impl/GovProjectServiceImpl.java | 36 ++++++ .../mapper/datastats/DatsStatsDao.xml | 12 ++ .../mapper/epmetuser/StaffRoleDao.xml | 21 ++++ .../mapper/govproject/ProjectDao.xml | 43 ++++++++ 18 files changed, 441 insertions(+), 4 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java index f6f81f36d7..559a08d9f9 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/OrgStatisticsFormDTO.java @@ -4,6 +4,7 @@ import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import java.io.Serializable; +import java.util.List; /** * @Description @@ -13,10 +14,12 @@ import java.io.Serializable; @Data public class OrgStatisticsFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = -1043502365053945317L; + private String customerId; private String agencyId; private String orgId; private String orgType; private String type; private String startDate; private String endDate; + private List agencyList; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java index 4b4ac940a3..e0c941e8e3 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/MemberProjectInfoResultDTO.java @@ -17,7 +17,8 @@ public class MemberProjectInfoResultDTO implements Serializable { private static final long serialVersionUID = -4880909768378661921L; private String staffId; private String staffName; + private String orgId; private String orgName; - private String projectCount; - private String closedCount; + private Integer projectCount = 0; + private Integer closedCount = 0; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 2e5f0bff93..e1538f0168 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -3,6 +3,7 @@ package com.epmet.dataaggre.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.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.annotation.RequirePermission; import com.epmet.commons.tools.aop.NoRepeatSubmit; @@ -18,7 +19,9 @@ 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.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.dataaggre.beans.GridMemberDataAnalysisExcelExportBean; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; @@ -27,6 +30,8 @@ import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.enums.GridMemberDataAnalysisEnums; +import com.epmet.dataaggre.excel.MemberProjectInfoExcel; +import com.epmet.dataaggre.excel.OrgProjectDetailExcel; import com.epmet.dataaggre.service.AggreGridService; import com.epmet.dataaggre.service.govorg.GovOrgService; import lombok.extern.slf4j.Slf4j; @@ -39,11 +44,13 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.FileInputStream; import java.io.IOException; +import java.io.PrintWriter; import java.net.URLEncoder; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.*; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; /** @@ -440,14 +447,110 @@ public class GovOrgController { return new Result().ok(govOrgService.queryBuildingInfo(buildingId)); } + /** + * 组织项目统计 + * @Param tokenDto + * @Param formDTO + * @Return {@link Result< PageData< OrgProjectDetailResultDTO>>} + * @Author zhaoqifeng + * @Date 2022/7/28 10:34 + */ @PostMapping("orgProjectDetailList") public Result> orgProjectDetailList(@LoginUser TokenDto tokenDto, @RequestBody OrgStatisticsFormDTO formDTO) { return new Result>().ok(govOrgService.orgProjectDetailList(tokenDto, formDTO)); } + /** + * 网格员项目统计 + * @Param tokenDto + * @Param formDTO + * @Return {@link Result< PageData< MemberProjectInfoResultDTO>>} + * @Author zhaoqifeng + * @Date 2022/7/28 10:34 + */ @PostMapping("memberProjectInfoList") public Result> memberProjectInfoList(@LoginUser TokenDto tokenDto, @RequestBody OrgStatisticsFormDTO formDTO) { return new Result>().ok(govOrgService.memberProjectInfoList(tokenDto, formDTO)); } + @NoRepeatSubmit + @PostMapping("orgProjectDetailList/export") + public void orgProjectExport(@LoginUser TokenDto tokenDto, @RequestBody OrgStatisticsFormDTO formDTO, HttpServletResponse response) throws Exception { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setIsPage(false); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + + ExcelWriter excelWriter = null; + AtomicInteger i = new AtomicInteger(1); + try { + String fileName = "组织项目统计.xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectDetailExcel.class).build(); + PageData page = null; + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + do { + page = govOrgService.orgProjectDetailList(tokenDto, formDTO); + List list = ConvertUtils.sourceToTarget(page.getList(), OrgProjectDetailExcel.class); + list.forEach(item -> { + item.setIndex(i.getAndIncrement()); + }); + excelWriter.write(list, writeSheet); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.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(); + } + } + } + + @NoRepeatSubmit + @PostMapping("memberProjectInfoList/export") + public void memberProjectExport(@LoginUser TokenDto tokenDto, @RequestBody OrgStatisticsFormDTO formDTO, HttpServletResponse response) throws Exception { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setIsPage(false); + formDTO.setPageSize(NumConstant.TEN_THOUSAND); + + ExcelWriter excelWriter = null; + AtomicInteger i = new AtomicInteger(1); + try { + String fileName = "网格员项目统计.xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), MemberProjectInfoExcel.class).build(); + PageData page = null; + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + do { + page = govOrgService.memberProjectInfoList(tokenDto, formDTO); + List list = ConvertUtils.sourceToTarget(page.getList(), MemberProjectInfoExcel.class); + list.forEach(item -> { + item.setIndex(i.getAndIncrement()); + }); + excelWriter.write(list, writeSheet); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.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(); + } + } + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java index 2c910a3057..d32ddf47ed 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/datastats/DataStatsDao.java @@ -28,6 +28,7 @@ import com.epmet.dataaggre.dto.epmetuser.result.GridMemberPatrolListResultDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; +import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; @@ -379,4 +380,6 @@ public interface DataStatsDao { List getMemberCount(@Param("agencyId")String agencyId, @Param("dateId") String dateId); + List getMemberList(@Param("gridId") String gridId, @Param("dateId") String dateId); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java index 1540c564d6..6f49f5a6d0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/StaffRoleDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.result.RoleListResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; +import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity; import org.apache.ibatis.annotations.Mapper; @@ -76,5 +77,5 @@ public interface StaffRoleDao extends BaseDao { List selectStaffByRole(@Param("customerId") String customerId, @Param("roleId") String roleId, @Param("userId") String userId); List getMemberCount(@Param("customerId") String customerId); - + List getMemberList(@Param("customerId") String customerId, @Param("orgIds") List orgIds); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 3057cfbb25..05354d0b8b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -128,4 +128,6 @@ public interface ProjectDao extends BaseDao { List getGridProjectCount(OrgStatisticsFormDTO formDTO); List getGridClosedProjectCount(OrgStatisticsFormDTO formDTO); + List getMemberProjectCount(OrgStatisticsFormDTO formDTO); + List getMemberClosedProjectCount(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java new file mode 100644 index 0000000000..58a5d8014e --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java @@ -0,0 +1,40 @@ +package com.epmet.dataaggre.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import lombok.Data; + +/** + * 数字平台党员信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-17 + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class MemberProjectInfoExcel { + + @ColumnWidth(10) + @ExcelProperty(value = "序号",order = 1) + private Integer index; + + @ColumnWidth(30) + @ExcelProperty(value = "网格员",order = 2) + private String name; + + @ColumnWidth(40) + @ExcelProperty(value = "所属组织",order = 3) + private String idCard; + + @ColumnWidth(20) + @ExcelProperty(value = "上报数量",order = 4) + private String mobile; + + @ColumnWidth(20) + @ExcelProperty(value = "办结数",order = 5) + private String rdsj; + + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java new file mode 100644 index 0000000000..e7c5ba3d91 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java @@ -0,0 +1,47 @@ +package com.epmet.dataaggre.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import com.alibaba.excel.annotation.write.style.HeadStyle; +import com.alibaba.excel.enums.poi.FillPatternTypeEnum; +import lombok.Data; + +/** + * 数字平台党员信息表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-17 + */ +@HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 44) +@Data +public class OrgProjectDetailExcel { + + @ColumnWidth(10) + @ExcelProperty(value = "序号",order = 1) + private Integer index; + + @ColumnWidth(40) + @ExcelProperty(value = "所属组织",order = 2) + private String orgName; + + @ColumnWidth(20) + @ExcelProperty(value = "网格员数",order = 3) + private String memberCount; + + @ColumnWidth(20) + @ExcelProperty(value = "上报数量",order = 4) + private String projectCount; + + @ColumnWidth(20) + @ExcelProperty(value = "办结数",order = 5) + private String closedCount; + + @ColumnWidth(20) + @ExcelProperty(value = "人均上报",order = 6) + private String projectAve; + + @ColumnWidth(20) + @ExcelProperty(value = "人均办结",order = 7) + private String closedAve; + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index db0827a62a..7ce06a88e5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.service.datastats; +import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.datastats.FactGroupActDailyDTO; import com.epmet.dataaggre.dto.datastats.form.*; import com.epmet.dataaggre.dto.datastats.result.*; @@ -10,6 +11,7 @@ import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; +import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; import com.epmet.dataaggre.dto.resigroup.result.GroupActRankDetailDTO; @@ -302,4 +304,6 @@ public interface DataStatsService { Map getAgencyProjectTotal(OrgStatisticsFormDTO formDTO); Map getMemberMap(String agencyId); + + PageData getMemberList(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index b89ce1b0c3..bf56d8cdb8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -8,6 +8,7 @@ import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; + import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; import com.epmet.commons.tools.utils.ExcelUtils; @@ -31,6 +32,7 @@ import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridMemberDataAnalysisResultDTO; + import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.dto.govproject.form.ProjectTotalFormDTO; import com.epmet.dataaggre.dto.resigroup.ActCategoryDictDTO; @@ -44,6 +46,7 @@ import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; 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; @@ -2297,4 +2300,14 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); } + + @Override + public PageData getMemberList(OrgStatisticsFormDTO formDTO) { + //当前日期前一天 + String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = dataStatsDao.getMemberList(formDTO.getOrgId(), dateId); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 014135e533..894e1fea1c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -1,12 +1,15 @@ package com.epmet.dataaggre.service.epmetuser; +import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; +import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; import com.epmet.dto.IcResiUserDTO; @@ -217,4 +220,14 @@ public interface EpmetUserService { * @Date 2022/7/27 14:58 */ Map getMemberCount(String customerId); + + /** + * 获取组织下网格员列表 + * + * @Param agencyId + * @Return {@link PageData< MemberProjectInfoResultDTO>} + * @Author zhaoqifeng + * @Date 2022/7/27 17:32 + */ + PageData getMemberList(OrgStatisticsFormDTO formDTO); } 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 79cb151439..4e31dd4a5d 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 @@ -7,6 +7,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.IdAndNameDTO; 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.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.DateUtils; @@ -25,6 +26,7 @@ import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; @@ -43,6 +45,7 @@ import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; import com.epmet.dto.result.StaffRoleResultDTO; 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.collections4.MapUtils; @@ -872,4 +875,21 @@ public class EpmetUserServiceImpl implements EpmetUserService { } return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); } + + /** + * 获取组织下网格员列表 + * + * @param formDTO + * @Param agencyId + * @Return {@link PageData < MemberProjectInfoResultDTO>} + * @Author zhaoqifeng + * @Date 2022/7/27 17:32 + */ + @Override + public PageData getMemberList(OrgStatisticsFormDTO formDTO) { + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); + List list = staffRoleDao.getMemberList(formDTO.getCustomerId(), formDTO.getAgencyList()); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal()); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index fb237d158e..aeffe22264 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1256,6 +1256,51 @@ public class GovOrgServiceImpl implements GovOrgService { */ @Override public PageData memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { - return null; + formDTO.setCustomerId(tokenDto.getCustomerId()); + PageData result; + if (StringUtils.isBlank(formDTO.getAgencyId())) { + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType(OrgConstant.AGENCY); + } + if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { + //获取当前组织的所有下级组织ID（包含本级） + List agencyIds = customerAgencyDao.getSubAgencyList(formDTO.getOrgId()); + formDTO.setAgencyList(agencyIds); + //获取组织下的网格员 + result = epmetUserService.getMemberList(formDTO); + } else { + //获取网格下的网格员 + result = dataStatsService.getMemberList(formDTO); + } + if (CollectionUtils.isNotEmpty(result.getList())) { + //统计项目数 + Map projectMap = govProjectService.getMemberProjectMap(formDTO); + //统计关闭项目数 + Map closedMap = govProjectService.getMemberClosedProjectMap(formDTO); + result.getList().forEach(item -> { + if (projectMap.containsKey(item.getStaffId())) { + item.setProjectCount(projectMap.get(item.getStaffId())); + } + if (projectMap.containsKey(item.getStaffId())) { + item.setClosedCount(closedMap.get(item.getStaffId())); + } + if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(item.getOrgId()); + if (null != agencyInfo) { + item.setOrgName(agencyInfo.getOrganizationName()); + } + } else { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getOrgId()); + if (null != gridInfo) { + item.setOrgName(gridInfo.getGridName()); + } + } + }); + } + return result; } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index e7123f51ca..31beec2422 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -121,6 +121,36 @@ public interface GovProjectService { */ List searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize); + /** + * 网格上报项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ Map getGridProjectMap(OrgStatisticsFormDTO formDTO); + /** + * 网格关闭项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ Map getGridClosedProjectMap(OrgStatisticsFormDTO formDTO); + /** + * 工作人员上报项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:28 + */ + Map getMemberProjectMap(OrgStatisticsFormDTO formDTO); + /** + * 工作人员关闭项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + Map getMemberClosedProjectMap(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index f491b2f3b2..72e51a6a54 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -685,6 +685,42 @@ public class GovProjectServiceImpl implements GovProjectService { return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); } + /** + * 工作人员上报项目数 + * + * @param formDTO + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:28 + */ + @Override + public Map getMemberProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getMemberProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + + /** + * 工作人员关闭项目数 + * + * @param formDTO + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + @Override + public Map getMemberClosedProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getMemberProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + /** * 构造事件查询 * @param customerId diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index b35342302d..a473f03daf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1242,5 +1242,17 @@ GROUP BY GRID_ID + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml index 2a5232fd8c..9c5999aeb3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml @@ -112,4 +112,25 @@ GROUP BY ORG_ID + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index a5ed36af1a..e56a84c754 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -458,5 +458,48 @@ GROUP BY GRID_ID + + From b1f3b0c82f1fb34fa7ef98c212e9340cdc2536e3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 11:18:55 +0800 Subject: [PATCH 150/288] =?UTF-8?q?=E5=8D=A0=E4=B8=AA=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CoverageAnalisisDataListLeftFormDTO.java | 45 +++++++++++++++++++ .../CoverageAnalisisDataListResultDTOV2.java | 26 +++++++++++ .../controller/CoverageController.java | 20 +++++++++ .../dataaggre/service/CoverageService.java | 9 ++++ .../service/impl/CoverageServiceImpl.java | 17 ++++++- 5 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTOV2.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java new file mode 100644 index 0000000000..eec9aebeb2 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java @@ -0,0 +1,45 @@ +package com.epmet.dataaggre.dto.govorg.form; + +import com.epmet.commons.tools.validator.group.CustomerClientShowGroup; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/7/28 11:09 + */ +@Data +public class CoverageAnalisisDataListLeftFormDTO { + public interface ShowGroup extends CustomerClientShowGroup { + } + + /** + * + */ + @NotBlank(message = "组织不能为空", groups = ShowGroup.class) + private String orgId; + @NotBlank(message = "组织类型不能为空", groups = ShowGroup.class) + private String orgType; + + /** + * 图层类型列表 + */ + private List coverageTypes; + + /** + * 分类key + */ + private List categoryKeys; + + // 以下3个参数固定 + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = false; + + private String customerId; + private String staffId; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTOV2.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTOV2.java new file mode 100644 index 0000000000..dcc46ae471 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTOV2.java @@ -0,0 +1,26 @@ +package com.epmet.dataaggre.dto.govorg.result; + +import lombok.Data; + +import java.util.List; + +/** + * @Description + * @Author yzm + * @Date 2022/7/28 11:13 + */ +@Data +public class CoverageAnalisisDataListResultDTOV2 { + /** + * 维度 + */ + private String latitude; + + /** + * 经度 + */ + private String longitude; + + private List dataList; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 67a4b52d04..3304d48b18 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -9,8 +9,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; import com.epmet.dataaggre.service.CoverageService; import org.apache.commons.collections4.CollectionUtils; @@ -94,4 +96,22 @@ public class CoverageController { return new Result>().ok(r); } + /** + * 五大图层，左侧菜单，点击事件，查询人.事的分布 + * + * @param formDTO + * @return + */ + @RequestMapping("dataList-left") + public Result> dataListLeft(@LoginUser TokenDto tokenDto, @RequestBody CoverageAnalisisDataListLeftFormDTO formDTO) { + List coverageTypes = formDTO.getCoverageTypes(); + List categoryKeys = formDTO.getCategoryKeys(); + if (CollectionUtils.isEmpty(coverageTypes)) { + return new Result().ok(new PageData<>(new ArrayList<>(), 0)); + } + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + PageData page = coverageService.dataListLeft(formDTO); + return new Result>().ok(page); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index 651655f2e3..f9ebd60f63 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -3,8 +3,10 @@ package com.epmet.dataaggre.service; import com.epmet.commons.tools.page.PageData; import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; +import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; import java.util.List; @@ -40,4 +42,11 @@ public interface CoverageService { List listAnalysisResourceCategories(); List listGovernedTargetCategories(); + + /** + * 五大图层，左侧菜单，点击事件，查询人.事的分布 + * @param formDTO + * @return + */ + PageData dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index dcc72dd756..7eeafa1652 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -12,8 +12,10 @@ import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; @@ -29,7 +31,6 @@ import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.heart.HeartService; import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; -import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -591,4 +592,18 @@ public class CoverageServiceImpl implements CoverageService { results.add(ggfwRq); return results; } + + /** + * 五大图层，左侧菜单，点击事件，查询人.事的分布 + * + * @param formDTO + * @return + */ + @Override + public PageData dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO) { + //todo + + + return null; + } } \ No newline at end of file From ab6072c1ce6e9e46a48b320115dbc389cd3ecebf Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 14:06:50 +0800 Subject: [PATCH 151/288] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/excel/MemberProjectInfoExcel.java | 8 ++++---- .../epmet/dataaggre/excel/OrgProjectDetailExcel.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java index 58a5d8014e..e7b5e2045c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java @@ -22,19 +22,19 @@ public class MemberProjectInfoExcel { @ColumnWidth(30) @ExcelProperty(value = "网格员",order = 2) - private String name; + private String staffName; @ColumnWidth(40) @ExcelProperty(value = "所属组织",order = 3) - private String idCard; + private String orgName; @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private String mobile; + private Integer projectCount; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private String rdsj; + private Integer closedCount; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java index e7c5ba3d91..91b30e0e89 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java @@ -26,22 +26,22 @@ public class OrgProjectDetailExcel { @ColumnWidth(20) @ExcelProperty(value = "网格员数",order = 3) - private String memberCount; + private Integer memberCount; @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private String projectCount; + private Integer projectCount; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private String closedCount; + private Integer closedCount; @ColumnWidth(20) @ExcelProperty(value = "人均上报",order = 6) - private String projectAve; + private Integer projectAve; @ColumnWidth(20) @ExcelProperty(value = "人均办结",order = 7) - private String closedAve; + private Integer closedAve; } \ No newline at end of file From 1f9e1c21c8cc3a2a3b626969fac6be1278fcc6c3 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 14:18:55 +0800 Subject: [PATCH 152/288] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/StrConstant.java | 2 + .../epmet/dataaggre/constant/OrgConstant.java | 3 + .../form/CoverageAnalisisDataListFormDTO.java | 9 ++ .../CoverageAnalisisDataListLeftFormDTO.java | 15 ++- .../CoverageAnalisisDataListResultDTO.java | 19 ++++ .../controller/CoverageController.java | 8 +- .../dataaggre/service/CoverageService.java | 3 +- .../service/impl/CoverageServiceImpl.java | 97 +++++++++++++++---- 8 files changed, 125 insertions(+), 31 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 62d9fef763..7d2ad8ec03 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -110,4 +110,6 @@ public interface StrConstant { String YES = "是"; String NO = "否"; + + String ELLIPSIS="......"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java index 5119475926..28bc8e794c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java @@ -14,4 +14,7 @@ public interface OrgConstant { String GRID_ID="GRID_ID"; String GENDER="GENDER"; String HOUSE_TYPE_KEY="HOUSE_TYPE"; + + String AGENCY_ID="agencyId"; + String AGENC_PATH="agencyPath"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java index 179dc80aba..2b3b0127df 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListFormDTO.java @@ -9,7 +9,16 @@ import java.util.List; */ @Data public class CoverageAnalisisDataListFormDTO { + /** + * 目前都是组织id + */ + private String orgId; + /** + * agency + * grid + */ + private String orgType; /** * 图层类型列表 */ diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java index eec9aebeb2..ca369fd4db 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageAnalisisDataListLeftFormDTO.java @@ -15,15 +15,18 @@ import java.util.List; public class CoverageAnalisisDataListLeftFormDTO { public interface ShowGroup extends CustomerClientShowGroup { } - /** - * + * 目前都是组织id */ @NotBlank(message = "组织不能为空", groups = ShowGroup.class) private String orgId; + + /** + * agency + * grid + */ @NotBlank(message = "组织类型不能为空", groups = ShowGroup.class) private String orgType; - /** * 图层类型列表 */ @@ -34,12 +37,8 @@ public class CoverageAnalisisDataListLeftFormDTO { */ private List categoryKeys; - // 以下3个参数固定 - private Integer pageNo = 1; - private Integer pageSize = 20; - private Boolean isPage = false; - private String customerId; private String staffId; + } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java index fd566cb191..1af67eb36a 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageAnalisisDataListResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dataaggre.dto.govorg.result; +import com.epmet.commons.tools.constant.StrConstant; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang3.StringUtils; @Data @NoArgsConstructor @@ -40,4 +42,21 @@ public class CoverageAnalisisDataListResultDTO { */ private String longitude; + /** + * 经度,纬度：120.38862649282282,36.07138835989835 + */ + private String longLat; + + public CoverageAnalisisDataListResultDTO(String id, String categoryKey, String categoryName, String placeType, String content, String latitude, String longitude) { + this.id=id; + this.categoryKey=categoryKey; + this.categoryName=categoryName; + this.placeType=placeType; + this.content=content; + this.latitude=latitude; + this.longitude=longitude; + if(StringUtils.isNotBlank(latitude)&&StringUtils.isNotBlank(longitude)){ + this.longLat=longitude.concat(StrConstant.COMMA).concat(latitude); + } + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index 3304d48b18..f300875b13 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.dto.result.ZhzlCategorySelectDTO; import com.epmet.commons.tools.enums.ZhzlResiCategoryEnum; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; @@ -42,13 +43,16 @@ public class CoverageController { */ @RequestMapping("dataList") public Result> dataList(@RequestBody CoverageAnalisisDataListFormDTO input) { + // 获取跟组织的坐标 + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + String staffId = EpmetRequestHolder.getLoginUserId(); List coverageTypes = input.getCoverageTypes(); List categoryKeys = input.getCategoryKeys(); if (CollectionUtils.isEmpty(coverageTypes)) { return new Result().ok(new PageData<>(new ArrayList<>(), 0)); } - PageData page = coverageService.analysisDataList(coverageTypes, categoryKeys, + PageData page = coverageService.analysisDataList(customerId,staffId,input.getOrgId(),input.getOrgType(),coverageTypes, categoryKeys, input.getSearch(), input.getPageNo(), input.getPageSize(), input.getIsPage()); return new Result>().ok(page); } @@ -106,7 +110,7 @@ public class CoverageController { public Result> dataListLeft(@LoginUser TokenDto tokenDto, @RequestBody CoverageAnalisisDataListLeftFormDTO formDTO) { List coverageTypes = formDTO.getCoverageTypes(); List categoryKeys = formDTO.getCategoryKeys(); - if (CollectionUtils.isEmpty(coverageTypes)) { + if (CollectionUtils.isEmpty(coverageTypes)||CollectionUtils.isEmpty(categoryKeys)) { return new Result().ok(new PageData<>(new ArrayList<>(), 0)); } formDTO.setCustomerId(tokenDto.getCustomerId()); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index f9ebd60f63..5c39087be8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -24,7 +24,8 @@ public interface CoverageService { * @param pageSize 页面大小 * @return */ - PageData analysisDataList(List coverageTypes, List categoryKeys, + PageData analysisDataList(String customerId,String staffId,String orgId,String orgType, + List coverageTypes, List categoryKeys, String search, Integer pageNo, Integer pageSize, Boolean isPage); /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 7eeafa1652..a94b485714 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -1,14 +1,19 @@ package com.epmet.dataaggre.service.impl; +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.CoverageEnums; import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; 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.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.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; +import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; @@ -33,6 +38,7 @@ import com.epmet.dataaggre.service.heart.HeartService; import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -97,12 +103,11 @@ public class CoverageServiceImpl implements CoverageService { * @return */ @Override - public PageData analysisDataList(List coverageTypes, List categoryKeys, + public PageData analysisDataList(String customerId,String staffId,String orgId,String orgType, + List coverageTypes, List categoryKeys, String search, Integer pageNo, Integer pageSize, Boolean isPage) { // 获取跟组织的坐标 - String customerId = EpmetRequestHolder.getLoginUserCustomerId(); - String staffId = EpmetRequestHolder.getLoginUserId(); CustomerAgencyEntity rootAgency = govOrgService.getRootAgencyByCustomerId(customerId); // 1.根据categoryKeys分类key列表，查询他们和图层时间的关系，映射为一个map @@ -122,15 +127,9 @@ public class CoverageServiceImpl implements CoverageService { } // 2.循环coverageTypes，使用key到map中查询(为了顺序)，得到categoryKeys列表之后，根据实际情况做相应的查询 - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId); - - if (staffInfo == null) { - String msg = "未找到当前登录人信息。staffId:" + EpmetRequestHolder.getLoginUserId(); - throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg); - } - - String staffPids = getStaffPidsFromStaffInfo(staffInfo); - String agencyId = staffInfo.getAgencyId(); + Map agencyMap=getStaffPidsFromStaffInfo(customerId,staffId,orgId,orgType); + String agencyPath = agencyMap.get(OrgConstant.AGENC_PATH); + String agencyId = agencyMap.get(OrgConstant.AGENCY_ID); // 分页不太好分，先查出所有的数据，然后partation()吧 int start = (pageNo - 1) * pageSize; @@ -158,7 +157,7 @@ public class CoverageServiceImpl implements CoverageService { } for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) { - Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, agencyPath, e.getPlaceType(), e.getCategoryKey(), search); lastTotalCount = totalCount; totalCount += tempCount; @@ -167,7 +166,7 @@ public class CoverageServiceImpl implements CoverageService { // 不分页，查询所有 // 检索数据 List dataSegment = doDataListSearch( - EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + EpmetRequestHolder.getLoginUserCustomerId(), agencyId, agencyPath, e.getPlaceType(), e.getCategoryKey(), search, null, null, isPage, rootAgency); rls.addAll(dataSegment); continue; @@ -189,7 +188,7 @@ public class CoverageServiceImpl implements CoverageService { // 检索数据 List dataSegment = doDataListSearch( - EpmetRequestHolder.getLoginUserCustomerId(), agencyId, staffPids, e.getPlaceType(), + EpmetRequestHolder.getLoginUserCustomerId(), agencyId, agencyPath, e.getPlaceType(), e.getCategoryKey(), search, 1, end, isPage, rootAgency); if (firstTimeDataAppear) { @@ -239,6 +238,41 @@ public class CoverageServiceImpl implements CoverageService { } } + private Map getStaffPidsFromStaffInfo(String customerId, String staffId, String orgId, String orgType) { + Map map = new HashMap<>(); + String agencyPath = StrConstant.EPMETY_STR; + String agencyId = StrConstant.EPMETY_STR; + if (StringUtils.isBlank(orgId)) { + // 默认查询的是当前登录用户所属组织及下级 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, staffId); + if (staffInfo == null) { + String msg = "未找到当前登录人信息。staffId:" + EpmetRequestHolder.getLoginUserId(); + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg); + } + // staffPids + agencyPath = getStaffPidsFromStaffInfo(staffInfo); + agencyId = staffInfo.getAgencyId(); + } else { + // 根据传入的组织id来 + if (OrgConstant.AGENCY.equals(orgType)) { + AgencyInfoCache agencyInfoCache = CustomerOrgRedis.getAgencyInfo(orgId); + if (agencyInfoCache == null) { + String msg = "查询组织缓存信息异常。orgId:" + orgId; + throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), msg, msg); + } + agencyId = orgId; + if (StringUtils.isNotBlank(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache)) { + agencyPath = agencyInfoCache.getPids().concat(":").concat(agencyId); + } else { + agencyPath = orgId; + } + } + } + map.put(OrgConstant.AGENCY_ID, agencyId); + map.put(OrgConstant.AGENC_PATH, agencyPath); + return map; + } + /** * 计算数据条数 * @param customerId @@ -346,7 +380,8 @@ public class CoverageServiceImpl implements CoverageService { return icEventEntities.stream() .map(e -> new CoverageAnalisisDataListResultDTO( - e.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? e.getName() : null, + e.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, + e.getEventContent().length() < 51 ? e.getEventContent() : e.getEventContent().substring(NumConstant.ZERO, NumConstant.FIFTY).concat(StrConstant.ELLIPSIS), e.getLatitude(), e.getLongitude())) .collect(Collectors.toList()); @@ -601,9 +636,31 @@ public class CoverageServiceImpl implements CoverageService { */ @Override public PageData dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO) { - //todo - - - return null; + PageData page = analysisDataList(formDTO.getCustomerId(), formDTO.getStaffId(), formDTO.getOrgId(), formDTO.getOrgType(), + formDTO.getCoverageTypes(), formDTO.getCategoryKeys(), + StrConstant.EPMETY_STR,// 搜索关键词 默认空字符串 + NumConstant.ONE, + NumConstant.TWENTY, + false // 不分页 + ); + List list = new ArrayList<>(); + if (CollectionUtils.isNotEmpty(page.getList())) { + Map> group = page.getList().stream().collect(Collectors.groupingBy(CoverageAnalisisDataListResultDTO::getLongLat)); + if (MapUtils.isNotEmpty(group)) { + for (Map.Entry> entry : group.entrySet()) { + if (CollectionUtils.isEmpty(entry.getValue())) { + continue; + } + CoverageAnalisisDataListResultDTOV2 res = new CoverageAnalisisDataListResultDTOV2(); + res.setLatitude(entry.getValue().get(NumConstant.ZERO).getLatitude()); + res.setLongitude(entry.getValue().get(NumConstant.ZERO).getLongitude()); + res.setDataList(entry.getValue()); + list.add(res); + } + } + } + // int totalCount = CollectionUtils.isNotEmpty(list) ? list.size() : NumConstant.ZERO;//这个是实际返回的几个坐标点 + // page.getTotal()是多少条业务数据 + return new PageData<>(list, page.getTotal()); } } \ No newline at end of file From 6c06a8c829915ed7aae4c841509752020eb259df Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 14:27:45 +0800 Subject: [PATCH 153/288] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E5=86=85=E5=AE=B920?= =?UTF-8?q?=E5=AD=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/service/impl/CoverageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index a94b485714..3d919688b2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -381,7 +381,7 @@ public class CoverageServiceImpl implements CoverageService { return icEventEntities.stream() .map(e -> new CoverageAnalisisDataListResultDTO( e.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - e.getEventContent().length() < 51 ? e.getEventContent() : e.getEventContent().substring(NumConstant.ZERO, NumConstant.FIFTY).concat(StrConstant.ELLIPSIS), + e.getEventContent().length() < 21 ? e.getEventContent() : e.getEventContent().substring(NumConstant.ZERO, 20).concat(StrConstant.ELLIPSIS), e.getLatitude(), e.getLongitude())) .collect(Collectors.toList()); From 3661de73e32b43f9b339a26cfb75dbc124b1c3b2 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 14:36:05 +0800 Subject: [PATCH 154/288] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84=E7=BB=87=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E5=90=8C=E6=AD=A5=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/CheckStaffInfoFormDTO.java | 5 +- .../controller/DepartmentController.java | 21 +++++- .../com/epmet/service/DepartmentService.java | 4 +- .../service/impl/DepartmentServiceImpl.java | 68 +++++++++++++++++-- .../feign/GovProjectOpenFeignClient.java | 2 + .../GovProjectOpenFeignClientFallback.java | 5 ++ .../epmet/controller/ProjectController.java | 8 +++ .../com/epmet/service/ProjectService.java | 1 + .../service/impl/ProjectServiceImpl.java | 9 +++ .../resources/mapper/CustomerStaffDao.xml | 12 ++-- 10 files changed, 120 insertions(+), 15 deletions(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java index 855755e1c1..b3fc9b036c 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/CheckStaffInfoFormDTO.java @@ -34,7 +34,7 @@ public class CheckStaffInfoFormDTO implements Serializable { /** * 联建单位、社会自组织Id */ - @NotBlank(message = "id不能为空", groups = CheckAdd.class) + @NotBlank(message = "id不能为空", groups = {CheckAdd.class, CheckEdit.class}) private String id; /** * 部门名称 @@ -55,7 +55,7 @@ public class CheckStaffInfoFormDTO implements Serializable { * 联建单位: party_unit * 社会自组织: community_org */ - @NotBlank(message = "部门类型不能为空", groups = CheckAdd.class) + @NotBlank(message = "部门类型不能为空", groups = {CheckAdd.class, CheckEdit.class}) private String deptType; /** * 部门Id [取消同步时必填] @@ -65,6 +65,7 @@ public class CheckStaffInfoFormDTO implements Serializable { /** * 部门下工作人员Id */ + @NotBlank(message = "工作人员Id不能为空", groups = CheckEdit.class) private String deptStaffId; //token中信息 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java index 448181bf74..da70a814b7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/DepartmentController.java @@ -178,9 +178,24 @@ public class DepartmentController { * @Author sun * @Description 联建单位、社会自组织同步到通讯录操作 */ - @PostMapping("addoreditdeptorstaff") - public Result addOrEditDeptOrStaff(@RequestBody CheckStaffInfoFormDTO formDTO) { - return new Result().ok(departmentService.addOrEditDeptOrStaff(formDTO)); + @PostMapping("syncdept") + public Result syncDept(@LoginUser TokenDto tokenDTO, @RequestBody CheckStaffInfoFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, CheckStaffInfoFormDTO.CheckAdd.class); + formDTO.setCustomerId(tokenDTO.getCustomerId()); + formDTO.setUserId(tokenDTO.getUserId()); + return new Result().ok(departmentService.syncDept(formDTO)); + } + + /** + * @Author sun + * @Description 联建单位、社会自组织取消同步 + */ + @PostMapping("notsyncdept") + public Result notSyncDept(@LoginUser TokenDto tokenDTO, @RequestBody CheckStaffInfoFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, CheckStaffInfoFormDTO.CheckEdit.class); + formDTO.setCustomerId(tokenDTO.getCustomerId()); + formDTO.setUserId(tokenDTO.getUserId()); + return new Result().ok(departmentService.notSyncDept(formDTO)); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java index 020ef3551e..adcf468e9d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/DepartmentService.java @@ -104,5 +104,7 @@ public interface DepartmentService { CheckStaffInfoResultDTO checkStaffInfo(CheckStaffInfoFormDTO formDTO); - CheckStaffInfoResultDTO addOrEditDeptOrStaff(CheckStaffInfoFormDTO formDTO); + CheckStaffInfoResultDTO syncDept(CheckStaffInfoFormDTO formDTO); + + CheckStaffInfoResultDTO notSyncDept(CheckStaffInfoFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 69f3ab9ae2..22fcda5a1e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -34,16 +34,14 @@ import com.epmet.dao.CustomerAgencyDao; import com.epmet.dao.CustomerDepartmentDao; import com.epmet.dao.CustomerStaffDepartmentDao; import com.epmet.dao.StaffOrgRelationDao; -import com.epmet.dto.CustomerDepartmentDTO; -import com.epmet.dto.CustomerIdDTO; -import com.epmet.dto.CustomerStaffDTO; -import com.epmet.dto.CustomerStaffDepartmentDTO; +import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.feign.EpmetHeartOpenFeignClient; import com.epmet.feign.EpmetUserFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; +import com.epmet.feign.GovProjectOpenFeignClient; import com.epmet.service.*; import com.epmet.util.ModuleConstant; import org.apache.commons.lang3.StringUtils; @@ -56,6 +54,7 @@ import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; +import java.util.Date; import java.util.List; /** @@ -93,6 +92,8 @@ public class DepartmentServiceImpl implements DepartmentService { private StaffOrgRelationService staffOrgRelationService; @Autowired private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient; + @Autowired + private GovProjectOpenFeignClient govProjectOpenFeignClient; /** * @param formDTO @@ -364,7 +365,8 @@ public class DepartmentServiceImpl implements DepartmentService { } @Override - public CheckStaffInfoResultDTO addOrEditDeptOrStaff(CheckStaffInfoFormDTO formDTO) { + @Transactional(rollbackFor = Exception.class) + public CheckStaffInfoResultDTO syncDept(CheckStaffInfoFormDTO formDTO) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); if (null == staffInfo) { throw new EpmetException(String.format("查询工作人员%s缓存信息失败...", formDTO.getUserId())); @@ -438,9 +440,11 @@ public class DepartmentServiceImpl implements DepartmentService { if(("agency".equals(resultDTO.getOrgType()))){ //一、更新人员基础数据[姓名 手机号信息] CustomerStaffDTO staffDTO = new CustomerStaffDTO(); + staffDTO.setCustomerId(formDTO.getCustomerId()); staffDTO.setUserId(resultDTO.getStaffId()); staffDTO.setRealName(formDTO.getPersonName()); staffDTO.setMobile(formDTO.getMobile()); + staffDTO.setUpdatedTime(new Date()); staffDTO.setUpdatedBy(resultDTO.getUserId()); Result result = epmetUserOpenFeignClient.editToStaff(staffDTO); if (!result.success()) { @@ -474,5 +478,59 @@ public class DepartmentServiceImpl implements DepartmentService { return resultDTO; } + @Override + @Transactional(rollbackFor = Exception.class) + public CheckStaffInfoResultDTO notSyncDept(CheckStaffInfoFormDTO formDTO) { + CheckStaffInfoResultDTO resultDTO = new CheckStaffInfoResultDTO(); + //1.校验当前部门下工作人员是否有代办项目 + ProjectListFromDTO project = new ProjectListFromDTO(); + project.setUserId(formDTO.getDeptStaffId()); + Result> projectResult = govProjectOpenFeignClient.staffPendingProject(project); + if (!projectResult.success()) { + throw new RenException("获取工作人员代办项目数据失败" + projectResult.getMsg()); + } + if(projectResult.getData().size()>NumConstant.ZERO){ + String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作",("party_unit".equals(formDTO.getDeptType())?"联建单位":"社会自组织")); + resultDTO.setMsg(msg); + } + //2.无代办项目的则删除部门、工作人员信息、修改联建单位/社会自组织业务数据 + //2-1.删除部门 + customerDepartmentDao.deleteById(formDTO.getId()); + //2-2.删除部门人员关系数据 + LambdaQueryWrapper query = new LambdaQueryWrapper<>(); + query.eq(CustomerStaffDepartmentEntity::getDepartmentId, formDTO.getDeptId()); + query.eq(CustomerStaffDepartmentEntity::getUserId, formDTO.getDeptStaffId()); + customerStaffDepartmentDao.delete(query); + //2-3.删除人员注册关系数据 + LambdaQueryWrapper StaffOrgRelation = new LambdaQueryWrapper<>(); + StaffOrgRelation.eq(StaffOrgRelationEntity::getOrgId, formDTO.getDeptId()); + StaffOrgRelation.eq(StaffOrgRelationEntity::getStaffId, formDTO.getDeptStaffId()); + staffOrgRelationDao.delete(StaffOrgRelation); + //2-4.删除工作人员数据 + CustomerStaffDTO staffDTO = new CustomerStaffDTO(); + staffDTO.setCustomerId(formDTO.getCustomerId()); + staffDTO.setUserId(formDTO.getDeptStaffId()); + staffDTO.setDelFlag(1); + staffDTO.setUpdatedTime(new Date()); + staffDTO.setUpdatedBy(formDTO.getUserId()); + Result result = epmetUserOpenFeignClient.editToStaff(staffDTO); + if (!result.success()) { + throw new RenException("更新工作人员基础信息失败" + result.getMsg()); + } + //2-5.修改联建单位/社会自组织业务数据 + resultDTO.setId(formDTO.getId()); + resultDTO.setDeptId(formDTO.getDeptId()); + resultDTO.setDeptType(formDTO.getDeptType()); + resultDTO.setDeptStaffId(formDTO.getDeptStaffId()); + resultDTO.setSyncType("not_sync"); + Result heartResult = epmetHeartOpenFeignClient.editPartyOrCommunity(resultDTO); + if (!heartResult.success()) { + throw new RenException("修改联建单位/社会自组织业务数据失败" + heartResult.getMsg()); + } + + resultDTO.setType(true); + return resultDTO; + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java index 1242d3064b..7907ac7ec5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/GovProjectOpenFeignClient.java @@ -175,5 +175,7 @@ public interface GovProjectOpenFeignClient { @PostMapping("gov/project/icEvent/closeprojectordemand") Result closeProjectOrDemand(@RequestBody ColseProjectOrDemandFormDTO formDTO); + @PostMapping("gov/project/project/staffpendingproject") + Result> staffPendingProject(@RequestBody ProjectListFromDTO formDTO); } diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java index 49a969f91e..51f7922ba5 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/feign/fallback/GovProjectOpenFeignClientFallback.java @@ -169,4 +169,9 @@ public class GovProjectOpenFeignClientFallback implements GovProjectOpenFeignCli public Result closeProjectOrDemand(ColseProjectOrDemandFormDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "closeProjectOrDemand",formDTO); } + + @Override + public Result> staffPendingProject(ProjectListFromDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_PROJECT_SERVER, "staffPendingProject",formDTO); + } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 03bb218bd1..fb8bcad8fd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -379,4 +379,12 @@ public class ProjectController { ValidatorUtils.validateEntity(formDTO, SatisfactionEvaluationListFormDTO.SatisfactionEvaluationListForm.class); return new Result().ok(projectService.satisfactionEvaluationList(formDTO)); } + + /** + * Desc: 查询客户下工作人员是否有代办项目 + */ + @PostMapping("staffpendingproject") + public Result> staffPendingProject(@RequestBody ProjectListFromDTO fromDTO){ + return new Result>().ok(projectService.staffPendingProject(fromDTO)); + } } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 82a88d3a5b..2e5fd4fd76 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -395,4 +395,5 @@ public interface ProjectService extends BaseService { */ void projectListExport(HttpServletResponse response,ProjectManageListFormDTO formDTO) throws IOException; + List staffPendingProject(ProjectListFromDTO fromDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index a9f4ca0093..7d26d3f9a0 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3445,4 +3445,13 @@ public class ProjectServiceImpl extends BaseServiceImpl staffPendingProject(ProjectListFromDTO fromDTO) { + fromDTO.setPageNo(0); + fromDTO.setPageSize(1); + List projectList = baseDao.selectPendList(fromDTO); + return projectList; + } + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 919b69fe0b..62a9312c6d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -458,12 +458,16 @@ UPDATE customer_staff - SET real_name = #{realName}, - mobile = #{mobile}, - updated_time = NOW(), - updated_by = #{updatedBy} + + real_name = #{realName}, + mobile = #{mobile}, + updated_by = #{updatedBy}, + updated_time = #{updatedTime}, + del_flag = #{delFlag} + WHERE del_flag = '0' + AND customer_id = #{customerId} AND user_id = #{userId} From 960c3026443daf777e25ddf25d2eb7e1272e392c Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 14:46:57 +0800 Subject: [PATCH 155/288] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=9A=90=E6=82=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/IcEnterprisePatrolRecordDao.java | 4 ++-- .../service/govorg/GovOrgCoverageService.java | 7 ++----- .../govorg/impl/GovOrgCoverageServiceImpl.java | 14 ++++++++------ .../service/impl/CoverageServiceImpl.java | 16 ++++++++++++++-- .../govorg/IcEnterprisePatrolRecordDao.xml | 6 ++++++ 5 files changed, 32 insertions(+), 15 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java index d6f5c83879..1019bb6f69 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java @@ -26,7 +26,7 @@ public interface IcEnterprisePatrolRecordDao extends BaseDao listEnterprisePatrol(@Param("customerId") String customerId, @Param("agencyId") String agencyId, @Param("staffOrgIds") String staffOrgIds, @Param("search") String search, - @Param("categoryKey") String categoryKey); + @Param("categoryKey") String categoryKey, @Param("latestResult") String latestResult); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 7b1779be57..10b94f81d9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -1,16 +1,13 @@ package com.epmet.dataaggre.service.govorg; -import com.epmet.commons.mybatis.service.BaseService; import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.entity.govorg.*; -import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; import java.util.Map; -import java.util.Set; /** * org库的图层service @@ -115,11 +112,11 @@ public interface GovOrgCoverageService { Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey); - Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey); + Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult); List listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, - Integer pageSize); + Integer pageSize, String latestResult); /** * 通过居民数量等条件查询房屋数量 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index bc64607a7f..e2987a1233 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -1,7 +1,6 @@ package com.epmet.dataaggre.service.govorg.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.enums.CoverageEnums; import com.epmet.commons.tools.utils.EpmetRequestHolder; @@ -15,7 +14,10 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * org 图层service @@ -291,18 +293,18 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { } @Override - public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) { - return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); + public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult) { + return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult); } @Override public List listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey, Boolean isPage, - Integer pageNo, Integer pageSize) { + Integer pageNo, Integer pageSize, String latestResult) { if (isPage) { PageHelper.startPage(pageNo, pageSize); } - return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); + return enterprisePatrolRecordDao.listEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey, latestResult); } @Override diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 3d919688b2..3e4e824fda 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -313,7 +313,7 @@ public class CoverageServiceImpl implements CoverageService { return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey); } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { // 企事业单位巡查 - return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); + return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null); } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定 return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT); @@ -323,6 +323,10 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { // 优势资源 return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey); + } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.equals(placeType)){ + // 企事业单位巡查 + // 最新巡查结果【0:合格 1:不合格】 + return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR ); } return 0; @@ -432,7 +436,7 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { // 企事业单位巡查 List list = orgCoverageService.listEnterprisePatrol( - customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); + customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize,null); return list.stream() .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getEnterpriseId(), categoryKey, @@ -473,6 +477,14 @@ public class CoverageServiceImpl implements CoverageService { .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); + } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.equals(placeType)){ + List list = orgCoverageService.listEnterprisePatrol( + customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize,NumConstant.ONE_STR); + + return list.stream() + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getEnterpriseId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude())) + .collect(Collectors.toList()); } return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml index 6aa433eb09..313eedb9c3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml @@ -12,6 +12,9 @@ and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) and e.PLACE_TYPE = #{categoryKey} and e.DEL_FLAG = '0' + + and e.LATEST_RESULT = #{latestResult} + @@ -34,5 +37,8 @@ and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) and e.PLACE_TYPE = #{categoryKey} and e.DEL_FLAG = '0' + + and e.LATEST_RESULT = #{latestResult} + \ No newline at end of file From e6eabdde06309675fed24c14d9c2a3f47631923c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 14:47:04 +0800 Subject: [PATCH 156/288] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/govorg/impl/GovOrgServiceImpl.java | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index aeffe22264..dc3c3a5d8b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -27,6 +27,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; 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.DateUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; @@ -1158,6 +1159,11 @@ public class GovOrgServiceImpl implements GovOrgService { } formDTO.setAgencyId(staffInfo.getAgencyId()); } + if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) { + //当前日期前一天 + String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); + formDTO.setEndDate(dateId); + } CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); long total = 0; @@ -1266,6 +1272,11 @@ public class GovOrgServiceImpl implements GovOrgService { formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setOrgType(OrgConstant.AGENCY); } + if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) { + //当前日期前一天 + String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); + formDTO.setEndDate(dateId); + } if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { //获取当前组织的所有下级组织ID（包含本级） List agencyIds = customerAgencyDao.getSubAgencyList(formDTO.getOrgId()); From e5a9a3be4fa14c0f230d4a1ecfca2396d7c161c5 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 15:33:07 +0800 Subject: [PATCH 157/288] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=9A=90=E6=82=A32?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 17 +++++++++-------- .../govorg/IcEnterprisePatrolRecordDao.xml | 8 ++++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 3e4e824fda..0bb8752a16 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -43,10 +43,7 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @@ -323,7 +320,7 @@ public class CoverageServiceImpl implements CoverageService { } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { // 优势资源 return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey); - } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.equals(placeType)){ + } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){ // 企事业单位巡查 // 最新巡查结果【0:合格 1:不合格】 return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR ); @@ -477,13 +474,16 @@ public class CoverageServiceImpl implements CoverageService { .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); - } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.equals(placeType)){ + } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){ + //最新巡查结果【0:合格 1:不合格】 List list = orgCoverageService.listEnterprisePatrol( customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize,NumConstant.ONE_STR); return list.stream() .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getEnterpriseId(), categoryKey, - isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude())) + isPage ? categoryDict.getCategoryName() : null, placeType, dc.getPlaceOrgName() , + StringUtils.isNotBlank(dc.getLatitude()) ? dc.getLatitude() : rootAgency.getLatitude(), + StringUtils.isNotBlank(dc.getLongitude()) ? dc.getLongitude() : rootAgency.getLongitude())) .collect(Collectors.toList()); } return new ArrayList<>(); @@ -657,7 +657,8 @@ public class CoverageServiceImpl implements CoverageService { ); List list = new ArrayList<>(); if (CollectionUtils.isNotEmpty(page.getList())) { - Map> group = page.getList().stream().collect(Collectors.groupingBy(CoverageAnalisisDataListResultDTO::getLongLat)); + Map> group = page.getList().stream().collect(Collectors.groupingBy(x->Optional.ofNullable(x.getLongLat()).orElse("O"))); + if (MapUtils.isNotEmpty(group)) { for (Map.Entry> entry : group.entrySet()) { if (CollectionUtils.isEmpty(entry.getValue())) { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml index 313eedb9c3..c682c31548 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml @@ -10,7 +10,9 @@ where e.CUSTOMER_ID = #{customerId} and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%') and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) - and e.PLACE_TYPE = #{categoryKey} + + and e.PLACE_TYPE = #{categoryKey} + and e.DEL_FLAG = '0' and e.LATEST_RESULT = #{latestResult} @@ -35,7 +37,9 @@ where e.CUSTOMER_ID = #{customerId} and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%') and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) - and e.PLACE_TYPE = #{categoryKey} + + and e.PLACE_TYPE = #{categoryKey} + and e.DEL_FLAG = '0' and e.LATEST_RESULT = #{latestResult} From 9f2c565e6812dea8b97d994cf04753ffe13f61c5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 15:33:27 +0800 Subject: [PATCH 158/288] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E3=80=81=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84=E7=BB=87=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E6=97=B6=E5=A2=9E=E5=8A=A0=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=90=8C=E6=AD=A5=E5=88=B0=E9=80=9A=E8=AE=AF=E5=BD=95?= =?UTF-8?q?=20=E6=98=AF=E5=90=A6=E6=9C=89=E6=9C=AA=E5=8A=9E=E7=BB=93?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...cCommunitySelfOrganizationServiceImpl.java | 30 +++++++++++++++-- .../service/impl/IcPartyUnitServiceImpl.java | 32 +++++++++++++++---- .../epmet/feign/GovOrgOpenFeignClient.java | 3 ++ .../GovOrgOpenFeignClientFallback.java | 5 +++ 4 files changed, 62 insertions(+), 8 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java index 195343850e..bdfe777e7c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcCommunitySelfOrganizationServiceImpl.java @@ -41,10 +41,12 @@ import com.epmet.dto.result.*; import com.epmet.dto.result.demand.OptionDTO; import com.epmet.entity.IcCommunitySelfOrganizationEntity; import com.epmet.entity.IcCommunitySelfOrganizationPersonnelEntity; +import com.epmet.entity.IcPartyUnitEntity; import com.epmet.excel.CommunitySelfOrgImportExcel; import com.epmet.excel.ImportCommunitySelfOrganization; import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OssFeignClient; import com.epmet.service.IcCommunitySelfOrganizationPersonnelService; import com.epmet.service.IcCommunitySelfOrganizationService; @@ -66,6 +68,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; +import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.InputStream; @@ -97,6 +100,8 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl page(Map params) { @@ -374,8 +379,29 @@ public class IcCommunitySelfOrganizationServiceImpl extends BaseServiceImpl NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未完成的服务", "存在未完成的服务，不能删除"); } - baseDao.deleteById(formDTO.getOrgId()); - personnelService.deleteByOrgId(formDTO.getOrgId()); + //校验是否有同步到通讯录，是否存在工作人员下有未处理项目数据【社会自组织被同步到通讯录部门的，如果部门下人员存在未办结项目则不允许删除】 + boolean bl = true; + IcCommunitySelfOrganizationEntity entity = baseDao.selectById(formDTO.getOrgId()); + if (null != entity && "sync".equals(entity.getSyncType())) { + CheckStaffInfoFormDTO dto = new CheckStaffInfoFormDTO(); + dto.setId(formDTO.getOrgId()); + dto.setDeptId(entity.getDeptId()); + dto.setDeptType("community_org"); + dto.setDeptStaffId(entity.getDeptStaffId()); + Result result = govOrgOpenFeignClient.notSyncDept(dto); + if (!result.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "社会自组织删除，取消同步到通讯录数据失败", "社会自组织删除，取消同步到通讯录数据失败"); + } + if (!result.getData().getType()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), result.getData().getMsg(), result.getData().getMsg()); + } + bl = result.getData().getType(); + } + if (bl) { + baseDao.deleteById(formDTO.getOrgId()); + personnelService.deleteByOrgId(formDTO.getOrgId()); + } + } /** diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 7b8df1b923..7c6ca5c81c 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -59,10 +59,7 @@ import com.epmet.entity.IcCommunitySelfOrganizationEntity; import com.epmet.entity.IcPartyUnitEntity; import com.epmet.excel.IcPartyUnitImportExcel; import com.epmet.excel.IcPartyUnitImportFailedExcel; -import com.epmet.feign.EpmetAdminOpenFeignClient; -import com.epmet.feign.EpmetCommonServiceOpenFeignClient; -import com.epmet.feign.EpmetHeartOpenFeignClient; -import com.epmet.feign.OssFeignClient; +import com.epmet.feign.*; import com.epmet.service.IcCommunitySelfOrganizationService; import com.epmet.service.IcPartyUnitService; import com.epmet.service.IcServiceItemDictService; @@ -80,6 +77,7 @@ import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -115,6 +113,8 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl search(PartyUnitFormDTO formDTO) { @@ -261,8 +261,28 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl NumConstant.ZERO) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "存在未完成的服务", "存在未完成的服务，不能删除"); } - // 逻辑删除（@TableLogic 注解） - baseDao.deleteById(id); + //校验是否有同步到通讯录，是否存在工作人员下有未处理项目数据【联建单位被同步到通讯录部门的，如果部门下人员存在未办结项目则不允许删除】 + boolean bl = true; + IcPartyUnitEntity entity = baseDao.selectById(id); + if (null != entity && "sync".equals(entity.getSyncType())) { + CheckStaffInfoFormDTO dto = new CheckStaffInfoFormDTO(); + dto.setId(id); + dto.setDeptId(entity.getDeptId()); + dto.setDeptType("party_unit"); + dto.setDeptStaffId(entity.getDeptStaffId()); + Result result = govOrgOpenFeignClient.notSyncDept(dto); + if (!result.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "联建单位删除，取消同步到通讯录数据失败", "联建单位删除，取消同步到通讯录数据失败"); + } + if (!result.getData().getType()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), result.getData().getMsg(), result.getData().getMsg()); + } + } + if (bl) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteById(id); + } + } /** diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java index 7e2bcae37e..3abfbc588e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java @@ -705,4 +705,7 @@ public interface GovOrgOpenFeignClient { */ @PostMapping("/gov/org/ichouse/getOwnerHouseList") Result> getOwnerHouseList(@RequestBody IcHouseDTO formDTO); + + @PostMapping("/gov/org/department/notsyncdept") + Result notSyncDept(@RequestBody CheckStaffInfoFormDTO formDTO); } diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java index f9046d5979..8d020c4538 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java @@ -459,4 +459,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient { return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getOwnerHouseList", formDTO); } + @Override + public Result notSyncDept(CheckStaffInfoFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "notSyncDept", formDTO); + } + } From dd6aa8efbcbf8cfbbb027573d207b528c09892df Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 15:51:07 +0800 Subject: [PATCH 159/288] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=81=94=E5=BB=BA?= =?UTF-8?q?=E5=8D=95=E4=BD=8D=E8=B4=9F=E8=B4=A3=E4=BA=BA=E3=80=81=E7=A4=BE?= =?UTF-8?q?=E5=8C=BA=E8=87=AA=E7=BB=84=E7=BB=87=E8=B4=9F=E8=B4=A3=E4=BA=BA?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E9=BB=98=E8=AE=A4=E8=A7=92=E8=89=B2=E4=B8=8D?= =?UTF-8?q?=E5=85=81=E8=AE=B8=E5=88=A0=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/GovRoleDTO.java | 5 +++++ .../src/main/java/com/epmet/entity/GovRoleEntity.java | 5 +++++ .../java/com/epmet/service/impl/GovRoleServiceImpl.java | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java index f4b7ce74e9..0915ba9348 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/GovRoleDTO.java @@ -60,6 +60,11 @@ public class GovRoleDTO implements Serializable { */ private Long deptId; + /** + * 是否默认角色【0:否 1:是】 + */ + private String defaultRole; + /** * 删除标识：0.未删除 1.已删除 */ diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java index 654bee9ce6..7db443d5db 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/entity/GovRoleEntity.java @@ -46,4 +46,9 @@ public class GovRoleEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 是否默认角色【0:否 1:是】 + */ + private String defaultRole; + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index c171d081d9..be20a94427 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; 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.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; @@ -116,6 +118,11 @@ public class GovRoleServiceImpl extends BaseServiceImpl Date: Thu, 28 Jul 2022 15:59:55 +0800 Subject: [PATCH 160/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96=EF=BC=8C=E5=81=9A=E4=BA=86=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/enums/CoveragePlaceTypeEnum.java | 2 +- .../AnalysisGovernedTargetsResult.java | 2 +- .../AnalysisResourceCategoriesResult.java | 6 +- .../govorg/IcCoverageCategoryDictEntity.java | 5 ++ .../service/impl/CoverageServiceImpl.java | 62 +++++++++---------- .../govorg/IcCoverageCategoryDictDao.xml | 1 + .../entity/IcCoverageCategoryDictEntity.java | 5 +- 7 files changed, 46 insertions(+), 37 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java index 3e68bf0503..6078970cb2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java @@ -13,7 +13,7 @@ public enum CoveragePlaceTypeEnum { CITY_MANAGEMENT("city_management", "城市管理"), COMMUNITY_ORG("community_org", "社区自组织"), PUBLIC_SERVICE("public_service", "公共服务"), - RESI("resi", "居民"), + RESI("resi", "公共服务人群"), PARTY_UNIT("party_unit", "联建单位"), VOLUNTEER("volunteer", "志愿者"), GROUP_RENT("group_rent", "群租房"), diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java index 56988054ba..a925663491 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisGovernedTargetsResult.java @@ -19,7 +19,7 @@ public class AnalysisGovernedTargetsResult { private String coverageType; private String placeType; private String placeTypeName; - private Integer count = 0; + private Integer quantity = 0; private List children; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java index 216c41f705..a6ab7996ab 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java @@ -26,7 +26,7 @@ public class AnalysisResourceCategoriesResult { /** * 个数 */ - private Integer count; + private Integer quantity; /** * 没有placeTypeInAnalysis，直接属于图层的 @@ -49,7 +49,7 @@ public class AnalysisResourceCategoriesResult { private String categoryName; private String coverageType; private String placeType; - private Integer count = 0; + private Integer quantity = 0; } /** @@ -61,7 +61,7 @@ public class AnalysisResourceCategoriesResult { public static class PlaceType { private String placeType; private String placeTypeName; - private Integer count = 0; + private Integer quantity = 0; private List categories; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java index bc0ae5c9e2..1ea7222208 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java @@ -60,6 +60,11 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { private String dataType; + /** + * 数量 + */ + private Integer quantity; + /** * 排序 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index dcc72dd756..1bb44635a4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -251,41 +251,41 @@ public class CoverageServiceImpl implements CoverageService { public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType, String categoryKey, String search) { - if (PLACE_TYPE_RESI.equals(placeType)) { + if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) { // 使用分类查询居民信息 return icResiService.countResisByCategories4Coverage(customerId, agencyId, staffOrgIds, categoryKey, search); - } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) { // 特殊人群 return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); - } else if (PLACE_TYPE_EVENT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) { // 难点痛点 return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true); - } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) { // 城市资源管理 return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey); - } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.COMMUNITY_ORG.getCode().equals(placeType)) { // 社区自组织 return heartService.countCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey); - } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) { // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 if (categoryKey.equals("pu_jgzsbm")) { String partyUnitType = "3"; return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search); } - } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) { // 危化企业 return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey); - } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) { // 企事业单位巡查 return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey); - } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定 return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT); - } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.PUBLIC_SERVICE.getCode().equals(placeType)) { // 公共服务 return orgCoverageService.countPublicServiceEntities(customerId, staffOrgIds, search, categoryKey); - } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.SUPERIOR_RESOURCE.getCode().equals(placeType)) { // 优势资源 return orgCoverageService.countSuporiorResourceEntities(customerId, staffOrgIds, search, categoryKey); } @@ -311,7 +311,7 @@ public class CoverageServiceImpl implements CoverageService { // 根据categoryKey查询类别名称 IcCoverageCategoryDictEntity categoryDict = orgCoverageService.selectByCategoryKey(categoryKey); - if (PLACE_TYPE_RESI.equals(placeType)) { + if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) { // 使用分类查询居民信息 List resiEntities = icResiService.listResisByCategories4Coverage( customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); @@ -325,7 +325,7 @@ public class CoverageServiceImpl implements CoverageService { coordinates[1], coordinates[0]); }).collect(Collectors.toList()); - } else if (PLACE_TYPE_SPECIAL_RESI.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) { // 特殊人群 List resiInfos = icResiService.listSpecialResisBySpecialType( customerId, agencyId, staffOrgIds, categoryKey, search, pageNo, pageSize, isPage); @@ -338,7 +338,7 @@ public class CoverageServiceImpl implements CoverageService { isPage ? re.getName() : null, coordinates[1], coordinates[0]); }).collect(Collectors.toList()); - } else if (PLACE_TYPE_EVENT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) { // 难点痛点 List icEventEntities = govProjectService.searchIcEventEntities( customerId, staffOrgIds, search, true, isPage, pageNo, pageSize); @@ -349,7 +349,7 @@ public class CoverageServiceImpl implements CoverageService { e.getLatitude(), e.getLongitude())) .collect(Collectors.toList()); - } else if (PLACE_TYPE_CITY_MANAGEMENT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) { // 城市资源管理 List cityResources = orgCoverageService.searchCityResourceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); @@ -359,7 +359,7 @@ public class CoverageServiceImpl implements CoverageService { isPage ? resource.getName() : null, resource.getLatitude(), resource.getLongitude())) .collect(Collectors.toList()); - } else if (PLACE_TYPE_COMUNITY_ORG.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.COMMUNITY_ORG.getCode().equals(placeType)) { // 社区自组织 List l = heartService.searchCommunityOrgEntities( customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); @@ -370,7 +370,7 @@ public class CoverageServiceImpl implements CoverageService { isPage ? org.getOrganizationName() : null, org.getLatitude(), org.getLongitude())) .collect(Collectors.toList()); - } else if (PLACE_TYPE_PARTY_UNIT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) { // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 if (categoryKey.equals("pu_jgzsbm")) { String partyUnitType = "3"; @@ -383,7 +383,7 @@ public class CoverageServiceImpl implements CoverageService { .collect(Collectors.toList()); } return new ArrayList<>(); - } else if (PLACE_TYPE_DANGEROUS_CHEMICALS.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) { // 危化企业 List l = orgCoverageService.searchDangerousChemicalEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); @@ -393,7 +393,7 @@ public class CoverageServiceImpl implements CoverageService { isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); - } else if (PLACE_TYPE_ENTERPRISE_PARTROL.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) { // 企事业单位巡查 List list = orgCoverageService.listEnterprisePatrol( customerId, agencyId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); @@ -403,7 +403,7 @@ public class CoverageServiceImpl implements CoverageService { isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getPlaceOrgName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); - } else if (PLACE_TYPE_GROUP_RENT.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定 List houses = orgCoverageService.searchByResiNumber( customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT, isPage, pageNo, pageSize); @@ -421,7 +421,7 @@ public class CoverageServiceImpl implements CoverageService { isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? houseName : null, latitude, longitude); }).collect(Collectors.toList()); - } else if (PLACE_TYPE_PUBLIC_SERVICE.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.PUBLIC_SERVICE.getCode().equals(placeType)) { // 公共服务 List l = orgCoverageService.searchPublicServiceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); @@ -429,7 +429,7 @@ public class CoverageServiceImpl implements CoverageService { .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getName() : null, dc.getLatitude(), dc.getLongitude())) .collect(Collectors.toList()); - } else if (PLACE_TYPE_SUPERIOR_RESOURCE.equals(placeType)) { + } else if (CoveragePlaceTypeEnum.SUPERIOR_RESOURCE.getCode().equals(placeType)) { // 优势资源 List l = orgCoverageService.searchSuporiorResourceEntities( customerId, staffOrgIds, search, categoryKey, isPage, pageNo, pageSize); @@ -504,31 +504,31 @@ public class CoverageServiceImpl implements CoverageService { // 没有placetype的 categoriesOfThisCoverage.getCategories() .add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), c.getCategoryName(), - c.getCoverageType(), c.getPlaceType(), 0)); + c.getCoverageType(), c.getPlaceType(), c.getQuantity())); } else { // 有placetype的 AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(c.getPlaceTypeInAnalysis()); if (placeType == null) { placeType = new AnalysisResourceCategoriesResult.PlaceType( - c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), 0, new ArrayList<>()); + c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), c.getQuantity(), new ArrayList<>()); placeTypeMap.put(c.getPlaceTypeInAnalysis(), placeType); } placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), - c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), 0)); + c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), c.getQuantity())); - placeType.setCount(placeType.getCount() + 0); // todo 0改为category的count + placeType.setQuantity(placeType.getQuantity() + c.getQuantity()); // todo 0改为category的count } }); AtomicReference total = new AtomicReference<>(0); placeTypeMap.forEach((placeTypeKey, placeType) -> { categoriesOfThisCoverage.getPlaceTypesInAnalysis().add(placeType); - total.updateAndGet(v -> v + placeType.getCount()); + total.updateAndGet(v -> v + placeType.getQuantity()); }); categoriesOfThisCoverage.setCoverageType(coverage.getKey()); categoriesOfThisCoverage.setCoverageName(CoverageEnums.getEnum(coverage.getKey()).getCoverageName()); - categoriesOfThisCoverage.setCount(total.get()); + categoriesOfThisCoverage.setQuantity(total.get()); results.add(categoriesOfThisCoverage); } @@ -553,7 +553,7 @@ public class CoverageServiceImpl implements CoverageService { if (StringUtils.isEmpty(placeTypeInAnalysis)) { // 只有一层，没有子级 results.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), - rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); } else { // 有子级，需要使用placeTypeInAnalysis分组 List targets = placeTypeMap.get(placeTypeInAnalysis); @@ -562,7 +562,7 @@ public class CoverageServiceImpl implements CoverageService { placeTypeMap.put(placeTypeInAnalysis, targets); } targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), - rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); } }); @@ -580,7 +580,7 @@ public class CoverageServiceImpl implements CoverageService { List categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); List ggfwrqCategories = categoriesNeed2Warn.stream().map(wc -> new AnalysisGovernedTargetsResult(wc.getColumnName(), wc.getTableName(), - CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getCode(), + CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getName(), 0, new ArrayList<>())).collect(Collectors.toList()); AnalysisGovernedTargetsResult ggfwRq = new AnalysisGovernedTargetsResult(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml index 94da6bd60c..599659a43b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml @@ -13,6 +13,7 @@ + diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java index 25a4e47299..57fbe777e1 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java @@ -62,7 +62,10 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { private String coverageType; private String dataType; - + /** + * 数量 + */ + private Integer quantity; /** * 排序 */ From 90d2d7b14aaef83583a47398cc6ff7532e21edc0 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 28 Jul 2022 16:10:32 +0800 Subject: [PATCH 161/288] =?UTF-8?q?=E6=9A=82=E6=8F=90=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/constant/OrgConstant.java | 4 + .../dataaggre/constant/TableConstant.java | 22 +++ .../form/CoverageHomeSearchFormDTO.java | 22 ++- .../result/CoverageHomeSearchResultDTO.java | 14 ++ .../dto/govorg/result/EventInfoResultDTO.java | 13 ++ .../govorg/result/ResourceInfoResultDTO.java | 45 ++++++ .../dto/govorg/result/UserInfoResultDTO.java | 23 +++ .../com/epmet/dataaggre/enums/MenusEnums.java | 75 +++++++++ .../data-aggregator-server/pom.xml | 5 + .../dao/epmetuser/IcResiUserDao.java | 12 +- .../dao/govorg/IcCityManagementDao.java | 43 +++++ .../dao/govorg/IcCoverageCategoryDictDao.java | 14 +- .../dataaggre/dao/govproject/IcEventDao.java | 13 ++ .../heart/IcCommunitySelfOrganizationDao.java | 7 + .../dataaggre/redis/GovCustomerMenuRedis.java | 109 +++++++++++++ .../service/epmetuser/IcResiService.java | 10 ++ .../epmetuser/impl/IcResiServiceImpl.java | 13 ++ .../service/govorg/GovOrgCoverageService.java | 10 ++ .../service/govorg/GovOrgService.java | 44 ++++- .../impl/GovOrgCoverageServiceImpl.java | 12 ++ .../govorg/impl/GovOrgServiceImpl.java | 30 +++- .../service/govproject/GovProjectService.java | 12 +- .../impl/GovProjectServiceImpl.java | 10 +- .../dataaggre/service/heart/HeartService.java | 4 + .../service/heart/impl/HeartServiceImpl.java | 8 +- .../service/impl/CoverageServiceImpl.java | 152 +++++++++++++++++- .../IcResiCategoryStatsConfigService.java | 9 ++ .../mapper/epmetuser/IcResiUserDao.xml | 20 +++ .../mapper/govorg/IcCityManagementDao.xml | 92 +++++++++++ .../govorg/IcCoverageCategoryDictDao.xml | 9 ++ .../mapper/govproject/IcEventDao.xml | 17 +- .../heart/IcCommunitySelfOrganizationDao.xml | 18 +++ 32 files changed, 877 insertions(+), 14 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TableConstant.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/MenusEnums.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryStatsConfigService.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java index 28bc8e794c..d69b12c4e5 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/OrgConstant.java @@ -17,4 +17,8 @@ public interface OrgConstant { String AGENCY_ID="agencyId"; String AGENC_PATH="agencyPath"; + + String SEARCH_TYPE_USER = "user"; + String SEARCH_TYPE_EVENT = "event"; + String SEARCH_TYPE_RESOURCE = "resource"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TableConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TableConstant.java new file mode 100644 index 0000000000..1e80e51d2f --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/TableConstant.java @@ -0,0 +1,22 @@ +package com.epmet.dataaggre.constant; + +/** + * + */ +public interface TableConstant { + + String IC_DANGEROUS_CHEMICALS = "ic_dangerous_chemicals"; + + String IC_SUPERIOR_RESOURCE = "ic_superior_resource"; + + String IC_ENTERPRISE = "ic_enterprise"; + + String IC_COMMUNITY_SELF_ORGANIZATION = "ic_community_self_organization"; + + String IC_CITY_MANAGEMENT = "ic_city_management"; + + String IC_PUBLIC_SERVICE = "ic_public_service"; + + String IC_EVENT = "ic_event"; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java index 61ff9e4c07..49575e02fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.dto.govorg.form; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; import java.io.Serializable; @@ -10,11 +11,30 @@ import java.io.Serializable; * @DESC */ @Data -public class CoverageHomeSearchFormDTO implements Serializable { +public class CoverageHomeSearchFormDTO extends PageFormDTO implements Serializable { private static final long serialVersionUID = 3776954636762201010L; private String name; + private String customerId; + private String userId; + + private String orgId; + + private String pids; + + private String tableName; + + /** + * 搜索类型，居民：user；事件：event；资源：resource + */ + private String searchType; + + /** + * 资源类型：社区自组织：community_org;优势资源:superior_resource;城市管理：city_management；重点危化企业：dangerous_chemicals；公共服务：public_service；企事业单位巡查：enterprise_patrol； + * searchType为resource时，此字段必填 + */ + private String resourceType; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java index 59d65d5741..508c63b69c 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/CoverageHomeSearchResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dataaggre.dto.govorg.result; +import com.epmet.commons.tools.constant.NumConstant; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -19,14 +21,26 @@ public class CoverageHomeSearchResultDTO implements Serializable { * 居民信息 */ private List userInfos; + private Long userInfosTotal; /** * 事件信息 */ private List eventInfos; + private Long eventInfoTotal; /** * 资源信息 */ private List resourceInfos; + private Long resourceInfoTotal; + + public CoverageHomeSearchResultDTO() { + this.userInfos = new ArrayList<>(); + this.userInfosTotal = NumConstant.ZERO_L; + this.eventInfos = new ArrayList<>(); + this.eventInfoTotal = NumConstant.ZERO_L; + this.resourceInfos = new ArrayList<>(); + this.resourceInfoTotal = NumConstant.ZERO_L; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java index 18c6221410..60866d7c3f 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/EventInfoResultDTO.java @@ -1,5 +1,6 @@ package com.epmet.dataaggre.dto.govorg.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; @@ -24,6 +25,9 @@ public class EventInfoResultDTO implements Serializable { */ private String gridName; + @JsonIgnore + private String gridId; + /** * 发生时间 yyyy-dd-mm hh:ii:ss */ @@ -43,4 +47,13 @@ public class EventInfoResultDTO implements Serializable { * 纬度 */ private String latitude; + + public EventInfoResultDTO() { + this.eventId = ""; + this.gridName = ""; + this.happenTime = ""; + this.eventContent = ""; + this.longitude = ""; + this.latitude = ""; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java index 772d6fd69f..c82110c7e9 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/ResourceInfoResultDTO.java @@ -28,4 +28,49 @@ public class ResourceInfoResultDTO implements Serializable { * 纬度 */ private String latitude; + + /** + * 分类名称 + */ + private String categoryName; + private String category; + + /** + * 占地面积 + */ + private String areaCovered; + + /** + * 容纳人数 + */ + private String capacity; + + /** + * 地址 + */ + private String address; + + /** + * 联系电话 + */ + private String mobile; + + /** + * 联系人 + */ + private String principal; + + public ResourceInfoResultDTO() { + this.resourceId = ""; + this.resourceType = ""; + this.name = ""; + this.longitude = ""; + this.latitude = ""; + this.categoryName = ""; + this.areaCovered = ""; + this.capacity = ""; + this.address = ""; + this.mobile = ""; + this.principal = ""; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java index 971606c625..efc74c0517 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/UserInfoResultDTO.java @@ -1,8 +1,10 @@ package com.epmet.dataaggre.dto.govorg.result; +import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import java.io.Serializable; +import java.util.ArrayList; import java.util.List; /** @@ -27,11 +29,17 @@ public class UserInfoResultDTO implements Serializable { */ private String gridName; + @JsonIgnore + private String gridId; + /** * 所属房屋 */ private String houseName; + @JsonIgnore + private String homeId; + /** * 手机号 */ @@ -66,4 +74,19 @@ public class UserInfoResultDTO implements Serializable { * 纬度 */ private String latitude; + + public UserInfoResultDTO() { + this.icUserId = ""; + this.name = ""; + this.gridName = ""; + this.houseName = ""; + this.homeId = ""; + this.mobile = ""; + this.idCard = ""; + this.gzdw = ""; + this.rhqk = ""; + this.type = new ArrayList<>(); + this.longitude = ""; + this.latitude = ""; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/MenusEnums.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/MenusEnums.java new file mode 100644 index 0000000000..c777cd1281 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/enums/MenusEnums.java @@ -0,0 +1,75 @@ +package com.epmet.dataaggre.enums; + +import org.apache.commons.lang3.StringUtils; + +public enum MenusEnums { + + IC_DANGEROUS_CHEMICALS("shequzhili/tuceng/anquan/weihua/index","ic_dangerous_chemicals","重点危化品企业","govorg"), + IC_SUPERIOR_RESOURCE("shequzhili/tuceng/yingji/ziyuan/index","ic_superior_resource","优势资源管理","govorg"), + IC_ENTERPRISE("shequzhili/tuceng/anquan/xuncha/index","ic_enterprise","企事业单位巡查","govorg"), + IC_COMMUNITY_SELF_ORGANIZATION("communityService/sqzzz/index","ic_community_self_organization","社区自组织","heart"), + IC_CITY_MANAGEMENT("shequzhili/csgltc/csgl","ic_city_management","城市管理图层","govorg"), + IC_PUBLIC_SERVICE("shequzhili/ggfwtc/ggfw","ic_public_service","公共服务图层","govorg"), + IC_EVENT("shequzhili/event/eventList","ic_event","事件管理","govproject"); + + private String url; + private String value; + private String name; + private String db; + + MenusEnums(String url, String value, String name, String db) { + this.url = url; + this.value = value; + this.name = name; + this.db = db; + } + + public static MenusEnums get(String url) { + for (MenusEnums gm : MenusEnums.values()) { + if (gm.url.equals(url)) { + return gm; + } + } + return null; + } + + public static String getValueByUrl(String url){ + if (StringUtils.isBlank(url)){ + return ""; + } + for (MenusEnums me : MenusEnums.values()) { + if (me.url.equals(url)) { + return me.getValue(); + } + } + return ""; + } + + public static String getDbByValue(String table){ + if (StringUtils.isBlank(table)){ + return ""; + } + for (MenusEnums me : MenusEnums.values()) { + if (me.value.equals(table)) { + return me.getDb(); + } + } + return ""; + } + + public String getUrl() { + return url; + } + + public String getValue() { + return value; + } + + public String getName() { + return name; + } + + public String getDb() { + return db; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index efa4bca631..1c61ede4bc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -13,6 +13,11 @@ data-aggregator-server + + com.epmet + gov-access-client + 2.0.0 + com.epmet epmet-heart-client diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index 8705014852..9aaf933745 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -21,6 +21,8 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.ResiByPolicyInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dto.IcResiUserDTO; @@ -28,7 +30,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Set; /** * 用户基础信息 @@ -98,4 +99,13 @@ public interface IcResiUserDao extends BaseDao { @Param("name") String name, @Param("resiRules") List resiRule, @Param("houseIds") List houseIds); + + /** + * Desc: 获取icUser + * @param formDTO + * @author zxc + * @date 2022/7/27 17:09 + */ + List getAllIcUser(CoverageHomeSearchFormDTO formDTO); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java index 46e2005b33..5fcc8ac3c2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java @@ -1,9 +1,13 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.entity.govorg.IcCityManagementEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 城市管理图层 * @@ -13,5 +17,44 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface IcCityManagementDao extends BaseDao { + /** + * Desc: 【资源】获取城市管理信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getCityManageInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取公共服务信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取重点危化品企业信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取优势资源信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取企事业单位巡查信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java index e81167fc39..8c438b9119 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryDictDao.java @@ -3,6 +3,9 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryDictEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 五大图层类别字典表 @@ -12,5 +15,14 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcCoverageCategoryDictDao extends BaseDao { - + + /** + * Desc: 根据客户ID和数据类型获取字典对应的url + * @param customerId + * @param dataType + * @author zxc + * @date 2022/7/27 16:52 + */ + List getAllTypeCoverageByCustomerAndType(@Param("customerId") String customerId, @Param("dataType") String dataType); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java index c2305c3afc..7cbb6dd87f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java @@ -1,9 +1,13 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; import com.epmet.dataaggre.entity.govproject.IcEventEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 事件管理表 * @@ -12,4 +16,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcEventDao extends BaseDao { + + /** + * Desc: 【资源】获取事件信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:48 + */ + List getEventInfos(CoverageHomeSearchFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java index 2499308cf6..2aab1d0be0 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java @@ -18,9 +18,13 @@ package com.epmet.dataaggre.dao.heart; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 社区自组织表 * @@ -29,4 +33,7 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcCommunitySelfOrganizationDao extends BaseDao { + + List getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java new file mode 100644 index 0000000000..fbeca4840e --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java @@ -0,0 +1,109 @@ +package com.epmet.dataaggre.redis; + +import cn.hutool.core.bean.BeanUtil; +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.constant.NumConstant; +import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.redis.RedisKeys; +import com.epmet.commons.tools.redis.RedisUtils; +import com.epmet.commons.tools.utils.ConvertUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.GovMenuDTO; +import com.epmet.dto.form.GetCustomerMenuListFormDTO; +import com.epmet.feign.GovAccessFeignClient; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * 客户菜单配置表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2021-03-16 + */ +@Slf4j +@Component +public class GovCustomerMenuRedis { + @Autowired + private RedisUtils redisUtils; + + @Autowired + private GovAccessFeignClient govAccessFeignClient; + + /** + * Desc: 保存客户菜单缓存 + * @param customerId + * @param type + * @param govMenuDTOS + * @author zxc + * @date 2022/7/27 13:45 + */ + public void setCustomerMenuList(String customerId, Integer type, List govMenuDTOS) { + if (checkParam(customerId, type) && !CollectionUtils.isEmpty(govMenuDTOS) && StringUtils.isNotBlank(govMenuDTOS.get(NumConstant.ZERO).getName())) { + String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId); + govMenuDTOS.forEach(g -> { + Map map = BeanUtil.beanToMap(g, false, true); + redisUtils.listAdd(key,map); + }); + } + } + + /** + * Desc: 获取客户菜单缓存 + * @param customerId + * @param type + * @param tableName + * @author zxc + * @date 2022/7/27 13:45 + */ + public List getCustomerMenuList(String customerId, Integer type, String tableName) { + if (checkParam(customerId, type)) { + String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId); + List result = new ArrayList<>(); + List> maps = (List>) redisUtils.listGetAll(key, NumConstant.ZERO, NumConstant.ONE_NEG); + for (Map map : maps) { + result.add(ConvertUtils.mapToEntity(map,GovMenuDTO.class)); + } +// result = (List) redisUtils.listGetAll(key, NumConstant.ZERO,NumConstant.ONE_NEG); + if (CollectionUtils.isEmpty(result)){ + GetCustomerMenuListFormDTO formDTO = new GetCustomerMenuListFormDTO(); + formDTO.setCustomerId(customerId); + formDTO.setType(type); + formDTO.setTableName(tableName); + Result> customerMenuList = govAccessFeignClient.getCustomerMenuList(formDTO); + if (!customerMenuList.success()){ + throw new EpmetException("查询客户菜单失败"+ JSON.toJSONString(formDTO)); + } + result = customerMenuList.getData(); + setCustomerMenuList(customerId,type,customerMenuList.getData()); + } + return result; + } + return new ArrayList<>(); + } + + /** + * Desc: 删除客户菜单缓存 + * @param + * @author zxc + * @date 2022/7/27 13:47 + */ + public void delAllCustomerMenu(String customerId) { + String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId); + redisUtils.delete(key); + } + + private boolean checkParam(String customerId, Integer type) { + if (StringUtils.isBlank(customerId) || type == null){ + log.warn("checkParam fail, param is null"); + return false; + } + return true; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java index 1900b75e89..c8d7f5ca36 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.service.epmetuser; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import java.util.List; @@ -39,4 +41,12 @@ public interface IcResiService { Integer pageNo, Integer pageSize, Boolean isPage); Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search); + + /** + * Desc: 获取icUser + * @param formDTO + * @author zxc + * @date 2022/7/27 17:09 + */ + List getAllIcUser(CoverageHomeSearchFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index 74ba309792..5aa7c8d3a31 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -5,6 +5,8 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmetuser.IcResiUserDao; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.UserInfoResultDTO; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.github.pagehelper.PageHelper; @@ -100,4 +102,15 @@ public class IcResiServiceImpl implements IcResiService { public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) { return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); } + + /** + * Desc: 获取icUser + * @param formDTO + * @author zxc + * @date 2022/7/27 17:09 + */ + @Override + public List getAllIcUser(CoverageHomeSearchFormDTO formDTO) { + return resiUserDao.getAllIcUser(formDTO); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 10b94f81d9..b13cd75b74 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -135,6 +135,16 @@ public interface GovOrgCoverageService { */ IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey); + List listCoverageCategoryEntities(String coverageType); + + /** + * Desc: 根据客户ID和数据类型获取字典对应的url + * @param customerId + * @param dataType + * @author zxc + * @date 2022/7/27 16:52 + */ + List getAllTypeCoverageByCustomerAndType(String customerId,String dataType); List listResourceCategoryEntities(String coverageType); List listGovernedTargetCategoryEntities(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index ee502bd493..adc04ab316 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -11,13 +11,10 @@ import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; -import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dto.IcNeighborHoodDTO; -import com.epmet.dto.result.NeighborHoodListResultDTO; import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.Set; /** * @Author zxc @@ -223,4 +220,45 @@ public interface GovOrgService { List statRule, Integer pageNo, Integer pageSize); List neighborhoodsByIds(List neighborhoodIds); + + /** + * Desc: 【资源】获取城市管理信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getCityManageInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取公共服务信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取重点危化品企业信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取优势资源信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO); + + /** + * Desc: 【资源】获取企事业单位巡查信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:22 + */ + List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index e2987a1233..56b32dad29 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -346,4 +346,16 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { query.eq(IcCoverageCategoryDictEntity::getDataType, CoverageEnums.DATA_TYPE_GOVERNED_TARGET.getKey()); return coverageCategoryDictDao.selectList(query); } + + /** + * Desc: 根据客户ID和数据类型获取字典对应的url + * @param customerId + * @param dataType + * @author zxc + * @date 2022/7/27 16:52 + */ + @Override + public List getAllTypeCoverageByCustomerAndType(String customerId, String dataType) { + return coverageCategoryDictDao.getAllTypeCoverageByCustomerAndType(customerId, dataType); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 86999e17bd..4eaab080a5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -5,7 +5,6 @@ import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.dingtalk.api.request.OapiRobotSendRequest; import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.commons.tools.constant.Constant; @@ -27,7 +26,6 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; 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.EpmetRequestHolder; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; @@ -41,7 +39,6 @@ import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.dto.resigroup.result.OrgInfoCommonDTO; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; -import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import com.epmet.dataaggre.excel.GridLivelyDetailExcel; import com.epmet.dataaggre.excel.GridLivelyExcel; import com.epmet.dataaggre.service.commonservice.AreaCodeService; @@ -117,6 +114,8 @@ public class GovOrgServiceImpl implements GovOrgService { private IcHouseDao houseDao; @Autowired private IcNeighborhoodDao neighborhoodDao; + @Autowired + private IcCityManagementDao cityManagementDao; /** * @param staffId @@ -1130,4 +1129,29 @@ public class GovOrgServiceImpl implements GovOrgService { public List neighborhoodsByIds(List neighborhoodIds) { return neighborhoodDao.neighborhoodsByIds(neighborhoodIds); } + + @Override + public List getCityManageInfos(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getCityManageInfos(formDTO); + } + + @Override + public List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getPublicServiceInfos(formDTO); + } + + @Override + public List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getDangerousChemicalsInfos(formDTO); + } + + @Override + public List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getSuperiorResourceInfos(formDTO); + } + + @Override + public List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getEnterpriseInfos(formDTO); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 44ec60c4cd..e64525a1fc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -2,10 +2,12 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.entity.govproject.IcEventEntity; -import com.sun.org.apache.xpath.internal.operations.Bool; import java.util.LinkedList; import java.util.List; @@ -121,4 +123,12 @@ public interface GovProjectService { List searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize); + /** + * Desc: 【资源】获取事件信息 + * @param formDTO + * @author zxc + * @date 2022/7/28 10:48 + */ + List getEventInfos(CoverageHomeSearchFormDTO formDTO); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index de4c2c2bc5..0a400fe927 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -26,6 +26,9 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; import com.epmet.dataaggre.dto.govproject.ResiEventDTO; @@ -665,7 +668,12 @@ public class GovProjectServiceImpl implements GovProjectService { return icEventDao.selectList(query); } - /** + @Override + public List getEventInfos(CoverageHomeSearchFormDTO formDTO) { + return icEventDao.getEventInfos(formDTO); + } + + /** * 构造事件查询 * @param customerId * @param staffOrgIds diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java index e1b4e3692b..d97044b718 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java @@ -1,5 +1,7 @@ package com.epmet.dataaggre.service.heart; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; @@ -40,4 +42,6 @@ public interface HeartService { Integer countPartyUnitEntities(String customerId, String agencyId, String staffOrgIds, String partyUnitType, String search); Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey); + + List getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java index c29f54c5ff..314c5d7672 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java @@ -5,10 +5,11 @@ import com.epmet.commons.dynamic.datasource.annotation.DataSource; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.heart.IcCommunitySelfOrganizationDao; import com.epmet.dataaggre.dao.heart.IcPartyUnitDao; +import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; import com.epmet.dataaggre.service.heart.HeartService; -import com.epmet.dto.result.PartyMemberUserIdsResultDTO; import com.github.pagehelper.PageHelper; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -57,6 +58,11 @@ public class HeartServiceImpl implements HeartService { return communitySelfOrganizationDao.selectCount(query); } + @Override + public List getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO) { + return communitySelfOrganizationDao.getCommunitySelOrgInfos(formDTO); + } + private LambdaQueryWrapper constructCommunityOrgQueryWrapper( String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 0a34e94edc..4f9216b5d4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -15,6 +15,8 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; +import com.epmet.dataaggre.constant.OrgConstant; +import com.epmet.dataaggre.constant.TableConstant; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; @@ -23,11 +25,14 @@ import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; +import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.govproject.IcEventEntity; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; +import com.epmet.dataaggre.enums.MenusEnums; +import com.epmet.dataaggre.redis.GovCustomerMenuRedis; import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; @@ -35,6 +40,9 @@ import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.heart.HeartService; +import com.epmet.dto.GovMenuDTO; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; @@ -69,6 +77,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private GovOrgCoverageService govOrgCoverageService; + @Autowired + private GovCustomerMenuRedis govCustomerMenuRedis; + @Autowired private IcResiCategoryWarnService icResiCategoryWarnService; @@ -217,7 +228,146 @@ public class CoverageServiceImpl implements CoverageService { */ @Override public CoverageHomeSearchResultDTO coverageHomeSearch(CoverageHomeSearchFormDTO formDTO) { - return null; + String customerId = formDTO.getCustomerId(); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId()); + if (null == staffInfo){ + throw new EpmetException("查询工作人员失败："+formDTO.getUserId()); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + CoverageHomeSearchResultDTO result = new CoverageHomeSearchResultDTO(); + // 缓存的客户菜单 + List customerMenuList = govCustomerMenuRedis.getCustomerMenuList(customerId, 0, "gov_menu"); + // org库配置的 + List resources = govOrgCoverageService.getAllTypeCoverageByCustomerAndType(customerId, "resources"); + if (CollectionUtils.isEmpty(resources)){ + return result; + } + if (CollectionUtils.isEmpty(customerMenuList)){ + return result; + } + List tables = new ArrayList<>(); + customerMenuList.forEach(cm -> { + resources.forEach(r -> { + if (cm.getUrl().equals(r)){ + String tableName = MenusEnums.getValueByUrl(r); + if (StringUtils.isNotBlank(tableName)){ + tables.add(tableName); + } + } + }); + }); + if (CollectionUtils.isEmpty(tables)){ + return result; + } + if (StringUtils.isNotBlank(formDTO.getSearchType())){ + if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_USER)){ + PageInfo allIcUserPageInfo = getIcUserPageInfo(formDTO); + result.setUserInfos(allIcUserPageInfo.getList()); + result.setUserInfosTotal(allIcUserPageInfo.getTotal()); + }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_EVENT)){ + for (String resource : resources) { + if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ + PageInfo eventPageInfo = getEventInfo(formDTO); + result.setEventInfos(eventPageInfo.getList()); + result.setEventInfoTotal(eventPageInfo.getTotal()); + break; + } + } + }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ + + } + }else { + // 查询居民 + PageInfo allIcUserPageInfo = getIcUserPageInfo(formDTO); + result.setUserInfos(allIcUserPageInfo.getList()); + result.setUserInfosTotal(allIcUserPageInfo.getTotal()); + List reInfos = new ArrayList<>(); + for (String table : tables) { + switch (table){ + case TableConstant.IC_SUPERIOR_RESOURCE: + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO)); + List superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO); + if (!superiorResourceInfos.isEmpty()){ + reInfos.addAll(superiorResourceInfos); + } + break; + case TableConstant.IC_CITY_MANAGEMENT: + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO)); + List cityManageInfos = govOrgService.getCityManageInfos(formDTO); + if (!cityManageInfos.isEmpty()){ + reInfos.addAll(cityManageInfos); + } + break; + case TableConstant.IC_COMMUNITY_SELF_ORGANIZATION: + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> heartService.getCommunitySelOrgInfos(formDTO)); + List communitySelOrgInfos = heartService.getCommunitySelOrgInfos(formDTO); + if (!communitySelOrgInfos.isEmpty()){ + reInfos.addAll(communitySelOrgInfos); + } + break; + case TableConstant.IC_DANGEROUS_CHEMICALS: + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); + List dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO); + if (!dangerousChemicalsInfos.isEmpty()){ + reInfos.addAll(dangerousChemicalsInfos); + } + break; + case TableConstant.IC_ENTERPRISE: + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO)); + List enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO); + if (!enterpriseInfos.isEmpty()){ + reInfos.addAll(enterpriseInfos); + } + break; + case TableConstant.IC_PUBLIC_SERVICE: + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO)); + List publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO); + if (!publicServiceInfos.isEmpty()){ + reInfos.addAll(publicServiceInfos); + } + break; + case TableConstant.IC_EVENT: + PageInfo eventPageInfo = getEventInfo(formDTO); + result.setEventInfos(eventPageInfo.getList()); + result.setEventInfoTotal(eventPageInfo.getTotal()); + break; + default: + break; + } + } + result.setResourceInfos(reInfos); + } + return result; + } + + public PageInfo getIcUserPageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icResiService.getAllIcUser(formDTO)); + }else { + List allIcUser = icResiService.getAllIcUser(formDTO); + result.setTotal(Long.valueOf(String.valueOf(allIcUser.size()))); + result.setList(allIcUser); + } + return result; + } + + /** + * Desc: 事件查询 + * @param formDTO + * @author zxc + * @date 2022/7/28 16:03 + */ + public PageInfo getEventInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govProjectService.getEventInfos(formDTO)); + }else { + List eventInfos = govProjectService.getEventInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(eventInfos.size()))); + result.setList(eventInfos); + } + return result; } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryStatsConfigService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryStatsConfigService.java new file mode 100644 index 0000000000..5910c9d9f1 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/opercustomize/IcResiCategoryStatsConfigService.java @@ -0,0 +1,9 @@ +package com.epmet.dataaggre.service.opercustomize; + +/** + * @Author zxc + * @DateTime 2022/7/27 17:20 + * @DESC + */ +public interface IcResiCategoryStatsConfigService { +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 58fc07506f..1a461c213a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -151,4 +151,24 @@ + + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml index 8cdd63a520..21c839a27e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml @@ -3,4 +3,96 @@ + + + + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml index 599659a43b..c756992558 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml @@ -3,6 +3,15 @@ + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml index ad5afc48d2..f35dd89392 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml @@ -1,6 +1,21 @@ - + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml index c785e28c0d..4e660c06dd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml @@ -2,4 +2,22 @@ + + + \ No newline at end of file From 4a70c115983a94f5d63ea036c286355723724b54 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 16:11:52 +0800 Subject: [PATCH 162/288] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E4=BA=BA=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/ResiCategoryEnum.java | 42 +++++++++++++++++++ .../epmetuser/impl/IcResiServiceImpl.java | 37 ++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java new file mode 100644 index 0000000000..b7ab6cbddc --- /dev/null +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java @@ -0,0 +1,42 @@ +package com.epmet.commons.tools.enums; + +public enum ResiCategoryEnum { + IS_PARTY("IS_PARTY", "党员"), + IS_DBH("IS_DBH", "低保人员"), + IS_ENSURE_HOUSE("IS_ENSURE_HOUSE", "保障房人员"), + IS_UNEMPLOYED("IS_UNEMPLOYED", "失业人员"), + IS_YLFN("IS_YLFN", "育龄妇女"), + IS_VETERANS("IS_VETERANS", "退役军人"), + IS_UNITED_FRONT("IS_UNITED_FRONT", "统战人员"), + IS_XFRY("IS_XFRY", "信访人员"), + IS_VOLUNTEER("IS_VOLUNTEER", "志愿者"), + IS_OLD_PEOPLE("IS_OLD_PEOPLE", "老年人"), + IS_KC("IS_KC", "空巢"), + IS_SD("IS_SD", "失独人员"), + IS_SN("IS_SN", "失能"), + IS_SZ("IS_SZ", "失智"), + IS_CJ("IS_CJ", "残疾"), + IS_DB("IS_DB", "大病"), + IS_MB("IS_MB", "慢病"), + IS_SPECIAL("IS_SPECIAL", "特殊人群"); + private String colName; + private String label; + + + ResiCategoryEnum(String colName, String label) { + this.colName = colName; + this.label = label; + } + + public String getColName() { + return colName; + } + + public String getLabel() { + return label; + } + + public void setLabel(String label) { + this.label = label; + } +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index 74ba309792..7525d751d6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -2,6 +2,7 @@ package com.epmet.dataaggre.service.epmetuser.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.commons.tools.enums.ResiCategoryEnum; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmetuser.IcResiUserDao; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; @@ -78,6 +79,42 @@ public class IcResiServiceImpl implements IcResiService { query.eq(IcResiUserEntity::getIsSn, true); } else if ("resi_szry".equals(categoryKey)) { query.eq(IcResiUserEntity::getIsSz, true); + } else if (ResiCategoryEnum.IS_PARTY.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsParty, true); + } else if (ResiCategoryEnum.IS_DBH.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsDbh, true); + } else if (ResiCategoryEnum.IS_ENSURE_HOUSE.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsEnsureHouse, true); + } else if (ResiCategoryEnum.IS_UNEMPLOYED.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsUnemployed, true); + } else if (ResiCategoryEnum.IS_YLFN.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsYlfn, true); + } else if (ResiCategoryEnum.IS_VETERANS.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsVeterans, true); + } else if (ResiCategoryEnum.IS_UNITED_FRONT.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsUnitedFront, true); + } else if (ResiCategoryEnum.IS_XFRY.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsXfry, true); + } else if (ResiCategoryEnum.IS_VOLUNTEER.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsVolunteer, true); + } else if (ResiCategoryEnum.IS_OLD_PEOPLE.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsOldPeople, true); + } else if (ResiCategoryEnum.IS_KC.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsKc, true); + } else if (ResiCategoryEnum.IS_SD.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsSd, true); + } else if (ResiCategoryEnum.IS_SN.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsSn, true); + } else if (ResiCategoryEnum.IS_SZ.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsSz, true); + } else if (ResiCategoryEnum.IS_CJ.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsCj, true); + } else if (ResiCategoryEnum.IS_DB.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsDb, true); + } else if (ResiCategoryEnum.IS_MB.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsMb, true); + } else if (ResiCategoryEnum.IS_SPECIAL.getColName().equals(categoryKey)) { + query.eq(IcResiUserEntity::getIsSpecial, true); } if (StringUtils.isNotBlank(search)) { From 9c71c9779828309fb29a007905084bea77176f5c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 16:16:54 +0800 Subject: [PATCH 163/288] =?UTF-8?q?=E7=A4=BE=E4=BC=9A=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87=E3=80=81=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/CommunitySelfOrganizationListDTO.java | 16 ++++++++++++++++ .../mapper/IcCommunitySelfOrganizationDao.xml | 5 ++++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java index 39552f7654..790c8c2a44 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/result/CommunitySelfOrganizationListDTO.java @@ -100,6 +100,22 @@ public class CommunitySelfOrganizationListDTO implements Serializable { * 积分 */ private Integer score; + + /** + * 同步状态【已同步:sync 未同步:not_sync】 + */ + private String syncType; + + /** + * 部门ID customer_department.id + */ + private String deptId; + + /** + * 部门下工作人员Id + */ + private String deptStaffId; + /** * 社区自组织人员 */ diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml index 872caf9999..1ab8c2264b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/mapper/IcCommunitySelfOrganizationDao.xml @@ -63,7 +63,10 @@ so.LATITUDE AS latitude, so.ADDRESS as address, so.ID as orgId, - so.remark + so.remark, + so.sync_type AS syncType, + so.dept_id AS deptId, + so.dept_staff_id AS deptStaffId FROM ic_community_self_organization so WHERE so.DEL_FLAG = 0 From 36a89abc4a4ea5e853e803751dc6659d79156556 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 28 Jul 2022 16:27:32 +0800 Subject: [PATCH 164/288] =?UTF-8?q?=E6=BC=8F=E6=8F=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/govorg/GovOrgCoverageService.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index b13cd75b74..26faa47e81 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -135,8 +135,6 @@ public interface GovOrgCoverageService { */ IcCoverageCategoryDictEntity selectByCategoryKey(String categoryKey); - List listCoverageCategoryEntities(String coverageType); - /** * Desc: 根据客户ID和数据类型获取字典对应的url * @param customerId From bb57374c87c364f531ad3d4d69258396d2d8b249 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 28 Jul 2022 16:28:16 +0800 Subject: [PATCH 165/288] =?UTF-8?q?z=E7=BB=BC=E5=90=88=E6=B2=BB=E7=90=86?= =?UTF-8?q?=E4=BA=BA=E7=BE=A4=EF=BC=8C=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=EF=BC=8C=E8=BF=99=E4=BA=9B=E5=B1=85=E6=B0=91=EF=BC=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=A7=93=E5=90=8D(=E8=BA=AB=E4=BB=BD=E8=AF=81?= =?UTF-8?q?=E5=8F=B7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/constant/StrConstant.java | 3 +++ .../epmetuser/result/IcResiInfoResultDTO.java | 1 + .../service/impl/CoverageServiceImpl.java | 17 +++++++---------- .../mapper/epmetuser/IcResiUserDao.xml | 2 +- 4 files changed, 12 insertions(+), 11 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 7d2ad8ec03..b89a521218 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -112,4 +112,7 @@ public interface StrConstant { String NO = "否"; String ELLIPSIS="......"; + + String BRACKET_LEFT="("; + String BRACKET_RIGNT=")"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java index 659805383f..a4ba26b37b 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiInfoResultDTO.java @@ -10,4 +10,5 @@ public class IcResiInfoResultDTO { private String id; private String name; private String buildId; + private String idNum; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 4f9216b5d4..3ec40ef572 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -14,36 +14,31 @@ import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache; import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.constant.OrgConstant; -import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; -import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.constant.TableConstant; +import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; -import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; -import com.epmet.dataaggre.dto.govorg.result.IcEnterisePatrolResultDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.entity.govorg.*; import com.epmet.dataaggre.entity.govproject.IcEventEntity; import com.epmet.dataaggre.entity.heart.IcCommunitySelfOrganizationEntity; import com.epmet.dataaggre.entity.heart.IcPartyUnitEntity; +import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.enums.MenusEnums; import com.epmet.dataaggre.redis.GovCustomerMenuRedis; -import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.service.CoverageService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.heart.HeartService; +import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; import com.epmet.dto.GovMenuDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.epmet.dataaggre.service.opercustomize.IcResiCategoryWarnService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.MapUtils; @@ -507,7 +502,8 @@ public class CoverageServiceImpl implements CoverageService { String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency); return new CoverageAnalisisDataListResultDTO( - re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? re.getName() : null, + re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, + re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT), coordinates[1], coordinates[0]); }).collect(Collectors.toList()); @@ -521,7 +517,8 @@ public class CoverageServiceImpl implements CoverageService { return new CoverageAnalisisDataListResultDTO( re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - isPage ? re.getName() : null, coordinates[1], coordinates[0]); + re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdNum()).concat(StrConstant.BRACKET_RIGNT), + coordinates[1], coordinates[0]); }).collect(Collectors.toList()); } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 1a461c213a..dfcd87920f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -38,7 +38,7 @@ SELECT - customer_id AS customerId + customer_id AS customerId, + dept_type AS deptType FROM customer_department WHERE From 452b6d75f5e5035ba2baf268ddbf46a7f31e3f65 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 28 Jul 2022 16:37:27 +0800 Subject: [PATCH 167/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96-=E5=B7=A6=E4=BE=A7=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E5=A2=9E=E5=8A=A0menu=E6=8E=A7=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 34 ++++++++----------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 4f9216b5d4..d916e9cb13 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -83,21 +83,6 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private IcResiCategoryWarnService icResiCategoryWarnService; - /** - * 场所类型常量 - */ - public static final String PLACE_TYPE_RESI = "resi"; - public static final String PLACE_TYPE_SPECIAL_RESI = "special_resi"; - public static final String PLACE_TYPE_EVENT= "event"; - public static final String PLACE_TYPE_CITY_MANAGEMENT= "city_management"; - public static final String PLACE_TYPE_COMUNITY_ORG= "community_org"; - public static final String PLACE_TYPE_DANGEROUS_CHEMICALS= "dangerous_chemicals"; - public static final String PLACE_TYPE_ENTERPRISE_PARTROL= "enterprise_patrol"; - public static final String PLACE_TYPE_GROUP_RENT= "group_rent"; - public static final String PLACE_TYPE_PUBLIC_SERVICE= "public_service"; - public static final String PLACE_TYPE_SUPERIOR_RESOURCE= "superior_resource"; - public static final String PLACE_TYPE_PARTY_UNIT= "party_unit"; - // 1：出租 0：自住 2：闲置 3：未售出 public static final Integer HOUSE_RENT_FLAG_RENT = 1; @@ -736,6 +721,13 @@ public class CoverageServiceImpl implements CoverageService { @Override public List listGovernedTargetCategories() { + List menuUrls = new ArrayList<>(128); + + List menus = govCustomerMenuRedis.getCustomerMenuList(EpmetRequestHolder.getLoginUserCustomerId(), 0, "gov_menu"); + if (CollectionUtils.isNotEmpty(menus)) { + menus.stream().forEach(m -> menuUrls.add(m.getUrl())); + } + // 1.从表中取数据出来 List targetCategories = govOrgCoverageService.listGovernedTargetCategoryEntities(); @@ -750,8 +742,10 @@ public class CoverageServiceImpl implements CoverageService { String placeTypeInAnalysis = rc.getPlaceTypeInAnalysis(); if (StringUtils.isEmpty(placeTypeInAnalysis)) { // 只有一层，没有子级 - results.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), - rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); + if (menuUrls.contains(rc.getMenuUrl()) || "all".equals(rc.getMenuUrl())) { + results.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); + } } else { // 有子级，需要使用placeTypeInAnalysis分组 List targets = placeTypeMap.get(placeTypeInAnalysis); @@ -759,8 +753,10 @@ public class CoverageServiceImpl implements CoverageService { targets = new ArrayList<>(); placeTypeMap.put(placeTypeInAnalysis, targets); } - targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), - rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); + if (menuUrls.contains(rc.getMenuUrl()) || "all".equals(rc.getMenuUrl())) { + targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); + } } }); From c632e652b5f0fa656d34bcfb2ab370452f7ac565 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 17:07:20 +0800 Subject: [PATCH 168/288] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/controller/GovOrgController.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index e1538f0168..3e1b51fd32 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -483,7 +483,7 @@ public class GovOrgController { ExcelWriter excelWriter = null; AtomicInteger i = new AtomicInteger(1); try { - String fileName = "组织项目统计.xlsx"; + String fileName = "组织事件统计.xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectDetailExcel.class).build(); PageData page = null; WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); @@ -493,6 +493,15 @@ public class GovOrgController { list.forEach(item -> { item.setIndex(i.getAndIncrement()); }); + OrgProjectDetailExcel sum = new OrgProjectDetailExcel(); + sum.setIndex(i.getAndIncrement()); + sum.setOrgName("合计"); + sum.setMemberCount(list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum()); + sum.setProjectCount(list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum()); + sum.setClosedCount(list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum()); + sum.setProjectAve(list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum()); + sum.setClosedAve(list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum()); + list.add(sum); excelWriter.write(list, writeSheet); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); @@ -523,7 +532,7 @@ public class GovOrgController { ExcelWriter excelWriter = null; AtomicInteger i = new AtomicInteger(1); try { - String fileName = "网格员项目统计.xlsx"; + String fileName = "网格员事件统计.xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), MemberProjectInfoExcel.class).build(); PageData page = null; WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); From ceaec34b3adf1401fdef18fdae0562df5f9d8b0b Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 17:19:16 +0800 Subject: [PATCH 169/288] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/GovOrgController.java | 21 +++++++++++-------- .../govorg/impl/GovOrgServiceImpl.java | 2 +- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 3e1b51fd32..83ae19c53b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -487,24 +487,27 @@ public class GovOrgController { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectDetailExcel.class).build(); PageData page = null; WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + OrgProjectDetailExcel sum = new OrgProjectDetailExcel(); do { page = govOrgService.orgProjectDetailList(tokenDto, formDTO); List list = ConvertUtils.sourceToTarget(page.getList(), OrgProjectDetailExcel.class); list.forEach(item -> { item.setIndex(i.getAndIncrement()); }); - OrgProjectDetailExcel sum = new OrgProjectDetailExcel(); - sum.setIndex(i.getAndIncrement()); - sum.setOrgName("合计"); - sum.setMemberCount(list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum()); - sum.setProjectCount(list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum()); - sum.setClosedCount(list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum()); - sum.setProjectAve(list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum()); - sum.setClosedAve(list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum()); - list.add(sum); + + sum.setMemberCount(sum.getMemberCount() + list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum()); + sum.setProjectCount(sum.getProjectCount() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum()); + sum.setClosedCount(sum.getClosedCount() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum()); + sum.setProjectAve(sum.getProjectAve() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum()); + sum.setClosedAve(sum.getClosedAve() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum()); excelWriter.write(list, writeSheet); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); + sum.setIndex(i.getAndIncrement()); + sum.setOrgName("合计"); + List list = new ArrayList<>(); + list.add(sum); + excelWriter.write(list, writeSheet); } catch (EpmetException e) { response.reset(); response.setCharacterEncoding("UTF-8"); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index dc3c3a5d8b..8aa7467ca8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1264,7 +1264,7 @@ public class GovOrgServiceImpl implements GovOrgService { public PageData memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); PageData result; - if (StringUtils.isBlank(formDTO.getAgencyId())) { + if (StringUtils.isBlank(formDTO.getOrgId())) { CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); From 70f27851439fcb5a72d35ed2825618935a592359 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 17:21:36 +0800 Subject: [PATCH 170/288] =?UTF-8?q?=E7=BB=84=E7=BB=87=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1,=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/excel/MemberProjectInfoExcel.java | 4 ++-- .../epmet/dataaggre/excel/OrgProjectDetailExcel.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java index e7b5e2045c..a742bd1546 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/MemberProjectInfoExcel.java @@ -30,11 +30,11 @@ public class MemberProjectInfoExcel { @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private Integer projectCount; + private Integer projectCount = 0; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private Integer closedCount; + private Integer closedCount = 0; } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java index 91b30e0e89..49aeaf9317 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/OrgProjectDetailExcel.java @@ -26,22 +26,22 @@ public class OrgProjectDetailExcel { @ColumnWidth(20) @ExcelProperty(value = "网格员数",order = 3) - private Integer memberCount; + private Integer memberCount = 0; @ColumnWidth(20) @ExcelProperty(value = "上报数量",order = 4) - private Integer projectCount; + private Integer projectCount = 0; @ColumnWidth(20) @ExcelProperty(value = "办结数",order = 5) - private Integer closedCount; + private Integer closedCount = 0; @ColumnWidth(20) @ExcelProperty(value = "人均上报",order = 6) - private Integer projectAve; + private Integer projectAve = 0; @ColumnWidth(20) @ExcelProperty(value = "人均办结",order = 7) - private Integer closedAve; + private Integer closedAve = 0; } \ No newline at end of file From 390d0a6408196b56cc49c021a5d87a9adb373178 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Thu, 28 Jul 2022 17:24:00 +0800 Subject: [PATCH 171/288] =?UTF-8?q?=E5=8F=88=E6=9A=82=E6=8F=90=E4=BA=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/IcCityManagementDao.java | 5 ++ .../service/impl/CoverageServiceImpl.java | 70 ++++++++++++------- .../mapper/govorg/IcCityManagementDao.xml | 70 +++++++++++++++++-- .../mapper/govproject/IcEventDao.xml | 4 +- 4 files changed, 118 insertions(+), 31 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java index 5fcc8ac3c2..04746db059 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCityManagementDao.java @@ -24,6 +24,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getCityManageInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取公共服务信息 @@ -32,6 +33,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取重点危化品企业信息 @@ -40,6 +42,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO); + Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取优势资源信息 @@ -48,6 +51,7 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取企事业单位巡查信息 @@ -56,5 +60,6 @@ public interface IcCityManagementDao extends BaseDao { * @date 2022/7/28 10:22 */ List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); + Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 0d2b4a922a..5a050263b6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -244,17 +244,23 @@ public class CoverageServiceImpl implements CoverageService { PageInfo allIcUserPageInfo = getIcUserPageInfo(formDTO); result.setUserInfos(allIcUserPageInfo.getList()); result.setUserInfosTotal(allIcUserPageInfo.getTotal()); - }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_EVENT)){ + }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ + for (String resource : resources) { - if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ - PageInfo eventPageInfo = getEventInfo(formDTO); - result.setEventInfos(eventPageInfo.getList()); - result.setEventInfoTotal(eventPageInfo.getTotal()); - break; + if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){ + + }else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){ + } } - }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ - } }else { // 查询居民 @@ -263,59 +269,73 @@ public class CoverageServiceImpl implements CoverageService { result.setUserInfosTotal(allIcUserPageInfo.getTotal()); List reInfos = new ArrayList<>(); for (String table : tables) { + if (formDTO.getIsPage() && reInfos.size() == formDTO.getPageSize()){ + break; + } + Integer flag = formDTO.getPageSize() - reInfos.size(); switch (table){ case TableConstant.IC_SUPERIOR_RESOURCE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO)); List superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO); - if (!superiorResourceInfos.isEmpty()){ + if (formDTO.getIsPage() && superiorResourceInfos.size() > flag){ + reInfos.addAll(superiorResourceInfos.subList(NumConstant.ZERO, flag)); + }else { reInfos.addAll(superiorResourceInfos); } break; case TableConstant.IC_CITY_MANAGEMENT: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO)); List cityManageInfos = govOrgService.getCityManageInfos(formDTO); - if (!cityManageInfos.isEmpty()){ + if (formDTO.getIsPage() && cityManageInfos.size() > flag){ + reInfos.addAll(cityManageInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(cityManageInfos); } break; case TableConstant.IC_COMMUNITY_SELF_ORGANIZATION: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> heartService.getCommunitySelOrgInfos(formDTO)); List communitySelOrgInfos = heartService.getCommunitySelOrgInfos(formDTO); - if (!communitySelOrgInfos.isEmpty()){ + if (formDTO.getIsPage() && communitySelOrgInfos.size() > flag){ + reInfos.addAll(communitySelOrgInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(communitySelOrgInfos); } break; case TableConstant.IC_DANGEROUS_CHEMICALS: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); List dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO); - if (!dangerousChemicalsInfos.isEmpty()){ + if (formDTO.getIsPage() && dangerousChemicalsInfos.size() > flag){ + reInfos.addAll(dangerousChemicalsInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(dangerousChemicalsInfos); } break; case TableConstant.IC_ENTERPRISE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO)); List enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO); - if (!enterpriseInfos.isEmpty()){ + if (formDTO.getIsPage() && enterpriseInfos.size() > flag){ + reInfos.addAll(enterpriseInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(enterpriseInfos); } break; case TableConstant.IC_PUBLIC_SERVICE: - PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO)); List publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO); - if (!publicServiceInfos.isEmpty()){ + if (formDTO.getIsPage() && publicServiceInfos.size() > flag){ + reInfos.addAll(publicServiceInfos.subList(NumConstant.ZERO,flag)); + }else { reInfos.addAll(publicServiceInfos); } break; - case TableConstant.IC_EVENT: - PageInfo eventPageInfo = getEventInfo(formDTO); - result.setEventInfos(eventPageInfo.getList()); - result.setEventInfoTotal(eventPageInfo.getTotal()); - break; default: break; } } result.setResourceInfos(reInfos); + result.setResourceInfoTotal(Long.valueOf(String.valueOf(reInfos.size()))); + } + for (String resource : resources) { + if (MenusEnums.IC_EVENT.getUrl().equals(resource)){ + PageInfo eventPageInfo = getEventInfo(formDTO); + result.setEventInfos(eventPageInfo.getList()); + result.setEventInfoTotal(eventPageInfo.getTotal()); + break; + } } return result; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml index 21c839a27e..29476955de 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml @@ -20,7 +20,9 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') - AND `NAME` LIKE CONCAT('%',#{name},'%') + + AND `NAME` LIKE CONCAT('%',#{name},'%') + + + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml index f35dd89392..547ff69899 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml @@ -16,6 +16,8 @@ AND customer_id = #{customerId} AND DIFFICULT_POINT = '1' AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%') - AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + + AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + \ No newline at end of file From 257ec3c2be7f3d350833044c224fb3b172b037a0 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 17:35:52 +0800 Subject: [PATCH 172/288] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/DepartmentServiceImpl.java | 9 +++++---- .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 51ab136d05..8f71eb4716 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -328,6 +328,7 @@ public class DepartmentServiceImpl implements DepartmentService { } //查不到工作人员就直接返回 if (null == userResult.getData()) { + resultDTO.setType(true); return resultDTO; } @@ -497,13 +498,14 @@ public class DepartmentServiceImpl implements DepartmentService { if (!projectResult.success()) { throw new RenException("获取工作人员代办项目数据失败" + projectResult.getMsg()); } - if(projectResult.getData().size()>NumConstant.ZERO){ - String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作",("party_unit".equals(formDTO.getDeptType())?"联建单位":"社会自组织")); + if (projectResult.getData().size() > NumConstant.ZERO) { + String msg = String.format("当前%s下负责人存在未办结的项目，请先将待处理项目办结后再操作", ("party_unit".equals(formDTO.getDeptType()) ? "联建单位" : "社会自组织")); resultDTO.setMsg(msg); + return resultDTO; } //2.无代办项目的则删除部门、工作人员信息、修改联建单位/社会自组织业务数据 //2-1.删除部门 - customerDepartmentDao.deleteById(formDTO.getId()); + customerDepartmentDao.deleteById(formDTO.getDeptId()); //2-2.删除部门人员关系数据 LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(CustomerStaffDepartmentEntity::getDepartmentId, formDTO.getDeptId()); @@ -511,7 +513,6 @@ public class DepartmentServiceImpl implements DepartmentService { customerStaffDepartmentDao.delete(query); //2-3.删除人员注册关系数据 LambdaQueryWrapper StaffOrgRelation = new LambdaQueryWrapper<>(); - StaffOrgRelation.eq(StaffOrgRelationEntity::getOrgId, formDTO.getDeptId()); StaffOrgRelation.eq(StaffOrgRelationEntity::getStaffId, formDTO.getDeptStaffId()); staffOrgRelationDao.delete(StaffOrgRelation); //2-4.删除工作人员数据 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 b25d014fc5..8fcc9b5338 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 @@ -886,9 +886,10 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl resultRole = govAccessFeignClient.getGovRole(roleDTO); - if (!resultRole.success()) { + if (!resultRole.success() || null == resultRole.getData()) { throw new RenException("人员添加失败" + resultRole.getMsg()); } List newRoles = new ArrayList<>(); From 5177ad45412148cf37161eba3796f560bdb5aee7 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Thu, 28 Jul 2022 17:37:09 +0800 Subject: [PATCH 173/288] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index dc505b1985..6b7db20347 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -317,6 +317,7 @@ lb://gov-access-server + From 8171753a5c0aedbe876cb1b127331edb7e1b5cd6 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 17:46:03 +0800 Subject: [PATCH 174/288] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E7=BB=9F=E8=AE=A1=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 3 +++ .../src/main/resources/mapper/datastats/DatsStatsDao.xml | 2 ++ .../src/main/resources/mapper/epmetuser/StaffRoleDao.xml | 2 ++ 3 files changed, 7 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 8aa7467ca8..6f5682e99f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1165,6 +1165,9 @@ public class GovOrgServiceImpl implements GovOrgService { formDTO.setEndDate(dateId); } CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); + if (null == agencyEntity) { + return null; + } PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); long total = 0; if (OrgConstant.COMMUNITY.equals(agencyEntity.getLevel()) && NumConstant.ONE_STR.equals(formDTO.getType())) { diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml index a473f03daf..ffee14d53f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/datastats/DatsStatsDao.xml @@ -1253,6 +1253,8 @@ DEL_FLAG = '0' AND GRID_ID = #{gridId} AND DATE_ID = #{dateId} + ORDER BY + CONVERT ( STAFF_NAME USING gbk ) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml index 9c5999aeb3..894a034659 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/StaffRoleDao.xml @@ -132,5 +132,7 @@ #{id} + ORDER BY + CONVERT ( c.REAL_NAME USING gbk ) \ No newline at end of file From c0ffb08f68b2ee997aac0b52fd90e639c209abae Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 28 Jul 2022 18:07:21 +0800 Subject: [PATCH 175/288] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/govorg/result/OrgProjectDetailResultDTO.java | 1 + .../dataaggre/service/govorg/impl/GovOrgServiceImpl.java | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java index 302e232d8d..8f8c980c61 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgProjectDetailResultDTO.java @@ -15,6 +15,7 @@ import java.io.Serializable; public class OrgProjectDetailResultDTO implements Serializable { private static final long serialVersionUID = 6333117500929136144L; private String orgId; + private String orgType; private String orgName; private Integer memberCount = 0; private Integer projectCount = 0; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 6f5682e99f..99318e966c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1166,7 +1166,7 @@ public class GovOrgServiceImpl implements GovOrgService { } CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); if (null == agencyEntity) { - return null; + return new PageData<>(Collections.emptyList(), NumConstant.ZERO); } PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()); long total = 0; @@ -1188,6 +1188,7 @@ public class GovOrgServiceImpl implements GovOrgService { resultList = gridList.stream().map(grid -> { OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); dto.setOrgId(grid.getId()); + dto.setOrgType(OrgConstant.GRID); dto.setOrgName(grid.getGridName()); if (projectMap.containsKey(grid.getId())) { dto.setProjectCount(projectMap.get(grid.getId())); @@ -1227,6 +1228,7 @@ public class GovOrgServiceImpl implements GovOrgService { resultList = agencyList.stream().map(agency -> { OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); dto.setOrgId(agency.getId()); + dto.setOrgType(OrgConstant.AGENCY); dto.setOrgName(agency.getOrganizationName()); if (projectMap.containsKey(agency.getId())) { dto.setProjectCount(projectMap.get(agency.getId()).getProjectTotal()); From 3678169c94f7a5d797354faff05ea7348c8ef7a4 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 28 Jul 2022 22:18:45 +0800 Subject: [PATCH 176/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96-=201.=E5=B0=86=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=E7=9A=84=E5=B7=A6=E5=8F=B3=E8=8F=9C=E5=8D=95=E8=B7=9Fmenu?= =?UTF-8?q?=E7=BB=91=E5=AE=9A;2.=E5=B9=B6=E4=B8=94=E5=B0=86=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=9C=8D=E5=8A=A1=E4=BA=BA=E7=BE=A4=E7=9A=84=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=EF=BC=8C=E4=BB=8Ecategory=5Fdict=E4=B8=AD=E5=8F=96?= =?UTF-8?q?=EF=BC=8C=E7=84=B6=E5=90=8E=E8=B7=9Foper=5Fcustomize.ic=5Fresi?= =?UTF-8?q?=5Fcategory=5Fwarn=5Fconfig=E4=B8=AD=E5=AF=B9=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 90 +++++++++++-------- 1 file changed, 52 insertions(+), 38 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 0d2b4a922a..38ad15d704 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -655,6 +655,14 @@ public class CoverageServiceImpl implements CoverageService { @Override public List listAnalysisResourceCategories() { + // 获取所有菜单的url + List menuUrls = new ArrayList<>(128); + + List menus = govCustomerMenuRedis.getCustomerMenuList(EpmetRequestHolder.getLoginUserCustomerId(), 0, "gov_menu"); + if (CollectionUtils.isNotEmpty(menus)) { + menus.stream().forEach(m -> menuUrls.add(m.getUrl())); + } + //结果集 ArrayList results = new ArrayList<>(); @@ -674,29 +682,31 @@ public class CoverageServiceImpl implements CoverageService { continue; } - // 2.根据menuUrl过滤 todo - - // 2.计算各类数量 todo - // 3.对上一步得到的数据进行分组，使用PLACE_TYPE_IN_ANALYSIS分组，然后放入placeType，这一列为空的说明不分组，直接属于coverage - categoryDictEntities.forEach(c -> { - if (StringUtils.isBlank(c.getPlaceTypeInAnalysis())) { + categoryDictEntities.forEach(category -> { + if (StringUtils.isBlank(category.getPlaceTypeInAnalysis())) { // 没有placetype的 - categoriesOfThisCoverage.getCategories() - .add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), c.getCategoryName(), - c.getCoverageType(), c.getPlaceType(), c.getQuantity())); + if ("all".equals(category.getMenuUrl()) || menuUrls.contains(category.getMenuUrl())) { + categoriesOfThisCoverage.getCategories() + .add(new AnalysisResourceCategoriesResult.Category(category.getCategoryKey(), category.getCategoryName(), + category.getCoverageType(), category.getPlaceType(), category.getQuantity())); + } } else { // 有placetype的 - AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(c.getPlaceTypeInAnalysis()); - if (placeType == null) { - placeType = new AnalysisResourceCategoriesResult.PlaceType( - c.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(c.getPlaceTypeInAnalysis()).getName(), c.getQuantity(), new ArrayList<>()); - placeTypeMap.put(c.getPlaceTypeInAnalysis(), placeType); + AnalysisResourceCategoriesResult.PlaceType placeType = placeTypeMap.get(category.getPlaceTypeInAnalysis()); + if ("all".equals(category.getMenuUrl()) || menuUrls.contains(category.getMenuUrl())) { + + if (placeType == null) { + placeType = new AnalysisResourceCategoriesResult.PlaceType( + category.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(category.getPlaceTypeInAnalysis()).getName(), category.getQuantity(), new ArrayList<>()); + placeTypeMap.put(category.getPlaceTypeInAnalysis(), placeType); + } + + placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(category.getCategoryKey(), + category.getCategoryName(), category.getCoverageType(), category.getPlaceType(), category.getQuantity())); + placeType.setQuantity(placeType.getQuantity() + category.getQuantity()); // todo 0改为category的count } - placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(c.getCategoryKey(), - c.getCategoryName(), c.getCoverageType(), c.getPlaceType(), c.getQuantity())); - placeType.setQuantity(placeType.getQuantity() + c.getQuantity()); // todo 0改为category的count } }); @@ -718,6 +728,7 @@ public class CoverageServiceImpl implements CoverageService { @Override public List listGovernedTargetCategories() { + // 获取所有菜单的url List menuUrls = new ArrayList<>(128); List menus = govCustomerMenuRedis.getCustomerMenuList(EpmetRequestHolder.getLoginUserCustomerId(), 0, "gov_menu"); @@ -732,11 +743,22 @@ public class CoverageServiceImpl implements CoverageService { return new ArrayList<>(); } + //2.从oper_customize.ic_resi_category_warn_config表中取18大类居民中需要预警的类出来 + List categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); + List resiCategories2Show = categoriesNeed2Warn.stream().map(wc -> wc.getColumnName()).collect(Collectors.toList()); + List results = new ArrayList<>(); - HashMap> placeTypeMap = new HashMap<>(); + HashMap> placeTypeTargetMap = new HashMap<>(); + HashMap placeTypeQuantityMap = new HashMap<>(); targetCategories.forEach(rc -> { String placeTypeInAnalysis = rc.getPlaceTypeInAnalysis(); + if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeTypeInAnalysis) && !resiCategories2Show.contains(rc.getCategoryKey())) { + // 因为公共服务-人群，是需要跟oper_customize.ic_resi_category_warn_config表对应，只显示warn=1的， + // 所以如果是被管理对象中的公共服务人群，如果不开启预警，就跳过；其他情况都放进去 + return; + } + if (StringUtils.isEmpty(placeTypeInAnalysis)) { // 只有一层，没有子级 if (menuUrls.contains(rc.getMenuUrl()) || "all".equals(rc.getMenuUrl())) { @@ -745,41 +767,33 @@ public class CoverageServiceImpl implements CoverageService { } } else { // 有子级，需要使用placeTypeInAnalysis分组 - List targets = placeTypeMap.get(placeTypeInAnalysis); - if (CollectionUtils.isEmpty(targets)) { - targets = new ArrayList<>(); - placeTypeMap.put(placeTypeInAnalysis, targets); - } if (menuUrls.contains(rc.getMenuUrl()) || "all".equals(rc.getMenuUrl())) { + List targets = placeTypeTargetMap.get(placeTypeInAnalysis); + if (CollectionUtils.isEmpty(targets)) { + targets = new ArrayList<>(); + placeTypeTargetMap.put(placeTypeInAnalysis, targets); + placeTypeQuantityMap.put(placeTypeInAnalysis, 0); + } targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); + + placeTypeQuantityMap.put(placeTypeInAnalysis, placeTypeQuantityMap.get(placeTypeInAnalysis) + rc.getQuantity()); } } }); - if (placeTypeMap.size() > 0) { - placeTypeMap.forEach((placeTypeInAnalysis, targetObjects) -> { + // 最后，把需要分组的"公共服务人群","综合治理人群"放到最后的结果列表中 + if (placeTypeTargetMap.size() > 0) { + placeTypeTargetMap.forEach((placeTypeInAnalysis, targetObjects) -> { AnalysisGovernedTargetsResult tr = new AnalysisGovernedTargetsResult(); tr.setPlaceType(placeTypeInAnalysis); + tr.setQuantity(placeTypeQuantityMap.get(placeTypeInAnalysis)); tr.setPlaceTypeName(CoveragePlaceTypeEnum.getEnum(placeTypeInAnalysis).getName()); tr.setChildren(targetObjects); results.add(tr); }); } - //2.从oper_customize.ic_resi_category_warn_config表中取18大类居民中需要预警的类出来 - List categoriesNeed2Warn = icResiCategoryWarnService.listResiCategoriesNeed2Warn(EpmetRequestHolder.getLoginUserCustomerId()); - List ggfwrqCategories = categoriesNeed2Warn.stream().map(wc -> - new AnalysisGovernedTargetsResult(wc.getColumnName(), wc.getTableName(), - CoverageEnums.GGFW.getKey(), CoveragePlaceTypeEnum.RESI.getCode(), CoveragePlaceTypeEnum.RESI.getName(), - 0, new ArrayList<>())).collect(Collectors.toList()); - - AnalysisGovernedTargetsResult ggfwRq = new AnalysisGovernedTargetsResult(); - ggfwRq.setPlaceType(CoveragePlaceTypeEnum.RESI.getCode()); - ggfwRq.setPlaceTypeName(CoveragePlaceTypeEnum.RESI.getName()); - ggfwRq.setChildren(ggfwrqCategories); - - results.add(ggfwRq); return results; } From 2c9d66709c9b73ff95e2e5fcdaf4ab7c900d8205 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 08:43:43 +0800 Subject: [PATCH 177/288] =?UTF-8?q?=E5=8F=88=E6=9A=82=E6=8F=90=E4=BA=86?= =?UTF-8?q?=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../heart/IcCommunitySelfOrganizationDao.java | 1 + .../service/govorg/GovOrgService.java | 5 + .../govorg/impl/GovOrgServiceImpl.java | 25 ++++ .../dataaggre/service/heart/HeartService.java | 1 + .../service/heart/impl/HeartServiceImpl.java | 5 + .../service/impl/CoverageServiceImpl.java | 112 +++++++++++++++++- .../heart/IcCommunitySelfOrganizationDao.xml | 14 ++- 7 files changed, 159 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java index 2aab1d0be0..b0adcb3773 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/heart/IcCommunitySelfOrganizationDao.java @@ -35,5 +35,6 @@ import java.util.List; public interface IcCommunitySelfOrganizationDao extends BaseDao { List getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index adc04ab316..8f0faeb52e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -228,6 +228,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getCityManageInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取公共服务信息 @@ -236,6 +237,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取重点危化品企业信息 @@ -244,6 +246,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO); + Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取优势资源信息 @@ -252,6 +255,7 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO); + Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO); /** * Desc: 【资源】获取企事业单位巡查信息 @@ -260,5 +264,6 @@ public interface GovOrgService { * @date 2022/7/28 10:22 */ List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); + Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 4eaab080a5..1cf12a56dd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1135,23 +1135,48 @@ public class GovOrgServiceImpl implements GovOrgService { return cityManagementDao.getCityManageInfos(formDTO); } + @Override + public Integer getCityManageInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getCityManageInfosCount(formDTO); + } + @Override public List getPublicServiceInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getPublicServiceInfos(formDTO); } + @Override + public Integer getPublicServiceInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getPublicServiceInfosCount(formDTO); + } + @Override public List getDangerousChemicalsInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getDangerousChemicalsInfos(formDTO); } + @Override + public Integer getDangerousChemicalsInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getDangerousChemicalsInfosCount(formDTO); + } + @Override public List getSuperiorResourceInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getSuperiorResourceInfos(formDTO); } + @Override + public Integer getSuperiorResourceInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getSuperiorResourceInfosCount(formDTO); + } + @Override public List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getEnterpriseInfos(formDTO); } + + @Override + public Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO) { + return cityManagementDao.getEnterpriseInfosCount(formDTO); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java index d97044b718..03d6de4431 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/HeartService.java @@ -44,4 +44,5 @@ public interface HeartService { Integer countCommunityOrgEntities(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey); List getCommunitySelOrgInfos(CoverageHomeSearchFormDTO formDTO); + Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java index 314c5d7672..7af8676a08 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/heart/impl/HeartServiceImpl.java @@ -63,6 +63,11 @@ public class HeartServiceImpl implements HeartService { return communitySelfOrganizationDao.getCommunitySelOrgInfos(formDTO); } + @Override + public Integer getCommunitySelOrgInfosCount(CoverageHomeSearchFormDTO formDTO) { + return communitySelfOrganizationDao.getCommunitySelOrgInfosCount(formDTO); + } + private LambdaQueryWrapper constructCommunityOrgQueryWrapper( String customerId, String agencyId, String staffOrgIds, String search, String categoryKey) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 1b94a0f270..ee4a6682fe 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -245,14 +245,24 @@ public class CoverageServiceImpl implements CoverageService { result.setUserInfos(allIcUserPageInfo.getList()); result.setUserInfosTotal(allIcUserPageInfo.getTotal()); }else if (formDTO.getSearchType().equals(OrgConstant.SEARCH_TYPE_RESOURCE)){ - + Integer total = NumConstant.ZERO; + Integer start = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + Integer end = start + formDTO.getPageSize(); + Integer flag; for (String resource : resources) { if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){ - + Integer superiorResourceInfosCount = govOrgService.getSuperiorResourceInfosCount(formDTO); + total = total + superiorResourceInfosCount; + if (superiorResourceInfosCount > start){ + + } }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){ + Integer cityManageInfosCount = govOrgService.getCityManageInfosCount(formDTO); + total = total + cityManageInfosCount; }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){ - + Integer communitySelOrgInfosCount = heartService.getCommunitySelOrgInfosCount(formDTO); + total = total + communitySelOrgInfosCount; }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){ }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){ @@ -340,6 +350,102 @@ public class CoverageServiceImpl implements CoverageService { return result; } + /** + * Desc: 【资源】优势资源查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getSuperiorResourcePageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getSuperiorResourceInfos(formDTO)); + }else { + List superiorResourceInfos = govOrgService.getSuperiorResourceInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(superiorResourceInfos.size()))); + result.setList(superiorResourceInfos); + } + return result; + } + + /** + * Desc: 【资源】城市管理查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getCityManagePageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getCityManageInfos(formDTO)); + }else { + List cityManageInfos = govOrgService.getCityManageInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(cityManageInfos.size()))); + result.setList(cityManageInfos); + } + return result; + } + + /** + * Desc: 【资源】公共服务查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getPublicServicePageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getPublicServiceInfos(formDTO)); + }else { + List publicServiceInfos = govOrgService.getPublicServiceInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(publicServiceInfos.size()))); + result.setList(publicServiceInfos); + } + return result; + } + + /** + * Desc: 【资源】重点危化品企业查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getDangerousChemicalsPageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); + }else { + List dangerousChemicalsInfos = govOrgService.getDangerousChemicalsInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(dangerousChemicalsInfos.size()))); + result.setList(dangerousChemicalsInfos); + } + return result; + } + + /** + * Desc: 【资源】企事业单位查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:37 + */ + public PageInfo getEnterpriseInfosPageInfo (CoverageHomeSearchFormDTO formDTO){ + PageInfo result = new PageInfo<>(); + if (formDTO.getIsPage()){ + result = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> govOrgService.getEnterpriseInfos(formDTO)); + }else { + List enterpriseInfos = govOrgService.getEnterpriseInfos(formDTO); + result.setTotal(Long.valueOf(String.valueOf(enterpriseInfos.size()))); + result.setList(enterpriseInfos); + } + return result; + } + + /** + * Desc: 居民信息查询 + * @param formDTO + * @author zxc + * @date 2022/7/29 08:34 + */ public PageInfo getIcUserPageInfo (CoverageHomeSearchFormDTO formDTO){ PageInfo result = new PageInfo<>(); if (formDTO.getIsPage()){ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml index 4e660c06dd..b374071590 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml @@ -18,6 +18,18 @@ WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} AND CONCAT(PIDS,':',ORG_ID) LIKE CONCAT('%',#{orgId},'%') - AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%') + + AND ORGANIZATION_NAME LIKE CONCAT('%',#{name},'%') + + + \ No newline at end of file From 973d88fd9d87b4294b867ce931349dbe859b0d76 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 09:14:25 +0800 Subject: [PATCH 178/288] duanxin --- .../impl/IcServiceRecordV2ServiceImpl.java | 5 +++-- .../impl/IcUserDemandRecServiceImpl.java | 4 ++-- .../epmet/constant/SmsTemplateConstant.java | 22 ++++++++++++++----- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java index 13937dd7a5..cf208a032e 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java @@ -176,9 +176,10 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl paramMap = new HashMap<>(); - paramMap.put("content", String.format("%s发起一个【%s】服务，请服务完成后尽快反馈，谢谢合作。", staffInfoCacheResult.getAgencyName(), serviceName)); + paramMap.put("name",staffInfoCacheResult.getAgencyName()); + paramMap.put("serviceName",serviceName); sms.setParamMap(paramMap); smsList.add(sms); messageOpenFeignClient.sendMsg(smsList); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index 355ca9f008..e7863747c5 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -453,9 +453,9 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl paramMap = new HashMap<>(); - paramMap.put("content", String.format("%s给您指派了一个新的需求，请查看", staffInfoCacheResult.getAgencyName())); + paramMap.put("name",staffInfoCacheResult.getAgencyName()); sms.setParamMap(paramMap); smsList.add(sms); messageOpenFeignClient.sendMsg(smsList); diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java index 225e61bacc..3f1ec288ac 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/constant/SmsTemplateConstant.java @@ -39,10 +39,22 @@ public interface SmsTemplateConstant { String PROJECT_OVERDUE = "SMS_206885207"; /** - * 通用的短信模板，翻出来的内容 - *【党群e事通】:XXXXX - * 参数key：content + * 模板名称 + * 数字社区-服务方接收消息模板 + * 模板CODE + * SMS_247205033 + * 模板内容 + * ${nane}发起一个${serviceName}服务，请服务完成后尽快反馈，谢谢合作。 */ - // todo - String COMMON_SMS_TEM=""; + String IC_SERVICE_TEM="SMS_247205033"; + + /** + * 模板名称 + * 数字社区-需求服务方接收消息模板 + * 模板CODE + * SMS_247645013 + * 模板内容 + * ${name}给您指派了一个新的需求，请服务完成后尽快反馈，谢谢合作。 + */ + String DEMAND_SERVICE_TEM="SMS_247645013"; } From b2713613d88c8a4626d33514bd869bba16aefc8d Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Jul 2022 09:41:27 +0800 Subject: [PATCH 179/288] =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=BC=96=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java index 18c2f11420..67fd29285b 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java @@ -162,7 +162,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl 10) { entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10))); } else { From d776d6aa55b1befc52560963f37ce1df2961bd69 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 09:41:48 +0800 Subject: [PATCH 180/288] =?UTF-8?q?=E5=B1=85=E6=B0=91=E3=80=81=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=E3=80=81=E8=B5=84=E6=BA=90=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/CoverageHomeSearchFormDTO.java | 4 + .../dto/govorg/form/SearchDetailFormDTO.java | 39 ++++++++ .../controller/CoverageController.java | 28 +++++- .../dataaggre/service/CoverageService.java | 12 ++- .../service/impl/CoverageServiceImpl.java | 77 +++++++++++++++ .../mapper/govorg/IcCityManagementDao.xml | 98 +++++++++++++++---- 6 files changed, 232 insertions(+), 26 deletions(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SearchDetailFormDTO.java diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java index 49575e02fc..4650740bf6 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/CoverageHomeSearchFormDTO.java @@ -37,4 +37,8 @@ public class CoverageHomeSearchFormDTO extends PageFormDTO implements Serializab * searchType为resource时，此字段必填 */ private String resourceType; + + private String resourceId; + private String icEventId; + private String icUserId; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SearchDetailFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SearchDetailFormDTO.java new file mode 100644 index 0000000000..61fe3607a5 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SearchDetailFormDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dataaggre.dto.govorg.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/7/29 08:48 + * @DESC + */ +@Data +public class SearchDetailFormDTO implements Serializable { + + private static final long serialVersionUID = 3499320376768396157L; + + public interface SearchUserDetailForm{} + public interface SearchEventDetailForm{} + public interface SearchResourceDetailForm{} + + @NotBlank(message = "icUserId不能为空",groups = SearchUserDetailForm.class) + private String icUserId; + + @NotBlank(message = "icEventId不能为空",groups = SearchEventDetailForm.class) + private String icEventId; + + @NotBlank(message = "resourceId不能为空",groups = SearchResourceDetailForm.class) + private String resourceId; + + /** + * 资源类型：社区自组织：community_org;优势资源:superior_resource;城市管理：city_management；重点危化企业：dangerous_chemicals；公共服务：public_service；企事业单位巡查：enterprise_patrol； + */ + @NotBlank(message = "resourceType不能为空",groups = SearchResourceDetailForm.class) + private String resourceType; + + private String customerId; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index f300875b13..ea436eb916 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -7,14 +7,14 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.commons.tools.utils.Result; +import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; -import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; +import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO; +import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.service.CoverageService; import org.apache.commons.collections4.CollectionUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -118,4 +118,26 @@ public class CoverageController { PageData page = coverageService.dataListLeft(formDTO); return new Result>().ok(page); } + + @PostMapping("search-user-detail") + public Result searchUserDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchUserDetailForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(coverageService.searchUserDetail(formDTO)); + } + + @PostMapping("search-event-detail") + public Result searchEventDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchEventDetailForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(coverageService.searchEventDetail(formDTO)); + } + + @PostMapping("search-resource-detail") + public Result searchResourceDetail(@RequestBody SearchDetailFormDTO formDTO,@LoginUser TokenDto tokenDto){ + ValidatorUtils.validateEntity(formDTO, SearchDetailFormDTO.SearchResourceDetailForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(coverageService.searchResourceDetail(formDTO)); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index 5c39087be8..9c2179e7e8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -5,9 +5,8 @@ import com.epmet.dataaggre.dto.coverage.AnalysisGovernedTargetsResult; import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; -import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTOV2; -import com.epmet.dataaggre.dto.govorg.result.CoverageHomeSearchResultDTO; +import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO; +import com.epmet.dataaggre.dto.govorg.result.*; import java.util.List; @@ -50,4 +49,11 @@ public interface CoverageService { * @return */ PageData dataListLeft(CoverageAnalisisDataListLeftFormDTO formDTO); + + UserInfoResultDTO searchUserDetail(SearchDetailFormDTO formDTO); + + EventInfoResultDTO searchEventDetail(SearchDetailFormDTO formDTO); + + ResourceInfoResultDTO searchResourceDetail(SearchDetailFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index ee4a6682fe..3d5b75f9bd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -8,10 +8,14 @@ import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; 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.BuildingInfoCache; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; +import com.epmet.commons.tools.redis.common.bean.HouseInfoCache; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.EpmetRequestHolder; import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.constant.TableConstant; @@ -20,6 +24,7 @@ import com.epmet.dataaggre.dto.coverage.AnalysisResourceCategoriesResult; import com.epmet.dataaggre.dto.epmetuser.result.IcResiInfoResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageAnalisisDataListLeftFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.form.SearchDetailFormDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dataaggre.entity.govorg.*; @@ -959,4 +964,76 @@ public class CoverageServiceImpl implements CoverageService { // page.getTotal()是多少条业务数据 return new PageData<>(list, page.getTotal()); } + + @Override + public UserInfoResultDTO searchUserDetail(SearchDetailFormDTO formDTO) { + CoverageHomeSearchFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CoverageHomeSearchFormDTO.class); + UserInfoResultDTO result = new UserInfoResultDTO(); + List allIcUser = icResiService.getAllIcUser(dto); + if (CollectionUtils.isNotEmpty(allIcUser)){ + result = allIcUser.get(NumConstant.ZERO); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId()); + if (null == gridInfo){ + throw new EpmetException("获取网格信息失败："+result.getGridId()); + } + result.setGridName(gridInfo.getGridNamePath()); + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), result.getHomeId()); + if (null == houseInfo){ + throw new EpmetException("获取房屋信息失败："+result.getHomeId()); + } + result.setHouseName(houseInfo.getAllName()); + result.setLongitude(houseInfo.getBuildingLongitude()); + result.setLatitude(houseInfo.getBuildingLatitude()); + } + return result; + } + + @Override + public EventInfoResultDTO searchEventDetail(SearchDetailFormDTO formDTO) { + CoverageHomeSearchFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CoverageHomeSearchFormDTO.class); + EventInfoResultDTO result = new EventInfoResultDTO(); + List eventInfos = govProjectService.getEventInfos(dto); + if (CollectionUtils.isNotEmpty(eventInfos)){ + result = eventInfos.get(NumConstant.ZERO); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(result.getGridId()); + if (null == gridInfo){ + throw new EpmetException("获取网格信息失败："+result.getGridId()); + } + result.setGridName(gridInfo.getGridNamePath()); + } + return result; + } + + @Override + public ResourceInfoResultDTO searchResourceDetail(SearchDetailFormDTO formDTO) { + CoverageHomeSearchFormDTO dto = ConvertUtils.sourceToTarget(formDTO, CoverageHomeSearchFormDTO.class); + ResourceInfoResultDTO result = new ResourceInfoResultDTO(); + List infos = new ArrayList<>(); + switch (formDTO.getResourceType()){ + case "community_org": + infos = heartService.getCommunitySelOrgInfos(dto); + break; + case "superior_resource": + infos = govOrgService.getSuperiorResourceInfos(dto); + break; + case "city_management": + infos = govOrgService.getCityManageInfos(dto); + break; + case "dangerous_chemicals": + infos = govOrgService.getDangerousChemicalsInfos(dto); + break; + case "public_service": + infos = govOrgService.getPublicServiceInfos(dto); + break; + case "enterprise_patrol": + infos = govOrgService.getEnterpriseInfos(dto); + break; + default: + break; + } + if (CollectionUtils.isNotEmpty(infos)){ + result = infos.get(NumConstant.ZERO); + } + return result; + } } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml index 29476955de..c0696d0d94 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCityManagementDao.xml @@ -18,8 +18,15 @@ IFNULL(MOBILE,'') AS MOBILE FROM ic_city_management WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND ID = #{resourceId} + + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -40,8 +47,15 @@ IFNULL(MOBILE,'') AS MOBILE FROM ic_public_service WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND ID = #{resourceId} + + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -60,8 +74,15 @@ ifnull(PRINCIPAL_MOBILE,'') AS mobile FROM ic_dangerous_chemicals WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND ID = #{resourceId} + + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -80,8 +101,15 @@ ifnull(ADDRESS,'') as ADDRESS FROM ic_superior_resource WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND ID = #{resourceId} + + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -99,8 +127,15 @@ ifnull(MOBILE,'') AS mobile FROM ic_enterprise WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') + + AND ID = #{resourceId} + + + AND CUSTOMER_ID = #{customerId} + + + AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') + AND PLACE_ORG_NAME LIKE CONCAT('%',#{name},'%') @@ -109,8 +144,15 @@ select count(id) FROM ic_city_management WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND ID = #{resourceId} + + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -119,8 +161,12 @@ select count(id) FROM ic_public_service WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -129,8 +175,12 @@ select count(id) FROM ic_dangerous_chemicals WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -139,8 +189,12 @@ select count(id) FROM ic_superior_resource WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + + AND CUSTOMER_ID = #{customerId} + + + AND AGENCY_ID_PATH LIKE CONCAT('%',#{orgId},'%') + AND `NAME` LIKE CONCAT('%',#{name},'%') @@ -149,8 +203,12 @@ select count(id) FROM ic_enterprise WHERE DEL_FLAG = 0 - AND CUSTOMER_ID = #{customerId} - AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') + + AND CUSTOMER_ID = #{customerId} + + + AND CONCAT(AGENCY_PIDS,':',AGENCY_ID) LIKE CONCAT('%',#{orgId},'%') + AND PLACE_ORG_NAME LIKE CONCAT('%',#{name},'%') From f23b9f9ec38e81302d735f875612180f8590fa6b Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Jul 2022 09:54:32 +0800 Subject: [PATCH 181/288] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BAN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java index 67fd29285b..4a997b1f6d 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java @@ -163,6 +163,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl 10) { entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10))); } else { From 46137f924eb61b1146b22e28c3d1c5caa9124d81 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Jul 2022 09:56:03 +0800 Subject: [PATCH 182/288] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BAN?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java index 4a997b1f6d..48cdf626bb 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java @@ -71,6 +71,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl Date: Fri, 29 Jul 2022 10:01:04 +0800 Subject: [PATCH 183/288] =?UTF-8?q?=E7=9F=AD=E4=BF=A1OK?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java | 3 ++- .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java index cf208a032e..8eca6b07e9 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcServiceRecordV2ServiceImpl.java @@ -178,7 +178,8 @@ public class IcServiceRecordV2ServiceImpl extends BaseServiceImpl paramMap = new HashMap<>(); - paramMap.put("name",staffInfoCacheResult.getAgencyName()); + //${nane}发起一个${serviceName}服务，请服务完成后尽快反馈，谢谢合作。 + paramMap.put("nane",staffInfoCacheResult.getAgencyName()); paramMap.put("serviceName",serviceName); sms.setParamMap(paramMap); smsList.add(sms); diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index e7863747c5..ca7b3c3f58 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -458,7 +458,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Fri, 29 Jul 2022 10:21:30 +0800 Subject: [PATCH 184/288] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BAN=20=E4=BB=A5=E5=8F=8A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=20=E6=9B=B4=E6=96=B0=E6=97=B6=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventreportPingyinServiceImpl.java | 6 ++++-- .../opendata/service/impl/GridInfoPingyinServiceImpl.java | 2 ++ .../service/impl/GridstaffInfoPingyinServiceImpl.java | 2 ++ .../service/impl/GridstaffWorkInfoPingyinServiceImpl.java | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java index fbf68fc8c5..380df961e4 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/EventreportPingyinServiceImpl.java @@ -21,6 +21,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -129,9 +130,10 @@ public class EventreportPingyinServiceImpl extends BaseServiceImpl 10) { entity.setLat(new BigDecimal(ag.getLatitude().substring(0, 10))); } else { diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java index 060a9ec449..fc42fd2dda 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffInfoPingyinServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; @@ -129,6 +130,7 @@ public class GridstaffInfoPingyinServiceImpl extends BaseServiceImpl Date: Fri, 29 Jul 2022 10:23:34 +0800 Subject: [PATCH 185/288] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=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/dto/form/AddDepartmentFormDTO.java | 5 +++++ .../java/com/epmet/service/impl/DepartmentServiceImpl.java | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java index ab18e62e57..786980aa47 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/AddDepartmentFormDTO.java @@ -71,6 +71,11 @@ public class AddDepartmentFormDTO implements Serializable { * 总人数 */ private Integer totalUser; + /** + * 联建单位: party_unit + * 社会自组织: community_org + */ + private String deptType; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 8f71eb4716..a8123798b6 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -107,6 +107,9 @@ public class DepartmentServiceImpl implements DepartmentService { Result result = new Result(); AddDepartmentResultDTO addDepartmentResultDTO = new AddDepartmentResultDTO(); CustomerDepartmentEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerDepartmentEntity.class); + if (formDTO.getTotalUser() > NumConstant.ZERO) { + entity.setTotalUser(formDTO.getTotalUser()); + } entity.setTotalUser(NumConstant.ZERO); //1:查询当前组织机构信息，获取客户Id CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); @@ -403,6 +406,7 @@ public class DepartmentServiceImpl implements DepartmentService { deptDTO.setAgencyId(staffInfo.getAgencyId()); deptDTO.setDepartmentDuty(""); deptDTO.setDepartmentName(formDTO.getDeptName()); + deptDTO.setDeptType(formDTO.getDeptType()); deptDTO.setTotalUser(1); Result deptResult = addDepartment(deptDTO); //三、新增组织人员关系数据 From d37a56cbbf73b01b6f0ae7b6c67e8706b9f0b2fb Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 29 Jul 2022 10:24:34 +0800 Subject: [PATCH 186/288] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=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/service/impl/DepartmentServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index a8123798b6..0793688b22 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -468,6 +468,7 @@ public class DepartmentServiceImpl implements DepartmentService { deptDTO.setAgencyId(staffInfo.getAgencyId()); deptDTO.setDepartmentDuty(""); deptDTO.setDepartmentName(formDTO.getDeptName()); + deptDTO.setDeptType(formDTO.getDeptType()); deptDTO.setTotalUser(1); Result deptResult = addDepartment(deptDTO); //三、部门下新增人员关系数据 From 622b585bb5e282f0d148a5c1eac6b7cd896f92a4 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Jul 2022 10:28:43 +0800 Subject: [PATCH 187/288] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E4=B8=BAN=20=E4=BB=A5=E5=8F=8A=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E6=97=B6=E9=97=B4=20=E6=9B=B4=E6=96=B0=E6=97=B6=20?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/GridInfoPingyinDao.xml | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml index c79ef11f2a..c2eeb0baa9 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/mapper/GridInfoPingyinDao.xml @@ -3,32 +3,13 @@ - - - - - - - - - - - - - - - - - - - - delete from grid_info_pingyin where grid_level !='7' + delete from grid_info_pingyin where grid_level !='07' - delete from grid_info_pingyin where grid_level ='7' + delete from grid_info_pingyin where grid_level ='07' SELECT id AS "gridId", - grid_name AS "gridName" + grid_name AS "gridName", + LATITUDE as latitude, + LONGITUDE as longitude, FROM customer_grid WHERE From 1c9237e0def8a1baf6367a2e8915012a8e8f45fc Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 12:52:51 +0800 Subject: [PATCH 195/288] shishi --- .../govorg/IcEnterprisePatrolRecordDao.java | 3 +- .../service/epmetuser/IcResiService.java | 2 +- .../epmetuser/impl/IcResiServiceImpl.java | 9 ++--- .../service/govorg/GovOrgCoverageService.java | 2 +- .../impl/GovOrgCoverageServiceImpl.java | 4 +-- .../service/govproject/GovProjectService.java | 3 +- .../impl/GovProjectServiceImpl.java | 12 +++---- .../service/impl/CoverageServiceImpl.java | 34 +++++++++++++------ .../govorg/IcEnterprisePatrolRecordDao.xml | 3 ++ 9 files changed, 45 insertions(+), 27 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java index 1019bb6f69..5c109fe0a6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcEnterprisePatrolRecordDao.java @@ -26,7 +26,8 @@ public interface IcEnterprisePatrolRecordDao extends BaseDao listResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, Integer pageNo, Integer pageSize, Boolean isPage); - Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search); + Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId); /** * 使用特殊人群类别查询居民列表 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index 300a79cc82..1a3d919a65 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -40,7 +40,7 @@ public class IcResiServiceImpl implements IcResiService { PageHelper.startPage(pageNo, pageSize); } - LambdaQueryWrapper query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search); + LambdaQueryWrapper query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search, null); query.orderByAsc(IcResiUserEntity::getCreatedTime); return resiUserDao.selectList(query); } @@ -55,8 +55,8 @@ public class IcResiServiceImpl implements IcResiService { * @return */ @Override - public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) { - LambdaQueryWrapper query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search); + public Integer countResisByCategories4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search, String gridId) { + LambdaQueryWrapper query = constructQueryWrapper4Coverage(customerId, agencyId, queryPids, categoryKey, search,gridId); return resiUserDao.selectCount(query); } @@ -69,11 +69,12 @@ public class IcResiServiceImpl implements IcResiService { * @param search * @return */ - LambdaQueryWrapper constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search) { + LambdaQueryWrapper constructQueryWrapper4Coverage(String customerId, String agencyId, String queryPids, String categoryKey, String search,String gridId) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcResiUserEntity::getCustomerId, customerId); query.eq(IcResiUserEntity::getStatus, "0"); // 只查询0 正常的居民。 query.and(q -> q.eq(IcResiUserEntity::getAgencyId, agencyId).or().likeRight(IcResiUserEntity::getPids, queryPids)); + query.eq(StringUtils.isNotBlank(gridId), IcResiUserEntity::getGridId, gridId); if ("resi_xfry".equals(categoryKey)) { // 信访人员 query.eq(IcResiUserEntity::getIsXfry, true); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java index 26faa47e81..442166f157 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgCoverageService.java @@ -112,7 +112,7 @@ public interface GovOrgCoverageService { Integer countSuporiorResourceEntities(String customerId, String staffOrgIds, String search, String categoryKey); - Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult); + Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId); List listEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey, Boolean isPage, Integer pageNo, diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 56b32dad29..4e0382068a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -293,8 +293,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { } @Override - public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult) { - return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult); + public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId) { + return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult,gridId); } @Override diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index e64525a1fc..ce23a1ed02 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -4,7 +4,6 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; -import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.dto.govproject.form.*; import com.epmet.dataaggre.dto.govproject.result.*; import com.epmet.dataaggre.entity.govproject.IcEventEntity; @@ -111,7 +110,7 @@ public interface GovProjectService { * @param isDifficultPoint 是否是难点堵点 * @return */ - Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint); + Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint,String gridId); /** * 搜索事件 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 0a400fe927..8cd50eb6eb 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -28,7 +28,6 @@ import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; -import com.epmet.dataaggre.dto.govorg.result.ResourceInfoResultDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; import com.epmet.dataaggre.dto.govproject.ResiEventDTO; @@ -653,15 +652,15 @@ public class GovProjectServiceImpl implements GovProjectService { } @Override - public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint) { - LambdaQueryWrapper query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint); + public Integer countIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, String gridId) { + LambdaQueryWrapper query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint,gridId); return icEventDao.selectCount(query); } @Override public List searchIcEventEntities(String customerId, String staffOrgIds, String search, Boolean isDifficultPoint, Boolean isPage, Integer pageNo, Integer pageSize) { - LambdaQueryWrapper query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint); + LambdaQueryWrapper query = constructIcEventQueryWrapper(customerId, staffOrgIds, search, isDifficultPoint,null); if (isPage) { PageHelper.startPage(pageNo, pageSize); } @@ -682,9 +681,10 @@ public class GovProjectServiceImpl implements GovProjectService { * @return */ private LambdaQueryWrapper constructIcEventQueryWrapper(String customerId, String staffOrgIds, - String search, Boolean difficultPoint) { + String search, Boolean difficultPoint, String gridId) { LambdaQueryWrapper query = new LambdaQueryWrapper<>(); - query.eq(IcEventEntity::getCustomerId, customerId); + query.eq(IcEventEntity::getCustomerId, customerId) + .eq(StringUtils.isNotBlank(gridId), IcEventEntity::getGridId, gridId); query.likeRight(IcEventEntity::getGridPids, staffOrgIds); if (StringUtils.isNotBlank(search)) { query.like(IcEventEntity::getName, search); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 230b70de37..f19f599b4e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -157,7 +157,7 @@ public class CoverageServiceImpl implements CoverageService { for (GovOrgCoverageService.CategoryCoverageMapping e : ccm) { Integer tempCount = doDataListCount(EpmetRequestHolder.getLoginUserCustomerId(), agencyId, agencyPath, e.getPlaceType(), - e.getCategoryKey(), search); + e.getCategoryKey(), search,null); lastTotalCount = totalCount; totalCount += tempCount; @@ -560,18 +560,18 @@ public class CoverageServiceImpl implements CoverageService { * @return */ public Integer doDataListCount(String customerId, String agencyId, String staffOrgIds, String placeType, - String categoryKey, String search) { + String categoryKey, String search,String gridId) { if (CoveragePlaceTypeEnum.RESI.getCode().equals(placeType)) { // 使用分类查询居民信息 return icResiService.countResisByCategories4Coverage(customerId, agencyId, - staffOrgIds, categoryKey, search); + staffOrgIds, categoryKey, search,gridId); } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) { // 特殊人群 return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) { // 难点痛点 - return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true); + return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true,gridId); } else if (CoveragePlaceTypeEnum.CITY_MANAGEMENT.getCode().equals(placeType)) { // 城市资源管理 return orgCoverageService.countCityResourceEntities(customerId, staffOrgIds, search, categoryKey); @@ -589,7 +589,7 @@ public class CoverageServiceImpl implements CoverageService { return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey); } else if (CoveragePlaceTypeEnum.ENTERPRISE_PATROL.getCode().equals(placeType)) { // 企事业单位巡查 - return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null); + return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,null,null); } else if (CoveragePlaceTypeEnum.GROUP_RENT.getCode().equals(placeType)) { // 群租房。出租的房屋，住的人口超过5人属于群租房（是个规定 return orgCoverageService.countByResiNumber(customerId, staffOrgIds, search, 5, HOUSE_RENT_FLAG_RENT); @@ -602,7 +602,7 @@ public class CoverageServiceImpl implements CoverageService { } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){ // 企事业单位巡查 // 最新巡查结果【0:合格 1:不合格】 - return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR ); + return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId); } return 0; @@ -1068,10 +1068,24 @@ public class CoverageServiceImpl implements CoverageService { if(CollectionUtils.isNotEmpty(list)){ resultList=ConvertUtils.sourceToTarget(list,DataListLeftSubTotalResDTO.class); for(DataListLeftSubTotalResDTO orgRes:resultList){ - - - - + String gridId=StrConstant.EPMETY_STR; + String agencyId=StrConstant.EPMETY_STR; + String orgIdPath=StrConstant.EPMETY_STR; + if(OrgConstant.AGENCY.equals(orgRes.getOrgType())){ + agencyId=orgRes.getOrgId(); + AgencyInfoCache agencyInfoCache=CustomerOrgRedis.getAgencyInfo(orgRes.getOrgId()); + if (StringUtils.isNotBlank(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache.getPids()) && !"0".equals(agencyInfoCache)) { + orgIdPath = agencyInfoCache.getPids().concat(":").concat(agencyId); + } else { + orgIdPath = agencyId; + } + }else{ + gridId=orgRes.getOrgId(); + GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(orgRes.getOrgId()); + orgIdPath=gridInfoCache.getPids().concat(":").concat(gridId); + } + int count = doDataListCount(formDTO.getCustomerId(), agencyId, orgIdPath, formDTO.getPlaceType(), formDTO.getCategoryKey(), null, gridId); + orgRes.setTotal(count); } } return resultList; diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml index c682c31548..523d80abb3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml @@ -17,6 +17,9 @@ and e.LATEST_RESULT = #{latestResult} + + and e.GRID_ID = #{gridId} + From b4a04e73d9779e45f9b992c962e442c11e17ab53 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 29 Jul 2022 12:53:50 +0800 Subject: [PATCH 196/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96-=201.=E5=B0=86=E5=8F=B3=E4=BE=A7?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E7=9A=84quantity=E6=9F=A5=E8=AF=A2=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E5=A4=9A=E7=BA=BF=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AnalysisResourceCategoriesResult.java | 5 +- .../controller/CoverageController.java | 5 +- .../govorg/IcCoverageCategoryDictEntity.java | 5 - .../dataaggre/service/CoverageService.java | 2 +- .../service/impl/CoverageServiceImpl.java | 133 +++++++++++++----- .../entity/IcCoverageCategoryDictEntity.java | 4 - 6 files changed, 102 insertions(+), 52 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java index a6ab7996ab..4bfd7e83c1 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/coverage/AnalysisResourceCategoriesResult.java @@ -6,6 +6,7 @@ import lombok.NoArgsConstructor; import java.util.ArrayList; import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; /** * 五大图层-可视化-右侧分类树列表 @@ -26,7 +27,7 @@ public class AnalysisResourceCategoriesResult { /** * 个数 */ - private Integer quantity; + private AtomicInteger quantity = new AtomicInteger(0); /** * 没有placeTypeInAnalysis，直接属于图层的 @@ -61,7 +62,7 @@ public class AnalysisResourceCategoriesResult { public static class PlaceType { private String placeType; private String placeTypeName; - private Integer quantity = 0; + private AtomicInteger quantity = new AtomicInteger(0); private List categories; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java index d64f0866a5..44be5f6dc9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/CoverageController.java @@ -89,8 +89,9 @@ public class CoverageController { * @return */ @PostMapping("analysis/resourceCategories") - public Result> listAnalysisResourceCategories() { - List r = coverageService.listAnalysisResourceCategories(); + public Result> listAnalysisResourceCategories(@RequestBody Map input) { + String agencyId = input.get("agencyId"); + List r = coverageService.listAnalysisResourceCategories(agencyId); return new Result>().ok(r); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java index 1ea7222208..bc0ae5c9e2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryDictEntity.java @@ -60,11 +60,6 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { private String dataType; - /** - * 数量 - */ - private Integer quantity; - /** * 排序 */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java index 1dcb2907a4..8bd6fd9bd9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/CoverageService.java @@ -40,7 +40,7 @@ public interface CoverageService { * 五大图层-可视化-右侧分类树列表 * @return */ - List listAnalysisResourceCategories(); + List listAnalysisResourceCategories(String agencyId); List listGovernedTargetCategories(String agencyId); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 0bc9878dc4..40595b8d39 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -7,6 +7,7 @@ import com.epmet.commons.tools.enums.CoverageEnums; import com.epmet.commons.tools.enums.CoveragePlaceTypeEnum; 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; @@ -458,10 +459,11 @@ public class CoverageServiceImpl implements CoverageService { return heartService.countCommunityOrgEntities(customerId, agencyId, staffOrgIds, search, categoryKey); } else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) { // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 - if (categoryKey.equals("pu_jgzsbm")) { - String partyUnitType = "3"; - return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, partyUnitType, search); - } +// if (categoryKey.equals("pu_jgzsbm")) { +// String partyUnitType = "3"; +// } + String[] parts = categoryKey.split("_"); + return heartService.countPartyUnitEntities(customerId, agencyId, staffOrgIds, parts[1], search); } else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) { // 危化企业 return orgCoverageService.countDangerousChemicalEntities(customerId, staffOrgIds, search, categoryKey); @@ -568,17 +570,16 @@ public class CoverageServiceImpl implements CoverageService { } else if (CoveragePlaceTypeEnum.PARTY_UNIT.getCode().equals(placeType)) { // 机关直属部门(联建单位) 楼宇党建 0;两新组织 1;区域单位党建 2;机关直属部门 3;社会团体 4;民办非企业单位 5;基金会 6;其他 7 - if (categoryKey.equals("pu_jgzsbm")) { - String partyUnitType = "3"; - List l = heartService.searchPartyUnitEntities( - customerId, agencyId, staffOrgIds, partyUnitType, search, isPage, pageNo, pageSize); - - return l.stream() - .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, - isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getUnitName() : null, dc.getLatitude(), dc.getLongitude())) - .collect(Collectors.toList()); - } - return new ArrayList<>(); +// if (categoryKey.equals("pu_jgzsbm")) { +// String partyUnitType = "3"; +// } + String[] parts = categoryKey.split("_"); + List l = heartService.searchPartyUnitEntities( + customerId, agencyId, staffOrgIds, parts[1], search, isPage, pageNo, pageSize); + return l.stream() + .map(dc -> new CoverageAnalisisDataListResultDTO(dc.getId(), categoryKey, + isPage ? categoryDict.getCategoryName() : null, placeType, isPage ? dc.getUnitName() : null, dc.getLatitude(), dc.getLongitude())) + .collect(Collectors.toList()); } else if (CoveragePlaceTypeEnum.DANGEROUS_CHEMICALS.getCode().equals(placeType)) { // 危化企业 List l = orgCoverageService.searchDangerousChemicalEntities( @@ -680,7 +681,7 @@ public class CoverageServiceImpl implements CoverageService { * @return */ @Override - public List listAnalysisResourceCategories() { + public List listAnalysisResourceCategories(String agencyId) { // 获取所有菜单的url List menuUrls = new ArrayList<>(128); @@ -700,7 +701,7 @@ public class CoverageServiceImpl implements CoverageService { continue; } - AnalysisResourceCategoriesResult categoriesOfThisCoverage = new AnalysisResourceCategoriesResult(); + AnalysisResourceCategoriesResult coverageResult = new AnalysisResourceCategoriesResult(); HashMap placeTypeMap = new HashMap<>(); List categoryDictEntities = govOrgCoverageService.listResourceCategoryEntities(coverage.getKey()); @@ -714,9 +715,9 @@ public class CoverageServiceImpl implements CoverageService { if (StringUtils.isBlank(category.getPlaceTypeInAnalysis())) { // 没有placetype的 if ("all".equals(category.getMenuUrl()) || menuUrls.contains(category.getMenuUrl())) { - categoriesOfThisCoverage.getCategories() + coverageResult.getCategories() .add(new AnalysisResourceCategoriesResult.Category(category.getCategoryKey(), category.getCategoryName(), - category.getCoverageType(), category.getPlaceType(), category.getQuantity())); + category.getCoverageType(), category.getPlaceType(), 0)); } } else { // 有placetype的 @@ -725,33 +726,94 @@ public class CoverageServiceImpl implements CoverageService { if (placeType == null) { placeType = new AnalysisResourceCategoriesResult.PlaceType( - category.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(category.getPlaceTypeInAnalysis()).getName(), category.getQuantity(), new ArrayList<>()); + category.getPlaceTypeInAnalysis(), CoveragePlaceTypeEnum.getEnum(category.getPlaceTypeInAnalysis()).getName(), new AtomicInteger(0), new ArrayList<>()); placeTypeMap.put(category.getPlaceTypeInAnalysis(), placeType); } placeType.getCategories().add(new AnalysisResourceCategoriesResult.Category(category.getCategoryKey(), - category.getCategoryName(), category.getCoverageType(), category.getPlaceType(), category.getQuantity())); - placeType.setQuantity(placeType.getQuantity() + category.getQuantity()); // todo 0改为category的count + category.getCategoryName(), category.getCoverageType(), category.getPlaceType(), 0)); } } }); - AtomicReference total = new AtomicReference<>(0); placeTypeMap.forEach((placeTypeKey, placeType) -> { - categoriesOfThisCoverage.getPlaceTypesInAnalysis().add(placeType); - total.updateAndGet(v -> v + placeType.getQuantity()); + coverageResult.getPlaceTypesInAnalysis().add(placeType); }); - categoriesOfThisCoverage.setCoverageType(coverage.getKey()); - categoriesOfThisCoverage.setCoverageName(CoverageEnums.getEnum(coverage.getKey()).getCoverageName()); - categoriesOfThisCoverage.setQuantity(total.get()); - results.add(categoriesOfThisCoverage); + coverageResult.setCoverageType(coverage.getKey()); + coverageResult.setCoverageName(CoverageEnums.getEnum(coverage.getKey()).getCoverageName()); + results.add(coverageResult); } + String customerId = EpmetRequestHolder.getLoginUserCustomerId(); + String userId = EpmetRequestHolder.getLoginUserId(); + + Map stafInfoMap=getStaffPidsFromStaffInfo(customerId, userId, agencyId,OrgConstant.AGENCY); + String staffOrgPath = stafInfoMap.get(OrgConstant.AGENC_PATH); + + // 填充数量quantity字段 + fillQuantities4ResourcesCoverages(results, customerId, agencyId, staffOrgPath); + return results; } + private void fillQuantities4ResourcesCoverages(ArrayList coverages, String customerId, String agencyId, String staffOrgIds) { + + ArrayList> futures = new ArrayList<>(); + + coverages.forEach(coverage -> { + List categoriesInCoverage = coverage.getCategories(); + List placeTypesInCoverage = coverage.getPlaceTypesInAnalysis(); + + if (CollectionUtils.isNotEmpty(categoriesInCoverage)) { + // 直属于图层的category。异步提交计算任务 + CompletableFuture future = CompletableFuture.runAsync(() -> fillQuantities4ResourcesCategories(coverage, null, categoriesInCoverage, customerId, agencyId, staffOrgIds)); + futures.add(future); + } + if (CollectionUtils.isNotEmpty(placeTypesInCoverage)) { + // placeType，需要拆开来算, 异步提交计算任务 + placeTypesInCoverage.forEach(placeType -> { + List categoriesInPlaceType = placeType.getCategories(); + CompletableFuture future = CompletableFuture.runAsync(() -> fillQuantities4ResourcesCategories(coverage, placeType, categoriesInPlaceType, customerId, agencyId, staffOrgIds)); + futures.add(future); + }); + } + }); + + // 等待异步任务计算完成 + futures.forEach(f -> { + try { + f.get(); + } catch (InterruptedException e) { + log.error("【五大图层】可视化-右侧资源列表异步计算数量quantity失败，计算被中止，错误信息:{}", ExceptionUtils.getErrorStackTrace(e)); + } catch (ExecutionException e) { + log.error("【五大图层】可视化-右侧资源列表异步计算数量quantity失败，错误信息:{}", ExceptionUtils.getErrorStackTrace(e)); + } + }); + } + + private void fillQuantities4ResourcesCategories(AnalysisResourceCategoriesResult coverage, + AnalysisResourceCategoriesResult.PlaceType placeType, + List categories, + String customerId, String agencyId, String staffOrgIds) { + + AtomicInteger total = new AtomicInteger(); + + categories.forEach(cat -> { + Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, cat.getPlaceType(), cat.getCategoryKey(), null); + cat.setQuantity(quantity); + total.getAndAdd(quantity); + }); + + // 分别给所属的coverage和placeType的quantity增加quantity + coverage.getQuantity().getAndAdd(total.get()); + + if (placeType != null) { + placeType.getQuantity().getAndAdd(total.get()); + } + } + @Override public List listGovernedTargetCategories(String agencyId) { @@ -776,7 +838,6 @@ public class CoverageServiceImpl implements CoverageService { List results = new ArrayList<>(); HashMap> placeTypeTargetMap = new HashMap<>(); - HashMap placeTypeQuantityMap = new HashMap<>(); targetCategories.forEach(rc -> { String placeTypeInAnalysis = rc.getPlaceTypeInAnalysis(); @@ -790,7 +851,7 @@ public class CoverageServiceImpl implements CoverageService { // 只有一层，没有子级 if (menuUrls.contains(rc.getMenuUrl()) || "all".equals(rc.getMenuUrl())) { results.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), - rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); } } else { // 有子级，需要使用placeTypeInAnalysis分组 @@ -799,12 +860,9 @@ public class CoverageServiceImpl implements CoverageService { if (CollectionUtils.isEmpty(targets)) { targets = new ArrayList<>(); placeTypeTargetMap.put(placeTypeInAnalysis, targets); - placeTypeQuantityMap.put(placeTypeInAnalysis, 0); } targets.add(new AnalysisGovernedTargetsResult(rc.getCategoryKey(), rc.getCategoryName(), rc.getCoverageType(), - rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), rc.getQuantity(), new ArrayList<>())); - - placeTypeQuantityMap.put(placeTypeInAnalysis, placeTypeQuantityMap.get(placeTypeInAnalysis) + rc.getQuantity()); + rc.getPlaceType(), CoveragePlaceTypeEnum.getEnum(rc.getPlaceType()).getName(), 0, new ArrayList<>())); } } }); @@ -814,7 +872,6 @@ public class CoverageServiceImpl implements CoverageService { placeTypeTargetMap.forEach((placeTypeInAnalysis, targetObjects) -> { AnalysisGovernedTargetsResult tr = new AnalysisGovernedTargetsResult(); tr.setPlaceType(placeTypeInAnalysis); - tr.setQuantity(placeTypeQuantityMap.get(placeTypeInAnalysis)); tr.setPlaceTypeName(CoveragePlaceTypeEnum.getEnum(placeTypeInAnalysis).getName()); tr.setChildren(targetObjects); results.add(tr); @@ -854,9 +911,9 @@ public class CoverageServiceImpl implements CoverageService { try { future.get(); } catch (InterruptedException e) { - e.printStackTrace(); + log.error("【五大图层】可视化-左侧异步计算数量quantity失败，计算被中止，错误信息:{}", ExceptionUtils.getErrorStackTrace(e)); } catch (ExecutionException e) { - e.printStackTrace(); + log.error("【五大图层】可视化-左侧异步计算数量quantity失败，错误信息:{}", ExceptionUtils.getErrorStackTrace(e)); } }); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java index 57fbe777e1..7fd612e013 100755 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/entity/IcCoverageCategoryDictEntity.java @@ -62,10 +62,6 @@ public class IcCoverageCategoryDictEntity extends BaseEpmetEntity { private String coverageType; private String dataType; - /** - * 数量 - */ - private Integer quantity; /** * 排序 */ From 1fbdc3df6530e33c62c9b90f9ce9f8a28852601a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 29 Jul 2022 13:01:44 +0800 Subject: [PATCH 197/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=8F=AF=E8=A7=86=E5=8C=96-=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 2a5ccfb5cb..523b1f1fbe 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -929,7 +929,7 @@ public class CoverageServiceImpl implements CoverageService { AtomicInteger total = new AtomicInteger(); categories.forEach(cat -> { - Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, cat.getPlaceType(), cat.getCategoryKey(), null); + Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, cat.getPlaceType(), cat.getCategoryKey(), null, null); cat.setQuantity(quantity); total.getAndAdd(quantity); }); @@ -1058,7 +1058,7 @@ public class CoverageServiceImpl implements CoverageService { if (CollectionUtils.isEmpty(children)) { // 城市管理时间 || 安全生产隐患等只有一层的 Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, targetsOfOnePlaceType.getPlaceType(), - targetsOfOnePlaceType.getCategoryKey(), null); + targetsOfOnePlaceType.getCategoryKey(), null, null); targetsOfOnePlaceType.setQuantity(quantity); } else { // 综合治理人群 || 公共服务人群等有子级的 @@ -1066,7 +1066,7 @@ public class CoverageServiceImpl implements CoverageService { AtomicInteger totalOfPlaceType = new AtomicInteger(); children.forEach(governedTarget -> { Integer quantity = doDataListCount(customerId, agencyId, staffOrgIds, governedTarget.getPlaceType(), - governedTarget.getCategoryKey(), null); + governedTarget.getCategoryKey(), null, null); governedTarget.setQuantity(quantity); totalOfPlaceType.addAndGet(quantity); }); From 9d39b0116342e524f71eafa91143e87b7007965e Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 13:28:46 +0800 Subject: [PATCH 198/288] duole , --- .../src/main/resources/mapper/govorg/CustomerGridDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 356819c9e5..7f68c5d787 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -49,7 +49,7 @@ id AS "gridId", grid_name AS "gridName", LATITUDE as latitude, - LONGITUDE as longitude, + LONGITUDE as longitude FROM customer_grid WHERE From 0e078901e9d0cf83ef27e604452dc5dc1a7b3050 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 29 Jul 2022 13:35:37 +0800 Subject: [PATCH 199/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91sql?= =?UTF-8?q?=E8=A1=A8=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/db/migration/V0.0.38__coverage_update.sql | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.38__coverage_update.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.38__coverage_update.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.38__coverage_update.sql new file mode 100644 index 0000000000..4dffe25831 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.38__coverage_update.sql @@ -0,0 +1,6 @@ +alter table ic_coverage_category_dict + add column PLACE_TYPE_IN_ANALYSIS varchar(32) comment '在可视化系统中所属的plact_type，跟COVERAGE_TYPE可能不同，COVERAGE_TYPE是给管理平台用的' after PLACE_TYPE; +alter table ic_coverage_category_dict + add column MENU_URL varchar(200) comment '要跟菜单绑定(客户配置了这个菜单，这里才显示)' after PLACE_TYPE_IN_ANALYSIS; +alter table ic_coverage_category_dict + add column DATA_TYPE varchar(32) comment '数据类别(governedTarget:被管理对象；resources:资源列表)' after MENU_URL; \ No newline at end of file From 7069a3c978e70fa686757f1ff5c46107e25ec8ef Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 13:45:09 +0800 Subject: [PATCH 200/288] =?UTF-8?q?=E4=BA=94=E5=A4=A7=E5=9B=BE=E5=B1=82?= =?UTF-8?q?=E9=A6=96=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 15 ++++++--------- .../resources/mapper/epmetuser/IcResiUserDao.xml | 11 +++++++++-- .../resources/mapper/govproject/IcEventDao.xml | 13 ++++++++++--- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 523b1f1fbe..943680915d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -60,9 +60,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @Slf4j @@ -269,22 +266,22 @@ public class CoverageServiceImpl implements CoverageService { List>> futures = new ArrayList<>(); for (String resource : resources) { if (MenusEnums.IC_SUPERIOR_RESOURCE.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getSuperiorResourceInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getSuperiorResourceInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_CITY_MANAGEMENT.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getCityManageInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getCityManageInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_COMMUNITY_SELF_ORGANIZATION.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> heartService.getCommunitySelOrgInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> heartService.getCommunitySelOrgInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_DANGEROUS_CHEMICALS.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getDangerousChemicalsInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getDangerousChemicalsInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_ENTERPRISE.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getEnterpriseInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getEnterpriseInfos(formDTO),executorService); futures.add(c); }else if (MenusEnums.IC_PUBLIC_SERVICE.getUrl().equals(resource)){ - CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getPublicServiceInfos(formDTO)); + CompletableFuture> c = CompletableFuture.supplyAsync(() -> govOrgService.getPublicServiceInfos(formDTO),executorService); futures.add(c); } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index dfcd87920f..f883a695f9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -164,11 +164,18 @@ ifnull(u.RHZK,'') as rhzk FROM ic_resi_user u WHERE u.DEL_FLAG = '0' - AND u.CUSTOMER_ID = #{customerId} + + AND u.CUSTOMER_ID = #{customerId} + + + AND u.id = #{icUserId} + AND u.`NAME` LIKE CONCAT('%',#{name},'%') - AND u.PIDS LIKE CONCAT('%',#{orgId},'%') + + AND u.PIDS LIKE CONCAT('%',#{orgId},'%') + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml index 547ff69899..c037d97239 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml @@ -13,9 +13,16 @@ LATITUDE FROM ic_event WHERE del_flag = '0' - AND customer_id = #{customerId} - AND DIFFICULT_POINT = '1' - AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%') + AND DIFFICULT_POINT = '1' + + AND customer_id = #{customerId} + + + AND GRID_PIDS LIKE CONCAT('%',#{orgId},'%') + + + AND id = #{icEventId} + AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') From 186bdcd448c41e8400cd2ff7bc6d9f15d9f72eb9 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 14:01:18 +0800 Subject: [PATCH 201/288] =?UTF-8?q?=E4=B8=8B=E7=BA=A7=E7=BB=84=E7=BB=87.?= =?UTF-8?q?=E7=BD=91=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 523b1f1fbe..f32f7bc6a1 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -60,9 +60,6 @@ import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.atomic.AtomicReference; import java.util.stream.Collectors; @Slf4j @@ -1196,7 +1193,7 @@ public class CoverageServiceImpl implements CoverageService { @Override public List dataListLeftSubTotal(DataListLeftSubTotalFormDTO formDTO) { List resultList=new ArrayList<>(); - List list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCoverageType(), formDTO.getOrgId()); + List list = SpringContextUtils.getBean(GovOrgService.class).queryNextOrgInfoDTO(formDTO.getCustomerId(), formDTO.getOrgId()); if(CollectionUtils.isNotEmpty(list)){ resultList=ConvertUtils.sourceToTarget(list,DataListLeftSubTotalResDTO.class); for(DataListLeftSubTotalResDTO orgRes:resultList){ From 064e2d489c39cde4c76279099eda190dd617c48a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 29 Jul 2022 14:23:40 +0800 Subject: [PATCH 202/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E5=AE=8C=E5=96=84=EF=BC=9A=E9=92=88=E5=AF=B9=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=9A=84volunteer=E8=BF=99=E4=B8=AAplacetype=E9=80=82=E9=85=8D?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/epmetuser/IcResiUserDao.java | 11 ++++ .../govorg/IcCoverageCategoryStatsDao.java | 16 ----- .../govorg/IcCoverageCategoryStatsEntity.java | 64 ------------------- .../service/epmetuser/EpmetUserService.java | 6 ++ .../epmetuser/impl/EpmetUserServiceImpl.java | 15 +++-- .../service/impl/CoverageServiceImpl.java | 23 +++++++ .../mapper/epmetuser/IcResiUserDao.xml | 38 +++++++++++ .../govorg/IcCoverageCategoryStatsDao.xml | 25 -------- 8 files changed, 89 insertions(+), 109 deletions(-) delete mode 100755 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryStatsDao.java delete mode 100755 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryStatsEntity.java delete mode 100755 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryStatsDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index 9aaf933745..5e282e7145 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -108,4 +108,15 @@ public interface IcResiUserDao extends BaseDao { */ List getAllIcUser(CoverageHomeSearchFormDTO formDTO); + Integer countVolunteersByCategory(@Param("customerId")String customerId, + @Param("agencyId")String agencyId, + @Param("staffOrgIds")String staffOrgIds, + @Param("search")String search, + @Param("resiCategory")String resiCategory); + + List listVolunteersByCategory(@Param("customerId")String customerId, + @Param("agencyId")String agencyId, + @Param("staffOrgIds")String staffOrgIds, + @Param("search")String search, + @Param("resiCategory")String resiCategory); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryStatsDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryStatsDao.java deleted file mode 100755 index 2d179ee974..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/IcCoverageCategoryStatsDao.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.epmet.dataaggre.dao.govorg; - -import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.dataaggre.entity.govorg.IcCoverageCategoryStatsEntity; -import org.apache.ibatis.annotations.Mapper; - -/** - * - * - * @author generator generator@elink-cn.com - * @since v1.0.0 2022-07-29 - */ -@Mapper -public interface IcCoverageCategoryStatsDao extends BaseDao { - -} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryStatsEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryStatsEntity.java deleted file mode 100755 index 7947b31564..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/govorg/IcCoverageCategoryStatsEntity.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.epmet.dataaggre.entity.govorg; - -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 2022-07-29 - */ -@Data -@EqualsAndHashCode(callSuper=false) -@TableName("ic_coverage_category_stats") -public class IcCoverageCategoryStatsEntity extends BaseEpmetEntity { - - private static final long serialVersionUID = 1L; - - /** - * default；或者customerId - */ - private String customerId; - - /** - * agency,grid的id - */ - private String orgId; - - /** - * agency,grid的id - */ - private String orgType; - - /** - * agency,grid ID路径path，包含自身 - */ - private String orgIdPath; - - /** - * 类别key - */ - private String categoryKey; - - /** - * 所属场所类型。社区自组织：community_org;优势资源:superior_resource;城市管理：city_management；重点危化企业：dangerous_chemicals；公共服务：public_service；特殊人群：special_resi；居民：resi；联建单位：party_unit；群租房：group_rent；事件(包括难点堵点)：event；企事业单位巡查：enterprise_patrol； - */ - private String placeType; - - /** - * 所属五大图层：zhzl：综合治理图层；yjcl：应急处置图层；aqsc：安全生产图层；csgl：城市管理图层；ggfw：公共服务图层 - */ - private String coverageType; - - /** - * - */ - private Integer quantity; - -} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 01b9dae907..018e5ae902 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -5,10 +5,12 @@ import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStaffListFormDTO; import com.epmet.dataaggre.dto.govorg.form.StaffDetailV2FormDTO; +import com.epmet.dataaggre.dto.govorg.result.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; +import com.epmet.dataaggre.entity.epmetuser.IcResiUserEntity; import com.epmet.dto.IcResiUserDTO; import com.epmet.dto.UserBaseInfoDTO; @@ -208,4 +210,8 @@ public interface EpmetUserService { Integer getTotalByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, List resiRule, List houseIds); + + Integer countVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory); + + List listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory); } 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 000affa6ff..b42e78b256 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 @@ -31,10 +31,7 @@ import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO; import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO; import com.epmet.dataaggre.dto.govproject.result.ProjectAnalysisResultDTO; -import com.epmet.dataaggre.entity.epmetuser.CustomerStaffEntity; -import com.epmet.dataaggre.entity.epmetuser.GovStaffRoleEntity; -import com.epmet.dataaggre.entity.epmetuser.ResiUserBadgeEntity; -import com.epmet.dataaggre.entity.epmetuser.StaffRoleEntity; +import com.epmet.dataaggre.entity.epmetuser.*; import com.epmet.dataaggre.service.datastats.DataStatsService; import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.StaffPatrolDetailService; @@ -857,4 +854,14 @@ public class EpmetUserServiceImpl implements EpmetUserService { public Integer getTotalByPolicyRules(String customerId, String orgIdPath, String orgId, String orgType, String neighborHoodId, String buildingId, String unitId, String houseId, String idCard, String name, List resiRule, List houseIds) { return icResiUserDao.getTotalByPolicyRules(customerId, orgIdPath, orgId, orgType, neighborHoodId, buildingId, unitId, houseId, idCard, name, resiRule, houseIds); } + + @Override + public Integer countVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory) { + return icResiUserDao.countVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); + } + + @Override + public List listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory) { + return icResiUserDao.listVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 523b1f1fbe..b950371ffa 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.enums.MenusEnums; import com.epmet.dataaggre.redis.GovCustomerMenuRedis; import com.epmet.dataaggre.service.CoverageService; +import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; @@ -96,6 +97,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private ExecutorService executorService; + @Autowired + private EpmetUserService epmetUserService; + // 1：出租 0：自住 2：闲置 3：未售出 public static final Integer HOUSE_RENT_FLAG_RENT = 1; @@ -611,6 +615,10 @@ public class CoverageServiceImpl implements CoverageService { // 企事业单位巡查 // 最新巡查结果【0:合格 1:不合格】 return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId); + } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) { + // 志愿者 + String[] parts = categoryKey.split("_"); + return epmetUserService.countVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]); } return 0; @@ -773,6 +781,21 @@ public class CoverageServiceImpl implements CoverageService { StringUtils.isNotBlank(dc.getLatitude()) ? dc.getLatitude() : rootAgency.getLatitude(), StringUtils.isNotBlank(dc.getLongitude()) ? dc.getLongitude() : rootAgency.getLongitude())) .collect(Collectors.toList()); + } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) { + // 志愿者 + String[] parts = categoryKey.split("_"); + List resiEntities = epmetUserService.listVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]); + + return resiEntities.parallelStream().map(re -> { + // 使用楼栋的坐标补充居民的坐标信息 + String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency); + + return new CoverageAnalisisDataListResultDTO( + re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, + re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT), + coordinates[1], coordinates[0]); + + }).collect(Collectors.toList()); } return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index dfcd87920f..23e2d967d6 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -171,4 +171,42 @@ AND u.PIDS LIKE CONCAT('%',#{orgId},'%') + + + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryStatsDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryStatsDao.xml deleted file mode 100755 index 2954d89db3..0000000000 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryStatsDao.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From 03a952b4698735626aec7557afea4f5e7080dcc2 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 14:24:23 +0800 Subject: [PATCH 203/288] =?UTF-8?q?=E5=AE=89=E5=85=A8=E7=94=9F=E4=BA=A7?= =?UTF-8?q?=E9=9A=90=E6=82=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dataaggre/service/impl/CoverageServiceImpl.java | 2 +- .../mapper/govorg/IcEnterprisePatrolRecordDao.xml | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 1720dffbfc..282b336398 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -1211,7 +1211,7 @@ public class CoverageServiceImpl implements CoverageService { }else{ gridId=orgRes.getOrgId(); GridInfoCache gridInfoCache=CustomerOrgRedis.getGridInfo(orgRes.getOrgId()); - orgIdPath=gridInfoCache.getPids().concat(":").concat(gridId); + orgIdPath=gridInfoCache.getPids(); } int count = doDataListCount(formDTO.getCustomerId(), agencyId, orgIdPath, formDTO.getPlaceType(), formDTO.getCategoryKey(), null, gridId); orgRes.setTotal(count); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml index 523d80abb3..1c7d0dd16e 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml @@ -8,8 +8,12 @@ select count(1) from ic_enterprise e where e.CUSTOMER_ID = #{customerId} - and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%') - and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) + + and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%') + + + and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) + and e.PLACE_TYPE = #{categoryKey} From 1f293b7709bca661c7efd78eb11bbbce0a9cd176 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 14:25:44 +0800 Subject: [PATCH 204/288] =?UTF-8?q?=E6=9F=A5=E8=AF=A2ic=5Fcoverage=5Fcateg?= =?UTF-8?q?ory=5Fdict=E6=97=B6=EF=BC=8C=E6=96=B0=E5=A2=9Eevent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/govorg/IcCoverageCategoryDictDao.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml index c756992558..22a95a5720 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcCoverageCategoryDictDao.xml @@ -11,6 +11,14 @@ WHERE DEL_FLAG = '0' AND CUSTOMER_ID = #{customerId} AND data_type = #{dataType} + UNION ALL + SELECT + DISTINCT MENU_URL + FROM ic_coverage_category_dict + WHERE DEL_FLAG = '0' + AND CUSTOMER_ID = #{customerId} + AND data_type = 'governedTarget' + AND category_key = 'event_tdnd' From 2f98fb06e1975800b46653c7405f37f137e20c8f Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 14:30:50 +0800 Subject: [PATCH 205/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=B8=8B=E5=A4=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/GovOrgCoverageServiceImpl.java | 2 ++ .../impl/GovProjectServiceImpl.java | 3 +++ .../service/impl/CoverageServiceImpl.java | 24 +------------------ 3 files changed, 6 insertions(+), 23 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java index 4e0382068a..e5688434bc 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgCoverageServiceImpl.java @@ -294,6 +294,8 @@ public class GovOrgCoverageServiceImpl implements GovOrgCoverageService { @Override public Integer countEnterprisePatrol(String customerId, String agencyId, String staffOrgIds, String search, String categoryKey,String latestResult,String gridId) { + // ic_enterprise.AGENCY_PIDS:agency_id的所有上级 + // 网格不为空时按网格查询， 网格为空时，根据agency_id或者AGENCY_PIDS查看 return enterprisePatrolRecordDao.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,latestResult,gridId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 8cd50eb6eb..cfcef68cd5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -682,6 +682,9 @@ public class GovProjectServiceImpl implements GovProjectService { */ private LambdaQueryWrapper constructIcEventQueryWrapper(String customerId, String staffOrgIds, String search, Boolean difficultPoint, String gridId) { + //ic_event.grid_pids是网格所有的上级，不包括网格自己 + //ic_event.agency_id网格的所属组织 + //所以这staffOrgIds是组织的全路径 LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcEventEntity::getCustomerId, customerId) .eq(StringUtils.isNotBlank(gridId), IcEventEntity::getGridId, gridId); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 2be9efef33..e0cbd88226 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -39,7 +39,6 @@ import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.enums.MenusEnums; import com.epmet.dataaggre.redis.GovCustomerMenuRedis; import com.epmet.dataaggre.service.CoverageService; -import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; @@ -94,9 +93,6 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private ExecutorService executorService; - @Autowired - private EpmetUserService epmetUserService; - // 1：出租 0：自住 2：闲置 3：未售出 public static final Integer HOUSE_RENT_FLAG_RENT = 1; @@ -611,11 +607,8 @@ public class CoverageServiceImpl implements CoverageService { } else if(CoveragePlaceTypeEnum.ENTERPRISE_PATROL_UNQUALIFIED.getCode().equals(placeType)){ // 企事业单位巡查 // 最新巡查结果【0:合格 1:不合格】 + // 左侧用，可以到网格， return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId); - } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) { - // 志愿者 - String[] parts = categoryKey.split("_"); - return epmetUserService.countVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]); } return 0; @@ -778,21 +771,6 @@ public class CoverageServiceImpl implements CoverageService { StringUtils.isNotBlank(dc.getLatitude()) ? dc.getLatitude() : rootAgency.getLatitude(), StringUtils.isNotBlank(dc.getLongitude()) ? dc.getLongitude() : rootAgency.getLongitude())) .collect(Collectors.toList()); - } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) { - // 志愿者 - String[] parts = categoryKey.split("_"); - List resiEntities = epmetUserService.listVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]); - - return resiEntities.parallelStream().map(re -> { - // 使用楼栋的坐标补充居民的坐标信息 - String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency); - - return new CoverageAnalisisDataListResultDTO( - re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, - re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT), - coordinates[1], coordinates[0]); - - }).collect(Collectors.toList()); } return new ArrayList<>(); } From 562c0469fe0a4ff66a333ad32712975ee4f17ebe Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 14:44:10 +0800 Subject: [PATCH 206/288] =?UTF-8?q?=E7=89=B9=E6=AE=8A=E4=BA=BA=E7=BE=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java | 3 ++- .../com/epmet/dataaggre/service/epmetuser/IcResiService.java | 2 +- .../dataaggre/service/epmetuser/impl/IcResiServiceImpl.java | 4 ++-- .../com/epmet/dataaggre/service/impl/CoverageServiceImpl.java | 2 +- .../src/main/resources/mapper/epmetuser/IcResiUserDao.xml | 3 +++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index 5e282e7145..610d90c62d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -62,7 +62,8 @@ public interface IcResiUserDao extends BaseDao { @Param("agencyId") String agencyId, @Param("queryPids") String queryPids, @Param("categoryKey") String categoryKey, - @Param("search") String search); + @Param("search") String search, + @Param("gridId")String gridId); /** * 政策查找居民 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java index aa9462d777..cf9f5f563d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/IcResiService.java @@ -40,7 +40,7 @@ public interface IcResiService { List listSpecialResisBySpecialType(String customerId, String agencyId, String queryPids, String categoryKey, String search, Integer pageNo, Integer pageSize, Boolean isPage); - Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search); + Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search,String gridId); /** * Desc: 获取icUser diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java index 1a3d919a65..10293c2a8f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/impl/IcResiServiceImpl.java @@ -137,8 +137,8 @@ public class IcResiServiceImpl implements IcResiService { } @Override - public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search) { - return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); + public Integer countSpecialResisBySpecialType(String customerId, String agencyId, String staffOrgIds, String categoryKey, String search, String gridId) { + return resiUserDao.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search,gridId); } /** diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index e0cbd88226..b29ffcb853 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -572,7 +572,7 @@ public class CoverageServiceImpl implements CoverageService { staffOrgIds, categoryKey, search,gridId); } else if (CoveragePlaceTypeEnum.SPECIAL_RESI.getCode().equals(placeType)) { // 特殊人群 - return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search); + return icResiService.countSpecialResisBySpecialType(customerId, agencyId, staffOrgIds, categoryKey, search,gridId); } else if (CoveragePlaceTypeEnum.EVENT.getCode().equals(placeType)) { // 难点痛点 return govProjectService.countIcEventEntities(customerId, staffOrgIds, search, true,gridId); diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index fe6b98c3a8..92c000175c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -63,6 +63,9 @@ and resi.NAME like CONCAT('%', #{search},'%') + + and resi.GRID_ID =#{gridId} + and s.SPECIAL_RQLB like CONCAT('%', #{categoryKey},'%') and resi.DEL_FLAG = '0' and s.DEL_FLAG = '0' From 63924cb4a0ff5900b7355da3a5a95c44461aecd8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 29 Jul 2022 15:00:07 +0800 Subject: [PATCH 207/288] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=96=B0=E5=A2=9E=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/feign/GovAccessFeignClient.java | 4 ++++ .../fallback/GovAccessFeignClientFallBack.java | 5 +++++ .../com/epmet/controller/GovRoleController.java | 10 ++++++++++ .../java/com/epmet/service/GovRoleService.java | 2 ++ .../epmet/service/impl/GovRoleServiceImpl.java | 17 +++++++++++++++++ .../oper-customize-server/pom.xml | 6 ++++++ .../epmet/service/impl/IcFormServiceImpl.java | 9 +++++++++ 7 files changed, 53 insertions(+) diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java index aa56275f68..074b6f0504 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/GovAccessFeignClient.java @@ -9,6 +9,7 @@ import com.epmet.dto.form.*; import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.feign.fallback.GovAccessFeignClientFallBackFactory; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -64,4 +65,7 @@ public interface GovAccessFeignClient { @PostMapping("/gov/access/govrole/getgovrole") Result getGovRole(@RequestBody GovRoleListDTO formDTO); + @PostMapping("/gov/access/govrole/initgovrole/{customerId}") + Result initGovRole(@PathVariable(value = "customerId") String customerId); + } diff --git a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java index 2a2d88498d..74ea29dbfe 100644 --- a/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java +++ b/epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/feign/fallback/GovAccessFeignClientFallBack.java @@ -50,4 +50,9 @@ public class GovAccessFeignClientFallBack implements GovAccessFeignClient { public Result getGovRole(GovRoleListDTO formDTO) { return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "getGovRole", formDTO); } + + @Override + public Result initGovRole(String customerId) { + return ModuleUtils.feignConError(ServiceConstant.GOV_ACCESS_SERVER, "initGovRole", customerId); + } } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java index 0159a8d891..d56c78229c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/controller/GovRoleController.java @@ -108,4 +108,14 @@ public class GovRoleController { return new Result().ok(govRoleService.getGovRole(fromDTO)); } + /** + * 数字平台客户初始化化设置默认角色数据 + * @Author sun + */ + @PostMapping("initgovrole/{customerId}") + public Result initGovRole(@PathVariable(value = "customerId") String customerId){ + govRoleService.initGovRole(customerId); + return new Result(); + } + } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java index b7ca62a420..60b22b27b1 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/GovRoleService.java @@ -95,4 +95,6 @@ public interface GovRoleService extends BaseService { void delete(String[] ids); GovRoleDTO getGovRole(GovRoleListDTO fromDTO); + + void initGovRole(String customerId); } \ No newline at end of file diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index be20a94427..a72f8dd1f2 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -41,6 +41,7 @@ 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; @@ -135,4 +136,20 @@ public class GovRoleServiceImpl extends BaseServiceImpl list = new ArrayList<>(); + GovRoleEntity entity = new GovRoleEntity(); + entity.setCustomerId(customerId); + entity.setName("联建单位负责人"); + entity.setRemark("默认角色"); + entity.setDefaultRole("1"); + list.add(entity); + GovRoleEntity entity1 = entity; + entity1.setName("社区自组织负责人"); + list.add(entity1); + insertBatch(list); + } + } \ No newline at end of file diff --git a/epmet-module/oper-customize/oper-customize-server/pom.xml b/epmet-module/oper-customize/oper-customize-server/pom.xml index 55fd617ca9..b6694d1abb 100644 --- a/epmet-module/oper-customize/oper-customize-server/pom.xml +++ b/epmet-module/oper-customize/oper-customize-server/pom.xml @@ -95,6 +95,12 @@ 2.0.0 compile + + com.epmet + gov-access-client + 2.0.0 + compile + diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java index 0583188d71..bb75b51fc4 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormServiceImpl.java @@ -37,6 +37,7 @@ import com.epmet.dto.result.FormGroupDTO; import com.epmet.dto.result.FormItemResult; import com.epmet.entity.*; import com.epmet.feign.EpmetHeartOpenFeignClient; +import com.epmet.feign.GovAccessFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.redis.CustomerFootBarRedis; import com.epmet.service.IcFormService; @@ -83,6 +84,8 @@ public class IcFormServiceImpl extends BaseServiceImpl private EpmetHeartOpenFeignClient epmetHeartOpenFeignClient; @Resource private GovOrgOpenFeignClient govOrgOpenFeignClient; + @Resource + private GovAccessFeignClient govAccessFeignClient; /** * 获取居民信息表单 @@ -329,6 +332,12 @@ public class IcFormServiceImpl extends BaseServiceImpl throw new EpmetException(dictResult.getCode(), dictResult.getMsg()); } + //7-29 初始化为客户设置(联建单位负责人、社区自组织负责人)两个默认角色数据 + Result accessResult = govAccessFeignClient.initGovRole(customerId); + if (!accessResult.success()) { + throw new EpmetException(accessResult.getCode(), accessResult.getMsg()); + } + return "初始化成功!客户ID:" + customerId + " formCode:" + formCode; } } From 4b0e70d7375d0b10257aceb9680f99d4f12db689 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 15:18:44 +0800 Subject: [PATCH 208/288] url --- .../com/epmet/service/impl/IcUserDemandRecServiceImpl.java | 2 +- .../java/com/epmet/feign/EpmetMessageOpenFeignClient.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java index ca7b3c3f58..951b7b2e79 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcUserDemandRecServiceImpl.java @@ -444,7 +444,7 @@ public class IcUserDemandRecServiceImpl extends BaseServiceImpl Date: Fri, 29 Jul 2022 15:23:35 +0800 Subject: [PATCH 209/288] message --- epmet-gateway/pom.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 6b7db20347..9f82bf017f 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -278,6 +278,7 @@ lb://epmet-message-server + lb://epmet-activiti-server @@ -357,7 +358,7 @@ lb://epmet-heart-server - + lb://epmet-point-server @@ -366,8 +367,8 @@ http://127.0.0.1:8113 - lb://data-aggregator-server - + + http://127.0.0.1:8114 lb://open-data-worker-server From d904d1e9712df9d39fe0f9865ccad9a4f24b5935 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 29 Jul 2022 15:24:44 +0800 Subject: [PATCH 210/288] dataagg --- epmet-gateway/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index 9f82bf017f..301fb79a81 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -367,8 +367,8 @@ http://127.0.0.1:8113 - - http://127.0.0.1:8114 + lb://data-aggregator-server + lb://open-data-worker-server From c9455b80e23f98796a3890624cd103062533068a Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 29 Jul 2022 16:11:59 +0800 Subject: [PATCH 211/288] =?UTF-8?q?=E3=80=90=E5=B1=85=E6=B0=91=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AF=BC=E5=85=A5=E3=80=91=E4=BF=AE=E5=A4=8D=EF=BC=9A?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BA=AB=E4=BB=BD=E8=AF=81=E5=8F=B7=E5=88=A4?= =?UTF-8?q?=E6=96=AD=E6=98=AF=E5=90=A6=E4=B8=BA=E8=80=81=E5=B9=B4=E4=BA=BA?= =?UTF-8?q?=EF=BC=8C=E5=8A=A0=E5=85=A5=E4=BA=86=E5=8F=98=E6=9B=B4=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E4=B8=AD(=E4=B9=8B=E5=89=8D=E6=BC=8F=E6=8E=89?= =?UTF-8?q?=E8=BF=99=E7=A7=8D=E6=83=85=E5=86=B5=E4=BA=86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/IcResiUserImportServiceImpl.java | 8 ++++++++ 1 file changed, 8 insertions(+) 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 ffeaea8246..7f8921443f 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 @@ -548,6 +548,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res if ((transferData = this.getResiImportTrasferData(existingResiMap, columnAndValues)) != null) { newlyOrChangedResi.get().getTransferedResis().put(existingResiMap.get("ID"), transferData); } + + // 因为主表会产生变更记录的，只有组织变更；其他能产生变更记录的，都在子表里面，所以此处只判断组织变更，其他类别的变更交给子表 + // 老年人产生变更记录，只会在新增居民的时候产生，修改居民信息不会产生，因为身份证不可变 } else { // 新增居民 String resiId = IdWorker.getIdStr(); @@ -566,6 +569,11 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res columnAndValues.get("HOME_ID"), new HashMap<>()); + // 因为老年人会通过年龄计算，子sheet中不一定有这个人的信息，所以此处需要加入到变更记录中去 + if ("1".equals(columnAndValues.get("IS_OLD_PEOPLE"))) { + categoryData.getCategories().put("IS_OLD_PEOPLE", "1"); + } + redisUtils.hMSet(RedisKeys.icResiImportResiCategoryKey(newlyOrChangedResi.get().getImportTag(), "add", resiId), BeanUtil.beanToMap(categoryData)); categoryData = null; } From 41338ef04996eaabcc948a974b6ad3666ce1463d Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 29 Jul 2022 16:13:48 +0800 Subject: [PATCH 212/288] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.27__alter_party_communit.sql | 11 +++++++++++ .../resources/db/migration/V0.0.8__alter_gov_role.sql | 4 ++++ .../resources/db/migration/V0.0.39__alter_dept.sql | 5 +++++ 3 files changed, 20 insertions(+) create mode 100644 epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.27__alter_party_communit.sql create mode 100644 epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.8__alter_gov_role.sql create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.39__alter_dept.sql diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.27__alter_party_communit.sql b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.27__alter_party_communit.sql new file mode 100644 index 0000000000..e7aca4b8aa --- /dev/null +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/db/migration/V0.0.27__alter_party_communit.sql @@ -0,0 +1,11 @@ + +ALTER TABLE `ic_community_self_organization` +ADD COLUMN `SYNC_TYPE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'not_sync' COMMENT '同步状态【已同步:sync 未同步:not_sync】' AFTER `ADDRESS`, +ADD COLUMN `DEPT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID customer_department.id' AFTER `SYNC_TYPE`, +ADD COLUMN `DEPT_STAFF_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门下工作人员Id' AFTER `DEPT_ID`; + +ALTER TABLE `ic_party_unit` +ADD COLUMN `SYNC_TYPE` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'not_sync' COMMENT '同步状态【已同步:sync 未同步:not_sync】' AFTER `REMARK`, +ADD COLUMN `DEPT_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门ID customer_department.id' AFTER `SYNC_TYPE`, +ADD COLUMN `DEPT_STAFF_ID` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '部门下工作人员Id' AFTER `DEPT_ID`; + diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.8__alter_gov_role.sql b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.8__alter_gov_role.sql new file mode 100644 index 0000000000..3372836974 --- /dev/null +++ b/epmet-module/gov-access/gov-access-server/src/main/resources/db/migration/V0.0.8__alter_gov_role.sql @@ -0,0 +1,4 @@ + + +ALTER TABLE `gov_role` +ADD COLUMN `default_role` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '0' COMMENT '是否默认角色【0:否 1:是】' AFTER `remark`; diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.39__alter_dept.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.39__alter_dept.sql new file mode 100644 index 0000000000..9dc87f0bd2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.39__alter_dept.sql @@ -0,0 +1,5 @@ + +ALTER TABLE `customer_department` +ADD COLUMN `DEPT_TYPE` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT 'duty' COMMENT '部门类型【职能部门: duty \r\n联建单位: party_unit \r\n社会自组织: community_org】' AFTER `MOBILE`; + + From a8097c956981712ac4a9938eccdc4cab8c3e4fd5 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 29 Jul 2022 16:20:45 +0800 Subject: [PATCH 213/288] =?UTF-8?q?=E6=80=BB=E8=AE=A1=20=E4=BA=BA=E5=9D=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dataaggre/controller/GovOrgController.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java index 83ae19c53b..bbf8011130 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java @@ -498,13 +498,15 @@ public class GovOrgController { sum.setMemberCount(sum.getMemberCount() + list.stream().mapToInt(OrgProjectDetailExcel::getMemberCount).sum()); sum.setProjectCount(sum.getProjectCount() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectCount).sum()); sum.setClosedCount(sum.getClosedCount() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedCount).sum()); - sum.setProjectAve(sum.getProjectAve() + list.stream().mapToInt(OrgProjectDetailExcel::getProjectAve).sum()); - sum.setClosedAve(sum.getClosedAve() + list.stream().mapToInt(OrgProjectDetailExcel::getClosedAve).sum()); excelWriter.write(list, writeSheet); formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); } while (org.apache.commons.collections4.CollectionUtils.isNotEmpty(page.getList()) && page.getList().size() == formDTO.getPageSize()); sum.setIndex(i.getAndIncrement()); sum.setOrgName("合计"); + if (NumConstant.ZERO != sum.getMemberCount()) { + sum.setProjectAve(sum.getProjectCount()/sum.getMemberCount()); + sum.setClosedAve(sum.getClosedCount()/sum.getMemberCount()); + } List list = new ArrayList<>(); list.add(sum); excelWriter.write(list, writeSheet); From a62e367693061a20a710c353dcd10f33356b5cec Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 29 Jul 2022 16:55:59 +0800 Subject: [PATCH 214/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/CustomerStaffAgencyDao.java | 3 + .../dao/govorg/CustomerStaffGridDao.java | 2 + .../dataaggre/dao/govproject/ProjectDao.java | 2 + .../epmetuser/impl/EpmetUserServiceImpl.java | 3 + .../govorg/impl/GovOrgServiceImpl.java | 167 ++++++++++++++---- .../service/govproject/GovProjectService.java | 16 ++ .../impl/GovProjectServiceImpl.java | 36 ++++ .../mapper/govorg/CustomerStaffAgencyDao.xml | 35 ++++ .../mapper/govorg/CustomerStaffGridDao.xml | 13 ++ .../mapper/govproject/ProjectDao.xml | 37 ++++ 10 files changed, 280 insertions(+), 34 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java index 043d5c245d..96e44d2c3a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffAgencyDao.java @@ -22,6 +22,7 @@ import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.CustomerStaffAgencyDTO; import com.epmet.dataaggre.dto.govorg.OrgDTO; +import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO; import com.epmet.dataaggre.entity.govorg.CustomerStaffAgencyEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -71,4 +72,6 @@ public interface CustomerStaffAgencyDao extends BaseDao selectSubAgency(@Param("agencyId") String agencyId, @Param("userId") String userId); + List getStaffList(@Param("orgId") String orgId, @Param("orgType") String orgType); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java index 2fcba2cdc4..b481617cb2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerStaffGridDao.java @@ -56,4 +56,6 @@ public interface CustomerStaffGridDao extends BaseDao { * @Date 2021/8/20 14:37 */ List selectGridList(@Param("agencyId") String agencyId, @Param("userId") String userId); + + List getGridStaffByAgency(@Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 05354d0b8b..956e8b95ed 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -130,4 +130,6 @@ public interface ProjectDao extends BaseDao { List getGridClosedProjectCount(OrgStatisticsFormDTO formDTO); List getMemberProjectCount(OrgStatisticsFormDTO formDTO); List getMemberClosedProjectCount(OrgStatisticsFormDTO formDTO); + List getAgencyProjectCount(OrgStatisticsFormDTO formDTO); + List getAgencyClosedProjectCount(OrgStatisticsFormDTO formDTO); } 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 4e31dd4a5d..025f550198 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 @@ -605,6 +605,9 @@ public class EpmetUserServiceImpl implements EpmetUserService { queryWrapper.eq(CustomerStaffEntity::getUserId,staffId) .eq(CustomerStaffEntity::getDelFlag,NumConstant.ZERO_STR); CustomerStaffEntity staffEntity = customerStaffDao.selectOne(queryWrapper); + if (null == staffEntity) { + return null; + } CustomerStaffResultDTO result = ConvertUtils.sourceToTarget(staffEntity, CustomerStaffResultDTO.class); //查询工作人员所属组织信息 diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index 99318e966c..f9772a9f47 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.dataaggre.service.govorg.impl; import cn.afterturn.easypoi.excel.ExcelExportUtil; import cn.afterturn.easypoi.excel.entity.ExportParams; import cn.afterturn.easypoi.excel.entity.enmus.ExcelType; +import cn.hutool.core.bean.BeanUtil; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.dingtalk.api.request.OapiRobotSendRequest; @@ -24,17 +25,17 @@ 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.BuildingInfoCache; +import com.epmet.commons.tools.redis.common.bean.CustomerStaffInfoCache; 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.DateUtils; import com.epmet.commons.tools.utils.HttpClientManager; import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dao.govorg.*; -import com.epmet.dataaggre.dto.datastats.result.SubAgencyProjectResultDTO; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; @@ -66,6 +67,7 @@ import org.apache.commons.fileupload.disk.DiskFileItemFactory; import org.apache.commons.lang3.StringUtils; import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; +import org.jetbrains.annotations.Nullable; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.commons.CommonsMultipartFile; @@ -75,6 +77,7 @@ import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletResponse; import java.io.IOException; import java.io.OutputStream; +import java.text.Collator; import java.text.NumberFormat; import java.text.SimpleDateFormat; import java.util.*; @@ -1153,17 +1156,12 @@ public class GovOrgServiceImpl implements GovOrgService { public PageData orgProjectDetailList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { List resultList = new ArrayList<>(); if (StringUtils.isBlank(formDTO.getAgencyId())) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); } formDTO.setAgencyId(staffInfo.getAgencyId()); } - if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) { - //当前日期前一天 - String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); - formDTO.setEndDate(dateId); - } CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); if (null == agencyEntity) { return new PageData<>(Collections.emptyList(), NumConstant.ZERO); @@ -1184,7 +1182,7 @@ public class GovOrgServiceImpl implements GovOrgService { //统计网格关闭项目数 Map closedMap = govProjectService.getGridClosedProjectMap(formDTO); //网格员统计 - Map memberMap = dataStatsService.getMemberMap(formDTO.getAgencyId()); + Map memberMap = getMemberMap(tokenDto.getCustomerId(), formDTO.getAgencyId()); resultList = gridList.stream().map(grid -> { OrgProjectDetailResultDTO dto = new OrgProjectDetailResultDTO(); dto.setOrgId(grid.getId()); @@ -1197,9 +1195,11 @@ public class GovOrgServiceImpl implements GovOrgService { dto.setClosedCount(closedMap.get(grid.getId())); } if (memberMap.containsKey(grid.getId())) { - dto.setMemberCount(memberMap.get(grid.getId())); - dto.setProjectAve(dto.getProjectCount()/memberMap.get(grid.getId())); - dto.setClosedAve(dto.getClosedCount()/memberMap.get(grid.getId())); + dto.setMemberCount(Math.toIntExact(memberMap.get(grid.getId()))); + if (NumConstant.ZERO != dto.getMemberCount()) { + dto.setProjectAve(dto.getProjectCount() / dto.getMemberCount()); + dto.setClosedAve(dto.getClosedCount() / dto.getMemberCount()); + } } return dto; }).collect(Collectors.toList()); @@ -1221,7 +1221,10 @@ public class GovOrgServiceImpl implements GovOrgService { //拼装数据 if (CollectionUtils.isNotEmpty(agencyList)) { //项目相关统计 - Map projectMap = dataStatsService.getAgencyProjectTotal(formDTO); + //统计项目数 + Map projectMap = govProjectService.getAgencyProjectMap(formDTO); + //统计关闭项目数 + Map closedMap = govProjectService.getAgencyClosedProjectMap(formDTO); //网格员统计 Map memberMap = epmetUserService.getMemberCount(tokenDto.getCustomerId()); @@ -1230,12 +1233,12 @@ public class GovOrgServiceImpl implements GovOrgService { dto.setOrgId(agency.getId()); dto.setOrgType(OrgConstant.AGENCY); dto.setOrgName(agency.getOrganizationName()); - if (projectMap.containsKey(agency.getId())) { - dto.setProjectCount(projectMap.get(agency.getId()).getProjectTotal()); - dto.setClosedCount(projectMap.get(agency.getId()).getClosedProjectTotal()); - } //获取当前组织的所有下级组织ID（包含本级） List agencyIds = customerAgencyDao.getSubAgencyList(agency.getId()); + int projectCount = agencyIds.stream().filter(projectMap::containsKey).mapToInt(projectMap::get).sum(); + int closedCount = agencyIds.stream().filter(closedMap::containsKey).mapToInt(closedMap::get).sum(); + dto.setProjectCount(projectCount); + dto.setClosedCount(closedCount); //将下级组织网格员数加起来 int memberCount = agencyIds.stream().filter(memberMap::containsKey).mapToInt(memberMap::get).sum(); dto.setMemberCount(memberCount); @@ -1268,30 +1271,25 @@ public class GovOrgServiceImpl implements GovOrgService { @Override public PageData memberProjectInfoList(TokenDto tokenDto, OrgStatisticsFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); - PageData result; if (StringUtils.isBlank(formDTO.getOrgId())) { - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); if (null == staffInfo) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); } formDTO.setOrgId(staffInfo.getAgencyId()); formDTO.setOrgType(OrgConstant.AGENCY); } - if (StringUtils.isEmpty(formDTO.getStartDate()) && StringUtils.isEmpty(formDTO.getEndDate())) { - //当前日期前一天 - String dateId = DateUtils.format(DateUtils.addDateDays(new Date(), NumConstant.ONE_NEG), DateUtils.DATE_PATTERN_YYYYMMDD); - formDTO.setEndDate(dateId); - } - if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { - //获取当前组织的所有下级组织ID（包含本级） - List agencyIds = customerAgencyDao.getSubAgencyList(formDTO.getOrgId()); - formDTO.setAgencyList(agencyIds); - //获取组织下的网格员 - result = epmetUserService.getMemberList(formDTO); - } else { - //获取网格下的网格员 - result = dataStatsService.getMemberList(formDTO); - } + PageData result = getGridMemberList(formDTO); + //if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { + // //获取当前组织的所有下级组织ID（包含本级） + // //List agencyIds = customerAgencyDao.getSubAgencyList(formDTO.getOrgId()); + // //formDTO.setAgencyList(agencyIds); + // //获取组织下的网格员 + // result = epmetUserService.getMemberList(formDTO); + //} else { + // //获取网格下的网格员 + // result = dataStatsService.getMemberList(formDTO); + //} if (CollectionUtils.isNotEmpty(result.getList())) { //统计项目数 Map projectMap = govProjectService.getMemberProjectMap(formDTO); @@ -1319,4 +1317,105 @@ public class GovOrgServiceImpl implements GovOrgService { } return result; } + + private PageData getGridMemberList(OrgStatisticsFormDTO formDTO) { + List list = new ArrayList<>(); + List staffList = customerStaffAgencyDao.getStaffList(formDTO.getOrgId(), formDTO.getOrgType()); + if (OrgConstant.AGENCY.equals(formDTO.getOrgType())) { + for (StaffOrgRelationResultDTO staff : staffList) { + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), staff.getStaffId()); + if (null != staffInfo) { + if(staffInfo.getRoleMap().containsKey("grid_member")) { + MemberProjectInfoResultDTO dto = new MemberProjectInfoResultDTO(); + dto.setStaffId(staff.getStaffId()); + dto.setStaffName(staffInfo.getRealName()); + dto.setOrgId(staff.getOrgId()); + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(staff.getOrgId()); + if (null != agencyInfo) { + dto.setOrgName(agencyInfo.getOrganizationName()); + } + list.add(dto); + } + } + } + } else { + for (StaffOrgRelationResultDTO staff : staffList) { + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(formDTO.getCustomerId(), staff.getStaffId()); + if (null != staffInfo) { + if(staffInfo.getRoleMap().containsKey("grid_member")) { + MemberProjectInfoResultDTO dto = new MemberProjectInfoResultDTO(); + dto.setStaffId(staff.getStaffId()); + dto.setStaffName(staffInfo.getRealName()); + dto.setOrgId(staff.getOrgId()); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(staff.getOrgId()); + if (null != gridInfo) { + dto.setOrgName(gridInfo.getGridName()); + } + list.add(dto); + } + } + } + } + int num = (formDTO.getPageNo() - NumConstant.ONE) * formDTO.getPageSize(); + PageInfo pageInfo = new PageInfo<>(list); + list = list.stream().sorted((o1, o2) -> + Collator.getInstance(Locale.SIMPLIFIED_CHINESE) + .compare(o1.getStaffName(),o2.getStaffName())).collect(Collectors.toList()); + list = list.stream().skip(num).limit(formDTO.getPageSize()).collect(Collectors.toList()); + return new PageData<>(list, pageInfo.getTotal()); + + } + + private Map getMemberMap(String customerId, String agencyId) { + List list = customerStaffGridDao.getGridStaffByAgency(agencyId); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + list = list.stream().filter(item -> { + CustomerStaffInfoCacheResult staffInfo = getStaffInfo(customerId, item.getStaffId()); + if (null != staffInfo) { + if (staffInfo.getRoleMap().containsKey("grid_member")) { + return true; + } + } + return false; + }).collect(Collectors.toList()); + + return list.stream().collect(Collectors.groupingBy(GridStaffResultDTO::getGridId, Collectors.counting())); + } + + + private CustomerStaffInfoCacheResult getStaffInfo(String customerId, String staffId) { + if (StringUtils.isBlank(customerId) || StringUtils.isBlank(staffId)){ + log.warn("getStaffInfo param is blank,customerId:{},staffId:{}",customerId,staffId); + return null; + } + String key = RedisKeys.getCustomerStaffInfoKey(customerId, staffId); + Map roleMap = redisUtils.hGetAll(key); + if (!org.springframework.util.CollectionUtils.isEmpty(roleMap)) { + return ConvertUtils.mapToEntity(roleMap, CustomerStaffInfoCacheResult.class); + } + + CustomerStaffInfoCache resultData = reloadStaffCache(staffId, key); + if (resultData == null) { + return null; + } + + return ConvertUtils.sourceToTarget(resultData, CustomerStaffInfoCacheResult.class); + } + + @Nullable + private CustomerStaffInfoCache reloadStaffCache(String staffId, String key) { + CustomerStaffResultDTO staffResult = epmetUserService.getStaffInfo(staffId); + if (staffResult == null) { + log.warn("getStaffInfo staff is null,staffId:{}", staffId); + return null; + } + CustomerStaffInfoCache resultData =ConvertUtils.sourceToTarget(staffResult, CustomerStaffInfoCache.class); + + Map map = BeanUtil.beanToMap(resultData, false, true); + redisUtils.hMSet(key, map); + return resultData; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 31beec2422..27e554145d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -153,4 +153,20 @@ public interface GovProjectService { * @Date 2022/7/28 9:29 */ Map getMemberClosedProjectMap(OrgStatisticsFormDTO formDTO); + /** + * 组织上报项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + Map getAgencyProjectMap(OrgStatisticsFormDTO formDTO); + /** + * 组织关闭项目数 + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + Map getAgencyClosedProjectMap(OrgStatisticsFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 72e51a6a54..ffe5d2d7a3 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -721,6 +721,42 @@ public class GovProjectServiceImpl implements GovProjectService { return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); } + /** + * 组织上报项目数 + * + * @param formDTO + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + @Override + public Map getAgencyProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getAgencyProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + + /** + * 组织关闭项目数 + * + * @param formDTO + * @Param formDTO + * @Return {@link Map< String, Integer>} + * @Author zhaoqifeng + * @Date 2022/7/28 9:29 + */ + @Override + public Map getAgencyClosedProjectMap(OrgStatisticsFormDTO formDTO) { + List list = projectDao.getAgencyClosedProjectCount(formDTO); + if (CollectionUtils.isEmpty(list)) { + return Collections.emptyMap(); + } + return list.stream().collect(Collectors.toMap(OrgCountDTO::getOrgId, OrgCountDTO::getCount, (o1, o2) -> o1)); + } + /** * 构造事件查询 * @param customerId diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml index d2c47a0922..b39a38745d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffAgencyDao.xml @@ -124,4 +124,39 @@ ca.ID ORDER BY ca.CREATED_TIME ASC + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml index d7bfb5ff40..0120ff67a5 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerStaffGridDao.xml @@ -55,4 +55,17 @@ cg.ID ORDER BY cg.CREATED_TIME ASC + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index e56a84c754..5771dfad79 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -501,5 +501,42 @@ GROUP BY STAFF_ID + + From edd5538d55e5f15244fc649f576fae0cd78aa670 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 29 Jul 2022 17:10:53 +0800 Subject: [PATCH 215/288] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E7=BB=84?= =?UTF-8?q?=E7=BB=87category?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/heart/IcCommunitySelfOrganizationDao.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml index b374071590..57b7dc3449 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/heart/IcCommunitySelfOrganizationDao.xml @@ -13,7 +13,8 @@ ifnull(PRINCIPAL_PHONE,'') AS mobile, ifnull(ADDRESS,'') as address, ifnull(LONGITUDE,'') as longitude, - ifnull(LATITUDE,'') as latitude + ifnull(LATITUDE,'') as latitude, + IFNULL(CATEGORY_CODE,'') as category FROM ic_community_self_organization WHERE DEL_FLAG = 0 AND CUSTOMER_ID = #{customerId} From 6135774ea255370161aa93e78e29c19b766c35f5 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 29 Jul 2022 17:34:51 +0800 Subject: [PATCH 216/288] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/DepartmentServiceImpl.java | 4 ++++ .../com/epmet/service/impl/CustomerStaffServiceImpl.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index 0793688b22..dbc9be392b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -408,6 +408,8 @@ public class DepartmentServiceImpl implements DepartmentService { deptDTO.setDepartmentName(formDTO.getDeptName()); deptDTO.setDeptType(formDTO.getDeptType()); deptDTO.setTotalUser(1); + deptDTO.setContacts(formDTO.getPersonName()); + deptDTO.setMobile(formDTO.getMobile()); Result deptResult = addDepartment(deptDTO); //三、新增组织人员关系数据 //人员机关关系表 @@ -470,6 +472,8 @@ public class DepartmentServiceImpl implements DepartmentService { deptDTO.setDepartmentName(formDTO.getDeptName()); deptDTO.setDeptType(formDTO.getDeptType()); deptDTO.setTotalUser(1); + deptDTO.setContacts(formDTO.getPersonName()); + deptDTO.setMobile(formDTO.getMobile()); Result deptResult = addDepartment(deptDTO); //三、部门下新增人员关系数据 CustomerStaffDepartmentEntity dept = new CustomerStaffDepartmentEntity(); 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 8fcc9b5338..3a10aa1b26 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 @@ -894,9 +894,17 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl newRoles = new ArrayList<>(); newRoles.add(resultRole.getData().getId()); + fromDTO.setNewRoles(newRoles); //3.新增工作人员 Result result = addStaff(fromDTO); + + //4.新增数字平台角色信息 + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(), fromDTO.getCustomerId())); + if (!roleUserAccess.success()) { + throw new RenException("工作人员新增数字平台角色信息失败" + resultRole.getMsg()); + } + return result; } From 3cd902ca44d72dea5fc2b71a4d400b978ac8a772 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 29 Jul 2022 17:45:20 +0800 Subject: [PATCH 217/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9A=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95?= =?UTF-8?q?"=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=E4=BA=8B=E4=BB=B6"?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java index 6078970cb2..6f71e122b0 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/CoveragePlaceTypeEnum.java @@ -17,7 +17,7 @@ public enum CoveragePlaceTypeEnum { PARTY_UNIT("party_unit", "联建单位"), VOLUNTEER("volunteer", "志愿者"), GROUP_RENT("group_rent", "群租房"), - EVENT("event", "事件(包括难点堵点)"), + EVENT("event", "城市管理事件"), ZHZL_RQ("zhzl_rq", "综合治理人群"); private final String code; From d3c26eb07faf3f1cea1fa1b8f521d168c268b7a0 Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 29 Jul 2022 17:48:23 +0800 Subject: [PATCH 218/288] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E8=BF=94=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java index 70b6bdb9ae..8e6ab35c55 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java +++ b/epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/wxapi/service/impl/WxMaCodeServiceImpl.java @@ -149,7 +149,7 @@ public class WxMaCodeServiceImpl implements WxMaCodeService { } JSONObject jsonObject = JSONObject.parseObject(submitResult.getData()); result.setErrorCode(jsonObject.getInteger(ERR_CODE)); - result.setErrorMsg(WxMaErrorMsgEnum.findMsgByCode(jsonObject.getInteger(ERR_CODE))); + result.setErrorMsg(jsonObject.getString(ERR_MSG)); result.setData(jsonObject.getString("auditid")); return result; } From 6605605033ebd3ac68a5a7eab8293fb8894fad52 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Fri, 29 Jul 2022 23:14:33 +0800 Subject: [PATCH 219/288] =?UTF-8?q?=E3=80=90=E5=9B=BE=E5=B1=82=E3=80=91?= =?UTF-8?q?=E6=89=BE=E5=9B=9E=E5=90=88=E4=B8=A2=E7=9A=84=E5=BF=97=E6=84=BF?= =?UTF-8?q?=E8=80=85=E6=95=B0=E9=87=8F=E5=92=8C=E6=90=9C=E7=B4=A2=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CoverageServiceImpl.java | 23 +++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index b29ffcb853..2a2cdb1474 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -39,6 +39,7 @@ import com.epmet.dataaggre.entity.opercustomize.IcResiCategoryWarnConfigEntity; import com.epmet.dataaggre.enums.MenusEnums; import com.epmet.dataaggre.redis.GovCustomerMenuRedis; import com.epmet.dataaggre.service.CoverageService; +import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.IcResiService; import com.epmet.dataaggre.service.govorg.GovOrgCoverageService; import com.epmet.dataaggre.service.govorg.GovOrgService; @@ -93,6 +94,9 @@ public class CoverageServiceImpl implements CoverageService { @Autowired private ExecutorService executorService; + @Autowired + private EpmetUserService epmetUserService; + // 1：出租 0：自住 2：闲置 3：未售出 public static final Integer HOUSE_RENT_FLAG_RENT = 1; @@ -609,6 +613,10 @@ public class CoverageServiceImpl implements CoverageService { // 最新巡查结果【0:合格 1:不合格】 // 左侧用，可以到网格， return orgCoverageService.countEnterprisePatrol(customerId, agencyId, staffOrgIds, search, categoryKey,NumConstant.ONE_STR,gridId); + } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) { + // 志愿者 + String[] parts = categoryKey.split("_"); + return epmetUserService.countVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]); } return 0; @@ -771,6 +779,21 @@ public class CoverageServiceImpl implements CoverageService { StringUtils.isNotBlank(dc.getLatitude()) ? dc.getLatitude() : rootAgency.getLatitude(), StringUtils.isNotBlank(dc.getLongitude()) ? dc.getLongitude() : rootAgency.getLongitude())) .collect(Collectors.toList()); + } else if (CoveragePlaceTypeEnum.VOLUNTEER.getCode().equals(placeType)) { + // 志愿者 + String[] parts = categoryKey.split("_"); + List resiEntities = epmetUserService.listVolunteers(customerId, agencyId, staffOrgIds, search, parts[1]); + + return resiEntities.parallelStream().map(re -> { + // 使用楼栋的坐标补充居民的坐标信息 + String[] coordinates = getUserCoordinates(re.getId(), re.getBuildId(), rootAgency); + + return new CoverageAnalisisDataListResultDTO( + re.getId(), categoryKey, isPage ? categoryDict.getCategoryName() : null, placeType, + re.getName().concat(StrConstant.BRACKET_LEFT).concat(re.getIdCard()).concat(StrConstant.BRACKET_RIGNT), + coordinates[1], coordinates[0]); + + }).collect(Collectors.toList()); } return new ArrayList<>(); } From 22ecd92922e9dba8d9ea1c3a060ec92d1c31d523 Mon Sep 17 00:00:00 2001 From: syc Date: Mon, 1 Aug 2022 11:19:04 +0800 Subject: [PATCH 220/288] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/DepartmentServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index dbc9be392b..f55fcaf70e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -370,6 +370,7 @@ public class DepartmentServiceImpl implements DepartmentService { //姓名不一样的给反馈 if (!formDTO.getPersonName().equals(userResult.getData().getRealName())) { resultDTO.setPersonName(userResult.getData().getRealName()); + resultDTO.setMsg("联系电话已存在工作账号，姓名已更新"); } resultDTO.setType(true); From 86c31a0c57e888108c68f884f45fbce528210c76 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 1 Aug 2022 12:51:05 +0800 Subject: [PATCH 221/288] =?UTF-8?q?=E3=80=90rocketmq=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E3=80=91=E4=B9=8B=E5=89=8D=E4=BF=AE=E6=94=B9mq=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=BF=98=E4=BA=86?= =?UTF-8?q?=E5=8A=A0=E4=B8=8Ayml=E7=9A=84=E9=85=8D=E7=BD=AE=EF=BC=8C?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet-admin-server/src/main/resources/bootstrap.yml | 3 ++- .../data-statistical-server/src/main/resources/bootstrap.yml | 2 ++ .../epmet-heart-server/src/main/resources/bootstrap.yml | 2 ++ .../epmet-message-server/src/main/resources/bootstrap.yml | 2 ++ .../epmet-point-server/src/main/resources/bootstrap.yml | 4 +++- .../epmet-third-server/src/main/resources/bootstrap.yml | 2 ++ .../gov-issue-server/src/main/resources/bootstrap.yml | 2 ++ .../gov-org/gov-org-server/src/main/resources/bootstrap.yml | 2 ++ .../open-data-worker-server/src/main/resources/bootstrap.yml | 2 ++ .../oper-customize-server/src/main/resources/bootstrap.yml | 2 ++ .../resi-group-server/src/main/resources/bootstrap.yml | 2 ++ .../resi-partymember-server/src/main/resources/bootstrap.yml | 4 +++- epmet-user/epmet-user-server/src/main/resources/bootstrap.yml | 2 ++ 13 files changed, 28 insertions(+), 3 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index 80503e260f..c6a439be3c 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -140,7 +140,8 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - + client: + logUseSlf4j: true thread: # 线程池配置 threadPool: diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index 530c216a2d..0fdb1169d4 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -226,3 +226,5 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index 0f10a78167..124d7b778b 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -151,6 +151,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # 停机选项 shutdown: graceful: diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml index 1c4e2f2bfd..1f5a8c83bf 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml @@ -152,6 +152,8 @@ shutdown: waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警 rocketmq: + client: + logUseSlf4j: true name-server: @rocketmq.nameserver@ producer: group: @rocketmq.producer.group@ diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index b3fa3f8fe9..4c7bbe3542 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -147,4 +147,6 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true \ No newline at end of file diff --git a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml index 573b117d9d..67cbb2570e 100644 --- a/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-third/epmet-third-server/src/main/resources/bootstrap.yml @@ -157,6 +157,8 @@ shutdown: waitTimeSecs: 30 # 优雅停机等待时间，超过30秒，发出告警 rocketmq: + client: + logUseSlf4j: true # epmet-cloud集群内部用的rocketmq # epmet-cloud-inner: # enable: @rocketmq.epmet-cloud-inner.enable@ diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 06f9b57041..940a51c056 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -142,6 +142,8 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true thread: # 线程池配置 diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 5a6a066a1b..2dd0a7d172 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -165,6 +165,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # consume-thread-min: 2 # consume-thread-max: 2 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 6118195219..397003f631 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -147,6 +147,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true thread: # 线程池配置 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 346506fb54..91b9bbfe59 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -130,6 +130,8 @@ dingTalk: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # 停机选项 shutdown: diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index b782d086dc..e1e520b3dd 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -175,3 +175,5 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index 751620e91d..7513661df2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -147,4 +147,6 @@ thread: # rocketmq rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ \ No newline at end of file + name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index a9ec2fcadb..cfe4da3c8f 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -168,6 +168,8 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ + client: + logUseSlf4j: true # 停机选项 shutdown: From 883d88a847dd2daa8c65a5f1fed7a68e64f09f6d Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 1 Aug 2022 14:50:07 +0800 Subject: [PATCH 222/288] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=92=8C=20=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcCityManagementDao.xml | 4 ++++ .../src/main/resources/mapper/IcPublicServiceDao.xml | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml index 051d742db4..2b83594d09 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml @@ -17,6 +17,8 @@ address, longitude, latitude, + principal, + mobile, del_flag, revision, created_by, @@ -39,6 +41,8 @@ #{i.address}, #{i.longitude}, #{i.latitude}, + #{i.principal}, + #{i.mobile}, 0, 0, #{i.createdBy}, diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 3894594840..513a824d42 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -17,6 +17,8 @@ address, longitude, latitude, + principal, + mobile, del_flag, revision, created_by, @@ -39,6 +41,8 @@ #{i.address}, #{i.longitude}, #{i.latitude}, + #{i.principal}, + #{i.mobile}, 0, 0, #{i.createdBy}, From 50ab9c9f7426a68b4585ba75aab1f74a1b516a5d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 1 Aug 2022 14:50:59 +0800 Subject: [PATCH 223/288] =?UTF-8?q?=E3=80=90RocketMQ=E3=80=91=E9=80=9A?= =?UTF-8?q?=E8=BF=87=E5=90=AF=E5=8A=A8=E7=B1=BB=E5=90=AF=E7=94=A8slf4j?= =?UTF-8?q?=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/AdminApplication.java | 1 + .../src/main/resources/bootstrap.yml | 3 +- .../data-statistical-server/pom.xml | 2 +- .../java/com/epmet/DataStatsApplication.java | 2 ++ .../src/main/resources/bootstrap.yml | 3 +- .../java/com/epmet/EpmetHeartApplication.java | 2 ++ .../src/main/resources/bootstrap.yml | 3 +- .../src/main/resources/logback-spring.xml | 28 +++++++++++++++++++ .../java/com/epmet/MessageApplication.java | 1 + .../src/main/resources/logback-spring.xml | 28 +++++++++++++++++++ .../java/com/epmet/EpmetPointApplication.java | 1 + .../src/main/resources/bootstrap.yml | 4 +-- .../java/com/epmet/GovIssueApplication.java | 1 + .../src/main/resources/bootstrap.yml | 3 +- .../java/com/epmet/GovOrgApplication.java | 1 + .../src/main/resources/bootstrap.yml | 2 -- .../java/com/epmet/OpenDataApplication.java | 1 + .../src/main/resources/bootstrap.yml | 2 -- .../com/epmet/OperCustomizeApplication.java | 1 + .../src/main/resources/bootstrap.yml | 2 -- .../java/com/epmet/ResiGroupApplication.java | 1 + .../src/main/resources/bootstrap.yml | 2 -- .../com/epmet/ResiPartyMemberApplication.java | 1 + .../src/main/resources/bootstrap.yml | 4 +-- .../src/main/resources/logback-spring.xml | 28 +++++++++++++++++++ .../main/java/com/epmet/UserApplication.java | 1 + .../src/main/resources/bootstrap.yml | 2 -- .../src/main/resources/logback-spring.xml | 28 +++++++++++++++++++ 28 files changed, 133 insertions(+), 25 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java index 4678542a56..67c7a22169 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/AdminApplication.java @@ -27,6 +27,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; public class AdminApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(AdminApplication.class, args); } diff --git a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml index c6a439be3c..80503e260f 100644 --- a/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml +++ b/epmet-admin/epmet-admin-server/src/main/resources/bootstrap.yml @@ -140,8 +140,7 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + thread: # 线程池配置 threadPool: diff --git a/epmet-module/data-statistical/data-statistical-server/pom.xml b/epmet-module/data-statistical/data-statistical-server/pom.xml index 98bb995c7e..b04561cd9a 100644 --- a/epmet-module/data-statistical/data-statistical-server/pom.xml +++ b/epmet-module/data-statistical/data-statistical-server/pom.xml @@ -444,7 +444,7 @@ SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd - local + false 192.168.1.140:9876;192.168.1.141:9876 diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java index 15bb6ee2a6..37be951be3 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/DataStatsApplication.java @@ -16,6 +16,8 @@ import org.springframework.scheduling.annotation.EnableAsync; public class DataStatsApplication { public static void main(String[] args) { + // 让rocketmq使用slf4j管理日志 + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(DataStatsApplication.class ,args); } } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml index 0fdb1169d4..ed65817966 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/bootstrap.yml @@ -226,5 +226,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java index 236d81d8d9..caec050a5f 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/EpmetHeartApplication.java @@ -29,6 +29,8 @@ import org.springframework.scheduling.annotation.EnableAsync; public class EpmetHeartApplication { public static void main(String[] args) { + // 让rocketmq使用slf4j管理日志 + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(EpmetHeartApplication.class, args); } diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml index 124d7b778b..352a8283aa 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/resources/bootstrap.yml @@ -151,8 +151,7 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + # 停机选项 shutdown: graceful: 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 d0428fcee3..b03ee98c4c 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 @@ -138,11 +138,35 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -156,6 +180,10 @@ + + + + diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java index 5a2a928d7a..120a8d5f7e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/MessageApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class MessageApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(MessageApplication.class, args); } 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 6b34183b22..338e0b9495 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 @@ -139,12 +139,36 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -158,6 +182,10 @@ + + + + diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java index 7315813d90..47a7df815a 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java +++ b/epmet-module/epmet-point/epmet-point-server/src/main/java/com/epmet/EpmetPointApplication.java @@ -20,6 +20,7 @@ import org.springframework.scheduling.annotation.EnableAsync; @EnableAsync public class EpmetPointApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(EpmetPointApplication.class, args); } diff --git a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml index 4c7bbe3542..b3fa3f8fe9 100644 --- a/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml +++ b/epmet-module/epmet-point/epmet-point-server/src/main/resources/bootstrap.yml @@ -147,6 +147,4 @@ shutdown: rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true \ No newline at end of file + name-server: @rocketmq.nameserver@ \ No newline at end of file diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java index fd9e212221..2f660d47ba 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java +++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/GovIssueApplication.java @@ -17,6 +17,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; @ServletComponentScan(basePackages = "com.epmet") public class GovIssueApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(GovIssueApplication.class, args); } } diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml index 940a51c056..06332fbf9b 100644 --- a/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-issue/gov-issue-server/src/main/resources/bootstrap.yml @@ -142,8 +142,7 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true + thread: # 线程池配置 diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java index 3dda2f6217..8fdce3f561 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/GovOrgApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class GovOrgApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(GovOrgApplication.class, args); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml index 2dd0a7d172..5a6a066a1b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml @@ -165,8 +165,6 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true # consume-thread-min: 2 # consume-thread-max: 2 diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java index 8332bdca9e..cd3642aca1 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/OpenDataApplication.java @@ -22,6 +22,7 @@ import org.springframework.scheduling.annotation.EnableScheduling; //@ComponentScan(value = { "com.epmet" }) public class OpenDataApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(OpenDataApplication.class, args); } } diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml index 397003f631..6118195219 100644 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/resources/bootstrap.yml @@ -147,8 +147,6 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true thread: # 线程池配置 diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java index 8b60526acf..f0b206f086 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/OperCustomizeApplication.java @@ -27,6 +27,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients; public class OperCustomizeApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(OperCustomizeApplication.class, args); } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml index 91b9bbfe59..346506fb54 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml +++ b/epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml @@ -130,8 +130,6 @@ dingTalk: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true # 停机选项 shutdown: diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java index 0e3a138491..278d64b9a6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/ResiGroupApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class ResiGroupApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(ResiGroupApplication.class, args); } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml index e1e520b3dd..b782d086dc 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/bootstrap.yml @@ -175,5 +175,3 @@ shutdown: rocketmq: enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java index 74e592b898..180e65cfe2 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/ResiPartyMemberApplication.java @@ -29,6 +29,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class ResiPartyMemberApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(ResiPartyMemberApplication.class, args); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml index 7513661df2..751620e91d 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/bootstrap.yml @@ -147,6 +147,4 @@ thread: # rocketmq rocketmq: enable: @rocketmq.enable@ - name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true \ No newline at end of file + name-server: @rocketmq.nameserver@ \ No newline at end of file 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 3bbff08587..f4fc5a99ea 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 @@ -139,12 +139,36 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -159,6 +183,10 @@ + + + + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java index 4f9b736afb..5767fb4d33 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/UserApplication.java @@ -30,6 +30,7 @@ import org.springframework.scheduling.annotation.EnableAsync; public class UserApplication { public static void main(String[] args) { + System.setProperty("rocketmq.client.logUseSlf4j", "true"); SpringApplication.run(UserApplication.class, args); } diff --git a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml index cfe4da3c8f..a9ec2fcadb 100644 --- a/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml +++ b/epmet-user/epmet-user-server/src/main/resources/bootstrap.yml @@ -168,8 +168,6 @@ rocketmq: # 是否开启mq enable: @rocketmq.enable@ name-server: @rocketmq.nameserver@ - client: - logUseSlf4j: true # 停机选项 shutdown: 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 41f567fccf..899eed6c7a 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 @@ -139,11 +139,35 @@ + + + + ${log.path}/rocketmqclient.log + + + %d{yyyy-MM-dd HH:mm:ss.SSS} [%contextName] [%X{Transaction-Serial}] %-5level %logger{50} - %msg%n + UTF-8 + + + + ${log.path}/rocketmqclient-%d{yyyy-MM-dd}.%i.log + + 100MB + + + 15 + + + + + + + @@ -157,6 +181,10 @@ + + + + From 1ff426d49ce073bd522da272e74644fa3ccdce81 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 1 Aug 2022 15:02:39 +0800 Subject: [PATCH 224/288] =?UTF-8?q?project=5Fprocess=E6=B7=BB=E5=8A=A0STAF?= =?UTF-8?q?F=5FNAME=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/entity/ProjectProcessEntity.java | 2 +- .../impl/ProjectProcessServiceImpl.java | 13 ++++++++++ .../service/impl/ProjectServiceImpl.java | 26 +++++++++++++++++-- .../service/impl/ProjectTraceServiceImpl.java | 15 +++++++++++ .../V0.0.26__alter_project_process.sql | 2 ++ 5 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.26__alter_project_process.sql diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java index 78599eb5bf..82a89bf6fa 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/entity/ProjectProcessEntity.java @@ -56,7 +56,7 @@ public class ProjectProcessEntity extends BaseEpmetEntity { * 负负责人ID */ private String staffId; - + private String staffName; /** * 处理：结案close，退回return，部门流转transfer，创建项目created */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java index 2b51ec32ce..b8b01aa5b9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectProcessServiceImpl.java @@ -25,10 +25,13 @@ import com.epmet.commons.rocketmq.messages.ProjectChangedMQMsg; import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.FieldConstant; 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.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.scan.param.TextScanParamDTO; import com.epmet.commons.tools.scan.param.TextTaskDTO; import com.epmet.commons.tools.scan.result.SyncScanResult; @@ -250,6 +253,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl staffList = formDTO.getStaffList(); @@ -636,6 +644,10 @@ public class ProjectProcessServiceImpl extends BaseServiceImpl NumConstant.ZERO) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index a9f4ca0093..622696cfc1 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -51,7 +51,6 @@ import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.excel.ProjectListExportExcel; import com.epmet.feign.*; -import com.epmet.redis.ProjectRedis; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.TopicAttachmentFormDTO; @@ -496,6 +495,7 @@ public class ProjectServiceImpl extends BaseServiceImpl { if (issueDTO.getOrgId().equals(agency.getId())) { processEntity.setDepartmentName(agency.getOrganizationName()); @@ -1403,6 +1409,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectTraceS projectService.insert(projectEntity); //3-2.项目进展表新增第一个节点数据 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); + } ProjectProcessEntity processEntity = new ProjectProcessEntity(); processEntity.setProjectId(projectEntity.getId()); processEntity.setCustomerId(formDTO.getCustomerId()); @@ -437,6 +441,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS processEntity.setInternalRemark(formDTO.getInternalRemark()); processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType()); processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId()); + processEntity.setStaffName(staffInfo.getRealName()); agencyDeptGrid.getAgencyList().forEach(agency -> { if (loginUser.getAgencyId().equals(agency.getId())) { processEntity.setDepartmentName(agency.getOrganizationName()); @@ -760,6 +765,10 @@ public class ProjectTraceServiceImpl implements ProjectTraceS projectService.insert(projectEntity); //3-2.项目进展表新增第一个节点数据 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); + } ProjectProcessEntity processEntity = new ProjectProcessEntity(); processEntity.setProjectId(projectEntity.getId()); processEntity.setCustomerId(formDTO.getCustomerId()); @@ -770,6 +779,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS processEntity.setInternalRemark(formDTO.getInternalRemark()); processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId()); processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType()); + processEntity.setStaffName(staffInfo.getRealName()); agencyDeptGrid.getAgencyList().forEach(agency -> { if (loginUser.getAgencyId().equals(agency.getId())) { processEntity.setDepartmentName(agency.getOrganizationName()); @@ -1281,6 +1291,10 @@ public class ProjectTraceServiceImpl implements ProjectTraceS projectService.insert(projectEntity); //3-2.项目进展表新增第一个节点数据 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + if (null == staffInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取用户信息失败", "获取用户信息失败"); + } ProjectProcessEntity processEntity = new ProjectProcessEntity(); processEntity.setProjectId(projectEntity.getId()); processEntity.setCustomerId(formDTO.getCustomerId()); @@ -1291,6 +1305,7 @@ public class ProjectTraceServiceImpl implements ProjectTraceS processEntity.setInternalRemark(formDTO.getInternalRemark()); processEntity.setAssistanceUnitId(formDTO.getAssistanceUnitId()); processEntity.setAssistanceUnitType(formDTO.getAssistanceUnitType()); + processEntity.setStaffName(staffInfo.getRealName()); agencyDeptGrid.getAgencyList().forEach(agency -> { if (loginUser.getAgencyId().equals(agency.getId())) { processEntity.setDepartmentName(agency.getOrganizationName()); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.26__alter_project_process.sql b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.26__alter_project_process.sql new file mode 100644 index 0000000000..2c2d53913c --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/db/migration/V0.0.26__alter_project_process.sql @@ -0,0 +1,2 @@ +ALTER TABLE `epmet_gov_project`.`project_process` + ADD COLUMN `STAFF_NAME` varchar(64) NULL COMMENT '负责人姓名' AFTER `STAFF_ID`; \ No newline at end of file From 2085de5c7d2668f0058a80191b40c64d65b7bbf9 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Mon, 1 Aug 2022 15:10:29 +0800 Subject: [PATCH 225/288] =?UTF-8?q?=E5=9F=8E=E5=B8=82=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=92=8C=20=E5=85=AC=E5=85=B1=E6=9C=8D=E5=8A=A1=E5=AF=BC?= =?UTF-8?q?=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/IcCityManagementDao.xml | 2 ++ .../src/main/resources/mapper/IcPublicServiceDao.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml index 2b83594d09..73a921331c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcCityManagementDao.xml @@ -61,6 +61,8 @@ address = values(address), longitude = null, latitude = null, + principal = values(principal), + mobile = values(mobile), updated_by = values(updated_by), updated_time = NOW() diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml index 513a824d42..ef81d4c77a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcPublicServiceDao.xml @@ -61,6 +61,8 @@ address = values(address), longitude = null, latitude = null, + principal = values(principal), + mobile = values(mobile), updated_by = values(updated_by), updated_time = NOW() From 98e1d76bc14e65c63a10ea808a6987200633f81e Mon Sep 17 00:00:00 2001 From: syc Date: Mon, 1 Aug 2022 16:00:14 +0800 Subject: [PATCH 226/288] =?UTF-8?q?=E8=A7=92=E8=89=B2=E9=97=AE=E9=A2=98?= 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 3a10aa1b26..ec1ac046fc 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 @@ -900,7 +900,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl result = addStaff(fromDTO); //4.新增数字平台角色信息 - Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), fromDTO.getStaffId(), fromDTO.getCustomerId())); + Result roleUserAccess = govAccessFeignClient.roleUser(new RoleUserFormDTO(fromDTO.getNewRoles(), result.getData().getUserId(), fromDTO.getCustomerId())); if (!roleUserAccess.success()) { throw new RenException("工作人员新增数字平台角色信息失败" + resultRole.getMsg()); } From 6ff3803a003cb85fc8c57d96ac00df626be082a8 Mon Sep 17 00:00:00 2001 From: syc Date: Mon, 1 Aug 2022 16:20:10 +0800 Subject: [PATCH 227/288] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=80=A7=E5=88=AB?= =?UTF-8?q?=E4=B8=BA=E7=94=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/DepartmentServiceImpl.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/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index f55fcaf70e..e5cd12fdf8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -396,7 +396,7 @@ public class DepartmentServiceImpl implements DepartmentService { StaffSubmitFromDTO submitDTO = ConvertUtils.sourceToTarget(formDTO, StaffSubmitFromDTO.class); submitDTO.setName(formDTO.getPersonName()); submitDTO.setAgencyId(staffInfo.getAgencyId()); - submitDTO.setGender(0); + submitDTO.setGender(1); submitDTO.setWorkType("fulltime"); Result staffResult = epmetUserOpenFeignClient.deptToAddStaff(submitDTO); if (!staffResult.success()) { From 4bd96bb615ac0bf6be1ce1dbe816b6158921e4d1 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 1 Aug 2022 16:24:00 +0800 Subject: [PATCH 228/288] =?UTF-8?q?project=5Fprocess=E6=B7=BB=E5=8A=A0STAF?= =?UTF-8?q?F=5FNAME=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectProcessDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml index 8a774f3c21..1f6b32cf36 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml @@ -92,7 +92,7 @@ ID AS processId, OPERATION_NAME AS processName, UNIX_TIMESTAMP(created_time) AS processTime, - DEPARTMENT_NAME, + CONCAT(DEPARTMENT_NAME,'(',STAFF_NAME,')'), PUBLIC_REPLY, INTERNAL_REMARK, IS_SEND, From 35dc6be063097ed6b31771f07a70c4e2bf648fbf Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Mon, 1 Aug 2022 16:43:35 +0800 Subject: [PATCH 229/288] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E7=94=B5=E8=AF=9D=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/CustomerStaffServiceImpl.java | 22 +++++-------------- 1 file changed, 5 insertions(+), 17 deletions(-) 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 c9c416d63c..ef8f079c56 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 @@ -25,7 +25,6 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; 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.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -45,13 +44,11 @@ import com.epmet.dao.StaffRoleDao; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; -import com.epmet.dto.result.NewUserRoleResultDTO; import com.epmet.entity.CustomerStaffEntity; import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.StaffRoleEntity; import com.epmet.entity.UserEntity; import com.epmet.feign.AuthFeignClient; -import com.epmet.feign.GovAccessFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OperCrmOpenFeignClient; import com.epmet.service.CustomerStaffService; @@ -97,8 +94,6 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl page(Map params) { @@ -288,16 +283,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO); - if (!staffExistRole.success()){ - throw new EpmetException("getStaffExistRole method is failure"); - } - if (!CollectionUtils.isEmpty(staffExistRole.getData())){ - List staffRoleResultDTOS = ConvertUtils.sourceToTarget(staffExistRole.getData(), StaffRoleResultDTO.class); - resultDTO.setNewRoleList(staffRoleResultDTOS); - } + return new Result().ok(resultDTO); } @@ -846,11 +832,13 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffRoleList = staffRoleDao.staffRoleList(gridStaffs.getData()); - + if(CollectionUtils.isEmpty(staffRoleList)){ + return resultList; + } //3.查询工作人员基础信息 List staffIdList = staffRoleList.stream().map(GridMobileListResultDTO.Role::getStaffId).collect(Collectors.toList()); staffIdList = staffIdList.stream().distinct().collect(Collectors.toList()); - List list = baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); + List list = CollectionUtils.isEmpty(staffIdList) ? new ArrayList<>() : baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); //4.封装数据并返回 resultList = ConvertUtils.sourceToTarget(list, GridMobileListResultDTO.class); From a82d83a7a284d9b3ecd71b5de9fc60e3ea412b0c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 1 Aug 2022 16:47:12 +0800 Subject: [PATCH 230/288] =?UTF-8?q?project=5Fprocess=E6=B7=BB=E5=8A=A0STAF?= =?UTF-8?q?F=5FNAME=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectProcessDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml index 1f6b32cf36..846f9ac89d 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml @@ -92,7 +92,7 @@ ID AS processId, OPERATION_NAME AS processName, UNIX_TIMESTAMP(created_time) AS processTime, - CONCAT(DEPARTMENT_NAME,'(',STAFF_NAME,')'), + CONCAT(DEPARTMENT_NAME,'(',STAFF_NAME,')') AS "departmentName", PUBLIC_REPLY, INTERNAL_REMARK, IS_SEND, From 0a8549bfa64f6f87836adb531b0f7607039c687c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Mon, 1 Aug 2022 17:10:34 +0800 Subject: [PATCH 231/288] =?UTF-8?q?project=5Fprocess=E6=B7=BB=E5=8A=A0STAF?= =?UTF-8?q?F=5FNAME=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 622696cfc1..a69c5b874f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -2441,7 +2441,7 @@ public class ProjectServiceImpl extends BaseServiceImpl Date: Mon, 1 Aug 2022 17:30:16 +0800 Subject: [PATCH 232/288] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=B9=E4=B8=BA=E6=8C=89=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=80=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/IcPartyUnitServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java index 7c6ca5c81c..304705ac2d 100644 --- a/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java +++ b/epmet-module/epmet-heart/epmet-heart-server/src/main/java/com/epmet/service/impl/IcPartyUnitServiceImpl.java @@ -126,7 +126,7 @@ public class IcPartyUnitServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); PageInfo pageInfo = new PageInfo<>(list); List dtoList = ConvertUtils.sourceToTarget(list, IcPartyUnitDTO.class); From e816f0fcb38be8d54ca37edf5897e1d3edb0634c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 1 Aug 2022 17:39:26 +0800 Subject: [PATCH 233/288] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E"=E5=B1=85=E6=B0=91=E7=B1=BB?= =?UTF-8?q?=E5=88=AB"=E5=88=97=E8=BF=94=E5=9B=9E=EF=BC=8C=E6=98=AF?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E5=85=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/enums/ResiCategoryEnum.java | 14 ++++++++++++++ .../com/epmet/dto/result/IcResiUserBriefDTO.java | 5 +++++ .../service/impl/IcResiUserServiceImpl.java | 16 ++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java index b7ab6cbddc..6416582380 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/ResiCategoryEnum.java @@ -28,6 +28,20 @@ public enum ResiCategoryEnum { this.label = label; } + /** + * 取枚举对象 + * @param columnName + * @return + */ + public static ResiCategoryEnum getEnum(String columnName) { + for (ResiCategoryEnum enumObject : ResiCategoryEnum.values()) { + if (enumObject.getColName().equals(columnName)) { + return enumObject; + } + } + return null; + } + public String getColName() { return colName; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index c9a0160aed..12121a4245 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -71,6 +71,11 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { */ private Map volunteerCategories = new HashMap<>(); + /** + * 居民类别 + */ + private Map resiCategories = new HashMap<>(); + /** * 同屋的其他人 */ 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 07aeab3f53..cf76bb0f2b 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 @@ -1508,6 +1508,22 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resiCategoryColumns = Arrays.stream(ResiCategoryEnum.values()).map(c -> c.getColName()).collect(Collectors.toList()); + + Map resiCategories = new HashMap<>(); + + Map categories = icResiUserDao.getCategoryListMap(resiCategoryColumns, resiUserId); + categories.forEach((k, v) -> { + if (NumConstant.ONE_STR.equals(v)) { + ResiCategoryEnum enumObject = ResiCategoryEnum.getEnum(k); + resiCategories.put(k, enumObject.getLabel()); + } + }); + + + r.setResiCategories(resiCategories); + return r; } From 5e7c7a27f1acb8d6ab59a2e01863bce7c9ea4f7d Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 2 Aug 2022 09:01:30 +0800 Subject: [PATCH 234/288] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8F=82=E6=95=B0=20?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E4=B8=8B=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/GridstaffWorkInfoPingyinServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java index 2e3e600e04..a4e98d714f 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridstaffWorkInfoPingyinServiceImpl.java @@ -60,7 +60,6 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl data; do { Result> record = epmetUserOpenFeignClient.getPatrolRoutineWorkListV2(midPatrolFormDTO); - midPatrolFormDTO.setPageNo(midPatrolFormDTO.getPageNo() + 1); if (record == null || !record.success()) { log.error("获取例行工作记录V2失败，param:{}", JSON.toJSONString(midPatrolFormDTO)); throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode()); @@ -86,7 +85,7 @@ public class GridstaffWorkInfoPingyinServiceImpl extends BaseServiceImpl Date: Tue, 2 Aug 2022 09:07:31 +0800 Subject: [PATCH 235/288] =?UTF-8?q?=E6=90=9C=E7=B4=A2=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/impl/CoverageServiceImpl.java | 10 ++++++++++ .../main/resources/mapper/epmetuser/IcResiUserDao.xml | 1 + 2 files changed, 11 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java index 2a2cdb1474..7639f6c561 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/CoverageServiceImpl.java @@ -486,6 +486,16 @@ public class CoverageServiceImpl implements CoverageService { result.setTotal(Long.valueOf(String.valueOf(allIcUser.size()))); result.setList(allIcUser); } + if (CollectionUtils.isNotEmpty(result.getList())){ + result.getList().forEach(r -> { + HouseInfoCache houseInfo = CustomerIcHouseRedis.getHouseInfo(formDTO.getCustomerId(), r.getHomeId()); + if (null == houseInfo){ + throw new EpmetException("获取房屋信息失败："+r.getHomeId()); + } + r.setLongitude(houseInfo.getBuildingLongitude()); + r.setLatitude(houseInfo.getBuildingLatitude()); + }); + } return result; } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 92c000175c..9097a47098 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -167,6 +167,7 @@ ifnull(u.RHZK,'') as rhzk FROM ic_resi_user u WHERE u.DEL_FLAG = '0' + and u.status ='0' AND u.CUSTOMER_ID = #{customerId} From e196e82e5ddeb53a452ea878757e2d9a81200338 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Tue, 2 Aug 2022 09:19:32 +0800 Subject: [PATCH 236/288] =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=9D=A1=E4=BB=B6?= =?UTF-8?q?=E7=B2=BE=E7=A1=AE=E5=88=B0=E6=97=B6=E5=88=86=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/govproject/ProjectDao.xml | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 5771dfad79..1b159cb69d 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -429,10 +429,10 @@ DEL_FLAG = '0' AND AGENCY_ID = #{agencyId} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY GRID_ID @@ -450,10 +450,10 @@ AND GRID_ID IS NOT NULL AND GRID_ID != '' - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY GRID_ID @@ -471,10 +471,10 @@ AND GRID_ID = #{orgId} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY CREATED_BY @@ -493,10 +493,10 @@ AND GRID_ID = #{orgId} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY STAFF_ID @@ -511,10 +511,10 @@ DEL_FLAG = '0' AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%')) - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY AGENCY_ID @@ -530,10 +530,10 @@ AND (AGENCY_ID = #{agencyId} OR ORG_ID_PATH LIKE CONCAT('%', #{agencyId}, '%')) AND OPERATION = 'close' - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") = ]]> #{startDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") = ]]> #{startDate} - AND DATE_FORMAT(CREATED_TIME,"%Y%m%d") #{endDate} + AND DATE_FORMAT(CREATED_TIME,"%Y%m%d%H%i%s") #{endDate} GROUP BY AGENCY_ID From e1745f5f46c31cee76168e285de820cfc916beda Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 2 Aug 2022 09:40:41 +0800 Subject: [PATCH 237/288] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=96=B0=E5=A2=9E"=E5=B1=85=E6=B0=91=E7=B1=BB?= =?UTF-8?q?=E5=88=AB=E5=90=8D=E7=A7=B0"=E5=88=97=E8=BF=94=E5=9B=9E?= =?UTF-8?q?=EF=BC=8C=E5=AD=97=E7=AC=A6=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/dto/result/IcResiUserBriefDTO.java | 2 +- .../epmet/service/impl/IcResiUserServiceImpl.java | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java index 12121a4245..87393c2a17 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBriefDTO.java @@ -74,7 +74,7 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { /** * 居民类别 */ - private Map resiCategories = new HashMap<>(); + private String resiCategoryNames; /** * 同屋的其他人 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 cf76bb0f2b..b329bee2b8 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 @@ -1466,6 +1466,11 @@ public class IcResiUserServiceImpl extends BaseServiceImpl resiCategoryColumns = Arrays.stream(ResiCategoryEnum.values()).map(c -> c.getColName()).collect(Collectors.toList()); - Map resiCategories = new HashMap<>(); + ArrayList resiCategoryNames = new ArrayList<>(); Map categories = icResiUserDao.getCategoryListMap(resiCategoryColumns, resiUserId); categories.forEach((k, v) -> { if (NumConstant.ONE_STR.equals(v)) { ResiCategoryEnum enumObject = ResiCategoryEnum.getEnum(k); - resiCategories.put(k, enumObject.getLabel()); + resiCategoryNames.add(enumObject.getLabel()); } }); - - r.setResiCategories(resiCategories); + r.setResiCategoryNames(String.join("、", resiCategoryNames)); return r; } From f7ed152f01e0617d5497e6980c1fd08aca927839 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 2 Aug 2022 11:17:43 +0800 Subject: [PATCH 238/288] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/redis/GovCustomerMenuRedis.java | 4 ++-- .../com/epmet/service/impl/GovCustomerMenuServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java index 274ad0fed3..dd72c1f98c 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java @@ -78,8 +78,8 @@ public class GovCustomerMenuRedis { redisUtils.deleteByPattern(key); } - public void delAllCustomerMenuFiveCoverage(String customerId){ - String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId); + public void delAllCustomerMenuFiveCoverage(){ + String key = RedisKeys.getCustomerMenuListFiveCoverage().concat("*"); redisUtils.delete(key); } diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java index 0a93c9a4d1..592713fdf5 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java @@ -115,10 +115,10 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl Date: Tue, 2 Aug 2022 13:47:08 +0800 Subject: [PATCH 239/288] =?UTF-8?q?=E7=BC=93=E5=AD=98=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E6=94=B9=E7=94=A8deleteByPattern?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java | 2 +- .../src/main/java/com/epmet/redis/GovCustomerMenuRedis.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java index fbeca4840e..5038e14a7c 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/redis/GovCustomerMenuRedis.java @@ -96,7 +96,7 @@ public class GovCustomerMenuRedis { */ public void delAllCustomerMenu(String customerId) { String key = RedisKeys.getCustomerMenuListFiveCoverage().concat(customerId); - redisUtils.delete(key); + redisUtils.deleteByPattern(key); } private boolean checkParam(String customerId, Integer type) { diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java index dd72c1f98c..3dc0ecd6aa 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/redis/GovCustomerMenuRedis.java @@ -80,7 +80,7 @@ public class GovCustomerMenuRedis { public void delAllCustomerMenuFiveCoverage(){ String key = RedisKeys.getCustomerMenuListFiveCoverage().concat("*"); - redisUtils.delete(key); + redisUtils.deleteByPattern(key); } private boolean checkParam(String customerId, Integer type) { From a9db5a17680dbc4269068741aa8aa9996cc8402a Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 2 Aug 2022 13:48:00 +0800 Subject: [PATCH 240/288] =?UTF-8?q?editStaffInit=E5=B0=91=E7=9A=84?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/CustomerStaffServiceImpl.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 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 ef8f079c56..77af73c96d 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 @@ -25,6 +25,7 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.*; 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.ExceptionUtils; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; @@ -49,6 +50,7 @@ import com.epmet.entity.GovStaffRoleEntity; import com.epmet.entity.StaffRoleEntity; import com.epmet.entity.UserEntity; import com.epmet.feign.AuthFeignClient; +import com.epmet.feign.GovAccessFeignClient; import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.feign.OperCrmOpenFeignClient; import com.epmet.service.CustomerStaffService; @@ -94,6 +96,8 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl page(Map params) { @@ -283,7 +287,16 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl> staffExistRole = govAccessFeignClient.getStaffExistRole(getStaffExistRoleFormDTO); + if (!staffExistRole.success()){ + throw new EpmetException("getStaffExistRole method is failure"); + } + if (!CollectionUtils.isEmpty(staffExistRole.getData())){ + List staffRoleResultDTOS = ConvertUtils.sourceToTarget(staffExistRole.getData(), StaffRoleResultDTO.class); + resultDTO.setNewRoleList(staffRoleResultDTOS); + } return new Result().ok(resultDTO); } From c5de446d1d0f8c1668c99d16b582f9d7134e0cc5 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 2 Aug 2022 15:08:52 +0800 Subject: [PATCH 241/288] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E6=94=AF=E6=8C=81"=E5=85=B6=E4=BB=96"?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=BF=97=E6=84=BF=E8=80=85=E7=9A=84=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/epmetuser/IcResiUserDao.java | 18 ++++++++ .../epmetuser/impl/EpmetUserServiceImpl.java | 14 +++++- .../mapper/epmetuser/IcResiUserDao.xml | 43 +++++++++++++++++++ 3 files changed, 73 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java index 610d90c62d..3b3a66dd50 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/IcResiUserDao.java @@ -115,9 +115,27 @@ public interface IcResiUserDao extends BaseDao { @Param("search")String search, @Param("resiCategory")String resiCategory); + Integer countVolunteersWithoutVolCategory(@Param("customerId")String customerId, + @Param("agencyId")String agencyId, + @Param("staffOrgIds")String staffOrgIds, + @Param("search")String search); + List listVolunteersByCategory(@Param("customerId")String customerId, @Param("agencyId")String agencyId, @Param("staffOrgIds")String staffOrgIds, @Param("search")String search, @Param("resiCategory")String resiCategory); + + /** + * 列出没有志愿者类别的志愿者 + * @param customerId + * @param agencyId + * @param staffOrgIds + * @param search + * @return + */ + List listVolunteersWithoutVolCategory(@Param("customerId")String customerId, + @Param("agencyId")String agencyId, + @Param("staffOrgIds")String staffOrgIds, + @Param("search")String search); } 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 b42e78b256..2e4d184353 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 @@ -857,11 +857,21 @@ public class EpmetUserServiceImpl implements EpmetUserService { @Override public Integer countVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory) { - return icResiUserDao.countVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); + if ("others".equals(resiCategory)) { + //others需要特殊处理，它是指那些勾选了是志愿者，但是没有选择具体志愿者类型的居民，实际上志愿者类型里面没有others这个类别的 + return icResiUserDao.countVolunteersWithoutVolCategory(customerId, agencyId, staffOrgIds, search); + } else { + return icResiUserDao.countVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); + } } @Override public List listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory) { - return icResiUserDao.listVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); + if ("others".equals(resiCategory)) { + //others需要特殊处理，它是指那些勾选了是志愿者，但是没有选择具体志愿者类型的居民，实际上志愿者类型里面没有others这个类别的 + return icResiUserDao.listVolunteersWithoutVolCategory(customerId, agencyId, staffOrgIds, search); + } else { + return icResiUserDao.listVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); + } } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index 9097a47098..84c5386481 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -188,6 +188,7 @@ from ic_resi_user resi inner join ic_volunteer vol on (resi.ID = vol.IC_RESI_USER and vol.DEL_FLAG = '0') where resi.DEL_FLAG = '0' + and resi.IS_VOLUNTEER = '1' and resi.CUSTOMER_ID = #{customerId} and resi.AGENCY_ID = #{agencyId} @@ -202,11 +203,32 @@ + + + + + From 01e3dc01abce9e7bba876181632c5e0c198533cb Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 2 Aug 2022 15:59:28 +0800 Subject: [PATCH 242/288] =?UTF-8?q?colVal=E5=8F=AF=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java index d9f15f9637..910a5b2e38 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/form/policy/IcPolicyRuleDetailDTO.java @@ -64,7 +64,7 @@ public class IcPolicyRuleDetailDTO { /** * 参数值 */ - @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class}) + // @NotBlank(message = "参数值不能为空", groups = {ResiRulerShowGroup.class,HouseRulerShowGroup.class,StatRulerShowGroup.class}) private String colVal; /** From fa1a116aa454e8c329b20e98b8d9d328632f7d4f Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 2 Aug 2022 16:11:04 +0800 Subject: [PATCH 243/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E6=9F=A5=E8=AF=A2=E5=88=97=E8=A1=A8=E5=8A=A8?= =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E6=94=AF=E6=8C=81=E4=BC=A0=E5=85=A5is=5Fnull?= =?UTF-8?q?/is=5Fnot=5Fnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/epmetuser/IcResiUserDao.xml | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml index adcb55f269..cc7cf00738 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/IcResiUserDao.xml @@ -116,13 +116,24 @@ and - ${rule.colTable}.${rule.colKey} ${rule.queryType} - - CONCAT('%',#{rule.colVal} ,'%') + + + (${rule.colTable}.${rule.colKey} is null or ${rule.colTable}.${rule.colKey} = '') + + + (${rule.colTable}.${rule.colKey} is not null and ${rule.colTable}.${rule.colKey} != '') - #{rule.colVal} + ${rule.colTable}.${rule.colKey} ${rule.queryType} + + + CONCAT('%',#{rule.colVal} ,'%') + + + #{rule.colVal} + + ${rule.nextLogicalRel} From d230318120e44550a3e698b51d6812bf360b29e4 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 2 Aug 2022 16:49:26 +0800 Subject: [PATCH 244/288] emm --- .../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 77af73c96d..5f3169e154 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 @@ -515,7 +515,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl staffIdList) { //1:批量查询人员基本信息 - List staffList = baseDao.selectStaffByIds(staffIdList, null); + List staffList = baseDao.selectStaffByIds(staffIdList, Constant.ENABLE); //2:批量查询人员拥有的所有角色信息 List roleList = staffRoleDao.selectStaffRoleList(staffIdList); CustomerStaffListResultDTO list = new CustomerStaffListResultDTO(); From 615f8a8a6b12067fd790b564b0cd6dd9875f942d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 2 Aug 2022 17:03:59 +0800 Subject: [PATCH 245/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=B9=B4=E9=BE=84?= =?UTF-8?q?-=E4=B8=8D=E4=B8=BA=E7=A9=BA=EF=BC=8C=E6=8A=A5NumberFormatExcep?= =?UTF-8?q?tion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/impl/ResiServiceImpl.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 8ea7d871d5..6c35d40b73 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -149,7 +149,8 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { // 使用年龄计算出生日期 if (resiRule != null) { resiRule.stream().forEach((r) -> { - if ("BIRTHDAY".equals(r.getColKey())) { + // 对生日列计算，并且内容是数字，才计算 + if ("BIRTHDAY".equals(r.getColKey()) && StringUtils.isNumeric(r.getColVal())) { LocalDate birthday = LocalDate.now().minus(Long.valueOf(r.getColVal()), ChronoUnit.YEARS); r.setQueryType(revertQueryType(r.getQueryType())); r.setColVal(birthday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); @@ -209,7 +210,16 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { resultResis.stream().forEach((r) -> { // 小区名称 - r.setNeighborHoodName(gridIdAndName.get(r.getGridId()).concat("-").concat(neighborhoodIdAndName.get(r.getNeighborhoodId()))); + String gridName = gridIdAndName.get(r.getGridId()); + String neighborhoodName = neighborhoodIdAndName.get(r.getNeighborhoodId()); + + if (StringUtils.isNoneBlank(gridName, neighborhoodName)) { + // 网格或者小区都能找到，给填充数据 + r.setNeighborHoodName(gridIdAndName.get(r.getGridId()).concat("-").concat(neighborhoodIdAndName.get(r.getNeighborhoodId()))); + } else { + // 网格或者小区中任何一个找不到，给个空 + r.setNeighborHoodName(""); + } // 出生日期 & 年龄 if (r.getBirthday() != null) { From d3e93bfce4ee7ef99bf259b0f72193d689c17415 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Tue, 2 Aug 2022 17:07:18 +0800 Subject: [PATCH 246/288] =?UTF-8?q?=E3=80=90=E6=94=BF=E7=AD=96=E6=89=BE?= =?UTF-8?q?=E4=BA=BA=E3=80=91=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=B9=B4=E9=BE=84?= =?UTF-8?q?-=E4=B8=8D=E4=B8=BA=E7=A9=BA=EF=BC=8C=E6=8A=A5NumberFormatExcep?= =?UTF-8?q?tion?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataaggre/service/impl/ResiServiceImpl.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java index 6c35d40b73..59810ea97b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/ResiServiceImpl.java @@ -149,11 +149,17 @@ public class ResiServiceImpl implements ResiService, ResultDataResolver { // 使用年龄计算出生日期 if (resiRule != null) { resiRule.stream().forEach((r) -> { - // 对生日列计算，并且内容是数字，才计算 - if ("BIRTHDAY".equals(r.getColKey()) && StringUtils.isNumeric(r.getColVal())) { - LocalDate birthday = LocalDate.now().minus(Long.valueOf(r.getColVal()), ChronoUnit.YEARS); - r.setQueryType(revertQueryType(r.getQueryType())); - r.setColVal(birthday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + // 对生日列计算 + if ("BIRTHDAY".equals(r.getColKey())) { + if ("is_null".equals(r.getQueryType()) || "is_not_null".equals(r.getQueryType())) { + // 如果是is_null、is_not_null，那么直接用这个条件 + return; + } else { + //如果不是is_null、is_not_null，那么需要转换为出生日期 + LocalDate birthday = LocalDate.now().minus(Long.valueOf(r.getColVal()), ChronoUnit.YEARS); + r.setQueryType(revertQueryType(r.getQueryType())); + r.setColVal(birthday.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))); + } } }); } From 52120e177853b5bad285e3d169b87b6693f3d9a1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 2 Aug 2022 17:40:48 +0800 Subject: [PATCH 247/288] 5 --- .../service/govproject/impl/GovProjectServiceImpl.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index 88793a90dd..82b58c2500 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -26,10 +26,10 @@ import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; -import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; -import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; +import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; +import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; import com.epmet.dataaggre.dto.govproject.ProjectDTO; import com.epmet.dataaggre.dto.govproject.ProjectRelatedPersonnelDTO; import com.epmet.dataaggre.dto.govproject.ResiEventDTO; @@ -791,4 +791,10 @@ public class GovProjectServiceImpl implements GovProjectService { return query; } + + @Override + public List getEventInfos(CoverageHomeSearchFormDTO formDTO) { + return icEventDao.getEventInfos(formDTO); + } + } From a0bb593b487156ba2cc073ccddd39e8ef0d80dbd Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Tue, 2 Aug 2022 18:38:12 +0800 Subject: [PATCH 248/288] try --- .../main/java/com/epmet/service/impl/GovRoleServiceImpl.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index a72f8dd1f2..eb90de87c0 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -21,10 +21,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; -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.exception.RenException; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.ConvertUtils; @@ -147,6 +145,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl Date: Tue, 2 Aug 2022 18:46:49 +0800 Subject: [PATCH 249/288] try --- .../main/java/com/epmet/service/impl/GovRoleServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java index eb90de87c0..3f7bae6b47 100644 --- a/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java +++ b/epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovRoleServiceImpl.java @@ -144,7 +144,7 @@ public class GovRoleServiceImpl extends BaseServiceImpl Date: Wed, 3 Aug 2022 13:58:41 +0800 Subject: [PATCH 250/288] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/dto/form/OrgProjectListFormDTO.java | 73 ++++++++++ .../dto/result/OrgProjectListResultDTO.java | 100 ++++++++++++++ .../epmet/controller/ProjectController.java | 64 +++++++++ .../main/java/com/epmet/dao/ProjectDao.java | 1 + .../com/epmet/excel/OrgProjectListExcel.java | 127 ++++++++++++++++++ .../com/epmet/service/ProjectService.java | 1 + .../service/impl/ProjectServiceImpl.java | 68 +++++++++- .../src/main/resources/mapper/ProjectDao.xml | 107 +++++++++++++++ .../epmet/dto/form/GetByRealNamesFormDTO.java | 4 + .../resources/mapper/CustomerStaffDao.xml | 11 +- 10 files changed, 552 insertions(+), 4 deletions(-) create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java create mode 100644 epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java create mode 100644 epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java new file mode 100644 index 0000000000..cbc171d0a9 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java @@ -0,0 +1,73 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +@Data +public class OrgProjectListFormDTO extends PageFormDTO implements Serializable { + private static final long serialVersionUID = -3317804468566708838L; + + /** + * 组织/网格Id + */ + private String orgId; + /** + * 组织agency 网格grid + */ + private String orgType; + /** + * 上报渠道 【来源：议题issue 项目立项:agency 事件:resi_event 工作人员上报:work_event】 + */ + private String origin; + /** + * 上报人姓名 + */ + private String staffName; + /** + * 手机号 + */ + private String mobile; + //手机号对应工作人员Id集合 + private List staffIds; + /** + * 事件内容 + */ + private String backGround; + /** + * 事件类型 一类、二类Id集合 + */ + private List firstIdList; + private List secondIdList; + /** + * 事件状态 待处理 pending，结案closed + */ + private String status; + /** + * 起始上报时间 精确到秒 + */ + private String startTime; + /** + * 终止上报时间 精确到秒 + */ + private String endTime; + /** + * 处置选项 筛选自己参与的项目 有值就按staffId查 + */ + private String staffId; + + /** + * 分页参数 + */ + private Integer pageNo = 1; + private Integer pageSize = 20; + private Boolean isPage = true; + + //token中信息 + private String userId; + private String customerId; + +} diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java new file mode 100644 index 0000000000..aaece87f42 --- /dev/null +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java @@ -0,0 +1,100 @@ +package com.epmet.dto.result; + +import com.epmet.dto.form.FileDTO; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; +import java.util.List; + +@Data +public class OrgProjectListResultDTO implements Serializable { + + private static final long serialVersionUID = 2374701362057175388L; + + /** + * 项目ID + */ + private String projectId; + /** + * 所属组织ID + */ + private String agencyId; + /** + * 上报渠道 agency:网格上报 resi_event:居民上报 work_event:巡查上报 issue:议题上报 + */ + private String origin; + /** + * 一级分类 + */ + private String firstName; + private String firstId; + + /** + * 二级分类 + */ + private String secondName; + private String secondId; + + /** + * 事件标题 + */ + private String title; + + /** + * 所属网格 + */ + private String gridName; + private String gridId; + + /** + * 地址 + */ + private String address; + /** + * 报事人 + */ + private String staffName; + private String staffId; + /** + * 上报人电话 + */ + private String mobile; + /** + * 上报时间 + */ + private String createdTime; + /** + * 事件内容 + */ + private String backGround; + /** + * 结案说明 + */ + private String publicReply; + /** + * 办结时间 + */ + private String endTime; + /** + * 办结部门 + */ + private String departmentName; + + /** + * 处理建议[创建节点的公开答复] + */ + private String createPublicReply; + + /** + * 图片url集合 + */ + private List urlList; + private List imageList; + + /** + * 状态 待处理 pending，结案closed + */ + private String status; +} diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 03bb218bd1..466eb3d57f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -17,11 +17,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.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.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; @@ -30,15 +40,20 @@ import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.dto.ProjectDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.excel.OrgProjectListExcel; import com.epmet.excel.ProjectExcel; import com.epmet.resi.mine.dto.from.MyPartProjectsFormDTO; import com.epmet.service.ProjectService; +import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.io.PrintWriter; +import java.util.Date; import java.util.List; import java.util.Map; @@ -51,6 +66,7 @@ import java.util.Map; */ @RestController @RequestMapping("project") +@Slf4j public class ProjectController { @Autowired @@ -379,4 +395,52 @@ public class ProjectController { ValidatorUtils.validateEntity(formDTO, SatisfactionEvaluationListFormDTO.SatisfactionEvaluationListForm.class); return new Result().ok(projectService.satisfactionEvaluationList(formDTO)); } + + /** + * Desc: 数字平台-项目管理列表 + */ + @PostMapping("orgprojectlist") + public Result> orgProjectList(@LoginUser TokenDto tokenDto, @RequestBody OrgProjectListFormDTO formDTO) { + formDTO.setUserId(tokenDto.getUserId()); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result>().ok(projectService.orgProjectList(formDTO)); + } + + @PostMapping("orgprojectexport") + public void orgProjectExport(@LoginUser TokenDto tokenDto, @RequestBody OrgProjectListFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setCustomerId(tokenDto.getCustomerId()); + formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setIsPage(false); + 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), OrgProjectListExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + PageData data = null; + List list = null; + do { + data = projectService.orgProjectList(formDTO); + list = ConvertUtils.sourceToTarget(data.getList(), OrgProjectListExcel.class); + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); + excelWriter.write(list, writeSheet); + } while (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(); + } + } + } + } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java index 6c5e253e06..316fbc8de6 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/ProjectDao.java @@ -299,4 +299,5 @@ public interface ProjectDao extends BaseDao { List getProjectManageList(ProjectManageListFormDTO formDTO); + List orgProjectList(OrgProjectListFormDTO formDTO); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java new file mode 100644 index 0000000000..4eb4cd5c71 --- /dev/null +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java @@ -0,0 +1,127 @@ +package com.epmet.excel; + +import cn.afterturn.easypoi.excel.annotation.ExcelCollection; +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +import java.util.List; + +/** + * 事件管理表 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2022-05-17 + */ +@Data +public class OrgProjectListExcel { + + private static final long serialVersionUID = 2374701362057175388L; + + /** + * 上报渠道 agency:网格上报 resi_event:居民上报 work_event:巡查上报 issue:议题上报 + */ + @ExcelProperty(value = "上报渠道") + @ColumnWidth(25) + private String origin; + /** + * 一级分类名称 + */ + @ExcelProperty(value = "一级分类") + @ColumnWidth(20) + private String firstName; + + /** + * 二级分类名称 + */ + @ExcelProperty(value = "二级分类") + @ColumnWidth(20) + private String secondName; + + /** + * 事件标题 + */ + @ExcelProperty(value = "事件标题") + @ColumnWidth(30) + private String title; + + /** + * 所属网格 + */ + @ExcelProperty(value = "所属网格") + @ColumnWidth(30) + private String gridName; + + /** + * 地址 + */ + @ExcelProperty(value = "地址") + @ColumnWidth(30) + private String address; + /** + * 报事人 + */ + @ExcelProperty(value = "报事人") + @ColumnWidth(20) + private String staffName; + /** + * 上报人电话 + */ + @ExcelProperty(value = "上报人电话") + @ColumnWidth(20) + private String mobile; + /** + * 上报时间 + */ + @ExcelProperty(value = "上报时间") + @ColumnWidth(25) + private String createdTime; + /** + * 事件内容 + */ + @ExcelProperty(value = "事件内容") + @ColumnWidth(40) + private String backGround; + /** + * 结案说明 + */ + @ExcelProperty(value = "结案说明") + @ColumnWidth(30) + private String publicReply; + /** + * 办结时间 + */ + @ExcelProperty(value = "办结时间") + @ColumnWidth(25) + private String endTime; + /** + * 办结部门 + */ + @ExcelProperty(value = "办结部门") + @ColumnWidth(30) + private String departmentName; + + /** + * 处理建议[创建节点的公开答复] + */ + @ExcelProperty(value = "处理建议") + @ColumnWidth(25) + private String createPublicReply; + + /** + * 图片url集合 + */ + @ExcelProperty(value = "图片") + @ColumnWidth(30) + @ExcelCollection(name = "图片") + private List imageList; + + /** + * 状态 处理中 pending，已结案 closed + */ + @ExcelProperty(value = "状态") + @ColumnWidth(20) + private String status; + + +} \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java index 82a88d3a5b..3e9125bbfd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/ProjectService.java @@ -395,4 +395,5 @@ public interface ProjectService extends BaseService { */ void projectListExport(HttpServletResponse response,ProjectManageListFormDTO formDTO) throws IOException; + PageData orgProjectList(OrgProjectListFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index a9f4ca0093..08f457f764 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -51,7 +51,6 @@ import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.excel.ProjectListExportExcel; import com.epmet.feign.*; -import com.epmet.redis.ProjectRedis; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.TopicAttachmentFormDTO; @@ -3445,4 +3444,71 @@ public class ProjectServiceImpl extends BaseServiceImpl orgProjectList(OrgProjectListFormDTO formDTO) { + //1.整理查询条件 + if (StringUtils.isNoneBlank(formDTO.getMobile())) { + //有手机号筛选条件的选按手机号查找工作人员，在按staffId查项目 + GetByRealNamesFormDTO dto = new GetByRealNamesFormDTO(); + dto.setCustomerId(formDTO.getCustomerId()); + dto.setMobile(formDTO.getMobile()); + Result> staffResult = epmetUserOpenFeignClient.getByRealNames(dto); + if (!staffResult.success()) { + throw new RenException("获取工作人员基础信息失败......"); + } + if (null != staffResult.getData() && staffResult.getData().size() > NumConstant.ZERO) { + List staffIds = staffResult.getData().stream().map(CustomerStaffDTO::getUserId).collect(Collectors.toList()); + formDTO.setStaffIds(staffIds); + } + } + //2.按条件筛选数据 列表/导出查询 + PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()); + List list = baseDao.orgProjectList(formDTO); + PageInfo pageInfo = new PageInfo<>(list); + if (list.size() < NumConstant.ONE) { + return new PageData<>(list, pageInfo.getTotal()); + } + //3.封装数据 + //3-1.查询分类信息 + /*IssueProjectCategoryDictListFormDTO dictFormDto = new IssueProjectCategoryDictListFormDTO(); + dictFormDto.setCustomerId(formDTO.getCustomerId()); + Result> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto); + if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); + } + Map categoryMap = categoryRes.getData().stream().collect(Collectors.toMap(IssueProjectCategoryDictDTO::getId, IssueProjectCategoryDictDTO::getCategoryName)); + *///3-2.封装数据 + for (OrgProjectListResultDTO dto : list) { + //分类名称 + /*dto.setFirstName(categoryMap.get(dto.getFirstId())); + dto.setSecondName(categoryMap.get(dto.getSecondId()));*/ + //工作人员基础信息 + /*CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), dto.getStaffId()); + if (null != staffInfo) { + dto.setStaffName(staffInfo.getRealName()); + dto.setMobile(staffInfo.getMobile()); + }*/ + //拼接网格名 + /*if (StringUtils.isNoneBlank(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName((StringUtils.isEmpty(gridInfo.getAllParentName()) ? "" : gridInfo.getAllParentName() + "-") + gridInfo.getGridNamePath()); + } + } else { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); + if (null != agencyInfo) { + dto.setGridName((StringUtils.isEmpty(agencyInfo.getAllParentName()) ? "" : agencyInfo.getAllParentName() + "-") + agencyInfo.getOrganizationName()); + } + }*/ + if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) { + List imageList = dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()); + dto.setImageList(imageList); + } + + } + return new PageData<>(list, pageInfo.getTotal()); + } + + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 493f8bbf72..cf692ea226 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -620,4 +620,111 @@ GROUP BY t.PROJECT_ID ORDER BY p.CREATED_TIME DESC + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetByRealNamesFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetByRealNamesFormDTO.java index 80719e6737..ec555aaa14 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetByRealNamesFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/GetByRealNamesFormDTO.java @@ -23,4 +23,8 @@ public class GetByRealNamesFormDTO implements Serializable { * 工作人员姓名集合 */ private Set realNames; + /** + * 手机号模糊查询 + */ + private String mobile; } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml index 10965b93ce..089546469d 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/CustomerStaffDao.xml @@ -450,9 +450,14 @@ WHERE del_flag = '0' AND customer_id = #{customerId} - - #{name} - + + + #{name} + + + + AND mobile LIKE concat('%', #{mobile}, '%') + From ee839d8a0cb1291fc112a77c9e74a0550cc2ba95 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 3 Aug 2022 16:11:16 +0800 Subject: [PATCH 251/288] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 12 ++--- .../epmet/dto/form/OrgProjectListFormDTO.java | 2 +- .../dto/result/OrgProjectListResultDTO.java | 4 +- .../epmet/controller/ProjectController.java | 2 +- .../com/epmet/excel/OrgProjectListExcel.java | 3 +- .../service/impl/ProjectServiceImpl.java | 54 +++++++++++-------- 6 files changed, 42 insertions(+), 35 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index dc505b1985..c70047b7c8 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -284,8 +284,8 @@ lb://epmet-job-server - - lb://epmet-user-server + http://localhost:8087 + lb://epmet-demo-server @@ -324,11 +324,11 @@ lb://resi-hall-server - - lb://gov-issue-server + http://localhost:8101 + - - lb://gov-project-server + http://localhost:8102 + lb://common-service-server diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java index cbc171d0a9..a4ffd4b25d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java @@ -43,7 +43,7 @@ public class OrgProjectListFormDTO extends PageFormDTO implements Serializable { private List firstIdList; private List secondIdList; /** - * 事件状态 待处理 pending，结案closed + * 事件状态 处理中 pending，已结案 closed */ private String status; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java index aaece87f42..8209973888 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java @@ -91,10 +91,10 @@ public class OrgProjectListResultDTO implements Serializable { * 图片url集合 */ private List urlList; - private List imageList; + private String imageUrl; /** - * 状态 待处理 pending，结案closed + * 状态 处理中 pending，已结案 closed */ private String status; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 466eb3d57f..180b00767e 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -409,7 +409,7 @@ public class ProjectController { @PostMapping("orgprojectexport") public void orgProjectExport(@LoginUser TokenDto tokenDto, @RequestBody OrgProjectListFormDTO formDTO, HttpServletResponse response) throws IOException { formDTO.setCustomerId(tokenDto.getCustomerId()); - formDTO.setStaffId(tokenDto.getUserId()); + formDTO.setUserId(tokenDto.getUserId()); formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageNo(NumConstant.ONE); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java index 4eb4cd5c71..0af3ccc4c9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/excel/OrgProjectListExcel.java @@ -113,8 +113,7 @@ public class OrgProjectListExcel { */ @ExcelProperty(value = "图片") @ColumnWidth(30) - @ExcelCollection(name = "图片") - private List imageList; + private String imageUrl; /** * 状态 处理中 pending，已结案 closed diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 08f457f764..3843668354 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3471,39 +3471,47 @@ public class ProjectServiceImpl extends BaseServiceImpl> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto); + Result> categoryRes = govIssueOpenFeignClient.coutomerCategoryList(dictFormDto); if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); } Map categoryMap = categoryRes.getData().stream().collect(Collectors.toMap(IssueProjectCategoryDictDTO::getId, IssueProjectCategoryDictDTO::getCategoryName)); - *///3-2.封装数据 + //3-2.封装数据 for (OrgProjectListResultDTO dto : list) { //分类名称 - /*dto.setFirstName(categoryMap.get(dto.getFirstId())); - dto.setSecondName(categoryMap.get(dto.getSecondId()));*/ - //工作人员基础信息 - /*CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), dto.getStaffId()); - if (null != staffInfo) { - dto.setStaffName(staffInfo.getRealName()); - dto.setMobile(staffInfo.getMobile()); - }*/ - //拼接网格名 - /*if (StringUtils.isNoneBlank(dto.getGridId())) { - GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); - if (null != gridInfo) { - dto.setGridName((StringUtils.isEmpty(gridInfo.getAllParentName()) ? "" : gridInfo.getAllParentName() + "-") + gridInfo.getGridNamePath()); + dto.setFirstName(categoryMap.get(dto.getFirstId())); + dto.setSecondName(categoryMap.get(dto.getSecondId())); + try { + //工作人员基础信息 + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), dto.getStaffId()); + if (null != staffInfo) { + dto.setStaffName(staffInfo.getRealName()); + dto.setMobile(staffInfo.getMobile()); } - } else { - AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); - if (null != agencyInfo) { - dto.setGridName((StringUtils.isEmpty(agencyInfo.getAllParentName()) ? "" : agencyInfo.getAllParentName() + "-") + agencyInfo.getOrganizationName()); + //拼接网格名 + if (StringUtils.isNoneBlank(dto.getGridId())) { + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(dto.getGridId()); + if (null != gridInfo) { + dto.setGridName((StringUtils.isEmpty(gridInfo.getAllParentName()) ? "" : gridInfo.getAllParentName() + "-") + gridInfo.getGridNamePath()); + } + } else { + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId()); + if (null != agencyInfo) { + dto.setGridName((StringUtils.isEmpty(agencyInfo.getAllParentName()) ? "" : agencyInfo.getAllParentName() + "-") + agencyInfo.getOrganizationName()); + } } - }*/ + } catch (Exception e) { + log.warn("获取组织/网格缓存失败"); + } + if (!org.springframework.util.CollectionUtils.isEmpty(dto.getUrlList())) { - List imageList = dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()); - dto.setImageList(imageList); + //String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),String.valueOf((char)10)); + String imageUrl = StringUtils.join(dto.getUrlList().stream().map(FileDTO::getUrl).collect(Collectors.toList()),"\n"); + System.out.println(imageUrl + ); + dto.setImageUrl(imageUrl); } } From c72bd68047cc55f2683871edef9bbeaf1d8fa096 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 3 Aug 2022 16:12:20 +0800 Subject: [PATCH 252/288] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/pom.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-gateway/pom.xml b/epmet-gateway/pom.xml index c70047b7c8..dc505b1985 100644 --- a/epmet-gateway/pom.xml +++ b/epmet-gateway/pom.xml @@ -284,8 +284,8 @@ lb://epmet-job-server - http://localhost:8087 - + + lb://epmet-user-server lb://epmet-demo-server @@ -324,11 +324,11 @@ lb://resi-hall-server - http://localhost:8101 - + + lb://gov-issue-server - http://localhost:8102 - + + lb://gov-project-server lb://common-service-server From 255e6e1e9749dc6194d351ae52215e3f2dc31275 Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Wed, 3 Aug 2022 17:27:38 +0800 Subject: [PATCH 253/288] =?UTF-8?q?=E3=80=90=E4=BA=94=E5=A4=A7=E5=9B=BE?= =?UTF-8?q?=E5=B1=82=E3=80=91=E4=BC=81=E4=BA=8B=E4=B8=9A=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E5=B7=A1=E6=9F=A5=EF=BC=8Csearch=E6=9D=A1=E4=BB=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml index 1c7d0dd16e..362e2ca60f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcEnterprisePatrolRecordDao.xml @@ -42,7 +42,9 @@ e.source_type from ic_enterprise e where e.CUSTOMER_ID = #{customerId} + and e.PLACE_ORG_NAME like CONCAT('%',#{search},'%') + and (e.AGENCY_ID = #{agencyId} or e.AGENCY_PIDS like CONCAT(#{staffOrgIds}, '%')) and e.PLACE_TYPE = #{categoryKey} From ed589583bd652459bbca11f6059db92686235eb5 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 3 Aug 2022 17:34:14 +0800 Subject: [PATCH 254/288] =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=B9=B3=E5=8F=B0=20?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/controller/ProjectController.java | 2 +- .../java/com/epmet/service/impl/ProjectServiceImpl.java | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java index 180b00767e..89ad557e61 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java @@ -413,7 +413,7 @@ public class ProjectController { formDTO.setIsPage(false); ExcelWriter excelWriter = null; formDTO.setPageNo(NumConstant.ONE); - formDTO.setPageSize(NumConstant.TEN_THOUSAND); + formDTO.setPageSize(NumConstant.ONE_THOUSAND); try { String fileName = "项目管理导出表" + DateUtils.format(new Date()) + ".xlsx"; excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), OrgProjectListExcel.class).build(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 3843668354..e8a73e8164 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3473,7 +3473,7 @@ public class ProjectServiceImpl extends BaseServiceImpl> categoryRes = govIssueOpenFeignClient.coutomerCategoryList(dictFormDto); + Result> categoryRes = govIssueOpenFeignClient.getCategoryList(dictFormDto); if (!categoryRes.success() || org.springframework.util.CollectionUtils.isEmpty(categoryRes.getData())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取项目分类名称异常"); } @@ -3507,10 +3507,7 @@ public class ProjectServiceImpl extends BaseServiceImpl "); dto.setImageUrl(imageUrl); } From 7e7991978d1afe3b0913fab9352890d07530afdc Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 4 Aug 2022 10:13:36 +0800 Subject: [PATCH 255/288] =?UTF-8?q?job=E5=A2=9E=E5=8A=A0=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/commons/tools/constant/ServiceConstant.java | 5 +++++ epmet-module/epmet-job/epmet-job-server/pom.xml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java index 221d7d3f69..8b819bcfb8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java @@ -143,4 +143,9 @@ public interface ServiceConstant { * 聚合查询服务 */ String DATA_AGGREGATOR_SERVER = "data-aggregator-server"; + + /** + * 插件pli-power服务 + */ + String PLI_POWER_SERVER = "pli-power-base-server"; } diff --git a/epmet-module/epmet-job/epmet-job-server/pom.xml b/epmet-module/epmet-job/epmet-job-server/pom.xml index 1e0d00c9ba..0aaf92db4a 100644 --- a/epmet-module/epmet-job/epmet-job-server/pom.xml +++ b/epmet-module/epmet-job/epmet-job-server/pom.xml @@ -43,6 +43,11 @@ epmet-message-client 2.0.0 + + com.epmet + pli-power-base-client + 2.0.0 + org.springframework.boot spring-boot-starter-web From c8f27c0d9a6bba1dc9048d17be8883bfed041a22 Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 4 Aug 2022 10:34:33 +0800 Subject: [PATCH 256/288] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/impl/ProjectServiceImpl.java | 8 ++++++++ .../src/main/resources/mapper/ProjectDao.xml | 10 +++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index e8a73e8164..6d9da2cfcd 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3448,6 +3448,14 @@ public class ProjectServiceImpl extends BaseServiceImpl orgProjectList(OrgProjectListFormDTO formDTO) { //1.整理查询条件 + if(StringUtils.isEmpty(formDTO.getOrgType())){ + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + if (null == staffInfo) { + throw new EpmetException("获取工作人员信息失败"); + } + formDTO.setOrgId(staffInfo.getAgencyId()); + formDTO.setOrgType("agency"); + } if (StringUtils.isNoneBlank(formDTO.getMobile())) { //有手机号筛选条件的选按手机号查找工作人员，在按staffId查项目 GetByRealNamesFormDTO dto = new GetByRealNamesFormDTO(); diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index cf692ea226..8258533b9a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -661,7 +661,14 @@ ppc.public_reply FROM project p - INNER JOIN project_category pc ON p.id = pc.project_id + + INNER JOIN ( + select PROJECT_ID,category_pids,category_id + from project_category + where del_flag = '0' and customer_id = #{customerId} + group by project_id + ORDER BY created_time desc + )pc ON p.id = pc.project_id #{firstId} @@ -682,6 +689,7 @@ WHERE p.del_flag = '0' + AND p.customer_id = #{customerId} From 1f9059e0d881babe6f8e5e24ef7f83cdf27b6f5d Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Thu, 4 Aug 2022 10:41:36 +0800 Subject: [PATCH 257/288] =?UTF-8?q?IcBulidingAddFormDTO.sort=E4=B8=8D?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AD=94=E4=BA=86=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java index 91b93b2569..cafecc1f1b 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java @@ -86,7 +86,7 @@ public class IcBulidingAddFormDTO implements Serializable { /** * 排序 */ - @NotNull(message = "排序不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) + // @NotNull(message = "排序不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class}) private BigDecimal sort = NumConstant.ZERO_DECIMAL; /** From 6a2de9a42d27521addc87e0cb612a25eb644bff5 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 4 Aug 2022 11:00:49 +0800 Subject: [PATCH 258/288] =?UTF-8?q?=E8=AE=BF=E5=AE=A2=E7=99=BB=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/PluginsService.java | 18 ++++++++ .../service/impl/PluginsServiceImpl.java | 28 +++++++++++++ .../com/epmet/task/VisitorLogoutTask.java | 41 +++++++++++++++++++ 3 files changed, 87 insertions(+) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java new file mode 100644 index 0000000000..e63e4233d1 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java @@ -0,0 +1,18 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; + +public interface PluginsService { + + /** + * 访客登出 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author zhy + * @date 2022/5/30 10:25 + */ + Result visitorLogout(VisitorLogoutFormDTO formDTO); + +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java new file mode 100644 index 0000000000..9321154cc8 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java @@ -0,0 +1,28 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.feign.DataStatisticalOpenFeignClient; +import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO; +import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; +import com.epmet.plugin.power.feign.PliPowerFeignClient; +import com.epmet.service.PluginsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +@Service +public class PluginsServiceImpl implements PluginsService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PliPowerFeignClient pliPowerFeignClient; + + @Override + public Result visitorLogout(VisitorLogoutFormDTO formDTO) { + return pliPowerFeignClient.visitorLogout(formDTO); + } + +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java new file mode 100644 index 0000000000..810f8105db --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java @@ -0,0 +1,41 @@ +package com.epmet.task; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; +import com.epmet.service.PluginsService; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 访客登出 + * + * @author zhy + * @date 2022/5/30 10:23 + */ +@Component("visitorLogoutTask") +public class VisitorLogoutTask implements ITask { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PluginsService pluginsService; + + @Override + public void run(String params) { + logger.info("VisitorLogoutTask定时任务正在执行，参数为：{}", params); + VisitorLogoutFormDTO formDTO = new VisitorLogoutFormDTO(); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, VisitorLogoutFormDTO.class); + } + Result result = pluginsService.visitorLogout(formDTO); + if (result.success()) { + logger.info("VisitorLogoutTask定时任务执行成功"); + } else { + logger.error("VisitorLogoutTask定时任务执行失败:" + result.getMsg()); + } + } +} From ff8c484bcd4ce351b5a1131b00030a66bc5d8434 Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 4 Aug 2022 11:17:42 +0800 Subject: [PATCH 259/288] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/OrgProjectListResultDTO.java | 5 +++++ .../epmet/service/impl/ProjectServiceImpl.java | 17 ++++++++++++----- 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java index 8209973888..b032f6bf0c 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java @@ -97,4 +97,9 @@ public class OrgProjectListResultDTO implements Serializable { * 状态 处理中 pending，已结案 closed */ private String status; + /** + * 是否需要自己处理 true:需要 false:不需要 + */ + private Boolean processable = false; + } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 6d9da2cfcd..290ef12c1f 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -41,10 +41,7 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.*; import com.epmet.constant.*; -import com.epmet.dao.ProjectDao; -import com.epmet.dao.ProjectOrgRelationDao; -import com.epmet.dao.ProjectSatisfactionDetailDao; -import com.epmet.dao.ProjectSatisfactionStatisticsDao; +import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; @@ -157,6 +154,8 @@ public class ProjectServiceImpl extends BaseServiceImpl "); dto.setImageUrl(imageUrl); } + //判断未结案项目是否涉及需要当前工作人员处理[列表查询需要，导出的不需要这段逻辑] + if (formDTO.getIsPage() && "pending".equals(dto.getStatus())) { + //查询当前工作人员是否存在当前项目的未处理节点 + ProjectStaffDTO projectStaff = projectStaffDao.selectLatestByProjectIdAndStaffId(dto.getProjectId(), formDTO.getUserId()); + if (null != projectStaff) { + dto.setProcessable(true); + } + } } return new PageData<>(list, pageInfo.getTotal()); From c9998ad0aab78091ed3c8004195360e1b448b255 Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 4 Aug 2022 15:12:39 +0800 Subject: [PATCH 260/288] =?UTF-8?q?bug=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/ProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index 290ef12c1f..ffac31d560 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3448,7 +3448,7 @@ public class ProjectServiceImpl extends BaseServiceImpl orgProjectList(OrgProjectListFormDTO formDTO) { //1.整理查询条件 if(StringUtils.isEmpty(formDTO.getOrgType())){ - CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getStaffId()); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); if (null == staffInfo) { throw new EpmetException("获取工作人员信息失败"); } From c0a30100889d6072433404a65ae042315898f20a Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 4 Aug 2022 15:16:23 +0800 Subject: [PATCH 261/288] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/govproject/impl/GovProjectServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index ffe5d2d7a3..dc261bb148 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -714,7 +714,7 @@ public class GovProjectServiceImpl implements GovProjectService { */ @Override public Map getMemberClosedProjectMap(OrgStatisticsFormDTO formDTO) { - List list = projectDao.getMemberProjectCount(formDTO); + List list = projectDao.getMemberClosedProjectCount(formDTO); if (CollectionUtils.isEmpty(list)) { return Collections.emptyMap(); } From 02c8376402d7707d91b2c42fe3d6712c09f7ce80 Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 4 Aug 2022 15:28:08 +0800 Subject: [PATCH 262/288] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/OrgProjectListResultDTO.java | 2 +- .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java index b032f6bf0c..f235b1280e 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java @@ -22,7 +22,7 @@ public class OrgProjectListResultDTO implements Serializable { */ private String agencyId; /** - * 上报渠道 agency:网格上报 resi_event:居民上报 work_event:巡查上报 issue:议题上报 + * 上报渠道 agency:网格上报 ic_event:居民上报 work_event:巡查上报 issue:议题上报 */ private String origin; /** diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index 8258533b9a..97d3279b8c 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -645,7 +645,7 @@ SELECT p.id, p.agency_id, - ( CASE WHEN p.origin = 'issue' THEN '议题上报' WHEN p.origin = 'resi_event' THEN '居民上报' WHEN p.origin = 'work_event' THEN '巡查上报' WHEN p.origin = 'agency' THEN '网格上报' ELSE '' END ) AS origin, + ( CASE WHEN p.origin = 'issue' THEN '议题上报' WHEN p.origin = 'ic_event' THEN '居民上报' WHEN p.origin = 'work_event' THEN '巡查上报' WHEN p.origin = 'agency' THEN '网格上报' ELSE '' END ) AS origin, p.title, p.grid_id, p.locate_address, From 3042fc5cf701bae6646edac7633bb1969ad0d807 Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 4 Aug 2022 15:28:47 +0800 Subject: [PATCH 263/288] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java index a4ffd4b25d..c2607974ee 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/OrgProjectListFormDTO.java @@ -20,7 +20,7 @@ public class OrgProjectListFormDTO extends PageFormDTO implements Serializable { */ private String orgType; /** - * 上报渠道 【来源：议题issue 项目立项:agency 事件:resi_event 工作人员上报:work_event】 + * 上报渠道 【来源：议题issue 项目立项:agency 事件:ic_event 工作人员上报:work_event】 */ private String origin; /** From 768d0a60b64ee4a637628e0674db0fc059253063 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Thu, 4 Aug 2022 16:20:10 +0800 Subject: [PATCH 264/288] =?UTF-8?q?=E7=BD=91=E6=A0=BC=E5=91=98=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/govorg/impl/GovOrgServiceImpl.java | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index f9772a9f47..84a8b7a276 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -1188,12 +1188,8 @@ public class GovOrgServiceImpl implements GovOrgService { dto.setOrgId(grid.getId()); dto.setOrgType(OrgConstant.GRID); dto.setOrgName(grid.getGridName()); - if (projectMap.containsKey(grid.getId())) { - dto.setProjectCount(projectMap.get(grid.getId())); - } - if (closedMap.containsKey(grid.getId())) { - dto.setClosedCount(closedMap.get(grid.getId())); - } + dto.setProjectCount(projectMap.getOrDefault(grid.getId(), NumConstant.ZERO)); + dto.setClosedCount(closedMap.getOrDefault(grid.getId(), NumConstant.ZERO)); if (memberMap.containsKey(grid.getId())) { dto.setMemberCount(Math.toIntExact(memberMap.get(grid.getId()))); if (NumConstant.ZERO != dto.getMemberCount()) { @@ -1296,12 +1292,9 @@ public class GovOrgServiceImpl implements GovOrgService { //统计关闭项目数 Map closedMap = govProjectService.getMemberClosedProjectMap(formDTO); result.getList().forEach(item -> { - if (projectMap.containsKey(item.getStaffId())) { - item.setProjectCount(projectMap.get(item.getStaffId())); - } - if (projectMap.containsKey(item.getStaffId())) { - item.setClosedCount(closedMap.get(item.getStaffId())); - } + item.setProjectCount(projectMap.getOrDefault(item.getStaffId(), NumConstant.ZERO)); + item.setClosedCount(closedMap.getOrDefault(item.getStaffId(), NumConstant.ZERO)); + if (OrgConstant.AGENCY.contains(formDTO.getOrgType())) { AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(item.getOrgId()); if (null != agencyInfo) { From 2c78a9e163d967ce1ab63bfc887c4d4dd4becb0e Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 4 Aug 2022 16:47:22 +0800 Subject: [PATCH 265/288] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/result/OrgProjectListResultDTO.java | 1 + .../main/java/com/epmet/service/impl/ProjectServiceImpl.java | 2 +- .../gov-project-server/src/main/resources/mapper/ProjectDao.xml | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java index f235b1280e..f734a13de8 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/OrgProjectListResultDTO.java @@ -97,6 +97,7 @@ public class OrgProjectListResultDTO implements Serializable { * 状态 处理中 pending，已结案 closed */ private String status; + private String statusValue; /** * 是否需要自己处理 true:需要 false:不需要 */ diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java index ffac31d560..8ec6dddb62 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java @@ -3518,7 +3518,7 @@ public class ProjectServiceImpl extends BaseServiceImpl + @@ -653,6 +654,7 @@ DATE_FORMAT(p.created_time, '%Y-%m-%d %H:%i:%s') AS created_time, p.back_ground, ( CASE WHEN p.`STATUS` = 'pending' THEN '处理中' WHEN p.`STATUS` = 'closed' THEN '已结案' ELSE '' END ) AS status, + p.`status` AS statusValue, pc.category_pids, pc.category_id, pp.public_reply, From c0ce8983cbc0b9997c6664ba2b00333feab79384 Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 5 Aug 2022 10:45:42 +0800 Subject: [PATCH 266/288] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E5=A7=93?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectProcessDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml index 846f9ac89d..a5c2979715 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml @@ -92,7 +92,7 @@ ID AS processId, OPERATION_NAME AS processName, UNIX_TIMESTAMP(created_time) AS processTime, - CONCAT(DEPARTMENT_NAME,'(',STAFF_NAME,')') AS "departmentName", + CONCAT( DEPARTMENT_NAME, '(', IFNULL(STAFF_NAME, ''), ')' ) AS "departmentName", PUBLIC_REPLY, INTERNAL_REMARK, IS_SEND, From b89c1074f01eb57a4882cd8f2547cfff400fe11c Mon Sep 17 00:00:00 2001 From: zhaoqifeng Date: Fri, 5 Aug 2022 10:49:52 +0800 Subject: [PATCH 267/288] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=9B=E5=B1=95?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E5=A7=93?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectProcessDao.xml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml index a5c2979715..6255a9b138 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectProcessDao.xml @@ -92,7 +92,11 @@ ID AS processId, OPERATION_NAME AS processName, UNIX_TIMESTAMP(created_time) AS processTime, - CONCAT( DEPARTMENT_NAME, '(', IFNULL(STAFF_NAME, ''), ')' ) AS "departmentName", + CASE + WHEN STAFF_NAME IS NULL THEN + DEPARTMENT_NAME + ELSE CONCAT( DEPARTMENT_NAME, '(', STAFF_NAME, ')' ) + END AS "departmentName", PUBLIC_REPLY, INTERNAL_REMARK, IS_SEND, From 09b06d330088651dd0dcfd7e6d13ca3eec444168 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 11:01:38 +0800 Subject: [PATCH 268/288] =?UTF-8?q?=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/PluginsServiceImpl.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java index 9321154cc8..490478a029 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java @@ -1,13 +1,9 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; -import com.epmet.feign.DataStatisticalOpenFeignClient; -import com.epmet.plugin.power.dto.visit.form.VisitVisitorChartFormDTO; import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; import com.epmet.plugin.power.feign.PliPowerFeignClient; import com.epmet.service.PluginsService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -15,8 +11,6 @@ import org.springframework.stereotype.Service; @Service public class PluginsServiceImpl implements PluginsService { - private Logger logger = LoggerFactory.getLogger(getClass()); - @Autowired private PliPowerFeignClient pliPowerFeignClient; From 228151f933ea5a397a0fc0cfe4ff21defc669c8f Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Aug 2022 14:04:25 +0800 Subject: [PATCH 269/288] =?UTF-8?q?=E5=8C=B9=E9=85=8D=E8=BA=AB=E4=BB=BD?= =?UTF-8?q?=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 1 + .../dto/form/IcUserMatchGridFormDTO.java | 24 ++++++++++++++++++ .../dto/result/IcUserMatchGridResultDTO.java | 20 +++++++++++++++ .../controller/IcResiUserController.java | 13 ++++++++++ .../com/epmet/service/IcResiUserService.java | 9 +++++++ .../service/impl/IcResiUserServiceImpl.java | 25 +++++++++++++++++++ 6 files changed, 92 insertions(+) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index a13d6cf1db..163dee5e2f 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -259,6 +259,7 @@ public enum EpmetErrorCode { NOT_REGEIST_RESI(8927,"未注册居民"), UNIT_EXIST_HOUSES_ERROR(8928,"单元下存在房屋，不可修改单元数"), IC_VACCINE(8929,"已存在相同记录，请去修改原有记录"), + NOT_MATCH_IC_USER_ERROR(8930,"请联系社区工作人员"), MISMATCH(10086,"人员与房屋信息不匹配，请与工作人员联系。"), diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java new file mode 100644 index 0000000000..5e93dcda97 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java @@ -0,0 +1,24 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/5 11:11 + * @DESC + */ +@Data +public class IcUserMatchGridFormDTO implements Serializable { + + private static final long serialVersionUID = -5252136149475817567L; + + public interface IcUserMatchGridForm{} + + @NotBlank(message = "idCard不能为空",groups = IcUserMatchGridForm.class) + private String idCard; + + private String customerId; +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java new file mode 100644 index 0000000000..08495ede1c --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java @@ -0,0 +1,20 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/8/5 11:14 + * @DESC + */ +@Data +public class IcUserMatchGridResultDTO implements Serializable { + + private static final long serialVersionUID = -3215965796907113918L; + + private String gridId; + + private String gridName; +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 834ac2326c..63f6f4a7e7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1293,5 +1293,18 @@ public class IcResiUserController implements ResultDataResolver { return new Result>>().ok(icResiUserService.listResiZhzl(pageFormDTO)); } + /** + * Desc: 居民首次进入小程序，可以根据输入身份证信息查询在数字社区居民信息中的网格，匹配不成功提示 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/8/5 11:17 + */ + @PostMapping("icUserMatchGrid") + public Result icUserMatchGrid(@LoginUser TokenDto tokenDto,@RequestBody IcUserMatchGridFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, IcUserMatchGridFormDTO.IcUserMatchGridForm.class); + formDTO.setCustomerId(tokenDto.getCustomerId()); + return new Result().ok(icResiUserService.icUserMatchGrid(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java index f68830d81c..37cf258e14 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java @@ -496,4 +496,13 @@ public interface IcResiUserService extends BaseService { * @return */ PageData> listResiZhzl(IcResiUserPageFormDTO pageFormDTO); + + /** + * Desc: 居民首次进入小程序，可以根据输入身份证信息查询在数字社区居民信息中的网格，匹配不成功提示 + * @param formDTO + * @author zxc + * @date 2022/8/5 11:17 + */ + IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO); + } 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 b329bee2b8..9247e69e48 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 @@ -3244,4 +3244,29 @@ public class IcResiUserServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } + + /** + * Desc: 居民首次进入小程序，可以根据输入身份证信息查询在数字社区居民信息中的网格，匹配不成功提示 + * @param formDTO + * @author zxc + * @date 2022/8/5 11:17 + */ + @Override + public IcUserMatchGridResultDTO icUserMatchGrid(IcUserMatchGridFormDTO formDTO) { + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + qw.eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + .eq(IcResiUserEntity::getIdCard,formDTO.getIdCard()); + IcResiUserEntity icResiUserEntity = baseDao.selectOne(qw); + if (null == icResiUserEntity){ + throw new EpmetException(EpmetErrorCode.NOT_MATCH_IC_USER_ERROR.getCode()); + } + IcUserMatchGridResultDTO result = new IcUserMatchGridResultDTO(); + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(icResiUserEntity.getGridId()); + if (null == gridInfo){ + throw new EpmetException("查询网格信息失败："+icResiUserEntity.getGridId()); + } + result.setGridId(icResiUserEntity.getGridId()); + result.setGridName(gridInfo.getGridName()); + return result; + } } From fc33938ce53551e840f41d6fa4bcd6f193747806 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 14:07:01 +0800 Subject: [PATCH 270/288] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/PluginsServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java index 490478a029..00cd78421f 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java @@ -4,6 +4,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; import com.epmet.plugin.power.feign.PliPowerFeignClient; import com.epmet.service.PluginsService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -11,11 +13,15 @@ import org.springframework.stereotype.Service; @Service public class PluginsServiceImpl implements PluginsService { + private Logger logger = LoggerFactory.getLogger(getClass()); + @Autowired private PliPowerFeignClient pliPowerFeignClient; @Override public Result visitorLogout(VisitorLogoutFormDTO formDTO) { + logger.info("info----------------------------"); + logger.error("error----------------------------"); return pliPowerFeignClient.visitorLogout(formDTO); } From b145fea023af3628f5ed7fab21289d3725edd097 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 14:27:55 +0800 Subject: [PATCH 271/288] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/service/impl/PluginsServiceImpl.java | 1 + 1 file changed, 1 insertion(+) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java index 00cd78421f..8323f9b87d 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java @@ -21,6 +21,7 @@ public class PluginsServiceImpl implements PluginsService { @Override public Result visitorLogout(VisitorLogoutFormDTO formDTO) { logger.info("info----------------------------"); + pliPowerFeignClient.logout(formDTO); logger.error("error----------------------------"); return pliPowerFeignClient.visitorLogout(formDTO); } From a708356bb223232321700a6e36fff1ae4ea4bd87 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Aug 2022 15:17:43 +0800 Subject: [PATCH 272/288] =?UTF-8?q?=E5=8A=A0=E7=99=BD=E5=90=8D=E5=8D=95=20?= =?UTF-8?q?=E7=95=A5=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/bootstrap.yml | 1 + .../java/com/epmet/dto/PaCustomerDTO.java | 71 +++++++++++++++++++ .../dto/form/IcUserMatchGridFormDTO.java | 3 +- .../controller/IcResiUserController.java | 3 +- .../service/impl/IcResiUserServiceImpl.java | 28 +++++++- 5 files changed, 102 insertions(+), 4 deletions(-) create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PaCustomerDTO.java diff --git a/epmet-gateway/src/main/resources/bootstrap.yml b/epmet-gateway/src/main/resources/bootstrap.yml index a1d2a74c11..b0b2492d33 100644 --- a/epmet-gateway/src/main/resources/bootstrap.yml +++ b/epmet-gateway/src/main/resources/bootstrap.yml @@ -502,6 +502,7 @@ epmet: # 内部认证url白名单(在白名单中的，就不会再校验登录了) internalAuthUrlsWhiteList: - /epmetuser/customerstaff/customerlist + - /epmetuser/icresiuser/icUserMatchGrid - /auth/wechat/** - /**/druid/** - /gov/project/project/platformcallback diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PaCustomerDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PaCustomerDTO.java new file mode 100644 index 0000000000..66abf30d75 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/PaCustomerDTO.java @@ -0,0 +1,71 @@ +package com.epmet.dto; + +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * @Author zxc + * @DateTime 2022/8/5 15:03 + * @DESC + */ +@Data +public class PaCustomerDTO implements Serializable { + + /** + * 客户id，本主键和oper_crm.customer.id一致 + */ + private String id; + + /** + * 客户名称，默认是根组织名称 + */ + private String customerName; + + /** + * 是否已经完成客户信息初始化 0：未初始化，1：已初始化 + */ + private Integer isInitialize; + + /** + * 客户类型 mini 微信小程序客户 app 第三方app客户 + */ + private String type; + + /** + * 数据来源(dev:开发 test:体验 prod:生产) + */ + private String source; + + /** + * 删除标识：0.未删除 1.已删除 + */ + private Integer delFlag; + + /** + * 乐观锁 + */ + private Integer revision; + + /** + * 创建人 + */ + private String createdBy; + + /** + * 创建时间 + */ + private Date createdTime; + + /** + * 更新人 + */ + private String updatedBy; + + /** + * 更新时间 + */ + private Date updatedTime; + +} diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java index 5e93dcda97..1aa4d2db1e 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/IcUserMatchGridFormDTO.java @@ -20,5 +20,6 @@ public class IcUserMatchGridFormDTO implements Serializable { @NotBlank(message = "idCard不能为空",groups = IcUserMatchGridForm.class) private String idCard; - private String customerId; + @NotBlank(message = "appId不能为空",groups = IcUserMatchGridForm.class) + private String appId; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java index 63f6f4a7e7..f958d975d3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java @@ -1301,9 +1301,8 @@ public class IcResiUserController implements ResultDataResolver { * @date 2022/8/5 11:17 */ @PostMapping("icUserMatchGrid") - public Result icUserMatchGrid(@LoginUser TokenDto tokenDto,@RequestBody IcUserMatchGridFormDTO formDTO){ + public Result icUserMatchGrid(@RequestBody IcUserMatchGridFormDTO formDTO){ ValidatorUtils.validateEntity(formDTO, IcUserMatchGridFormDTO.IcUserMatchGridForm.class); - formDTO.setCustomerId(tokenDto.getCustomerId()); return new Result().ok(icResiUserService.icUserMatchGrid(formDTO)); } 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 9247e69e48..ebc175dd65 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 @@ -20,6 +20,7 @@ package com.epmet.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.IdWorker; @@ -3253,8 +3254,12 @@ public class IcResiUserServiceImpl extends BaseServiceImpl qw = new LambdaQueryWrapper<>(); - qw.eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + qw.eq(IcResiUserEntity::getCustomerId,customerInfo.getId()) .eq(IcResiUserEntity::getIdCard,formDTO.getIdCard()); IcResiUserEntity icResiUserEntity = baseDao.selectOne(qw); if (null == icResiUserEntity){ @@ -3269,4 +3274,25 @@ public class IcResiUserServiceImpl extends BaseServiceImplurl:https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/ ，结果->" + data); + JSONObject toResult = JSON.parseObject(data); + Result mapToResult = ConvertUtils.mapToEntity(toResult, Result.class); + if (null != toResult.get("code")) { + mapToResult.setCode(((Integer) toResult.get("code")).intValue()); + } + if (!mapToResult.success()) { + logger.error(String.format("根据appId查询客户Id失败，对应appId->" + appId)); + throw new RenException(mapToResult.getMsg()); + } + Object PublicCustomerResultDTO = mapToResult.getData(); + JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString()); + Map map = (Map) json.get("customer"); + PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class); + logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer); + return customer; + } } From 7df0589a9747e999c9d3841d3798f657901515e2 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Aug 2022 15:44:30 +0800 Subject: [PATCH 273/288] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A2=E6=88=B7ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/dto/result/IcUserMatchGridResultDTO.java | 2 ++ .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 1 + 2 files changed, 3 insertions(+) diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java index 08495ede1c..d3fd271987 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcUserMatchGridResultDTO.java @@ -16,5 +16,7 @@ public class IcUserMatchGridResultDTO implements Serializable { private String gridId; + private String customerId; + private String gridName; } 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 ebc175dd65..75ee6009e1 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 @@ -3270,6 +3270,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 5 Aug 2022 16:15:03 +0800 Subject: [PATCH 274/288] =?UTF-8?q?=E8=AF=95=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/PliPowerService.java | 10 +++++ .../service/impl/PliPowerServiceImpl.java | 33 +++++++++++++++ .../com/epmet/task/PliVisitorLogoutTask.java | 41 +++++++++++++++++++ .../com/epmet/task/VisitorLogoutTask.java | 5 ++- 4 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java create mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java new file mode 100644 index 0000000000..3c1c34e009 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java @@ -0,0 +1,10 @@ +package com.epmet.service; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.StatsFormDTO; +import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; + +public interface PliPowerService { + + Result visitorLogout(VisitorLogoutFormDTO formDTO); +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java new file mode 100644 index 0000000000..d7c141132f --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java @@ -0,0 +1,33 @@ +package com.epmet.service.impl; + +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.StatsFormDTO; +import com.epmet.feign.DataStatisticalOpenFeignClient; +import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; +import com.epmet.plugin.power.feign.PliPowerFeignClient; +import com.epmet.service.PliPowerService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + + +/** + * @Description + * @ClassName StatsUserServiceImpl + * @Auth wangc + * @Date 2020-06-29 09:41 + */ +@Service +public class PliPowerServiceImpl implements PliPowerService { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PliPowerFeignClient pliPowerFeignClient; + + @Override + public Result visitorLogout(VisitorLogoutFormDTO formDTO) { + return pliPowerFeignClient.visitorLogout(formDTO); + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java new file mode 100644 index 0000000000..c24e66aa22 --- /dev/null +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java @@ -0,0 +1,41 @@ +package com.epmet.task; + +import com.alibaba.fastjson.JSON; +import com.epmet.commons.tools.utils.Result; +import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; +import com.epmet.service.PliPowerService; +import org.apache.commons.lang3.StringUtils; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 访客登出 + * + * @author zhy + * @date 2022/5/30 10:23 + */ +@Component("PliVisitorLogoutTask") +public class PliVisitorLogoutTask implements ITask { + + private Logger logger = LoggerFactory.getLogger(getClass()); + + @Autowired + private PliPowerService pliPowerService; + + @Override + public void run(String params) { + logger.info("VisitorLogoutTask定时任务正在执行，参数为：{}", params); + VisitorLogoutFormDTO formDTO = new VisitorLogoutFormDTO(); + if (StringUtils.isNotBlank(params)) { + formDTO = JSON.parseObject(params, VisitorLogoutFormDTO.class); + } + Result result = pliPowerService.visitorLogout(formDTO); + if (result.success()) { + logger.info("VisitorLogoutTask定时任务执行成功"); + } else { + logger.error("VisitorLogoutTask定时任务执行失败:" + result.getMsg()); + } + } +} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java index 810f8105db..53e069fb3a 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java @@ -3,6 +3,7 @@ package com.epmet.task; import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.utils.Result; import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; +import com.epmet.service.PliPowerService; import com.epmet.service.PluginsService; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; @@ -22,7 +23,7 @@ public class VisitorLogoutTask implements ITask { private Logger logger = LoggerFactory.getLogger(getClass()); @Autowired - private PluginsService pluginsService; + private PliPowerService pliPowerService; @Override public void run(String params) { @@ -31,7 +32,7 @@ public class VisitorLogoutTask implements ITask { if (StringUtils.isNotBlank(params)) { formDTO = JSON.parseObject(params, VisitorLogoutFormDTO.class); } - Result result = pluginsService.visitorLogout(formDTO); + Result result = pliPowerService.visitorLogout(formDTO); if (result.success()) { logger.info("VisitorLogoutTask定时任务执行成功"); } else { From 945d6b602acd4d6f8db422d4044c030e9a184f32 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 16:23:53 +0800 Subject: [PATCH 275/288] ? --- .../src/main/java/com/epmet/task/PliVisitorLogoutTask.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java index c24e66aa22..41ffa19ecc 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/PliVisitorLogoutTask.java @@ -16,7 +16,7 @@ import org.springframework.stereotype.Component; * @author zhy * @date 2022/5/30 10:23 */ -@Component("PliVisitorLogoutTask") +@Component("pliVisitorLogoutTask") public class PliVisitorLogoutTask implements ITask { private Logger logger = LoggerFactory.getLogger(getClass()); From 0c543dd1cc1f6b49772b19cbb07b4518b8b01c91 Mon Sep 17 00:00:00 2001 From: syc Date: Fri, 5 Aug 2022 16:45:50 +0800 Subject: [PATCH 276/288] =?UTF-8?q?=E5=BA=94=E6=9D=A8=E5=9D=A4=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=87=BA=E7=9A=84=E5=9B=BE=E7=89=87=E5=B1=95?= =?UTF-8?q?=E7=A4=BA=E5=88=9B=E5=BB=BA=E8=8A=82=E7=82=B9=E5=92=8C=E7=BB=93?= =?UTF-8?q?=E6=A1=88=E8=8A=82=E7=82=B9=E7=9A=84=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/ProjectDao.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml index b0a1bc562e..527e4bd62a 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml +++ b/epmet-module/gov-project/gov-project-server/src/main/resources/mapper/ProjectDao.xml @@ -731,10 +731,10 @@ INNER JOIN project_process_attachment ppa ON pp.id = ppa.process_id AND ppa.attachment_type = 'image' AND ppa.del_flag = '0' WHERE pp.del_flag = '0' - AND pp.operation = 'created' + and pp.operation IN('created', 'close') AND pp.project_id = #{projectId} ORDER BY - ppa.created_time ASC + pp.created_time ASC, ppa.created_time ASC \ No newline at end of file From 863b10523ce1284256d007e9b16830e2d109cf05 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 16:57:28 +0800 Subject: [PATCH 277/288] shandiao --- .../main/java/com/epmet/service/impl/PluginsServiceImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java index 8323f9b87d..eac4327bbd 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java @@ -20,8 +20,6 @@ public class PluginsServiceImpl implements PluginsService { @Override public Result visitorLogout(VisitorLogoutFormDTO formDTO) { - logger.info("info----------------------------"); - pliPowerFeignClient.logout(formDTO); logger.error("error----------------------------"); return pliPowerFeignClient.visitorLogout(formDTO); } From b0db08200a42216e475cd6aed0fbe9826cc1f6ba Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 5 Aug 2022 16:57:46 +0800 Subject: [PATCH 278/288] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=83=A8=E9=97=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/service/impl/DepartmentServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java index e5cd12fdf8..5aad1c9b59 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/DepartmentServiceImpl.java @@ -51,7 +51,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; -import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.Date; @@ -107,10 +106,11 @@ public class DepartmentServiceImpl implements DepartmentService { Result result = new Result(); AddDepartmentResultDTO addDepartmentResultDTO = new AddDepartmentResultDTO(); CustomerDepartmentEntity entity = ConvertUtils.sourceToTarget(formDTO, CustomerDepartmentEntity.class); - if (formDTO.getTotalUser() > NumConstant.ZERO) { + if (null != formDTO.getTotalUser() && formDTO.getTotalUser() > NumConstant.ZERO) { entity.setTotalUser(formDTO.getTotalUser()); + }else{ + entity.setTotalUser(NumConstant.ZERO); } - entity.setTotalUser(NumConstant.ZERO); //1:查询当前组织机构信息，获取客户Id CustomerAgencyEntity parentEntity = customerAgencyDao.selectById(formDTO.getAgencyId()); entity.setCustomerId(parentEntity.getCustomerId()); From a825c96b24187e45b653396b8258742c065ca777 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Fri, 5 Aug 2022 17:13:23 +0800 Subject: [PATCH 279/288] =?UTF-8?q?=E8=BF=98=E5=8E=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/service/PliPowerService.java | 9 +++- .../com/epmet/service/PluginsService.java | 18 -------- .../service/impl/PliPowerServiceImpl.java | 2 - .../service/impl/PluginsServiceImpl.java | 27 ------------ .../com/epmet/task/VisitorLogoutTask.java | 42 ------------------- 5 files changed, 8 insertions(+), 90 deletions(-) delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java delete mode 100644 epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java index 3c1c34e009..4fb990d033 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PliPowerService.java @@ -1,10 +1,17 @@ package com.epmet.service; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.StatsFormDTO; import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; public interface PliPowerService { + /** + * 访客登出 + * + * @param formDTO + * @return com.epmet.commons.tools.utils.Result + * @author zhy + * @date 2022/5/30 10:25 + */ Result visitorLogout(VisitorLogoutFormDTO formDTO); } diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java deleted file mode 100644 index e63e4233d1..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/PluginsService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.epmet.service; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; - -public interface PluginsService { - - /** - * 访客登出 - * - * @param formDTO - * @return com.epmet.commons.tools.utils.Result - * @author zhy - * @date 2022/5/30 10:25 - */ - Result visitorLogout(VisitorLogoutFormDTO formDTO); - -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java index d7c141132f..ed54b7e6d9 100644 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java +++ b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PliPowerServiceImpl.java @@ -1,8 +1,6 @@ package com.epmet.service.impl; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.StatsFormDTO; -import com.epmet.feign.DataStatisticalOpenFeignClient; import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; import com.epmet.plugin.power.feign.PliPowerFeignClient; import com.epmet.service.PliPowerService; diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java deleted file mode 100644 index eac4327bbd..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/service/impl/PluginsServiceImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.epmet.service.impl; - -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.plugin.power.feign.PliPowerFeignClient; -import com.epmet.service.PluginsService; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -@Service -public class PluginsServiceImpl implements PluginsService { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private PliPowerFeignClient pliPowerFeignClient; - - @Override - public Result visitorLogout(VisitorLogoutFormDTO formDTO) { - logger.error("error----------------------------"); - return pliPowerFeignClient.visitorLogout(formDTO); - } - -} diff --git a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java b/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java deleted file mode 100644 index 53e069fb3a..0000000000 --- a/epmet-module/epmet-job/epmet-job-server/src/main/java/com/epmet/task/VisitorLogoutTask.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.epmet.task; - -import com.alibaba.fastjson.JSON; -import com.epmet.commons.tools.utils.Result; -import com.epmet.plugin.power.dto.visit.form.VisitorLogoutFormDTO; -import com.epmet.service.PliPowerService; -import com.epmet.service.PluginsService; -import org.apache.commons.lang3.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 访客登出 - * - * @author zhy - * @date 2022/5/30 10:23 - */ -@Component("visitorLogoutTask") -public class VisitorLogoutTask implements ITask { - - private Logger logger = LoggerFactory.getLogger(getClass()); - - @Autowired - private PliPowerService pliPowerService; - - @Override - public void run(String params) { - logger.info("VisitorLogoutTask定时任务正在执行，参数为：{}", params); - VisitorLogoutFormDTO formDTO = new VisitorLogoutFormDTO(); - if (StringUtils.isNotBlank(params)) { - formDTO = JSON.parseObject(params, VisitorLogoutFormDTO.class); - } - Result result = pliPowerService.visitorLogout(formDTO); - if (result.success()) { - logger.info("VisitorLogoutTask定时任务执行成功"); - } else { - logger.error("VisitorLogoutTask定时任务执行失败:" + result.getMsg()); - } - } -} From 4456ea5d55af2874075ab4312cdde4a20ffef8cb Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Fri, 5 Aug 2022 17:13:30 +0800 Subject: [PATCH 280/288] emm --- .../main/java/com/epmet/service/impl/IcResiUserServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java index 75ee6009e1..f0fcfceefc 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 @@ -3272,7 +3272,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl Date: Fri, 5 Aug 2022 17:24:04 +0800 Subject: [PATCH 281/288] emm --- .../main/java/com/epmet/dto/result/StaffListResultDTO.java | 2 ++ .../com/epmet/service/impl/CustomerAgencyServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java index 2bf18307ce..c5e0fafb4e 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/StaffListResultDTO.java @@ -41,4 +41,6 @@ public class StaffListResultDTO implements Serializable { */ private String mobile=""; + private Boolean staffEnabledStatus = false; + } 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 4354be6b51..f2c0392dc7 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 @@ -325,6 +325,7 @@ public class CustomerAgencyServiceImpl extends BaseServiceImpl> collect = agencyStaffList.stream().collect(Collectors.groupingBy(StaffListResultDTO::getStaffEnabledStatus)); + resultDTO.setAgencyStaffList(CollectionUtils.isNotEmpty(collect.get(true)) ? collect.get(true) : new ArrayList<>()); resultDTO.setDepartmentList(departmentList); resultDTO.setGridList(gridList); return resultDTO; From d67be733a36b13787dc751f0ad26de585a23a6c3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 8 Aug 2022 18:25:12 +0800 Subject: [PATCH 282/288] =?UTF-8?q?=E7=BB=84=E7=BB=87code=20=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E6=97=B6=20=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E6=90=BA=E5=B8=A6=20=E4=BF=AE=E6=94=B9=E5=89=8D=E7=9A=84code?= =?UTF-8?q?=EF=BC=8C=E4=BE=BF=E4=BA=8E=E5=90=8C=E6=AD=A5=E5=B9=B3=E9=98=B4?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=97=B6=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rocketmq/messages/OrgOrStaffMQMsg.java | 5 ++ .../com/epmet/dto/form/EditGridFormDTO.java | 1 + .../epmet/controller/AgencyController.java | 11 +-- .../com/epmet/controller/GridController.java | 11 +-- .../epmet/service/impl/AgencyServiceImpl.java | 16 +++- .../service/impl/CustomerGridServiceImpl.java | 25 +++++-- .../form/ExractGridInfoPingYinFormDTO.java | 5 ++ .../OpenDataOrgChangeEventListener.java | 9 ++- .../impl/GridInfoPingyinServiceImpl.java | 75 ++++++++++++++++++- 9 files changed, 122 insertions(+), 36 deletions(-) diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java index fdd9e5d860..f579fbb1fc 100644 --- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java +++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/messages/OrgOrStaffMQMsg.java @@ -22,6 +22,11 @@ public class OrgOrStaffMQMsg implements Serializable { //删除网格：grid_delete；删除组织：agency_delete private String type; + /** + * org原有的Code + */ + private String oldCode; + //工作人员Id集合 private List staffIdList; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java index 8774da4f99..671fe3aee7 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/EditGridFormDTO.java @@ -25,6 +25,7 @@ public class EditGridFormDTO implements Serializable { /** * gridId 网格id */ + @NotBlank(message = "网格ID不能为空") private String gridId; /** diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java index 893bc95cda..eb42e5a043 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java @@ -177,16 +177,7 @@ public class AgencyController { formDTO.setCustomerId(tokenDTO.getCustomerId()); ValidatorUtils.validateEntity(formDTO, EditAgencyFormDTO.DefaultUserShowGroup.class, EditAgencyFormDTO.AddUserInternalGroup.class); Result result = agencyService.editAgency(formDTO); - - //2021-10-18 推送mq，数据同步到中介库 start【中介库只放了组织的名称、级别，所以涉及批量修改pname的操作不涉及同步中间库】 - OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg(); - mq.setCustomerId(tokenDTO.getCustomerId()); - mq.setOrgId(formDTO.getAgencyId()); - mq.setOrgType("agency"); - mq.setType("agency_change"); - SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq); - //2021-10-18 end - + //发送mq 消息迁移至service return result; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java index 171197d40e..a9ec51cb6c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/GridController.java @@ -79,16 +79,7 @@ public class GridController { editGridFormDTO.setCustomerId(tokenDto.getCustomerId()); Result result = customerGridService.editGrid(tokenDto,editGridFormDTO); - //2021-10-18 推送mq，数据同步到中介库 start - if (result.success()) { - OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg(); - mq.setCustomerId(tokenDto.getCustomerId()); - mq.setOrgId(editGridFormDTO.getGridId()); - mq.setOrgType("grid"); - mq.setType("grid_change"); - SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq); - } - //2021-10-18 end + //发送mq 消息 移至service return result; } 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 1505018fa9..494c68d392 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 @@ -20,6 +20,7 @@ package com.epmet.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.epmet.commons.rocketmq.messages.OrgOrStaffMQMsg; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; @@ -51,13 +52,14 @@ import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.CustomerDepartmentEntity; import com.epmet.entity.CustomerGridEntity; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; +import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.OperCrmFeignClient; import com.epmet.redis.CustomerAgencyRedis; +import com.epmet.send.SendMqMsgUtil; import com.epmet.service.AgencyService; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerOrgParameterService; -import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.base.Joiner; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; @@ -70,7 +72,6 @@ import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; import java.util.*; -import java.util.function.Function; import java.util.stream.Collectors; /** @@ -106,6 +107,8 @@ public class AgencyServiceImpl implements AgencyService { private IcBuildingDao icBuildingDao; @Autowired private CustomerDepartmentDao customerDepartmentDao; + @Autowired + private EpmetMessageOpenFeignClient epmetMessageOpenFeignClient; /** * @param formDTO @@ -240,6 +243,15 @@ public class AgencyServiceImpl implements AgencyService { //5.redis缓存 customerAgencyRedis.delete(formDTO.getAgencyId()); + //2021-10-18 推送mq，数据同步到中介库 start【中介库只放了组织的名称、级别，所以涉及批量修改pname的操作不涉及同步中间库】 + OrgOrStaffMQMsg mq = new OrgOrStaffMQMsg(); + mq.setCustomerId(originalEntity.getCustomerId()); + mq.setOrgId(formDTO.getAgencyId()); + mq.setOrgType("agency"); + mq.setType("agency_change"); + mq.setOldCode(originalEntity.getCode()); + SendMqMsgUtil.build().openFeignClient(epmetMessageOpenFeignClient).sendOrgStaffMqMsg(mq); + //2021-10-18 end return result; } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java index af626daac1..04c9312926 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java @@ -55,7 +55,6 @@ import com.epmet.entity.CustomerGridEntity; import com.epmet.entity.CustomerStaffGridEntity; import com.epmet.entity.StaffOrgRelationEntity; import com.epmet.feign.*; -import com.epmet.resi.partymember.feign.ResiPartyMemberOpenFeignClient; import com.epmet.send.SendMqMsgUtil; import com.epmet.service.CustomerAgencyService; import com.epmet.service.CustomerGridService; @@ -111,10 +110,6 @@ public class CustomerGridServiceImpl extends BaseServiceImpl msgs, ConsumeConcurrentlyContext context) { @@ -51,7 +51,7 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent } try { - msgs.forEach(msg -> consumeMessage(msg)); + msgs.forEach(this::consumeMessage); } catch (Exception e) { logger.error(ExceptionUtils.getErrorStackTrace(e)); return ConsumeConcurrentlyStatus.RECONSUME_LATER; @@ -94,6 +94,7 @@ public class OpenDataOrgChangeEventListener implements MessageListenerConcurrent ExractGridInfoPingYinFormDTO extractFormDto = new ExractGridInfoPingYinFormDTO(); extractFormDto.setCustomerId(obj.getCustomerId()); extractFormDto.setType(obj.getType()); + extractFormDto.setOldCode(obj.getOldCode()); List orgIdList = new ArrayList<>(); if(StringUtils.isNotBlank(obj.getOrgId())){ orgIdList.add(obj.getOrgId()); diff --git a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java index c2d915155f..9958530251 100755 --- a/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java +++ b/epmet-module/open-data-worker/open-data-worker-server/src/main/java/com/epmet/opendata/service/impl/GridInfoPingyinServiceImpl.java @@ -1,5 +1,6 @@ package com.epmet.opendata.service.impl; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.constant.NumConstant; @@ -7,14 +8,22 @@ import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.IndexCalConstant; +import com.epmet.dto.org.form.GridBaseInfoFormDTO; import com.epmet.dto.org.result.CustomerAgencyDTO; import com.epmet.dto.org.result.CustomerGridDTO; import com.epmet.feign.DataStatisticalOpenFeignClient; +import com.epmet.opendata.dao.EventreportPingyinDao; import com.epmet.opendata.dao.GridInfoPingyinDao; +import com.epmet.opendata.dao.GridstaffInfoPingyinDao; +import com.epmet.opendata.dao.GridstaffWorkInfoPingyinDao; import com.epmet.opendata.dto.constant.DataWorkerConstant; import com.epmet.opendata.dto.form.ExractGridInfoPingYinFormDTO; +import com.epmet.opendata.entity.EventreportPingyinEntity; import com.epmet.opendata.entity.GridInfoPingyinEntity; +import com.epmet.opendata.entity.GridstaffInfoPingyinEntity; +import com.epmet.opendata.entity.GridstaffWorkInfoPingyinEntity; import com.epmet.opendata.service.GridInfoPingyinService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.ListUtils; import org.apache.commons.lang3.StringUtils; @@ -33,11 +42,18 @@ import java.util.List; * @author generator generator@elink-cn.com * @since v1.0.0 2022-07-22 */ +@Slf4j @Service public class GridInfoPingyinServiceImpl extends BaseServiceImpl implements GridInfoPingyinService { @Autowired private DataStatisticalOpenFeignClient dataStatisticalOpenFeignClient; + @Autowired + private GridstaffInfoPingyinDao gridstaffInfoPingyinDao; + @Autowired + private GridstaffWorkInfoPingyinDao gridstaffWorkInfoPingyinDao; + @Autowired + private EventreportPingyinDao eventreportPingyinDao; /** * 抽取customer_agency到grid_info_pingyin表 @@ -99,9 +115,13 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl orginList = baseDao.selectByGridCode(entity.getGridCode()); if (CollectionUtils.isNotEmpty(orginList)) { @@ -138,7 +158,7 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl> result = dataStatisticalOpenFeignClient.getGridBaseInfo(formDTO1); if (!result.success()) { + log.warn("根据网格Id 没有找到网格 等待再次调用"); throw new RenException(result.getInternalMsg()); } if (null == result.getData() || result.getData().size() < NumConstant.ONE) { @@ -195,7 +216,9 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl orginList = baseDao.selectByGridCode(entity.getGridCode()); if (CollectionUtils.isNotEmpty(orginList)) { @@ -224,5 +247,51 @@ public class GridInfoPingyinServiceImpl extends BaseServiceImpl updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(GridInfoPingyinEntity::getGridCode,formDTO.getOldCode()); + int update = baseDao.update(gridInfoEntity, updateWrapper); + log.info("code changed gridinfo effect row:{}",update); + //更新完 网格code 去更新其他的业务【工作人员、例行工作、事件】数据对应的code + + GridstaffInfoPingyinEntity staffInfo = new GridstaffInfoPingyinEntity(); + staffInfo.setGridCode(entity.getGridCode()); + staffInfo.setUpdateTime(new Date()); + + LambdaUpdateWrapper staffInfoWrapper = new LambdaUpdateWrapper<>(); + staffInfoWrapper.eq(GridstaffInfoPingyinEntity::getGridCode,formDTO.getOldCode()); + update = gridstaffInfoPingyinDao.update(staffInfo, staffInfoWrapper); + log.info("code changed gridStaffInfo effect row:{}",update); + + GridstaffWorkInfoPingyinEntity workInfo = new GridstaffWorkInfoPingyinEntity(); + workInfo.setGridCode(entity.getGridCode()); + workInfo.setUpdateTime(new Date()); + + LambdaUpdateWrapper workInfoWrapper = new LambdaUpdateWrapper<>(); + workInfoWrapper.eq(GridstaffWorkInfoPingyinEntity::getGridCode,formDTO.getOldCode()); + update = gridstaffWorkInfoPingyinDao.update(workInfo, workInfoWrapper); + log.info("code changed staffWorkInfo effect row:{}",update); + + EventreportPingyinEntity eventEntity = new EventreportPingyinEntity(); + eventEntity.setGridCode(entity.getGridCode()); + eventEntity.setUpdateTime(new Date()); + + LambdaUpdateWrapper eventWrapper = new LambdaUpdateWrapper<>(); + eventWrapper.eq(EventreportPingyinEntity::getGridCode,formDTO.getOldCode()); + update = eventreportPingyinDao.update(eventEntity, eventWrapper); + log.info("code changed eventreport effect row:{}",update); + + } + } + } From 8b482e436bd714c1e8e1d3529ba4b7ed6019e3e9 Mon Sep 17 00:00:00 2001 From: syc Date: Tue, 9 Aug 2022 13:35:23 +0800 Subject: [PATCH 283/288] =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../partymember/PartymemberRegisterRelationDTO.java | 10 ++++++++++ .../entity/PartymemberRegisterRelationEntity.java | 10 ++++++++++ .../main/java/com/epmet/dto/RegisterRelationDTO.java | 10 ++++++++++ .../java/com/epmet/entity/RegisterRelationEntity.java | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java index 35ebdcbb38..c2716ea00b 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java @@ -44,6 +44,16 @@ public class PartymemberRegisterRelationDTO implements Serializable { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java index 07aa0380ff..360131ca94 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java @@ -40,6 +40,16 @@ public class PartymemberRegisterRelationEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java index 0cc3ea4019..165651b81b 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java @@ -44,6 +44,16 @@ public class RegisterRelationDTO implements Serializable { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 用户Id (user.id) */ diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java index ba4ff82087..2548d9b2ac 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java @@ -40,6 +40,16 @@ public class RegisterRelationEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 用户Id (user.id) */ From f7772549f5fd45f2019b0594fe9541192d9d084a Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 10 Aug 2022 09:46:18 +0800 Subject: [PATCH 284/288] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AE=9E=E6=97=B6?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E3=80=81?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../constant/DataSourceConstant.java | 1 + .../datastats/form/NowStatsDataFormDTO.java | 59 +++++++++ .../result/NowStatsDataResultDTO.java | 46 +++++++ .../dto/epmetuser/RegisterRelationDTO.java | 10 ++ .../data-aggregator-server/pom.xml | 28 +++++ .../controller/DataStatsController.java | 62 ++++++++++ .../dao/epmetuser/RegisterRelationDao.java | 7 +- .../dataaggre/dao/govproject/IcEventDao.java | 3 + .../dataaggre/dao/govproject/ProjectDao.java | 4 + .../resipartymember/ResiPartymemberDao.java | 31 +++++ .../epmetuser/RegisterRelationEntity.java | 10 ++ .../dataaggre/excel/NowStatsDataExcel.java | 68 ++++++++++ .../dataaggre/service/PartymemberService.java | 12 ++ .../service/datastats/DataStatsService.java | 2 + .../datastats/impl/DataStatsServiceImpl.java | 117 ++++++++++++++++++ .../service/epmetuser/EpmetUserService.java | 4 + .../epmetuser/impl/EpmetUserServiceImpl.java | 11 ++ .../service/govproject/GovProjectService.java | 5 + .../impl/GovProjectServiceImpl.java | 12 ++ .../service/impl/PartymemberServiceImpl.java | 24 ++++ .../ResiPartymemberService.java | 12 ++ .../impl/ResiPartymemberServiceImpl.java | 29 +++++ .../src/main/resources/bootstrap.yml | 5 + .../mapper/epmetuser/RegisterRelationDao.xml | 40 ++++++ .../mapper/govproject/IcEventDao.xml | 44 +++++++ .../mapper/govproject/ProjectDao.xml | 43 +++++++ .../resipartymember/ResiPartymemberDao.xml | 46 +++++++ 27 files changed, 734 insertions(+), 1 deletion(-) create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java create mode 100644 epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java index f02e5faa46..ae05f1af6e 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/constant/DataSourceConstant.java @@ -38,4 +38,5 @@ public interface DataSourceConstant { String EPMET_T_DUCK = "epmettduck"; String EPMETTDUCK="epmettduck"; String EPMET_HEART="heart"; + String RESI_PARTYMEMBER="partymember"; } diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java new file mode 100644 index 0000000000..06f1b6eab7 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/form/NowStatsDataFormDTO.java @@ -0,0 +1,59 @@ +package com.epmet.dataaggre.dto.datastats.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.List; + +/** + * @Description 数据统计页面查询-接口入参 + */ +@Data +public class NowStatsDataFormDTO implements Serializable { + + private static final long serialVersionUID = 6462094914874831738L; + + public interface CustomerDataManageForm{} + + /** + * 客户ID + */ + @NotBlank(message = "客户ID不能为空",groups = CustomerDataManageForm.class) + private String customerId; + + /** + * 组织ID + */ + @NotBlank(message = "组织ID不能为空",groups = CustomerDataManageForm.class) + private String agencyId; + + /** + * 区间:Interval 截止:end + */ + @NotBlank(message = "type不能为空",groups = CustomerDataManageForm.class) + private String type; + + /** + * 开始时间 精确到秒【yyyy-MM-dd HH:mm:ss】 + */ + private String startTime; + + /** + * 结束时间 精确到秒【yyyy-MM-dd HH:mm:ss】 + */ + @NotBlank(message = "结束时间不能为空",groups = CustomerDataManageForm.class) + private String endTime; + + + //组织或网格Id集合 + private List idList; + //数据类型【组织agency 网格grid】 + private String dataType; + + /** + * desc:是否是导出 + */ + private boolean export = false; +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java new file mode 100644 index 0000000000..537179b3e1 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/datastats/result/NowStatsDataResultDTO.java @@ -0,0 +1,46 @@ +package com.epmet.dataaggre.dto.datastats.result; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Description 数据统计页面查询-接口返参 + */ +@Data +public class NowStatsDataResultDTO { + + //组织、网格Id + private String orgId; + //组织、网格名称 + private String orgName; + //注册居民数 + private Integer resiUserCount = 0; + //注册党员数 + private Integer partyMemberCount = 0; + //事件总数 + private Integer icEventCount = 0; + //居民上报事件数【小程序端随手拍随时讲】 + private Integer resiEventCount = 0; + //平台录入事件数【数字平台录入的事件数】 + private Integer pcEventCount = 0; + //项目总数 + private Integer projectCount = 0; + //议题转项目数 + private Integer issueProjectCount = 0; + //事件立项数 + private Integer icEventProjectCount = 0; + //直接立项项目数 + private Integer agencyProjectCount = 0; + + + //组织的pids + private String pids; + //事件来源，0代表居民点 其他代表数字平台 + private String sourceType; + //项目来源 issue议题 agency立项 ic_event事件 + private String origin; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java index 2759e4f745..a3e354859a 100644 --- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/RegisterRelationDTO.java @@ -44,6 +44,16 @@ public class RegisterRelationDTO implements Serializable { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index 1c61ede4bc..27873367ec 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -259,6 +259,13 @@ epmet_heart_user EpmEt-db-UsEr + + + + + epmet_resi_partymember_user + EpmEt-db-UsEr + 0 192.168.1.140 @@ -390,6 +397,13 @@ epmet_heart_user EpmEt-db-UsEr + + + + + epmet_resi_partymember_user + EpmEt-db-UsEr + 0 192.168.1.140 @@ -522,6 +536,13 @@ epmet elink@833066 + + + + + epmet + elink@833066 + 0 192.168.10.150 @@ -654,6 +675,13 @@ epmet_heart_user EpmEt-db-UsEr + + + + + epmet_resi_partymember_user + EpmEt-db-UsEr + 0 r-m5ez3n1j0qc3ykq2ut.redis.rds.aliyuncs.com diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java index a4d88b3a91..4ebceec4a4 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/DataStatsController.java @@ -1,11 +1,25 @@ package com.epmet.dataaggre.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.epmet.commons.tools.annotation.LoginUser; +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.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.commons.tools.validator.ValidatorUtils; import com.epmet.dataaggre.dto.datastats.form.*; import com.epmet.dataaggre.dto.datastats.result.*; +import com.epmet.dataaggre.excel.NowStatsDataExcel; import com.epmet.dataaggre.service.datastats.DataStatsService; +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; @@ -13,13 +27,17 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.PrintWriter; import java.text.ParseException; +import java.util.Date; import java.util.List; /** * @Author sun * @Description 数据统计服务 */ +@Slf4j @RestController @RequestMapping("datastats") public class DataStatsController { @@ -243,4 +261,48 @@ public class DataStatsController { return new Result().ok(dataStatsService.operateExport(formDTO)); } + /** + * @Description 数据统计页面查询【用户、项目、事件一些数据的实时统计查询】 + * 需求：数据统计页面查询：注册居民数、注册党员数、事件总数、居民上报事件数、平台录入事件数、项目总数、议题转项目数、事件立项数、立项数； + * 可根据组织（只选组织，查询直属下级数据）、选择统计类型（截止累计值/区间新增值，截止累计选择一天，区间选择时间段，精确到时分秒）筛选； + * 可点击查看总计，可导出，打开页面默认选中当前工作人员所在组织（页面参考灵山卫-人房信息统计页面） + * @author sun + */ + @PostMapping("nowstatsdata") + public Result> nowStatsData(@RequestBody NowStatsDataFormDTO formDTO) { + ValidatorUtils.validateEntity(formDTO, NowStatsDataFormDTO.CustomerDataManageForm.class); + formDTO.setExport(false); + return new Result>().ok(dataStatsService.nowStatsData(formDTO)); + } + + @PostMapping("nowstatsdataexport") + public void nowStatsDataExport(@RequestBody NowStatsDataFormDTO formDTO, HttpServletResponse response) throws IOException { + formDTO.setExport(true); + ExcelWriter excelWriter = null; + try { + String fileName = "数据统计" + DateUtils.format(new Date()) + ".xlsx"; + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel(fileName, response), NowStatsDataExcel.class).build(); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); + List data = null; + List list = null; + data = dataStatsService.nowStatsData(formDTO); + list = ConvertUtils.sourceToTarget(data, NowStatsDataExcel.class); + excelWriter.write(list, writeSheet); + } 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(); + } + } + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java index ced9de54cd..bb2f1d225b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmetuser/RegisterRelationDao.java @@ -18,9 +18,13 @@ package com.epmet.dataaggre.dao.epmetuser; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.entity.epmetuser.RegisterRelationEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 注册关系表 用于统计客户网格的注册居民数 * @@ -29,5 +33,6 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface RegisterRelationDao extends BaseDao { - + + List selectNowResiUser(NowStatsDataFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java index 7cbb6dd87f..c8e69a05a9 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/IcEventDao.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; import com.epmet.dataaggre.dto.govorg.result.EventInfoResultDTO; import com.epmet.dataaggre.entity.govproject.IcEventEntity; @@ -25,4 +27,5 @@ public interface IcEventDao extends BaseDao { */ List getEventInfos(CoverageHomeSearchFormDTO formDTO); + List getIcEvent(NowStatsDataFormDTO formDTO); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java index 956e8b95ed..2c7792f6ee 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govproject/ProjectDao.java @@ -18,6 +18,8 @@ package com.epmet.dataaggre.dao.govproject; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.result.OrgCountDTO; @@ -132,4 +134,6 @@ public interface ProjectDao extends BaseDao { List getMemberClosedProjectCount(OrgStatisticsFormDTO formDTO); List getAgencyProjectCount(OrgStatisticsFormDTO formDTO); List getAgencyClosedProjectCount(OrgStatisticsFormDTO formDTO); + + List getNowProject(NowStatsDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java new file mode 100644 index 0000000000..06429e42db --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/resipartymember/ResiPartymemberDao.java @@ -0,0 +1,31 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.dao.resipartymember; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface ResiPartymemberDao { + + List getNowPart(NowStatsDataFormDTO formDTO); + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java index 4c21db9b8d..60ee1dc873 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/entity/epmetuser/RegisterRelationEntity.java @@ -40,6 +40,16 @@ public class RegisterRelationEntity extends BaseEpmetEntity { */ private String customerId; + /** + * 所属组织机构Id + */ + private String agencyId; + + /** + * agencyId的所有上级，包含自己 + */ + private String agencyIdPath; + /** * 网格Id (customer_grid.id) */ diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java new file mode 100644 index 0000000000..0df02e5ab5 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/excel/NowStatsDataExcel.java @@ -0,0 +1,68 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dataaggre.excel; + +import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; +import lombok.Data; + +@Data +public class NowStatsDataExcel { + + //组织、网格名称 + @ExcelProperty(value = "组织名称") + @ColumnWidth(25) + private String orgName; + //注册居民数 + @ExcelProperty(value = "注册居民数") + @ColumnWidth(20) + private Integer resiUserCount; + //注册党员数 + @ExcelProperty(value = "注册党员数") + @ColumnWidth(20) + private Integer partyMemberCount; + //事件总数 + @ExcelProperty(value = "事件总数") + @ColumnWidth(20) + private Integer icEventCount; + //居民上报事件数【小程序端随手拍随时讲】 + @ExcelProperty(value = "居民上报事件数") + @ColumnWidth(20) + private Integer resiEventCount; + //平台录入事件数【数字平台录入的事件数】 + @ExcelProperty(value = "平台录入事件数") + @ColumnWidth(20) + private Integer pcEventCount; + //项目总数 + @ExcelProperty(value = "项目总数") + @ColumnWidth(20) + private Integer projectCount; + //议题转项目数 + @ExcelProperty(value = "议题转项目数") + @ColumnWidth(20) + private Integer issueProjectCount; + //事件立项数 + @ExcelProperty(value = "事件立项数") + @ColumnWidth(20) + private Integer icEventProjectCount; + //直接立项项目数 + @ExcelProperty(value = "立项数") + @ColumnWidth(20) + private Integer agencyProjectCount; + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java new file mode 100644 index 0000000000..c610a16a1c --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/PartymemberService.java @@ -0,0 +1,12 @@ +package com.epmet.dataaggre.service; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; + +import java.util.List; + +public interface PartymemberService { + + List getNowPart(NowStatsDataFormDTO formDTO); + +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java index 7ce06a88e5..650f40b83f 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/DataStatsService.java @@ -306,4 +306,6 @@ public interface DataStatsService { Map getMemberMap(String agencyId); PageData getMemberList(OrgStatisticsFormDTO formDTO); + + List nowStatsData(NowStatsDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index bf56d8cdb8..5acc263059 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -40,10 +40,13 @@ import com.epmet.dataaggre.entity.datastats.DimAgencyEntity; import com.epmet.dataaggre.entity.datastats.FactAgencyGovernDailyEntity; import com.epmet.dataaggre.excel.CustomerDataManageExcel; + import com.epmet.dataaggre.service.PartymemberService; import com.epmet.dataaggre.service.datastats.DataStatsService; + import com.epmet.dataaggre.service.epmetuser.EpmetUserService; import com.epmet.dataaggre.service.epmetuser.StatsStaffPatrolRecordDailyService; import com.epmet.dataaggre.service.evaluationindex.EvaluationIndexService; import com.epmet.dataaggre.service.govorg.GovOrgService; + import com.epmet.dataaggre.service.govproject.GovProjectService; import com.epmet.dataaggre.service.opercrm.CustomerRelation; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -86,6 +89,12 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve private StatsStaffPatrolRecordDailyService statsStaffPatrolRecordDailyService; @Autowired private GovOrgService govOrgService; + @Autowired + private EpmetUserService epmetUserService; + @Autowired + private GovProjectService govProjectService; + @Autowired + private PartymemberService partymemberService; /** * @Param formDTO @@ -2310,4 +2319,112 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + @Override + public List nowStatsData(NowStatsDataFormDTO formDTO) { + //1.必要参数校验及处理 + String startTimeForm = formDTO.getStartTime(); + if ("Interval".equals(formDTO.getType()) && StringUtils.isEmpty(startTimeForm)) { + throw new RenException("请选择开始时间或查询累计值"); + } + + //2.查询组织信息，判断要查询下级是组织还是网格数据 + ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + if (null == agencyGrid) { + return new ArrayList<>(); + } + //组织或网格Id集合 + List idList = agencyGrid.getAgencyGridList().stream().map(ScreenAgencyOrGridListDTO.AgencyGrid::getOrgId).collect(Collectors.toList()); + formDTO.setDataType(!OrgLevelEnum.COMMUNITY.getCode().equals(agencyGrid.getLevel()) ? OrgTypeEnum.AGENCY.getCode() : OrgTypeEnum.GRID.getCode()); + formDTO.setIdList(idList); + + //3.按条件分别查询统计各业务实时数据 + //3-1.注册居民、注册党员数 + List user = epmetUserService.getNowResiUser(formDTO); + List party = partymemberService.getNowPart(formDTO); + //3-2.事件总数、居民上报事件数、平台录入事件数 + List event = govProjectService.getNowIcEvent(formDTO); + //3-3.项目总数、议题转项目数、事件立项数、组织立项数 + List project = govProjectService.getNowProject(formDTO); + Map userMap = new HashMap<>(); + Map partyMap = new HashMap<>(); + Map eventMap = new HashMap<>(); + Map projectMap = new HashMap<>(); + if ("grid".equals(formDTO.getDataType())) { + userMap = CollectionUtils.isEmpty(user) ? new HashMap<>() : user.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + partyMap = CollectionUtils.isEmpty(party) ? new HashMap<>() : party.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + eventMap = CollectionUtils.isEmpty(event) ? new HashMap<>() : event.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + projectMap = CollectionUtils.isEmpty(project) ? new HashMap<>() : project.stream().collect(Collectors.toMap(NowStatsDataResultDTO::getOrgId, m -> m, (k1, k2) -> k1)); + } + + //4.封装数据 + List resultDTOList = new ArrayList<>(); + NowStatsDataResultDTO export = new NowStatsDataResultDTO(); + export.setOrgName("合计"); + for (ScreenAgencyOrGridListDTO.AgencyGrid org : agencyGrid.getAgencyGridList()) { + NowStatsDataResultDTO dto = new NowStatsDataResultDTO(); + dto.setOrgId(org.getOrgId()); + dto.setOrgName(org.getOrgName()); + //网格数据sql已统计好 + if ("grid".equals(formDTO.getDataType())) { + if (userMap.containsKey(org.getOrgId())) { + dto.setResiUserCount(userMap.get(org.getOrgId()).getResiUserCount()); + } + if (partyMap.containsKey(org.getOrgId())) { + dto.setPartyMemberCount(partyMap.get(org.getOrgId()).getPartyMemberCount()); + } + if (eventMap.containsKey(org.getOrgId())) { + dto.setIcEventCount(eventMap.get(org.getOrgId()).getIcEventCount()); + dto.setResiEventCount(eventMap.get(org.getOrgId()).getResiEventCount()); + dto.setPcEventCount(eventMap.get(org.getOrgId()).getPcEventCount()); + } + if (projectMap.containsKey(org.getOrgId())) { + dto.setProjectCount(projectMap.get(org.getOrgId()).getProjectCount()); + dto.setIssueProjectCount(projectMap.get(org.getOrgId()).getIssueProjectCount()); + dto.setIcEventProjectCount(projectMap.get(org.getOrgId()).getIcEventProjectCount()); + dto.setAgencyProjectCount(projectMap.get(org.getOrgId()).getAgencyProjectCount()); + } + } else { + //组织数据 需要java计算结果 + int resiUserCount = (int) user.stream().filter(u -> u.getPids().contains(org.getOrgId())).count(); + dto.setResiUserCount(resiUserCount); + + int partyMemberCount = (int) party.stream().filter(p -> p.getPids().contains(org.getOrgId())).count(); + dto.setPartyMemberCount(partyMemberCount); + + int resiEventCount = (int) event.stream().filter(e -> e.getPids().contains(org.getOrgId()) && "0".equals(e.getSourceType())).count(); + int pcEventCount = (int) event.stream().filter(e -> e.getPids().contains(org.getOrgId()) && !"0".equals(e.getSourceType())).count(); + int icEventCount = resiEventCount + pcEventCount; + dto.setIcEventCount(icEventCount); + dto.setResiEventCount(resiEventCount); + dto.setPcEventCount(pcEventCount); + + int issueProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "issue".equals(p.getOrigin())).count(); + int icEventProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "ic_event".equals(p.getOrigin())).count(); + int agencyProjectCount = (int) project.stream().filter(p -> p.getPids().contains(org.getOrgId()) && "agency".equals(p.getOrigin())).count(); + int projectCount = issueProjectCount + icEventProjectCount + agencyProjectCount; + dto.setProjectCount(projectCount); + dto.setIssueProjectCount(issueProjectCount); + dto.setIcEventProjectCount(icEventProjectCount); + dto.setAgencyProjectCount(agencyProjectCount); + } + resultDTOList.add(dto); + if (formDTO.isExport()) { + export.setResiUserCount(export.getResiUserCount() + dto.getResiUserCount()); + export.setPartyMemberCount(export.getPartyMemberCount() + dto.getPartyMemberCount()); + export.setIcEventCount(export.getIcEventCount() + dto.getIcEventCount()); + export.setResiEventCount(export.getResiEventCount() + dto.getResiEventCount()); + export.setPcEventCount(export.getPcEventCount() + dto.getPcEventCount()); + export.setProjectCount(export.getProjectCount() + dto.getProjectCount()); + export.setIssueProjectCount(export.getIssueProjectCount() + dto.getIssueProjectCount()); + export.setIcEventProjectCount(export.getIcEventProjectCount() + dto.getIcEventProjectCount()); + export.setAgencyProjectCount(export.getAgencyProjectCount() + dto.getAgencyProjectCount()); + } + } + if (formDTO.isExport()) { + resultDTOList.add(export); + } + return resultDTOList; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java index 6f9ce93725..068b1176cd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmetuser/EpmetUserService.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.service.epmetuser; import com.epmet.commons.tools.page.PageData; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.epmetuser.form.*; import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.govorg.form.GridLivelyFormDTO; @@ -236,4 +238,6 @@ public interface EpmetUserService { Integer countVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory); List listVolunteers(String customerId, String agencyId, String staffOrgIds, String search, String resiCategory); + + List getNowResiUser(NowStatsDataFormDTO formDTO); } 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 14d9bd5dc5..26c5ef1b3a 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 @@ -15,6 +15,8 @@ import com.epmet.constant.BadgeConstant; import com.epmet.constant.OrgInfoConstant; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.epmetuser.*; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.epmetuser.CustomerStaffDTO; import com.epmet.dataaggre.dto.epmetuser.FactIcuserCategoryAnalysisDailyDTO; import com.epmet.dataaggre.dto.epmetuser.StaffPatrolDetailDTO; @@ -90,6 +92,8 @@ public class EpmetUserServiceImpl implements EpmetUserService { private IcResiUserDao icResiUserDao; @Resource private CustomerFootBarService customerFootBarService; + @Resource + private RegisterRelationDao registerRelationDao; /** * @Description 根据UserIds查询 @@ -912,4 +916,11 @@ public class EpmetUserServiceImpl implements EpmetUserService { return icResiUserDao.listVolunteersByCategory(customerId, agencyId, staffOrgIds, search, resiCategory); } } + + @Override + public List getNowResiUser(NowStatsDataFormDTO formDTO) { + //实时统计组织/网格下小程序端注册居民数 + List list = registerRelationDao.selectNowResiUser(formDTO); + return list; + } } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java index 12f901ed66..6b36beac2b 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/GovProjectService.java @@ -1,6 +1,8 @@ package com.epmet.dataaggre.service.govproject; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; import com.epmet.dataaggre.dto.govorg.form.OrgStatisticsFormDTO; import com.epmet.dataaggre.dto.govorg.form.CoverageHomeSearchFormDTO; @@ -180,4 +182,7 @@ public interface GovProjectService { */ List getEventInfos(CoverageHomeSearchFormDTO formDTO); + List getNowIcEvent(NowStatsDataFormDTO formDTO); + + List getNowProject(NowStatsDataFormDTO formDTO); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java index caa0bf8e87..4eefc02d34 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govproject/impl/GovProjectServiceImpl.java @@ -21,8 +21,10 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.dao.govproject.IcEventDao; import com.epmet.dataaggre.dao.govproject.ProjectDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectMonthResultDTO; import com.epmet.dataaggre.dto.datastats.result.FactAgencyProjectResultDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; import com.epmet.dataaggre.dto.govissue.IssueProjectCategoryDictDTO; import com.epmet.dataaggre.dto.govissue.result.IssueInfoDTO; import com.epmet.dataaggre.dto.govissue.result.IssueListResultDTO; @@ -797,4 +799,14 @@ public class GovProjectServiceImpl implements GovProjectService { return icEventDao.getEventInfos(formDTO); } + @Override + public List getNowIcEvent(NowStatsDataFormDTO formDTO) { + return icEventDao.getIcEvent(formDTO); + } + + @Override + public List getNowProject(NowStatsDataFormDTO formDTO) { + return projectDao.getNowProject(formDTO); + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java new file mode 100644 index 0000000000..cdfab84c0f --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/impl/PartymemberServiceImpl.java @@ -0,0 +1,24 @@ +package com.epmet.dataaggre.service.impl; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; +import com.epmet.dataaggre.service.PartymemberService; +import com.epmet.dataaggre.service.resipartymember.ResiPartymemberService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +public class PartymemberServiceImpl implements PartymemberService { + + @Autowired + private ResiPartymemberService resiPartymemberService; + + @Override + public List getNowPart(NowStatsDataFormDTO formDTO) { + return resiPartymemberService.getNowPart(formDTO); + } +} \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java new file mode 100644 index 0000000000..1d5bb43a23 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/ResiPartymemberService.java @@ -0,0 +1,12 @@ +package com.epmet.dataaggre.service.resipartymember; + +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; + +import java.util.List; + +public interface ResiPartymemberService { + + List getNowPart(NowStatsDataFormDTO formDTO); + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java new file mode 100644 index 0000000000..cb45cb5f17 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/resipartymember/impl/ResiPartymemberServiceImpl.java @@ -0,0 +1,29 @@ +package com.epmet.dataaggre.service.resipartymember.impl; + +import com.epmet.commons.dynamic.datasource.annotation.DataSource; +import com.epmet.dataaggre.constant.DataSourceConstant; +import com.epmet.dataaggre.dao.resipartymember.ResiPartymemberDao; +import com.epmet.dataaggre.dto.datastats.form.NowStatsDataFormDTO; +import com.epmet.dataaggre.dto.datastats.result.NowStatsDataResultDTO; +import com.epmet.dataaggre.service.resipartymember.ResiPartymemberService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Slf4j +@Service +@DataSource(DataSourceConstant.RESI_PARTYMEMBER) +public class ResiPartymemberServiceImpl implements ResiPartymemberService { + + @Autowired + private ResiPartymemberDao resiPartymemberDao; + + + @Override + public List getNowPart(NowStatsDataFormDTO formDTO) { + return resiPartymemberDao.getNowPart(formDTO); + } + +} diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml index aa857a1eaf..0237f7f5d7 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/bootstrap.yml @@ -161,6 +161,11 @@ dynamic: url: @datasource.druid.heart.url@ username: @datasource.druid.heart.username@ password: @datasource.druid.heart.password@ + partymember: + driver-class-name: com.mysql.cj.jdbc.Driver + url: @datasource.druid.partymember.url@ + username: @datasource.druid.partymember.username@ + password: @datasource.druid.partymember.password@ feign: hystrix: enabled: true diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml index 21a959c15e..2ecbd63552 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmetuser/RegisterRelationDao.xml @@ -3,4 +3,44 @@ + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml index c037d97239..fdba65d9cd 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/IcEventDao.xml @@ -27,4 +27,48 @@ AND EVENT_CONTENT LIKE CONCAT('%',#{name},'%') + + + + \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml index 1b159cb69d..4b51beae89 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml @@ -539,4 +539,47 @@ AGENCY_ID + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml new file mode 100644 index 0000000000..058581128d --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/resipartymember/ResiPartymemberDao.xml @@ -0,0 +1,46 @@ + + + + + + + + From 98a0e4bc8519995d507f8e581609f348a7d837b7 Mon Sep 17 00:00:00 2001 From: syc Date: Wed, 10 Aug 2022 10:21:41 +0800 Subject: [PATCH 285/288] =?UTF-8?q?=E8=A1=A8=E4=B8=AD=E5=8A=A0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=AE=BE=E8=AE=A1=E6=97=A7=E7=A8=8B=E5=BA=8F=E8=B5=8B?= =?UTF-8?q?=E5=80=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/PartyMemberConfirmServiceImpl.java | 10 ++++++++++ .../service/impl/RegisterRelationServiceImpl.java | 11 +++++++++++ 2 files changed, 21 insertions(+) diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index ae67b95ebf..74b9ba9844 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -5,7 +5,10 @@ import com.epmet.commons.tools.constant.AppClientConstant; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; 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.exception.RenException; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.*; @@ -601,6 +604,13 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberRegisterRelationEntity registerRelationEntity = new PartymemberRegisterRelationEntity(); registerRelationEntity.setCustomerId(partyMemberInfoDTO.getCustomerId()); registerRelationEntity.setGridId(partyMemberInfoDTO.getGridId()); + //表中新增字段 为其赋值 + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(partyMemberInfoDTO.getGridId()); + if (null == gridInfo) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "获取网格缓存失败", "获取网格缓存失败"); + } + registerRelationEntity.setAgencyId(gridInfo.getPid()); + registerRelationEntity.setAgencyIdPath(gridInfo.getPids()); registerRelationEntity.setUserId(partyMemberInfoDTO.getUserId()); registerRelationEntity.setFirstRegister(1); registerRelationEntity.setRegister(1); 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 d63921e97a..bf7f42d6f9 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 @@ -23,7 +23,11 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.FieldConstant; 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.page.PageData; +import com.epmet.commons.tools.redis.common.CustomerOrgRedis; +import com.epmet.commons.tools.redis.common.bean.GridInfoCache; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.UserConstant; @@ -344,6 +348,13 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl Date: Wed, 10 Aug 2022 10:32:06 +0800 Subject: [PATCH 286/288] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B5=81=E8=BD=AC(?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=80=80=E5=9B=9E=E5=90=B9=E5=93=A8=E7=BB=93?= =?UTF-8?q?=E6=A1=88)=E6=97=B6=E5=85=AC=E5=BC=80=E7=AD=94=E5=A4=8D?= =?UTF-8?q?=E4=B8=BA=E5=BF=85=E5=A1=AB=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/dto/form/ProjectResponseFormDTO.java | 2 ++ .../src/main/java/com/epmet/dto/form/ReturnFromDTO.java | 2 ++ .../src/main/java/com/epmet/dto/form/TransferFormDTO.java | 1 + 3 files changed, 5 insertions(+) diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java index 068d449a4a..05402a071d 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ProjectResponseFormDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -29,6 +30,7 @@ public class ProjectResponseFormDTO implements Serializable { /** * 公开答复内容 */ + @NotBlank(message = "公开答复不能为空") @Length(max = 1000, message = "公开答复不能超过1000个字符") private String publicReply; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java index 9953e31be7..7d34814d54 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/ReturnFromDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto.form; import lombok.Data; import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.List; @@ -30,6 +31,7 @@ public class ReturnFromDTO implements Serializable { /** * 公开答复内容 */ + @NotBlank(message = "公开答复不能为空") @Length(max = 1000, message = "公开答复不能超过1000个字符") private String publicReply; /** diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java index f6033bdd6a..ec3c6bd18a 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/form/TransferFormDTO.java @@ -22,6 +22,7 @@ public class TransferFormDTO implements Serializable { @NotBlank(message = "项目人员关联Id不能为空") private String projectStaffId; + @NotBlank(message = "公开答复不能为空") @Length(max=1000,message = "公开答复内容不能超过1000位") private String publicReply; From b55f97f7cc7c95d9ffee443f6a1dbbe3456c5cae Mon Sep 17 00:00:00 2001 From: syc Date: Thu, 11 Aug 2022 09:57:30 +0800 Subject: [PATCH 287/288] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E3=80=81=E7=BD=91=E6=A0=BC=E6=94=B9=E4=B8=BA=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AE=9E=E6=97=B6=E6=95=B0=E6=8D=AE=EF=BC=8C=E4=B8=8D=E5=9C=A8?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=BB=9F=E8=AE=A1=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dao/govorg/CustomerAgencyDao.java | 2 + .../dataaggre/dao/govorg/CustomerGridDao.java | 2 + .../datastats/impl/DataStatsServiceImpl.java | 2 +- .../service/govorg/GovOrgService.java | 3 ++ .../govorg/impl/GovOrgServiceImpl.java | 43 +++++++++++++++++++ .../mapper/govorg/CustomerAgencyDao.xml | 17 ++++++++ .../mapper/govorg/CustomerGridDao.xml | 15 +++++++ 7 files changed, 83 insertions(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java index ba9043c0f4..7c3bbfd838 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.result.*; import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity; import org.apache.ibatis.annotations.Mapper; @@ -108,4 +109,5 @@ public interface CustomerAgencyDao extends BaseDao { List getSubAgencyList(@Param("agencyId") String agencyId); + List getSubAgencyListByAgency(@Param("customerId") String customerId, @Param("agencyId") String agencyId); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java index 2d2c95b424..10721a9f7a 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerGridDao.java @@ -18,6 +18,7 @@ package com.epmet.dataaggre.dao.govorg; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; import com.epmet.dataaggre.dto.govorg.result.GridInfoResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridsInfoListResultDTO; @@ -84,4 +85,5 @@ public interface CustomerGridDao extends BaseDao { */ CustomerGridDTO getGridInfo(@Param("gridId") String gridId); + List getSubGridList(@Param("customerId") String customerId, @Param("agencyId") String agencyId); } \ No newline at end of file diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java index 5acc263059..fd2a4e5f85 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/datastats/impl/DataStatsServiceImpl.java @@ -2329,7 +2329,7 @@ public class DataStatsServiceImpl implements DataStatsService, ResultDataResolve } //2.查询组织信息，判断要查询下级是组织还是网格数据 - ScreenAgencyOrGridListDTO agencyGrid = indexService.getSubAgencyOrGridList(formDTO.getAgencyId(), formDTO.isExport()); + ScreenAgencyOrGridListDTO agencyGrid = govOrgService.getSubAgencyOrGridList(formDTO.getCustomerId(), formDTO.getAgencyId()); if (null == agencyGrid) { return new ArrayList<>(); } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java index ae942731a0..6a55f59e53 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java @@ -5,6 +5,7 @@ import com.epmet.commons.tools.redis.common.bean.BuildingInfoCache; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerDepartmentDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; @@ -289,4 +290,6 @@ public interface GovOrgService { List getEnterpriseInfos(CoverageHomeSearchFormDTO formDTO); Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO); + ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId); + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java index b84b11d14f..96099374f8 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java @@ -14,6 +14,7 @@ import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.form.DingTextBriefNessFormDTO; 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; @@ -39,6 +40,9 @@ import com.epmet.dataaggre.dto.epmetuser.result.CustomerStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.ListStaffResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffRoleListResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; +import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; import com.epmet.dataaggre.dto.govorg.*; import com.epmet.dataaggre.dto.govorg.form.*; import com.epmet.dataaggre.dto.govorg.result.*; @@ -1467,4 +1471,43 @@ public class GovOrgServiceImpl implements GovOrgService { public Integer getEnterpriseInfosCount(CoverageHomeSearchFormDTO formDTO) { return cityManagementDao.getEnterpriseInfosCount(formDTO); } + + @Override + public ScreenAgencyOrGridListDTO getSubAgencyOrGridList(String customerId, String agencyId) { + ScreenAgencyOrGridListDTO resultDTO = new ScreenAgencyOrGridListDTO(); + List agencyGridList = new ArrayList<>(); + //1.查询组织信息 + CustomerAgencyEntity dto = customerAgencyDao.selectById(agencyId); + if (dto == null) { + log.error(String.format("组织信息不存在,组织Id->%s", agencyId)); + return new ScreenAgencyOrGridListDTO(); + } + //2.根据组织级别判断查询直属组织或网格列表 + List agencyList = new ArrayList<>(); + List gridList = new ArrayList<>(); + if (!"community".equals(dto.getLevel())) { + //2-1.直属下级组织列表 + agencyList = customerAgencyDao.getSubAgencyListByAgency(customerId, agencyId); + agencyList.forEach(gr->{ + ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); + org.setOrgId(gr.getAgencyId()); + org.setOrgName(gr.getAgencyName()); + agencyGridList.add(org); + }); + } else { + //2-2.直属下级网格列表 + gridList = customerGridDao.getSubGridList(customerId, agencyId); + gridList.forEach(gr->{ + ScreenAgencyOrGridListDTO.AgencyGrid org = new ScreenAgencyOrGridListDTO.AgencyGrid(); + org.setOrgId(gr.getGridId()); + org.setOrgName(gr.getGridName()); + agencyGridList.add(org); + }); + } + + resultDTO.setLevel(dto.getLevel()); + resultDTO.setAgencyGridList(agencyGridList); + return resultDTO; + } + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml index a77f1f22e0..9af0849b72 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml @@ -309,4 +309,21 @@ OR PIDS LIKE CONCAT('%', #{agencyId}, '%')) + + diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml index 7f68c5d787..2457f87733 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerGridDao.xml @@ -181,4 +181,19 @@ AND cg.DEL_FLAG = '0' + + From 5e1acfec08d61892fb043f97990398a10b65107d Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Thu, 11 Aug 2022 14:42:06 +0800 Subject: [PATCH 288/288] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9Aaggregator?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=96=B0=E5=A2=9E=E7=9A=84partymember?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=BA=90=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-module/data-aggregator/data-aggregator-server/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-aggregator/data-aggregator-server/pom.xml b/epmet-module/data-aggregator/data-aggregator-server/pom.xml index e3961f7a7d..7cab2dfdbf 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/pom.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/pom.xml @@ -677,7 +677,7 @@ - + epmet_resi_partymember_user EpmEt-db-UsEr