From 0e04fb6dc0593c1d770b2f7fc7cd1c3c8c0e7145 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Thu, 9 Jun 2022 09:39:54 +0800 Subject: [PATCH] dto --- .../result/EpdcPopulationErrorResultDTO.java | 1 + .../personroom/EpidemicBuildingUnitDTO.java | 10 +++ .../personroom/EpidemicPlotBuildingDTO.java | 5 ++ .../personroom/form/HouseQrcodeFormDTO.java | 19 +++++ .../EpidemicBuildingUnitDetailResultDTO.java | 15 ++++ .../result/EpidemicPlotBuildingResultDTO.java | 4 + .../result/EpidemicUnitInfoResultDTO.java | 73 +++++++++++++++++++ 7 files changed, 127 insertions(+) create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseQrcodeFormDTO.java create mode 100644 epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicUnitInfoResultDTO.java diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java index 3241940..bb02515 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/house/result/EpdcPopulationErrorResultDTO.java @@ -18,6 +18,7 @@ public class EpdcPopulationErrorResultDTO implements Serializable { * 错误数据sheet名 */ private String sheetName; + /** * 错误数据行数 */ diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java index a3003dd..d531110 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicBuildingUnitDTO.java @@ -213,4 +213,14 @@ public class EpidemicBuildingUnitDTO implements Serializable { * 小区名 */ private String plotName; + + /** + * 房屋编码 + */ + private String roomCode; + + /** + * 房屋码(5位数字自增) + */ + private Integer roomMaCode; } diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotBuildingDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotBuildingDTO.java index ed17499..bbd8e3d 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotBuildingDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/EpidemicPlotBuildingDTO.java @@ -270,4 +270,9 @@ public class EpidemicPlotBuildingDTO implements Serializable { */ private String deptCode; + /** + * 楼栋唯一编码五位数自增 + */ + private Integer buildingMaCode; + } diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseQrcodeFormDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseQrcodeFormDTO.java new file mode 100644 index 0000000..c3dae4f --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/form/HouseQrcodeFormDTO.java @@ -0,0 +1,19 @@ +package com.elink.esua.epdc.dto.personroom.form; + +import lombok.Data; + +import javax.validation.constraints.NotNull; +import java.io.Serializable; + +/** + * @program: epmet-cloud + * @description: + * @author: wangtong + * @create: 2022-06-01 13:44 + **/ +@Data +public class HouseQrcodeFormDTO implements Serializable { + + @NotNull(message = "id不可为空") + private String id; +} diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicBuildingUnitDetailResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicBuildingUnitDetailResultDTO.java index ffffd01..0f0c1fb 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicBuildingUnitDetailResultDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicBuildingUnitDetailResultDTO.java @@ -20,6 +20,11 @@ public class EpidemicBuildingUnitDetailResultDTO implements Serializable { */ private Long buildingId; + /** + * 小区.村 + */ + private String buildingName; + /** * 道路名称 */ @@ -180,4 +185,14 @@ public class EpidemicBuildingUnitDetailResultDTO implements Serializable { * 小区名 */ private String plotName; + + /** + * 房屋编码 + */ + private String roomCode; + + /** + * 房屋码(5位数字自增) + */ + private Integer roomMaCode; } diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java index e81c6f2..5ada80d 100644 --- a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicPlotBuildingResultDTO.java @@ -203,4 +203,8 @@ public class EpidemicPlotBuildingResultDTO implements Serializable { */ private String emergencyPosition; + /** + * 楼栋唯一编码五位数自增 + */ + private Integer buildingMaCode; } diff --git a/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicUnitInfoResultDTO.java b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicUnitInfoResultDTO.java new file mode 100644 index 0000000..3eb61a0 --- /dev/null +++ b/epdc-cloud-custom-client/src/main/java/com/elink/esua/epdc/dto/personroom/result/EpidemicUnitInfoResultDTO.java @@ -0,0 +1,73 @@ +/** + * 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.elink.esua.epdc.dto.personroom.result; + +import lombok.Data; + +import java.io.Serializable; + +/** + * @author zhy + * @date 2021/7/28 9:28 + */ +@Data +public class EpidemicUnitInfoResultDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 单元ID + */ + private Long unitId; + + /** + * 单元 + */ + private String unit; + + /** + * 单元 + */ + private String roomNo; + + /** + * 栋主键 + */ + private Long buildingId; + + /** + * 小区/村ID + */ + private Long plotId; + + /** + * 小区.村 + */ + private String plotName; + + /** + * 楼栋名称 + */ + private String buildingName; + + /** + * 房屋码(5位数字自增) + */ + private Integer roomMaCode; + +}