From 14487d3f70db28aeb72bc299a5e5c04456003ed3 Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 23 Dec 2021 10:49:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=A0=91=E4=B9=9F=E6=8E=92?= =?UTF-8?q?=E4=B8=80=E4=B8=8B=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/controller/BuildingController.java | 8 +- .../com/epmet/service/BuildingService.java | 8 +- .../service/impl/BuildingServiceImpl.java | 29 +++-- .../main/resources/mapper/IcBuildingDao.xml | 112 ------------------ 4 files changed, 21 insertions(+), 136 deletions(-) diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java index 98b5d1233e..adaa3ed3f1 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/BuildingController.java @@ -92,9 +92,7 @@ public class BuildingController { //效验数据 ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.AddShowGroup.class); String customerId = tokenDTO.getCustomerId(); -// String customerId = "123123"; - - buildingService.AddBuilding(customerId,formDTO); + buildingService.addBuilding(customerId,formDTO); return new Result().ok("保存成功"); } @@ -105,7 +103,7 @@ public class BuildingController { ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.UpdateShowGroup.class); String customerId = tokenDTO.getCustomerId(); // String customerId = "123123"; - buildingService.UpdateBuilding(customerId,formDTO); + buildingService.updateBuilding(customerId,formDTO); return new Result().ok("修改成功"); } @@ -114,7 +112,7 @@ public class BuildingController { //效验数据 ValidatorUtils.validateEntity(formDTO, IcBulidingFormDTO.DeleteGroup.class); String buildingId = formDTO.getBuildingId(); - buildingService.DelBuilding(buildingId); + buildingService.delBuilding(buildingId); return new Result(); } diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java index 3a78628602..81b70a4bd2 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/BuildingService.java @@ -40,16 +40,16 @@ public interface BuildingService { - void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO); + void updateBuilding(String customerId, IcBulidingFormDTO formDTO); /** * 删除小区 * @param buildingId */ - void DelBuilding(String buildingId); + void delBuilding(String buildingId); - void AddBuilding(String customerId, IcBulidingFormDTO formDTO); + void addBuilding(String customerId, IcBulidingFormDTO formDTO); List treeList(String customerId); @@ -62,4 +62,4 @@ public interface BuildingService { List buildingListByIds(List buildingIdList); BuildingResultPagedDTO buildinglistbyidsPage(List buildingIdList, Integer pageNo, Integer pageSize); -} \ 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 512a89c209..c421861a7c 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 @@ -1,9 +1,11 @@ package com.epmet.service.impl; import cn.afterturn.easypoi.excel.entity.TemplateExportParams; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.tools.dto.result.CustomerStaffInfoCacheResult; import com.epmet.commons.tools.exception.EpmetErrorCode; import com.epmet.commons.tools.exception.RenException; @@ -70,7 +72,7 @@ public class BuildingServiceImpl implements BuildingService { @Override @Transactional(rollbackFor = Exception.class) - public void AddBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void addBuilding(String customerId, IcBulidingFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),null); if (null != count && count > 0) { @@ -152,8 +154,10 @@ public class BuildingServiceImpl implements BuildingService { //3.获取网格下的所有小区 - List gridIdList = customerGridList.stream().map(a->a.getId()).collect(Collectors.toList()); - List icNeighborHoodList = icNeighborHoodDao.selectList(new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList)); + List gridIdList = customerGridList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper queryWrapper = new QueryWrapper().lambda().in(IcNeighborHoodEntity::getGridId, gridIdList); + queryWrapper.orderByAsc(IcNeighborHoodEntity::getCreatedTime); + List icNeighborHoodList = icNeighborHoodDao.selectList(queryWrapper); if(CollectionUtils.isEmpty(icNeighborHoodList)){ agencyList.addAll(gridList); return covertToTree(customerAgency,agencyList); @@ -171,8 +175,11 @@ public class BuildingServiceImpl implements BuildingService { }).collect(Collectors.toList()); //3.获取小区下的所有楼宇 - List neighborHoodIdList = icNeighborHoodList.stream().map(a->a.getId()).collect(Collectors.toList()); - List icBuildingList = icBuildingDao.selectList(new QueryWrapper().lambda().in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList)); + List neighborHoodIdList = icNeighborHoodList.stream().map(BaseEpmetEntity::getId).collect(Collectors.toList()); + LambdaQueryWrapper buildingQueryWrapper = new QueryWrapper().lambda() + .in(IcBuildingEntity::getNeighborHoodId, neighborHoodIdList) + .orderByAsc(IcBuildingEntity::getBuildingName); + List icBuildingList = icBuildingDao.selectList(buildingQueryWrapper); if(CollectionUtils.isEmpty(neighborHoodIdList)){ agencyList.addAll(gridList); @@ -193,14 +200,6 @@ public class BuildingServiceImpl implements BuildingService { return buildingTreeLevelDTO; }).collect(Collectors.toList()); - - - - //组织 -// gridList.stream() -// Map> gridMap = gridList.stream().collect(Collectors.groupingBy(e -> e.getPId())); -// List allList = agencyList.addAll(gridList) - agencyList.addAll(gridList); agencyList.addAll(neighbourHoodList); agencyList.addAll(buildingList); @@ -412,7 +411,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override @Transactional(rollbackFor = Exception.class) - public void UpdateBuilding(String customerId, IcBulidingFormDTO formDTO) { + public void updateBuilding(String customerId, IcBulidingFormDTO formDTO) { //同一小区下不能存在楼栋名字一样的 Integer count = icBuildingDao.checkBuildName(formDTO.getNeighborHoodId(),formDTO.getBuildingName(),formDTO.getBuildingId()); if (null != count && count > 0) { @@ -468,7 +467,7 @@ public class BuildingServiceImpl implements BuildingService { */ @Override @Transactional(rollbackFor = Exception.class) - public void DelBuilding(String buildingId) { + public void delBuilding(String buildingId) { //如果存在房屋，无法删除 List icHouseEntities = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, buildingId)); if(!CollectionUtils.isEmpty(icHouseEntities)){ diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml index a9df36a163..f3aaa7ba80 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml +++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/IcBuildingDao.xml @@ -138,117 +138,6 @@ - - - - - - -