From a4d7993d0b44faffe2e548250a9d2bc27c77e521 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 19 七月 2023 12:27:46 +0800
Subject: [PATCH] 集成获取分类接口（包含编码规则码段码值信息）
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 63 ++++++++++++++-----------------
1 files changed, 29 insertions(+), 34 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 42cad8e..b675fa2 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
@@ -117,9 +117,6 @@
return codeClassifyMapper.selectObjs(wrapper);
}
-
-
-
@Override
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
@@ -131,11 +128,11 @@
if(StringUtils.isNotBlank(codeClassifyEntity.getParentCodeClassifyOid()) && StringUtils.isNotBlank(codeClassifyEntity.getBtmTypeId())){
return R.fail("鍙湁鍦ㄩ《灞傜殑涓婚搴撳垎绫绘墠鑳借缃笟鍔＄被鍨�");
}
- codeClassifyEntity.setCreator(AuthUtil.getUser().getUserName());
+ codeClassifyEntity.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setCreateTime(new Date());
codeClassifyEntity.setTs(new Date());
- codeClassifyEntity.setOwner(AuthUtil.getUser().getUserName());
- codeClassifyEntity.setLastModifier(AuthUtil.getUser().getUserName());
+ codeClassifyEntity.setOwner(String.valueOf(AuthUtil.getUser().getUserId()));
+ codeClassifyEntity.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
codeClassifyEntity.setLastModifyTime(new Date());
codeClassifyEntity.setRevisionSeq(1);
codeClassifyEntity.setVersionSeq(1);
@@ -154,20 +151,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);
// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
@@ -203,12 +197,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);
}
/**
@@ -354,7 +347,7 @@
codeClassify.setLcStatus(lcStatus);
codeClassify.setTs(new Date());
codeClassify.setLastModifyTime(new Date());
- codeClassify.setLastModifier(AuthUtil.getUser().getUserName());
+ codeClassify.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
//鍚敤銆佸仠鐢�
// int u = codeClassifyMapper.updateLcStatus(oid,lcStatus);
int count = codeClassifyMapper.updateById(codeClassify);
@@ -547,7 +540,9 @@
*/
@Override
public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
- return codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassify> doList= codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
}
@@ -592,7 +587,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->{
@@ -602,7 +597,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->{
@@ -634,12 +629,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()));
@@ -900,9 +895,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);
}
@@ -937,12 +932,12 @@
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){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
@@ -972,7 +967,7 @@
}
});
}
- R<BtmTypeVO> btmTypeVOR = btmTypeClient.getDefaultAttrByBtmId(topClassifyVO.getBtmtypeid());
+ R<BtmTypeVO> btmTypeVOR = btmTypeClient.getDefaultAttrByBtmId(topClassifyVO.getBtmTypeId());
if(btmTypeVOR.getCode() != 200){
throw new ServiceException("涓氬姟绫诲瀷feign鎺ュ彛璋冪敤鍑洪敊");
}
@@ -1188,7 +1183,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