From 96d8cb69f2ddcb012fe40c8ad57932dec0b17d69 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 13 九月 2024 11:13:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsActionServiceI.java | 13 ++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java | 51 +++++++++++++++++
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/RoleInfoDTO.java | 32 ++++++++++
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsActionController.java | 34 +++++++++++
4 files changed, 130 insertions(+), 0 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/RoleInfoDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/RoleInfoDTO.java
new file mode 100644
index 0000000..12a6647
--- /dev/null
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/RoleInfoDTO.java
@@ -0,0 +1,32 @@
+package com.vci.dto;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 瑙掕壊浼犺緭瀵硅薄
+ * @author yuxc
+ * @date 2024-09-09
+ */
+@Data
+public class RoleInfoDTO implements Serializable {
+
+
+ /**
+ * 绂佹淇敼杩欎釜鍊�
+ */
+ private static final long serialVersionUID = 2492852474710986720L;
+ /**
+ * 涓婚敭
+ */
+ public String id;
+ public String name;
+ public String description;
+ public short type;
+ public long createTime;
+ public String createUser;
+ public long updateTime;
+ public String updateUser;
+ public String grantor;
+}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsActionController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsActionController.java
index 56ff805..ec90618 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsActionController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/OsActionController.java
@@ -82,6 +82,24 @@
}
/**
+ * 鍒犻櫎鍒嗙被
+ * @param dto 鍒嗙被瀵硅薄
+ * @return 澶勭悊缁撴灉
+ * @throws PLException
+ */
+ @DeleteMapping("/deleteActionCls")
+ public BaseResult deleteActionCls(@RequestBody PLActionClsDTO dto){
+ try {
+ return osActionServiceI.deleteActionCls(dto);
+ } catch (PLException e) {
+ BaseResult objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
+
+ /**
* 鑾峰彇Action琛ㄦ牸鏁版嵁
* dto 鏌ヨ鏉′欢
* @return 鏌ヨ缁撴灉
@@ -234,4 +252,20 @@
return objectBaseResult;
}
}
+ /**
+ * 鏌ヨAction鍙傛暟鍒楄〃鏁版嵁
+ * actionOid 鍙傛暟涓婚敭
+ * @return 淇濆瓨缁撴灉
+ */
+ @GetMapping("/getPLActionParam")
+ public BaseResult getPLActionParam(String actionOid){
+ try {
+ return osActionServiceI.getPLActionParam(actionOid);
+ } catch (PLException e) {
+ BaseResult objectBaseResult = new BaseResult<>();
+ objectBaseResult.setCode(Integer.parseInt(e.code));
+ objectBaseResult.setMsg(Arrays.toString(e.messages));
+ return objectBaseResult;
+ }
+ }
}
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsActionServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsActionServiceI.java
index 95e28e9..5cf2c13 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsActionServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsActionServiceI.java
@@ -93,4 +93,17 @@
* @return 淇濆瓨缁撴灉
*/
BaseResult deletePLActionParam(String oid) throws PLException;
+ /**
+ * 鏌ヨAction鍙傛暟鍒楄〃鏁版嵁
+ * actionOid 鍙傛暟涓婚敭
+ * @return 淇濆瓨缁撴灉
+ */
+ BaseResult getPLActionParam(String actionOid) throws PLException;
+ /**
+ * 鍒犻櫎鍒嗙被
+ * @param dto 鍒嗙被瀵硅薄
+ * @return 澶勭悊缁撴灉
+ * @throws PLException
+ */
+ BaseResult deleteActionCls(PLActionClsDTO dto) throws PLException;
}
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 1030cb5..80c21c9 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
@@ -566,6 +566,57 @@
}
return BaseResult.success();
}
+ /**
+ * 鏌ヨAction鍙傛暟鍒楄〃鏁版嵁
+ * actionOid 鍙傛暟涓婚敭
+ * @return 淇濆瓨缁撴灉
+ */
+ @Override
+ public BaseResult getPLActionParam(String actionOid) throws PLException {
+ if (StringUtils.isBlank(actionOid)){
+ throw new PLException("500", new String[]{"Action涓婚敭涓嶈兘涓虹┖锛�"});
+ }
+ PLActionParam[] paramArrays = platformClientUtil.getUIService().getPLActionParamArrayByActionId(actionOid);
+ List<PLActionParamDTO> dtos = new ArrayList<>();
+ for (PLActionParam paramArray : paramArrays) {
+ PLActionParamDTO dto = new PLActionParamDTO();
+ dto.setAction(paramArray.action);
+ dto.setOid(paramArray.oid);
+ dto.setName(paramArray.name);
+ dto.setDescription(paramArray.description);
+ dto.setDefaultValue(paramArray.defaultValue);
+ dtos.add(dto);
+ }
+ return BaseResult.dataList(dtos);
+ }
+
+ /**
+ * 鍒犻櫎鍒嗙被
+ * @param dto 鍒嗙被瀵硅薄
+ * @return 澶勭悊缁撴灉
+ * @throws PLException
+ */
+ @Override
+ public BaseResult deleteActionCls(PLActionClsDTO dto) throws PLException {
+ PLActionCls[] clses = platformClientUtil.getUIService().getPLActionClsArray();
+ // 灏嗘墍鏈夊垎绫荤埗鍒嗙被淇濆瓨
+ HashSet<String> clsPids = new HashSet<String>();
+ for (PLActionCls plActionCls : clses) {
+ clsPids.add(plActionCls.pid);
+ }
+ if (dto.getName().equals("鏈垎绫�")) {
+ throw new PLException("500", new String[]{"鏈垎绫讳笉鑳藉垹闄�!"});
+ }
+ if (clsPids.contains(dto.getId())) {
+ throw new PLException("500", new String[]{"璇ュ垎绫讳笅瀛樺湪瀛愬垎绫讳笉鑳藉垹闄わ紒\n璇峰垹闄ゆ鍒嗙被涓嬬殑瀛愬垎绫伙紒"});
+ }
+ // 鎵ц鍒犻櫎鎿嶄綔
+ String message = platformClientUtil.getUIService().deletePLActionClsById(dto.getId());
+ if (message.startsWith("0")) {
+ throw new PLException("500", new String[]{"鍒犻櫎鍒嗙被澶辫触锛�" + message.substring(1)});
+ }
+ return BaseResult.success("鍒嗙被鍒犻櫎鎴愬姛锛�" + message.substring(1));
+ }
public boolean isValidPageForamt(PLActionExpDTO plActionExpDTO) throws PLException {
--
Gitblit v1.9.3