From 5e7892cd0921111dfbaf84196f2593f8045d1c11 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期四, 08 十二月 2022 13:16:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java | 20 ++++++++++++++++++++
1 files changed, 20 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
index 14895c5..476b59d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComPropertyServiceImpl.java
@@ -3,6 +3,7 @@
import cn.hutool.core.date.DateUtil;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.panzhihua.common.constants.UserConstants;
import com.panzhihua.common.model.dtos.property.CommonPage;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.community.ComPropertyVO;
@@ -14,6 +15,8 @@
import com.panzhihua.service_community.service.ComPropertyService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.core.StringRedisTemplate;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +39,8 @@
private ComPropertyDao comPropertyDao;
@Resource
private UserService userService;
+ @Resource
+ private StringRedisTemplate stringRedisTemplate;
@Override
public R pageList(CommonPage commonPage) {
return R.ok(comPropertyDao.pageList(new Page(commonPage.getPage(),commonPage.getSize()),commonPage));
@@ -55,6 +60,9 @@
if (isNotBlank(comPropertyVO.getAccount())) {
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
administratorsUserVO.setType(3);
+ if (comPropertyVO.getCommunityId().equals(10172)){
+ administratorsUserVO.setType(20);
+ }
administratorsUserVO.setAccount(comPropertyVO.getAccount());
administratorsUserVO.setPassword(comPropertyVO.getPassword());
administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
@@ -62,6 +70,7 @@
administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
administratorsUserVO.setName(comPropertyVO.getContactName());
administratorsUserVO.setPhone(comPropertyVO.getPhone());
+ administratorsUserVO.setAppid(userService.detailUser(comPropertyVO.getCreateUserId()).getData().getAppId());
R r=userService.addUserBackstageProperty(administratorsUserVO);
if(R.isOk(r)){
comProperty.setUserId(Long.parseLong(r.getData().toString()));
@@ -88,12 +97,18 @@
ComProperty comPropertyBase=this.comPropertyDao.selectById(comPropertyVO.getId());
AdministratorsUserVO administratorsUserVO=new AdministratorsUserVO();
administratorsUserVO.setUserId(comPropertyBase.getUserId());
+ administratorsUserVO.setAccount(comPropertyVO.getAccount());
+ administratorsUserVO.setPassword(comPropertyVO.getPassword());
administratorsUserVO.setRoleId(comPropertyVO.getRoleId());
administratorsUserVO.setLastLoginTime(DateUtil.date());
administratorsUserVO.setAreaId(comPropertyVO.getAreaId());
this.userService.putUserBackstage(administratorsUserVO);
+ // 删除用户信息缓存
+ String userKey = UserConstants.LOGIN_USER_INFO + comPropertyBase.getUserId();
+ stringRedisTemplate.delete(userKey);
}
this.comPropertyDao.updateById(comProperty);
+
return R.ok();
}
return R.fail();
@@ -131,4 +146,9 @@
comPropertyVO.setPassword(null);
return R.ok(comPropertyVO);
}
+
+ @Override
+ public R noticeList(Integer page, Integer size, Long propertyId) {
+ return R.ok(comPropertyDao.noticeList(new Page(page,size),propertyId));
+ }
}
--
Gitblit v1.7.1