|
|
@@ -44,6 +44,7 @@ import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.util.*;
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
+import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
|
* (AuthAccessToken)表服务实现类
|
|
|
@@ -320,21 +321,21 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResponseResultVO<?> updateClearOpenidFeign(Map<String, Object> map) {
|
|
|
String userId = map.get("userId") + "";
|
|
|
- Integer cpId = Integer.parseInt(map.get("cpId")+"") ;
|
|
|
+ Integer cpId = Integer.parseInt(map.get("cpId") + "");
|
|
|
UserLogin userLogin = userMapper.selectById(userId);
|
|
|
Integer cpIdNew = null;
|
|
|
if (userLogin != null) {
|
|
|
List<Integer> joinedCps = new ArrayList<>();
|
|
|
- joinedCps = userLogin.getJoinedCps();
|
|
|
+ joinedCps = userLogin.getJoinedCps();
|
|
|
if (joinedCps != null) {
|
|
|
- List<Integer> joinedCpsNew = new ArrayList<>();
|
|
|
- joinedCpsNew.add(cpId);
|
|
|
- joinedCps.removeAll(joinedCpsNew);
|
|
|
+ joinedCps = joinedCps.stream() // 将List转换为Stream
|
|
|
+ .filter(n -> n != cpId) // 过滤掉我们不想要的元素
|
|
|
+ .collect(Collectors.toList()); // 收集结果到新的List
|
|
|
if (joinedCps != null && joinedCps.size() > 0) {
|
|
|
cpIdNew = joinedCps.get(0);
|
|
|
}
|
|
|
}
|
|
|
- userMapper.updateClearOpenidFeign(userId, cpIdNew, joinedCps);
|
|
|
+ userMapper.updateClearOpenidFeign(userId, cpIdNew, joinedCps != null && joinedCps.size() == 0 ? null : joinedCps);
|
|
|
}
|
|
|
|
|
|
return ResponseResultUtil.success();
|
|
|
@@ -396,7 +397,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
*/
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public ResponseResultVO logout(UserWxLogin userWxLogin) {
|
|
|
- userMapper.updateWxid(userWxLogin.getUserId(),null);
|
|
|
+ userMapper.updateWxid(userWxLogin.getUserId(), null);
|
|
|
return ResponseResultUtil.success();
|
|
|
}
|
|
|
|
|
|
@@ -628,7 +629,7 @@ public class AuthAccessTokenServiceImpl extends ServiceImpl<AuthAccessTokenMappe
|
|
|
//二维码参数
|
|
|
Map<String, Object> param = new HashMap<>();
|
|
|
param.put("page", "pages/welcome/welcome");
|
|
|
- param.put("scene", map.get("openid").toString());
|
|
|
+ param.put("scene", map.get("openid").toString());
|
|
|
param.put("check_path", false);
|
|
|
log.info("二维码参数=123: {}", param);
|
|
|
//生成二维码接口地址
|