From cb41c6645777148f78788b369a6f66ecbdc7111a Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 03 一月 2024 16:14:10 +0800
Subject: [PATCH] 整合代码
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 49 insertions(+), 11 deletions(-)
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 edba565..6b963c6 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
@@ -50,6 +50,10 @@
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
import com.vci.ubcs.system.cache.NacosConfigCache;
+import com.vci.ubcs.system.entity.Strategy;
+import com.vci.ubcs.system.feign.ISysClient;
+import com.vci.ubcs.system.user.entity.User;
+import com.vci.ubcs.system.user.feign.IUserClient;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
@@ -114,10 +118,13 @@
private RevisionModelUtil revisionModelUtil;
@Resource
- private NacosConfigCache nacosConfigCache;
-
- @Resource
private ICodeFixedValueService codeFixedValueService;
+
+ /**
+ * 绯荤粺鏈嶅姟
+ */
+ @Resource
+ private IUserClient userClient;
/**
* 鍒嗛〉鏌ヨ
@@ -127,13 +134,14 @@
*/
@Override
public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) throws VciBaseException {
+ //int i = 1 / 0;
//濡傛灉绛変簬鑷繁閰嶇疆鐨勭鐞嗙粍绉熸埛id鍜岀鐞嗙粍瓒呯璐﹀彿锛屽氨涓嶉渶瑕佹寜鐓ц鍒欐墍鏈夎�呮潵杩涜鏌ヨ
- if(!(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())
- && AuthUtil.getUserId().toString().equals(nacosConfigCache.getAdminUserInfo().getUserId().toString()))
+ /*if(!(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())
+ && AuthUtil.getUserId().toString().equals(NacosConfigCache.getAdminUserInfo().getUserId().toString()))
){
// 鎸夌収瑙勫垯鎵�鏈夎�呮潵鏌ヨ
- conidtionMap.put("owner",AuthUtil.getUserId());
- }
+ conidtionMap.put("owner",AuthUtil.getUserId().toString());
+ }*/
IPage<CodeRule> codeRuleIPage = this.codeRuleMapper.selectPage(Condition.getPage(query), UBCSCondition.getQueryWrapper(conidtionMap, CodeRule.class));
//do杞瑅o鍚屾椂setLcStatusText鐢熷懡鍛ㄦ湡鍊硷紝骞跺寘瑁呮垚鍒嗛〉瀵硅薄杩斿洖
return CodeRuleWrapper.build().pageVO(codeRuleIPage);
@@ -158,6 +166,7 @@
DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRule, MdmBtmTypeConstant.CODE_RULE);
codeRule.setLctid(CODE_RULE_LC);
codeRule.setLcStatus(FRAMEWORK_RELEASE_EDITING);
+ codeRule.setOwnerText(AuthUtil.getUserAccount()+"("+AuthUtil.getNickName()+")");
return R.status(codeRuleMapper.insert(codeRule)>0);
}
@@ -170,7 +179,7 @@
public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO)throws VciBaseException {
LambdaQueryWrapper<CodeRule> wrapper = Wrappers.<CodeRule>query()
.lambda().eq(CodeRule::getId, codeRuleDTO.getId());
- if(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())){
+ if(AuthUtil.getTenantId().equals(NacosConfigCache.getAdminUserInfo().getTenantId())){
wrapper.eq(CodeRule::getTenantId,AuthUtil.getTenantId());
}
// 鏍规嵁瑙勫垯id鏌ヨ缂栧彿
@@ -223,6 +232,12 @@
revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
if(!codeRule.getOwner().equals(codeRuleDTO.getOwner())){
codeRule.setOwner(codeRuleDTO.getOwner());
+ R<User> userR = userClient.userInfoById(Func.toLong(codeRuleDTO.getOwner()));
+ if(!userR.isSuccess() || Func.isEmpty(userR.getData())){
+ codeRule.setOwnerText(codeRuleDTO.getOwner());
+ }else{
+ codeRule.setOwnerText(userR.getData().getAccount()+"("+userR.getData().getRealName()+")");
+ }
}
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
return R.status(codeRuleMapper.updateById(codeRule)>0);
@@ -373,7 +388,7 @@
public Collection<CodeRuleVO> listCodeRuleByOids(Collection<String> oidCollections) throws VciBaseException {
VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎");
List<CodeRule> codeRuleDOList = listCodeRuleDOByOidCollections(oidCollections);
- return CodeRuleWrapper.build().listVO(codeRuleDOList);
+ return codeRuleDO2VOs(codeRuleDOList,true);
}
/**
@@ -387,8 +402,8 @@
@Override
public Collection<CodeRuleVO> listCodeRuleByIds(Collection<String> oidCollections, boolean hasSec) throws VciBaseException {
VciBaseUtil.alertNotNull(oidCollections, "鏁版嵁瀵硅薄涓婚敭闆嗗悎");
- List<CodeRule> codeRuleDOList = listCodeRuleDOByOidCollections(oidCollections);
- return codeRuleDO2VOs(codeRuleDOList, true);
+ List<CodeRule> codeRuleDOList = listCodeRuleDOByIdCollections(oidCollections);
+ return codeRuleDO2VOs(codeRuleDOList, hasSec);
}
/**
@@ -412,6 +427,29 @@
}
/**
+ * 浣跨敤瑙勫垯id闆嗗悎鏌ヨ鏁版嵁瀵硅薄
+ *
+ * @param idCollections id鐨勯泦鍚�
+ * @return 鏁版嵁瀵硅薄鍒楄〃
+ */
+ private List<CodeRule> listCodeRuleDOByIdCollections(Collection<String> idCollections) throws VciBaseException {
+ List<CodeRule> codeRuleDOList = new ArrayList<CodeRule>();
+ if (!CollectionUtils.isEmpty(idCollections)) {
+ Collection<Collection<String>> idCollectionsList = VciBaseUtil.switchCollectionForOracleIn(idCollections);
+ for (Collection<String> ids : idCollectionsList) {
+ List<CodeRule> tempDOList = codeRuleMapper.selectList(
+ Wrappers.<CodeRule>query()
+ .lambda().in(CodeRule::getId,ids)
+ );
+ if (!CollectionUtils.isEmpty(tempDOList)) {
+ codeRuleDOList.addAll(tempDOList);
+ }
+ }
+ }
+ return codeRuleDOList;
+ }
+
+ /**
* 鍙傜収涓绘暟鎹紪鐮佽鍒欏垪琛�
*
* @param bladeQueryObject 鏌ヨ鏉′欢
--
Gitblit v1.9.3