diff --git a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java index 23451a79d7..b0367639ed 100644 --- a/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java +++ b/epmet-module/epmet-heart/epmet-heart-client/src/main/java/com/epmet/dto/IcPartyActivityDTO.java @@ -68,7 +68,6 @@ public class IcPartyActivityDTO implements Serializable { /** * act_info表ID */ - @JsonIgnore private String actId; private String unitId; 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 322d580490..4098e0bcc0 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 @@ -71,13 +71,26 @@ public class HouseController implements ResultDataResolver { @PostMapping("houselist") - public Result> houseList(@RequestBody IcHouseListFormDTO formDTO) { + public Result> houseList(@LoginUser TokenDto loginUser, @RequestBody IcHouseListFormDTO formDTO) { //效验数据 + LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(loginUser, "【查询房屋】查询当前staff所在组织信息失败"); + formDTO.setAgencyId(loginUserDetail.getAgencyId()); ValidatorUtils.validateEntity(formDTO); return new Result().ok(houseService.getHouseList(formDTO)); } + public LoginUserDetailsResultDTO getLoginUserDetailsResultDTO(@LoginUser TokenDto loginUser, String errorMsg) { + LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO(); + form.setUserId(loginUser.getUserId()); + form.setClient(loginUser.getClient()); + form.setApp(loginUser.getApp()); + return getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER, + EpmetErrorCode.SERVER_ERROR.getCode(), + errorMsg, + null); + } + /** * @return * @Description 社区查询-搜索房屋 @@ -105,14 +118,7 @@ public class HouseController implements ResultDataResolver { buildingName = null; } - LoginUserDetailsFormDTO form = new LoginUserDetailsFormDTO(); - form.setUserId(loginUser.getUserId()); - form.setClient(loginUser.getClient()); - form.setApp(loginUser.getApp()); - LoginUserDetailsResultDTO loginUserDetail = getResultDataOrThrowsException(userOpenFeignClient.getLoginUserDetails(form), ServiceConstant.EPMET_USER_SERVER, - EpmetErrorCode.SERVER_ERROR.getCode(), - "【社区查询-查询房屋】查询当前staff所在组织信息失败", - null); + LoginUserDetailsResultDTO loginUserDetail = getLoginUserDetailsResultDTO(loginUser, "【社区查询-查询房屋】查询当前staff所在组织信息失败"); formDTO.setAgencyId(loginUserDetail.getAgencyId()); formDTO.setBuildingName(buildingName); formDTO.setNeighborHoodName(neighborhoodName); 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 1a3611f72c..679a194fcf 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 @@ -7,6 +7,7 @@ import com.alibaba.excel.read.metadata.ReadSheet; 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.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.epmet.commons.mybatis.entity.BaseEpmetEntity; import com.epmet.commons.tools.constant.NumConstant; @@ -54,9 +55,11 @@ import org.springframework.util.CollectionUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletResponse; import java.io.InputStream; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.stream.Collectors; @Slf4j @@ -299,7 +302,8 @@ public class BuildingServiceImpl implements BuildingService { @Override public PageData listBuilding(IcBuildingListFormDTO formDTO) { - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> icBuildingDao.searchBuildingByPage(formDTO)); List records = pageInfo.getList(); records.forEach(item -> item.setBuildingType(BuildingTypeEnums.getTypeValue(item.getBuildingTypeKey()))); return new PageData<>(pageInfo.getList(), pageInfo.getTotal()); @@ -454,15 +458,15 @@ public class BuildingServiceImpl implements BuildingService { String unitNum = String.valueOf(i); if (!unitMap.containsKey(unitNum)) { IcBuildingUnitEntity icBuildingUnit = new IcBuildingUnitEntity(); + icBuildingUnit.setId(IdWorker.getIdStr()); icBuildingUnit.setBuildingId(icBuilding.getId()); icBuildingUnit.setCustomerId(customerId); icBuildingUnit.setUnitName(unitNum + "单元"); icBuildingUnit.setUnitNum(unitNum); unitList.add(icBuildingUnit); } - icBuildingUnitService.insertBatch(unitList); - } + icBuildingUnitService.insertBatch(unitList, NumConstant.ONE_HUNDRED); } //删除楼栋下所有的房屋缓存 List houseList = icHouseDao.selectList(new QueryWrapper().lambda().eq(IcHouseEntity::getBuildingId, formDTO.getBuildingId())); diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java index 64dd27807d..16d019db61 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/HouseServiceImpl.java @@ -167,9 +167,15 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { pids = getPids(formDTO.getAgencyId()); } formDTO.setPids(pids); + PageInfo pageInfo = null; + if (formDTO.getIsPage()){ + pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()) + .doSelectPageInfo(() -> icHouseDao.searchHouseByPage(formDTO)); + }else{ + List resultDTOS = icHouseDao.searchHouseByPage(formDTO); + pageInfo = new PageInfo<>(resultDTOS,resultDTOS.size()); + } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(),formDTO.getIsPage()).doSelectPageInfo(() -> - icHouseDao.searchHouseByPage(formDTO)); List records = pageInfo.getList(); records.forEach(item->{ item.setHouseType(HouseTypeEnums.getTypeValue(item.getHouseTypeKey())); @@ -204,8 +210,6 @@ public class HouseServiceImpl implements HouseService, ResultDataResolver { Map map = new HashMap<>(); map.put("maplist",icHouseExcels.getList()); ExcelPoiUtils.exportExcel(templatePath ,map,"房屋信息录入表",response); - - return ; } @Override diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java index ebc6b80744..991469c313 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java @@ -103,7 +103,8 @@ public class NeighborHoodServiceImpl implements NeighborHoodService { //根据组织过滤 formDTO.setAgencyId(formDTO.getId()); } - PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()).doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); + PageInfo pageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize(), formDTO.getIsPage()) + .doSelectPageInfo(() -> icNeighborHoodDao.searchNeighborhoodByPage(formDTO)); return new PageData<>(pageInfo.getList(),pageInfo.getTotal()); } 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 59ac9f2b24..ef222cc698 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 @@ -149,7 +149,7 @@ AND a.DEL_FLAG = #{building.delFlag} - + order by a.CREATED_TIME, a.BUILDING_NAME