diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java index 15ba83ef46..1090af5ae3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/IcBuildingController.java @@ -18,20 +18,16 @@ package com.epmet.controller; import com.epmet.commons.tools.dto.result.OptionResultDTO; -import com.epmet.commons.tools.page.PageData; 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.IcBuildingDTO; import com.epmet.service.IcBuildingService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; -import java.util.Map; /** @@ -43,46 +39,10 @@ import java.util.Map; @RestController @RequestMapping("icbuilding") public class IcBuildingController { - + @Autowired private IcBuildingService icBuildingService; - @GetMapping("page") - public Result> page(@RequestParam Map params){ - PageData page = icBuildingService.page(params); - return new Result>().ok(page); - } - - @GetMapping("{id}") - public Result get(@PathVariable("id") String id){ - IcBuildingDTO data = icBuildingService.get(id); - return new Result().ok(data); - } - - @PostMapping - public Result save(@RequestBody IcBuildingDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class); - icBuildingService.save(dto); - return new Result(); - } - - @PutMapping - public Result update(@RequestBody IcBuildingDTO dto){ - //效验数据 - ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class); - icBuildingService.update(dto); - return new Result(); - } - - @DeleteMapping - public Result delete(@RequestBody String[] ids){ - //效验数据 - AssertUtils.isArrayEmpty(ids, "id"); - icBuildingService.delete(ids); - return new Result(); - } - /** * @Description 获取小区内的楼栋 * @Param dto @@ -94,4 +54,4 @@ public class IcBuildingController { public Result> getBuildingOptions(@RequestBody IcBuildingDTO dto) { return new Result>().ok(icBuildingService.getBuildingOptions(dto.getNeighborHoodId())); } -} \ No newline at end of file +} diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java index 0caa4a5c71..c0ce3e9bd3 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java @@ -23,7 +23,10 @@ import com.epmet.dao.*; import com.epmet.dto.BuildingTreeLevelDTO; import com.epmet.dto.IcBuildingDTO; import com.epmet.dto.form.*; -import com.epmet.dto.result.*; +import com.epmet.dto.result.BuildingResultDTO; +import com.epmet.dto.result.BuildingResultPagedDTO; +import com.epmet.dto.result.IcBuildingListResultDTO; +import com.epmet.dto.result.ImportTaskCommonResultDTO; import com.epmet.entity.*; import com.epmet.enums.BuildingTypeEnums; import com.epmet.excel.IcBuildingExcel; @@ -31,7 +34,10 @@ import com.epmet.feign.EpmetCommonServiceOpenFeignClient; import com.epmet.model.BuildingInfoModel; import com.epmet.model.ImportBuildingInfoListener; import com.epmet.redis.IcHouseRedis; -import com.epmet.service.*; +import com.epmet.service.BuildingService; +import com.epmet.service.IcBuildingService; +import com.epmet.service.IcBuildingUnitService; +import com.epmet.service.IcNeighborHoodService; import com.epmet.util.ExcelPoiUtils; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; @@ -44,7 +50,6 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.io.InputStream; import java.util.*; import java.util.concurrent.ExecutorService; @@ -60,15 +65,10 @@ public class BuildingServiceImpl implements BuildingService { private IcBuildingService icBuildingService; @Resource private IcBuildingDao icBuildingDao; - @Autowired private IcBuildingUnitService icBuildingUnitService; - @Resource private IcHouseDao icHouseDao; - @Autowired - private IcHouseService icHouseService; - @Resource private CustomerAgencyDao customerAgencyDao; @Resource @@ -76,8 +76,6 @@ public class BuildingServiceImpl implements BuildingService { @Resource private IcNeighborHoodDao icNeighborHoodDao; @Resource - private CustomerStaffAgencyDao customerStaffAgencyDao; - @Resource private IcBuildingUnitDao icBuildingUnitDao; @Autowired private IcHouseRedis icHouseRedis; @@ -112,7 +110,7 @@ public class BuildingServiceImpl implements BuildingService { icBuildingUnit.setUnitNum(String.valueOf(i+1)); unitList.add(icBuildingUnit); } - icBuildingUnitService.insertBatch(unitList); + icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED); } @@ -428,12 +426,12 @@ public class BuildingServiceImpl implements BuildingService { * 3. 选中小区可导入该小区下所有楼宇信息、房屋信息(没有匹配的楼宇均新增); * 4. 选中楼宇可导入该楼宇下所有房屋信息。 * @param formDTO - * @param file + * @param inputStream * @author zxc * @date 2022/2/13 10:15 上午 */ @Override - public Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream,Result importTask) throws IOException { + public Result buildingImportExcel(ImportInfoFormDTO formDTO, InputStream inputStream,Result importTask) { executorService.submit(() -> { ExcelReader excelReader = null; try {