From b22228b92c9758504cb39168d14eab0f13cc1ba0 Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Thu, 16 Jun 2022 09:46:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E5=BA=AD=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E7=9B=B8=E5=85=B3=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AppFamilyController.java       | 19 +++++++++++++++----
 .../service/EpidemicBuildingUnitService.java  | 11 +++++++++++
 .../impl/EpidemicBuildingUnitServiceImpl.java |  8 ++++++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
index 193af00..b7f819b 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java
@@ -21,10 +21,7 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
 import com.elink.esua.epdc.commons.tools.validator.group.DefaultGroup;
 import com.elink.esua.epdc.commons.tools.validator.group.UpdateGroup;
-import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO;
-import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
-import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
-import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.*;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -103,6 +100,20 @@ public class AppFamilyController {
         return epidemicBuildingUnitService.getHouseInfo(formDTO);
     }
 
+    /**
+     * 修改房屋信息
+     *
+     * @param formDTO
+     * @return
+     * @Author wanggongfeng
+     */
+    @PostMapping("updateHouseInfo")
+    public Result updateHouseInfo(@RequestBody HouseInfoFormDTO formDTO) {
+        //效验数据
+        ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
+        return epidemicBuildingUnitService.updateHouseInfo(formDTO);
+    }
+
     /**
      * 绑定我的家庭房屋
      *
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
index 75e4576..80e9073 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java
@@ -23,10 +23,12 @@ import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicBuildingUnitDetailResultDTO;
 import com.elink.esua.epdc.dto.personroom.result.EpidemicUnitInfoResultDTO;
 import com.elink.esua.epdc.vaccine.personroom.entity.EpidemicBuildingUnitEntity;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -169,6 +171,13 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
      */
     Result getHouseInfo(GetHouseInfoFormDTO formDTO);
 
+    /**
+     * 修改房屋信息
+     * @param formDTO
+     * @return
+     */
+    Result updateHouseInfo(HouseInfoFormDTO formDTO);
+
     /**
      * @return com.epmet.commons.tools.utils.Result
      * @describe: 批量生成房屋的房屋编码和一户一档二维码
@@ -199,4 +208,6 @@ public interface EpidemicBuildingUnitService extends CrudService<EpidemicBuildin
     void createQrCode(String roomId, HttpServletResponse response);
 
 
+
+
 }
diff --git a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
index 057082e..77f266f 100644
--- a/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
+++ b/epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java
@@ -38,6 +38,7 @@ import com.elink.esua.epdc.dto.house.result.EpdcPopulationErrorResultDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicUnitOwnerDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
+import com.elink.esua.epdc.dto.personroom.form.HouseInfoFormDTO;
 import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeZipFormDTO;
 import com.elink.esua.epdc.dto.personroom.result.*;
 import com.elink.esua.epdc.vaccine.epidemic.entity.EpidemicUserErrorEntity;
@@ -742,6 +743,13 @@ public class EpidemicBuildingUnitServiceImpl extends CrudServiceImpl<EpidemicBui
         return new Result<HouseInfoResultDTO>().ok(houseInfoResultDTO);
     }
 
+    @Override
+    public Result updateHouseInfo(HouseInfoFormDTO formDTO) {
+        EpidemicBuildingUnitEntity entity = ConvertUtils.sourceToTarget(formDTO, EpidemicBuildingUnitEntity.class);
+        baseDao.updateById(entity);
+        return new Result();
+    }
+
     public String createHouseQrCodeUrl(String roomCode, String name) throws Exception {
         //url组成:小程序地址?房屋编码
         String url = qrCodeProperties.getPre() + roomCode;