From b77c70bb4fd39f3a08d2a3bc5e16155652452990 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 15 十一月 2024 16:28:08 +0800
Subject: [PATCH] 整合代码
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java | 73 +++++++++++++++++++++++++-----------
1 files changed, 50 insertions(+), 23 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
index f2eeb6a..bd46053 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
@@ -1,15 +1,18 @@
package com.vci.web.service;
-import com.vci.client.bof.RevisionValueObject;
-import com.vci.client.bof.VersionValueObject;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.data.BusinessObject;
+import com.vci.corba.omd.data.LinkObject;
+import com.vci.corba.omd.data.RevisionDataInfo;
+import com.vci.corba.omd.data.VersionDataInfo;
+import com.vci.dto.*;
import com.vci.starter.web.enumpck.VciChangeDocumentTypeEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.model.BaseModel;
import com.vci.starter.web.pagemodel.*;
-import com.vci.web.dto.*;
-import com.vci.web.pageModel.OsBtmTypeVO;
-import com.vci.web.pageModel.ReferConfigVO;
-import com.vci.web.pageModel.UIFormDataVO;
+import com.vci.pagemodel.OsBtmTypeVO;
+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;
@@ -31,7 +34,7 @@
* @return DataGrid涓璬ata涓篗ap<String,String>鏍煎紡
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- DataGrid getDataForGrid(UIDataGridQuery dataGridQuery) throws VciBaseException;
+ DataGrid getDataForGrid(UIDataGridQuery dataGridQuery) throws VciBaseException, PLException;
/**
* 鑾峰彇琛ㄥ崟鐨勬暟鎹�
@@ -39,7 +42,7 @@
* @return 琛ㄥ崟鐨勬暟鎹�
* @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException;
+ UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException, PLException;
/**
* 鑾峰彇鏍戝舰鏁版嵁
@@ -58,7 +61,7 @@
* @return 鎵ц缁撴灉锛岃鍒ゆ柇success灞炴�ф槸鍚︿负true
* @throws VciBaseException 閰嶇疆鎴栬�呮槸璋冪敤涓嶆垚鍔熺殑鏃跺�欙紝浼氭姏鍑哄紓甯�
*/
- BaseResult callPreEvent(BaseModelDTOList baseModelDTOList, BaseLinkModelDTOList baseLinkModelDTOList,String preEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException;
+ BaseResult callPreEvent(BaseModelDTOList baseModelDTOList, BaseLinkModelDTOList baseLinkModelDTOList, String preEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException;
/**
* 鍚庣疆浜嬩欢
@@ -69,7 +72,7 @@
* @return 鎵ц鐨勭粨鏋�
* @throws VciBaseException 鎵ц鍑洪敊鐨勪細鎶涘嚭寮傚父锛屾垨鑰呬簨浠剁洿鎺ヨ繑鍥炰簡寮傚父
*/
- BaseResult callPostEvent(Collection<com.vci.client.bof.ClientBusinessObject> cbos, Collection<com.vci.client.bof.ClientLinkObject> clos, String postEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException;
+ BaseResult callPostEvent(Collection<BusinessObject> cbos, Collection<LinkObject> clos, String postEvent, VciChangeDocumentTypeEnum businessType) throws VciBaseException;
/**
* 琛ㄥ崟鏁版嵁杞崲涓哄熀纭�瀵硅薄
@@ -105,14 +108,14 @@
* @return 鎵ц缁撴灉鍜屾樉绀哄悗鐨勫��
* @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- BaseResult<Map<String,Object>> addSave(FormDataDTO formDataDTO) throws VciBaseException;
+ BaseResult<Map<String,Object>> addSave(FormDataDTO formDataDTO) throws VciBaseException, PLException;
/**
* 涓氬姟绫诲瀷
* @param cbo 涓氬姟鏁版嵁瀵硅薄
* @return 鍩虹瀵硅薄
*/
- BaseModel cbo2BaseModel(com.vci.client.bof.ClientBusinessObject cbo);
+ BaseModel cbo2BaseModel(BusinessObject cbo);
/**
* 涓氬姟鏁版嵁琛ㄥ崟瀵硅薄杞崲涓哄熀纭�鐨勫睘鎬�
@@ -134,7 +137,7 @@
* @param baseModel 鍩虹瀵硅薄
* @return 鐗堟湰鐨勫璞�
*/
- RevisionValueObject getNextRevision(OsBtmTypeVO btmTypeVO, BaseModel baseModel);
+ RevisionDataInfo getNextRevision(OsBtmTypeVO btmTypeVO, BaseModel baseModel);
/**
* 鑾峰彇涓嬩竴涓増娆＄殑鍙�
@@ -142,7 +145,7 @@
* @param baseModel 鍩虹瀵硅薄
* @return 鐗堟湰鐨勫�煎璞�
*/
- VersionValueObject getNextVersion(OsBtmTypeVO btmTypeVO, BaseModel baseModel);
+ VersionDataInfo getNextVersion(OsBtmTypeVO btmTypeVO, BaseModel baseModel);
/**
* 鑾峰彇绗竴涓増娆�
@@ -157,7 +160,7 @@
* @return 鎵ц缁撴灉鍜屼富閿�
* @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- BaseResult<String> batchAddSave(FormDataDTOList formDataDTOList) throws VciBaseException;
+ BaseResult<String> batchAddSave(FormDataDTOList formDataDTOList) throws VciBaseException, PLException;
/**
* 淇敼鏁版嵁銆傛敞鎰忚〃鍗曞畾涔夌殑瀛楁鎵嶄細琚慨鏀癸紝ts杩欑榛樿瀛楁闄ゅ
@@ -165,7 +168,7 @@
* @return 鎵ц缁撴灉鍜屾樉绀哄悗鐨勫��
* @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- BaseResult<Map<String,Object>> editSave(FormDataDTO formDataDTO) throws VciBaseException;
+ BaseResult<Map<String,Object>> editSave(FormDataDTO formDataDTO) throws VciBaseException, PLException;
/**
* 鏁版嵁鍗囩増
@@ -173,7 +176,7 @@
* @return 鎵ц缁撴灉鍜屾樉绀哄悗鐨勫��
* @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- BaseResult<Map<String, Object>> upRevision(FormDataDTO formDataDTO) throws VciBaseException;
+ BaseResult<Map<String, Object>> upRevision(FormDataDTO formDataDTO) throws VciBaseException, PLException;
/**
* 鎵归噺淇敼锛屾敞鎰忚〃鍗曞畾涔夌殑瀛楁鎵嶄細琚慨鏀癸紝ts杩欑榛樿瀛楁闄ゅ
@@ -181,7 +184,7 @@
* @return 鎵ц缁撴灉鍜屾樉绀哄悗鐨勫��
* @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- BaseResult<String> batchEditSave(FormDataDTOList formDataDTOList) throws VciBaseException;
+ BaseResult<String> batchEditSave(FormDataDTOList formDataDTOList) throws VciBaseException, PLException;
/**
* 鎵归噺鍒犻櫎
@@ -189,7 +192,7 @@
* @return 鎵ц缁撴灉
* @throws VciBaseException 鏁版嵁琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
*/
- BaseResult batchDelete(DeleteDataDTO deleteDataDTO) throws VciBaseException;
+ BaseResult batchDelete(DeleteDataDTO deleteDataDTO) throws VciBaseException, PLException;
/**
* 閾炬帴绫诲瀷娣诲姞
@@ -197,7 +200,7 @@
* @return 閾炬帴绫诲瀷鐨勪富閿�
* @throws VciBaseException 鍙傛暟涓虹┖锛屽繀杈撻」缂哄け
*/
- BaseResult<String> linkAddSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException;
+ BaseResult<String> linkAddSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException, PLException;
/**
* 璁剧疆鍊煎埌涓氬姟绫诲瀷鐨勫璞′笂
@@ -206,7 +209,7 @@
* @param cbo 涓氬姟绫诲瀷鐨勫璞�
* @param editFlag 鏄惁涓虹紪杈�
*/
- void setValueToCbo(Map<String, String> dataLow, Map<String, String> baseDataLow, com.vci.client.bof.ClientBusinessObject cbo, boolean editFlag);
+ void setValueToCbo(Map<String, String> dataLow, Map<String, String> baseDataLow, BusinessObject cbo, boolean editFlag);
/**
* 閾炬帴绫诲瀷鐨勭紪杈戞暟鎹�
@@ -214,7 +217,7 @@
* @return 鎵ц缁撴灉
* @throws VciBaseException 鍙傛暟涓虹┖锛屽繀杈撻」缂哄け
*/
- BaseResult linkEditSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException;
+ BaseResult linkEditSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException, PLException;
/**
* 鍒犻櫎閾炬帴绫诲瀷
@@ -230,7 +233,7 @@
* @param pageHelper 鍒嗛〉鐨勫伐鍏�
* @return 鍒楄〃鏁版嵁
*/
- DataGrid referDataGrid(ReferConfigVO referConfigVO, PageHelper pageHelper);
+ DataGrid referDataGrid(ReferConfigVO referConfigVO, PageHelper pageHelper) throws PLException;
/**
* 鑾峰彇鏍戝舰鐨勫弬鐓�
@@ -246,4 +249,28 @@
* @return 涓氬姟鏁版嵁鐨勫睘鎬т俊鎭�
*/
List<Map<String,String>> getDataAttr(String btmName, String oid);
+
+ /**
+ * 鏁版嵁鍗囩増鏈�/娆★紝鍓嶇浣跨敤JSON鎻愪氦
+ * @param btmname 涓氬姟绫诲瀷鐨勪俊鎭�
+ * @param oid 涓氬姟鏁版嵁鐨勪富閿�
+ * @param type 1:鐗堟瀵硅薄锛�2锛氱増鏈璞★紱3锛氫富瀵硅薄
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ BaseResult deleteBusinessObject(String btmname, String oid, int type) throws PLException;
+ /**
+ * 鍙樻洿鎵�鏈夎��
+ * @param btmname 涓氬姟绫诲瀷
+ * @param oid 涓婚敭
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ BaseResult changeBusinessObjectOwner(String btmname, String oid) throws PLException;
+ /**
+ * 鐘舵�佽穬杩�
+ * @param btmname 涓氬姟绫诲瀷
+ * @param oid 涓婚敭
+ * @param releaseStatus 鍙戝竷鐘舵��
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ BaseResult transferBusinessObject(String btmname, String oid, String toStatus, String releaseStatus) throws PLException;
}
--
Gitblit v1.9.3