From f6f5e4a28931bdd49b9d0d593d42ef6a291e0f86 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期六, 09 九月 2023 09:14:07 +0800
Subject: [PATCH] 1、租户拼接问题修改。 2、http请求头加鉴权失败问题修改。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 328 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 258 insertions(+), 70 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 1740d98..710c79e 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;
@@ -23,6 +24,7 @@
import com.vci.ubcs.omd.enums.EnumEnum;
import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeAttributeVO;
+import com.vci.ubcs.omd.feign.IBtmTypeClient;
import com.vci.ubcs.omd.vo.BtmTypeVO;
import com.vci.ubcs.starter.bo.WriteExcelData;
import com.vci.ubcs.starter.exception.VciBaseException;
@@ -34,14 +36,16 @@
import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
import com.vci.ubcs.starter.util.BladeTreeQueryObject;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.LocalFileUtil;
+import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
import com.vci.ubcs.starter.web.pagemodel.DataGrid;
-import com.vci.ubcs.starter.web.pagemodel.PageHelper;
import com.vci.ubcs.starter.web.pagemodel.Tree;
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import com.vci.ubcs.system.cache.NacosConfigCache;
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,14 +57,16 @@
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.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import javax.annotation.Resource;
+import java.awt.event.ItemEvent;
import java.io.File;
import java.util.*;
import java.util.stream.Collectors;
+import java.util.stream.Stream;
import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.*;
@@ -78,6 +84,9 @@
@Resource
private IBtmTypeClient btmTypeClient;
+
+ @Resource
+ private NacosConfigCache nacosConfigCache;
/**
* 鏃ュ織
@@ -105,25 +114,58 @@
return codeClassifyMapper.selectList(wrapper);
}
+ /**
+ * 鏌ヨ
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return
+ */
@Override
- public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
- return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
+ public List<String> select1(Wrapper wrapper) {
+
+ return codeClassifyMapper.selectObjs(wrapper);
}
@Override
- public R addSave(CodeClassify codeClassifyEntity) {
+ public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
+ return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify,AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId()));
+ }
+ /**
+ * 涓婚搴撳畾涔夎〃 鏂板
+ * @param
+ */
+ @Override
+ public R addSave(CodeClassify codeClassifyEntity) {
+ try {
+ VciBaseUtil.alertNotNull(codeClassifyEntity.getId(),"涓婚搴撶紪鍙蜂笉鑳戒负绌猴紒",codeClassifyEntity.getName(),"涓婚搴撳悕绉颁笉鑳戒负绌猴紒");
+ }catch (VciBaseException e){
+ return R.fail(e.getMessage());
+ }
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
}
- codeClassifyEntity.setCreator(AuthUtil.getUser().getUserName());
- codeClassifyEntity.setCreateTime(new Date());
- codeClassifyEntity.setTs(new Date());
- codeClassifyEntity.setOwner(AuthUtil.getUser().getUserName());
- codeClassifyEntity.setLastModifier(AuthUtil.getUser().getUserName());
- codeClassifyEntity.setLastModifyTime(new Date());
- codeClassifyEntity.setRevisionSeq(1);
- codeClassifyEntity.setVersionSeq(1);
+ if(StringUtils.isEmpty(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isBlank(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());
+ }
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY);
+ codeClassifyEntity.setLcStatus(FRAMEWORK_DATA_ENABLED);
int insertNumber = codeClassifyMapper.insert(codeClassifyEntity);
return R.status(SqlHelper.retBool(insertNumber));
}
@@ -139,20 +181,17 @@
return R.fail("浼犲叆鏁版嵁涓嶈兘涓虹┖锛�");
}
//妫�鏌s
- Map<String,Object> condition = new HashMap<>(2);
- condition.put("oid",codeClassifyEntity.getOid());
- condition.put("ts",codeClassifyEntity.getTs());
- CodeClassify detail = codeClassifyMapper
- .selectOne(Condition.getQueryWrapper(condition,CodeClassify.class));
- if(detail == null){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
+ CodeClassify detail = codeClassifyMapper.selectById(codeClassifyEntity.getOid());
+ if(!detail.getTs().toString().equals(codeClassifyEntity.getTs().toString())){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
return R.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
}
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
}
- codeClassifyEntity.setLastModifier(AuthUtil.getUser().getUserName());
+ codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setLastModifyTime(new Date());
+ codeClassifyEntity.setTs(new Date());
int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
@@ -188,12 +227,11 @@
* @return 鏁版嵁瀵硅薄
*/
private CodeClassify selectByOid(String oid){
-
- CodeClassify codeClassifyEntity = codeClassifyMapper.selectById(oid.trim());
- 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);
}
/**
@@ -211,13 +249,15 @@
// .selectOne(Condition.getQueryWrapper(condition,CodeClassify.class));
if(detail == null){//涓嶆槸鏈�鏂扮殑涓嶈鏀�
throw new ServiceException("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
-// return R.fail("褰撳墠鏁版嵁涓嶆槸鏈�鏂帮紝璇峰埛鏂板悗鍐嶄慨鏀癸紒");
}
//鏍￠獙涓嬬骇鏄惁鏈夊紩鐢�
if(checkChildIsLinked(detail.getOid())){
return R.fail("dataCascadeLinkedNotDelete");
}
- return R.data(checkHasChild(detail.getOid()));
+ if(checkHasChild(detail.getOid())){
+ return R.fail("姝ゆ暟鎹湁涓嬬骇锛屾棤娉曡繘琛屽垹闄わ紒");
+ }
+ return R.status(!checkHasChild(detail.getOid()));
}
/**
@@ -273,7 +313,7 @@
R result = checkIsCanDeleteForDO(codeClassify);
- //鍏堢畝绉版槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
+ //鍏堟鏌ユ槸鍚︽湁鍏宠仈妯℃澘锛屾湁妯℃澘瑕佸厛鍒犻櫎
Map<String,Object> condition = new HashMap<>(2);
condition.put("codeClassifyOid",codeClassify.getOid());
List<CodeClassifyTemplate> codeClstemplateEntities = codeClassifyTemplateMapper.selectByMap(condition);
@@ -334,20 +374,32 @@
@Override
public R updateLcStatus(String oid, String lcStatus){
- //鏌ヨ淇敼鍓峵s
- CodeClassify codeClassify = codeClassifyMapper.selectById(oid);//涓昏鏄负浜嗘煡璇s
- codeClassify.setLcStatus(lcStatus);
- codeClassify.setTs(new Date());
- codeClassify.setLastModifyTime(new Date());
- codeClassify.setLastModifier(AuthUtil.getUser().getUserName());
+ List<CodeClassify> classifyList = codeClassifyMapper.selectStartWithCurrentOid(oid);
+ Date now = new Date();
+ String userId = String.valueOf(AuthUtil.getUserId());
+ classifyList = classifyList.stream().map(s -> {
+ s.setLcStatus(lcStatus);
+ s.setTs(now);
+ s.setLastModifier(userId);
+ s.setLastModifyTime(now);
+ return s;
+ }).collect(Collectors.toList());
+// //鏌ヨ淇敼鍓峵s
+// CodeClassify codeClassify = codeClassifyMapper.selectById(oid);//涓昏鏄负浜嗘煡璇s
+// codeClassify.setLcStatus(lcStatus);
+// codeClassify.setTs(new Date());
+// codeClassify.setLastModifyTime(new Date());
+// codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
//鍚敤銆佸仠鐢�
// int u = codeClassifyMapper.updateLcStatus(oid,lcStatus);
- int count = codeClassifyMapper.updateById(codeClassify);
+// int count = codeClassifyMapper.updateById(codeClassify);
+ codeClassifyMapper.batchUpdateLcStatus(classifyList);
// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆�
// if(u!=0) {
// codeDuckingServiceI.insertCache1(lcStatus,lcStatus,DOCKING_DEFAULT_CLASSIFY, DOCKING_DEFAULT_CLASSIFYOID, oid, codeClassifyDO_old.getTs());
// }
- return R.data(SqlHelper.retBool(count));
+// return R.data(SqlHelper.retBool(count));
+ return R.success("");
}
/**
@@ -439,15 +491,55 @@
}
/**
+ * 涓婚敭鏌ヨ鏁版嵁瀵硅薄,鍏宠仈鏌ヨ
+ * @param oid 涓婚敭
+ * @return 鏁版嵁瀵硅薄
+ */
+ private CodeClassify selectByOidRel(String oid){
+
+ List<CodeClassify> codeClassifyList = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'");
+// CodeClassify codeClassifyEntity = (CodeClassify) codeClassifyList;
+ if(codeClassifyList.size() == 0 ){
+ throw new ServiceException("dataNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹�
+ }
+// if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){
+// throw new ServiceException("dataOidNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹�
+// }
+ return codeClassifyList.get(0);
+ }
+
+ /**
* 鏌ヨ涓婚搴撳垎绫� 鏍�
* @param treeQueryObject 鏍戞煡璇㈠璞�
* @return 涓婚搴撳垎绫� 鏄剧ず鏍�
*/
@Override
public List<Tree> treeCodeClassify(TreeQueryObject treeQueryObject) {
- List<CodeClassify> doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid());
+ List<CodeClassify> doList = null;
+ String id = null;
+ String lcStatus = null;
+ if(!Objects.isNull(treeQueryObject.getConditionMap())){
+ id = treeQueryObject.getConditionMap().getOrDefault("id",null);
+ lcStatus = treeQueryObject.getConditionMap().getOrDefault("lcStatus",null);
+ }
+ if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
+ doList = codeClassifyMapper
+ .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId());
+ }else{
+ doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null: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) ->{
//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
@@ -475,10 +567,66 @@
*/
@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()
+ .equals(
+ nacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null: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;
+ }
+
/**
* 浣跨敤缂栧彿鐨勮矾寰勮幏鍙栧璞�
*
@@ -502,7 +650,9 @@
*/
@Override
public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
- return null;
+ List<CodeClassify> doList= codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
}
// /**
@@ -546,17 +696,17 @@
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->{
-// Collection<CodeRuleVO> ruleVOS = codeRuleService.listCodeRuleByOids(ruleOids);
- Collection<CodeRuleVO> ruleVOS = null;
+ Collection<CodeRuleVO> ruleVOS = codeRuleService.listCodeRuleByOids(ruleOids);
+ // Collection<CodeRuleVO> ruleVOS = null;
ruleVOMap.putAll( Optional.ofNullable(ruleVOS).orElseGet(()->new ArrayList<>()).stream().collect(Collectors.toMap(s->s.getOid(),t->t)));
});
}
//鎵惧叧閿睘鎬ц鍒�
- 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->{
@@ -584,16 +734,17 @@
excelDataList.add(new WriteExcelData(0,9,"鐘舵��"));
excelDataList.add(new WriteExcelData(0,10,"鍒嗙被灞傜骇"));
excelDataList.add(new WriteExcelData(0,11,"鎻忚堪"));
+ codeClassifyVOS = codeClassifyVOS.stream().sorted(Comparator.comparing(CodeClassifyVO::getDataLevel)).collect(Collectors.toList());
for (int i = 0; i < codeClassifyVOS.size(); i++) {
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()));
@@ -616,7 +767,7 @@
@Override
public List<CodeClassifyVO> listChildrenClassify(String codeClassifyOid, boolean allLevel, String fieldInPath, boolean enable) {
if(allLevel){
- List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid);
+ List<CodeClassify> classifyDOS = codeClassifyMapper.selectAllLevelChildHasPath(codeClassifyOid,fieldInPath);
if(!CollectionUtils.isEmpty(classifyDOS)){
classifyDOS = classifyDOS.stream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
}
@@ -727,7 +878,7 @@
Map<String,CodeKeyAttrRepeatRuleVO> keyRuleVOMap =Optional.ofNullable(keyOids.size()==0 ? null: iCodeKeyattrrepeatService.listCodeKeyAttrRepeatRuleByOids(keyOids)
).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
- List<String> btmOids = poList.stream().filter(s -> StringUtils.isNotBlank(s.getKeyRepeatRuleId()))
+ List<String> btmOids = poList.stream().filter(s -> StringUtils.isNotBlank(s.getBtmTypeId()))
.map(CodeClassifyPO::getBtmTypeId).collect(Collectors.toList());
Map<String, BtmTypeVO> btmVOMap = Optional
.ofNullable(btmOids.size()==0 ? null: btmTypeClient.selectByIdCollection(btmOids).getData())
@@ -736,7 +887,7 @@
Map<String/**璺緞**/,String/**涓婚敭**/> oidPathMap = new HashMap<>();
//鎴戜滑闇�瑕佹煡璇㈡墍鏈夊凡缁忓瓨鍦ㄧ殑鍒嗙被锛屼富瑕佹槸璺緞锛岀敤鏉ュ垽鏂垎绫荤殑鏁版嵁
- List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("");
+ List<CodeClassify> existClassifyDOs = codeClassifyMapper.selectAllLevelChildHasPath("",null);
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("#")){
@@ -854,9 +1005,9 @@
classifyDO.setTs(new Date());
classifyDO.setBtmname("codeclassify");
classifyDO.setLcStatus("Enabled");
- classifyDO.setOwner(AuthUtil.getUser().getUserName());
- classifyDO.setCreator(AuthUtil.getUser().getUserName());
- classifyDO.setLastModifier(AuthUtil.getUser().getUserName());
+ classifyDO.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
classifyDO.setLastModifyTime(new Date());
codeClassifyMapper.insert(classifyDO);
}
@@ -873,7 +1024,7 @@
* @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴��
*/
@Override
- public DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) {
+ public DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject) throws ServiceException{
if(baseQueryObject == null){
baseQueryObject = new BaseQueryObject();
}
@@ -891,14 +1042,17 @@
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());
- BtmTypeVO data = btmTypeClient.getDetail(btmTypeOid).getData();
- List<BtmTypeAttributeVO> unDefaultAttributes = data.getAttributes();
+ condition.put("pkbtmtype",topClassifyVO.getBtmTypeId());
+ R<BtmTypeVO> btmTypeDetail = btmTypeClient.getDetail(btmTypeOid);
+ if(!btmTypeDetail.isSuccess()){
+ throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
+ }
+ List<BtmTypeAttributeVO> unDefaultAttributes = btmTypeDetail.getData().getAttributes();
// List<CodeOsbtmtypeattributeEntity> unDefaultAttributes = codeOsbtmtypeattributeMapper.selectByMap(condition);
// List<OsBtmTypeAttributeVO> unDefaultAttributes = btmService. (topClassifyVO.getBtmtypeid());
List<BtmTypeAttributeVO> attributeVOS = new ArrayList<>();
@@ -908,14 +1062,14 @@
BeanUtils.copyProperties(attr,attributeVO);
attributeVO.setAttrDataType(attr.getAttrDataType());
attributeVO.setAttributeLength(attr.getAttributeLength());
- attributeVO.setBtmTypeId(data.getId());
- attributeVO.setBtmname(data.getName());
- attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCO_FIELD_TYPE,attr.getAttrDataType()));
+ attributeVO.setBtmTypeId(btmTypeDetail.getData().getId());
+ attributeVO.setBtmname(btmTypeDetail.getData().getName());
+ attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,attr.getAttrDataType()));
boolean add = true;
if(StringUtils.isNotBlank(id) && !attributeVO.getId().contains(id.replace("*",""))){
add = false;
}
- if(StringUtils.isNotBlank(name) && !attributeVO.getId().contains(name.replace("*",""))){
+ if(StringUtils.isNotBlank(name) && !attributeVO.getName().contains(name.replace("*",""))){
add = false;
}
if(add){
@@ -923,6 +1077,36 @@
}
});
}
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getDefaultAttrByBtmId(topClassifyVO.getBtmTypeId());
+ if(!btmTypeVOR.isSuccess()){
+ throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
+ }
+ List<BtmTypeAttributeVO> defaultAttrVOS = btmTypeVOR.getData().getAttributes();
+
+ // 鍙栦袱涓泦鍚堝樊闆�
+ List<String> ids = unDefaultAttributes.stream().map(BtmTypeAttributeVO::getId).collect(Collectors.toList());
+ defaultAttrVOS.forEach(item->{
+ if(!ids.contains(item.getId())){
+ BtmTypeAttributeVO attributeVO = new BtmTypeAttributeVO();
+ BeanUtils.copyProperties(item,attributeVO);
+ attributeVO.setAttrDataType(item.getAttrDataType());
+ attributeVO.setAttributeLength(item.getAttributeLength());
+ attributeVO.setBtmTypeId(btmTypeDetail.getData().getId());
+ attributeVO.setBtmname(btmTypeDetail.getData().getName());
+ attributeVO.setAttrDataTypeText(EnumCache.getValue(EnumEnum.VCI_FIELD_TYPE,item.getAttrDataType()));
+ boolean add = true;
+ if(StringUtils.isNotBlank(id) && !item.getId().contains(id.replace("*",""))){
+ add = false;
+ }
+ if(StringUtils.isNotBlank(name) && !item.getName().contains(name.replace("*",""))){
+ add = false;
+ }
+ if(add){
+ attributeVOS.add(attributeVO);
+ }
+ }
+ });
+
DataGrid<BtmTypeAttributeVO> dataGrid = new DataGrid<>();
dataGrid.setData(attributeVOS);
dataGrid.setTotal(attributeVOS.size());
@@ -972,10 +1156,15 @@
}
//浣跨敤涓婚敭鏌ヨ涓�涓�
- List<CodeClassify> classifyDOS = codeClassifyMapper.selectBatchIds(oidLevelMap.keySet());
+ String oids = "";
+ for (String s : oidLevelMap.keySet()) {
+ oids += "'"+s+"',";
+ }
+ List<CodeClassify> classifyDOS = codeClassifyMapper.selectClassifyByKeyAndReseRel(oids.substring(0,oids.length()-1));
if(!CollectionUtils.isEmpty(classifyDOS)){
classifyDOS.stream().forEach(classifyDO->{
classifyDO.setDataLevel(VciBaseUtil.getInt(oidLevelMap.getOrDefault(classifyDO.getOid(),"0")));
+ classifyDO.setLcStatusText(EnumCache.getValue("codeLcstatus",classifyDO.getLcStatus()));
});
}
return classifyDOS;
@@ -1000,17 +1189,16 @@
*/
@Override
public CodeClassifyVO getObjectByIdPath(String idPath) {
- List<Map<String, Object>> idPathValues = codeClassifyMapper.selectByFieldPath("/" + idPath);
+ List<Map<String, Object>> idPathValues = codeClassifyMapper.selectByFieldPath("#" + idPath);
CodeClassify classifyDO = null;
if (idPathValues != null){
- classifyDO = codeClassifyMapper.selectById(idPathValues.get(0).get("oid").toString());
+ classifyDO = codeClassifyMapper.selectByIdRel(idPathValues.get(0).get("OID").toString());
}
return codeClassifyDO2VO(classifyDO);
}
/**
* 涓婚搴撶殑鏍�,宸茶仈璋冧笟鍔＄被鍨嬫煡璇eign
- *
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
* @return 涓婚搴撴樉绀烘爲
*/
@@ -1090,7 +1278,7 @@
public CodeClassifyFullInfoBO getClassifyFullInfo(String codeClassifyOid) {
VciBaseUtil.alertNotNull(codeClassifyOid,"鍒嗙被鐨勪富閿�");
CodeClassifyFullInfoBO fullInfo = new CodeClassifyFullInfoBO();
- CodeClassify classifyDO = selectByOid(codeClassifyOid);
+ CodeClassify classifyDO = selectByOidRel(codeClassifyOid);
//鏌ヨ涓婄骇
fullInfo.setCurrentClassifyVO(codeClassifyDO2VO(classifyDO));
// List<Map<String, Object>> maps = codeClassifyMapper.selectAllLevelParentByOid(codeClassifyOid);
@@ -1105,7 +1293,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