From 54ad966d0b142c97fc659263b51d1ea5d7b5c7c6 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期五, 28 五月 2021 16:17:08 +0800
Subject: [PATCH] 修改bug
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 209 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
index 8dcf780..75dac62 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationHouseServiceImpl.java
@@ -1,11 +1,28 @@
package com.panzhihua.service_community.service.impl;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.model.dtos.community.CascadeHouseDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseAdminDTO;
+import com.panzhihua.common.model.dtos.community.ComMngPopulationHouseEditAdminDTO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.model.vos.community.ComMngCascadeHouseVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationHouseDetailAdminVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationHouseTotalVO;
+import com.panzhihua.common.model.vos.community.ComMngPopulationHouseUserAdminVO;
import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
+import com.panzhihua.service_community.dao.ComMngPopulationHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.service.ComMngPopulationHouseService;
import lombok.extern.slf4j.Slf4j;
+import org.checkerframework.checker.units.qual.A;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.stream.Collectors;
/**
* @auther lyq
@@ -16,4 +33,196 @@
@Service
public class ComMngPopulationHouseServiceImpl extends ServiceImpl<ComMngPopulationHouseDAO, ComMngPopulationHouseDO> implements ComMngPopulationHouseService {
+ @Resource
+ private ComMngPopulationHouseUserDAO comMngPopulationHouseUserDAO;
+
+ /**
+ * 查询房屋级联菜单
+ * @param cascadeHouseDTO 请求参数
+ * @return 菜单列表
+ */
+ @Override
+ public R getCascadeHouseAddress(CascadeHouseDTO cascadeHouseDTO){
+ List<ComMngCascadeHouseVO> cascadeHouseVOList = new ArrayList<>();
+
+ ComMngPopulationHouseDO houseDO = null;
+ if(cascadeHouseDTO.getHouseId() != null){
+ houseDO = this.baseMapper.selectById(cascadeHouseDTO.getHouseId());
+ }
+
+ switch (cascadeHouseDTO.getLevel()){
+ case 1:
+ cascadeHouseVOList = this.baseMapper.getHouseLevelByAlley(cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
+ cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley()))), ArrayList::new));
+ cascadeHouseVOList.forEach(cascade -> {
+ cascade.setName(cascade.getAlley());
+ });
+ break;
+ case 2:
+ if(houseDO != null){
+ cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNum(houseDO.getAlley(),cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
+ cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum()))), ArrayList::new));
+ cascadeHouseVOList.forEach(cascade -> {
+ cascade.setName(cascade.getHouseNum());
+ });
+ }
+ break;
+ case 3:
+ if(houseDO != null) {
+ cascadeHouseVOList = this.baseMapper.getHouseLevelByFloor(houseDO.getAlley(), houseDO.getHouseNum(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
+ cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor()))), ArrayList::new));
+ cascadeHouseVOList.forEach(cascade -> {
+ cascade.setName(cascade.getFloor());
+ });
+ }
+ break;
+ case 4:
+ if(houseDO != null) {
+ cascadeHouseVOList = this.baseMapper.getHouseLevelByUnitNo(houseDO.getAlley(), houseDO.getHouseNum(), houseDO.getFloor(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
+ cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor() + ";" + o.getUnitNo()))), ArrayList::new));
+ cascadeHouseVOList.forEach(cascade -> {
+ cascade.setName(cascade.getUnitNo());
+ });
+ }
+ break;
+ case 5:
+ if(houseDO != null) {
+ cascadeHouseVOList = this.baseMapper.getHouseLevelByHouseNo(houseDO.getAlley(), houseDO.getHouseNum(), houseDO.getFloor(), houseDO.getUnitNo(), cascadeHouseDTO.getCommunityId(),cascadeHouseDTO.getVillageId());
+ cascadeHouseVOList = cascadeHouseVOList.stream().collect(Collectors.collectingAndThen(Collectors.toCollection(() -> new TreeSet<>(Comparator.comparing(o -> o.getAlley() + ";" + o.getHouseNum() + ";" + o.getFloor() + ";" + o.getUnitNo() + ";" + o.getHouseNo()))), ArrayList::new));
+ cascadeHouseVOList.forEach(cascade -> {
+ cascade.setName(cascade.getHouseNo());
+ });
+ }
+ break;
+ default:
+ break;
+ }
+ return R.ok(cascadeHouseVOList);
+ }
+
+ /**
+ * 分页查询房屋列表
+ * @param populationHouseAdminDTO 请求参数
+ * @return 房屋列表
+ */
+ @Override
+ public R getPageHouse(ComMngPopulationHouseAdminDTO populationHouseAdminDTO){
+
+ if(populationHouseAdminDTO.getHouseId() != null){
+ ComMngPopulationHouseDO houseDO = this.baseMapper.selectById(populationHouseAdminDTO.getHouseId());
+ if(houseDO != null){
+ switch (populationHouseAdminDTO.getLevel()){
+ case 1:
+ populationHouseAdminDTO.setRoad(houseDO.getAlley());
+ break;
+ case 2:
+ populationHouseAdminDTO.setRoad(houseDO.getAlley());
+ populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
+ break;
+ case 3:
+ populationHouseAdminDTO.setRoad(houseDO.getAlley());
+ populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
+ populationHouseAdminDTO.setFloor(houseDO.getFloor());
+ break;
+ case 4:
+ populationHouseAdminDTO.setRoad(houseDO.getAlley());
+ populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
+ populationHouseAdminDTO.setFloor(houseDO.getFloor());
+ populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
+ break;
+ case 5:
+ populationHouseAdminDTO.setRoad(houseDO.getAlley());
+ populationHouseAdminDTO.setDoorNo(houseDO.getHouseNum());
+ populationHouseAdminDTO.setFloor(houseDO.getFloor());
+ populationHouseAdminDTO.setUnitNo(houseDO.getUnitNo());
+ populationHouseAdminDTO.setHouseNo(houseDO.getHouseNo());
+ break;
+ default:
+ break;
+ }
+ }
+ }
+ return R.ok(this.baseMapper.getPageHouse(new Page(populationHouseAdminDTO.getPageNum(),populationHouseAdminDTO.getPageSize()),populationHouseAdminDTO));
+ }
+
+ /**
+ * 根据id查询实有房屋信息
+ * @param houseId 房屋id
+ * @return 房屋信息
+ */
+ @Override
+ public R getHouseDetail(Long houseId){
+ ComMngPopulationHouseDetailAdminVO houseDetailAdminVO = this.baseMapper.getHouseDetail(houseId);
+ if(houseDetailAdminVO != null){
+ //查询房屋下住户信息
+ List<ComMngPopulationHouseUserAdminVO> houseUserList = comMngPopulationHouseUserDAO.getHouseUserByHouseId(houseDetailAdminVO.getId());
+ if(!houseUserList.isEmpty()){
+ houseDetailAdminVO.setHouseUserList(houseUserList);
+ }
+ }
+ return R.ok(houseDetailAdminVO);
+ }
+
+ /**
+ * 编辑实有房屋信息
+ * @param houseEditAdminDTO 请求参数
+ * @return 编辑结果
+ */
+ @Override
+ public R editHouse(ComMngPopulationHouseEditAdminDTO houseEditAdminDTO){
+
+ //查询实有房屋信息
+ ComMngPopulationHouseDO houseDO = this.baseMapper.selectById(houseEditAdminDTO.getHouseId());
+ if(houseDO == null){
+ return R.fail("参数错误");
+ }
+
+ BeanUtils.copyProperties(houseEditAdminDTO,houseDO);
+ houseDO.setUpdateAt(new Date());
+ if(this.baseMapper.updateById(houseDO) > 0){
+ return R.ok();
+ }else{
+ return R.fail();
+ }
+ }
+
+ /**
+ * 根据房屋id列表删除房屋信息
+ * @param Ids 请求参数
+ * @return 删除结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public R deleteHouses(List<Long> Ids){
+ if(this.baseMapper.deleteBatchIds(Ids) > 0){
+ return R.ok();
+ }else{
+ return R.fail();
+ }
+ }
+
+ /**
+ * 实有房屋统计
+ * @param communityId 社区id
+ * @return 统计结果
+ */
+ @Override
+ public R getHouseTotalByAdmin(Long communityId){
+ ComMngPopulationHouseTotalVO houseTotalVO = new ComMngPopulationHouseTotalVO();
+ if(communityId != null){
+ houseTotalVO = this.baseMapper.getHouseTotalByAdmin(communityId);
+ }
+ return R.ok(houseTotalVO);
+ }
+
+ /**
+ * 根据社区id查询社区所有省市区
+ * @param communityId 社区id
+ * @return 社区所在省市区
+ */
+ @Override
+ public R getRegion(Long communityId){
+ return R.ok(this.baseMapper.getRegion(communityId));
+ }
+
}
--
Gitblit v1.7.1