From cc1098fc00a50cb1591d182f04bc37066ff0a9e2 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期四, 05 八月 2021 15:12:39 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
index 4748672..dd8a675 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -12,6 +12,7 @@
import com.panzhihua.common.model.vos.community.ComStreetVO;
import com.panzhihua.service_community.dao.ComActDAO;
import com.panzhihua.service_community.dao.ComStreetDAO;
+import com.panzhihua.service_community.model.dos.ComActDO;
import com.panzhihua.service_community.model.dos.ComStreetDO;
import com.panzhihua.service_community.service.ComStreetService;
import org.springframework.beans.BeanUtils;
@@ -53,7 +54,7 @@
param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
Integer integer = comStreetDAO.selectCount(param);
if (integer > 0) {
- return R.fail("街道已经存在");
+ return R.fail(500, "街道已经存在");
}
BeanUtils.copyProperties(comStreetVO, comStreetDO);
int insert = comStreetDAO.insert(comStreetDO);
@@ -62,7 +63,7 @@
BeanUtils.copyProperties(comStreetDO1, comStreetVO);
return R.ok(comStreetVO);
}
- return R.fail();
+ return R.fail(500, "");
}
@@ -74,14 +75,24 @@
*/
@Override
public R listStreet(ComStreetVO comStreetVO) {
- List<ComStreetVO> vos = Lists.newArrayList();
LambdaQueryWrapper<ComStreetDO> param = new QueryWrapper<ComStreetDO>().lambda();
- param.eq(ComStreetDO::getProvinceCode, comStreetVO.getProvinceCode());
- param.eq(ComStreetDO::getCityCode, comStreetVO.getCityCode());
- param.eq(ComStreetDO::getAreaCode, comStreetVO.getCityCode());
- List<ComStreetDO> ComStreetDOS = comStreetDAO.selectList(param);
- BeanUtils.copyProperties(vos, ComStreetDOS);
- return R.ok(comStreetVO);
+ if (comStreetVO.getProvinceCode() != null) {
+ param.eq(ComStreetDO::getProvinceCode, comStreetVO.getProvinceCode());
+ }
+ if (comStreetVO.getCityCode() != null) {
+ param.eq(ComStreetDO::getCityCode, comStreetVO.getCityCode());
+ }
+ if (comStreetVO.getAreaCode() != null) {
+ param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
+ }
+ List<ComStreetVO> voList = Lists.newArrayList();
+ List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
+ comStreetDOS.forEach(dos -> {
+ ComStreetVO vo = new ComStreetVO();
+ BeanUtils.copyProperties(dos, vo);
+ voList.add(vo);
+ });
+ return R.ok(voList);
}
/**
@@ -114,37 +125,42 @@
Long pageNum = pageComStreetDTO.getPageNum();
Long pageSize = pageComStreetDTO.getPageSize();
if (null == pageNum || 0 == pageNum) {
- pageNum = 1l;
+ pageNum = 1L;
}
if (null == pageSize || 0 == pageSize) {
- pageSize = 10l;
+ pageSize = 10L;
}
page.setSize(pageSize);
page.setCurrent(pageNum);
LambdaQueryWrapper<ComStreetDO> userLambdaQueryWrapper = Wrappers.lambdaQuery();
- if (!pageComStreetDTO.getName().isEmpty()) {
+ if (pageComStreetDTO.getName() != null) {
userLambdaQueryWrapper.like(ComStreetDO::getName, pageComStreetDTO.getName());
}
Page userPage = new Page(pageNum, pageSize);
- IPage<ComStreetDO> doPager = comStreetDAO.selectPage(userPage, userLambdaQueryWrapper);
+ IPage<ComStreetDO> doPager = comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));
return R.ok(doPager);
}
/**
- * 批量删除社区
+ * 批量删除街道
*
* @param streetIds 社区id
* @return 删除结果
*/
@Override
public R delectStreat(List<Long> streetIds) {
+ //不能删除，已经绑定了社区的街道
+ LambdaQueryWrapper<ComActDO> comActDOParam = new QueryWrapper<ComActDO>().lambda().in(ComActDO::getStreetId, streetIds);
+ List<ComActDO> comActDOS = comActDAO.selectList(comActDOParam);
+ if (comActDOS != null && comActDOS.size() > 0) {
+ return R.fail("删除失败，批量删除街道中，街道下有社区无法删除！");
+ }
int delete = comStreetDAO.deleteBatchIds(streetIds);
if (delete > 0) {
return R.ok();
}
return R.fail();
}
-
}
--
Gitblit v1.7.1