diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java new file mode 100644 index 0000000000..4ce99a8f04 --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/form/LingShanLianHuResiUserFormDTO.java @@ -0,0 +1,15 @@ +package com.epmet.dataaggre.dto.epmetuser.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/19 9:23 + */ +@Data +public class LingShanLianHuResiUserFormDTO extends PageFormDTO { + private String partyCenterHouseId; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java new file mode 100644 index 0000000000..0c43cae2fa --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/IcResiUserResultDTO.java @@ -0,0 +1,16 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +/** + * @Description + * @Author yzm + * @Date 2023/5/19 9:52 + */ +@Data +public class IcResiUserResultDTO { + private String icResiUserId; + private String name; + private String mobile; +} + diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java new file mode 100644 index 0000000000..e54f8e807e --- /dev/null +++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmetuser/result/LingShanLianHuResiUserResultDTO.java @@ -0,0 +1,33 @@ +package com.epmet.dataaggre.dto.epmetuser.result; + +import lombok.Data; + +import java.util.List; + +/** + * @Description 灵山大屏-党员中共新户联户群众列表 + * @Author yzm + * @Date 2023/5/19 9:10 + */ +@Data +public class LingShanLianHuResiUserResultDTO { + /** + * 与入参一致 + * 党员中心户房屋id, + */ + private String partyCenterHouseId; + // 关联的房屋信息 + private String neighborHoodId; + private String neighborHoodName; + private String buildingId; + private String buildingName; + private String buildingUnitId; + private String unitName; + private String doorName; + private String houseId; + // 每个房屋里住的居民 + private List resiList; + + +} + 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 263a862971..d569a6be59 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 @@ -24,6 +24,8 @@ 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.form.LingShanLianHuResiUserFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; import com.epmet.dataaggre.dto.govorg.CustomerGridDTO; @@ -567,4 +569,15 @@ public class GovOrgController { } } + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * + * @param formDTO + * @return + */ + @PostMapping("lianHuResi") + public Result> lianHuResi(@RequestBody LingShanLianHuResiUserFormDTO formDTO) { + return new Result>().ok(govOrgService.lianHuResi(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getPartyCenterHouseId())); + } } 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 568e74e5cb..8350e4c753 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 @@ -2,6 +2,7 @@ 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.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.entity.govorg.IcHouseEntity; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -36,4 +37,11 @@ public interface IcHouseDao extends BaseDao { @Param("houseId") String houseId, @Param("houseRule") List houseRule, @Param("statRule") List statRule); + + /** + * 灵山项目：查询房屋关联的联户房屋 + * @param partyCenterHouseId + * @return + */ + List selectListLianHuHouse(@Param("partyCenterHouseId") String partyCenterHouseId); } 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 ec87a71781..8ef6f1ad94 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 @@ -11,7 +11,6 @@ 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.CoverageAnalisisDataListResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridDateIdResultDTO; import com.epmet.dataaggre.dto.govorg.result.GridStaffResultDTO; import com.epmet.dataaggre.dto.govorg.result.MemberProjectInfoResultDTO; @@ -269,4 +268,11 @@ public interface EpmetUserService { Integer pageNo, Integer pageSize); Integer staffQtyInGridsOfRole(String roleKeyAgent, Set staffIds); + + /** + * 根据房屋id,查询居民信息 + * @param houseId + * @return + */ + List listIcResiUserByHouseId(String houseId); } 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 ea513ee6f5..4fb4346b98 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 @@ -1195,4 +1195,27 @@ public class EpmetUserServiceImpl implements EpmetUserService, ResultDataResolve return customerStaffDao.countStaffQtyByStaffIdsAndRole(staffIds, role.getId()); } + + /** + * 根据房屋id,查询居民信息 + * + * @param houseId + * @return + */ + @Override + public List listIcResiUserByHouseId(String houseId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcResiUserEntity::getHomeId, houseId) + .eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); + List list = icResiUserDao.selectList(queryWrapper); + List resultList = new ArrayList<>(); + for (IcResiUserEntity entity : list) { + IcResiUserResultDTO resultDTO = new IcResiUserResultDTO(); + resultDTO.setIcResiUserId(entity.getId()); + resultDTO.setName(entity.getName()); + resultDTO.setMobile(entity.getMobile()); + resultList.add(resultDTO); + } + return resultList; + } } 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 d8ffe1e59b..c9fbed85c9 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.beans.LingShanAgentServiceStaffAndGrid; import com.epmet.dataaggre.dto.epmetuser.form.ResisByPolicyRulesFormDTO; +import com.epmet.dataaggre.dto.epmetuser.result.LingShanLianHuResiUserResultDTO; import com.epmet.dataaggre.dto.epmetuser.result.StaffSelectResDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.govorg.CustomerAgencyDTO; @@ -309,4 +310,13 @@ public interface GovOrgService { Set getStaffIdsInGrid(String gridId); List listBelongGridsByStaffId(String staffId); + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * @param pageNo + * @param pageSize + * @param partyCenterHouseId + * @return + */ + PageData lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId); } 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 68a8b8dac3..9eb154dfe6 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 @@ -37,10 +37,7 @@ import com.epmet.dataaggre.constant.DataSourceConstant; import com.epmet.dataaggre.constant.OrgConstant; import com.epmet.dataaggre.dao.govorg.*; 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; +import com.epmet.dataaggre.dto.epmetuser.result.*; import com.epmet.dataaggre.dto.evaluationindex.ScreenAgencyOrGridListDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerAgencyDTO; import com.epmet.dataaggre.dto.evaluationindex.ScreenCustomerGridDTO; @@ -1572,4 +1569,30 @@ public class GovOrgServiceImpl implements GovOrgService { q2.in(CustomerGridEntity::getId, staffAndGrids.stream().map(CustomerStaffGridEntity::getGridId).collect(Collectors.toList())); return customerGridDao.selectList(q2); } + + + /** + * 灵山大屏：根据房屋id，查询联户里的居民信息列表 + * + * @param pageNo + * @param pageSize + * @param partyCenterHouseId + * @return + */ + public PageData lianHuResi(Integer pageNo, Integer pageSize, String partyCenterHouseId) { + // 先查询关联的房屋id + PageHelper.startPage(pageNo, pageSize); + List houseList = houseDao.selectListLianHuHouse(partyCenterHouseId); + if (CollectionUtils.isEmpty(houseList)) { + return new PageData<>(); + } + houseList.forEach(lianHuHouse -> { + List resiList = epmetUserService.listIcResiUserByHouseId(lianHuHouse.getHouseId()); + lianHuHouse.setResiList(resiList); + }); + PageInfo pageInfo = new PageInfo<>(houseList); + return new PageData<>(houseList, pageInfo.getTotal()); + } + + } diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml index c679f9a5ce..584add00d2 100644 --- a/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml +++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/IcHouseDao.xml @@ -38,4 +38,28 @@ + + diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java index 0a7df6be25..c5db519f45 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/LingshanPartyCenterHouseLianhuDTO.java @@ -70,6 +70,7 @@ public class LingshanPartyCenterHouseLianhuDTO implements Serializable { * 联户：联户房屋id */ private String houseId; - + private String longitude; + private String latitude; } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java deleted file mode 100644 index 7e179fe4a0..0000000000 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/lingshan/ScreenPartyCenterHouseDistributionResDTO.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.epmet.dto.result.lingshan; - -import lombok.Data; - -/** - * @Description - * @Author yzm - * @Date 2023/5/18 10:56 - */ -@Data -public class ScreenPartyCenterHouseDistributionResDTO { - /** - * 小区id - */ - private String neighborHoodId; - private String neighborHoodName; - /** - * 所属楼栋id - */ - private String buildingId; - private String buildingName; - /** - * 所属单元id - */ - private String buildingUnitId; - private String unitName; - - /** - * 房屋名字后台插入时生成 - */ - private String houseName; - /** - * 房屋坐标 - */ - private String longitude; - private String latitude; - - /** - * 灵山项目：是否党员中心户：1是；0不是 - */ - private String partyCenterHouseFlag; -} - diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 971015a298..ac166eaec3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -31,7 +31,9 @@ import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dto.BuildingTreeLevelDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; import com.epmet.dto.result.IcBuildingListResultDTO; @@ -283,5 +285,15 @@ public class BuildingController { } - + /** + * 灵山大屏：查询楼栋坐标 + * + * @param tokenDto + * @param formDTO + * @return + */ + @PostMapping("building-distribution") + public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(buildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java index 32062f26c5..09e4793318 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java @@ -48,10 +48,14 @@ import com.epmet.commons.tools.utils.poi.excel.handler.FreezeAndFilter; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcHouseDao; +import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; +import com.epmet.dto.form.lingshan.PartyCenterHousePageFormDTO; +import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.CustomerOrgParameterEntity; -import com.epmet.feign.EpmetAdminOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetMessageOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; @@ -100,9 +104,6 @@ public class HouseController implements ResultDataResolver { @Autowired private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; - @Autowired - private EpmetAdminOpenFeignClient epmetAdminOpenFeignClient; - @Autowired private IcHouseDao icHouseDao; @Autowired @@ -708,4 +709,36 @@ public class HouseController implements ResultDataResolver { + /** + * 灵山大屏：查询房屋坐标点位 + * 支持根据网格\小区\楼栋id查询 + */ + @PostMapping("house-distribution") + public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { + return new Result>().ok(houseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @MaskResponse(fieldNames = {"showOwnerIdCard", "showOwnerPhone"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD, MaskResponse.MASK_TYPE_MOBILE}) + @PostMapping("houseDetail/{houseId}") + public Result queryHouseDetail(@PathVariable("houseId")String houseId){ + return new Result().ok(houseService.queryHouseDetail(houseId)); + } + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * + * @param formDTO + * @return + */ + @MaskResponse(fieldNames = {"showOwnerPhone", "showOwnerIdCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_MOBILE, MaskResponse.MASK_TYPE_ID_CARD}) + @PostMapping("lingshanScreen/houseList") + public Result> queryHouseListForLingShanScreen(@RequestBody PartyCenterHousePageFormDTO formDTO) { + return new Result>().ok(houseService.queryHouseListForLingShanScreen(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getBuildingId())); + } + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java deleted file mode 100644 index fe3123a482..0000000000 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/LingShanScreenGovOrgController.java +++ /dev/null @@ -1,66 +0,0 @@ -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.dto.IcBuildingDTO; -import com.epmet.dto.IcHouseDTO; -import com.epmet.dto.form.lingshan.ScreenPartyCenterHouseDistributionFormDTO; -import com.epmet.dto.result.lingshan.HouseDetailResultDTO; -import com.epmet.service.IcBuildingService; -import com.epmet.service.IcHouseService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @Description 灵山大屏-查询gov-org库的接口， 可以放在这.... - * @Author yzm - * @Date 2023/5/18 10:05 - */ -@RestController -@RequestMapping("houseScreen") -public class LingShanScreenGovOrgController { - @Autowired - private IcHouseService icHouseService; - @Autowired - private IcBuildingService icBuildingService; - - - /** - * 灵山大屏：查询楼栋坐标 - * - * @param tokenDto - * @param formDTO - * @return - */ - @PostMapping("building-distribution") - public Result> buildingDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { - return new Result>().ok(icBuildingService.buildingDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId())); - } - - - /** - * 灵山大屏：查询房屋坐标点位 - * 支持根据网格\小区\楼栋id查询 - */ - @PostMapping("house-distribution") - public Result> houseDistribution(@LoginUser TokenDto tokenDto, @RequestBody ScreenPartyCenterHouseDistributionFormDTO formDTO) { - return new Result>().ok(icHouseService.houseDistribution(tokenDto.getCustomerId(), formDTO.getGridId(), formDTO.getNeighborHoodId(), formDTO.getBuildingId())); - } - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - @PostMapping("houseDetail/{houseId}") - public Result queryHouseDetail(@PathVariable("houseId")String houseId){ - return new Result().ok(icHouseService.queryHouseDetail(houseId)); - } - - - -} - diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java index 7b712e100c..8788e1d6cb 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/LingshanPartyCenterHouseLianhuDao.java @@ -1,9 +1,12 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.result.lingshan.LingshanPartyCenterHouseLianhuDTO; import com.epmet.entity.LingshanPartyCenterHouseLianhuEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 灵山_党员中心户联户 * @@ -15,5 +18,17 @@ public interface LingshanPartyCenterHouseLianhuDao extends BaseDao selectLianHuHouse(String partyCenterHouseId); } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 27e1c4c1ee..d1da0c1ae8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -20,6 +20,7 @@ package com.epmet.service; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.BuildingTreeLevelDTO; +import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; @@ -96,4 +97,13 @@ public interface BuildingService { */ Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream, Result importTask) throws IOException; + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + List buildingDistribution(String customerId, String gridId, String neighborHoodId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java index 8499b55722..f5cebceb3a 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/HouseService.java @@ -23,6 +23,8 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.google.common.cache.Cache; import javax.servlet.http.HttpServletResponse; @@ -211,4 +213,29 @@ public interface HouseService { * @return */ PageData groupRentHouseList(GroupRentHouseFormDTO formDTO); + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); + + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + HouseDetailResultDTO queryHouseDetail(String houseId); + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * @param buildingId + * @return + */ + PageData queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java index 27663c2d94..29453d73f3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcBuildingService.java @@ -149,4 +149,5 @@ public interface IcBuildingService extends BaseService { * @return */ List buildingDistribution(String customerId, String gridId, String neighborHoodId); + } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java index c03cb3d238..997c23aae3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java @@ -192,21 +192,5 @@ public interface IcHouseService extends BaseService { */ void updatePartyCenterHouse(String houseId, String partyCenterHouseFlag); - /** - * 灵山大屏：查询房屋坐标点位 - * - * @param gridId - * @param neighborHoodId - * @param buildingId - * @return - */ - List houseDistribution(String customerId, String gridId, String neighborHoodId, String buildingId); - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - HouseDetailResultDTO queryHouseDetail(String houseId); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index c8a7d1fd13..e3638b346b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -869,4 +869,20 @@ public class BuildingServiceImpl implements BuildingService { } + + /** + * 灵山大屏：查询楼栋坐标 + * + * @param customerId + * @param gridId + * @param neighborHoodId + * @return + */ + @Override + public List buildingDistribution(String customerId, String gridId, String neighborHoodId) { + List list=icBuildingDao.selectListByMap(customerId,gridId,neighborHoodId); + return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); + } + + } 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 ea27654291..5a505422ec 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 @@ -36,6 +36,8 @@ import com.epmet.dao.*; import com.epmet.dto.*; import com.epmet.dto.form.*; import com.epmet.dto.result.*; +import com.epmet.dto.result.lingshan.HouseDetailResultDTO; +import com.epmet.dto.result.lingshan.PartyCenterHouseResultDTO; import com.epmet.entity.*; import com.epmet.enums.*; import com.epmet.feign.*; @@ -132,7 +134,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Autowired private DataReportOpenFeignClient dataReportOpenFeignClient; - + @Autowired + private LingshanPartyCenterHouseLianhuDao partyCenterHouseLianhuDao; /** * 房屋管理-新增房屋 * @@ -1553,4 +1556,61 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { PageInfo pageInfo = new PageInfo<>(list); return new PageData<>(list, pageInfo.getTotal()); } + + + /** + * 灵山大屏：查询房屋坐标点位 + * + * @param gridId + * @param neighborHoodId + * @param buildingId + * @return + */ + @Override + public List houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { + List list=icHouseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); + return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); + } + + /** + * 灵山大屏：点击房屋，显示房屋详情 + * @param houseId + * @return + */ + @Override + public HouseDetailResultDTO queryHouseDetail(String houseId) { + IcHouseDTO data = icHouseService.get(houseId); + HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); + if (null != resultDTO) { + LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); + countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); + resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); + } + return resultDTO; + } + + /** + * 灵山项目:根据楼栋id返回房屋列表，分页，且返回党员中心户标志, 联户群众数 + * + * @param pageNo + * @param pageSize + * @param buildingId + * @return + */ + @Override + public PageData queryHouseListForLingShanScreen(Integer pageNo, Integer pageSize, String buildingId) { + PageHelper.startPage(pageNo, pageSize); + List list = icHouseDao.selectListPartyCenterHouse(null, + null, + null, + null, + buildingId, + null); + list.forEach(item -> { + item.setHouseTypeName(HouseTypeEnums.getTypeValue(item.getHouseType())); + item.setPurposeName(HousePurposeEnums.getTypeValue(item.getPurpose())); + }); + PageInfo pageInfo = new PageInfo<>(list); + return new PageData<>(list, pageInfo.getTotal(), pageSize); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java index 899b2698dc..b7ce4ca07d 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java @@ -206,4 +206,5 @@ public class IcBuildingServiceImpl extends BaseServiceImpl list=baseDao.selectListByMap(customerId,gridId,neighborHoodId); return ConvertUtils.sourceToTarget(list,IcBuildingDTO.class); } + } 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 42584eceaf..f9e09c123f 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 @@ -668,10 +668,8 @@ public class IcHouseServiceImpl extends BaseServiceImpl(); } - LambdaQueryWrapper queryWrapper=new LambdaQueryWrapper<>(); - queryWrapper.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId,partyCenterHouseId); - List list=partyCenterHouseLianhuDao.selectList(queryWrapper); - return ConvertUtils.sourceToTarget(list,LingshanPartyCenterHouseLianhuDTO.class); + List resultList=partyCenterHouseLianhuDao.selectLianHuHouse(partyCenterHouseId); + return resultList; } /** @@ -726,36 +724,6 @@ public class IcHouseServiceImpl extends BaseServiceImpl houseDistribution(String customerId,String gridId, String neighborHoodId, String buildingId) { - List list=baseDao.selectListByMap(customerId,gridId,neighborHoodId,buildingId); - return ConvertUtils.sourceToTarget(list,IcHouseDTO.class); - } - - /** - * 灵山大屏：点击房屋，显示房屋详情 - * @param houseId - * @return - */ - @Override - public HouseDetailResultDTO queryHouseDetail(String houseId) { - IcHouseDTO data = get(houseId); - HouseDetailResultDTO resultDTO = ConvertUtils.sourceToTarget(data, HouseDetailResultDTO.class); - if (null != resultDTO) { - LambdaQueryWrapper countQuery = new LambdaQueryWrapper<>(); - countQuery.eq(LingshanPartyCenterHouseLianhuEntity::getPartyCenterHouseId, houseId); - resultDTO.setTotalLianHu(partyCenterHouseLianhuDao.selectCount(countQuery)); - } - return resultDTO; - } } 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 1c168e5dd8..509956b15e 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 @@ -969,6 +969,9 @@ ih.DEL_FLAG = '0' AND b.DEL_FLAG = '0' AND h.DEL_FLAG = '0' + + and ih.customer_id=#{customerId} + AND ih.PARTY_CENTER_HOUSE_FLAG='1' diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml index 285b47922e..1c3072c4bc 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/LingshanPartyCenterHouseLianhuDao.xml @@ -34,4 +34,19 @@ where DEL_FLAG='0' and HOUSE_ID = #{houseId} + + \ No newline at end of file diff --git a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java index e34285d2fd..9d8643cf73 100644 --- a/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java +++ b/epmet-module/gov-project/gov-project-client/src/main/java/com/epmet/dto/result/EventAnalysisResultDTO.java @@ -25,29 +25,41 @@ public class EventAnalysisResultDTO implements Serializable { * 网格化平台数量 */ private Integer wangGeHua; - /** - * 归档数量 + * 待处理 */ - private Integer guiDang; + private Integer daiChuLi; /** - * 红灯占比 + * 待处理占比 */ private Double daiChuLiRate; /** - * 黄灯占比 + * 处理中 + */ + private Integer chuLiZhong; + /** + * 处理中占比 */ private Double chuLiZhongRate; + + /** + * 已结案数量 + */ + private Integer yiJieAn; + /** - * 蓝灯占比 + * 已结案占比 */ private Double yiJieAnRate; + /** + * 归档数量 + */ + private Integer guiDang; /** * 归档占比 */ - private Double guiDangRate; } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java index dd31462f70..06ba55576b 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/IcEventController.java @@ -62,6 +62,7 @@ public class IcEventController { /** * 事件管理-列表 + * * @param tokenDto * @param formDTO * @return @@ -72,6 +73,7 @@ public class IcEventController { formDTO.setStaffId(tokenDto.getUserId()); return new Result>().ok(icEventService.list(formDTO)); } + /** * @Author sun * @Description 工作端小程序-事件管理-列表 @@ -84,28 +86,29 @@ public class IcEventController { return new Result>().ok(icEventService.list(formDTO)); } - @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET}) - public Result get(@PathVariable("id") String id){ + @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET}) + public Result get(@PathVariable("id") String id) { IcEventDTO data = icEventService.get(id); return new Result().ok(data); } /** * 事件管理-新增 + * * @param tokenDto * @param formDTO * @return */ @NoRepeatSubmit @PostMapping("add") - public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO){ + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcEventAddEditFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, AddGroup.class, DefaultGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); formDTO.setApp(tokenDto.getApp()); formDTO.setClient(tokenDto.getClient()); - if("3".equals(formDTO.getOperationType())){ - ValidatorUtils.validateEntity(formDTO.getIssueInfo(),IcEventToIssueFormDTO.AddEventAndShiftIssue.class); + if ("3".equals(formDTO.getOperationType())) { + ValidatorUtils.validateEntity(formDTO.getIssueInfo(), IcEventToIssueFormDTO.AddEventAndShiftIssue.class); } icEventService.save(formDTO); return new Result(); @@ -113,7 +116,7 @@ public class IcEventController { @NoRepeatSubmit @PostMapping("update") - public Result update(@RequestBody IcEventDTO dto){ + public Result update(@RequestBody IcEventDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); icEventService.update(dto); @@ -121,7 +124,7 @@ public class IcEventController { } @PostMapping("delete") - public Result delete(@RequestBody String[] ids){ + public Result delete(@RequestBody String[] ids) { //效验数据 AssertUtils.isArrayEmpty(ids, "id"); icEventService.delete(ids); @@ -130,6 +133,7 @@ public class IcEventController { /** * 事件处理分析-处理状态比例查询 + * * @param formDTO * @return */ @@ -148,6 +152,7 @@ public class IcEventController { /** * 事件处理分析-事件列表 + * * @param input * @return */ @@ -169,6 +174,7 @@ public class IcEventController { /** * 时间处理分析-阅读增量查询 + * * @param input * @return */ @@ -190,6 +196,7 @@ public class IcEventController { /** * 研判分析查询 + * * @param eventId * @return */ @@ -201,6 +208,7 @@ public class IcEventController { /** * 组织下，分类下的事件列表 + * * @param input * @return */ @@ -212,16 +220,17 @@ public class IcEventController { String orgType = input.getOrgType(); Integer pageNo = input.getPageNo(); Integer pageSize = input.getPageSize(); - PageData page = icEventService.getSameCategoryEvents(orgId, orgType, categroyPid, pageNo, pageSize); + PageData page = icEventService.getSameCategoryEvents(orgId, orgType, categroyPid, pageNo, pageSize); return new Result>().ok(page); } + /** * @Author sun * @Description 事件管理-回复 **/ @NoRepeatSubmit @PostMapping("reply") - public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO){ + public Result reply(@LoginUser TokenDto tokenDto, @RequestBody IcEventReplyFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); @@ -235,12 +244,12 @@ public class IcEventController { **/ @NoRepeatSubmit @PostMapping("icEventToProject") - public Result icEventToProject(@LoginUser TokenDto tokenDto, @RequestBody IcEventToProjectFormDTO formDTO){ + public Result icEventToProject(@LoginUser TokenDto tokenDto, @RequestBody IcEventToProjectFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); formDTO.setApp(tokenDto.getApp()); formDTO.setClient(tokenDto.getClient()); - ValidatorUtils.validateEntity(formDTO,IcEventToProjectFormDTO.ApprovalCategory.class,IcEventToProjectFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, IcEventToProjectFormDTO.ApprovalCategory.class, IcEventToProjectFormDTO.AddUserInternalGroup.class); icEventService.icEventToProject(formDTO); return new Result(); } @@ -250,7 +259,7 @@ public class IcEventController { * @Description 事件管理-转需求 **/ @PostMapping("icEventToDemand") - public Result icEventToDemand(@LoginUser TokenDto tokenDto, @RequestBody IcDemandFormDTO formDTO){ + public Result icEventToDemand(@LoginUser TokenDto tokenDto, @RequestBody IcDemandFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setDemandUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, IcDemandFormDTO.AddUserShowGroup.class, IcDemandFormDTO.AddUserInternalGroup.class); @@ -260,6 +269,7 @@ public class IcEventController { /** * 事件转议题 + * * @param tokenDto * @param formDTO * @return @@ -283,7 +293,7 @@ public class IcEventController { public Result> categoryAnalysisTotal(@LoginUser TokenDto tokenDto, @RequestBody IcEventCategoryAnalysisFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setStaffId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,IcEventCategoryAnalysisFormDTO.TotalPie.class); + ValidatorUtils.validateEntity(formDTO, IcEventCategoryAnalysisFormDTO.TotalPie.class); List list = icEventService.categoryAnalysisTotal(formDTO); return new Result>().ok(list); } @@ -305,7 +315,7 @@ public class IcEventController { * @Author sun * @Description 事件管理-详情 **/ - @MaskResponse(fieldNames = { "idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD }) + @MaskResponse(fieldNames = {"idCard"}, fieldsMaskType = {MaskResponse.MASK_TYPE_ID_CARD}) @PostMapping("detail") public Result detail(@LoginUser TokenDto tokenDto, @RequestBody IcEventListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); @@ -313,6 +323,7 @@ public class IcEventController { ValidatorUtils.validateEntity(formDTO, IcEventListFormDTO.Detail.class); return new Result().ok(icEventService.detail(formDTO)); } + /** * @Author sun * @Description 工作端小程序-事件管理-详情 @@ -328,6 +339,7 @@ public class IcEventController { /** * 事件分类分析- 饼图2，直属下级 事件数量 + * * @param tokenDto * @param formDTO * @return @@ -353,19 +365,20 @@ public class IcEventController { /** * Desc: 定时任务自动评价 + * * @param formDTO * @author zxc * @date 2022/5/18 16:35 */ @PostMapping("auto-evaluation") - public Result autoEvaluation(@RequestBody AutoEvaluationFormDTO formDTO){ + public Result autoEvaluation(@RequestBody AutoEvaluationFormDTO formDTO) { icEventService.autoEvaluation(formDTO); return new Result(); } /** * @Author sun - * @Description 需求完成/项目结案时 修改事件数据 + * @Description 需求完成/项目结案时 修改事件数据 * 议题关闭时，如果议题来源于事件，也会调用此方法 **/ @PostMapping("closeprojectordemand") @@ -376,6 +389,7 @@ public class IcEventController { /** * Desc: 新增【随手拍、讲】 + * * @param tokenDto * @param formDTO * @author zxc @@ -383,7 +397,7 @@ public class IcEventController { */ @NoRepeatSubmit @PostMapping("add-event-resi") - public Result addEventFromResi(@LoginUser TokenDto tokenDto,@RequestBody AddEventFromResiFormDTO formDTO){ + public Result addEventFromResi(@LoginUser TokenDto tokenDto, @RequestBody AddEventFromResiFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, AddEventFromResiFormDTO.AddEventFromResiForm.class); formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); @@ -394,6 +408,7 @@ public class IcEventController { /** * 居民端小程序我上报的事件-列表+详情 * yapi: http://yapi.elinkservice.cn/project/102/interface/api/7781 + * * @param tokenDto * @param formDTO * @return @@ -408,6 +423,7 @@ public class IcEventController { /** * 居民端我上报的事件， 消息列表跳转详情 + * * @param tokenDto * @param formDTO * @return @@ -423,20 +439,22 @@ public class IcEventController { /** * 居民端小程序我上报的事件详情页面-回复列表 * http://yapi.elinkservice.cn/project/102/interface/api/7783 + * * @param formDTO * @return */ @PostMapping("reply-list") - public Result> replyList(@LoginUser TokenDto tokenDto,@RequestBody MyReportIcEvFormDTO formDTO) { + public Result> replyList(@LoginUser TokenDto tokenDto, @RequestBody MyReportIcEvFormDTO formDTO) { formDTO.setUserId(tokenDto.getUserId()); ValidatorUtils.validateEntity(formDTO, MyReportIcEvFormDTO.ReplyListGroup.class); - return new Result>().ok(icEventReplyService.replyList(formDTO.getIcEventId(),formDTO.getUserId())); + return new Result>().ok(icEventReplyService.replyList(formDTO.getIcEventId(), formDTO.getUserId())); } /** * 居民端小程序我上报的事件-处理中 * 点击事件进入详情页时调用此接口，消除红点 * yapi：http://yapi.elinkservice.cn/project/102/interface/api/7790 + * * @param tokenDto * @param formDTO * @return @@ -452,23 +470,24 @@ public class IcEventController { /** * 居民端我上报的事件-回复 * http://yapi.elinkservice.cn/project/102/interface/api/7789 + * * @param tokenDto * @param formDTO * @return */ @NoRepeatSubmit @PostMapping("resi-reply") - public Result resiReply(@LoginUser TokenDto tokenDto, @RequestBody ResiReplyIcEventFormDTO formDTO){ + public Result resiReply(@LoginUser TokenDto tokenDto, @RequestBody ResiReplyIcEventFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO, ResiReplyIcEventFormDTO.AddUserShowGroup.class,ResiReplyIcEventFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, ResiReplyIcEventFormDTO.AddUserShowGroup.class, ResiReplyIcEventFormDTO.AddUserInternalGroup.class); icEventService.resiReply(formDTO); return new Result(); } /** * @Author sun - * @Description 数字平台-事件导出 + * @Description 数字平台-事件导出 **/ @NoRepeatSubmit @PostMapping("export") @@ -487,8 +506,8 @@ public class IcEventController { List list = null; do { data = icEventService.list(formDTO); - data.getList().forEach(d->{ - if(!org.springframework.util.CollectionUtils.isEmpty(d.getImageList())){ + data.getList().forEach(d -> { + if (!org.springframework.util.CollectionUtils.isEmpty(d.getImageList())) { d.setImageUrl(d.getImageList().get(NumConstant.ZERO)); } }); @@ -501,7 +520,7 @@ public class IcEventController { 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()); + Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), e.getMsg()); printWriter.write(JSON.toJSONString(result)); printWriter.close(); } catch (Exception e) { @@ -515,7 +534,7 @@ public class IcEventController { /** * @Author sun - * @Description 工作端事件红点消除 + * @Description 工作端事件红点消除 **/ @PostMapping("govRedDot") public Result govRedDot(@RequestBody IcEventListFormDTO formDTO) { @@ -526,7 +545,7 @@ public class IcEventController { /** * @Author sun - * @Description 标记事件为难点堵点 + * @Description 标记事件为难点堵点 **/ @PostMapping("difficultpointevent") public Result difficultPointEvent(@RequestBody IcEventListFormDTO formDTO) { @@ -537,6 +556,7 @@ public class IcEventController { /** * 数据分析-个人档案-上报事件列表,根据epmetUserIdList查询 * 模仿gov/project/resieventreply/pageuserreported接口重新查询新表接口 + * * @author sun */ @PostMapping("icevent-pageuserreported") @@ -560,23 +580,25 @@ public class IcEventController { } /** - * @description 获取事件数量和分类数量 - * @param * @param null - * @return Result - * @throws - * @author yan Lu - * @date 2023/5/17 14:49 - */ + * @param * @param null + * @return Result + * @throws + * @description 获取事件数量和分类数量 + * @author yan Lu + * @date 2023/5/17 14:49 + */ @GetMapping("getEventRate") public Result getEventRate(@RequestParam("orgId") String orgId, - @RequestParam("orgType") String orgType){ - return new Result().ok(icEventService.getEventRate(orgId,orgType)); + @RequestParam("orgType") String orgType, + @RequestParam("eventType") String eventType) { + return new Result().ok(icEventService.getEventRate(orgId, orgType, eventType)); } @GetMapping("getEventAnalysis") public Result getEventAnalysis(@RequestParam("orgId") String orgId, - @RequestParam("orgType") String orgType){ - return new Result().ok(icEventService.getEventAnalysis(orgId,orgType)); + @RequestParam("orgType") String orgType, + @RequestParam("eventType") String eventType) { + return new Result().ok(icEventService.getEventAnalysis(orgId, orgType, eventType)); } } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java index 9622cb94e0..3aed8c5932 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/dao/IcEventDao.java @@ -148,12 +148,12 @@ public interface IcEventDao extends BaseDao { List selectUserReported(PageUserReportEventFormDTO formDTO); - EventRateResultDTO getEventRate(@Param("orgIdPath") String orgIdPath); + EventRateResultDTO getEventRate(@Param("orgIdPath") String orgIdPath, @Param("eventType") String eventType); - EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath); + EventAnalysisResultDTO getEventAnalysis(@Param("orgIdPath") String orgPath, @Param("eventType") String eventType); @MapKey("code") - List> getAnalysis(@Param("orgIdPath") String orgPath); + List> getAnalysis(@Param("orgIdPath") String orgPath); IcEventEntity selectByEventId(String icEventId); } diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java index 4e1e19e580..7b1a6bbbd9 100644 --- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java +++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/IcEventService.java @@ -257,7 +257,7 @@ public interface IcEventService extends BaseService { * * @return */ - EventRateResultDTO getEventRate(String orgId, String orgType); + EventRateResultDTO getEventRate(String orgId, String orgType, String eventType); /** * 事件分析数据获取 @@ -266,5 +266,5 @@ public interface IcEventService extends BaseService { * @param orgType * @return */ - EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType); + EventAnalysisResultDTO getEventAnalysis(String orgId, String orgType, String eventType); } 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 3e67c8d848..2c44fab7ff 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 @@ -1924,8 +1924,8 @@ public class IcEventServiceImpl extends BaseServiceImpl> dataMap = baseDao.getAnalysis(getOrgPath(orgId, orgType));//按分类获取数量 Map temp = new HashMap<>(); if (null != dataMap && dataMap.size() > 0) { @@ -1956,10 +1956,14 @@ public class IcEventServiceImpl extends BaseServiceImpl and b.GRID_PIDS like concat(#{orgIdPath},'%') + + AND b.SOURCE_TYPE = #{eventType} + ) eb, ( SELECT SUM( CASE WHEN c.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) AS huang FROM ic_event c WHERE c.DEL_FLAG = 0 and c.STATUS = 'processing' and c.GRID_PIDS like concat(#{orgIdPath},'%') + + AND c.SOURCE_TYPE = #{eventType} + ) ec, ( SELECT SUM( CASE WHEN d.OPERATION_TYPE = 0 THEN 1 ELSE 0 END ) as lan FROM ic_event d WHERE d.DEL_FLAG = 0 and d.STATUS = 'closed_case' and d.GRID_PIDS like concat(#{orgIdPath},'%') + + AND d.SOURCE_TYPE = #{eventType} + ) ed, - ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 and d.OPERATION_TYPE = 0 THEN 1 ELSE 0 END) as dang + ( SELECT SUM( CASE WHEN d.DIFFICULT_POINT = 1 THEN 1 ELSE 0 END) as dang FROM ic_event d WHERE d.DEL_FLAG = 0 and d.GRID_PIDS like concat(#{orgIdPath},'%') + + AND d.SOURCE_TYPE = #{eventType} + ) ee @@ -492,10 +504,13 @@ SELECT ea.total AS jiSuJiBan, eb.total AS zhiTongLianBan, - ec.total AS wangGeHua + ec.total AS wangGeHua, + ed.total AS guiDang FROM ( - SELECT COUNT( e.id ) AS total FROM ic_event e + SELECT COUNT( e.id ) AS total + + FROM ic_event e WHERE e.DEL_FLAG = 0 AND e.SOURCE_TYPE = 0 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL ) and e.GRID_PIDS like concat(#{orgIdPath},'%') @@ -514,7 +529,14 @@ and e.GRID_PIDS like concat(#{orgIdPath},'%') - ) ec + ) ec, + ( + SELECT COUNT( e.id ) AS total FROM ic_event e + WHERE e.DEL_FLAG = 0 AND e.DIFFICULT_POINT = 1 AND ( e.OPERATION_TYPE = 0 OR e.OPERATION_TYPE IS NULL ) + + and e.GRID_PIDS like concat(#{orgIdPath},'%') + + ) ed diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java index e2355d145a..8dbe98ac93 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PersonDataFormDTO.java @@ -23,4 +23,10 @@ public class PersonDataFormDTO implements Serializable { @NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataForm.class) private String customerId; + + /** + * 灵山项目需求，改造此接口，添加houseId，支持查询房屋里的所有人 + * /epmetuser/icresiuser/ownerrelation接口userId与houseId至少传一个值 + */ + private String houseId; } 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 540b0207d9..ca832d0643 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 @@ -97,10 +97,14 @@ public class IcResiUserBriefDTO extends HouseUserDTO implements Serializable { * 民族： */ private String mz; - /** * 因灵山项目添加此列： - * 与户主关系：存储字典纸 + * 民族姓名 + */ + private String mzName; + /** + * 因灵山项目添加此列： + * 与户主关系：存储字典：/sys/dict/data/relationship */ private String yhzgx; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java index 8ec9b45ef1..42c4e3e122 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/OwnerRelationResultDTO.java @@ -15,7 +15,18 @@ import java.util.List; public class OwnerRelationResultDTO implements Serializable { private static final long serialVersionUID = 2876258704168954941L; + /** + * 与户主关系是本人的居民 + */ private String ownerName; + /** + * 与户主关系是本人的居民id + */ + private String ownerUserId; + + /** + * 房屋里的所有人 + */ private List userList; @NoArgsConstructor @@ -24,11 +35,25 @@ public class OwnerRelationResultDTO implements Serializable { private String userId; private String userName; private String isSelf; + + /** + * 与户主关系key【字典表】 + */ + private String yhzgx; + + /** + * 与户主关系名称 + */ private String relation; + /** + * 人户情况 + */ + private String rhzk; /** * 2022.11.17：人户状况：人户一致、人在户不在、户在人不在、暂不清楚 */ private String renHuCondition; + } } 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 03284d5fe7..e48c26c81d 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 @@ -860,7 +860,7 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("ownerrelation") public Result getOwnerRelation(@RequestBody PersonDataFormDTO formDTO) { - return new Result().ok(icResiUserService.getOwnerRelation(formDTO.getUserId())); + return new Result().ok(icResiUserService.getOwnerRelation(formDTO.getUserId(),formDTO.getHouseId())); } /** 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 090c56560f..a64a8e4e85 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 @@ -136,7 +136,7 @@ public interface IcResiUserService extends BaseService { * @Author zhaoqifeng * @Date 2021/11/5 10:28 */ - OwnerRelationResultDTO getOwnerRelation(String userId); + OwnerRelationResultDTO getOwnerRelation(String userId,String houseId); /** * @Description 获取一栋楼每个房间人员分类的数量 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 bcb36c5efb..9f68a6ac4f 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 @@ -1596,41 +1596,65 @@ public class IcResiUserServiceImpl extends BaseServiceImpl wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(IcResiUserEntity::getHomeId, user.getHomeId()); - wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); - wrapper.orderByAsc(IcResiUserEntity::getYhzgx); - List resiUserList = baseDao.selectList(wrapper); - if (CollectionUtils.isNotEmpty(resiUserList)) { - List userList = resiUserList.stream().map(item -> { + if(StringUtils.isBlank(houseId)){ + //获取用户信息 + IcResiUserEntity user = baseDao.selectById(userId); + if (null != user) { + houseId=user.getHomeId(); + } + } + //获取用户所在家庭里所有人员信息 + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(IcResiUserEntity::getHomeId, houseId); + wrapper.eq(IcResiUserEntity::getStatus,NumConstant.ZERO_STR); + wrapper.orderByAsc(IcResiUserEntity::getYhzgx); + List resiUserList = baseDao.selectList(wrapper); + if (CollectionUtils.isNotEmpty(resiUserList)) { + + //先找到户主：正常情况下只会有一个户主，所以找到之后，终止循环 + for(IcResiUserEntity resiUserEntity:resiUserList){ + //如果与房主的关系是本人，则这个人就是房主 + if (RelationshipEnum.SELF.getCode().equals(resiUserEntity.getYhzgx())) { + result.setOwnerName(resiUserEntity.getName()); + result.setOwnerUserId(resiUserEntity.getId()); + break; + } + } + List userList=new ArrayList<>(); + for(IcResiUserEntity item:resiUserList){ + //成员里排除户主 + if(!result.getOwnerUserId().equals(item.getId())){ OwnerRelationResultDTO.UserListBean bean = new OwnerRelationResultDTO.UserListBean(); bean.setUserId(item.getId()); bean.setUserName(item.getName()); + bean.setYhzgx(item.getYhzgx()); bean.setRelation(RelationshipEnum.getEnum(item.getYhzgx()).getName()); - if (userId.equals(item.getId())) { - bean.setIsSelf(NumConstant.ONE_STR); - } - //如果与房主的关系是本人，则这个人就是房主 - if (RelationshipEnum.SELF.getCode().equals(item.getYhzgx())) { - result.setOwnerName(item.getName()); + bean.setIsSelf(NumConstant.ZERO_STR); + + // 与入参里的居民id对比 + if (StringUtils.isNotBlank(userId)) { + if (userId.equals(item.getId())) { + bean.setIsSelf(NumConstant.ONE_STR); + } } + //2022.11.17 返参增加人户状况名称 + bean.setRhzk(item.getRhzk()); if (StringUtils.isBlank(item.getRhzk())){ bean.setRenHuCondition(RenHuConditionEnum.ZBQC.getName()); }else { bean.setRenHuCondition(RenHuConditionEnum.getNameByCode(item.getRhzk())); } - return bean; - }).collect(Collectors.toList()); - result.setUserList(userList); + userList.add(bean); + } } + result.setUserList(userList); } return result; } @@ -1719,6 +1743,13 @@ public class IcResiUserServiceImpl extends BaseServiceImpl> mzRes=epmetAdminOpenFeignClient.getNationOption(); + if(mzRes.success()&&CollectionUtils.isNotEmpty(mzRes.getData())){ + Map mzMap = mzRes.getData().stream().collect(Collectors.toMap(OptionResultDTO::getValue, OptionResultDTO::getLabel)); + if(MapUtils.isNotEmpty(mzMap)&&mzMap.containsKey(r.getMz())){ + r.setMzName(mzMap.get(r.getMz())); + } + } r.setYhzgx(resiEntity.getYhzgx()); r.setYhzgxName(StrConstant.EPMETY_STR); Result> yhzgxRes=epmetAdminOpenFeignClient.getRelationshipOption();