From ce4a770744d7a0b4e4ea3b5101556b94e72bdf1c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 14 十一月 2023 17:49:20 +0800
Subject: [PATCH] 修改打卡
---
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java | 31 ++++++++++---------------------
1 files changed, 10 insertions(+), 21 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
index 5a061e1..84626db 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
@@ -1,16 +1,13 @@
package com.panzhihua.service_dangjian.service.impl;
+import static java.util.Objects.nonNull;
+
import java.util.List;
import javax.annotation.Resource;
-import com.alibaba.fastjson.JSONObject;
-import com.panzhihua.common.constants.SecurityConstants;
-import com.panzhihua.common.constants.TokenConstant;
-import com.panzhihua.common.model.vos.LoginUserInfoVO;
import org.springframework.beans.BeanUtils;
import org.springframework.data.redis.core.StringRedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
@@ -28,8 +25,6 @@
import com.panzhihua.service_dangjian.service.ComPbServiceTeamService;
import lombok.extern.slf4j.Slf4j;
-
-import static java.util.Objects.nonNull;
/**
* @program: springcloud_k8s_panzhihuazhihuishequ
@@ -59,7 +54,7 @@
ComPbServiceTeamDO comPbServiceTeamDO = new ComPbServiceTeamDO();
BeanUtils.copyProperties(comPbServiceTeamDTO, comPbServiceTeamDO);
comPbServiceTeamDO.setIsReg(2);
- Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone());
+ Long userId = comPbMemberRoleDAO.getSysUserIdByPhone(comPbServiceTeamDTO.getPhone(), comPbServiceTeamDTO.getAppid());
if (nonNull(userId)) {
comPbServiceTeamDO.setIsReg(1);
}
@@ -67,16 +62,7 @@
if (insert > 0) {
if (nonNull(userId)) {
String userKey = UserConstants.LOGIN_USER_INFO + userId;
- Boolean hasKeyLoginUserInfo = stringRedisTemplate.hasKey(userKey);
- if (hasKeyLoginUserInfo) {
- ValueOperations<String, String> valueOperations = stringRedisTemplate.opsForValue();
- String userInfo = valueOperations.get(userKey);
- LoginUserInfoVO loginUserInfoVO = JSONObject.parseObject(userInfo, LoginUserInfoVO.class);
- loginUserInfoVO.setIsmemberrole(1);
- loginUserInfoVO.setIsCommunityWorker(1);
- userInfo = JSONObject.toJSONString(loginUserInfoVO);
- valueOperations.set(userKey, userInfo, TokenConstant.EXPIRETIME_REFRESH * 60 * 60 * 1000);
- }
+ stringRedisTemplate.delete(userKey);
}
return R.ok();
}
@@ -98,9 +84,9 @@
ComPbServiceTeamDO oldComPbServiceTeam =
comPbServiceTeamDAO.selectComPbServiceTeamById(comPbServiceTeamDTO.getId());
String oldphone = oldComPbServiceTeam.getPhone();
- SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone);
+ SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone, comPbServiceTeamDTO.getAppid());
String newphone = comPbServiceTeamDTO.getPhone();
- SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone);
+ SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone, comPbServiceTeamDTO.getAppid());
if (!ObjectUtils.isEmpty(sysUserOld) || !ObjectUtils.isEmpty(sysUserNew)) {
comPbServiceTeamDO.setIsReg(1);
}
@@ -132,6 +118,9 @@
page.setSize(pageSize);
page.setCurrent(pageNum);
IPage<ComPbServiceTeamVO> iPage = comPbServiceTeamDAO.PageComPbServiceTeamDTO(page, pageComPbServiceTeamDTO);
+ if (nonNull(pageComPbServiceTeamDTO.getPropertyId())){
+ iPage = comPbServiceTeamDAO.pageServiceTeamProperty(page, pageComPbServiceTeamDTO);
+ }
return R.ok(iPage);
}
@@ -152,7 +141,7 @@
int delete = comPbServiceTeamDAO.deleteById(comPbServiceTeamDTO.getId());
if (delete > 0) {
- SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone());
+ SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone(), comPbServiceTeamDTO.getAppid());
// 删除用户信息缓存
if (sysUserVO != null) {
Long userId = sysUserVO.getUserId();
--
Gitblit v1.7.1