From e61a898fe563214cb13e97c08804534a61aad46b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 07 十一月 2023 17:32:40 +0800
Subject: [PATCH] 主数据管理按钮返回缓存问题修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 129 +++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 28 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 baaac38..c41aada 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
@@ -2,6 +2,7 @@
import com.alibaba.nacos.common.utils.StringUtils;
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.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -13,6 +14,7 @@
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.po.CodeClassifyPO;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeKeyAttrRepeatService;
@@ -36,13 +38,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.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;
@@ -66,6 +71,7 @@
import java.util.stream.Stream;
import static com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant.*;
+import static com.vci.ubcs.starter.web.util.VciBaseUtil.getTableName;
@Service
public class CodeClassifyServiceImpl extends ServiceImpl<CodeClassifyMapper, CodeClassify> implements ICodeClassifyService {
@@ -82,8 +88,8 @@
@Resource
private IBtmTypeClient btmTypeClient;
- @Value("${user-info.tenant-id}")
- private String tenantId;
+ @Resource
+ private CommonsMapper commonsMapper;
/**
* 鏃ュ織
@@ -124,14 +130,30 @@
@Override
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
- return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, 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("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
+ }
+ if(StringUtils.isEmpty(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isBlank(codeClassifyEntity.getBtmTypeId())){
+ return R.fail("涓婚搴撳叧鑱旂殑涓氬姟绫诲瀷涓嶈兘涓虹┖锛�");
}
QueryWrapper<CodeClassify> classifyQueryWrapper = new QueryWrapper<>();
classifyQueryWrapper.eq("parentCodeClassifyOid",codeClassifyEntity.getParentCodeClassifyOid());
@@ -145,14 +167,8 @@
codeClassifyEntity.setBtmTypeId(codeClassify.getBtmTypeId());
codeClassifyEntity.setBtmTypeName(codeClassify.getBtmTypeName());
}
- codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
- codeClassifyEntity.setCreateTime(new Date());
- codeClassifyEntity.setTs(new Date());
- codeClassifyEntity.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
- codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
- codeClassifyEntity.setLastModifyTime(new Date());
- codeClassifyEntity.setRevisionSeq(1);
- codeClassifyEntity.setVersionSeq(1);
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeClassifyEntity, MdmBtmTypeConstant.CODE_CLASSIFY);
+ codeClassifyEntity.setLcStatus(FRAMEWORK_DATA_ENABLED);
int insertNumber = codeClassifyMapper.insert(codeClassifyEntity);
return R.status(SqlHelper.retBool(insertNumber));
}
@@ -176,7 +192,8 @@
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
}
- codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ // codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
codeClassifyEntity.setLastModifyTime(new Date());
codeClassifyEntity.setTs(new Date());
int insertNumber = codeClassifyMapper.updateById(codeClassifyEntity);
@@ -363,11 +380,12 @@
List<CodeClassify> classifyList = codeClassifyMapper.selectStartWithCurrentOid(oid);
Date now = new Date();
- String userId = String.valueOf(AuthUtil.getUserId());
+ // String userId = String.valueOf(AuthUtil.getUserId());
+ String account = AuthUtil.getUserAccount();
classifyList = classifyList.stream().map(s -> {
s.setLcStatus(lcStatus);
s.setTs(now);
- s.setLastModifier(userId);
+ s.setLastModifier(account);
s.setLastModifyTime(now);
return s;
}).collect(Collectors.toList());
@@ -430,7 +448,7 @@
List<CodeClassifyVO> voList = new ArrayList<CodeClassifyVO>();
if(!CollectionUtils.isEmpty(codeClassifys)){
for(CodeClassify s: codeClassifys){
- CodeClassifyVO vo = codeClassifyDO2VO(s);
+ CodeClassifyVO vo = codeClassifyDO2VO(s);
if(vo != null){
voList.add(vo);
}
@@ -510,10 +528,21 @@
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"));
doList = codeClassifyMapper
- .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
+ .selectCodeClassifyDOByTree(
+ treeQueryObject.getConditionMap().get("id"),
+ treeQueryObject.getConditionMap().get("lcStatus"),
+ treeQueryObject.getParentOid(),
+ VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId(),
+ tableName
+ );
}else{
- doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
+ // 鍙鍓嶇浼氫紶鍙傛暟杩囨潵灏变笉浼氬嚭鐜拌蛋杩欏彞鐨勬儏鍐碉紝鎵�浠ユ煡璇㈡�绘暟娌″湪杩欏効娣诲姞
+ doList =codeClassifyMapper.selectCodeClassifyVOByTree(
+ treeQueryObject.getParentOid(),
+ VciBaseUtil.checkAdminTenant() ? null:AuthUtil.getTenantId()
+ );
}
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);
@@ -523,6 +552,7 @@
return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
});
+
Iterator var6 = tree.listIterator();
while(var6.hasNext()){
Tree trees = (Tree) var6.next();
@@ -534,6 +564,28 @@
}
}
return tree;
+ }
+
+ /**
+ * 鍒嗙被鍔犺浇鏃惰幏鍙栦笟鍔＄被鍨媔d锛屾嫾鎺ヤ笟鍔＄被鍨嬭〃鍚�
+ * @return
+ */
+ private String getTableName(String parentCodeClassifyOid,String id,String lcStatus){
+ 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);
+ }
+ CodeClassify codeClassify = codeClassifyMapper.selectOne(wrapper);
+ if(Func.isEmpty(codeClassify) || Func.isEmpty(codeClassify.getBtmTypeId())){
+ throw new ServiceException("鏌ヨ涓绘暟鎹�绘暟鏃讹紝鏈幏鍙栦笟鍔＄被鍨婭D锛�");
+ }
+ return VciBaseUtil.getTableName(codeClassify.getBtmTypeId(),true);
}
/**
@@ -572,11 +624,27 @@
if(StringUtils.isNotBlank(libName)){
libNameList=VciBaseUtil.str2List(libName);
}
- List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId());
+ List<CodeClassify> doList =codeClassifyMapper.getRMLibByName(libNameList,"Enabled",AuthUtil.getTenantId()
+ .equals(
+ NacosConfigCache
+ .getAdminUserInfo()
+ .getTenantId()
+ ) ? null:AuthUtil.getTenantId());
List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
return voList;
}
+ /***
+ * 鏍规嵁oid鑾峰彇涓嬮潰鎵�鏈夌殑鍒嗙被淇℃伅
+ * @param oid
+ * @return
+ */
+ public List<CodeClassifyVO> selectAllClassifyByOid(String oid){
+ List<CodeClassify> codeClassifyList=codeClassifyMapper.selectAllClassifyByOid(oid,AuthUtil.getTenantId());
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(codeClassifyList);
+ return voList;
+
+ }
/***
* 鏍规嵁鍒嗙被鎻忚堪澶囨敞鍜屽簱鑺傜偣鏌ヨ鍒嗙被淇℃伅
* @param desc
@@ -672,8 +740,8 @@
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)));
});
}
@@ -706,6 +774,7 @@
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()));
@@ -740,7 +809,8 @@
if(allLevel){
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());
+ // 杩欏効鐢╯tream鏈夌偣鎱�
+ classifyDOS = classifyDOS.parallelStream().filter(s->FRAMEWORK_DATA_ENABLED.equalsIgnoreCase(s.getLcStatus())).collect(Collectors.toList());
}
return codeClassifyDO2VOs(classifyDOS);
}else{
@@ -841,7 +911,7 @@
s -> StringUtils.isNotBlank(s.getCodeRuleId()))
.map(CodeClassifyPO::getCodeRuleId)
.collect(Collectors.toList());
- Map<String, CodeRuleVO> ruleVOMap = Optional.ofNullable(ruleOids.size()==0 ? null:codeRuleService.listCodeRuleByOids(ruleOids)
+ Map<String, CodeRuleVO> ruleVOMap = Optional.ofNullable(ruleOids.size()==0 ? null:codeRuleService.listCodeRuleByIds(ruleOids,true)
).orElse(new ArrayList<>()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t,(o1,o2)->o2));
List<String> keyOids = poList.stream().filter(s -> StringUtils.isNotBlank(s.getKeyRepeatRuleId()))
@@ -849,7 +919,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())
@@ -977,8 +1047,10 @@
classifyDO.setBtmname("codeclassify");
classifyDO.setLcStatus("Enabled");
classifyDO.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
- classifyDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
- classifyDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ // classifyDO.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ // classifyDO.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyDO.setCreator(String.valueOf(AuthUtil.getUser().getAccount()));
+ classifyDO.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
classifyDO.setLastModifyTime(new Date());
codeClassifyMapper.insert(classifyDO);
}
@@ -1120,7 +1192,8 @@
List<Map<String,Object>> cbos = codeClassifyMapper.selectAllLevelParentByOid(oid);
Map<String,String> oidLevelMap = new HashMap<>();
Optional.ofNullable(cbos).orElseGet(()->new ArrayList<>()).stream().forEach(cbo->{
- oidLevelMap.put(cbo.get("OID").toString(),cbo.get("LEVEL").toString());
+ // 鐢╧ey鍙杕ap鍊煎苟涓斾笉鍖哄垎澶у皬鍐�
+ oidLevelMap.put(cbo.getOrDefault("OID",cbo.get("oid")).toString(),cbo.get("LEVEL").toString());
});
if(CollectionUtils.isEmpty(oidLevelMap)){
return new ArrayList<>();
@@ -1191,7 +1264,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;
}
--
Gitblit v1.9.3