assignedStaffs = input.getAssignedStaffs();
BlockChainProjectProcessAssignedStaffFormDTO handledStaff = input.getHandledStaff();
- fill(null, process, assignedStaffs, handledStaff);
+ fill(project, process, assignedStaffs, handledStaff);
String processString = JSON.toJSONString(process);
blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROCESS, processString);
-
+
+ if (project != null) {
+ blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_PROJECT, JSON.toJSONString(project));
+ }
+
if (assignedStaffs != null && assignedStaffs.size() > 0) {
String assignedStaffsString = JSON.toJSONString(assignedStaffs);
blockChainProducer.sendMsg(BlockChainProducer.TOPIC_PROJECT, BlockChainProducer.TAG_SEND_ASSIGNED_STAFFS, assignedStaffsString);
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 94%
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 fb679755d7..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;
@@ -79,9 +79,9 @@ public class IcHouseFormDTO implements Serializable {
private String purpose;
/**
- * 1出租；0未出租
+ * 1：出租 0：自住 2：闲置
*/
- @NotNull(message = "是否出租不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
+ @NotNull(message = "房屋状态不能为空", groups = {AddShowGroup.class, UpdateShowGroup.class})
private Integer rentFlag;
/**
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 402c86c868..0000000000
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/ListIcNeighborHoodFormDTO.java
+++ /dev/null
@@ -1,85 +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;
- /**
- * 数据类型【小区：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/HousesNameResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousesNameResultDTO.java
new file mode 100644
index 0000000000..954031f4c2
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HousesNameResultDTO.java
@@ -0,0 +1,20 @@
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2022/4/12 16:40
+ * @DESC
+ */
+@Data
+public class HousesNameResultDTO implements Serializable {
+
+ private static final long serialVersionUID = -8643628706377635279L;
+
+ private String idCard;
+
+ 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/IcHouseListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
new file mode 100644
index 0000000000..83d6f590e0
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/IcHouseListResultDTO.java
@@ -0,0 +1,38 @@
+
+package com.epmet.dto.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * desc:房屋列表结果类
+ * @author liujianjun
+ */
+@Data
+public class IcHouseListResultDTO implements Serializable {
+
+
+ private static final long serialVersionUID = 4963952996288796744L;
+
+ private String houseId;
+ private String ownerPhone;
+ private String purpose;
+ private String doorName;
+ private String houseType;
+ private String unitNum;
+ private String agencyId;
+ private String buildingId;
+ private String houseName;
+ private String buildingName;
+ private String rentFlag;
+ private String ownerName;
+ private String neighborHoodId;
+ private String purposeKey;
+ private String neighborHoodName;
+ private String unitNumKey;
+ private String ownerIdCard;
+ private String gridId;
+ private String houseTypeKey;
+ private Integer rentFlagKey;
+}
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-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
index 618be0ea9a..27cd699bf3 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/enums/HouseRentFlagEnums.java
@@ -3,8 +3,12 @@ package com.epmet.enums;
import org.springframework.util.StringUtils;
public enum HouseRentFlagEnums {
- YES(1,"是"),
- NO(0,"否");
+ //原有的房屋出租状态是否改为房屋状态【1：出租 0：自住 2：闲置】
+ /*YES(1,"是"),
+ NO(0,"否");*/
+ HOUSE_ZZ(0,"自住"),
+ HOUSE_CZ(1,"出租"),
+ HOUSE_XZ(2,"闲置");
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
index e3ffa35663..87db3dd3e6 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/GovOrgOpenFeignClient.java
@@ -605,4 +605,13 @@ public interface GovOrgOpenFeignClient {
*/
@PostMapping("/gov/org/customerstaffgrid/getallstaffbygridid")
Result> getAllStaffByGridId(@RequestParam("gridId")String gridId);
+
+ /**
+ * Desc: 根据身份证查询房屋名
+ * @param idCards
+ * @author zxc
+ * @date 2022/4/12 16:42
+ */
+ @PostMapping("/gov/org/ichouse/houses-name")
+ Result> getHousesNameByIdCards(@RequestBody List idCards);
}
diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
index dd29ab6129..4e48ff1657 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/feign/fallback/GovOrgOpenFeignClientFallback.java
@@ -393,4 +393,9 @@ public class GovOrgOpenFeignClientFallback implements GovOrgOpenFeignClient {
public Result> getAllStaffByGridId(String gridId) {
return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getAllStaffByGridId", gridId);
}
+
+ @Override
+ public Result> getHousesNameByIdCards(List idCards) {
+ return ModuleUtils.feignConError(ServiceConstant.GOV_ORG_SERVER, "getHousesNameByIdCards", idCards);
+ }
}
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 fca09fe069..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();
@@ -118,6 +114,18 @@ public class BuildingController {
List buildingTreeLevelDTOS =buildingService.treeList(tokenDTO.getCustomerId(), tokenDTO.getUserId());
return new Result().ok(buildingTreeLevelDTOS);
}
+
+ /**
+ * Desc: 根据前端方便，新开接口，只返回树的ID
+ * @param tokenDTO
+ * @author zxc
+ * @date 2022/4/12 15:20
+ */
+ @PostMapping("tree-ids")
+ public Result treeIds(@LoginUser TokenDto tokenDTO){
+ List ids =buildingService.treeIds(tokenDTO.getCustomerId(), tokenDTO.getUserId());
+ return new Result().ok(ids);
+ }
/**
* 导出模板
* @param response
@@ -125,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());
@@ -139,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);
@@ -153,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 09f29f5330..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,35 +86,25 @@ public class HouseController implements ResultDataResolver {
@PostMapping("houselist")
- public Result houseList(@RequestBody ListIcNeighborHoodFormDTO formDTO){
+ public Result> houseList(@RequestBody IcHouseListFormDTO formDTO) {
//效验数据
ValidatorUtils.validateEntity(formDTO);
-
- String queryScene = "house_manage";
-
- IcNeighborHoodResultDTO icNeighborHoodResultDTO = houseService.listNeighborhood(null, formDTO.getBuildingId(), formDTO.getOwnerName(),
- formDTO.getOwnerPhone(), null,
- null, queryScene,
- formDTO.getPageNo(), formDTO.getPageSize());
- 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();
@@ -129,9 +120,6 @@ public class HouseController implements ResultDataResolver {
buildingName = null;
}
- // 使用场景:社区查询
- String scene = "community_search";
-
LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO();
form.setUserId(loginUser.getUserId());
form.setClient(loginUser.getClient());
@@ -140,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, scene, formDTO.getPageNo(), formDTO.getPageSize());
-
- 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
*/
@@ -191,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
@@ -227,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);
@@ -265,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();
@@ -298,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/IcHouseController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
index 8473a7ac72..8587a72993 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java
@@ -30,6 +30,7 @@ import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
import com.epmet.service.IcHouseService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -114,4 +115,15 @@ public class IcHouseController {
return new Result>().ok(icHouseService.getHouseList(tokenDto, formDTO));
}
+ /**
+ * Desc: 根据身份证查询房屋名
+ * @param idCards
+ * @author zxc
+ * @date 2022/4/12 16:42
+ */
+ @PostMapping("houses-name")
+ public Result> getHousesNameByIdCards(@RequestBody List idCards){
+ return new Result>().ok(icHouseService.getHousesNameByIdCards(idCards));
+ }
+
}
\ No newline at end of file
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 ab44cc24f6..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;
@@ -43,6 +43,7 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.service.IcNeighborHoodService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
@@ -79,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..f7c669b5d9 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,8 +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.form.IcHouseListFormDTO;
+import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
+import com.epmet.dto.form.IcNeighborHoodListFormDTO;
import com.epmet.dto.result.IcNeighborHoodResultDTO;
import com.epmet.entity.IcBuildingEntity;
import com.epmet.excel.IcNeighborHoodExcel;
@@ -77,48 +78,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 +128,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 c5a392e6ca..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,9 +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;
@@ -11,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;
/**
@@ -23,22 +24,7 @@ import java.util.Set;
@Mapper
public interface IcHouseDao extends BaseDao {
-// IPage> searchHouseByPage(IPage page,
-// @Param(Constants.WRAPPER) QueryWrapper neighborHoodEntityQueryWrapper,
-// @Param("ew1") QueryWrapper buildingEntityQueryWrapper,
-// @Param("ew2") QueryWrapper houseEntityQueryWrapper);
-// IPage> searchHouseByPage(IPage page,
-// @Param("neighbor") IcNeighborHoodEntity neighbor,
-// @Param("building") IcBuildingEntity building,
-// @Param("house") IcHouseEntity house);
- 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("queryScene") String queryScene);
+ List searchHouseByPage(IcHouseListFormDTO formDTO);
List searchAllHouse(@Param("house") IcHouseEntity house);
@@ -92,4 +78,12 @@ public interface IcHouseDao extends BaseDao {
*/
void houseUpdate(@Param("houses") List houses);
-}
\ No newline at end of file
+ /**
+ * Desc: 根据身份证查询房屋名
+ * @param idCards
+ * @author zxc
+ * @date 2022/4/12 16:42
+ */
+ List getHousesNameByIdCards(@Param("idCards") List idCards);
+
+}
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..d2adb6c87f 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.IcNeighborHoodListFormDTO;
+import com.epmet.dto.result.IcNeighborHoodResultDTO;
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;
/**
* 小区表
@@ -37,10 +37,8 @@ import java.util.Map;
@Mapper
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);
List selectListByName(@Param("customerId") String customerId,
@@ -61,4 +59,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/redis/CustomerAgencyRedis.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java
index fb65a508d5..a4be0f2703 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/redis/CustomerAgencyRedis.java
@@ -20,7 +20,7 @@ package com.epmet.redis;
import cn.hutool.core.bean.BeanUtil;
import com.epmet.commons.tools.redis.RedisKeys;
import com.epmet.commons.tools.redis.RedisUtils;
-import com.epmet.dto.CustomerAgencyDTO;
+import com.epmet.commons.tools.redis.common.bean.AgencyInfoCache;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -44,19 +44,19 @@ public class CustomerAgencyRedis {
redisUtils.delete(key);
}
- public void set(String agencyId, CustomerAgencyDTO value){
+ public void set(String agencyId, AgencyInfoCache value){
String key = RedisKeys.getAgencyByIdKey(agencyId);
Map map = BeanUtil.beanToMap(value, false, true);
redisUtils.hMSet(key, map);
}
- public CustomerAgencyDTO get(String agencyId){
+ public AgencyInfoCache get(String agencyId){
String key = RedisKeys.getAgencyByIdKey(agencyId);
Map resultMap = redisUtils.hGetAll(key);
if (CollectionUtils.isEmpty(resultMap)) {
return null;
}
- return BeanUtil.mapToBean(resultMap, CustomerAgencyDTO.class, true);
+ return BeanUtil.mapToBean(resultMap, AgencyInfoCache.class, true);
}
}
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 81a9f10390..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,15 +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 a651ed1615..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,17 +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,
- String queryScene,
- Integer pageNo,
- Integer pageSize);
+ PageData getHouseList(IcHouseListFormDTO formDTO);
- void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception;
+ void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception;
List queryListHouseInfo(Set houseIds, String customerId);
@@ -78,5 +71,6 @@ public interface HouseService {
*/
void allDelete(NeighborHoodManageDelFormDTO formDTO);
+
HouseInfoDTO getHouseInfoDTO(String customerId,String houseId);
-}
\ No newline at end of file
+}
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
index 423f218049..bd82a396c1 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseService.java
@@ -8,6 +8,7 @@ import com.epmet.dto.IcHouseDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
import com.epmet.entity.IcHouseEntity;
import java.util.List;
@@ -116,4 +117,12 @@ public interface IcHouseService extends BaseService {
*/
void houseUpdate(List houses);
+ /**
+ * Desc: 根据身份证查询房屋名
+ * @param idCards
+ * @author zxc
+ * @date 2022/4/12 16:42
+ */
+ List getHousesNameByIdCards(List idCards);
+
}
\ No newline at end of file
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..78b55aea8b 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,8 +17,10 @@
package com.epmet.service;
-import com.epmet.dto.form.IcNeighborHoodFormDTO;
-import com.epmet.dto.form.ListIcNeighborHoodFormDTO;
+import com.epmet.commons.tools.page.PageData;
+import com.epmet.dto.form.IcHouseListFormDTO;
+import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
+import com.epmet.dto.form.IcNeighborHoodListFormDTO;
import com.epmet.dto.result.IcNeighborHoodResultDTO;
import com.epmet.excel.IcNeighborHoodExcel;
@@ -33,24 +35,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/AgencyServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
index 7a81bd7fd0..c07985347c 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java
@@ -20,6 +20,7 @@ package com.epmet.service.impl;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.epmet.commons.tools.constant.Constant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.constant.StrConstant;
import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult;
@@ -490,16 +491,53 @@ public class AgencyServiceImpl implements AgencyService {
@Override
public CustomerAgencyDTO getAgencyById(String agencyId) {
- CustomerAgencyDTO cachedAgency = customerAgencyRedis.get(agencyId);
- if (cachedAgency == null) {
- cachedAgency = new CustomerAgencyDTO();
+ AgencyInfoCache agencyInfoCache = customerAgencyRedis.get(agencyId);
+ if (agencyInfoCache == null) {
+ agencyInfoCache = new AgencyInfoCache();
CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(agencyId);
if (agencyEntity != null) {
- BeanUtils.copyProperties(agencyEntity, cachedAgency);
+ //设置行政地区编码全路径
+ if (StringUtils.isNotBlank(agencyEntity.getAreaCode()) && StringUtils.isNotBlank(agencyEntity.getParentAreaCode())) {
+ agencyInfoCache.setAreaCodePath(queryAreaCodePath(agencyEntity));
+ }
+ BeanUtils.copyProperties(agencyEntity, agencyInfoCache);
}
- customerAgencyRedis.set(agencyId, cachedAgency);
+ customerAgencyRedis.set(agencyId, agencyInfoCache);
+ }
+ CustomerAgencyDTO customerAgencyDTO=ConvertUtils.sourceToTarget(agencyInfoCache,CustomerAgencyDTO.class);
+ return customerAgencyDTO;
+ }
+
+ private List queryAreaCodePath(CustomerAgencyEntity customerAgencyEntity) {
+ List areaCodePath = new ArrayList<>();
+ switch (customerAgencyEntity.getLevel()) {
+ case Constant.COMMUNITY:
+ areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+ areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR));
+ areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.SIX));
+ areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+ areaCodePath.add(customerAgencyEntity.getAreaCode());
+ break;
+ case Constant.STREET:
+ areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+ areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.FOUR));
+ areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+ areaCodePath.add(customerAgencyEntity.getAreaCode());
+ break;
+ case Constant.DISTRICT:
+ areaCodePath.add(customerAgencyEntity.getAreaCode().substring(NumConstant.ZERO, NumConstant.TWO));
+ areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+ areaCodePath.add(customerAgencyEntity.getAreaCode());
+ break;
+ case Constant.CITY:
+ areaCodePath.add(customerAgencyEntity.getParentAreaCode());
+ areaCodePath.add(customerAgencyEntity.getAreaCode());
+ break;
+ case Constant.PROVINCE:
+ areaCodePath.add(customerAgencyEntity.getAreaCode());
+ break;
}
- return cachedAgency;
+ return areaCodePath;
}
@Override
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 04670fde28..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) {
@@ -261,6 +258,45 @@ public class BuildingServiceImpl implements BuildingService {
}
+ @Override
+ public List treeIds(String customerId, String staffId) {
+ List result = new ArrayList<>();
+ CustomerStaffInfoCacheResult agency = CustomerStaffRedis.getStaffInfo(customerId, staffId);
+ if(null == agency || StringUtils.isBlank(agency.getAgencyId())){
+ log.error("com.epmet.service.impl.BuildingServiceImpl.treeIds，没有找到工作人员所属的机关信息，用户Id：{}",staffId);
+ return new ArrayList<>();
+ }
+ //1.获取所在组织及下级组织
+ CustomerAgencyEntity customerAgency = customerAgencyDao.selectById(agency.getAgencyId());
+ List customerAgencyList = icBuildingDao.selectAgencyChildrenList(agency.getAgencyId());
+ customerAgencyList.add(customerAgency);
+ if(CollectionUtils.isEmpty(customerAgencyList)){
+ return new ArrayList<>();
+ }
+ result.addAll(customerAgencyList.stream().map(m -> m.getId()).collect(Collectors.toList()));
+ List agencyList = customerAgencyList.stream().map(item -> {
+ BuildingTreeLevelDTO buildingTreeLevelDTO = new BuildingTreeLevelDTO();
+ buildingTreeLevelDTO.setId(item.getId());
+ buildingTreeLevelDTO.setPId(item.getPid());
+ buildingTreeLevelDTO.setLabel(item.getOrganizationName());
+ buildingTreeLevelDTO.setLevel(item.getLevel());
+ buildingTreeLevelDTO.setLongitude(item.getLongitude());
+ buildingTreeLevelDTO.setLatitude(item.getLatitude());
+ buildingTreeLevelDTO.setChildren(new ArrayList<>());
+ //当前组织有几个下级组织
+ buildingTreeLevelDTO.setShowNum(StrConstant.EPMETY_STR);
+ return buildingTreeLevelDTO;
+ }).collect(Collectors.toList());
+ //2.获取组织所在网格
+ List agencyIdList = customerAgencyList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList());
+ List customerGridList = customerGridDao.selectList(new QueryWrapper().lambda().in(CustomerGridEntity::getPid, agencyIdList));
+ if(CollectionUtils.isEmpty(customerGridList)){
+ return result;
+ }
+ result.addAll(customerGridList.stream().map(m -> m.getId()).collect(Collectors.toList()));
+ return result;
+ }
+
@Override
@Transactional(rollbackFor = Exception.class)
public List importExcel(String customerId, List list, String staffId, List numList) {
@@ -347,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);
@@ -428,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()
@@ -453,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();
@@ -506,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 03458a90fd..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,21 +4,23 @@ 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;
+import com.epmet.commons.tools.enums.OrgTypeEnum;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.exception.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;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.CustomerGridConstant;
+import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.CustomerGridConstant;
import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcBuildingDao;
import com.epmet.dao.IcBuildingUnitDao;
@@ -30,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;
@@ -46,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;
@@ -99,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) {
@@ -113,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());
@@ -130,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) {
@@ -248,52 +252,47 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver {
}
@Override
- public IcNeighborHoodResultDTO listNeighborhood(String ancestorAgencyId,
- String buildingId,
- String ownerName,
- String ownerPhone,
- String neighborHoodName,
- String buildingName,
- String queryScene,
- Integer pageNo,
- Integer pageSize) {
- IcNeighborHoodResultDTO result = new IcNeighborHoodResultDTO();
- //如果类型是house 查房屋
- //IPage> resultMap = searchHouse(buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, pageNo, pageSize);
+ public PageData getHouseList(IcHouseListFormDTO formDTO) {
// 查询pids
String pids = null;
- if (StringUtils.isNotBlank(ancestorAgencyId)) {
- CustomerAgencyDTO agency = agencyservice.getAgencyById(ancestorAgencyId);
+ if (StringUtils.isNotBlank(formDTO.getAgencyId())) {
+ pids = getPids(formDTO.getAgencyId());
+ }
+ if (StringUtils.isNotBlank(formDTO.getLevel()) && OrgTypeEnum.AGENCY.getCode().equals(formDTO.getLevel())){
+ pids = getPids(formDTO.getAgencyId());
+ }
+ formDTO.setPids(pids);
- if (agency == null) {
- throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败");
- }
+ PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() ->
+ icHouseDao.searchHouseByPage(formDTO));
+ List records = pageInfo.getList();
+ records.forEach(item->{
+ item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey()));
+ item.setPurpose(HousePurposeEnums.getTypeValue(item.getPurposeKey()));
+ });
+ return new PageData<>(records,pageInfo.getTotal());
+ }
+ public String getPids(String agencyId){
+ String pids = null;
+ CustomerAgencyDTO agency = agencyservice.getAgencyById(agencyId);
- if (NumConstant.ZERO_STR.equals(agency.getPid())) {
- pids = ancestorAgencyId;
- } else {
- pids = agency.getPids().concat(StrConstant.COLON).concat(ancestorAgencyId);
- }
+ if (agency == null) {
+ throw new EpmetException(EpmetErrorCode.SERVER_ERROR.getCode(), "【社区查询-查询房屋列表】查询当前staff所属组织信息失败");
}
- IPage page = new Page(pageNo,pageSize);
-
- IPage> mapIPage = icHouseDao.searchHouseByPage(page, pids, buildingId, ownerName, ownerPhone, neighborHoodName, buildingName, queryScene);
- List> records = mapIPage.getRecords();
- records.forEach(item->{
- item.put("houseType", HouseTypeEnums.getTypeValue(item.get("houseTypeKey")));
- item.put("purpose", HousePurposeEnums.getTypeValue(item.get("purposeKey")));
- });
- result.setTotal(Long.valueOf(mapIPage.getTotal()).intValue());
- result.setList(records);
- return result;
+ if (NumConstant.ZERO_STR.equals(agency.getPid())) {
+ pids = agencyId;
+ } else {
+ pids = agency.getPids().concat(StrConstant.COLON).concat(agencyId);
+ }
+ return pids;
}
@Override
- public void exportBuildinginfo(ListIcNeighborHoodFormDTO formDTO, HttpServletResponse response) throws Exception {
+ public void exportBuildinginfo(IcHouseListFormDTO formDTO, HttpServletResponse response) throws Exception {
//如果类型是house 查房屋
//导出房屋
@@ -305,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/IcHouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
index f0afc84a28..527a5cf986 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java
@@ -19,6 +19,7 @@ import com.epmet.dto.IcResiUserDTO;
import com.epmet.dto.ImportGeneralDTO;
import com.epmet.dto.form.HouseFormDTO;
import com.epmet.dto.result.HouseListResultDTO;
+import com.epmet.dto.result.HousesNameResultDTO;
import com.epmet.entity.IcHouseEntity;
import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.feign.OperCustomizeOpenFeignClient;
@@ -231,4 +232,18 @@ public class IcHouseServiceImpl extends BaseServiceImpl getHousesNameByIdCards(List idCards) {
+ if (CollectionUtils.isEmpty(idCards)){
+ return new ArrayList<>();
+ }
+ return baseDao.getHousesNameByIdCards(idCards);
+ }
+
}
\ No newline at end of file
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 b094f0c226..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;
@@ -74,6 +74,7 @@ import org.apache.commons.lang3.StringUtils;
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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
@@ -234,8 +235,9 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl importTask) {
- executorService.submit(() -> {
+// executorService.submit(() -> {
// importNeighbor(formDTO,file,importTask);
log.info("neighborhoodImport thread start=====");
ExcelReader excelReader = null;
@@ -260,7 +262,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl();
}
@@ -687,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..5cdde1e697 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,8 +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.form.IcHouseListFormDTO;
+import com.epmet.dto.form.IcNeighborHoodAddFormDTO;
+import com.epmet.dto.form.IcNeighborHoodListFormDTO;
import com.epmet.dto.result.IcNeighborHoodResultDTO;
import com.epmet.entity.*;
import com.epmet.excel.IcNeighborHoodExcel;
@@ -26,6 +26,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 +74,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 +107,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 +129,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 +179,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 +196,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 +312,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/db/migration/V0.0.15__alter_ic_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql
new file mode 100644
index 0000000000..d624bf775a
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.15__alter_ic_house.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `ic_house`
+MODIFY COLUMN `RENT_FLAG` tinyint(1) NOT NULL COMMENT '1：出租 0：自住 2：闲置' AFTER `PURPOSE`;
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.16__add_index_ic_house.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.16__add_index_ic_house.sql
new file mode 100644
index 0000000000..3bf8ad31eb
--- /dev/null
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.16__add_index_ic_house.sql
@@ -0,0 +1,3 @@
+ALTER TABLE `epmet_gov_org`.`ic_house`
+ ADD INDEX `idx_building_id`(`BUILDING_ID`) USING BTREE COMMENT '楼宇id',
+ ADD INDEX `idx_hood_id`(`NEIGHBOR_HOOD_ID`) USING BTREE COMMENT '小区id';
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/CustomerAgencyDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
index 1e8792cab6..d8314ee8b5 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerAgencyDao.xml
@@ -709,15 +709,6 @@
agency.DEL_FLAG = '0'
AND agency.ID = #{agencyId}