From f22211dcc3767d8fb50a37eb424a258a12fe626b Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期三, 08 一月 2025 15:44:19 +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 | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 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 6a05746..38249fc 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;
@@ -132,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);
@@ -186,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 {
@@ -236,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[]{"淇濆瓨澶辫触锛侊紒"});
@@ -269,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[]{"淇敼澶辫触锛侊紒"});
@@ -294,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[]{"鍒犻櫎澶辫触锛侊紒"});
@@ -516,7 +524,7 @@
param.name = dto.getName();
param.defaultValue = dto.getDefaultValue();
param.description = dto.getDescription();
- param.action = dto.getAction();
+ param.action = dto.getActionOid();
String message = platformClientUtil.getUIService().createPLActionParam(param);
if(message.startsWith("0")) {
@@ -539,7 +547,7 @@
param.name = dto.getName();
param.defaultValue = dto.getDefaultValue();
param.description = dto.getDescription();
- param.action = dto.getAction();
+ param.action = dto.getActionOid();
String message = platformClientUtil.getUIService().editPLActionParam(param);
if(message.startsWith("0")) {
@@ -581,7 +589,7 @@
List<PLActionParamDTO> dtos = new ArrayList<>();
for (PLActionParam paramArray : paramArrays) {
PLActionParamDTO dto = new PLActionParamDTO();
- dto.setAction(paramArray.action);
+ dto.setActionOid(paramArray.action);
dto.setOid(paramArray.oid);
dto.setName(paramArray.name);
dto.setDescription(paramArray.description);
@@ -612,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)});
}
@@ -673,7 +684,6 @@
}
return res;
}
-
/**
* 澶勭悊鍙傛暟鍒楄〃
--
Gitblit v1.9.3