From ddab14a4547255236c60b1cd039013c2eaecf18f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 01 八月 2023 21:07:05 +0800
Subject: [PATCH] 修改参照组件值回填bug等
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 115 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 91 insertions(+), 24 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 4328924..6f1dbdf 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,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
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.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
@@ -53,6 +54,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -79,6 +81,9 @@
@Resource
private IBtmTypeClient btmTypeClient;
+
+ @Value("${user-info.tenant-id}")
+ private String tenantId;
/**
* 鏃ュ織
@@ -127,6 +132,18 @@
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
+ }
+ QueryWrapper<CodeClassify> classifyQueryWrapper = new QueryWrapper<>();
+ classifyQueryWrapper.eq("parentCodeClassifyOid",codeClassifyEntity.getParentCodeClassifyOid());
+ classifyQueryWrapper.eq("id",codeClassifyEntity.getId());
+ List<CodeClassify> codeClassifyList = baseMapper.selectList(classifyQueryWrapper);
+ if(codeClassifyList.size()!=0){
+ return R.fail("褰撳墠鍒嗙被涓嬩笉鍏佽鍒嗙被缂栧彿閲嶅锛岃妫�鏌ワ紒锛侊紒");
+ }
+ if(Func.isNotEmpty(codeClassifyEntity.getParentCodeClassifyOid())){
+ CodeClassify codeClassify = baseMapper.selectOne(Wrappers.<CodeClassify>query().lambda().eq(CodeClassify::getOid, codeClassifyEntity.getParentCodeClassifyOid()));
+ codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId());
+ codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName());
}
codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setCreateTime(new Date());
@@ -197,11 +214,11 @@
* @return 鏁版嵁瀵硅薄
*/
private CodeClassify selectByOid(String oid){
- CodeClassify codeClassifyEntity = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'").get(0);
- if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){
+ List<CodeClassify> codeClassifyEntityList = codeClassifyMapper.selectClassifyByKeyAndReseRel("'" + oid.trim() + "'");
+ if (codeClassifyEntityList.isEmpty() || codeClassifyEntityList.get(0) == null || StringUtils.isBlank(codeClassifyEntityList.get(0).getOid())) {
throw new ServiceException("dataOidNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹�
}
- return codeClassifyEntity;
+ return codeClassifyEntityList.get(0);
}
/**
@@ -225,7 +242,7 @@
if(checkChildIsLinked(detail.getOid())){
return R.fail("dataCascadeLinkedNotDelete");
}
- return R.data(checkHasChild(detail.getOid()));
+ return R.status(!checkHasChild(detail.getOid()));
}
/**
@@ -281,7 +298,7 @@
R result = checkIsCanDeleteForDO(codeClassify);
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
+ //鍏堟鏌ユ槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
Map<String,Object> condition = new HashMap<>(2);
condition.put("codeClassifyOid",codeClassify.getOid());
List<CodeClassifyTemplate> codeClstemplateEntities = codeClassifyTemplateMapper.selectByMap(condition);
@@ -480,12 +497,12 @@
}
if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
doList = codeClassifyMapper
- .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid());
+ .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
}else{
- doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid());
+ doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
}
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
- TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME.toLowerCase(Locale.ROOT));
+ TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
List<Tree> tree= revisionModelUtil.doList2Trees(voList,treeWrapperOptions,(CodeClassifyVO s) ->{
//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
@@ -513,10 +530,61 @@
*/
@Override
public List<CodeClassifyVO> selectCodeClassifyDOByTree(TreeQueryObject treeQueryObject) {
- List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid());
+ List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(),AuthUtil.getTenantId());
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
return voList;
}
+
+ /***
+ *
+ * @param parentOid
+ * @return
+ */
+ @Override
+ public List<CodeClassifyVO> selectCodeClassifyVOByParentId(String parentOid) {
+ List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyDOByParentId(parentOid,AuthUtil.getTenantId());
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
+ }
+
+ /**
+ * 鏍规嵁搴撹妭鐐瑰悕绉拌幏鍙栧垎绫�
+ * @param libName
+ * @return
+ */
+ @Override
+ public List<CodeClassifyVO> getRMLibByName(String libName) {
+ List<String> libNameList=new ArrayList<>();
+ if(StringUtils.isNotBlank(libName)){
+ libNameList=VciBaseUtil.str2List(libName);
+ }
+ List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId());
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
+ }
+
+ /***
+ * 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
+ * @param desc
+ * @param codeLibName
+ * @return
+ */
+ @Override
+ public List<CodeClassifyVO> getRMTypeByDescAndLib(String desc, String codeLibName) {
+ List<CodeClassify> doList =codeClassifyMapper.getRMTypeByDesc(desc,"Enabled",AuthUtil.getTenantId());
+ if (CollectionUtils.isEmpty(doList)) {
+ return new LinkedList<CodeClassifyVO>();
+ }
+ CodeClassify codeClassify=doList.get(0);
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllParenClassifytByOid(codeClassify.getOid(),AuthUtil.getTenantId());
+ CodeClassify currentLib = codeClassifyList.get(codeClassifyList.size() - 1);
+ if (!currentLib.getName().equals(codeLibName)) {
+ return new ArrayList<>();
+ }
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
+ return voList;
+ }
+
/**
* 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
*
@@ -544,7 +612,6 @@
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
return voList;
}
-
// /**
// * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
@@ -587,7 +654,7 @@
codeClassifyVOS.add(codeClassifyVO);
//鏌ヨ涓�涓嬭鍒欑殑缂栧彿锛屽拰鍏抽敭灞炴�ч噸澶嶈鍒�
- List<String> codeRuleOids = codeClassifyVOS.stream().filter(s -> StringUtils.isNotBlank(s.getCoderuleoid())).map(CodeClassifyVO::getCoderuleoid).collect(Collectors.toList());
+ List<String> codeRuleOids = codeClassifyVOS.stream().filter(s -> StringUtils.isNotBlank(s.getCodeRuleOid())).map(CodeClassifyVO::getCodeRuleOid).collect(Collectors.toList());
Map<String, CodeRuleVO> ruleVOMap = new HashMap<>();
if(!CollectionUtils.isEmpty(codeRuleOids)){
VciBaseUtil.switchCollectionForOracleIn(codeRuleOids).stream().forEach(ruleOids->{
@@ -597,7 +664,7 @@
});
}
//鎵惧叧閿睘鎬ц鍒�
- List<String> keyRuleOids = codeClassifyVOS.stream().filter(s -> StringUtils.isNotBlank(s.getCodekeyattrrepeatoid())).map(CodeClassifyVO::getCodekeyattrrepeatoid).collect(Collectors.toList());
+ List<String> keyRuleOids = codeClassifyVOS.stream().filter(s -> StringUtils.isNotBlank(s.getCodeKeyAttrRepeatOid())).map(CodeClassifyVO::getCodeKeyAttrRepeatOid).collect(Collectors.toList());
Map<String, CodeKeyAttrRepeatRuleVO> keyRuleVOMap = new HashMap<>();
if(!CollectionUtils.isEmpty(keyRuleOids)){
VciBaseUtil.switchCollectionForOracleIn(keyRuleOids).stream().forEach(ruleOids->{
@@ -629,12 +696,12 @@
CodeClassifyVO vo = codeClassifyVOS.get(i);
excelDataList.add(new WriteExcelData(i+1,0,vo.getId()));
excelDataList.add(new WriteExcelData(i+1,1,vo.getName()));
- excelDataList.add(new WriteExcelData(i+1,2,vo.getBtmtypeid()));
- excelDataList.add(new WriteExcelData(i+1,3,vo.getBtmtypename()));
- excelDataList.add(new WriteExcelData(i+1,4, StringUtils.isNotBlank(vo.getCoderuleoid())?ruleVOMap.getOrDefault(vo.getCoderuleoid(),new CodeRuleVO()).getId():""));
- excelDataList.add(new WriteExcelData(i+1,5, StringUtils.isNotBlank(vo.getCoderuleoid())?ruleVOMap.getOrDefault(vo.getCoderuleoid(),new CodeRuleVO()).getName():""));
- excelDataList.add(new WriteExcelData(i+1,6, StringUtils.isNotBlank(vo.getCodekeyattrrepeatoid())?keyRuleVOMap.getOrDefault(vo.getCodekeyattrrepeatoid(),new CodeKeyAttrRepeatRuleVO()).getId():""));
- excelDataList.add(new WriteExcelData(i+1,7, StringUtils.isNotBlank(vo.getCodekeyattrrepeatoid())?keyRuleVOMap.getOrDefault(vo.getCodekeyattrrepeatoid(),new CodeKeyAttrRepeatRuleVO()).getName():""));
+ excelDataList.add(new WriteExcelData(i+1,2,vo.getBtmTypeId()));
+ excelDataList.add(new WriteExcelData(i+1,3,vo.getBtmTypeName()));
+ excelDataList.add(new WriteExcelData(i+1,4, StringUtils.isNotBlank(vo.getCodeRuleOid())?ruleVOMap.getOrDefault(vo.getCodeRuleOid(),new CodeRuleVO()).getId():""));
+ excelDataList.add(new WriteExcelData(i+1,5, StringUtils.isNotBlank(vo.getCodeRuleOid())?ruleVOMap.getOrDefault(vo.getCodeRuleOid(),new CodeRuleVO()).getName():""));
+ excelDataList.add(new WriteExcelData(i+1,6, StringUtils.isNotBlank(vo.getCodeKeyAttrRepeatOid())?keyRuleVOMap.getOrDefault(vo.getCodeKeyAttrRepeatOid(),new CodeKeyAttrRepeatRuleVO()).getId():""));
+ excelDataList.add(new WriteExcelData(i+1,7, StringUtils.isNotBlank(vo.getCodeKeyAttrRepeatOid())?keyRuleVOMap.getOrDefault(vo.getCodeKeyAttrRepeatOid(),new CodeKeyAttrRepeatRuleVO()).getName():""));
excelDataList.add(new WriteExcelData(i+1,8,vo.getOid().equalsIgnoreCase(codeClassify.getOid())?vo.getPath():codeClassify.getPath() + vo.getPath()));
excelDataList.add(new WriteExcelData(i+1,9,FrameworkDataLCStatus.getTextByValue(vo.getLcStatus())));
excelDataList.add(new WriteExcelData(i+1,10,vo.getDataLevel()));
@@ -932,14 +999,14 @@
return new DataGrid<>();
}
CodeClassifyVO topClassifyVO = getTopClassifyVO(classifyOid);
- if(topClassifyVO == null || StringUtils.isBlank(topClassifyVO.getBtmtypeid())){
+ if(topClassifyVO == null || StringUtils.isBlank(topClassifyVO.getBtmTypeId())){
return new DataGrid<>();
}
Map<String,Object> condition = new HashMap<>(1);
- condition.put("pkbtmtype",topClassifyVO.getBtmtypeid());
+ condition.put("pkbtmtype",topClassifyVO.getBtmTypeId());
R<BtmTypeVO> btmTypeDetail = btmTypeClient.getDetail(btmTypeOid);
- if(btmTypeDetail.getCode() != 200){
+ if(!btmTypeDetail.isSuccess()){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
}
List<BtmTypeAttributeVO> unDefaultAttributes = btmTypeDetail.getData().getAttributes();
@@ -967,8 +1034,8 @@
}
});
}
- R<BtmTypeVO> btmTypeVOR = btmTypeClient.getDefaultAttrByBtmId(topClassifyVO.getBtmtypeid());
- if(btmTypeVOR.getCode() != 200){
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getDefaultAttrByBtmId(topClassifyVO.getBtmTypeId());
+ if(!btmTypeVOR.isSuccess()){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
}
List<BtmTypeAttributeVO> defaultAttrVOS = btmTypeVOR.getData().getAttributes();
@@ -1183,7 +1250,7 @@
fullInfo.setParentClassifyVOs(codeClassifyDO2VOs(codeClassifyList));
if(!CollectionUtils.isEmpty(fullInfo.getParentClassifyVOs())){
- fullInfo.setTopClassifyVO(fullInfo.getParentClassifyVOs().stream().filter(s->StringUtils.isBlank(s.getParentcodeclassifyoid())).findFirst().orElseGet(()->null));
+ fullInfo.setTopClassifyVO(fullInfo.getParentClassifyVOs().stream().filter(s->StringUtils.isBlank(s.getParentCodeClassifyOid())).findFirst().orElseGet(()->null));
}
return fullInfo;
}
--
Gitblit v1.9.3