From db5dc52c255d8ffb8b131812b7bdfff395463d52 Mon Sep 17 00:00:00 2001 From: YUJT Date: Mon, 9 May 2022 14:35:07 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=85=E6=B0=91?= =?UTF-8?q?=E7=AB=AF=E5=85=9A=E5=91=98=E9=A3=8E=E9=87=87=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/StyleShowListResiFormDTO.java | 22 +++++++++++ .../IcPartymemberStyleController.java | 39 ++++++++++++++----- .../service/IcPartymemberStyleService.java | 14 +++++++ .../impl/IcPartymemberStyleServiceImpl.java | 35 ++++++++++------- 4 files changed, 88 insertions(+), 22 deletions(-) create mode 100644 epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java new file mode 100644 index 0000000000..102a99b3e7 --- /dev/null +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/form/StyleShowListResiFormDTO.java @@ -0,0 +1,22 @@ +package com.epmet.resi.partymember.dto.partymember.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * 党员风采列表接口参数 + * + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:22 + */ +@Data +public class StyleShowListResiFormDTO extends StyleShowListFormDTO implements Serializable { + + private static final long serialVersionUID = -7548077165302515633L; + + @NotBlank(message = "所属组织不能为空") + private String agencyId; + +} diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java index b22de7b1f6..f73a8bd961 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/IcPartymemberStyleController.java @@ -40,6 +40,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import lombok.extern.slf4j.Slf4j; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FilenameUtils; @@ -75,27 +76,27 @@ import java.util.stream.Collectors; @RestController @RequestMapping("icpartymemberstyle") public class IcPartymemberStyleController { - + @Autowired private IcPartymemberStyleService icPartymemberStyleService; @Autowired private EpmetCommonServiceOpenFeignClient commonServiceOpenFeignClient; @GetMapping("page") - public Result> page(@RequestParam Map params){ + public Result> page(@RequestParam Map params) { PageData page = icPartymemberStyleService.page(params); return new Result>().ok(page); } @PostMapping("detail") - public Result get(@RequestBody IcPartymemberStyleDTO dto){ + public Result get(@RequestBody IcPartymemberStyleDTO dto) { IcPartymemberStyleDTO data = icPartymemberStyleService.get(dto.getId()); return new Result().ok(data); } @PostMapping("save") @NoRepeatSubmit - public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto){ + public Result save(@LoginUser TokenDto tokenDto, @RequestBody IcPartymemberStyleDTO dto) { //效验数据 ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); icPartymemberStyleService.save(tokenDto, dto); @@ -103,7 +104,7 @@ public class IcPartymemberStyleController { } @PostMapping("delete") - public Result delete(@RequestBody IcPartymemberStyleDTO dto){ + public Result delete(@RequestBody IcPartymemberStyleDTO dto) { //效验数据 icPartymemberStyleService.delete(dto.getId()); return new Result(); @@ -156,7 +157,7 @@ public class IcPartymemberStyleController { InputStream inputStream = null; try { inputStream = file.getInputStream(); - }catch (Exception e){ + } catch (Exception e) { ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); input.setOperatorId(tokenDto.getUserId()); input.setTaskId(result.getData().getTaskId()); @@ -172,23 +173,43 @@ public class IcPartymemberStyleController { /** * 数据分析-党员风采列表查询 + * * @param tokenDto * @return */ @PostMapping("showlist") - public Result> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO){ + public Result> showList(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListFormDTO formDTO) { formDTO.setCustomerId(tokenDto.getCustomerId()); formDTO.setUserId(tokenDto.getUserId()); - ValidatorUtils.validateEntity(formDTO,StyleShowListFormDTO.AddUserInternalGroup.class); + ValidatorUtils.validateEntity(formDTO, StyleShowListFormDTO.AddUserInternalGroup.class); return new Result>().ok(icPartymemberStyleService.showList(formDTO)); } + /** + * 党员风采列表 + * + * @param tokenDto 登录用户 + * @param formDto 查询条件 + * @return com.epmet.commons.tools.utils.Result> + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:23 + */ + @PostMapping("showlistbyagency") + public Result> showListByAgency(@LoginUser TokenDto tokenDto, @RequestBody StyleShowListResiFormDTO formDto) { + formDto.setCustomerId(tokenDto.getCustomerId()); + // 此接口不包含userId相关业务处理 + formDto.setUserId(tokenDto.getUserId()); + ValidatorUtils.validateEntity(formDto, StyleShowListFormDTO.AddUserInternalGroup.class); + return new Result().ok(icPartymemberStyleService.showListByAgency(formDto)); + } + /** * 下载党员风采导入模板 + * * @param response * @throws IOException */ - @RequestMapping(value = "import/template-download" ,method = {RequestMethod.GET, RequestMethod.POST}) + @RequestMapping(value = "import/template-download", method = {RequestMethod.GET, RequestMethod.POST}) public void downloadTemplate(HttpServletResponse response) throws IOException { response.setCharacterEncoding("UTF-8"); response.addHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, "Content-Disposition"); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java index 4a9ec6ba5c..9e004e03c5 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/IcPartymemberStyleService.java @@ -25,6 +25,7 @@ import com.epmet.modules.partymember.entity.IcPartymemberStyleEntity; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; @@ -93,6 +94,7 @@ public interface IcPartymemberStyleService extends BaseService} * @Author zhaoqifeng @@ -102,6 +104,7 @@ public interface IcPartymemberStyleService extends BaseService showList(StyleShowListFormDTO formDTO); + + /** + * 党员风采列表查询 + * + * @param formDto + * @return com.epmet.commons.tools.page.PageData + * @author work@yujt.net.cn + * @date 2022/5/9/0009 14:22 + */ + PageData showListByAgency(StyleShowListResiFormDTO formDto); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java index 3c5871637c..b488b7e15f 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java @@ -60,6 +60,7 @@ import com.epmet.modules.partymember.service.IcPartymemberStyleService; import com.epmet.resi.partymember.dto.partymember.IcPartymemberStyleDTO; import com.epmet.resi.partymember.dto.partymember.form.PartyMemberStyleFormDTO; import com.epmet.resi.partymember.dto.partymember.form.StyleShowListFormDTO; +import com.epmet.resi.partymember.dto.partymember.form.StyleShowListResiFormDTO; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; @@ -72,10 +73,8 @@ import org.apache.http.entity.ContentType; import org.apache.poi.ss.usermodel.Workbook; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Async; -import org.springframework.scheduling.annotation.EnableAsync; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.commons.CommonsMultipartFile; import javax.annotation.Resource; @@ -131,7 +130,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl { if (StringUtils.isNotBlank(item.getGridId())) { GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(item.getGridId()); - if(gridInfo == null) { + if (gridInfo == null) { log.warn("未找到网格信息:{}", item.getGridId()); return; } @@ -145,8 +144,8 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + 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); @@ -168,7 +167,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl list = baseDao.selectList(wrapper); PageInfo pageInfo = new PageInfo<>(list); @@ -289,13 +288,13 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId()); + Result> gridOptionResult = govOrgOpenFeignClient.getGridIListByAgency(staffInfoCache.getAgencyId()); if (!gridOptionResult.success()) { throw new EpmetException(gridOptionResult.getCode(), gridOptionResult.getMsg()); } Map gridMap = gridOptionResult.getData().stream().collect(Collectors.toMap(CustomerGridDTO::getGridName, CustomerGridDTO::getId)); //获取党员风采所有分类:key:分类名称； - Map categoryDictMap=icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); + Map categoryDictMap = icPartymemberStyleCategoryDictService.getCategoryDictMap(tokenDto.getCustomerId()); //1.数据校验 只允许导入当前组织下的网格的数据 //网格名称不一样的数据舍弃或者分类名称不存在也舍弃 Iterator iterator = result.iterator(); @@ -346,7 +345,7 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl showList(StyleShowListFormDTO formDTO) { - CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(formDTO.getCustomerId(), formDTO.getUserId()); + String customerId = formDTO.getCustomerId(); + CustomerStaffInfoCacheResult staff = CustomerStaffRedis.getStaffInfo(customerId, formDTO.getUserId()); if (null == staff || StringUtils.isBlank(staff.getAgencyId())) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "查询当前工作人员缓存信息失败", "查询用户信息异常"); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.selectShowList(staff.getAgencyId(), formDTO.getCustomerId())); + return showListByAgency(formDTO.getPageNo(), formDTO.getPageSize(), staff.getAgencyId(), customerId); + } + + @Override + public PageData showListByAgency(StyleShowListResiFormDTO formDto) { + return showListByAgency(formDto.getPageNo(), formDto.getPageSize(), formDto.getAgencyId(), formDto.getCustomerId()); + } + + private PageData showListByAgency(int pageNo, int pageSize, String agencyId, String customerId) { + PageInfo pageInfo = PageHelper.startPage(pageNo, pageSize).doSelectPageInfo(() -> baseDao.selectShowList(agencyId, customerId)); if (CollectionUtils.isNotEmpty(pageInfo.getList())) { //赋值网格名称 for (IcPartymemberStyleDTO dto : pageInfo.getList()) { @@ -468,5 +478,4 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl(pageInfo.getList(), pageInfo.getTotal()); } - } From 216fb26c863ee64955c7489698f8a2f750d3b78c Mon Sep 17 00:00:00 2001 From: wangxianzhang Date: Mon, 9 May 2022 16:15:54 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E5=8F=98=E6=9B=B4=E3=80=82"=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=BD=95=E5=85=A5?= =?UTF-8?q?=E8=A1=A8"sheet=E4=B8=AD=E7=9A=84=E5=A4=87=E6=B3=A8=EF=BC=8C?= =?UTF-8?q?=E6=8C=AA=E5=8A=A8=E5=88=B0=E4=BA=86"=E5=9F=BA=E7=A1=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF"=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/ic_resi_import_template.xls | Bin 73728 -> 73728 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls b/epmet-user/epmet-user-server/src/main/resources/excel/ic_resi_import_template.xls index 99f2034351177d40c553dab992e44674f7f7da71..0cd7fc22f13ba97f87c79ce9f6b8e4d39f1299e2 100644 GIT binary patch delta 6479 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 From f13582b5aafa91b4228752083db7b615cad61a21 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 10 May 2022 09:05:44 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=80=E6=88=B7?= =?UTF-8?q?=E4=B8=80=E6=A1=A3=20=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/HouseMemberResultDTO.java | 39 ++++ .../dto/result/IcHouseMemberResultDTO.java | 48 +++++ .../com/epmet/controller/HouseController.java | 50 +++++ .../java/com/epmet/service/HouseService.java | 9 + .../epmet/service/impl/HouseServiceImpl.java | 17 +- .../epmet/dto/form/RentTenantDataFormDTO.java | 40 +++- .../dto/result/IcResiUserBaseResultDTO.java | 48 +++++ .../dto/result/IcResiUserPageResultDTO.java | 173 ------------------ .../epmet/feign/EpmetUserOpenFeignClient.java | 8 + .../EpmetUserOpenFeignClientFallback.java | 5 + .../controller/IcResiUserController.java | 21 +-- .../java/com/epmet/dao/IcResiUserDao.java | 10 +- .../com/epmet/service/IcResiUserService.java | 6 + .../service/impl/IcResiUserServiceImpl.java | 37 +++- .../main/resources/mapper/IcResiUserDao.xml | 16 +- 15 files changed, 303 insertions(+), 224 deletions(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java create mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java delete mode 100644 epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java new file mode 100644 index 0000000000..208353f318 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -0,0 +1,39 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.util.List; + +/** + * desc:房屋和房屋成员返回结果类 + * + * @author: LiuJanJun + * @date: 2022/5/9 1:58 下午 + * @version: 1.0 + */ +@Data +public class HouseMemberResultDTO extends PageFormDTO { + private static final long serialVersionUID = 4574743024782401136L; + + private String agencyName; + private String gridName; + private String neighborHoodName; + private String buildingName; + private String unitName; + /** + * 门牌号 + */ + private String doorName; + /** + * 房屋类型，1楼房，2平房，3别墅 + */ + private String houseType; + + /** + * 家庭成员 + */ + public static List memberList; + + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java new file mode 100644 index 0000000000..6879feb43d --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseMemberResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 用户基础信息 + * @Author yinzuomei + * @Date 2021/11/1 10:34 上午 + */ +@Data +public class IcHouseMemberResultDTO implements Serializable { + private static final long serialVersionUID = 5621052927788129250L; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 备注 + */ + private String remarks; + + +} + 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 3e625e88c2..ae3fb5b413 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 @@ -18,6 +18,10 @@ package com.epmet.controller; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +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.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; @@ -28,7 +32,9 @@ 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.security.dto.TokenDto; +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.constants.ImportTaskConstants; import com.epmet.dto.form.*; @@ -45,6 +51,7 @@ import org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; +import java.io.PrintWriter; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -306,4 +313,47 @@ public class HouseController implements ResultDataResolver { return new Result(); } + /** + * desc: 导出一户一档 + * + * @param tokenDto + * @param formDTO + * @param response + * @return void + * @author LiuJanJun + * @date 2022/5/9 1:42 下午 + */ + @NoRepeatSubmit + @RequestMapping(value = "/exportHouseUser") + public void exportHouseUser(@LoginUser TokenDto tokenDto, @RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { + //效验数据 + LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(tokenDto, "【查询房屋】查询当前staff所在组织信息失败"); + formDTO.setAgencyId(loginUserDetail.getAgencyId()); + ValidatorUtils.validateEntity(formDTO); + + ExcelWriter excelWriter = null; + try { + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response)) + .registerWriteHandler(new FreezeAndFilter()) + .build(); + + WriteSheet writeSheet = EasyExcel.writerSheet().build(); + List dataList = null; + do { + dataList = houseService.getHouseUser(tokenDto,formDTO); + + }while (dataList != null && dataList.size() == formDTO.getPageSize()); + //获取导出配置 + + } catch (EpmetException e) { + response.reset(); + response.setCharacterEncoding("UTF-8"); + response.setHeader("content-type", "text/htm1; 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(); + } + } + } 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 3ef5b4ca2a..506ac2e30b 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 @@ -18,6 +18,7 @@ package com.epmet.service; 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.dto.form.*; import com.epmet.dto.result.*; @@ -94,4 +95,12 @@ public interface HouseService { * @date 2022/5/6 08:50 */ void updateSort(UpdateSortFormDTO formDTO); + + /** + * desc:条件获取房和家庭成员 + * @param tokenDto + * @param formDTO + * @return + */ + List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); } 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 2c2101e5b3..b992ca9c00 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 @@ -16,6 +16,7 @@ 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.security.dto.TokenDto; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.constant.CustomerGridConstant; @@ -29,7 +30,6 @@ import com.epmet.enums.HousePurposeEnums; import com.epmet.enums.HouseTypeEnums; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; -import com.epmet.feign.GovOrgOpenFeignClient; import com.epmet.model.HouseInfoModel; import com.epmet.model.ImportHouseInfoListener; import com.epmet.redis.IcHouseRedis; @@ -70,12 +70,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Resource private IcBuildingDao icBuildingDao; @Resource - private IcBuildingUnitDao icBuildingUnitDao; - @Resource private IcHouseDao icHouseDao; @Autowired - private GovOrgOpenFeignClient govOrgOpenFeignClient; - @Autowired private IcHouseRedis icHouseRedis; @Autowired private AgencyService agencyservice; @@ -475,6 +471,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } } + @Override + public List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { + PageData houseList = this.getHouseList(formDTO); + List memberResultDTOS = ConvertUtils.sourceToTarget(houseList.getList(), HouseMemberResultDTO.class); + memberResultDTOS.parallelStream().forEach(o ->{ + RentTenantDataFormDTO userResiInfoListFormDTO = new RentTenantDataFormDTO(); + epmetUserOpenFeignClient.getHouseMemberList(userResiInfoListFormDTO); + }); + return memberResultDTOS; + } + /** * @Author sun * @Description 【人房】房屋、居民统计列表数据 diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java index c79bf3e596..ae6986765a 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java @@ -1,24 +1,52 @@ 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; /** - * 租客，房东信息 + * desc:居民信息查询条件 * * @author zhy * @date 2022/4/26 10:54 */ @Data -public class RentTenantDataFormDTO implements Serializable { - private static final long serialVersionUID = 9156247659994638103L; +public class RentTenantDataFormDTO extends PageFormDTO { - @NotBlank(message = "userId不能为空") + private static final long serialVersionUID = 803398545727377361L; + + public interface RentTenantDataForm{} + + @NotBlank(message = "userId不能为空", groups = RentTenantDataForm.class) private String userId; - @NotBlank(message = "tokenDto获取customerId不能为空") + @NotBlank(message = "tokenDto获取customerId不能为空", groups = RentTenantDataForm.class) private String customerId; + /** + * 组织Id + */ + private String agencyId; + + /** + * 网格Id + */ + private String gridId; + + /** + * 小区ID + */ + private String neighborHoodId; + + /** + * 楼栋ID + */ + private String buildingId; + + /** + * 房间ID + */ + private String houseId; + } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java new file mode 100644 index 0000000000..f54ad0cfe4 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserBaseResultDTO.java @@ -0,0 +1,48 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Description 用户基础信息 + * @Author yinzuomei + * @Date 2021/11/1 10:34 上午 + */ +@Data +public class IcResiUserBaseResultDTO implements Serializable { + private static final long serialVersionUID = 5621052927788129250L; + + /** + * 姓名 + */ + private String name; + + /** + * 手机号 + */ + private String mobile; + + /** + * 性别 + */ + private String gender; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 出生日期 + */ + private String birthday; + + /** + * 备注 + */ + private String remarks; + + +} + diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java deleted file mode 100644 index 0c5f5ab0bf..0000000000 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/IcResiUserPageResultDTO.java +++ /dev/null @@ -1,173 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description TODO - * @Author yinzuomei - * @Date 2021/11/1 10:34 上午 - */ -@Data -public class IcResiUserPageResultDTO implements Serializable { - private static final long serialVersionUID = 5621052927788129250L; - private String icResiUserId; - private String gridId; - private String gridName; - /** - * 所属小区ID - */ - private String villageId; - private String vallageName; - - - /** - * 所属楼宇Id - */ - private String buildId; - private String buildName; - - /** - * 单元id - */ - private String unitId; - private String unitName; - - /** - * 所属家庭Id - */ - private String homeId; - private String homeName; - - /** - * 姓名 - */ - private String name; - - /** - * 手机号 - */ - private String mobile; - - /** - * 性别 - */ - private String gender; - - /** - * 身份证号 - */ - private String idCard; - - /** - * 出生日期 - */ - private String birthday; - - /** - * 备注 - */ - private String remarks; - - /** - * 是否党员 - */ - private Boolean isParty; - - /** - * 是否低保户 - */ - private Boolean isDbh; - - /** - * 是否保障房 - */ - private Boolean isEnsureHouse; - - /** - * 是否失业 - */ - private Boolean isUnemployed; - - /** - * 是否育龄妇女 - */ - private Boolean isYlfn; - - /** - * 是否退役军人 - */ - private Boolean isVeterans; - - /** - * 是否统战人员 - */ - private Boolean isUnitedFront; - - /** - * 是否信访人员 - */ - private Boolean isXfry; - - /** - * 是否志愿者 - */ - private Boolean isVolunteer; - - /** - * 是否老年人 - */ - private Boolean isOldPeople; - - /** - * 是否空巢 - */ - private Boolean isKc; - - /** - * 是否失独 - */ - private Boolean isSd; - - /** - * 是否失能 - */ - private Boolean isSn; - - /** - * 是否失智 - */ - private Boolean isSz; - - /** - * 是否残疾 - */ - private Boolean isCj; - - /** - * 是否大病 - */ - private Boolean isDb; - - /** - * 是否慢病 - */ - private Boolean isMb; - - /** - * 是否特殊人群 - */ - private Boolean isSpecial; - - - // 以下属性都需要单独处理，不是直接取数据库的字段 - private String demandCategoryIds; - - private String demandName; - - /** - * 房屋类型，1楼房，2平房，3别墅 - */ - private String houseType;} - 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 78aa5f8181..1bd57957c1 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 @@ -740,4 +740,12 @@ public interface EpmetUserOpenFeignClient { @PostMapping("/epmetuser/icresiuser/userchartlist") Result> userChartList(@RequestBody UserChartFormDTO userDTO); + + /** + * desc:条件获取房屋成员信息 + * @param formDTO + * @return + */ + @PostMapping("/epmetuser/icresiuser/getHouseMemberList") + Result> getHouseMemberList(@RequestBody RentTenantDataFormDTO 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 aa0cb1e7f9..0231dce7b5 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 @@ -543,4 +543,9 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "userChartList", userDTO); } + @Override + public Result> getHouseMemberList(RentTenantDataFormDTO formDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getHouseMemberList", formDTO); + } + } 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 1b923f19d5..97b9ded9a1 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 @@ -270,7 +270,7 @@ public class IcResiUserController implements ResultDataResolver { */ @PostMapping("rent/getrentresiuserinfo") public Result getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) { - ValidatorUtils.validateEntity(formDTO); + ValidatorUtils.validateEntity(formDTO, RentTenantDataFormDTO.RentTenantDataForm.class); return new Result().ok(icResiUserService.getRentResiUserInfo(formDTO)); } @@ -1001,19 +1001,8 @@ public class IcResiUserController implements ResultDataResolver { List r = icResiUserService.listHomeUserBrief(houseId, customerId); return new Result().ok(r); } -// @PostMapping("test-async") -// public Result testAsync(HttpServletRequest request) { -//// tl.set("wxz"); -// executorService.submit(() -> { -// try { -// Thread.sleep(500l); -// log.info("[我是子线程]:" + EpmetRequestHolder.getHeader("app")); -// System.out.println("---"); -// } catch (InterruptedException e) { -// log.error("method exception", e); -// } -// icResiUserImportService.testAsync(); -// }); -// return new Result(); -// } + @PostMapping("getHouseMemberList") + Result> getHouseMemberList(@RequestBody RentTenantDataFormDTO formDTO) { + return new Result().ok(icResiUserService.getHouseMemberList(formDTO)); + } } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java index 6de40fe9fa..32878e0bde 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/IcResiUserDao.java @@ -159,11 +159,11 @@ public interface IcResiUserDao extends BaseDao { @Param("tableName") String tableName, @Param("userId") String userId); /** - * @Author sun - * @Description 查询居民信息 - **/ - IcResiUserDTO getResiUser(IcResiUserDTO dto); - + * desc:根据身份证号获取居民信息 + * @param idCard + * @param customerId + * @return + */ IcResiUserDTO getResiUserByIdCard(@Param("idCard") String idCard,@Param("customerId") String customerId); /** 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 698156282f..51d71b72f0 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 @@ -319,4 +319,10 @@ public interface IcResiUserService extends BaseService { */ String updateImage(TokenDto tokenDto, RentTenantFormDTO formDTO); + /** + * desc:条件获取居民基础信息 + * @param formDTO + * @return + */ + List getHouseMemberList(RentTenantDataFormDTO 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 96793a6db8..f48398684e 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 @@ -208,10 +208,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl getHouseMemberList(RentTenantDataFormDTO formDTO) { + String pids = ""; + //根据pid 获取居民 信息 + if (StringUtils.isNotBlank(formDTO.getGridId())){ + GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getGridId()); + if (gridInfo == null){ + log.warn("getHouseMemberList gridId:{} is not exist",formDTO.getGridId()); + return null; + } + pids = gridInfo.getPids().concat(StrConstant.COLON).concat(formDTO.getGridId()); + } + if (StringUtils.isNotBlank(formDTO.getAgencyId())){ + AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(formDTO.getAgencyId()); + if (agencyInfo == null){ + log.warn("getHouseMemberList agencyId:{} is not exist",formDTO.getAgencyId()); + return null; + } + pids = agencyInfo.getPids().concat(StrConstant.COLON).concat(formDTO.getAgencyId()); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + .eq(StringUtils.isNotBlank(formDTO.getAgencyId()),IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + .eq(StringUtils.isNotBlank(formDTO.getCustomerId()),IcResiUserEntity::getCustomerId,formDTO.getCustomerId()) + ; + /*PageHelper.startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage()) + .doSelectPage(()->baseDao.getResiUser())*/ + return null; + } + } 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 1645f09bdf..8b35a19c85 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 @@ -363,19 +363,6 @@ AND IC_RESI_USER = #{userId} - + From d2ae84dc811713579c7cb2dfbaddd16ccd5a7c36 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 07:41:05 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=80=E6=88=B7?= =?UTF-8?q?=E4=B8=80=E6=A1=A3=20=E6=9A=82=E5=AD=983?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../handler/ExcelFillCellMergeStrategy.java | 13 ++++++++++++- .../dto/result/HouseMemberResultDTO.java | 3 +++ .../com/epmet/controller/HouseController.java | 13 +++++++------ .../java/com/epmet/service/HouseService.java | 2 +- .../epmet/service/impl/HouseServiceImpl.java | 19 ++++++++++++------- 5 files changed, 35 insertions(+), 15 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java index 4d02d241c7..e8408478ea 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/poi/excel/handler/ExcelFillCellMergeStrategy.java @@ -28,6 +28,10 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { * 从下标n行开始合并 */ private int mergeRowIndex; + /** + * 默认隐藏第一列 用于合并数据 + */ + private boolean hiddenFirst = true; public ExcelFillCellMergeStrategy() { } @@ -36,6 +40,11 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { this.mergeRowIndex = mergeRowIndex; this.mergeColumnIndexArr = mergeColumnIndexArr; } + public ExcelFillCellMergeStrategy(int mergeRowIndex, int[] mergeColumnIndexArr,boolean hiddenFirst) { + this.mergeRowIndex = mergeRowIndex; + this.mergeColumnIndexArr = mergeColumnIndexArr; + this.hiddenFirst = hiddenFirst; + } @Override public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer columnIndex, Integer relativeRowIndex, Boolean isHead) { @@ -45,7 +54,9 @@ public class ExcelFillCellMergeStrategy implements CellWriteHandler { @Override public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) { // 隐藏id列 - writeSheetHolder.getSheet().setColumnHidden(0, true); + if (hiddenFirst ){ + writeSheetHolder.getSheet().setColumnHidden(0, true); + } } @Override diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java index 615b887d03..cdf2e7855f 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -17,6 +17,9 @@ import java.io.Serializable; public class HouseMemberResultDTO implements Serializable { private static final long serialVersionUID = 1L; + @ExcelProperty(value = {"序号","序号"},index = 0) + private Integer num; + @ExcelProperty(value = {"房屋信息","所属组织"},index = 1) private String agencyName; @ExcelProperty(value = {"房屋信息","所属网格"},index = 2) 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 438cc31abd..233aec7c13 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 @@ -346,7 +346,7 @@ public class HouseController implements ResultDataResolver { excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response), HouseMemberResultDTO.class) .registerWriteHandler(new FreezeAndFilter()) .build(); - int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10}; + int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12}; // 头的策略 WriteCellStyle headWriteCellStyle = new WriteCellStyle(); @@ -356,19 +356,20 @@ public class HouseController implements ResultDataResolver { contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); FreezeAndFilter writeHandler = new FreezeAndFilter(); - ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr); - WriteSheet writeSheet = EasyExcel.writerSheet().registerWriteHandler(mergeStrategy) + writeHandler.rowSplit = 2; + ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr,false); + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(mergeStrategy) .registerWriteHandler(horizontalCellStyleStrategy) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .registerWriteHandler(writeHandler) .build(); - List dataList = null; + PageData dataList = null; do { dataList = houseService.getHouseUser(tokenDto,formDTO); System.out.println("====:"+JSON.toJSONString(dataList)); - excelWriter.write(dataList,writeSheet); + excelWriter.write(dataList.getList(), writeSheet); formDTO.setPageSize(formDTO.getPageSize()+1); - }while (dataList != null && dataList.size() == formDTO.getPageSize()); + }while (dataList != null && dataList.getTotal() == formDTO.getPageSize()); //获取导出配置 } catch (EpmetException e) { 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 506ac2e30b..48d88c38f3 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 @@ -102,5 +102,5 @@ public interface HouseService { * @param formDTO * @return */ - List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); + PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); } 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 e790fc07a9..25862ead97 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 @@ -190,7 +190,8 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey())); }); - return new PageData<>(records,pageInfo.getTotal()); + + return new PageData<>(records == null? new ArrayList<>():records,pageInfo.getTotal()); } public String getPids(String agencyId){ String pids = null; @@ -473,9 +474,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icBuildingService.update(icBuildingDTO); } } - //Cache + Cache exportNumCacheMap = CacheBuilder.newBuilder().build(); @Override - public List getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { + public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO(); resiParam.setCustomerId(tokenDto.getCustomerId()); resiParam.setAgencyId(formDTO.getAgencyId()); @@ -494,11 +495,13 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { searchLevel = 2; } - PageData houseList = this.getHouseList(formDTO); - List resultDTOS = ConvertUtils.sourceToTarget(houseList.getList(), HouseMemberResultDTO.class); + PageData houseData = this.getHouseList(formDTO); + List resultDTOS = ConvertUtils.sourceToTarget(houseData.getList(), HouseMemberResultDTO.class); - List result = new ArrayList<>(); + List resultList = new ArrayList<>(); + PageData result = new PageData<>(resultList,houseData.getList().size()); int finalSearchLevel = searchLevel; + AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); resultDTOS.parallelStream().forEach(o ->{ resiParam.setNeighborHoodId(o.getNeighborHoodId()); @@ -513,8 +516,10 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (members == null){ return; } + int n = num.incrementAndGet(); members.forEach(m->{ HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(m, HouseMemberResultDTO.class); + resultDTO.setNum(n); resultDTO.setAgencyName(o.getAgencyName()); resultDTO.setGridName(o.getGridName()); resultDTO.setNeighborHoodName(o.getNeighborHoodName()); @@ -527,7 +532,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { resultDTO.setOwnerName(o.getOwnerName()); resultDTO.setOwnerPhone(o.getOwnerPhone()); resultDTO.setOwnerIdCard(o.getOwnerIdCard()); - result.add(resultDTO); + resultList.add(resultDTO); }); }); return result; From a27bdb44ebc82074a18287b777202b21a43e0757 Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 09:17:44 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=81=A2=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/epmet/feign/EpmetUserOpenFeignClient.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 3dfbe4b8fe..1d8a6f3c5a 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 @@ -23,8 +23,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:09 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") -//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) +//@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class, url = "localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallbackFactory = EpmetUserOpenFeignClientFallbackFactory.class) public interface EpmetUserOpenFeignClient { /** From ebc038f89c0a520379429e203711f6ab65460c9f Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 11 May 2022 15:47:42 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=B8=80=E6=88=BF?= =?UTF-8?q?=E4=B8=80=E6=A1=A3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/commons/tools/enums/GenderEnum.java | 2 +- .../feign/EpmetBaseRequestInterceptor.java | 4 +- .../dto/result/HouseMemberResultDTO.java | 38 ++++++----- .../com/epmet/controller/HouseController.java | 36 ++++++---- .../java/com/epmet/service/HouseService.java | 5 +- .../epmet/service/impl/HouseServiceImpl.java | 68 +++++++++++++------ .../src/main/resources/mapper/IcHouseDao.xml | 9 +++ .../dto/form/IcFormOptionsQueryFormDTO.java | 16 +++-- .../IcFormItemOptionsController.java | 13 ++-- .../service/IcFormItemOptionsService.java | 7 +- .../impl/IcFormItemOptionsServiceImpl.java | 15 ++-- .../dto/result/HouseIcResiUserResultDTO.java | 6 ++ .../service/impl/IcResiUserServiceImpl.java | 67 +++++++++++++++++- .../service/impl/VolunteerServiceImpl.java | 2 +- .../main/resources/mapper/IcResiUserDao.xml | 31 +++++++++ 15 files changed, 241 insertions(+), 78 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java index 5604377ed5..0ebbe0c3e3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/enums/GenderEnum.java @@ -19,7 +19,7 @@ public enum GenderEnum { public static String getName(String code) { GenderEnum[] genderEnums = values(); for (GenderEnum genderEnum : genderEnums) { - if (genderEnum.getCode() == code) { + if (genderEnum.getCode().equals(code)) { return genderEnum.getName(); } } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java index 2cfa8ea3ad..f7eb3a778d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/feign/EpmetBaseRequestInterceptor.java @@ -25,7 +25,7 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor { // Map requestHeaders = getHeadersFromRequest(); - log.info("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:" + requestHeaders); + log.debug("EpmetBaseRequestInterceptor#apply#inheritableAdditionalHeaders:" + requestHeaders); if (requestHeaders != null && requestHeaders.size() > 0) { for (Map.Entry kv : requestHeaders.entrySet()) { @@ -59,4 +59,4 @@ public class EpmetBaseRequestInterceptor implements RequestInterceptor { return headers; } -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java index cdf2e7855f..66bfdfa4ad 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseMemberResultDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.result; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; +import com.alibaba.excel.annotation.write.style.ColumnWidth; import lombok.Data; import java.io.Serializable; @@ -17,7 +18,8 @@ import java.io.Serializable; public class HouseMemberResultDTO implements Serializable { private static final long serialVersionUID = 1L; - @ExcelProperty(value = {"序号","序号"},index = 0) + @ColumnWidth(value = 7) + @ExcelProperty(value = "序号",index = 0) private Integer num; @ExcelProperty(value = {"房屋信息","所属组织"},index = 1) @@ -85,103 +87,103 @@ public class HouseMemberResultDTO implements Serializable { /** * 姓名 */ - @ExcelProperty(value = {"实际居住人息","姓名"},index = 13) + @ExcelProperty(value = {"实际居住人信息","姓名"},index = 13) private String name; /** * 性别 */ - @ExcelProperty(value = {"实际居住人息","性别"},index = 14) + @ExcelProperty(value = {"实际居住人信息","性别"},index = 14) private String gender; /** * 手机号 */ - @ExcelProperty(value = {"实际居住人息","手机号"},index = 15) + @ExcelProperty(value = {"实际居住人信息","手机号"},index = 15) private String mobile; /** * 身份证号 */ - @ExcelProperty(value = {"实际居住人息","身份证号"},index = 16) + @ExcelProperty(value = {"实际居住人信息","身份证号"},index = 16) private String idCard; /** * 出生日期 */ - @ExcelProperty(value = {"实际居住人息","出生日期"},index = 17) + @ExcelProperty(value = {"实际居住人信息","出生日期"},index = 17) private String birthday; /** * 户籍所在地 */ - @ExcelProperty(value = {"实际居住人息","户籍所在地"},index = 18) + @ExcelProperty(value = {"实际居住人信息","户籍所在地"},index = 18) private String hjszd; /** * 与户主关系【字典表】 */ - @ExcelProperty(value = {"实际居住人息","与户主关系"},index = 19) + @ExcelProperty(value = {"实际居住人信息","与户主关系"},index = 19) private String yhzgx; /** * 是否党员 */ - @ExcelProperty(value = {"实际居住人息","是否党员"},index = 20) + @ExcelProperty(value = {"实际居住人信息","是否党员"},index = 20) private String isParty; /** * 是否租户 */ - @ExcelProperty(value = {"实际居住人息","是否租户"},index = 21) + @ExcelProperty(value = {"实际居住人信息","是否租户"},index = 21) private String isTenant; /** * 是否流动人口 */ - @ExcelProperty(value = {"实际居住人息","是否流动人口"},index = 22) + @ExcelProperty(value = {"实际居住人信息","是否流动人口"},index = 22) private String isFloating; /** * 工作单位 */ - @ExcelProperty(value = {"实际居住人息","工作单位"},index = 23) + @ExcelProperty(value = {"实际居住人信息","工作单位"},index = 23) private String gzdw; /** * 民族【字典表】 */ - @ExcelProperty(value = {"实际居住人息","民族"},index = 24) + @ExcelProperty(value = {"实际居住人信息","民族"},index = 24) private String mz; /** * 籍贯 */ - @ExcelProperty(value = {"实际居住人息","籍贯"},index = 25) + @ExcelProperty(value = {"实际居住人信息","籍贯"},index = 25) private String jg; /** * 婚姻状况【字典表】 */ - @ExcelProperty(value = {"实际居住人息","婚姻状况"},index = 26) + @ExcelProperty(value = {"实际居住人信息","婚姻状况"},index = 26) private String hyzk; /** * 文化程度【字典表】 */ - @ExcelProperty(value = {"实际居住人息","文化程度"},index = 27) + @ExcelProperty(value = {"实际居住人信息","文化程度"},index = 27) private String culture; /** * 宗教信仰 */ - @ExcelProperty(value = {"实际居住人息","宗教信仰"},index = 28) + @ExcelProperty(value = {"实际居住人信息","宗教信仰"},index = 28) private String faith; /** * 备注 */ - @ExcelProperty(value = {"实际居住人息","备注"},index = 29) + @ExcelProperty(value = {"实际居住人信息","备注"},index = 29) private String remarks; 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 233aec7c13..1a5fcdb3fb 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 @@ -47,11 +47,14 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.service.HouseService; import com.epmet.util.ExcelPoiUtils; +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.apache.poi.ss.usermodel.IndexedColors; import org.apache.poi.ss.usermodel.VerticalAlignment; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -62,6 +65,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Set; +import java.util.concurrent.TimeUnit; /** @@ -343,11 +347,6 @@ public class HouseController implements ResultDataResolver { ExcelWriter excelWriter = null; try { - excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response), HouseMemberResultDTO.class) - .registerWriteHandler(new FreezeAndFilter()) - .build(); - int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12}; - // 头的策略 WriteCellStyle headWriteCellStyle = new WriteCellStyle(); // 背景设置为红色 @@ -355,21 +354,32 @@ public class HouseController implements ResultDataResolver { WriteCellStyle contentWriteCellStyle = new WriteCellStyle(); contentWriteCellStyle.setVerticalAlignment(VerticalAlignment.CENTER); HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(headWriteCellStyle, contentWriteCellStyle); + + excelWriter = EasyExcel.write(ExcelUtils.getOutputStreamForExcel("一户一档信息.xlsx", response)) + .registerWriteHandler(horizontalCellStyleStrategy) + .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + .build(); + int[] mergeRowArr = new int[]{0,1,2,3,4,5,6,7,8,9,10,11,12}; + FreezeAndFilter writeHandler = new FreezeAndFilter(); writeHandler.rowSplit = 2; ExcelFillCellMergeStrategy mergeStrategy = new ExcelFillCellMergeStrategy(2,mergeRowArr,false); - WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(mergeStrategy) - .registerWriteHandler(horizontalCellStyleStrategy) - .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1") + .head(HouseMemberResultDTO.class) + .registerWriteHandler(mergeStrategy) .registerWriteHandler(writeHandler) .build(); PageData dataList = null; + Cache haveSearchCache = CacheBuilder.newBuilder().maximumSize(NumConstant.ONE_HUNDRED).expireAfterWrite(NumConstant.THIRTY, TimeUnit.MINUTES).build(); do { - dataList = houseService.getHouseUser(tokenDto,formDTO); - System.out.println("====:"+JSON.toJSONString(dataList)); + dataList = houseService.getHouseUser(tokenDto,formDTO,haveSearchCache); + + formDTO.setPageNo(formDTO.getPageNo() + NumConstant.ONE); excelWriter.write(dataList.getList(), writeSheet); - formDTO.setPageSize(formDTO.getPageSize()+1); - }while (dataList != null && dataList.getTotal() == formDTO.getPageSize()); + if (CollectionUtils.isEmpty(dataList.getList())){ + break; + } + }while (dataList.getTotal() == formDTO.getPageSize()); //获取导出配置 } catch (EpmetException e) { @@ -380,7 +390,7 @@ public class HouseController implements ResultDataResolver { Result result = new Result<>().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),e.getMsg()); printWriter.write(JSON.toJSONString(result)); printWriter.close(); - }finally { + } finally { if (excelWriter != null){ excelWriter.finish(); } 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 48d88c38f3..39d3ec1b24 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 @@ -22,6 +22,7 @@ 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.*; +import com.google.common.cache.Cache; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; @@ -36,6 +37,7 @@ import java.util.Set; */ public interface HouseService { + void addHouse(String customerId, IcHouseAddFormDTO formDTO); @@ -100,7 +102,8 @@ public interface HouseService { * desc:条件获取房和家庭成员 * @param tokenDto * @param formDTO + * @param haveSearchCache * @return */ - PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO); + PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache haveSearchCache); } 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 25862ead97..c4bd04db15 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 @@ -4,6 +4,7 @@ import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.alibaba.excel.EasyExcel; import com.alibaba.excel.ExcelReader; import com.alibaba.excel.read.metadata.ReadSheet; +import com.alibaba.fastjson.JSON; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -175,14 +176,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { pids = getPids(formDTO.getAgencyId()); } formDTO.setPids(pids); - PageInfo pageInfo = null; - if (formDTO.getIsPage()){ - pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()) + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()) .doSelectPageInfo(() -> icHouseDao.searchHouseByPage(formDTO)); - }else{ - List resultDTOS = icHouseDao.searchHouseByPage(formDTO); - pageInfo = new PageInfo<>(resultDTOS,resultDTOS.size()); - } + List records = pageInfo.getList(); records.forEach(item->{ @@ -214,10 +210,17 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { //如果类型是house 查房屋 //导出房屋 - PageData icHouseExcels = getHouseList(formDTO); + List list = new ArrayList<>(); + do { + PageData icHouseExcels = getHouseList(formDTO); + if (CollectionUtils.isEmpty(icHouseExcels.getList())){ + break; + } + list.addAll(icHouseExcels.getList()); + }while (list.size() == formDTO.getPageSize()); TemplateExportParams templatePath = new TemplateExportParams("excel/house_export.xlsx"); Map map = new HashMap<>(); - map.put("maplist",icHouseExcels.getList()); + map.put("maplist", list); ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response); } @@ -474,14 +477,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icBuildingService.update(icBuildingDTO); } } - Cache exportNumCacheMap = CacheBuilder.newBuilder().build(); + Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); @Override - public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO) { + public PageData getHouseUser(TokenDto tokenDto, IcHouseListFormDTO formDTO, Cache haveSearchCache) { RentTenantDataFormDTO resiParam = new RentTenantDataFormDTO(); resiParam.setCustomerId(tokenDto.getCustomerId()); resiParam.setAgencyId(formDTO.getAgencyId()); resiParam.setGridId(formDTO.getGridId()); resiParam.setPageSize(NumConstant.ONE_THOUSAND); + resiParam.setIsPage(false); //查询级别 默认按照小区去查 int searchLevel = 0; @@ -502,8 +506,9 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { PageData result = new PageData<>(resultList,houseData.getList().size()); int finalSearchLevel = searchLevel; AtomicInteger num = new AtomicInteger((formDTO.getPageNo()-1) * formDTO.getPageSize()); - Cache> memberMap = CacheBuilder.newBuilder().expireAfterAccess(1, TimeUnit.SECONDS).build(); - resultDTOS.parallelStream().forEach(o ->{ + + resultDTOS.stream().forEach(o ->{ + resiParam.setNeighborHoodId(o.getNeighborHoodId()); if (finalSearchLevel == 1){ resiParam.setBuildingId(o.getBuildingId()); @@ -511,12 +516,19 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { if (finalSearchLevel == 2){ resiParam.setHouseId(o.getHouseId()); } - getHouseMembers(resiParam, memberMap); + this.getHouseMembers(resiParam, memberMap,haveSearchCache); List members = memberMap.getIfPresent(o.getHouseId()); - if (members == null){ + + int n = num.incrementAndGet(); + + //没有住户 则直接写房屋 + if (CollectionUtils.isEmpty(members)){ + HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(o, HouseMemberResultDTO.class); + resultDTO.setNum(n); + resultList.add(resultDTO); return; } - int n = num.incrementAndGet(); + //有住户 房屋信息是重复的 members.forEach(m->{ HouseMemberResultDTO resultDTO = ConvertUtils.sourceToTarget(m, HouseMemberResultDTO.class); resultDTO.setNum(n); @@ -538,20 +550,36 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { return result; } - public void getHouseMembers(RentTenantDataFormDTO resiParam, Cache> memberMap) { + /** + * desc:分情况获取 房屋内居民 + * @param resiParam + * @param memberMap + * @param haveSearchCache + */ + public void getHouseMembers(RentTenantDataFormDTO resiParam, Cache> memberMap, Cache haveSearchCache) { + String searchKey = resiParam.getHouseId()+resiParam.getBuildingId()+resiParam.getNeighborHoodId()+resiParam.getAgencyId(); + Boolean haveSearch = haveSearchCache.getIfPresent(searchKey); + if (haveSearch!= null && haveSearch){ + return; + } + haveSearchCache.put(searchKey,true); List memberListTemp = null; + resiParam.setPageNo(NumConstant.ONE); do { Result> memberResult = epmetUserOpenFeignClient.getHouseMemberList(resiParam); + log.debug("=======查询居民:"+ resiParam.getPageNo()+",size:"+resiParam.getPageSize()+",result:"+memberResult.getData().size()); if (!memberResult.success()) { throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "调用user服务失败"); } memberListTemp = memberResult.getData(); + log.debug("=======查询居民结果:"+ JSON.toJSONString(memberListTemp)); if (CollectionUtils.isEmpty(memberListTemp)) { - continue; + break; } - resiParam.setPageSize(resiParam.getPageSize()+1); + resiParam.setPageNo(resiParam.getPageNo()+1); memberListTemp.parallelStream().forEach(h -> memberMap.put(h.getHomeId(), h.getHouseMemberList())); - } while (memberListTemp != null && memberListTemp.size() == resiParam.getPageSize()); + + } while (memberListTemp.size() == resiParam.getPageSize()); } /** 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 14ad186898..a32acff97f 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 @@ -131,12 +131,21 @@ AND c.GRID_ID = #{id} + + AND c.GRID_ID = #{gridId} + AND c.id = #{id} + + AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId} + AND b.id = #{id} + + AND a.BUILDING_ID = #{buildingId} + AND a.RENT_FLAG = #{rentFlag} diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java index f7fa5bb1da..8ec7ed10c2 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/form/IcFormOptionsQueryFormDTO.java @@ -12,16 +12,24 @@ import javax.validation.constraints.NotBlank; */ @Data public class IcFormOptionsQueryFormDTO { - + public interface QueryByLabelAndCustomerIdForForm {} - + @NotBlank(message = "客户ID必填", groups = { QueryByLabelAndCustomerIdForForm.class }) private String customerId; @NotBlank(message = "FormCode必填", groups = { QueryByLabelAndCustomerIdForForm.class }) private String formCode; + /** + * 列名单纯的列名，如果是扩展字段则 需要给columnNum赋值 + */ @NotBlank(message = "OptionsLabel必填", groups = { QueryByLabelAndCustomerIdForForm.class }) - private String label; - + private String columnName; + + /** + * 列名数字 + */ + private Integer columnNum; + } diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java index ed22604272..d794955eef 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/IcFormItemOptionsController.java @@ -31,12 +31,10 @@ import com.epmet.excel.IcFormItemOptionsExcel; import com.epmet.service.IcFormItemOptionsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import org.springframework.web.servlet.tags.form.InputTag; import javax.servlet.http.HttpServletResponse; import java.util.List; import java.util.Map; -import java.util.function.IntUnaryOperator; /** @@ -48,7 +46,7 @@ import java.util.function.IntUnaryOperator; @RestController @RequestMapping("icformitemoptions") public class IcFormItemOptionsController { - + @Autowired private IcFormItemOptionsService icFormItemOptionsService; @@ -115,11 +113,12 @@ public class IcFormItemOptionsController { ValidatorUtils.validateEntity(input, IcFormOptionsQueryFormDTO.QueryByLabelAndCustomerIdForForm.class); String customerId = input.getCustomerId(); String formCode = input.getFormCode(); - String label = input.getLabel(); + String columnName = input.getColumnName(); + Integer columnNum = input.getColumnNum(); - List r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, label); + List r = icFormItemOptionsService.getOptionsByItemConditions(customerId, formCode, columnName, columnNum); return new Result>().ok(r); } - -} \ No newline at end of file + +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java index 7423f85289..8dd3193e6d 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/IcFormItemOptionsService.java @@ -105,8 +105,9 @@ public interface IcFormItemOptionsService extends BaseService getOptionsByItemConditions(String customerId, String formCode, String label); -} \ No newline at end of file + List getOptionsByItemConditions(String customerId, String formCode, String columnName, Integer columnNum); +} diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java index 970845cbee..f176182cf9 100644 --- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java +++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcFormItemOptionsServiceImpl.java @@ -53,7 +53,7 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -118,19 +118,20 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl getOptionsByItemConditions(String customerId, String formCode, String label) { + public List getOptionsByItemConditions(String customerId, String formCode, String columnName, Integer columnNum) { // 查询item LambdaQueryWrapper formItemQuery = new LambdaQueryWrapper<>(); - formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId); - formItemQuery.eq(IcFormItemEntity::getFormCode, formCode); - formItemQuery.eq(IcFormItemEntity::getLabel, label); + formItemQuery.eq(IcFormItemEntity::getCustomerId, customerId) + .eq(IcFormItemEntity::getFormCode, formCode) + .eq(IcFormItemEntity::getColumnName, columnName) + .eq(columnNum != null,IcFormItemEntity::getColumnNum,columnNum); IcFormItemEntity item = icFormItemDao.selectOne(formItemQuery); if (item == null) { return new ArrayList<>(); } - + // 通过item查询options LambdaQueryWrapper query = new LambdaQueryWrapper<>(); query.eq(IcFormItemOptionsEntity::getItemId, item.getId()); @@ -143,4 +144,4 @@ public class IcFormItemOptionsServiceImpl extends BaseServiceImpl houseMemberList; + /** + * 屋内的居民 + */ + private LinkedHashMap houseMemberList2; + @Data public static class HouseMemberResultDTO implements Serializable { 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 4a40748907..8f169aa7e5 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 @@ -1486,7 +1486,7 @@ public class IcResiUserServiceImpl extends BaseServiceImpl categorieDtos = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsQuery), ServiceConstant.OPER_CUSTOMIZE_SERVER, EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), @@ -1819,7 +1819,72 @@ public class IcResiUserServiceImpl extends BaseServiceImpl listPage = PageHelper .startPage(formDTO.getPageNo(),formDTO.getPageSize(),formDTO.getIsPage()) .doSelectPage(()->baseDao.getResiUser(formDTO)); + //Result> relationshipResult = epmetAdminOpenFeignClient.getRelationshipOption(); + //Result> educationResult = epmetAdminOpenFeignClient.getEducationOption(); + //Result> nationResult = epmetAdminOpenFeignClient.getNationOption(); + List dictTypeList = Arrays.asList(DictTypeEnum.EDUCATION.getCode(), DictTypeEnum.RELATIONSHIP.getCode(), DictTypeEnum.NATION.getCode()); + Map> dictResult = new HashMap<>(); + dictTypeList.forEach(dict->{ + Result> mapResult = epmetAdminOpenFeignClient.dictMap(dict); + if (mapResult!=null && mapResult.success()){ + dictResult.put(dict,mapResult.getData()); + } + }); + + Map hyzkMap = getOptionMap(formDTO.getCustomerId(),"HYZK"); + + listPage.getResult().forEach(e->{ + e.getHouseMemberList().parallelStream().forEach(o->{ + if (StringUtils.isNotBlank(o.getIsParty())){ + o.setIsParty(NumConstant.ZERO_STR.equals(o.getIsParty())?StrConstant.NO:StrConstant.YES); + } + if (StringUtils.isNotBlank(o.getGender())){ + o.setGender(GenderEnum.getName(o.getGender())); + } + if (StringUtils.isNotBlank(o.getIsTenant())){ + o.setIsTenant(NumConstant.ZERO_STR.equals(o.getIsTenant())?StrConstant.NO:StrConstant.YES); + } + if (StringUtils.isNotBlank(o.getIsFloating())){ + o.setIsFloating(NumConstant.ZERO_STR.equals(o.getIsFloating())?StrConstant.NO:StrConstant.YES); + } + Map mzMap = dictResult.get(DictTypeEnum.NATION.getCode()); + Map whcdMap = dictResult.get(DictTypeEnum.EDUCATION.getCode()); + Map yhzgxMap = dictResult.get(DictTypeEnum.RELATIONSHIP.getCode()); + if (StringUtils.isNotBlank(o.getMz())) { + o.setMz(mzMap.get(o.getMz())); + } + if (StringUtils.isNotBlank(o.getCulture())) { + o.setCulture(whcdMap.get(o.getCulture())); + } + if (StringUtils.isNotBlank(o.getYhzgx())) { + o.setYhzgx(yhzgxMap.get(o.getYhzgx())); + } + if (StringUtils.isNotBlank(o.getHyzk())) { + o.setHyzk(hyzkMap.get(o.getHyzk())); + } + + }); + }); return listPage.getResult(); } + /** + * desc:根据字段值获取 options + * @param customerId + * @param columnName + * @return + */ + private Map getOptionMap(String customerId,String columnName) { + IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); + optionsForm.setCustomerId(customerId); + optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); + optionsForm.setColumnName(columnName); + Result> listResult = operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm); + if (!listResult.success()){ + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"获取item失败,"+listResult.getInternalMsg()); + } + return listResult.getData().stream() + .collect(Collectors.toMap(IcFormItemOptionsDTO::getOptionValue, IcFormItemOptionsDTO::getOptionLabel, (o1, o2) -> o1)); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java index 1272b57629..99a4817aa7 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/VolunteerServiceImpl.java @@ -69,7 +69,7 @@ public class VolunteerServiceImpl implements VolunteerService, ResultDataResolve IcFormOptionsQueryFormDTO optionsForm = new IcFormOptionsQueryFormDTO(); optionsForm.setCustomerId(customerId); optionsForm.setFormCode(IcFormCodeEnum.RESI_BASE_INFO.getCode()); - optionsForm.setLabel("志愿者类别"); + optionsForm.setColumnName("VOLUNTEER_CATEGORY"); String errorMsg = "【志愿者分布】查询志愿者图例失败"; List options = getResultDataOrThrowsException(operCustomizeOpenFeignClient.listOptionsByItemConditions(optionsForm), 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 4378ed3c3e..4e35245c8d 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 @@ -32,6 +32,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + insert into ${tableName} (