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/ComMngVillageServiceImpl.java | 144 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 118 insertions(+), 26 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
index 227a37a..fbd6e11 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngVillageServiceImpl.java
@@ -11,11 +11,14 @@
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComMngVillageServeExcelVO;
import com.panzhihua.common.model.vos.community.ComMngVillageVO;
+import com.panzhihua.common.utlis.StringUtils;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComActVillageDAO;
-import com.panzhihua.service_community.dao.ComMngVolunteerMngDAO;
+import com.panzhihua.service_community.dao.ComMngPopulationDAO;
+import com.panzhihua.service_community.dao.ComMngPopulationHouseDAO;
import com.panzhihua.service_community.model.dos.ComActDO;
-import com.panzhihua.service_community.model.dos.ComActDiscussDO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationDO;
+import com.panzhihua.service_community.model.dos.ComMngPopulationHouseDO;
import com.panzhihua.service_community.model.dos.ComMngVillageDO;
import com.panzhihua.service_community.service.ComMngVillageService;
import org.springframework.beans.BeanUtils;
@@ -23,10 +26,8 @@
import javax.annotation.Resource;
import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Date;
import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
/**
* @author: llming
@@ -38,6 +39,10 @@
ComActVillageDAO comActVillageDAO;
@Resource
ComActDAO comActDAO;
+ @Resource
+ ComMngPopulationDAO populationDAO;
+ @Resource
+ private ComMngPopulationHouseDAO comMngPopulationHouseDAO;
@Override
public R addComActVillage(ComMngVillageVO comMngVillageVO) {
@@ -45,19 +50,24 @@
LambdaQueryWrapper<ComMngVillageDO> param = new QueryWrapper<ComMngVillageDO>().lambda();
param.eq(ComMngVillageDO::getCommunityId, comMngVillageVO.getCommunityId());
param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley());
+ param.eq(ComMngVillageDO::getHouseNum, comMngVillageVO.getHouseNum());
Integer resultCount = comActVillageDAO.selectCount(param);
if (resultCount > 0) {
return R.fail("实有房屋已经存在");
}
BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
+ if (comActDO == null || comActDO.getStreetId() == null) {
+ return R.fail("社区没有绑定街道，请绑定后操作！");
+ }
comMngVillageDO.setStreetId(comActDO.getStreetId());
+ comMngVillageDO.setUpdateAt(new Date());
int insert = comActVillageDAO.insert(comMngVillageDO);
if (insert > 0) {
- param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley());
- param.eq(ComMngVillageDO::getHouseNum, comMngVillageVO.getHouseNum());
- ComMngVillageDO comMngVillageDO1 = comActVillageDAO.selectOne(param);
- BeanUtils.copyProperties(comMngVillageDO1, comMngVillageVO);
+// param.eq(ComMngVillageDO::getAlley, comMngVillageVO.getAlley());
+// param.eq(ComMngVillageDO::getHouseNum, comMngVillageVO.getHouseNum());
+// ComMngVillageDO comMngVillageDO1 = comActVillageDAO.selectOne(param);
+ BeanUtils.copyProperties(comMngVillageDO, comMngVillageVO);
return R.ok(comMngVillageVO);
}
return R.fail();
@@ -77,28 +87,67 @@
@Override
public R pageComActVillage(PageComMngVillageDTO pageComMngVillageDTO) {
- Page page = new Page<>();
- Long pageNum = pageComMngVillageDTO.getPageNum();
- Long pageSize = pageComMngVillageDTO.getPageSize();
- if (null == pageNum || 0 == pageNum) {
- pageNum = 1l;
- }
- if (null == pageSize || 0 == pageSize) {
- pageSize = 10l;
- }
- page.setSize(pageSize);
- page.setCurrent(pageNum);
LambdaQueryWrapper<ComMngVillageDO> userLambdaQueryWrapper = Wrappers.lambdaQuery();
+ if(pageComMngVillageDTO.getCommunityId() != null){
+ userLambdaQueryWrapper.eq(ComMngVillageDO::getCommunityId,pageComMngVillageDTO.getCommunityId());
+ }
if (pageComMngVillageDTO.getAlley() != null) {
userLambdaQueryWrapper.like(ComMngVillageDO::getAlley, pageComMngVillageDTO.getAlley());
}
- Page userPage = new Page(pageNum, pageSize);
- IPage<ComMngVillageDO> doPager = comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper);
- return R.ok(doPager);
+ if (StringUtils.isNotEmpty(pageComMngVillageDTO.getHouseNum())) {
+ userLambdaQueryWrapper.eq(ComMngVillageDO::getHouseNum, pageComMngVillageDTO.getHouseNum());
+ }
+ if (StringUtils.isNotEmpty(pageComMngVillageDTO.getGroupAt())) {
+ userLambdaQueryWrapper.eq(ComMngVillageDO::getGroupAt, pageComMngVillageDTO.getGroupAt());
+ }
+ if(pageComMngVillageDTO.getType() != null){
+ userLambdaQueryWrapper.eq(ComMngVillageDO::getType, pageComMngVillageDTO.getType());
+ }
+ Page userPage = new Page(pageComMngVillageDTO.getPageNum(), pageComMngVillageDTO.getPageSize());
+ IPage<ComMngVillageDO> doPager = comActVillageDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComMngVillageDO::getCreateAt));
+
+ IPage<ComMngVillageVO> villageVOIPage = new Page<>();
+ villageVOIPage.setCurrent(doPager.getCurrent());
+ villageVOIPage.setPages(doPager.getPages());
+ villageVOIPage.setSize(doPager.getSize());
+ villageVOIPage.setTotal(doPager.getTotal());
+ if(!doPager.getRecords().isEmpty()){
+ List<ComMngVillageVO> villageVOList = new ArrayList<>();
+ //统计小区下的数据
+ doPager.getRecords().forEach(village -> {
+ ComMngVillageVO villageVO = new ComMngVillageVO();
+ BeanUtils.copyProperties(village,villageVO);
+ //查询小区统计数据
+ ComMngVillageVO villageTotal = comActVillageDAO.getStatisticsCount(village.getVillageId());
+ if(villageTotal != null){
+ villageVO.setFloorTotal(villageTotal.getFloorTotal());
+ villageVO.setCarTotal(villageTotal.getCarTotal());
+ villageVO.setHouseTotal(villageTotal.getHouseTotal());
+ villageVO.setPopulationTotal(villageTotal.getPopulationTotal());
+ }
+ villageVOList.add(villageVO);
+
+ });
+ villageVOIPage.setRecords(villageVOList);
+ }
+ return R.ok(villageVOIPage);
}
@Override
public R delecComActVillage(List<Long> Ids) {
+ LambdaQueryWrapper<ComMngPopulationHouseDO> paramHouseWrapper = Wrappers.lambdaQuery();
+ paramHouseWrapper.in(ComMngPopulationHouseDO::getVillageId,Ids);
+ List<ComMngPopulationHouseDO> populationHouseDOList = comMngPopulationHouseDAO.selectList(paramHouseWrapper);
+ if (!populationHouseDOList.isEmpty()) {
+ return R.fail("无法删除，已绑定实有房屋!");
+ }
+
+ LambdaQueryWrapper<ComMngPopulationDO> paramWrapper = Wrappers.lambdaQuery();
+ paramWrapper.in(ComMngPopulationDO::getVillageId, Ids);
+ List<ComMngPopulationDO> mngPopulationDOList = populationDAO.selectList(paramWrapper);
+ if (!mngPopulationDOList.isEmpty()) {
+ return R.fail("无法删除，已绑定实有人口!");
+ }
int delete = comActVillageDAO.deleteBatchIds(Ids);
if (delete > 0) {
return R.ok();
@@ -109,10 +158,10 @@
@Override
public R listSaveVillage(List<ComMngVillageServeExcelVO> list, Long communityId) {
//思路：获取社区下所有的实有房屋（小区）,打印已经存在的重复数据
- List<ComMngVillageDO> comMngVillageDOs = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
if (list.size() == 0) {
return R.fail("数据为空！");
}
+ List<ComMngVillageDO> comMngVillageDOs = comActVillageDAO.selectList(new QueryWrapper<ComMngVillageDO>().lambda().eq(ComMngVillageDO::getCommunityId, communityId));
int index = 2;
for (ComMngVillageServeExcelVO vo : list) {
if (vo.getHouseNum() == null) {
@@ -122,13 +171,16 @@
return R.fail("街路巷第" + index + "行为空!");
}
//判断DB和exel数据重复判断
- boolean result = comMngVillageDOs.stream().allMatch(village -> village.getAlley().equals(vo.getAlley()) && village.getHouseNum().equals(vo.getHouseNum()));
+ boolean result = comMngVillageDOs.stream().anyMatch(village -> village.getAlley().equals(vo.getAlley()) && village.getHouseNum().equals(vo.getHouseNum()));
if (result) {
- return R.fail("导入街路巷已存在(" + vo.getAlley()+")");
+ return R.fail("导入街路巷已存在(" + vo.getAlley() + ")");
}
index++;
}
ComActDO comActDO = comActDAO.selectById(communityId);
+ if(comActDO.getStreetId()==null||comActDO.getStreetId().toString().equals("")){
+ return R.fail("请绑定街道，再操作！");
+ }
ArrayList<ComMngVillageDO> comMngVillageDOS = Lists.newArrayList();
list.forEach(vo -> {
ComMngVillageDO comMngVillageDO = new ComMngVillageDO();
@@ -140,4 +192,44 @@
this.saveBatch(comMngVillageDOS);
return R.ok("共计导入实有房屋数量：" + comMngVillageDOS.size());
}
+
+ @Override
+ public R editVillage(Long villageId, ComMngVillageVO comMngVillageVO) {
+ ComMngVillageDO comMngVillageDO = this.baseMapper.selectById(villageId);
+ if (comMngVillageDO == null) {
+ return R.fail("id有误！");
+ }
+ BeanUtils.copyProperties(comMngVillageVO, comMngVillageDO);
+ ComActDO comActDO = comActDAO.selectById(comMngVillageDO.getCommunityId());
+ if (comActDO == null || comActDO.getStreetId() == null) {
+ return R.fail("社区没有绑定街道，请绑定后操作！");
+ }
+ comMngVillageDO.setStreetId(comActDO.getStreetId());
+ int update = this.baseMapper.update(comMngVillageDO, new LambdaQueryWrapper<ComMngVillageDO>()
+ .eq(ComMngVillageDO::getVillageId, villageId));
+ if(update>0){
+ return R.ok(comMngVillageVO);
+ }
+ return R.fail();
+ }
+
+ /**
+ * 统计社区内小区数量
+ * @param communityId 社区id
+ * @return 统计小区数量
+ */
+ @Override
+ public R villageStatistics(Long communityId){
+ return R.ok(this.baseMapper.getVillageStatisticsCount(communityId));
+ }
+
+ /**
+ * 小区详情
+ * @param villageId 小区id
+ * @return 小区详情
+ */
+ @Override
+ public R getVillage(Long villageId){
+ return R.ok(this.baseMapper.getVillageById(villageId));
+ }
}
--
Gitblit v1.7.1