From 10cc0db30a1be5377e4c09bce349014a667849b6 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期三, 12 一月 2022 13:21:08 +0800
Subject: [PATCH] Merge branch 'phs' into test
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 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 882d812..1f9b4c0 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
@@ -1,5 +1,14 @@
package com.panzhihua.service_community.service.impl;
+import java.util.List;
+
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -15,13 +24,6 @@
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;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-
-import javax.annotation.Resource;
-import java.util.List;
/**
* @author: llming
@@ -38,7 +40,8 @@
/**
* 新增社区
*
- * @param comStreetVO 街道信息
+ * @param comStreetVO
+ * 街道信息
* @return 新增结果
*/
@Override
@@ -54,7 +57,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);
@@ -63,14 +66,14 @@
BeanUtils.copyProperties(comStreetDO1, comStreetVO);
return R.ok(comStreetVO);
}
- return R.fail();
+ return R.fail(500, "");
}
-
/**
* 查询街道
*
- * @param comStreetVO 街道名
+ * @param comStreetVO
+ * 街道名
* @return 社区集合
*/
@Override
@@ -85,14 +88,21 @@
if (comStreetVO.getAreaCode() != null) {
param.eq(ComStreetDO::getAreaCode, comStreetVO.getAreaCode());
}
+ List<ComStreetVO> voList = Lists.newArrayList();
List<ComStreetDO> comStreetDOS = comStreetDAO.selectList(param);
- return R.ok(comStreetDOS);
+ comStreetDOS.forEach(dos -> {
+ ComStreetVO vo = new ComStreetVO();
+ BeanUtils.copyProperties(dos, vo);
+ voList.add(vo);
+ });
+ return R.ok(voList);
}
/**
* 社区详情
*
- * @param streetId 街道id
+ * @param streetId
+ * 街道id
* @return 社区详情
*/
@Override
@@ -110,7 +120,8 @@
/**
* 分页查询社区
*
- * @param pageComStreetDTO 查询参数
+ * @param pageComStreetDTO
+ * 查询参数
* @return 分页集合
*/
@Override
@@ -119,10 +130,10 @@
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);
@@ -131,20 +142,23 @@
userLambdaQueryWrapper.like(ComStreetDO::getName, pageComStreetDTO.getName());
}
Page userPage = new Page(pageNum, pageSize);
- IPage<ComStreetDO> doPager = comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));
+ IPage<ComStreetDO> doPager =
+ comStreetDAO.selectPage(userPage, userLambdaQueryWrapper.orderByDesc(ComStreetDO::getCreateAt));
return R.ok(doPager);
}
-
/**
* 批量删除街道
- * @param streetIds 社区id
+ *
+ * @param streetIds
+ * 社区id
* @return 删除结果
*/
@Override
public R delectStreat(List<Long> streetIds) {
- //不能删除，已经绑定了社区的街道
- LambdaQueryWrapper<ComActDO> comActDOParam = new QueryWrapper<ComActDO>().lambda().in(ComActDO::getStreetId, 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("删除失败，批量删除街道中，街道下有社区无法删除！");
@@ -155,6 +169,5 @@
}
return R.fail();
}
-
}
--
Gitblit v1.7.1