From 6f7f3834f66b08bed7af331ce1a168d6cd89292d Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期五, 03 一月 2025 18:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
index 80c21c9..6661629 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
@@ -1,4 +1,5 @@
package com.vci.web.service.impl;
+
import cn.hutool.core.io.FileUtil;
import com.vci.constant.FrameWorkLangCodeConstant;
import com.vci.corba.common.PLException;
@@ -19,8 +20,11 @@
import com.vci.web.enumpck.PlTypetypeEnum;
import com.vci.web.other.ExportActionLogBean;
import com.vci.web.other.ExportBeans;
-import com.vci.web.service.*;
-import com.vci.web.util.*;
+import com.vci.web.service.OsActionServiceI;
+import com.vci.starter.web.util.Lcm.Func;
+import com.vci.web.util.PinyinCommon;
+import com.vci.web.util.PlatformClientUtil;
+import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -98,6 +102,7 @@
PLActionCls pac = new PLActionCls();
pac.name = pLActionCls.getName();
pac.pid = pLActionCls.getPid();
+ pac.id = pLActionCls.getId();
pac.description = pLActionCls.getDescription() == null ? "" : pLActionCls.getDescription();
pac.creator = WebUtil.getCurrentUserId();
pac.createTime = System.currentTimeMillis();
@@ -131,7 +136,7 @@
Map<String, List<PLActionCls>> allDataMap = Arrays.stream(clses).collect(Collectors.groupingBy(pl -> pl.pid));
for (PLActionCls cls : clses) {
- if (StringUtils.isBlank(cls.pid)) {
+ if (StringUtils.isBlank(cls.pid) || cls.pid.equals("root")) {
PLActionClsDTO parentDto = new PLActionClsDTO();
parentDto.setId(cls.id);
parentDto.setName(cls.name);
@@ -185,7 +190,8 @@
@Override
public BaseResult getActionTableData(PLActionQueryDTO dto) throws PLException {
Constraint[] consArray ;
- if(StringUtils.isNotBlank(dto.getPlactioncls())){
+ //杩欏効瑕佺敤!=null鎺у埗锛屾煡璇㈡湭鍒嗙被鑺傜偣鐨勬椂鍊欎紶鐨�""
+ if(dto.getPlactioncls() != null){
consArray = new Constraint[7];
consArray[6] = new Constraint("plactioncls", dto.getPlactioncls().equals("root") ? "": dto.getPlactioncls());
}else {
@@ -235,6 +241,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().savePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇濆瓨澶辫触锛侊紒"});
@@ -268,6 +275,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().updatePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"淇敼澶辫触锛侊紒"});
@@ -293,6 +301,7 @@
plAction.plModifyUser = WebUtil.getCurrentUserId();
plAction.plActionCls = StringUtils.defaultString(dto.getPlActionCls());
plAction.plTypeType = StringUtils.defaultString(dto.getPlTypeType());
+ plAction.plImage = StringUtils.defaultString(dto.getPlImage());
boolean b = platformClientUtil.getUIService().deletePLAction(plAction);
if(!b){
throw new PLException("500", new String[]{"鍒犻櫎澶辫触锛侊紒"});
@@ -611,7 +620,10 @@
throw new PLException("500", new String[]{"璇ュ垎绫讳笅瀛樺湪瀛愬垎绫讳笉鑳藉垹闄わ紒\n璇峰垹闄ゆ鍒嗙被涓嬬殑瀛愬垎绫伙紒"});
}
// 鎵ц鍒犻櫎鎿嶄綔
- String message = platformClientUtil.getUIService().deletePLActionClsById(dto.getId());
+ PLActionCls actionCls = new PLActionCls();
+ actionCls.id = dto.getId();
+ actionCls.name = dto.getName();
+ String message = platformClientUtil.getUIService().deletePLActionCls(actionCls);
if (message.startsWith("0")) {
throw new PLException("500", new String[]{"鍒犻櫎鍒嗙被澶辫触锛�" + message.substring(1)});
}
@@ -672,7 +684,6 @@
}
return res;
}
-
/**
* 澶勭悊鍙傛暟鍒楄〃
--
Gitblit v1.9.3