From a2ee03e36e2cf5a5381328a38cc6ac5d6a2aff30 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 10 May 2022 14:42:23 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E5=8F=98=E6=9B=B4?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/form/HouseChangeListFormDTO.java | 57 +++++++++++++++++++ .../dto/result/HouseChangeListResultDTO.java | 41 +++++++++++++ .../IcHouseChangeRecordController.java | 17 ++++++ .../com/epmet/dao/IcHouseChangeRecordDao.java | 14 ++++- .../service/IcHouseChangeRecordService.java | 11 ++++ .../impl/IcHouseChangeRecordServiceImpl.java | 37 ++++++++++++ .../mapper/IcHouseChangeRecordDao.xml | 40 +++++++++++++ 7 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChangeListFormDTO.java create mode 100644 epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChangeListResultDTO.java diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChangeListFormDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChangeListFormDTO.java new file mode 100644 index 0000000000..fed6624b73 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/form/HouseChangeListFormDTO.java @@ -0,0 +1,57 @@ +package com.epmet.dto.form; + +import com.epmet.commons.tools.dto.form.PageFormDTO; +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/5/10 13:34 + * @DESC + */ +@Data +public class HouseChangeListFormDTO extends PageFormDTO implements Serializable { + + private static final long serialVersionUID = 3650098822228397304L; + + /** + * 网格ID + */ + private String gridId; + + /** + * 工作人员所属组织ID + */ + private String agencyId; + + /** + * 小区ID + */ + private String neighborHoodId; + + /** + * 楼栋ID + */ + private String buildingId; + + /** + * 楼栋单元ID + */ + private String buildingUnitId; + + /** + * 房屋ID + */ + private String houseId; + + /** + * 开始日期，eg：20220510 + */ + private String startDate; + + /** + * 结束日期，eg：20220510 + */ + private String endDate; +} diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChangeListResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChangeListResultDTO.java new file mode 100644 index 0000000000..a1ea1007c2 --- /dev/null +++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/HouseChangeListResultDTO.java @@ -0,0 +1,41 @@ +package com.epmet.dto.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @Author zxc + * @DateTime 2022/5/10 13:42 + * @DESC + */ +@Data +public class HouseChangeListResultDTO implements Serializable { + + private static final long serialVersionUID = 4501420202270980751L; + + /** + * 所属网格 + */ + private String gridName; + + /** + * 所属房屋 + */ + private String houseName; + + /** + * 变更前 + */ + private String changeBefore; + + /** + * 变更后 + */ + private String changeAfter; + + /** + * 变更时间 + */ + private String changeTime; +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java index 677ff6e5a5..78a25c51e4 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseChangeRecordController.java @@ -1,7 +1,11 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.annotation.MaskResponse; import com.epmet.commons.tools.aop.NoRepeatSubmit; +import com.epmet.commons.tools.dto.form.PageFormDTO; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.AssertUtils; import com.epmet.commons.tools.validator.ValidatorUtils; @@ -9,6 +13,7 @@ import com.epmet.commons.tools.validator.group.AddGroup; import com.epmet.commons.tools.validator.group.UpdateGroup; import com.epmet.commons.tools.validator.group.DefaultGroup; import com.epmet.dto.IcHouseChangeRecordDTO; +import com.epmet.dto.form.HouseChangeListFormDTO; import com.epmet.service.IcHouseChangeRecordService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -67,4 +72,16 @@ public class IcHouseChangeRecordController { return new Result(); } + /** + * Desc: 查询房屋变更记录 + * @param tokenDto + * @param formDTO + * @author zxc + * @date 2022/5/10 14:32 + */ + @PostMapping("list") + public Result list(@LoginUser TokenDto tokenDto,@RequestBody HouseChangeListFormDTO formDTO){ + ValidatorUtils.validateEntity(formDTO, PageFormDTO.AddUserInternalGroup.class); + return new Result().ok(icHouseChangeRecordService.list(tokenDto, formDTO)); + } } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseChangeRecordDao.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseChangeRecordDao.java index ab8b3cdbe8..4f4d3c6552 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseChangeRecordDao.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/dao/IcHouseChangeRecordDao.java @@ -1,9 +1,13 @@ package com.epmet.dao; import com.epmet.commons.mybatis.dao.BaseDao; +import com.epmet.dto.form.HouseChangeListFormDTO; +import com.epmet.dto.result.HouseChangeListResultDTO; import com.epmet.entity.IcHouseChangeRecordEntity; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * 房屋变更记录表 * @@ -12,5 +16,13 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface IcHouseChangeRecordDao extends BaseDao { - + + /** + * Desc: 获取房屋变更记录 + * @param formDTO + * @author zxc + * @date 2022/5/10 14:22 + */ + List getHouseChangeList(HouseChangeListFormDTO formDTO); + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseChangeRecordService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseChangeRecordService.java index f51da9f288..0405fce0b0 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseChangeRecordService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/IcHouseChangeRecordService.java @@ -2,7 +2,9 @@ package com.epmet.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.dto.IcHouseChangeRecordDTO; +import com.epmet.dto.form.HouseChangeListFormDTO; import com.epmet.entity.IcHouseChangeRecordEntity; import java.util.List; @@ -75,4 +77,13 @@ public interface IcHouseChangeRecordService extends BaseService pageData = new PageData<>(new ArrayList<>(), NumConstant.ZERO); + CustomerStaffInfoCacheResult staffInfo = CustomerStaffRedis.getStaffInfo(tokenDto.getCustomerId(), tokenDto.getUserId()); + if (null == staffInfo){ + throw new EpmetException("未查询到此工作人员"+tokenDto.getUserId()); + } + formDTO.setAgencyId(staffInfo.getAgencyId()); + if (formDTO.getIsPage()){ + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.getHouseChangeList(formDTO)); + pageData.setList(pageInfo.getList()); + pageData.setTotal(Integer.valueOf(String.valueOf(pageInfo.getTotal()))); + }else { + List houseChangeList = baseDao.getHouseChangeList(formDTO); + pageData.setList(houseChangeList); + pageData.setTotal(houseChangeList.size()); + } + return pageData; + } + } \ No newline at end of file diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseChangeRecordDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseChangeRecordDao.xml index 4026bf7cac..67765b0c6e 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseChangeRecordDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcHouseChangeRecordDao.xml @@ -3,4 +3,44 @@ + + \ No newline at end of file From 48401c4e66d09e5512604e6aac3ee2b2d0098e26 Mon Sep 17 00:00:00 2001 From: zxc <1272811460@qq.com> Date: Tue, 10 May 2022 14:46:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=84=9A=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...0.0.19__house_change_record_and_detail.sql | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.19__house_change_record_and_detail.sql diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.19__house_change_record_and_detail.sql b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.19__house_change_record_and_detail.sql new file mode 100644 index 0000000000..4646d335c4 --- /dev/null +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/db/migration/V0.0.19__house_change_record_and_detail.sql @@ -0,0 +1,37 @@ +CREATE TABLE `ic_house_change_record` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户ID', + `AGENCY_ID` varchar(64) NOT NULL COMMENT '组织ID', + `GRID_ID` varchar(64) NOT NULL COMMENT '网格ID', + `NEIGHBOR_HOOD_ID` varchar(64) NOT NULL COMMENT '小区ID', + `BUILDING_ID` varchar(64) NOT NULL COMMENT '楼栋ID', + `BUILDING_UNIT_ID` varchar(64) NOT NULL COMMENT '楼栋单元ID', + `HOUSE_ID` varchar(64) NOT NULL COMMENT '房屋ID', + `CHANGE_BEFORE` varchar(255) NOT NULL COMMENT '变更前', + `CHANGE_AFTER` varchar(255) NOT NULL COMMENT '变更后', + `PIDS` varchar(255) NOT NULL COMMENT '组织ID的所有上级', + `DEL_FLAG` int(11) NOT NULL, + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='房屋变更记录表'; + +CREATE TABLE `ic_house_change_detail` ( + `ID` varchar(64) NOT NULL COMMENT 'ID', + `CUSTOMER_ID` varchar(64) NOT NULL COMMENT '客户id', + `RECORD_ID` varchar(64) NOT NULL COMMENT '记录ID', + `CHANGE_COL` varchar(64) NOT NULL COMMENT '变更字段，HOUSE_TYPE:房屋类型，PURPOSE:房屋用途，RENT_FLAG:房屋状态，OWNER_NAME:房主姓名，OWNER_PHONE:房主电话，OWNER_ID_CARD:房主身份证', + `CHANGE_BEFORE` varchar(255) NOT NULL COMMENT '变更前', + `CHANGE_AFTER` varchar(255) NOT NULL COMMENT '变更后', + `DEL_FLAG` int(1) NOT NULL, + `REVISION` int(11) NOT NULL COMMENT '乐观锁', + `CREATED_BY` varchar(32) NOT NULL COMMENT '创建人', + `CREATED_TIME` datetime NOT NULL COMMENT '创建时间', + `UPDATED_BY` varchar(32) NOT NULL COMMENT '更新人', + `UPDATED_TIME` datetime NOT NULL COMMENT '更新时间', + PRIMARY KEY (`ID`) USING BTREE, + KEY `recordId` (`RECORD_ID`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='房屋变更详情表'; \ No newline at end of file