From 53d628adb1082d7df51dc1a2151505f17b1de9a2 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 11 九月 2023 14:59:07 +0800
Subject: [PATCH] bug修改，规则克隆接口修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 81 ++++++++++++++++++++++++++++++++--------
1 files changed, 65 insertions(+), 16 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 be398aa..5d8bd08 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
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -48,6 +49,7 @@
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.starter.web.util.WebUtil;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
@@ -64,6 +66,7 @@
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.rmi.ServerException;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -110,10 +113,14 @@
@Resource
private RevisionModelUtil revisionModelUtil;
- @Value("${user-info.tenant-id}")
- private String tenantId;
- @Value("${user-info.id}")
- private String userId;
+ @Resource
+ private NacosConfigCache nacosConfigCache;
+
+ @Resource
+ private ICodeFixedValueService codeFixedValueService;
+
+ @Resource
+ private ICodeClassifyValueService codeClassifyValueService;
/**
* 鍒嗛〉鏌ヨ
@@ -124,7 +131,9 @@
@Override
public IPage<CodeRuleVO> gridCodeRule(Query query, Map<String,Object> conidtionMap) {
//濡傛灉绛変簬鑷繁閰嶇疆鐨勭鐞嗙粍绉熸埛id鍜岀鐞嗙粍瓒呯璐﹀彿锛屽氨涓嶉渶瑕佹寜鐓ц鍒欐墍鏈夎�呮潵杩涜鏌ヨ
- if(!(AuthUtil.getTenantId().equals(this.tenantId) && AuthUtil.getUserId().toString().equals(this.userId))){
+ if(!(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())
+ && AuthUtil.getUserId().toString().equals(nacosConfigCache.getAdminUserInfo().getUserId().toString()))
+ ){
// 鎸夌収瑙勫垯鎵�鏈夎�呮潵鏌ヨ
conidtionMap.put("owner",AuthUtil.getUserId());
}
@@ -162,14 +171,17 @@
*/
@Override
public boolean checkCodeRuleRepeat(CodeRuleDTO codeRuleDTO){
+ LambdaQueryWrapper<CodeRule> wrapper = Wrappers.<CodeRule>query()
+ .lambda().eq(CodeRule::getId, codeRuleDTO.getId());
+ if(AuthUtil.getTenantId().equals(nacosConfigCache.getAdminUserInfo().getTenantId())){
+ wrapper.eq(CodeRule::getTenantId,codeRuleDTO.getTenantId());
+ }
// 鏍规嵁瑙勫垯id鏌ヨ缂栧彿
- List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(Wrappers.<CodeRule>query()
- .lambda().eq(CodeRule::getId, codeRuleDTO.getId())
- .eq(CodeRule::getTenantId,AuthUtil.getTenantId().equals(this.tenantId) ? "":codeRuleDTO.getTenantId()));
+ List<CodeRule> codeRulesList = this.codeRuleMapper.selectList(wrapper);
if(!codeRulesList.isEmpty()){
return codeRulesList.parallelStream().anyMatch(codeRule -> {
if(StringUtils.isNotBlank(codeRuleDTO.getOid())){
- // 浠ｈ〃鏄慨鏀癸紝涓嶆槸灏嗙紪鍙蜂慨鏀圭浉鍚岀殑缂栧彿
+ // 浠ｈ〃鏄慨鏀硅鍒欙紝涓嶆槸灏嗙紪鍙蜂慨鏀逛负宸插瓨鍦ㄧ殑鐨勭紪鍙�
return !codeRule.getOid().equals(codeRuleDTO.getOid());
}else {
return true;
@@ -465,14 +477,21 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public R cloneCodeRule(CodeRuleDTO codeRuleDTO) {
+ public R cloneCodeRule(CodeRuleDTO codeRuleDTO) throws ServerException {
+ if(checkCodeRuleRepeat(codeRuleDTO)){
+ return R.fail("瑙勫垯缂栧彿宸插瓨鍦紒");
+ }
VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
CodeRule codeRuleDO = new CodeRule();
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE);
BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDTO, codeRuleDO);
boolean exFlag = codeRuleMapper.insert(codeRuleDO)>0;
List<CodeBasicSecDTO> secList = codeRuleDTO.getElements();
List<CodeBasicSec> codeBasicSecs = new ArrayList<>();
- secList.forEach(codeBasicSecDTO -> {
+ List<CodeBasicSec> codeClassifySec = new ArrayList<>();
+ // 鍥哄畾鐮佸�兼槧灏勫叧绯�
+ Map<String,List<CodeFixedValue>> codeFixedValueMaps = new HashMap<>();
+ for (CodeBasicSecDTO codeBasicSecDTO : secList) {
codeBasicSecDTO.setPkCodeRule(codeRuleDO.getOid());
KeyValue attrKv = codeBasicSecService.checkAttrNullableBySecType(codeBasicSecDTO);
if (!"success".equals(attrKv.getKey())) {
@@ -480,13 +499,43 @@
}
CodeBasicSec codeBasicSecDO = new CodeBasicSec();
BeanUtilForVCI.copyPropertiesIgnoreCase(codeBasicSecDTO, codeBasicSecDO);
- codeBasicSecDO.setOid("");
- codeBasicSecDO.setRevisionOid("");
- codeBasicSecDO.setNameOid("");
+ String oldBasicOid = codeBasicSecDO.getOid(); //琚厠闅嗙殑鐮佹鐨刼id
+ // 鍒ゆ柇鏄惁鏄垎绫荤爜娈�
+ if(codeBasicSecDO.getSecType().equals(CodeSecTypeEnum.CODE_CLASSIFY_SEC.getValue())){
+ // 瀛樺偍鏃х殑鐮佹oid鍜屾柊鐨勭爜娈电殑oid鐨勫叧鑱斿叧绯�
+ codeClassifySec.add(codeBasicSecDO);
+ continue;
+ }
+ // 鏇存敼鍒涘缓鏃堕棿锛屼慨鏀规椂闂寸瓑榛樿鍊�
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeBasicSecDO,MdmBtmTypeConstant.CODE_BASIC_SEC);
+ // 鍥哄畾鐮佹
+ if(codeBasicSecDO.getSecType().equals(CodeSecTypeEnum.CODE_FIXED_SEC.getValue())){
+ // 鍥哄畾鐮佹瀛樺偍濂給id鍜岀爜鍊肩殑鍏宠仈鍏崇郴
+ codeFixedValueMaps.put(codeBasicSecDO.getOid(),codeFixedValueService.list(Wrappers.<CodeFixedValue>query()
+ .lambda().eq(CodeFixedValue::getCodeFixedSecOid, oldBasicOid)
+ ));
+ }
codeBasicSecs.add(codeBasicSecDO);
- });
+ }
+ // 澶勭悊鍒嗙被鐮佹鐨刼id锛屽洜涓簅id鍏宠仈parentClassifyOid锛屼笌鐮佸�糲odeClassifyOid锛岀爜鍊煎張闇�瑕侀�氳繃鏃х殑鐮佹oid鏉ユ煡璇紝鎵�浠ヤ笉鑳界洿鎺ユ敼鍙榦id
+ boolean resChangeAssn = codeBasicSecService.changeParentOidAssnOid(codeClassifySec);
+ // 灏嗗鐞嗚繃鐨勫垎绫荤爜娈典篃娣诲姞杩涜鍋氭柊澧炲鐞嗙殑鐮佹闆嗗悎涓�
+ codeBasicSecs.addAll(codeClassifySec);
+ // 鏂板鐮佹
boolean exFlag1 = this.codeBasicSecService.saveBatch(codeBasicSecs);
- return R.data(exFlag&&exFlag1);
+ // 鏈�缁堣瀛樺叆鐮佸�艰〃涓殑锛岀爜鍊煎璞�
+ List<CodeFixedValue> codeFixedDOValues = new ArrayList<>();
+ // 鏋勯�犵爜鍊煎璞★紝涓庣爜娈典富閿叧鑱斿叧绯伙紝浠ュ強鏀瑰彉鐮佸�肩殑oid
+ codeFixedValueMaps.forEach((key, value) -> {
+ value.stream().forEach(item -> {
+ item.setOid("");
+ item.setCodeFixedSecOid(key);
+ DefaultAttrAssimtUtil.updateDefaultAttrAssimt(item);
+ codeFixedDOValues.add(item);
+ });
+ });
+ boolean exFlag2 = codeFixedValueService.saveBatch(codeFixedDOValues) && resChangeAssn;
+ return R.data(exFlag&&exFlag1&&exFlag2);
}
/**
--
Gitblit v1.9.3