From e69fe1394776fb01437d3f8f08df16ed5e93615b Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Fri, 15 Apr 2022 09:35:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/HouseController.java | 11 +----
 .../epmet/controller/IcHouseController.java   | 47 +------------------
 2 files changed, 4 insertions(+), 54 deletions(-)

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 4b91e3f877..957e1f7c90 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
@@ -31,7 +31,6 @@ 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.constants.ImportTaskConstants;
-import com.epmet.dao.IcBuildingDao;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.HouseInfoDTO;
 import com.epmet.dto.result.IcHouseListResultDTO;
@@ -40,9 +39,7 @@ import com.epmet.dto.result.LoginUserDetailsResultDTO;
 import com.epmet.excel.IcHouseExcel;
 import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
-import com.epmet.redis.IcHouseRedis;
 import com.epmet.service.HouseService;
-import com.epmet.service.IcHouseService;
 import com.epmet.util.ExcelPoiUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -76,12 +73,6 @@ public class HouseController implements ResultDataResolver {
     @Autowired
     private EpmetUserOpenFeignClient userOpenFeignClient;
     @Autowired
-    private IcBuildingDao icBuildingDao;
-    @Autowired
-    private IcHouseRedis icHouseRedis;
-    @Autowired
-    private IcHouseService icHouseService;
-    @Autowired
     private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
 
 
@@ -239,6 +230,8 @@ public class HouseController implements ResultDataResolver {
         return new Result().ok(str);
     }
 
+
+
     @PostMapping("queryListHouseInfo")
     Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody Set<String> houseIds, @RequestParam("customerId") String customerId) {
         return new Result<List<HouseInfoDTO>>().ok(houseService.queryListHouseInfo(houseIds, customerId));
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 8587a72993..0f32e356b7 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
@@ -19,15 +19,8 @@ package com.epmet.controller;
 
 import com.epmet.commons.tools.annotation.LoginUser;
 import com.epmet.commons.tools.dto.result.OptionResultDTO;
-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;
-import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.DefaultGroup;
-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;
@@ -36,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
-import java.util.Map;
 
 
 /**
@@ -48,45 +40,10 @@ import java.util.Map;
 @RestController
 @RequestMapping("ichouse")
 public class IcHouseController {
-    
+
     @Autowired
     private IcHouseService icHouseService;
 
-    @GetMapping("page")
-    public Result<PageData<IcHouseDTO>> page(@RequestParam Map<String, Object> params){
-        PageData<IcHouseDTO> page = icHouseService.page(params);
-        return new Result<PageData<IcHouseDTO>>().ok(page);
-    }
-
-    @GetMapping("{id}")
-    public Result<IcHouseDTO> get(@PathVariable("id") String id){
-        IcHouseDTO data = icHouseService.get(id);
-        return new Result<IcHouseDTO>().ok(data);
-    }
-
-    @PostMapping
-    public Result save(@RequestBody IcHouseDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        icHouseService.save(dto);
-        return new Result();
-    }
-
-    @PutMapping
-    public Result update(@RequestBody IcHouseDTO dto){
-        //效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        icHouseService.update(dto);
-        return new Result();
-    }
-
-    @DeleteMapping
-    public Result delete(@RequestBody String[] ids){
-        //效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
-        icHouseService.delete(ids);
-        return new Result();
-    }
     @PostMapping("houseoption")
     public Result<List<OptionResultDTO>> getHouseOption(@RequestBody HouseFormDTO formDTO){
         return new Result<List<OptionResultDTO>>().ok(icHouseService.getHouseOption(formDTO));
@@ -126,4 +83,4 @@ public class IcHouseController {
         return new Result<List<HousesNameResultDTO>>().ok(icHouseService.getHousesNameByIdCards(idCards));
     }
 
-}
\ No newline at end of file
+}