Browse Source

删除无用代码

release
jianjun 3 years ago
parent
commit
e69fe13947
  1. 11
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java
  2. 47
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcHouseController.java

11
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.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.constants.ImportTaskConstants; import com.epmet.constants.ImportTaskConstants;
import com.epmet.dao.IcBuildingDao;
import com.epmet.dto.form.*; import com.epmet.dto.form.*;
import com.epmet.dto.result.HouseInfoDTO; import com.epmet.dto.result.HouseInfoDTO;
import com.epmet.dto.result.IcHouseListResultDTO; import com.epmet.dto.result.IcHouseListResultDTO;
@ -40,9 +39,7 @@ import com.epmet.dto.result.LoginUserDetailsResultDTO;
import com.epmet.excel.IcHouseExcel; import com.epmet.excel.IcHouseExcel;
import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.feign.EpmetCommonServiceOpenFeignClient;
import com.epmet.feign.EpmetUserOpenFeignClient; import com.epmet.feign.EpmetUserOpenFeignClient;
import com.epmet.redis.IcHouseRedis;
import com.epmet.service.HouseService; import com.epmet.service.HouseService;
import com.epmet.service.IcHouseService;
import com.epmet.util.ExcelPoiUtils; import com.epmet.util.ExcelPoiUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
@ -76,12 +73,6 @@ public class HouseController implements ResultDataResolver {
@Autowired @Autowired
private EpmetUserOpenFeignClient userOpenFeignClient; private EpmetUserOpenFeignClient userOpenFeignClient;
@Autowired @Autowired
private IcBuildingDao icBuildingDao;
@Autowired
private IcHouseRedis icHouseRedis;
@Autowired
private IcHouseService icHouseService;
@Autowired
private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient; private EpmetCommonServiceOpenFeignClient epmetCommonServiceOpenFeignClient;
@ -239,6 +230,8 @@ public class HouseController implements ResultDataResolver {
return new Result().ok(str); return new Result().ok(str);
} }
@PostMapping("queryListHouseInfo") @PostMapping("queryListHouseInfo")
Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody Set<String> houseIds, @RequestParam("customerId") String customerId) { Result<List<HouseInfoDTO>> queryListHouseInfo(@RequestBody Set<String> houseIds, @RequestParam("customerId") String customerId) {
return new Result<List<HouseInfoDTO>>().ok(houseService.queryListHouseInfo(houseIds, customerId)); return new Result<List<HouseInfoDTO>>().ok(houseService.queryListHouseInfo(houseIds, customerId));

47
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.annotation.LoginUser;
import com.epmet.commons.tools.dto.result.OptionResultDTO; 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.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result; 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.form.HouseFormDTO;
import com.epmet.dto.result.HouseListResultDTO; import com.epmet.dto.result.HouseListResultDTO;
import com.epmet.dto.result.HousesNameResultDTO; import com.epmet.dto.result.HousesNameResultDTO;
@ -36,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
import java.util.Map;
/** /**
@ -48,45 +40,10 @@ import java.util.Map;
@RestController @RestController
@RequestMapping("ichouse") @RequestMapping("ichouse")
public class IcHouseController { public class IcHouseController {
@Autowired @Autowired
private IcHouseService icHouseService; 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") @PostMapping("houseoption")
public Result<List<OptionResultDTO>> getHouseOption(@RequestBody HouseFormDTO formDTO){ public Result<List<OptionResultDTO>> getHouseOption(@RequestBody HouseFormDTO formDTO){
return new Result<List<OptionResultDTO>>().ok(icHouseService.getHouseOption(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)); return new Result<List<HousesNameResultDTO>>().ok(icHouseService.getHousesNameByIdCards(idCards));
} }
} }

Loading…
Cancel
Save