From 5a8861736eb17fe27a4ac49cc8ebaa6f3ade2e71 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 07 七月 2023 17:08:35 +0800
Subject: [PATCH] 前端代码提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyServiceImpl.java | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 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 0b567fd..4328924 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
@@ -106,6 +106,17 @@
return codeClassifyMapper.selectList(wrapper);
}
+ /**
+ * 鏌ヨ
+ * @param wrapper 鏌ヨ灏佽鍣�
+ * @return
+ */
+ @Override
+ public List<String> select1(Wrapper wrapper) {
+
+ return codeClassifyMapper.selectObjs(wrapper);
+ }
+
@Override
public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
@@ -117,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);
@@ -140,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);
// //澶勭悊鏁版嵁闆嗘垚閫昏緫,鎴愬姛鍚庢墽琛岄泦鎴愮涓�姝�,鍒嗙被鏁版嵁鐗规畩澶勭悊銆傚彧鏈夊惎鐢ㄧ姸鎬佺殑鍒嗙被鎵嶆帹閫�
@@ -189,8 +197,7 @@
* @return 鏁版嵁瀵硅薄
*/
private CodeClassify selectByOid(String oid){
-
- CodeClassify codeClassifyEntity = codeClassifyMapper.selectById(oid.trim());
+ CodeClassify codeClassifyEntity = codeClassifyMapper.selectClassifyByKeyAndReseRel("'"+oid.trim()+"'").get(0);
if(codeClassifyEntity == null || StringUtils.isBlank(codeClassifyEntity.getOid())){
throw new ServiceException("dataOidNotExist");//鏍规嵁涓婚敭id鏈煡鍒扮浉鍏虫暟鎹�
}
@@ -340,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);
@@ -533,8 +540,11 @@
*/
@Override
public List<CodeClassifyVO> getIdPathToNamePathByParentId(String classifyId, boolean enable) {
- return null;
+ List<CodeClassify> doList= codeClassifyMapper.getIdPathToNamePathByParentId(classifyId);
+ List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
+ return voList;
}
+
// /**
// * 鏍规嵁鏍戝舰鏌ヨ瀵硅薄鏉ユ煡璇㈡暟鎹璞�
@@ -647,7 +657,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());
}
@@ -767,7 +777,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("#")){
@@ -885,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);
}
@@ -1069,10 +1079,10 @@
*/
@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);
}
--
Gitblit v1.9.3