From 1c3919f11f5eb5b3c2ba74d95ca6fcdf11ce9bf9 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期四, 25 一月 2024 10:17:35 +0800 Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 208 +++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 182 insertions(+), 26 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 8d69451..da10e36 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,22 +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; @@ -49,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; @@ -61,6 +62,7 @@ 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; @@ -69,6 +71,7 @@ import java.awt.event.ItemEvent; import java.io.File; import java.util.*; +import java.util.concurrent.ForkJoinPool; import java.util.stream.Collectors; import java.util.stream.Stream; @@ -91,7 +94,7 @@ private IBtmTypeClient btmTypeClient; @Resource - private CommonsMapper commonsMapper; + private ISysClient sysClient; /** * 鏃ュ織 @@ -105,6 +108,16 @@ @Resource private ICodeKeyAttrRepeatService iCodeKeyattrrepeatService; + + @Resource + private CodeAllCodeMapper codeAllCodeMapper; + + @Resource + private CodeSerialValueMapper codeSerialValueMapper; + + @Resource + private CodeBasicSecMapper codeBasicSecMapper; + /** * 涓婄骇鑺傜偣鐨勫睘鎬у悕绉� */ @@ -207,12 +220,16 @@ // 涓嶄负绌哄氨闇�瑕佽褰撳墠鍒嗙被涓嬫墍鏈夊瓙鍒嗙被鐨刬sParticipateCheck if(!codeClassifies.isEmpty()){ List<String> oids = codeClassifies.stream().map(CodeClassify::getOid).collect(Collectors.toList()); - updateAttr = codeClassifyMapper.update( - null, - Wrappers.<CodeClassify>update() - .lambda().eq(CodeClassify::getOid, oids) - .set(CodeClassify::getIsParticipateCheck, codeClassifyEntity.getIsParticipateCheck()) - ); + 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); + } // //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫� @@ -495,7 +512,7 @@ * @return 涓婚搴撳垎绫绘樉绀烘爲 */ @Override - public List<Tree> referTree(TreeQueryObject treeQueryObject) { + public List<Tree> referTree(TreeQueryObject treeQueryObject) throws ServiceException{ if(treeQueryObject == null){ treeQueryObject = new TreeQueryObject(); } @@ -505,7 +522,7 @@ if(treeQueryObject.getConditionMap().containsKey(LC_STATUS)) { treeQueryObject.getConditionMap().remove(LC_STATUS); } - if(treeQueryObject.getExtandParamsMap() ==null || !treeQueryObject.getExtandParamsMap().containsKey(REFER_SHOW_DISABLED_QUERY_KEY)) { + if(treeQueryObject.getExtandParamsMap() == null || !treeQueryObject.getExtandParamsMap().containsKey(REFER_SHOW_DISABLED_QUERY_KEY)) { } treeQueryObject.getConditionMap().put(LC_STATUS, FRAMEWORK_DATA_ENABLED); return treeCodeClassify(treeQueryObject); @@ -535,7 +552,7 @@ * @return 涓婚搴撳垎绫� 鏄剧ず鏍� */ @Override - public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) { + public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) throws ServiceException{ List<CodeClassify> doList = null; String id = null; String lcStatus = null; @@ -545,6 +562,7 @@ } if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){ //String tableName = this.getTableName(treeQueryObject.getConditionMap().get("btmTypeId"),treeQueryObject.getConditionMap().get("id"), treeQueryObject.getConditionMap().get("lcStatus")); + // TODO: 2024-1-24 23:25鎴戝幓鎺変簡鎳掑姞杞斤紝鍥犱负浼氬奖鍝嶆暟鎹巿鏉冭繃婊わ紝鑰屼笖杩欏効鎰熻娌″繀瑕佸仛鎳掑姞杞� doList = codeClassifyMapper .selectCodeClassifyDOByTree( treeQueryObject.getConditionMap().get("id"), @@ -563,23 +581,71 @@ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList); TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME); treeWrapperOptions.copyFromTreeQuery(treeQueryObject); - List<Tree> tree= revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{ + List<Tree> tree = revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{ //鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀� return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s .getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : ""); }); + // 闈炶秴绠¤繃婊ゆ湭鎺堟潈鐨勫垎绫� + if(!VciBaseUtil.checkAdminTenant()){ + // 閭d簺鍒嗙被鍏峰鏌ョ湅鏉冮檺 + R<List<String>> viewClassByRoleIds = sysClient.getViewClassByRoleIds( + Arrays.asList(AuthUtil.getUser().getRoleId().split(",")), + treeQueryObject.getConditionMap().getOrDefault("authType","classify_auth"), + treeQueryObject.getConditionMap().getOrDefault("buttonCode","classify_view"), + treeQueryObject.getConditionMap().getOrDefault("menuCode","classifyTree") + ); + // 璇锋眰澶辫触鎴栬�呰姹傚緱鍒扮殑鍏峰鏌ョ湅鏉冮檺鐨勫垎绫籭d闆嗗悎涓虹┖ + if(!viewClassByRoleIds.isSuccess() && viewClassByRoleIds.getData().isEmpty()){ + throw new ServiceException("涓绘暟鎹煡鐪嬫潈闄愭湭閰嶇疆锛屾垨閰嶇疆鏈夎锛�"); + } + // 杩囨护 + filterTreeNodes(tree,viewClassByRoleIds.getData()); + } + // 鍔犺浇鍒嗙被鏄惁鍏锋湁瀛愬垎绫� + tree.parallelStream().forEach(item -> { + boolean checkHasChild = checkHasChild(item.getOid()); + item.setLeaf(!checkHasChild); + }); + return tree; + } - 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); + /** + * 鍒嗙被鎺堟潈杩囨护鎺夋病鏈夋潈闄愮殑鍒嗙被 + * @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 = 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(); } } - return tree; + } + + 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; } /** @@ -656,10 +722,85 @@ * @return */ public List<CodeClassifyVO> selectAllClassifyByOid(String oid, String fieldInPath){ - List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId(),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) { + if(Func.isEmpty(codeAllCodeVO.getSerialUnit())){ + throw new ServiceException("缂栫爜涓猴細" + codeAllCodeVO.getId() + "鐨勭爜鍊兼暟鎹祦姘翠緷璧栦笉鑳戒负绌猴紒"); + } + try { + CodeRuleVO codeRuleVO = codeRuleService.getObjectByOid(codeAllCodeVO.getCodeRuleOid()); + if(Func.isEmpty(codeRuleVO)){ + continue; + } + }catch (Exception e){ + continue; + } + 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("鎿嶄綔鎴愬姛锛�"); } /*** @@ -1329,6 +1470,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 鍒嗙被鐨勪富閿� @@ -1373,4 +1527,6 @@ return codeClassifyMapper.selectCount(wrapper).intValue(); } + + } -- Gitblit v1.9.3