From 81edec7c3bdef059a44e7c5e7b81d35ea09a72ed Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 08:52:39 +0800
Subject: [PATCH] 人员组织结构申请接口开发

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java |  102 +++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 78 insertions(+), 24 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 6b14eaf..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;
@@ -33,10 +34,7 @@
 import com.vci.ubcs.code.mapper.CodeSerialValueMapper;
 import com.vci.ubcs.code.mapper.CommonsMapper;
 import com.vci.ubcs.code.service.*;
-import com.vci.ubcs.code.vo.pagemodel.CodeBasicSecVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeFixedValueVO;
-import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.code.vo.pagemodel.*;
 import com.vci.ubcs.code.wrapper.CodeClassifyWrapper;
 import com.vci.ubcs.code.wrapper.CodeRuleWrapper;
 import com.vci.ubcs.omd.cache.EnumCache;
@@ -51,10 +49,13 @@
 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;
+import org.springblade.core.tool.api.IResultCode;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.api.ResultCode;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.utils.BeanUtil;
 import org.springblade.core.tool.utils.Func;
@@ -65,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;
@@ -111,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;
 
 	/**
 	 * 鍒嗛〉鏌ヨ
@@ -125,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());
 		}
@@ -163,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;
@@ -239,7 +250,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("缂栫爜瑙勫垯宸茬敓鎴愮紪鐮侊紝涓嶅厑璁稿垹闄�");
@@ -467,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())) {
@@ -482,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);
 	}
 
 	/**
@@ -514,7 +561,7 @@
 		CodeRuleVO releaseCodeRule = getObjectHasSecByOid(oid);
 		// 褰撳墠鍙戝竷鐨勮鍒欎笉瀛樺湪鐮佹淇℃伅锛岀洿鎺ョ┖淇℃伅杩斿洖
 		if(Func.isEmpty(releaseCodeRule.getSecVOList())){
-			return R.success("");
+			return R.fail("瑙勫垯淇℃伅涓嶅瓨鍦紝璇峰埛鏂板悗閲嶈瘯锛�");
 		}
 		// 2銆佹壘鍑轰笌褰撳墠鍙戝竷鐨勮鍒欑爜娈甸『搴忎竴鑷寸殑瑙勫垯
 		String secTypes = releaseCodeRule.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
@@ -525,7 +572,7 @@
 		);
 		// 涓虹┖锛岃瘉鏄庝笉瀛樺湪绫诲悓鐨勭紪鐮佽鍒欑洿鎺ヨ繑鍥�
 		if(Func.isEmpty(codeRuleList)){
-			return R.success("");
+			return R.data(new ResultDataVO(true));
 		}
 		// 鏌ヨ鍑哄熀纭�鐮佹鍒楄〃锛堟寜鐓rderNum鍗囧簭鎺掑簭锛�
 		List<CodeRuleVO> codeRuleVOS = codeRuleDO2VOs(codeRuleList, true);
@@ -589,6 +636,8 @@
 					// 灞傜骇鐮佹锛屾瘮瀵瑰眰绾х被鍨嬨�佸眰绾х殑鍊笺�佸瓧绗︽埅鍙栫被鍨嬨�佸彇鍊肩被鍨�
 					case "codelevelsec":
 						if(!(releasedBasicSec.getCodeLevelType().equals(releaseBasicSec.getCodeLevelType())
+							/*鍏堝仛闈炵┖鍒ゆ柇锛屽洜涓烘敼灞炴�т笉鏄繀濉睘鎬�*/
+							&& (Func.isNotEmpty(releasedBasicSec.getCodeLevelValue()) && Func.isNotEmpty(releaseBasicSec.getCodeLevelValue()))
 							&& releasedBasicSec.getCodeLevelValue().equals(releaseBasicSec.getCodeLevelValue())
 							&& releasedBasicSec.getValueCutType().equals(releaseBasicSec.getValueCutType())
 							&& releasedBasicSec.getCodeGetValueType().equals(releaseBasicSec.getCodeGetValueType()))){
@@ -611,6 +660,10 @@
 				lastCodeRule.add(item);
 			}
 		});
+		// 涓虹┖鏃惰鏄庢楠�3娌℃瘮瀵瑰嚭绫讳技鐨勭紪鐮佽鍒�
+		if(lastCodeRule.isEmpty()){
+			return R.data(new ResultDataVO(true));
+		}
 		StringBuffer resMsg = new StringBuffer();
 		resMsg.append("瀛樺湪濡備笅鐩镐技瑙勫垯锛屾槸鍚︾户缁彂甯冿紵\n");
 		// 鏈�鍚庡皢缁撴灉杩涜澶勭悊骞惰繑鍥�
@@ -619,7 +672,8 @@
 			resMsg.append(item.getId());
 			resMsg.append("缂栫爜瑙勫垯;\n");
 		});
-		return R.fail(resMsg.toString());
+		ResultDataVO resultDataVO = new ResultDataVO(false,resMsg.toString());
+		return R.data(resultDataVO);
 	}
 
 	/**

--
Gitblit v1.9.3