From fc938792642cb1b74ad10c25693a9756bf528adb Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 06 九月 2023 14:32:56 +0800
Subject: [PATCH] 代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml | 9 ++--
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java | 22 ++++++++++-
Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml | 10 +++--
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java | 10 ++--
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java | 17 ++++++--
Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java | 7 +++
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java | 3 +
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 1
Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java | 17 ++------
9 files changed, 62 insertions(+), 34 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java
similarity index 75%
rename from Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
rename to Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java
index 8a7dd43..b7ffd86 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/cache/NacosConfigCache.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/cache/NacosConfigCache.java
@@ -1,19 +1,12 @@
-package com.vci.ubcs.system.cache;
+package com.vci.ubcs.common.cache;
+/*import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.cache.utils.CacheUtil;
-import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.BladeUser;
-import org.springblade.core.tool.api.R;
-import org.springblade.core.tool.utils.Func;
+import org.springblade.core.tool.utils.Func;*/
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.core.env.Environment;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Component;
-
-import javax.annotation.PostConstruct;
-
-import static org.springblade.core.cache.constant.CacheConstant.SYS_CACHE;
/**
* redis涓瓨鍌ㄧ殑nacos涓婇厤缃殑瓒呯閰嶇疆淇℃伅
@@ -35,7 +28,7 @@
* nacos涓婇厤缃殑瓒呯淇℃伅
* @return
*/
- public BladeUser getAdminUserInfo() {
+ /*public BladeUser getAdminUserInfo() {
try {
BladeUser user = CacheUtil.getCache(NACOS_CONFIG_CACHE).get(ADMIN_INFO_CODE,BladeUser.class);
//浠庣紦瀛樹腑鏈幏鍙栧埌瓒呯骇绠＄悊鍛橀厤缃俊鎭紝浠巒acos涓婇噸鏂拌幏鍙栧苟瀛樺叆缂撳瓨銆�
@@ -51,6 +44,6 @@
}catch (Exception e){
throw new ServiceException("浠巒acos涓婅幏鍙栬秴绾х鐞嗗憳閰嶇疆澶辫触锛�");
}
- }
+ }*/
}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java
similarity index 83%
rename from Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java
rename to Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java
index 9bab7a7..23c1e4e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-system-api/src/main/java/com/vci/ubcs/system/config/NacosConfig.java
+++ b/Source/UBCS/ubcs-common/src/main/java/com/vci/ubcs/common/config/NacosConfig.java
@@ -1,11 +1,11 @@
-package com.vci.ubcs.system.config;
+package com.vci.ubcs.common.config;
-import org.springblade.core.cache.utils.CacheUtil;
+/*import org.springblade.core.cache.utils.CacheUtil;
import org.springblade.core.secure.BladeUser;
import org.springblade.core.tool.utils.Func;
+import org.springframework.data.redis.core.RedisTemplate;*/
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cloud.context.config.annotation.RefreshScope;
-import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.core.env.Environment;
import org.springframework.stereotype.Component;
@@ -29,11 +29,11 @@
@PostConstruct
public void init() {
- BladeUser adminUser = new BladeUser();
+ /*BladeUser adminUser = new BladeUser();
adminUser.setTenantId(environment.getProperty("user-info.tenant-id", "000000"));
adminUser.setUserName(environment.getProperty("user-info.user-name","admin"));
adminUser.setUserId(Func.toLong(environment.getProperty("user-info.id","0")));
- CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);
+ CacheUtil.getCache(NACOS_CONFIG_CACHE).put(ADMIN_INFO_CODE,adminUser);*/
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
index 991bea3..d32e68c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeAllCodeMapper.java
@@ -20,6 +20,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.vci.ubcs.code.entity.CodeAllCode;
import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
@@ -38,7 +39,7 @@
* @param codeAllCode
* @return
*/
- List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode);
+ List<CodeAllCodeVO> selectCodeAllCodePage(IPage page, CodeAllCodeVO codeAllCode, @Param("tenantId")String tenantId);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
index 4159c0e..017ada2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeAllCodeServiceImpl.java
@@ -23,6 +23,8 @@
import com.vci.ubcs.code.mapper.CodeAllCodeMapper;
import com.vci.ubcs.code.service.ICodeAllCodeService;
import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
+import com.vci.ubcs.common.cache.NacosConfigCache;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -44,9 +46,26 @@
@Lazy
private CodeAllCodeMapper codeAllcodeMapper;
+ /**
+ * nacos涓婃媺鍙栫殑閰嶇疆
+ */
+ @Resource
+ private NacosConfigCache nacosConfigCache;
+
@Override
public IPage<CodeAllCodeVO> selectCodeAllcodePage(IPage<CodeAllCodeVO> page, CodeAllCodeVO CodeAllcode) {
- return page.setRecords(baseMapper.selectCodeAllCodePage(page, CodeAllcode));
+ IPage<CodeAllCodeVO> codeAllCodeVOIPage = page.setRecords(
+ baseMapper.selectCodeAllCodePage(
+ page,
+ CodeAllcode,
+ AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ )
+ ? null : AuthUtil.getTenantId()));
+ return codeAllCodeVOIPage;
}
/**
@@ -58,6 +77,5 @@
public List<CodeAllCode> selectByWrapper(Wrapper wrapper) {
return this.codeAllcodeMapper.selectList(wrapper);
}
-
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 286e404..be398aa 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -238,7 +238,6 @@
return R.fail("缂栫爜瑙勫垯宸茶寮曠敤锛屼笉鍏佽缂栬緫鎴栧垹闄わ紒");
}
}
-
List<CodeAllCode> codeDOList = codeAllcodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCodeRuleOid, codeRuleDTO.getOid()));
if (!CollectionUtils.isEmpty(codeDOList)) {
return R.fail("缂栫爜瑙勫垯宸茬敓鎴愮紪鐮侊紝涓嶅厑璁稿垹闄�");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
index 2f97ec8..201be73 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeALlCodeMapper.xml
@@ -6,12 +6,13 @@
<resultMap id="CodeAllcodeResultMap" type="com.vci.ubcs.code.entity.CodeAllCode">
</resultMap>
-
<select id="selectCodeAllCodePage" resultMap="CodeAllcodeResultMap">
select * from PL_CODE_ALLCODE
-
+ <where>
+ <if test="tenantId != null and tenantId != ''">
+ TENANT_ID = #{tenantId}
+ </if>
+ </where>
</select>
-
-
</mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
index fd2bf73..cc4fa8f 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/mapper/StrategyMapper.java
@@ -47,7 +47,12 @@
*/
Strategy queryByUserId(@Param("userId") Long userId);
- Strategy queryByIsDefault();
+ /**
+ * 鏌ヨ瀵嗙爜榛樿鐨勭瓥鐣�
+ * @param tenantId
+ * @return
+ */
+ Strategy queryByIsDefault(@Param("tenantId") String tenantId);
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
index a75e548..906f470 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/StrategyServiceImpl.java
@@ -5,7 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vci.ubcs.common.constant.CommonConstant;
-import com.vci.ubcs.system.cache.NacosConfigCache;
+import com.vci.ubcs.common.cache.NacosConfigCache;
import com.vci.ubcs.system.entity.Strategy;
import com.vci.ubcs.system.mapper.StrategyMapper;
import com.vci.ubcs.system.service.IStrategyService;
@@ -15,7 +15,6 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.Func;
-import org.springframework.data.domain.PageImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -43,6 +42,9 @@
@Resource
private IUserClient userClient;
+ /**
+ * nacos涓婃媺鍙栫殑閰嶇疆
+ */
@Resource
private NacosConfigCache nacosConfigCache;
@@ -63,7 +65,13 @@
*/
@Override
public Strategy queryByIsDefault() {
- return this.strategyMapper.queryByIsDefault();
+ return this.strategyMapper.queryByIsDefault(AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId()
+ );
}
/**
@@ -83,7 +91,8 @@
nacosConfigCache
.getAdminUserInfo()
.getTenantId()
- ) ? null:AuthUtil.getTenantId()
+ )
+ ? null:AuthUtil.getTenantId()
);
return strategyIPage;
}
diff --git a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
index 50d4a67..f7043dd 100644
--- a/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-system/src/main/resources/mapper/StrategyMapper.xml
@@ -30,9 +30,9 @@
where instr(pss.COMBINATION_IDS,psc.ID) > 0) COMBINATIONNAMES
from PL_SYS_PWDSTRATEGY pss
<where>
- <if test="tenantId != null and tenantId != ''">
- and TENANT_ID = #{tenantId}
- </if>
+ <if test="tenantId != null and tenantId != ''">
+ TENANT_ID = #{tenantId}
+ </if>
</where>
</select>
@@ -92,7 +92,6 @@
</where>
</select>
-
<select id="queryByNameAndTenantId" resultMap="StrategyMap">
SELECT PSS.*,(SELECT listagg(psc.NAME,',') within GROUP(ORDER BY psc.NAME asc)
from PL_SYS_COMBINATION psc
@@ -117,6 +116,9 @@
WHERE instr(pss.COMBINATION_IDS, psc.ID) > 0) COMBINATIONNAMES
FROM PL_SYS_PWDSTRATEGY PSS
WHERE is_default = 1
+ <if test="tenantId != null and tenantId != ''">
+ and TENANT_ID = #{tenantId}
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3