From a36d93e531c292240dc59cb8e712b2eca21a4066 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 01 四月 2024 22:13:06 +0800
Subject: [PATCH] sync模块修复
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java | 109 ++++++++++++------------------------------------------
1 files changed, 24 insertions(+), 85 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java
index 67b21ca..4886e54 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/sync/service/impl/OuterAppConfigServiceImpl.java
@@ -1,21 +1,23 @@
package com.qianwen.smartman.modules.sync.service.impl;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
-import java.lang.invoke.SerializedLambda;
import java.time.Duration;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
-import com.qianwen.smartman.common.constant.CommonConstant;
-import com.qianwen.smartman.common.utils.MessageUtils;
+
+import org.springframework.context.annotation.Lazy;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.qianwen.core.log.exception.ServiceException;
import com.qianwen.core.mp.base.BaseServiceImpl;
import com.qianwen.core.mp.support.Condition;
import com.qianwen.core.redis.cache.BladeRedis;
import com.qianwen.core.tool.utils.Func;
+import com.qianwen.smartman.common.constant.CommonConstant;
+import com.qianwen.smartman.common.utils.MessageUtils;
import com.qianwen.smartman.modules.notify.service.INotifyConfigService;
import com.qianwen.smartman.modules.sync.constant.DingConstant;
import com.qianwen.smartman.modules.sync.constant.OuterAppConfigConstant;
@@ -25,10 +27,8 @@
import com.qianwen.smartman.modules.sync.mapper.OuterAppConfigMapper;
import com.qianwen.smartman.modules.sync.service.IOuterAppConfigService;
import com.qianwen.smartman.modules.sync.vo.OuterAppConfigVO;
+import com.qianwen.smartman.modules.system.entity.UserOauth;
import com.qianwen.smartman.modules.system.service.IUserOauthService;
-import org.springframework.context.annotation.Lazy;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
@Service
/* loaded from: blade-api.jar:BOOT-INF/classes/org/springblade/modules/sync/service/impl/OuterAppConfigServiceImpl.class */
@@ -37,77 +37,6 @@
private final IUserOauthService userOauthService;
private final INotifyConfigService notifyConfigService;
- private static /* synthetic */ Object $deserializeLambda$(SerializedLambda lambda) {
- String implMethodName = lambda.getImplMethodName();
- boolean z = true;
- switch (implMethodName.hashCode()) {
- case 242925765:
- if (implMethodName.equals("getAppType")) {
- z = true;
- break;
- }
- break;
- case 799509265:
- if (implMethodName.equals("getSource")) {
- z = false;
- break;
- }
- break;
- case 803533544:
- if (implMethodName.equals("getStatus")) {
- z = true;
- break;
- }
- break;
- case 859984188:
- if (implMethodName.equals("getUserId")) {
- z = true;
- break;
- }
- break;
- }
- switch (z) {
- case false:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/String;")) {
- return (v0) -> {
- return v0.getSource();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/core/mp/base/BaseEntity") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getStatus();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/system/entity/UserOauth") && lambda.getImplMethodSignature().equals("()Ljava/lang/Long;")) {
- return (v0) -> {
- return v0.getUserId();
- };
- }
- break;
- case true:
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getAppType();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getAppType();
- };
- }
- if (lambda.getImplMethodKind() == 5 && lambda.getFunctionalInterfaceClass().equals("com/baomidou/mybatisplus/core/toolkit/support/SFunction") && lambda.getFunctionalInterfaceMethodName().equals("apply") && lambda.getFunctionalInterfaceMethodSignature().equals("(Ljava/lang/Object;)Ljava/lang/Object;") && lambda.getImplClass().equals("org/springblade/modules/sync/entity/OuterAppConfig") && lambda.getImplMethodSignature().equals("()Ljava/lang/Integer;")) {
- return (v0) -> {
- return v0.getAppType();
- };
- }
- break;
- }
- throw new IllegalArgumentException("Invalid lambda deserialization");
- }
public OuterAppConfigServiceImpl(BladeRedis bladeRedis, IUserOauthService userOauthService, @Lazy INotifyConfigService notifyConfigService) {
this.bladeRedis = bladeRedis;
@@ -121,9 +50,12 @@
if (Func.isNotEmpty(configObj)) {
return (OuterAppConfig) Func.convert(configObj, OuterAppConfig.class);
}
+
+ OuterAppConfig dingAppConfig = getOne(Wrappers.<OuterAppConfig>lambdaQuery().eq(OuterAppConfig::getAppType, appType));
+ /*
OuterAppConfig dingAppConfig = (OuterAppConfig) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getAppType();
- }, appType));
+ }, appType));*/
this.bladeRedis.setEx(OuterAppConfigConstant.OUTER_APP_CONFIG + appType, dingAppConfig, Duration.ofDays(7L));
return dingAppConfig;
}
@@ -132,23 +64,30 @@
@Transactional
public Boolean unbind(Integer type) {
this.bladeRedis.del(OuterAppConfigConstant.OUTER_APP_CONFIG + type);
+ this.userOauthService.update(Wrappers.<UserOauth>lambdaUpdate()
+ .eq(UserOauth::getSource, type.equals(OuterAppConfigConstant.QY_WECHAT) ? "WECHAT_ENTERPRISE_WEB" : "DINGTALK_WEB").set(UserOauth::getUserId, null));
+ /*
this.userOauthService.update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getSource();
}, type.equals(OuterAppConfigConstant.QY_WECHAT) ? QyWechatConstant.QY_SOURCE : DingConstant.DING_AUTH_KEY)).set((v0) -> {
return v0.getUserId();
- }, (Object) null));
+ }, (Object) null));*/
+ return Boolean.valueOf(update(Wrappers.<OuterAppConfig>lambdaUpdate().eq(OuterAppConfig::getAppType, type).set(OuterAppConfig::getStatus, CommonConstant.DEACTIVATE)));
+ /*
return Boolean.valueOf(update((Wrapper) ((LambdaUpdateWrapper) Wrappers.lambdaUpdate().eq((v0) -> {
return v0.getAppType();
}, type)).set((v0) -> {
return v0.getStatus();
- }, CommonConstant.DEACTIVATE)));
+ }, CommonConstant.DEACTIVATE)));*/
}
@Override // org.springblade.modules.sync.service.IOuterAppConfigService
public OuterAppConfigVO submit(OuterAppConfigVO outerAppConfigVO) {
+ OuterAppConfig dingAppConfig = getOne(Wrappers.<OuterAppConfig>lambdaQuery().eq(OuterAppConfig::getAppType, outerAppConfigVO.getAppType().equals(OuterAppConfigConstant.QY_WECHAT) ? OuterAppConfigConstant.DING : OuterAppConfigConstant.QY_WECHAT));
+ /*
OuterAppConfig dingAppConfig = (OuterAppConfig) getOne((Wrapper) Wrappers.lambdaQuery().eq((v0) -> {
return v0.getAppType();
- }, outerAppConfigVO.getAppType().equals(OuterAppConfigConstant.QY_WECHAT) ? OuterAppConfigConstant.DING : OuterAppConfigConstant.QY_WECHAT));
+ }, outerAppConfigVO.getAppType().equals(OuterAppConfigConstant.QY_WECHAT) ? OuterAppConfigConstant.DING : OuterAppConfigConstant.QY_WECHAT));*/
if (Func.isNotEmpty(dingAppConfig) && dingAppConfig.getStatus().equals(CommonConstant.ENABLE)) {
throw new ServiceException(MessageUtils.message("sys.outer.config.is.bind", new Object[0]));
}
@@ -164,7 +103,7 @@
@Override // org.springblade.modules.sync.service.IOuterAppConfigService
public List<OuterAppConfigVO> getConfigs(Map<String, Object> params) {
List<OuterAppConfig> list = list(Condition.getQueryWrapper(params, OuterAppConfig.class));
- Map<Long, OuterAppConfig> configMap = (Map) list.parallelStream().collect(Collectors.toMap((v0) -> {
+ Map<Long, OuterAppConfig> configMap = list.parallelStream().collect(Collectors.toMap((v0) -> {
return v0.getId();
}, config -> {
return config;
--
Gitblit v1.9.3