diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java new file mode 100644 index 0000000000..249a7d4c42 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBuildingListFormDTO.java @@ -0,0 +1,29 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * desc: 楼宇列表查询条件 + * + * @return + * @author LiuJanJun + * @date 2022/4/13 2:45 下午 + */ +@Data +public class IcBuildingListFormDTO extends PageFormDTO { + + private static final long serialVersionUID = -7536532648656861790L; + /** + * 小区ID + */ + private String neighborHoodId; + /** + * 房主姓名 + */ + private String ownerName; + /** + * 房主电话 + */ + private String ownerPhone; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java similarity index 98% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java index 879fd011c9..e476297ec6 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcBulidingAddFormDTO.java @@ -27,7 +27,7 @@ import java.io.Serializable; @Data -public class IcBulidingFormDTO implements Serializable { +public class IcBulidingAddFormDTO implements Serializable { private static final long serialVersionUID = 1L; @@ -126,4 +126,4 @@ public class IcBulidingFormDTO implements Serializable { -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java similarity index 98% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java index 5fe1c6c4db..b05d70d8aa 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseAddFormDTO.java @@ -26,7 +26,7 @@ import java.io.Serializable; @Data -public class IcHouseFormDTO implements Serializable { +public class IcHouseAddFormDTO implements Serializable { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java new file mode 100644 index 0000000000..7fdbf31cc5 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcHouseListFormDTO.java @@ -0,0 +1,69 @@ +package com.epmet.dto.form;/** + * Created by 11 on 2020/3/19. + */ + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +/** + * @Description 小区房屋列表查询条件 + * @ClassName ListCustomerGridFormDTO + * @Author wangc + * @date 2020.03.19 15:00 + */ +@Data +public class IcHouseListFormDTO extends PageFormDTO { + + private static final long serialVersionUID = -1L; + + /** + * 组织类别 + */ + private String level; + + private String id; + + + /** + * 组织ID + */ + private String agencyId; + private String pids; + private String gridId; + + /** + * 小区名字 + */ + private String neighborHoodName; + /** + * 楼栋名字 + */ + private String buildingName; + /** + * 房主姓名 + */ + private String ownerName; + /** + * 房主电话 + */ + private String ownerPhone; + /** + * 房屋状态 【1：出租 0：自住 2：闲置】 + */ + private String rentFlag; + /** + * 楼栋ID + */ + private String buildingId; + /** + * 小区ID + */ + private String neighborHoodId; + + /** + * 搜索关键词，社区查询，搜索输入的关键词 + */ + private String keyword; + + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java similarity index 97% rename from epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodFormDTO.java rename to epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java index 32eabb2ea6..65708da4d3 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodFormDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodAddFormDTO.java @@ -27,7 +27,7 @@ import javax.validation.constraints.NotBlank; @Data -public class IcNeighborHoodFormDTO extends PageFormDTO { +public class IcNeighborHoodAddFormDTO extends PageFormDTO { private static final long serialVersionUID = 1L; diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodListFormDTO.java new file mode 100644 index 0000000000..632cb1ea60 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/IcNeighborHoodListFormDTO.java @@ -0,0 +1,63 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

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

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

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + + +@Data +public class IcNeighborHoodListFormDTO extends PageFormDTO { + + private static final long serialVersionUID = 1L; + + /** + * 组织类别 + */ + @NotBlank(message = "组织类别不能为空") + private String level; + + /** + * orgId 跟level配套使用 + */ + @NotBlank(message = "组织Id不能为空") + private String id; + + + /** + * 组织ID + */ + private String agencyId; + private String pids; + private String gridId; + + + /** + * 房主姓名 + */ + private String ownerName; + /** + * 房主电话 + */ + private String ownerPhone; + + + +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java deleted file mode 100644 index 613ee6f3d2..0000000000 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.epmet.dto.form;/** - * Created by 11 on 2020/3/19. - */ - -import lombok.Data; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import java.io.Serializable; - -/** - * @Description 陌生人导览查询附近网格传参定义 - * @ClassName ListCustomerGridFormDTO - * @Author wangc - * @date 2020.03.19 15:00 - */ -@Data -public class ListIcNeighborHoodFormDTO implements Serializable{ - - private static final long serialVersionUID = -1L; - - - /** - * 当前页 - * */ - private Integer pageNo = 1; - - /** - * 每页显示数量 - * */ - private Integer pageSize = 20; - - /** - * 组织类别 - */ - private String level ; - - private String id; - - /** - * 组织ID - */ -// private String agencyId; - /** - * 网格ID - */ -// private String gridId; - /** - * 小区名字 - */ -// private String neighborHoodName; - /** - * 楼栋名字 - */ -// private String buildingName; - /** - * 房主姓名 - */ - private String ownerName; - /** - * 房主电话 - */ - private String ownerPhone; - /** - * 房屋状态 【1：出租 0：自住 2：闲置】 - */ - private String rentFlag; - /** - * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】 - */ -// @Pattern(regexp = "^(neighbourHood|building|house)?$",message = "数据类型选择错误") -// private String dataType; - /** - * 楼栋ID - */ - private String buildingId; - /** - * 小区ID - */ - private String neighborHoodId; - - /** - * 搜索关键词，社区查询，搜索输入的关键词 - */ - private String keyword; - - -} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseResultDTO.java deleted file mode 100644 index 58a07c8bbc..0000000000 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseResultDTO.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.epmet.dto.result; - -import lombok.Data; - -import java.io.Serializable; - -/** - * @Description - * @Author zhaoqifeng - * @Date 2021/10/25 16:58 - */ -@Data -public class HouseResultDTO implements Serializable { - private static final long serialVersionUID = 8054109017922254586L; - private String houseId; - private String houseName; -} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java new file mode 100644 index 0000000000..ebaf6ca58e --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcBuildingListResultDTO.java @@ -0,0 +1,35 @@ +package com.epmet.dto.result; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * desc:楼宇列表结果类 + * + * @author: LiuJanJun + * @date: 2022/4/13 2:28 下午 + * @version: 1.0 + */ +@NoArgsConstructor +@Data +public class IcBuildingListResultDTO extends PageFormDTO { + + private static final long serialVersionUID = -8277921228438123299L; + private String gridName; + private Integer totalHouseNum; + private String latitude; + private String agencyId; + private Integer sort; + private String agencyName; + private String buildingId; + private String buildingName; + private String buildingTypeKey; + private String neighborHoodId; + private String neighborHoodName; + private Integer totalFloorNum; + private String gridId; + private Integer totalUnitNum; + private String longitude; + private String buildingType; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java index 51b410eaa5..d775552bbf 100644 --- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcNeighborHoodResultDTO.java @@ -1,10 +1,8 @@ package com.epmet.dto.result; +import com.epmet.commons.tools.dto.form.PageFormDTO; import lombok.Data; - -import java.io.Serializable; -import java.util.List; -import java.util.Map; +import lombok.NoArgsConstructor; /** * @Description 网格列表信息 @@ -12,25 +10,22 @@ import java.util.Map; * @Author wangc * @date 2020.04.23 14:21 */ +@NoArgsConstructor @Data -public class IcNeighborHoodResultDTO implements Serializable { +public class IcNeighborHoodResultDTO extends PageFormDTO { private static final long serialVersionUID = 1L; - /** - * 总条数 - * */ - - private Integer total; - -// /** -// * 数据类型【小区：neighbourHood，楼栋：building，房屋：house】 -// * */ -// private String dataType; - - /** - * 结果集 - */ - private List> list; - + private String gridName; + private String address; + private String neighborHoodId; + private String neighborHoodName; + private String latitude; + private String remark; + private String agencyId; + private String location; + private String gridId; + private String propertyId; + private String agencyName; + private String longitude; } 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 6ca644bd31..2991258f53 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 @@ -26,6 +26,7 @@ import com.epmet.commons.tools.aop.NoRepeatSubmit; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -33,10 +34,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingUnitDao; import com.epmet.dto.BuildingTreeLevelDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.BuildingResultDTO; -import com.epmet.dto.result.BuildingResultPagedDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.result.*; import com.epmet.entity.IcBuildingUnitEntity; import com.epmet.excel.IcBuildingExcel; import com.epmet.feign.EpmetCommonServiceOpenFeignClient; @@ -75,19 +73,17 @@ public class BuildingController { @PostMapping("buildinglist") - public Result houseList(@RequestBody ListIcNeighborHoodFormDTO formDTO){ - //效验数据 - ValidatorUtils.validateEntity(formDTO); - IcNeighborHoodResultDTO icNeighborHoodResultDTO = buildingService.listBuilding(formDTO); + public Result> houseList(@RequestBody IcBuildingListFormDTO formDTO){ + PageData icNeighborHoodResultDTO = buildingService.listBuilding(formDTO); return new Result().ok(icNeighborHoodResultDTO); } @NoRepeatSubmit @PostMapping("buildingadd") - public Result buildingAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){ + public Result buildingAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingAddFormDTO formDTO){ //效验数据 - ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.AddShowGroup.class); + ValidatorUtils.validateEntity(formDTO, IcBulidingAddFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); buildingService.addBuilding(customerId,formDTO); return new Result().ok("保存成功"); @@ -95,9 +91,9 @@ public class BuildingController { @NoRepeatSubmit @PostMapping("buildingupdate") - public Result buildingUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){ + public Result buildingUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingAddFormDTO formDTO){ //效验数据 - ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.UpdateShowGroup.class); + ValidatorUtils.validateEntity(formDTO, IcBulidingAddFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; buildingService.updateBuilding(customerId,formDTO); @@ -105,9 +101,9 @@ public class BuildingController { } @PostMapping("buildingdel") - public Result buildingDel(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingFormDTO formDTO){ + public Result buildingDel(@LoginUser TokenDto tokenDTO, @RequestBody IcBulidingAddFormDTO formDTO){ //效验数据 - ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.DeleteGroup.class); + ValidatorUtils.validateEntity(formDTO, IcBulidingAddFormDTO.DeleteGroup.class); String buildingId = formDTO.getBuildingId(); buildingService.delBuilding(buildingId); return new Result(); @@ -137,7 +133,6 @@ public class BuildingController { */ @PostMapping("exporttemplate") public void exportTemplate( HttpServletResponse response) throws Exception { - TemplateExportParams templatePath = new TemplateExportParams("excel/building_template.xlsx"); Map map = new HashMap<>(); map.put("maplist",new ArrayList()); @@ -151,7 +146,7 @@ public class BuildingController { * @throws Exception */ @RequestMapping("exportbuildinginfo") - public void exportbuildinginfo(@RequestBody ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exportbuildinginfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { ValidatorUtils.validateEntity(formDTO); buildingService.exportBuildinginfo(formDTO,response); @@ -165,7 +160,7 @@ public class BuildingController { */ @GetMapping("export") public void export(HttpServletResponse response) throws Exception { - ListIcNeighborHoodFormDTO formDTO = new ListIcNeighborHoodFormDTO(); + IcHouseListFormDTO formDTO = new IcHouseListFormDTO(); ValidatorUtils.validateEntity(formDTO); buildingService.exportBuildinginfo(formDTO,response); 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 316ab3e12f..4b91e3f877 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 @@ -26,6 +26,7 @@ import com.epmet.commons.tools.constant.ServiceConstant; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.feign.ResultDataResolver; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -33,7 +34,7 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.IcBuildingDao; import com.epmet.dto.form.*; import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.dto.result.IcHouseListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.LoginUserDetailsResultDTO; import com.epmet.excel.IcHouseExcel; @@ -85,33 +86,25 @@ public class HouseController implements ResultDataResolver { @PostMapping("houselist") - public Result houseList(@RequestBody ListIcNeighborHoodFormDTO formDTO){ + public Result> houseList(@RequestBody IcHouseListFormDTO formDTO) { //效验数据 ValidatorUtils.validateEntity(formDTO); - - IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(), - formDTO.getOwnerPhone(), null, - null, - formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getId(),formDTO.getLevel(),formDTO.getRentFlag()); - return new Result().ok(icNeighborHoodResultDTO); + return new Result().ok(houseService.getHouseList(formDTO)); } /** - *@Description 社区查询-搜索房屋 - *@Author wangxianzhang - *@Date 2022/1/14 11:00 上午 - *@Param - *@return - */ + * @return + * @Description 社区查询-搜索房屋 + * @Author wangxianzhang + * @Date 2022/1/14 11:00 上午 + * @Param + */ @PostMapping("search") - public Result searchHouse(@RequestBody ListIcNeighborHoodFormDTO formDTO, @LoginUser TokenDto loginUser) { + public Result> searchHouse(@RequestBody IcHouseListFormDTO formDTO, @LoginUser TokenDto loginUser) { String keyword = formDTO.getKeyword(); if (StringUtils.isBlank(keyword)) { - IcNeighborHoodResultDTO r = new IcNeighborHoodResultDTO(); - r.setTotal(0); - r.setList(new ArrayList<>()); - return new Result().ok(r); + return new Result>().ok(new PageData<>(new ArrayList<>(), NumConstant.ZERO)); } keyword = keyword.trim(); @@ -135,50 +128,52 @@ public class HouseController implements ResultDataResolver { EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋】查询当前staff所在组织信息失败", null); - - IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(loginUserDetail.getAgencyId(),null, null, null, - neighborhoodName, buildingName, formDTO.getPageNo(), formDTO.getPageSize(),null,null,null); - - return new Result().ok(icNeighborHoodResultDTO); + formDTO.setAgencyId(loginUserDetail.getAgencyId()); + formDTO.setBuildingName(buildingName); + formDTO.setNeighborHoodName(neighborhoodName); + return new Result>().ok(houseService.getHouseList(formDTO)); } @NoRepeatSubmit @PostMapping("houseadd") - public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){ + public Result houseAdd(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO) { //效验数据 - ValidatorUtils.validateEntity(formDTO, IcHouseFormDTO.AddShowGroup.class); + ValidatorUtils.validateEntity(formDTO, IcHouseAddFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; - houseService.addHouse(customerId,formDTO); + houseService.addHouse(customerId, formDTO); return new Result(); } @NoRepeatSubmit @PostMapping("houseupdate") - public Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseFormDTO formDTO){ + public Result houseUpdate(@LoginUser TokenDto tokenDTO, @RequestBody IcHouseAddFormDTO formDTO) { //效验数据 - ValidatorUtils.validateEntity(formDTO, IcHouseFormDTO.UpdateShowGroup.class); + ValidatorUtils.validateEntity(formDTO, IcHouseAddFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; - houseService.updateHouse(customerId,formDTO); + houseService.updateHouse(customerId, formDTO); return new Result(); } /** * lzh + * * @param formDTO * @return 单独删除房屋内部调用/gov/org/house/delete */ @PostMapping("housedel") - public Result houseDel(@RequestBody IcHouseFormDTO formDTO){ + public Result houseDel(@RequestBody IcHouseAddFormDTO formDTO) { //效验数据 - ValidatorUtils.validateEntity(formDTO, IcNeighborHoodFormDTO.DeleteGroup.class); + ValidatorUtils.validateEntity(formDTO, IcNeighborHoodAddFormDTO.DeleteGroup.class); houseService.delHouse(formDTO.getHouseId()); return new Result(); } + /** * 导出模板 + * * @param response * @throws Exception */ @@ -186,26 +181,29 @@ public class HouseController implements ResultDataResolver { public void exportTemplate(HttpServletResponse response) throws Exception { // ValidatorUtils.validateEntity(ListIcNeighborHoodFormDTO.class); TemplateExportParams templatePath = new TemplateExportParams("excel/house_template.xlsx"); - Map map = new HashMap<>(); - map.put("maplist",new ArrayList()); - ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response); + Map map = new HashMap<>(); + map.put("maplist", new ArrayList()); + ExcelPoiUtils.exportExcel(templatePath, map, "房屋信息录入表", response); } + /** * 导出 + * * @param formDTO * @param response * @throws Exception */ @RequestMapping("exporthouseinfo") - public void exporthouseinfo(@RequestBody ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exporthouseinfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { ValidatorUtils.validateEntity(formDTO); - houseService.exportBuildinginfo(formDTO,response); + houseService.exportBuildinginfo(formDTO, response); } /** * 导入数据 + * * @param file * @return * @throws IOException @@ -222,34 +220,34 @@ public class HouseController implements ResultDataResolver { //存放错误数据行号 List numList = new ArrayList<>(); - if(!CollectionUtils.isEmpty(failList)){ - for ( IcHouseExcel entity : failList) { - log.warn("第{}行,{}",entity.getRowNum(),entity.getErrorMsg());//打印失败的行 和失败的信息 + if (!CollectionUtils.isEmpty(failList)) { + for (IcHouseExcel entity : failList) { + log.warn("第{}行,{}", entity.getRowNum(), entity.getErrorMsg());//打印失败的行 和失败的信息 numList.add(entity.getRowNum()); } } - List result =importResult.getList(); + List result = importResult.getList(); - List resultList = houseService.importExcel(customerId,result,tokenDTO.getUserId(),numList); - String str = String.format("共%s条，成功导入%s条。",numList.size()+result.size(),numList.size()+result.size()-resultList.size()); - if(resultList.size()> NumConstant.ZERO){ + List resultList = houseService.importExcel(customerId, result, tokenDTO.getUserId(), numList); + String str = String.format("共%s条，成功导入%s条。", numList.size() + result.size(), numList.size() + result.size() - resultList.size()); + if (resultList.size() > NumConstant.ZERO) { Collections.sort(resultList); String subList = resultList.stream().map(String::valueOf).collect(Collectors.joining("、")); log.warn(str + "第" + subList + "行未成功！"); - return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str+"第"+subList+"行未成功！"); + return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str + "第" + subList + "行未成功！"); } return new Result().ok(str); } - @PostMapping( "queryListHouseInfo") - Result> queryListHouseInfo(@RequestBody Set houseIds, @RequestParam("customerId") String customerId){ - return new Result>().ok(houseService.queryListHouseInfo(houseIds,customerId)); + @PostMapping("queryListHouseInfo") + Result> queryListHouseInfo(@RequestBody Set houseIds, @RequestParam("customerId") String customerId) { + return new Result>().ok(houseService.queryListHouseInfo(houseIds, customerId)); } @PostMapping("houseimport") public Result houseImport(@LoginUser TokenDto tokenDTO, @RequestParam("file") MultipartFile file, - @RequestParam("orgId")String orgId, - @RequestParam("orgType")String orgType,HttpServletRequest multipartRequest){ + @RequestParam("orgId") String orgId, + @RequestParam("orgType") String orgType, HttpServletRequest multipartRequest) { ImportInfoFormDTO formDTO = new ImportInfoFormDTO(); formDTO.setCustomerId(tokenDTO.getCustomerId()); formDTO.setOrgType(orgType); @@ -260,32 +258,33 @@ public class HouseController implements ResultDataResolver { importFormDTO.setOperatorId(formDTO.getUserId()); importFormDTO.setOriginFileName(file.getOriginalFilename()); Result importTask = epmetCommonServiceOpenFeignClient.createImportTask(importFormDTO); - if (!importTask.success()){ - throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"","存在进行中的导入"); + if (!importTask.success()) { + throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "", "存在进行中的导入"); } InputStream inputStream = null; try { inputStream = file.getInputStream(); - }catch (Exception e){ + } catch (Exception e) { ImportTaskCommonFormDTO input = new ImportTaskCommonFormDTO(); input.setOperatorId(formDTO.getUserId()); input.setTaskId(importTask.getData().getTaskId()); input.setProcessStatus(ImportTaskConstants.PROCESS_STATUS_FINISHED_FAIL); epmetCommonServiceOpenFeignClient.finishImportTask(input); - log.error("读取文件失败",e); + log.error("读取文件失败", e); } - houseService.dispose(inputStream,formDTO,importTask); + houseService.dispose(inputStream, formDTO, importTask); return new Result<>(); } /** * Desc 小区管理中批量删除 + * * @param formDTO * @author zxc * @date 2022/3/1 4:57 下午 */ @PostMapping("delete") - public Result allDelete(@RequestBody NeighborHoodManageDelFormDTO formDTO){ + public Result allDelete(@RequestBody NeighborHoodManageDelFormDTO formDTO) { ValidatorUtils.validateEntity(formDTO, NeighborHoodManageDelFormDTO.NeighborHoodManageDelForm.class); houseService.allDelete(formDTO); return new Result(); @@ -293,14 +292,15 @@ public class HouseController implements ResultDataResolver { /** * 获取房屋信息 + * * @param houseId * @return */ @PostMapping("gethouseinfo/{houseId}") - public Result getHouseInfo(@LoginUser TokenDto tokenDto,@PathVariable("houseId") String houseId){ - if(StringUtils.isBlank(houseId)){ + public Result getHouseInfo(@LoginUser TokenDto tokenDto, @PathVariable("houseId") String houseId) { + if (StringUtils.isBlank(houseId)) { return new Result<>(); } - return new Result().ok(houseService.getHouseInfoDTO(tokenDto.getCustomerId(),houseId)); + return new Result().ok(houseService.getHouseInfoDTO(tokenDto.getCustomerId(), houseId)); } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java index 49c42ab117..cb1a14ce10 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcNeighborHoodController.java @@ -35,7 +35,7 @@ import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.constants.ImportTaskConstants; import com.epmet.dto.IcNeighborHoodDTO; -import com.epmet.dto.form.IcNeighborHoodFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; @@ -80,7 +80,7 @@ public class IcNeighborHoodController { } @PostMapping("open/list") - public Result> openList(@RequestBody IcNeighborHoodFormDTO params){ + public Result> openList(@RequestBody IcNeighborHoodAddFormDTO params){ PageData page = icNeighborHoodService.openPage(params); return new Result>().ok(page); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java index da7f783c1e..5c813ea6a8 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/NeighborHoodController.java @@ -28,9 +28,9 @@ import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.dao.IcBuildingDao; -import com.epmet.dto.form.IcNeighborHoodFormDTO; -import com.epmet.dto.form.ListIcNeighborHoodFormDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; +import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.entity.IcBuildingEntity; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.service.BuildingService; @@ -77,48 +77,45 @@ public class NeighborHoodController { @PostMapping("neighborhoodlist") - public Result neighborhoodlist(@RequestBody ListIcNeighborHoodFormDTO formDTO){ + public Result neighborhoodlist(@RequestBody IcNeighborHoodListFormDTO formDTO){ //效验数据 ValidatorUtils.validateEntity(formDTO); - IcNeighborHoodResultDTO icNeighborHoodResultDTO = neighborHoodService.listNeighborhood(formDTO); - return new Result().ok(icNeighborHoodResultDTO); + return new Result().ok(neighborHoodService.listNeighborhood(formDTO)); } @NoRepeatSubmit @PostMapping("neighborhoodadd") - public Result neighborhoodadd(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodFormDTO formDTO){ + public Result neighborhoodadd(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodAddFormDTO formDTO){ //效验数据 - ValidatorUtils.validateEntity(formDTO, IcNeighborHoodFormDTO.AddShowGroup.class); + ValidatorUtils.validateEntity(formDTO, IcNeighborHoodAddFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - - neighborHoodService.AddNeighborhood(customerId,formDTO); + neighborHoodService.addNeighborhood(customerId,formDTO); return new Result(); } @NoRepeatSubmit @PostMapping("neighborhoodupdate") - public Result neighborhoodupdate(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodFormDTO formDTO){ + public Result neighborhoodupdate(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodAddFormDTO formDTO){ //效验数据 - ValidatorUtils.validateEntity(formDTO, IcNeighborHoodFormDTO.UpdateShowGroup.class); + ValidatorUtils.validateEntity(formDTO, IcNeighborHoodAddFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; - neighborHoodService.UpdateNeighborhood(customerId,formDTO); + neighborHoodService.updateNeighborhood(customerId,formDTO); return new Result(); } @PostMapping("neighborhooddel") - public Result neighborhooddel(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodFormDTO formDTO){ + public Result neighborhooddel(@LoginUser TokenDto tokenDTO, @RequestBody IcNeighborHoodAddFormDTO formDTO){ //效验数据 - ValidatorUtils.validateEntity(formDTO, IcNeighborHoodFormDTO.DeleteGroup.class); + ValidatorUtils.validateEntity(formDTO, IcNeighborHoodAddFormDTO.DeleteGroup.class); String neighborHoodId = formDTO.getNeighborHoodId(); //判断是否存在楼宇，如果存在不能删除 List icBuildingEntities = icBuildingDao.selectList(new QueryWrapper().lambda().eq(IcBuildingEntity::getNeighborHoodId, neighborHoodId)); if(!CollectionUtils.isEmpty(icBuildingEntities)){ return new Result().error(8001,"小区下已存在楼宇，无法删除"); } - neighborHoodService.DelNeighborhood(neighborHoodId); + neighborHoodService.delNeighborhood(neighborHoodId); return new Result().ok("删除成功"); } @@ -130,7 +127,7 @@ public class NeighborHoodController { * @throws Exception */ @PostMapping("exportneighborhoodinfo") - public void exportneighborhoodinfo(@RequestBody ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exportneighborhoodinfo(@RequestBody IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { ValidatorUtils.validateEntity(formDTO); neighborHoodService.exportNeighborhoodinfo(formDTO,response); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java index 780e489e21..5c87d4ec46 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcBuildingDao.java @@ -20,10 +20,8 @@ package com.epmet.dao; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; -import com.epmet.dto.result.BaseInfoFamilyBuildingResultDTO; -import com.epmet.dto.result.BuildingResultDTO; -import com.epmet.dto.result.ExistHouseInfoResultDTO; -import com.epmet.dto.result.UpdateBuildingHouseNumResultDTO; +import com.epmet.dto.form.IcBuildingListFormDTO; +import com.epmet.dto.result.*; import com.epmet.entity.CustomerAgencyEntity; import com.epmet.entity.IcBuildingEntity; import com.epmet.entity.IcHouseEntity; @@ -45,16 +43,9 @@ import java.util.Set; @Mapper public interface IcBuildingDao extends BaseDao { -// IPage> searchBuildingByPage(IPage page, -// @Param("neighbor") IcNeighborHoodEntity neighbor, -// @Param("building")IcBuildingEntity building); - IPage> searchBuildingByPage(IPage page, - @Param("building")IcBuildingEntity building, @Param("house") IcHouseEntity house); -// List searchAllBuilding(@Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper, -// @Param("ew1") QueryWrapper buildingEntityQueryWrapper); -// List searchAllBuilding(@Param("neighbor") IcNeighborHoodEntity neighbor, -// @Param("building")IcBuildingEntity building); + List searchBuildingByPage(IcBuildingListFormDTO formDTO); + List searchAllBuilding( @Param("building")IcBuildingEntity building, @Param("house")IcHouseEntity house); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java index 6841d60ce3..4e8353d993 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseDao.java @@ -1,10 +1,11 @@ package com.epmet.dao; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.dto.ImportGeneralDTO; +import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HousesNameResultDTO; +import com.epmet.dto.result.IcHouseListResultDTO; import com.epmet.dto.result.NeighborHoodManageDelResultDTO; import com.epmet.entity.IcHouseEntity; import com.epmet.excel.IcHouseExcel; @@ -12,7 +13,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; import java.util.Set; /** @@ -24,16 +24,7 @@ import java.util.Set; @Mapper public interface IcHouseDao extends BaseDao { - IPage> searchHouseByPage(IPage page, - @Param("pids") String pids, - @Param("buildingId") String buildingId, - @Param("ownerName") String ownerName, - @Param("ownerPhone") String ownerPhone, - @Param("neighborHoodName") String neighborHoodName, - @Param("buildingName") String buildingName, - @Param("id")String id, - @Param("level")String level, - @Param("rentFlag")String rentFlag); + List searchHouseByPage(IcHouseListFormDTO formDTO); List searchAllHouse(@Param("house") IcHouseEntity house); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java index 43b6aedaf5..8189d0638b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcNeighborHoodDao.java @@ -17,8 +17,9 @@ package com.epmet.dao; -import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.entity.IcHouseEntity; import com.epmet.entity.IcNeighborHoodEntity; import com.epmet.excel.IcNeighborHoodExcel; @@ -26,7 +27,6 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; -import java.util.Map; /** * 小区表 @@ -38,7 +38,7 @@ import java.util.Map; public interface IcNeighborHoodDao extends BaseDao { // IPage> searchNeighborhoodByPage(IPage page,@Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper); - IPage> searchNeighborhoodByPage(IPage page, @Param("neighbor") IcNeighborHoodEntity neighbor, @Param("house")IcHouseEntity house); + List searchNeighborhoodByPage(IcNeighborHoodListFormDTO formDTO); // List searchAllNeighborhood(@Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper); List searchAllNeighborhood(@Param("neighbor") IcNeighborHoodEntity neighbor, @Param("house")IcHouseEntity house); @@ -61,4 +61,4 @@ public interface IcNeighborHoodDao extends BaseDao { */ List selectNeighborhoodNameByNames(@Param("names")List names,@Param("customerId") String customerId); -} \ 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 d5d1dd7903..1188cbf306 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 @@ -17,14 +17,16 @@ 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.form.IcBulidingFormDTO; +import com.epmet.dto.form.IcBuildingListFormDTO; +import com.epmet.dto.form.IcBulidingAddFormDTO; +import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; -import com.epmet.dto.form.ListIcNeighborHoodFormDTO; import com.epmet.dto.result.BuildingResultDTO; import com.epmet.dto.result.BuildingResultPagedDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.dto.result.IcBuildingListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcBuildingExcel; @@ -45,7 +47,7 @@ public interface BuildingService { - void updateBuilding(String customerId, IcBulidingFormDTO formDTO); + void updateBuilding(String customerId, IcBulidingAddFormDTO formDTO); /** * 删除小区 @@ -54,16 +56,16 @@ public interface BuildingService { void delBuilding(String buildingId); - void addBuilding(String customerId, IcBulidingFormDTO formDTO); + void addBuilding(String customerId, IcBulidingAddFormDTO formDTO); List treeList(String customerId, String staffId); List treeIds(String customerId, String staffId); List importExcel(String customerId, List list, String staffId, List numList); - IcNeighborHoodResultDTO listBuilding(ListIcNeighborHoodFormDTO formDTO); + PageData listBuilding(IcBuildingListFormDTO formDTO); - void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception ; + void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception ; List buildingListByIds(List buildingIdList); 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 0173311c8b..2dae6def56 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 @@ -17,13 +17,14 @@ package com.epmet.service; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.form.IcHouseFormDTO; +import com.epmet.dto.form.IcHouseAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; -import com.epmet.dto.form.ListIcNeighborHoodFormDTO; +import com.epmet.dto.form.IcHouseListFormDTO; import com.epmet.dto.form.NeighborHoodManageDelFormDTO; import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.dto.result.IcHouseListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.excel.IcHouseExcel; @@ -40,10 +41,10 @@ import java.util.Set; */ public interface HouseService { - void addHouse(String customerId, IcHouseFormDTO formDTO); + void addHouse(String customerId, IcHouseAddFormDTO formDTO); - void updateHouse(String customerId, IcHouseFormDTO formDTO); + void updateHouse(String customerId, IcHouseAddFormDTO formDTO); /** * 删除小区 @@ -54,19 +55,9 @@ public interface HouseService { List importExcel(String customerId, List list, String staffId, List numList); - IcNeighborHoodResultDTO listNeighborhood(String ancestorAgencyId, - String buildingId, - String ownerName, - String ownerPhone, - String neighborHoodName, - String buildingName, - Integer pageNo, - Integer pageSize, - String id, - String level, - String rentFlag); - - void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception; + PageData getHouseList(IcHouseListFormDTO formDTO); + + void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception; List queryListHouseInfo(Set houseIds, String customerId); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java index 3dcfaba0da..fb97d3add3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcNeighborHoodService.java @@ -23,7 +23,7 @@ import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.ImportGeneralDTO; -import com.epmet.dto.form.IcNeighborHoodFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.entity.IcNeighborHoodEntity; @@ -154,5 +154,5 @@ public interface IcNeighborHoodService extends BaseService * @param params * @return */ - PageData openPage(IcNeighborHoodFormDTO params); + PageData openPage(IcNeighborHoodAddFormDTO params); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java index ff1a35f45a..7f6b814440 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/NeighborHoodService.java @@ -17,9 +17,10 @@ package com.epmet.service; -import com.epmet.dto.form.IcNeighborHoodFormDTO; -import com.epmet.dto.form.ListIcNeighborHoodFormDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.commons.tools.page.PageData; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; +import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.excel.IcNeighborHoodExcel; import javax.servlet.http.HttpServletResponse; @@ -33,24 +34,24 @@ import java.util.List; */ public interface NeighborHoodService{ - void AddNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO); + void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO); - IcNeighborHoodResultDTO listNeighborhood(ListIcNeighborHoodFormDTO formDTO); + PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO); - void UpdateNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO); + void updateNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO); /** * 删除小区 * @param neighborHoodId */ - void DelNeighborhood(String neighborHoodId); + void delNeighborhood(String neighborHoodId); /** * 导出数据 * @param formDTO * @param response */ - void exportNeighborhoodinfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception ; + void exportNeighborhoodinfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception ; List importExcel(String customerId, List list, String staffId, List numList); -} \ No newline at end of file +} 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 4649e18546..8bde9b9cff 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 @@ -14,6 +14,7 @@ import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -21,14 +22,8 @@ import com.epmet.constants.ImportTaskConstants; import com.epmet.dao.*; import com.epmet.dto.BuildingTreeLevelDTO; import com.epmet.dto.IcBuildingDTO; -import com.epmet.dto.form.IcBulidingFormDTO; -import com.epmet.dto.form.ImportInfoFormDTO; -import com.epmet.dto.form.ImportTaskCommonFormDTO; -import com.epmet.dto.form.ListIcNeighborHoodFormDTO; -import com.epmet.dto.result.BuildingResultDTO; -import com.epmet.dto.result.BuildingResultPagedDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; -import com.epmet.dto.result.ImportTaskCommonResultDTO; +import com.epmet.dto.form.*; +import com.epmet.dto.result.*; import com.epmet.entity.*; import com.epmet.enums.BuildingTypeEnums; import com.epmet.excel.IcBuildingExcel; @@ -38,6 +33,8 @@ import com.epmet.model.ImportBuildingInfoListener; import com.epmet.redis.IcHouseRedis; import com.epmet.service.*; import com.epmet.util.ExcelPoiUtils; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -93,7 +90,7 @@ public class BuildingServiceImpl implements BuildingService { @Override @Transactional(rollbackFor = Exception.class) - public void addBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void addBuilding(String customerId, IcBulidingAddFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),null); if (null != count && count > 0) { @@ -386,25 +383,19 @@ public class BuildingServiceImpl implements BuildingService { //4.新增单元 icBuildingService.insertBatch(buildingEntityList); icBuildingUnitService.insertBatch(icBuildingUnitEntityList); - - /* if(!"".equals(str)){ - return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str.append("不存在").toString()); - }*/ return numList; } @Override - public IcNeighborHoodResultDTO listBuilding(ListIcNeighborHoodFormDTO formDTO) { - - IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); - IPage> resultMap = searchBuilding(formDTO); - result.setTotal(Long.valueOf(resultMap.getTotal()).intValue()); - result.setList(resultMap.getRecords()); - return result; + public PageData listBuilding(IcBuildingListFormDTO formDTO) { + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); + List records = pageInfo.getList(); + records.forEach(item-> item.setBuildingType( BuildingTypeEnums.getTypeValue(item.getBuildingTypeKey()))); + return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); } @Override - public void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { //如果类型是building 查楼栋 //导出楼栋 List icBuildingExcels = searchAllBuilding(formDTO); @@ -467,7 +458,7 @@ public class BuildingServiceImpl implements BuildingService { return new Result<>(); } - private List searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) { + private List searchAllBuilding(IcHouseListFormDTO formDTO) { // QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); // neighborHoodEntityQueryWrapper.lambda() @@ -492,21 +483,6 @@ public class BuildingServiceImpl implements BuildingService { return icBuildingExcels; } - private IPage> searchBuilding(ListIcNeighborHoodFormDTO formDTO) { - IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); - - IcBuildingEntity building = ConvertUtils.sourceToTarget(formDTO, IcBuildingEntity.class); - building.setDelFlag("0"); - - IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); - IPage> mapIPage = icBuildingDao.searchBuildingByPage(page, building, house); - List> records = mapIPage.getRecords(); - records.forEach(item->{ - item.put("buildingType", BuildingTypeEnums.getTypeValue(item.get("buildingTypeKey"))); - }); - return mapIPage; - } - private List covertToTree(CustomerAgencyEntity customerAgency,List agencyList) { BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO(); @@ -545,7 +521,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override @Transactional(rollbackFor = Exception.class) - public void updateBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void updateBuilding(String customerId, IcBulidingAddFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),formDTO.getBuildingId()); if (null != count && count > 0) { 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 4d713a912a..6fb7e02db6 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,8 +4,6 @@ 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.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.tools.constant.NumConstant; import com.epmet.commons.tools.constant.StrConstant; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; @@ -14,6 +12,7 @@ import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.EpmetException; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.feign.ResultDataResolver; +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; @@ -33,7 +32,7 @@ import com.epmet.dto.IcBuildingUnitDTO; import com.epmet.dto.IcHouseDTO; import com.epmet.dto.form.*; import com.epmet.dto.result.HouseInfoDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.dto.result.IcHouseListResultDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.dto.result.NeighborHoodManageDelResultDTO; import com.epmet.entity.IcHouseEntity; @@ -49,6 +48,8 @@ import com.epmet.model.ImportHouseInfoListener; import com.epmet.redis.IcHouseRedis; import com.epmet.service.*; import com.epmet.util.ExcelPoiUtils; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -102,7 +103,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { @Override @Transactional(rollbackFor = Exception.class) - public void addHouse(String customerId, IcHouseFormDTO formDTO) { + public void addHouse(String customerId, IcHouseAddFormDTO formDTO) { //同一楼栋，单元内，房屋名称唯一 Integer count = icHouseDao.checkDoorNameUq(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(), formDTO.getDoorName(),null); if (null != count && count > 0) { @@ -116,7 +117,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { icHouseService.save(icHouseDTO); } - private String getHouseName(IcHouseFormDTO formDTO){ + private String getHouseName(IcHouseAddFormDTO formDTO){ //设置房间名 楼栋-单元号-门牌号 IcBuildingDTO icBuilding = icBuildingService.get(formDTO.getBuildingId()); IcBuildingUnitDTO icBuildingUnit = icBuildingUnitService.get(formDTO.getBuildingUnitId()); @@ -133,7 +134,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { */ @Override @Transactional(rollbackFor = Exception.class) - public void updateHouse(String customerId, IcHouseFormDTO formDTO) { + public void updateHouse(String customerId, IcHouseAddFormDTO formDTO) { //同一楼栋，单元内，房屋名称唯一 Integer count = icHouseDao.checkDoorNameUq(formDTO.getNeighborHoodId(), formDTO.getBuildingId(), formDTO.getBuildingUnitId(),formDTO.getDoorName(), formDTO.getHouseId()); if (null != count && count > 0) { @@ -251,37 +252,27 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } @Override - public IcNeighborHoodResultDTO listNeighborhood(String ancestorAgencyId, - String buildingId, - String ownerName, - String ownerPhone, - String neighborHoodName, - String buildingName, - Integer pageNo, - Integer pageSize, - String id,String level, String rentFlag) { - IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); + public PageData getHouseList(IcHouseListFormDTO formDTO) { + // 查询pids String pids = null; - if (StringUtils.isNotBlank(ancestorAgencyId)) { - pids = getPids(ancestorAgencyId); + if (StringUtils.isNotBlank(formDTO.getAgencyId())) { + pids = getPids(formDTO.getAgencyId()); } - if (StringUtils.isNotBlank(level) && OrgTypeEnum.AGENCY.getCode().equals(level)){ - pids = getPids(ancestorAgencyId); + if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())){ + pids = getPids(formDTO.getAgencyId()); } + formDTO.setPids(pids); - IPage page = new Page(pageNo,pageSize); - - IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName,id,level,rentFlag); - List> records = mapIPage.getRecords(); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> + icHouseDao.searchHouseByPage(formDTO)); + List records = pageInfo.getList(); records.forEach(item->{ - item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey"))); - item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey"))); + item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey())); + item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey())); }); - result.setTotal(Long.valueOf(mapIPage.getTotal()).intValue()); - result.setList(records); - return result; + return new PageData<>(records,pageInfo.getTotal()); } public String getPids(String agencyId){ String pids = null; @@ -301,7 +292,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { } @Override - public void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { //如果类型是house 查房屋 //导出房屋 @@ -313,7 +304,7 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { return ; } - private List searchAllHouse(ListIcNeighborHoodFormDTO formDTO) { + private List searchAllHouse(IcHouseListFormDTO formDTO) { //IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); // diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java index 4a813c32a8..5be5d81697 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java @@ -48,7 +48,7 @@ import com.epmet.dao.IcBuildingDao; import com.epmet.dao.IcNeighborHoodDao; import com.epmet.dao.IcPropertyManagementDao; import com.epmet.dto.*; -import com.epmet.dto.form.IcNeighborHoodFormDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; import com.epmet.dto.form.ImportInfoFormDTO; import com.epmet.dto.form.ImportTaskCommonFormDTO; import com.epmet.dto.result.ImportTaskCommonResultDTO; @@ -689,7 +689,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl openPage(IcNeighborHoodFormDTO params) { + public PageData openPage(IcNeighborHoodAddFormDTO params) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(IcNeighborHoodEntity::getAgencyId,params.getAgencyId()); PageData result = null; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index 0aeca0d13b..f79f02204c 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -2,12 +2,11 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.enums.OrgTypeEnum; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; +import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.redis.common.CustomerStaffRedis; import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; @@ -16,9 +15,9 @@ import com.epmet.dao.*; import com.epmet.dto.CustomerAgencyDTO; import com.epmet.dto.IcNeighborHoodDTO; import com.epmet.dto.IcNeighborHoodPropertyDTO; -import com.epmet.dto.form.IcNeighborHoodFormDTO; -import com.epmet.dto.form.ListIcNeighborHoodFormDTO; -import com.epmet.dto.result.IcNeighborHoodResultDTO; +import com.epmet.dto.form.IcNeighborHoodAddFormDTO; +import com.epmet.dto.form.IcHouseListFormDTO; +import com.epmet.dto.form.IcNeighborHoodListFormDTO; import com.epmet.entity.*; import com.epmet.excel.IcNeighborHoodExcel; import com.epmet.feign.GovOrgOpenFeignClient; @@ -26,6 +25,8 @@ import com.epmet.service.IcNeighborHoodPropertyService; import com.epmet.service.IcNeighborHoodService; import com.epmet.service.NeighborHoodService; import com.epmet.util.ExcelPoiUtils; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -72,7 +73,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { @Override @Transactional(rollbackFor = Exception.class) - public void AddNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO) { + public void addNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO) { //同一网格下，小区名称唯一 Integer count = icNeighborHoodDao.checkNameUq(formDTO.getGridId(),formDTO.getNeighborHoodName(),null); if (null != count && count > 0) { @@ -105,45 +106,19 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { /** * 查询 * @param formDTO + * @return */ @Override - public IcNeighborHoodResultDTO listNeighborhood(ListIcNeighborHoodFormDTO formDTO) { - String level = formDTO.getLevel(); - Integer pageNo = formDTO.getPageNo(); - Integer pageSize = formDTO.getPageSize(); - - - - IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO(); - - IPage> resultMap = searchNeighborhood(formDTO); - result.setTotal(Long.valueOf(resultMap.getTotal()).intValue()); - result.setList(resultMap.getRecords()); - - return result; - - } - - - - - - - private IPage> searchNeighborhood(ListIcNeighborHoodFormDTO formDTO) { - - IPage page = new Page(formDTO.getPageNo(),formDTO.getPageSize()); - - IcNeighborHoodEntity neighbor = ConvertUtils.sourceToTarget(formDTO, IcNeighborHoodEntity.class); - IcHouseEntity house = ConvertUtils.sourceToTarget(formDTO, IcHouseEntity.class); - neighbor.setDelFlag("0"); + public PageData listNeighborhood(IcNeighborHoodListFormDTO formDTO) { if(NeighborhoodConstant.GRID.equals(formDTO.getLevel())){ //根据网格过滤 - neighbor.setGridId(formDTO.getId()); + formDTO.setGridId(formDTO.getId()); }else{ //根据组织过滤 - neighbor.setAgencyId(formDTO.getId()); + formDTO.setAgencyId(formDTO.getId()); } - return icNeighborHoodDao.searchNeighborhoodByPage(page, neighbor,house); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); + return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); } /** @@ -153,7 +128,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { */ @Override @Transactional(rollbackFor = Exception.class) - public void UpdateNeighborhood(String customerId, IcNeighborHoodFormDTO formDTO) { + public void updateNeighborhood(String customerId, IcNeighborHoodAddFormDTO formDTO) { //同一客户下，小区名称唯一 Integer count = icNeighborHoodDao.checkNameUq(formDTO.getGridId(),formDTO.getNeighborHoodName(),formDTO.getNeighborHoodId()); if (null != count && count > 0) { @@ -203,7 +178,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { */ @Override @Transactional(rollbackFor = Exception.class) - public void DelNeighborhood(String neighborHoodId) { + public void delNeighborhood(String neighborHoodId) { //删除小区 icNeighborHoodService.deleteById(neighborHoodId); //删除小区物业关联 @@ -220,7 +195,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { * @param response */ @Override - public void exportNeighborhoodinfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception { + public void exportNeighborhoodinfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception { //导出小区 List icNeighborHoodExcels = searchAllNeighborhood(formDTO); // ExcelUtils.exportExcelToTarget(response, "小区信息录入表", icNeighborHoodExcels, IcNeighborHoodExcel.class); @@ -336,7 +311,7 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { - private List searchAllNeighborhood(ListIcNeighborHoodFormDTO formDTO) { + private List searchAllNeighborhood(IcHouseListFormDTO formDTO) { // QueryWrapper neighborHoodEntityQueryWrapper = new QueryWrapper<>(); // neighborHoodEntityQueryWrapper.lambda() // .eq(!StringUtils.isEmpty(formDTO.getAgencyId()),IcNeighborHoodEntity::getAgencyId,formDTO.getAgencyId()) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export.xlsx index 9460a651da..815e222273 100644 Binary files a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export.xlsx and b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_export.xlsx differ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx index 027f37bcad..0f58eff1d8 100644 Binary files a/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx and b/epmet-module/gov-org/gov-org-server/src/main/resources/excel/house_template.xlsx differ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index 37839f8e82..d4561898a7 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -64,7 +64,7 @@ --> - select a.BUILDING_NAME as buildingName, b.NEIGHBOR_HOOD_NAME as neighborHoodName, @@ -86,30 +86,25 @@ LEFT JOIN ic_neighbor_hood b on a.NEIGHBOR_HOOD_ID = b.ID and b.DEL_FLAG='0' left join customer_agency c on b.AGENCY_ID = c.ID and c.DEL_FLAG='0' - left join customer_grid d on b.GRID_ID = d.ID and d.DEL_FLAG='0' - - AND a.NEIGHBOR_HOOD_ID = #{building.neighborHoodId} + + AND a.NEIGHBOR_HOOD_ID = #{neighborHoodId} - - + AND a.ID in (select distinct BUILDING_ID from ic_house e - - AND e.OWNER_NAME = #{house.ownerName} + + AND e.OWNER_NAME = #{ownerName} - - AND e.OWNER_PHONE = #{house.ownerPhone} + + AND e.OWNER_PHONE = #{ownerPhone} and e.DEL_FLAG='0' ) - - - AND a.DEL_FLAG = #{building.delFlag} - + AND a.DEL_FLAG = '0' order by a.CREATED_TIME, a.BUILDING_NAME 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 b2b6b99b29..b1d5a5161a 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 @@ -70,7 +70,7 @@ ) - select a.HOUSE_NAME as houseName, c.NEIGHBOR_HOOD_NAME as neighborHoodName, @@ -138,7 +138,7 @@ and a.del_flag = '0' - /*排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序*/ + #排序规则：根据小区、楼栋、单元、门牌号(分别按照数字和中文)分别升序排序 ORDER BY CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), CONVERT(b.BUILDING_NAME USING gbk), CONVERT(d.UNIT_NAME USING gbk), @@ -176,6 +176,11 @@ AND a.DEL_FLAG = #{house.delFlag} + ORDER BY CONVERT(c.NEIGHBOR_HOOD_NAME using gbk), + CONVERT(b.BUILDING_NAME USING gbk), + CONVERT(d.UNIT_NAME USING gbk), + CAST(a.DOOR_NAME AS SIGNED), + CONVERT(a.DOOR_NAME using gbk) diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml index acc02135cf..e36c72ca8f 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcNeighborHoodDao.xml @@ -57,54 +57,48 @@ --> - select - a.id as neighborHoodId, - a.NEIGHBOR_HOOD_NAME as neighborHoodName, - b.ORGANIZATION_NAME as agencyName, - c.GRID_NAME as gridName, - a.ADDRESS as address, - a.REMARK as remark, - b.ID as agencyId, - c.ID as gridId, - d.PROPERTY_ID as propertyId , - a.LOCATION as location, - a.LONGITUDE as longitude, - a.LATITUDE as latitude + a.id as neighborHoodId, + a.NEIGHBOR_HOOD_NAME as neighborHoodName, + b.ORGANIZATION_NAME as agencyName, + c.GRID_NAME as gridName, + a.ADDRESS as address, + a.REMARK as remark, + b.ID as agencyId, + c.ID as gridId, + d.PROPERTY_ID as propertyId , + a.LOCATION as location, + a.LONGITUDE as longitude, + a.LATITUDE as latitude from ic_neighbor_hood a - left join customer_agency b on a.AGENCY_ID = b.ID and b.DEL_FLAG='0' - left join customer_grid c on a.GRID_ID = c.ID and c.DEL_FLAG='0' - left join ic_neighbor_hood_property d on a.ID = d.NEIGHBOR_HOOD_ID and d.DEL_FLAG='0' - - AND a.GRID_ID = #{neighbor.gridId} + + AND a.GRID_ID = #{gridId} - - AND (a.AGENCY_ID = #{neighbor.agencyId} or CONCAT(':',a.AGENCY_PIDS, ':') like CONCAT('%:',#{neighbor.agencyId},':%')) + + AND (a.AGENCY_ID = #{agencyId} or CONCAT(':',a.AGENCY_PIDS, ':') like CONCAT('%:',#{agencyId},':%')) - + AND a.ID in (select NEIGHBOR_HOOD_ID from ic_house e - - AND e.OWNER_NAME like concat('%',#{house.ownerName},'%') + + AND e.OWNER_NAME like concat('%',#{ownerName},'%') - - AND e.OWNER_PHONE like concat('%',#{house.ownerPhone},'%') + + AND e.OWNER_PHONE like concat('%',#{ownerPhone},'%') and e.DEL_FLAG='0' ) + AND a.DEL_FLAG = '0' - - - AND a.DEL_FLAG = #{neighbor.delFlag} - ORDER BY a.CREATED_TIME