From d26e31aad7a9e843ce149e88668ce38e2cefd219 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期六, 08 十月 2022 14:59:55 +0800
Subject: [PATCH] update
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 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 00931e4..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;
@@ -238,9 +238,9 @@
* @return 社区列表
*/
@Override
- public R getCommunityAllList(String areaCode) {
+ public R getCommunityAllList(String appId) {
// 查询街道列表
- List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(areaCode);
+ List<StreetAllAppletsVO> streetList = this.comActDAO.getStreetList(appId);
streetList.forEach(street -> {
// 查询街道下社区列表
List<CommunitySwitchAllAppletsVO> communityList =
@@ -263,8 +263,8 @@
* @return 社区列表
*/
@Override
- public R communitySwitchSearchList(String name,String areaCode) {
- return R.ok(this.comActDAO.getCommunityListByName(name,areaCode));
+ public R communitySwitchSearchList(String name,String appId) {
+ return R.ok(this.comActDAO.getCommunityListByName(name,appId));
}
/**
@@ -281,7 +281,13 @@
@Override
public R getCommunityPassword(Long communityId){
- return R.ok(comActDAO.getCommunityPassword(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