From 0f4bac6483639a3be54d8fa311e005a2a3c99885 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 27 九月 2024 17:45:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java |   71 +++++++++++++++++++++++++++++++++--
 1 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
index f342ec9..dba34fa 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
@@ -1,11 +1,15 @@
 package com.vci.web.controller;
 
+import com.vci.corba.common.PLException;
+import com.vci.dto.DeleteDataDTO;
+import com.vci.dto.DeleteLinkDataDTO;
+import com.vci.dto.FormDataDTO;
+import com.vci.dto.FormLinkDataDTO;
 import com.vci.starter.web.annotation.controller.VciUnCheckRight;
 import com.vci.starter.web.annotation.log.VciBusinessLog;
 import com.vci.starter.web.pagemodel.*;
-import com.vci.web.dto.*;
-import com.vci.web.pageModel.ReferConfigVO;
-import com.vci.web.pageModel.UIFormDataVO;
+import com.vci.pagemodel.ReferConfigVO;
+import com.vci.pagemodel.UIFormDataVO;
 import com.vci.web.query.UIDataGridQuery;
 import com.vci.web.query.UIFormQuery;
 import com.vci.web.query.UITreeQuery;
@@ -13,6 +17,8 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
@@ -115,14 +121,33 @@
     }
 
     /**
-     * 鏁版嵁鍗囩増锛屽墠绔娇鐢↗SON鎻愪氦
+     * 鏁版嵁鍗囩増鏈�/娆★紝鍓嶇浣跨敤JSON鎻愪氦
      * @param formDataDTO 琛ㄥ崟鏁版嵁
      * @return 鎵ц鐨勭粨鏋�
      */
     @PutMapping("/upRevision")
     @VciBusinessLog(operateName = "鏁版嵁鍗囩増",description = "${param.btmname}閲岀殑${param.copyFromVersion}")
-    public BaseResult<Map<String,Object>> upRevision(@RequestBody FormDataDTO formDataDTO){
+    public BaseResult<Map<String, Object>> upRevision(@RequestBody FormDataDTO formDataDTO) throws PLException {
         return uiDataService.upRevision(formDataDTO);
+    }
+
+    /**
+     * 鏁版嵁鍗囩増鏈�/娆★紝鍓嶇浣跨敤JSON鎻愪氦
+     * @param btmname 涓氬姟绫诲瀷鐨勪俊鎭�
+     * @param oid 涓氬姟鏁版嵁鐨勪富閿�
+     * @param type 1:鐗堟瀵硅薄锛�2锛氱増鏈璞★紱3锛氫富瀵硅薄
+     * @return 鎵ц鐨勭粨鏋�
+     */
+    @DeleteMapping("/deleteBusinessObject")
+    public BaseResult deleteBusinessObject(String btmname , String oid, int type) {
+        try {
+            return uiDataService.deleteBusinessObject(btmname, oid, type);
+        }catch (PLException e){
+            BaseResult<Object> objectBaseResult = new BaseResult<>();
+            objectBaseResult.setCode(Integer.parseInt(e.code));
+            objectBaseResult.setMsg(Arrays.toString(e.messages));
+            return objectBaseResult;
+        }
     }
 
     /**
@@ -187,4 +212,40 @@
         re.setData(dataMapList);
         return re;
     }
+    /**
+     * 鍙樻洿鎵�鏈夎��
+     * @param btmname 涓氬姟绫诲瀷
+     * @param oid 涓婚敭
+     * @return 鎵ц鐨勭粨鏋�
+     */
+    @PutMapping("/changeBusinessObjectOwner")
+    public BaseResult changeBusinessObjectOwner(String btmname , String oid) {
+        try {
+            return uiDataService.changeBusinessObjectOwner(btmname, oid);
+        } catch (PLException e) {
+            BaseResult<Object> objectBaseResult = new BaseResult<>();
+            objectBaseResult.setCode(Integer.parseInt(e.code));
+            objectBaseResult.setMsg(Arrays.toString(e.messages));
+            return objectBaseResult;
+        }
+    }
+
+    /**
+     * 鐘舵�佽穬杩�
+     * @param btmname 涓氬姟绫诲瀷
+     * @param oid 涓婚敭
+     * @param releaseStatus 鍙戝竷鐘舵��
+     * @return 鎵ц鐨勭粨鏋�
+     */
+    @PutMapping("/transferBusinessObject")
+    public BaseResult transferBusinessObject(String btmname , String oid, String toStatus, String releaseStatus) {
+        try {
+            return uiDataService.transferBusinessObject(btmname, oid, toStatus, releaseStatus);
+        } catch (PLException e) {
+            BaseResult<Object> objectBaseResult = new BaseResult<>();
+            objectBaseResult.setCode(Integer.parseInt(e.code));
+            objectBaseResult.setMsg(Arrays.toString(e.messages));
+            return objectBaseResult;
+        }
+    }
 }

--
Gitblit v1.9.3