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/CodeClassifyServiceImpl.java |  232 +++++++++++++++++++++++++++++++++++++++++++++++++---------
 1 files changed, 196 insertions(+), 36 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
index 50de8a3..f2d1d0b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java
@@ -4,21 +4,22 @@
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 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.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
-import com.vci.ubcs.code.entity.CodeClassify;
-import com.vci.ubcs.code.entity.CodeClassifyTemplate;
+import com.vci.ubcs.code.entity.*;
 import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
-import com.vci.ubcs.code.mapper.CodeClassifyMapper;
-import com.vci.ubcs.code.mapper.CodeClassifyTemplateMapper;
-import com.vci.ubcs.code.mapper.CommonsMapper;
+import com.vci.ubcs.code.mapper.*;
 import com.vci.ubcs.code.po.CodeClassifyPO;
 import com.vci.ubcs.code.service.ICodeClassifyService;
 import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
 import com.vci.ubcs.code.service.ICodeRuleService;
+import com.vci.ubcs.code.vo.pagemodel.CodeAllCodeVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeKeyAttrRepeatRuleVO;
 import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
@@ -48,6 +49,7 @@
 import com.vci.ubcs.starter.web.util.LangBaseUtil;
 import com.vci.ubcs.starter.web.util.VciBaseUtil;
 import com.vci.ubcs.system.cache.NacosConfigCache;
+import com.vci.ubcs.system.feign.ISysClient;
 import org.apache.poi.hssf.util.HSSFColor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -60,7 +62,9 @@
 import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -89,7 +93,7 @@
 	private IBtmTypeClient btmTypeClient;
 
 	@Resource
-	private CommonsMapper commonsMapper;
+	private ISysClient sysClient;
 
 	/**
 	 * 鏃ュ織
@@ -103,6 +107,15 @@
 
 	@Resource
 	private ICodeKeyAttrRepeatService iCodeKeyattrrepeatService;
+
+	@Resource
+	private CodeAllCodeMapper codeAllCodeMapper;
+
+	@Resource
+	private CodeSerialValueMapper codeSerialValueMapper;
+
+	@Resource
+	private CodeBasicSecMapper codeBasicSecMapper;
 	/**
 	 * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉�
 	 */
@@ -179,6 +192,7 @@
 	 * @return 鎵ц缁撴灉
 	 */
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public R editSave(CodeClassify codeClassifyEntity) {
 		if(codeClassifyEntity == null || codeClassifyEntity.getOid() == null){
 			return R.fail("浼犲叆鏁版嵁涓嶈兘涓虹┖锛�");
@@ -196,15 +210,32 @@
 		codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
 		codeClassifyEntity.setLastModifyTime(new Date());
 		codeClassifyEntity.setTs(new Date());
-		int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
+		int updateEntity = codeClassifyMapper.updateById(codeClassifyEntity);
+		// 濡傛灉涓嶆槸鍙跺瓙缁撶偣锛屽垯闇�瑕佷慨鏀瑰叾涓嬫墍鏈夌殑瀛愬垎绫伙紝鏄惁鍙備笌鍏抽敭灞炴�ф牎楠岀殑鍊�
+		String oid = codeClassifyEntity.getOid();
+		List<CodeClassify> codeClassifies = codeClassifyMapper.selectStartWithCurrentOid(oid);
+		int updateAttr = 0;
+		// 涓嶄负绌哄氨闇�瑕佽褰撳墠鍒嗙被涓嬫墍鏈夊瓙鍒嗙被鐨刬sParticipateCheck
+		if(!codeClassifies.isEmpty()){
+			List<String> oids = codeClassifies.stream().map(CodeClassify::getOid).collect(Collectors.toList());
+			LambdaUpdateWrapper<CodeClassify> updateWrapper = Wrappers.<CodeClassify>update()
+				.lambda().in(CodeClassify::getOid, oids)
+				.set(CodeClassify::getIsParticipateCheck, codeClassifyEntity.getIsParticipateCheck());
+			// 鐖跺垎绫荤殑涓氬姟绫诲瀷鍋氫簡鏇存敼锛屾墍鏈夊瓙鍒嗙被鐨勯兘寰楄繘琛屾洿鏀�
+			if(!codeClassifyEntity.getBtmTypeId().equals(detail.getBtmTypeId())){
+				updateWrapper.set(CodeClassify::getBtmTypeId,codeClassifyEntity.getBtmTypeId())
+					.set(CodeClassify::getBtmTypeName,codeClassifyEntity.getBtmTypeName());
+			}
+			updateAttr = codeClassifyMapper.update(null,updateWrapper);
+
+		}
 
 //         //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
 //         if(FRAMEWORK_DATA_ENABLED.equals(codeClassifyDO.getLcStatus()));
 //         {
 //             codeDuckingServiceI.insertCache1(CACHE_TYPE_CLASSIFY_EDIT,FRAMEWORK_DATA_ENABLED,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, codeClassifyDO.getOid(), codeClassifyDTO.getTs());
 //         }
-		return R.status(SqlHelper.retBool(insertNumber));
-//		return BaseResult.success(codeClassifyDO2VO(codeClassifyDO));
+		return R.status(SqlHelper.retBool(updateAttr) & SqlHelper.retBool(updateEntity));
 	}
 
 	/**
@@ -528,14 +559,14 @@
 			lcStatus = treeQueryObject.getConditionMap().getOrDefault("lcStatus",null);
 		}
 		if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
-			String tableName = this.getTableName(treeQueryObject.getParentOid(),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
+			//String tableName = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus"));
 			doList = codeClassifyMapper
 				.selectCodeClassifyDOByTree(
 					treeQueryObject.getConditionMap().get("id"),
 					treeQueryObject.getConditionMap().get("lcStatus"),
 					treeQueryObject.getParentOid(),
-					VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId(),
-					tableName
+					VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId()
+					/*tableName*/
 				);
 		}else{
 			// 鍙鍓嶇浼氫紶鍙傛暟杩囨潵灏变笉浼氬嚭鐜拌蛋杩欏彞鐨勬儏鍐碉紝鎵�浠ユ煡璇㈡�绘暟娌″湪杩欏効娣诲姞
@@ -552,40 +583,89 @@
 			return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
 				.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
 		});
-
-		Iterator var6 =  tree.listIterator();
-		while(var6.hasNext()){
-			Tree trees = (Tree) var6.next();
-			boolean checkHasChild=codeClassifyMapper.checkHasChild(trees.getOid());
-			if(checkHasChild){
-				trees.setLeaf(false);
-			}else{
-				trees.setLeaf(true);
+		//瓒呯鏄剧ず鎵�鏈夊垎绫�
+		if(VciBaseUtil.checkAdminTenant()){
+			Iterator var6 =  tree.listIterator();
+			while(var6.hasNext()){
+				Tree trees = (Tree) var6.next();
+				boolean checkHasChild=codeClassifyMapper.checkHasChild(trees.getOid());
+				if(checkHasChild){
+					trees.setLeaf(false);
+				}else{
+					trees.setLeaf(true);
+				}
 			}
+		}else {
+			// 閭ｄ簺鍒嗙被鍏峰鏌ョ湅鏉冮檺
+			R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds(Arrays.asList(AuthUtil.getUser().getRoleId().split(",")));
+			// 璇锋眰澶辫触鎴栬�呰姹傚緱鍒扮殑鍏峰鏌ョ湅鏉冮檺鐨勫垎绫籭d闆嗗悎涓虹┖
+			if(!viewClassByRoleIds.isSuccess() && !viewClassByRoleIds.getData().isEmpty()){
+				return new ArrayList<>();
+			}
+			// 杩囨护
+			filterTreeNodes(tree,viewClassByRoleIds.getData());
 		}
 		return tree;
+	}
+
+	/**
+	 * 鍒嗙被鎺堟潈杩囨护鎺夋病鏈夋潈闄愮殑鍒嗙被
+	 * @param trees
+	 * @param classifyIds
+	 */
+	private void filterTreeNodes(List<Tree> trees, List<String> classifyIds) {
+		Iterator<Tree> iterator = trees.iterator();
+		while (iterator.hasNext()) {
+			Tree tree = iterator.next();
+			Boolean checkHasChild = codeClassifyMapper.checkHasChild(tree.getOid());
+			tree.setLeaf(!checkHasChild);
+			if (classifyIds.contains(tree.getOid())) {
+				// 濡傛灉椤跺眰鑺傜偣瀛樺湪浜� classifyIds 涓紝鐩存帴淇濈暀鍏跺瓙鑺傜偣闆嗗悎
+				continue;
+			}
+			if (tree.getChildren() != null && !tree.getChildren().isEmpty()) {
+				filterTreeNodes(tree.getChildren(), classifyIds);
+			}
+			if (!hasMatchingChild(tree, classifyIds)) {
+				iterator.remove();
+			}
+		}
+	}
+
+	private boolean hasMatchingChild(Tree tree, List<String> classifyIds) {
+		if (classifyIds.contains(tree.getOid())) {
+			return true;
+		}
+		if (tree.getChildren() != null) {
+			for (Tree child : tree.getChildren()) {
+				if (hasMatchingChild(child, classifyIds)) {
+					return true;
+				}
+			}
+		}
+		return false;
 	}
 
 	/**
 	 * 鍒嗙被鍔犺浇鏃惰幏鍙栦笟鍔＄被鍨媔d锛屾嫾鎺ヤ笟鍔＄被鍨嬭〃鍚�
 	 * @return
 	 */
-	private String getTableName(String parentCodeClassifyOid,String id,String lcStatus){
+	private String getTableName(String btmTypeId,String id,String lcStatus){
+		if(Func.isNotEmpty(btmTypeId)){
+			return VciBaseUtil.getTableName(btmTypeId,true);
+		}
 		LambdaQueryWrapper<CodeClassify> wrapper = Wrappers.<CodeClassify>query()
 			.lambda().select(CodeClassify::getBtmTypeId)
 			.eq(CodeClassify::getLcStatus, lcStatus)
 			.isNotNull(CodeClassify::getBtmTypeId)
-			.last("limit 1");
-		if(Func.isNotBlank(id)){
-			wrapper.eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid);
-		}else{
-			wrapper.eq(CodeClassify::getParentCodeClassifyOid,parentCodeClassifyOid);
-		}
+			.last("limit 1")
+			.eq(CodeClassify::getId,id).isNull(CodeClassify::getParentCodeClassifyOid);
+
 		CodeClassify codeClassify = codeClassifyMapper.selectOne(wrapper);
 		if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){
-			throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栦笟鍔＄被鍨婭D锛�");
+			throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栧埌涓氬姟绫诲瀷ID锛�");
 		}
-		return VciBaseUtil.getTableName(codeClassify.getBtmTypeId().toLowerCase(Locale.ROOT),true);
+		return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true);
 	}
 
 	/**
@@ -639,12 +719,78 @@
 	 * @param oid
 	 * @return
 	 */
-	public List<CodeClassifyVO> selectAllClassifyByOid(String oid){
-		List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId());
+	public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){
+		List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,fieldInPath,AuthUtil.getTenantId());
 		List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
 		return voList;
 
 	}
+
+	/**
+	 * 鏍规嵁椤跺眰鑺傜偣oid鏌ヨ鎵�鏈夐櫎褰撳墠鑺傜偣浠ュ鎵�鏈変笉鍙備笌鏍￠獙鐨勫垎绫籵id
+	 * @param topOid
+	 * @param currentOid
+	 * @return
+	 */
+	@Override
+	public String selectLeafByParentClassifyOid(String topOid, String currentOid) {
+		List<CodeClassify> codeClassifies = codeClassifyMapper.selectLeafByParentClassifyOid(topOid, currentOid);
+		if(codeClassifies.isEmpty()){
+			return "";
+		}
+		String oids = codeClassifies.stream()
+			.map(CodeClassify::getOid)
+			.map(s -> "'" + s + "'")
+			.collect(Collectors.joining(","));;
+		return oids;
+	}
+
+	/**
+	 * 娴佹按渚濊禆鐢熸垚
+	 */
+	@Override
+	public R flowingDependencyGen(String classifyOid) {
+
+		//鏌ヨ姝ゅ垎绫讳笅闈㈢殑鎵�鏈夊垎绫�
+		List<CodeClassify>  codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(classifyOid,AuthUtil.getTenantId(),null);
+		//鏌ヨ鐮佸�艰〃锛岃幏鍙栨渶澶ф祦姘�
+		List<CodeAllCode> codeAllCodeVOS = codeAllCodeMapper.selectGroupByClassify("'" + codeClassifyList.stream()
+			.map(classfiy -> classfiy.getOid()).collect(Collectors.joining("','")) + "'","'${sav}'");
+		//寰�娴佹按琛ㄩ噷闈㈠姞鏁版嵁锛屾湁鍒欐洿鏂帮紝鏃犲垯娣诲姞鏁版嵁銆�
+		for (CodeAllCode codeAllCodeVO : codeAllCodeVOS) {
+			QueryWrapper<CodeBasicSec> secWrapper = new QueryWrapper<>();
+			secWrapper.eq("PKCODERULE",codeAllCodeVO.getCodeRuleOid());
+			secWrapper.eq("SECTYPE","codeserialsec");
+			List<CodeBasicSec> codeBasicSecs = codeBasicSecMapper.selectList(secWrapper);
+			if(codeBasicSecs.size() == 0 ){
+				throw new ServiceException("鏍规嵁鐮佸�糏D锛�" + codeAllCodeVO.getCodeRuleOid() + ",鐮佹绫诲瀷涓烘祦姘寸爜娈�(codeserialsec),鍦ㄥ熀纭�鐮佹涓湭鎵惧埌鐩稿叧鏁版嵁锛�");
+			}
+			QueryWrapper<CodeSerialValue> wrapper = new QueryWrapper<>();
+			wrapper.eq("codeRuleOid",codeAllCodeVO.getCodeRuleOid());
+			wrapper.eq("serialUnit",codeAllCodeVO.getSerialUnit());
+			wrapper.eq("codeSecOid",codeBasicSecs.get(0).getOid());
+			List<CodeSerialValue> codeSerialValues = codeSerialValueMapper.selectList(wrapper);
+			if(codeSerialValues.size() == 0){
+				CodeSerialValue newSerialValue = new CodeSerialValue();
+				DefaultAttrAssimtUtil.addDefaultAttrAssimt(newSerialValue,"codeserialvalue");
+				newSerialValue.setCodeRuleOid(codeAllCodeVO.getCodeRuleOid());
+				newSerialValue.setCodeSecOid(codeBasicSecs.get(0).getOid());
+				newSerialValue.setSerialUnit(codeAllCodeVO.getSerialUnit());
+				newSerialValue.setMaxSerial(codeAllCodeVO.getUnFillSerial());
+				newSerialValue.setLctid("defaultLC");
+				newSerialValue.setLcStatus("Exist");
+				codeSerialValueMapper.insert(newSerialValue);
+			}else{
+				codeSerialValues.get(0).setMaxSerial(codeAllCodeVO.getUnFillSerial());
+				codeSerialValues.get(0).setLastModifyTime(new Date());
+				codeSerialValues.get(0).setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+				codeSerialValues.get(0).setTs(new Date());
+				codeSerialValueMapper.updateById(codeSerialValues.get(0));
+			}
+		}
+		return R.success("鎿嶄綔鎴愬姛锛�");
+	}
+
 	/***
 	 * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
 	 * @param desc
@@ -807,9 +953,8 @@
 	@Override
 	public List<CodeClassifyVO> listChildrenClassify(String codeClassifyOid, boolean allLevel, String fieldInPath, boolean enable) {
 		if(allLevel){
-			List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath);
+			List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath,AuthUtil.getTenantId());
 			if(!CollectionUtils.isEmpty(classifyDOS)){
-				// 杩欏効鐢╯tream鏈夌偣鎱�
 				classifyDOS = classifyDOS.parallelStream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
 			}
 			return codeClassifyDO2VOs(classifyDOS);
@@ -928,7 +1073,7 @@
 		Map<String/**璺緞**/,String/**涓婚敭**/> oidPathMap = new HashMap<>();
 
 		//鎴戜滑闇�瑕佹煡璇㈡墍鏈夊凡缁忓瓨鍦ㄧ殑鍒嗙被锛屼富瑕佹槸璺緞锛岀敤鏉ュ垽鏂垎绫荤殑鏁版嵁
-		List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null);
+		List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null,AuthUtil.getTenantId());
 		Map<String/**璺緞**/, CodeClassify/**宸茬粡瀛樺湪鐨勬暟鎹�**/> pathDOMap = Optional.ofNullable(existClassifyDOs).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> {
 			String path = s.getPath();
 			if(StringUtils.isNotBlank(path) && path.startsWith("#")){
@@ -1264,7 +1409,7 @@
 			return null;
 		}
 		List<Tree> treeList = trees.stream().filter(tree -> !CollectionUtils.isEmpty(btmTypeVOS.stream().filter(btmType -> {
-					if(Objects.equals(tree.getAttributes().get("id"), btmType.getId())){
+					if(Objects.equals(tree.getAttributes().get("btmTypeId"), btmType.getId())){
 						tree.getAttributes().put("btmTypeOid",btmType.getOid());
 						return true;
 					}
@@ -1313,6 +1458,19 @@
 	}
 
 	/**
+	 * 鏌ヨ鎵�鏈変笂灞傜埗鑺傜偣鐨刼id
+	 * @param oid
+	 * @return
+	 */
+	@Override
+	public List<String> selectAllParentOid(String oid){
+		if(Func.isBlank(oid)){
+			return new ArrayList<>();
+		}
+		return this.codeClassifyMapper.selectAllParentOid(oid);
+	}
+
+	/**
 	 * 浣跨敤鍒嗙被涓婚敭鑾峰彇鍒嗙被鐩稿叧鐨勬墍鏈変俊鎭�
 	 *
 	 * @param codeClassifyOid 鍒嗙被鐨勪富閿�
@@ -1357,4 +1515,6 @@
 		return codeClassifyMapper.selectCount(wrapper).intValue();
 	}
 
+
+
 }

--
Gitblit v1.9.3