format

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/AppFamilyController.java

@@ -17,29 +17,18 @@
 
 package com.elink.esua.epdc.vaccine.personroom.controller;
 
-import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
 import com.elink.esua.epdc.commons.tools.utils.Result;
-import com.elink.esua.epdc.commons.tools.validator.AssertUtils;
 import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils;
-import com.elink.esua.epdc.commons.tools.validator.group.AddGroup;
 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.epidemic.DictOptionDTO;
+import com.elink.esua.epdc.dto.personroom.form.BindingFamilyFormDTO;
-import com.elink.esua.epdc.dto.personroom.EpidemicPlotCoordinateDTO;
+import com.elink.esua.epdc.dto.personroom.form.FamilyMemberInfoFormDTO;
-import com.elink.esua.epdc.dto.personroom.form.*;
+import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
-import com.elink.esua.epdc.dto.personroom.result.EpidemicPlotCoordinateResultDTO;
+import com.elink.esua.epdc.dto.personroom.form.GetMemberListFormDTO;
 import com.elink.esua.epdc.vaccine.epidemic.service.EpidemicUserInfoService;
-import com.elink.esua.epdc.vaccine.personroom.excel.EpidemicPlotCoordinateExcel;
 import com.elink.esua.epdc.vaccine.personroom.service.EpidemicBuildingUnitService;
-import com.elink.esua.epdc.vaccine.personroom.service.EpidemicPlotCoordinateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -66,7 +55,7 @@ public class AppFamilyController {
      * @Author wanggongfeng
      */
     @GetMapping("getFamilyMember")
-    public Result getFamilyMember(@RequestBody GetMemberListFormDTO formDTO){
+    public Result getFamilyMember(@RequestBody GetMemberListFormDTO formDTO) {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
         return epidemicUserInfoService.getFamilyMember(formDTO);
@@ -80,7 +69,7 @@ public class AppFamilyController {
      * @Author wanggongfeng
      */
     @PostMapping("addFamilyMember")
-    public Result addFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){
+    public Result addFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO) {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
         return epidemicUserInfoService.addFamilyMember(formDTO);
@@ -94,7 +83,7 @@ public class AppFamilyController {
      * @Author wanggongfeng
      */
     @PostMapping("updateFamilyMember")
-    public Result updateFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO){
+    public Result updateFamilyMember(@RequestBody FamilyMemberInfoFormDTO formDTO) {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
         return epidemicUserInfoService.updateFamilyMember(formDTO);
@@ -108,7 +97,7 @@ public class AppFamilyController {
      * @Author wanggongfeng
      */
     @GetMapping("getHouseInfo")
-    public Result getHouseInfo(@RequestBody GetHouseInfoFormDTO formDTO){
+    public Result getHouseInfo(@RequestBody GetHouseInfoFormDTO formDTO) {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
         return epidemicBuildingUnitService.getHouseInfo(formDTO);
@@ -122,13 +111,11 @@ public class AppFamilyController {
      * @Author wanggongfeng
      */
     @PostMapping("bindingFamily")
-    public Result bindingFamily(@RequestBody BindingFamilyFormDTO formDTO){
+    public Result bindingFamily(@RequestBody BindingFamilyFormDTO formDTO) {
         //效验数据
         ValidatorUtils.validateEntity(formDTO, UpdateGroup.class, DefaultGroup.class);
         return epidemicUserInfoService.bindingFamily(formDTO);
     }
 
 
-
-
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/controller/BuildingUnitController.java

@@ -191,7 +191,7 @@ public class BuildingUnitController {
     @PostMapping("downloadZip")
     public void downloadZip(@RequestBody HouseQrcodeZipFormDTO formDTO, HttpServletResponse response) throws Exception {
         ValidatorUtils.validateEntity(formDTO);
-        epidemicBuildingUnitService.downloadZip(formDTO,response);
+        epidemicBuildingUnitService.downloadZip(formDTO, response);
     }
 
 }

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/dao/EpidemicBuildingUnitDao.java

@@ -20,9 +20,7 @@ package com.elink.esua.epdc.vaccine.personroom.dao;
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.epidemic.DictOptionDTO;
 import com.elink.esua.epdc.dto.personroom.EpidemicBuildingUnitDTO;
-import com.elink.esua.epdc.dto.personroom.EpidemicPlotBuildingDTO;
 import com.elink.esua.epdc.dto.personroom.form.GetHouseInfoFormDTO;
-import com.elink.esua.epdc.dto.personroom.form.HouseQrcodeFormDTO;
 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;
@@ -140,6 +138,7 @@ public interface EpidemicBuildingUnitDao extends BaseDao<EpidemicBuildingUnitEnt
 
     /**
      * 获取房屋信息
+     *
      * @param formDTO
      * @return
      */

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/EpidemicBuildingUnitService.java

@@ -23,7 +23,6 @@ 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.HouseQrcodeFormDTO;
 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;

epdc-cloud-vim-yushan/src/main/java/com/elink/esua/epdc/vaccine/personroom/service/impl/EpidemicBuildingUnitServiceImpl.java

@@ -38,7 +38,6 @@ 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.HouseQrcodeFormDTO;
 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;