From 3c884ccd7b51edf3b36840bf99de5edaa41a38a7 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 12 十月 2022 19:05:28 +0800
Subject: [PATCH] 三说会堂事件流程处理
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 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..4652fc7 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
@@ -7,6 +7,8 @@
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;
@@ -223,8 +225,8 @@
* @return 社区列表
*/
@Override
- public R getCommunityLists() {
- return R.ok(this.comActDAO.getCommunityLists());
+ public R getCommunityLists(String appId) {
+ return R.ok(this.comActDAO.getCommunityLists(appId));
}
@Override
@@ -238,9 +240,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 =
@@ -250,8 +252,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);
}
@@ -263,8 +265,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 +283,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