From 43f0578e80af82ecae6c61b51bd0539c6b960603 Mon Sep 17 00:00:00 2001
From: puhanshu <a9236326>
Date: 星期二, 16 八月 2022 19:08:32 +0800
Subject: [PATCH] 服务范围优化

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java |   50 +++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 11 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
index 41cd082..5c4f4f1 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java
@@ -1,12 +1,12 @@
 package com.panzhihua.service_community.service.impl;
 
 import java.util.ArrayList;
-import java.util.Comparator;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.annotation.Resource;
 
+import com.panzhihua.common.model.vos.community.ComActPasswordVo;
+import com.panzhihua.service_community.util.MyAESUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
@@ -63,6 +63,7 @@
             return R.fail("社区已经存在");
         }
         BeanUtils.copyProperties(comActVO, comActDO);
+        comActDO.setPlaintextPassword(password);
         int insert = comActDAO.insert(comActDO);
         if (insert > 0) {
             ComActDO comActDO1 =
@@ -91,6 +92,7 @@
         if (!ObjectUtils.isEmpty(password)) {
             String encode = new BCryptPasswordEncoder().encode(password);
             comActVO.setPassword(encode);
+            comActDO.setPlaintextPassword(password);
             a = 1;
         }
         ComStreetDO comStreetDO = comStreetDAO.selectById(comActVO.getStreetId());
@@ -101,7 +103,10 @@
         // a=1;
         // }
         BeanUtils.copyProperties(comActVO, comActDO);
-
+//        ComActDO selectOne = comActDAO.selectOne(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getAccount, account));
+//        if (null != selectOne && selectOne.getAccount().equals(comActVO.getAccount())) {
+//            return R.fail("该登录账号重复，请重新修改");
+//        }
         int update = comActDAO.updateById(comActDO);
         if (update > 0) {
             if (a == 1) {
@@ -142,6 +147,13 @@
         ComActVO comActVO = new ComActVO();
         BeanUtils.copyProperties(comActDO, comActVO);
         comActVO.setAreaName(comActDAO.selectAreaName(comActVO.getAreaCode()));
+        comActVO.setAccount(null);
+        comActVO.setPassword(null);
+        comActVO.setAddress(null);
+        comActVO.setContacts(null);
+        comActVO.setCreateAt(null);
+        comActVO.setState(null);
+        comActVO.setDistance(null);
         return R.ok(comActVO);
     }
 
@@ -175,9 +187,9 @@
      * @return 社区集合 按照创建顺序倒序排列
      */
     @Override
-    public R listCommunityAll() {
+    public R listCommunityAll(String areaCode) {
         List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0)
-            .eq(ComActDO::getCityCode, "510400").orderByDesc(ComActDO::getCreateAt));
+            .eq(ComActDO::getAreaCode, areaCode).orderByDesc(ComActDO::getCreateAt));
         List<ComActVO> comActVOS = new ArrayList<>();
         if (!ObjectUtils.isEmpty(comActDOS)) {
             comActDOS.forEach(comActDO -> {
@@ -215,15 +227,20 @@
         return R.ok(this.comActDAO.getCommunityLists());
     }
 
+    @Override
+    public R getWestCommunityLists(String areaCode) {
+        return R.ok(this.comActDAO.getWestCommunityLists(areaCode));
+    }
+
     /**
      * 查询社区所有列表
      * 
      * @return 社区列表
      */
     @Override
-    public R getCommunityAllList() {
+    public R getCommunityAllList(String appId) {
         // 查询街道列表
-        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList();
+        List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(appId);
         streetList.forEach(street -> {
             // 查询街道下社区列表
             List<CommunitySwitchAllAppletsVO> communityList =
@@ -233,8 +250,8 @@
                 street.setCount(communityList.size());
             }
         });
-        streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
-            .collect(Collectors.toList());
+//        streetList = streetList.stream().sorted(Comparator.comparing(StreetAllAppletsVO::getCount).reversed())
+//            .collect(Collectors.toList());
         return R.ok(streetList);
     }
 
@@ -246,8 +263,8 @@
      * @return 社区列表
      */
     @Override
-    public R communitySwitchSearchList(String name) {
-        return R.ok(this.comActDAO.getCommunityListByName(name));
+    public R communitySwitchSearchList(String name,String appId) {
+        return R.ok(this.comActDAO.getCommunityListByName(name,appId));
     }
 
     /**
@@ -262,4 +279,15 @@
         return R.ok(this.comActDAO.getCommunityListByNearby(communityDTO));
     }
 
+    @Override
+    public R getCommunityPassword(Long communityId){
+        ComActPasswordVo comActPasswordVo=comActDAO.getCommunityPassword(communityId);
+        try {
+            comActPasswordVo.setPassword(MyAESUtil.Decrypt(comActPasswordVo.getPassword(),"Ryo7M3n8loC5Abcd"));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+        return R.ok(comActPasswordVo);
+    }
+
 }

--
Gitblit v1.7.1