From b3c6911c1e78563dc04998dd7bfb510130a9fcec Mon Sep 17 00:00:00 2001
From: huanghongfa <18228131219@163.com>
Date: 星期一, 01 二月 2021 16:37:52 +0800
Subject: [PATCH] auth
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
index 343de96..a7e7416 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructAreaServiceImpl.java
@@ -16,6 +16,7 @@
import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -77,7 +78,7 @@
}
page.setSize(pageSize);
page.setCurrent(pageNum);
- IPage<ComActDynVO> iPage = comMngStructAreaDAO.pageArea(page, comMngStructAreaVO);
+ IPage<ComMngStructAreaVO> iPage = comMngStructAreaDAO.pageArea(page, comMngStructAreaVO);
return R.ok(iPage);
}
@@ -151,8 +152,34 @@
*/
@Override
public R listArea(Long communityId) {
+ List<ComMngStructAreaVO> comMngStructAreaVOS=new ArrayList<>();
List<ComMngStructAreaDO> comMngStructAreaDOS = comMngStructAreaDAO.selectList(new QueryWrapper<ComMngStructAreaDO>().lambda().eq(ComMngStructAreaDO::getCommunityId, communityId));
- return R.ok(comMngStructAreaDOS);
+ if (!ObjectUtils.isEmpty(comMngStructAreaDOS)) {
+ comMngStructAreaDOS.forEach(comMngStructAreaDO -> {
+ ComMngStructAreaVO comMngStructAreaVO=new ComMngStructAreaVO();
+ BeanUtils.copyProperties(comMngStructAreaDO,comMngStructAreaVO);
+ comMngStructAreaVOS.add(comMngStructAreaVO);
+ });
+
+ }
+ return R.ok(comMngStructAreaVOS);
+ }
+
+ /**
+ * 小区详情
+ *
+ * @param areaId 小区id
+ * @return 小区信息
+ */
+ @Override
+ public R detailArea(Long areaId) {
+ ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(areaId);
+ if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
+ return R.fail("小区不存在");
+ }
+ ComMngStructAreaVO comMngStructAreaVO=new ComMngStructAreaVO();
+ BeanUtils.copyProperties(comMngStructAreaDO,comMngStructAreaVO);
+ return R.ok(comMngStructAreaVO);
}
--
Gitblit v1.7.1