From 72c7bbd66b8456db7dabf0dbc15f7aa9c2af2b9d Mon Sep 17 00:00:00 2001
From: dangsn <dangsn@chicecm.com>
Date: 星期三, 05 六月 2024 14:53:54 +0800
Subject: [PATCH] 项目引用调整
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java | 39 ++++++++++++++++++---------------------
1 files changed, 18 insertions(+), 21 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
index 37866ae..5efa41b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebProcessCommandServiceImpl.java
@@ -1,16 +1,15 @@
package com.vci.web.service.impl;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.framework.data.UserEntityInfo;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.corba.common.data.UserEntityInfo;
import com.vci.corba.workflow.data.FlowInstanceInfo;
import com.vci.corba.workflow.data.MapTransfersInfo;
+import com.vci.corba.workflow.data.TasksAssignedInfo;
import com.vci.file.dto.VciFileObjectDTO;
-import com.vci.rmip.workflow.server.template.TasksAssigned;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
@@ -34,8 +33,6 @@
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
import org.springframework.web.multipart.MultipartFile;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
import java.util.*;
import java.util.Map.Entry;
@@ -149,7 +146,7 @@
Map<String, String> conditionMap = WebUtil.getOidQuery(config.getOids());
conditionMap.put(WebBoServiceI.QUERY_FILTER_SECRET, "false");
conditionMap.put(WebBoServiceI.QUERY_FILTER_DATARIGHT, "false");
- List<ClientBusinessObject> allCbo = boService.queryCBO(config.getBtmType().toLowerCase().trim(), conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> allCbo = boService.queryCBO(config.getBtmType().toLowerCase().trim(), conditionMap);
if (allCbo == null || allCbo.size() == 0) {
throw new VciBaseException(msgCodePrefix + "dataNotNull", new String[]{});
}
@@ -157,9 +154,9 @@
//鏌ヨ鏁版嵁鏄惁宸茬粡鍙戣捣浜嗘祦绋�
//鏌ヨinput杩炴帴閲屾槸涓嶆槸鏈夋祦绋嬪疄渚嬶紝骞朵笖娴佺▼瀹炰緥涓嶇瓑浜庣粓姝�
conditionMap.put("oid", " in (select f_oid from platformlt_" + processDao.getTaskDataLink() + " where oid " + conditionMap.get("oid").replace("\\IN", " in ") + ")");
- List<ClientBusinessObject> workInstanceCbos = boService.queryCBO(processDao.getWorkIntanceBtmType(), conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> workInstanceCbos = boService.queryCBO(processDao.getWorkIntanceBtmType(), conditionMap);
if (workInstanceCbos != null && workInstanceCbos.size() > 0) {
- for (ClientBusinessObject workInstance : workInstanceCbos) {
+ for (com.vci.client.bof.ClientBusinessObject workInstance : workInstanceCbos) {
if (!workInstance.getLcStatus().equalsIgnoreCase("Obsoleted")) {
throw new VciBaseException(msgCodePrefix + "dataSubmitedToProcess", new String[]{workInstance.getName(), workInstance.getCreator()});
}
@@ -170,7 +167,7 @@
String[][] objectPropertyValues = new String[allCbo.size()][4];
String[] objIds = new String[allCbo.size()];//涓氬姟鏁版嵁鐨勭粍浠�
for (int i = 0; i < allCbo.size(); i++) {
- ClientBusinessObject cbo = allCbo.get(i);
+ com.vci.client.bof.ClientBusinessObject cbo = allCbo.get(i);
String[] values = new String[4];
values[0] = cbo.getOid();
values[1] = cbo.getRevisionid();
@@ -551,7 +548,7 @@
}
@Override
- public TasksAssigned getProxy() throws VciBaseException {
+ public TasksAssignedInfo getProxy() throws VciBaseException {
return processDao.getProxy();
}
@@ -595,14 +592,14 @@
//鏌ヨ娴佺▼瀹炰緥
Map<String, String> conditionMap = new HashMap<String, String>();
conditionMap.put("executionid", executionId.trim() + "*");//浼氭湁瀛愭祦绋�
- List<ClientBusinessObject> workInstanceCbos = boService.queryCBO(processDao.getWorkIntanceBtmType(), conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> workInstanceCbos = boService.queryCBO(processDao.getWorkIntanceBtmType(), conditionMap);
if (workInstanceCbos == null || workInstanceCbos.size() == 0) {
throw new VciBaseException(msgCodePrefix + "executionNotExist");
}
//鍒ゆ柇鏄惁閮芥槸鎵ц鐘舵�侊紝鍓嶇鐨勫垽鏂兘琚烦杩�
- List<ClientBusinessObject> needUpdateCbos = new ArrayList<ClientBusinessObject>();
+ List<com.vci.client.bof.ClientBusinessObject> needUpdateCbos = new ArrayList<>();
List<String> workInstanceOids = new ArrayList<String>();
- for (ClientBusinessObject cbo : workInstanceCbos) {
+ for (com.vci.client.bof.ClientBusinessObject cbo : workInstanceCbos) {
if (!cbo.getLcStatus().equalsIgnoreCase("Executing")) {
throw new VciBaseException(msgCodePrefix + "processNotExecutionStatus");
}
@@ -612,7 +609,7 @@
//鎵剧浉鍏崇殑娴佺▼浠诲姟瀵硅薄锛屽苟涓旀槸姝ｅ湪鎵ц涓殑
conditionMap.put("executionid", QueryOptionConstant.IN + "(" + WebUtil.toInSql(workInstanceOids.toArray(new String[0])) + ")");
conditionMap.put("lcstatus", "Executing");
- List<ClientBusinessObject> workItemCbos = boService.queryCBO(processDao.getWorkitemBtmType(), conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> workItemCbos = boService.queryCBO(processDao.getWorkitemBtmType(), conditionMap);
if (workItemCbos != null && workItemCbos.size() > 0) {
needUpdateCbos.addAll(workItemCbos);
}
@@ -635,14 +632,14 @@
//鏌ヨ娴佺▼瀹炰緥
Map<String, String> conditionMap = new HashMap<String, String>();
conditionMap.put("executionid", executionId.trim() + "*");//浼氭湁瀛愭祦绋�
- List<ClientBusinessObject> workInstanceCbos = boService.queryCBO(processDao.getWorkIntanceBtmType(), conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> workInstanceCbos = boService.queryCBO(processDao.getWorkIntanceBtmType(), conditionMap);
if (workInstanceCbos == null || workInstanceCbos.size() == 0) {
throw new VciBaseException(msgCodePrefix + "executionNotExist");
}
//鍒ゆ柇鏄惁閮芥槸鎵ц鐘舵�侊紝鍓嶇鐨勫垽鏂兘琚烦杩�
- List<ClientBusinessObject> needUpdateCbos = new ArrayList<ClientBusinessObject>();
+ List<com.vci.client.bof.ClientBusinessObject> needUpdateCbos = new ArrayList<>();
List<String> workInstanceOids = new ArrayList<String>();
- for (ClientBusinessObject cbo : workInstanceCbos) {
+ for (com.vci.client.bof.ClientBusinessObject cbo : workInstanceCbos) {
if (!cbo.getLcStatus().equalsIgnoreCase("Suspended")) {
throw new VciBaseException(msgCodePrefix + "processNotSuspendedStatus");
}
@@ -652,7 +649,7 @@
//鎵剧浉鍏崇殑娴佺▼浠诲姟瀵硅薄锛屽苟涓旀槸姝ｅ湪鎵ц涓殑
conditionMap.put("executionid", QueryOptionConstant.IN + "(" + WebUtil.toInSql(workInstanceOids.toArray(new String[0])) + ")");
conditionMap.put("lcstatus", "Suspended");
- List<ClientBusinessObject> workItemCbos = boService.queryCBO(processDao.getWorkitemBtmType(), conditionMap);
+ List<com.vci.client.bof.ClientBusinessObject> workItemCbos = boService.queryCBO(processDao.getWorkitemBtmType(), conditionMap);
if (workItemCbos != null && workItemCbos.size() > 0) {
needUpdateCbos.addAll(workItemCbos);
}
@@ -709,7 +706,7 @@
}
}
List<String> causeList = Arrays.asList(new String[]{primaryKeyName});
- List<ClientBusinessObject> cbos = boService.queryCBO(btmType, conditionMap, null, causeList);
+ List<com.vci.client.bof.ClientBusinessObject> cbos = boService.queryCBO(btmType, conditionMap, null, causeList);
if (cbos == null || cbos.size() == 0) {
throw new VciBaseException("鍙戣捣娴佺▼鐨勪笟鍔℃暟鎹叏閮ㄤ笉绗﹀悎瑕佹眰");
}
@@ -718,7 +715,7 @@
for (String oid : oidArray) {
oidSet.add(oid);
}
- for (ClientBusinessObject cbo : cbos) {
+ for (com.vci.client.bof.ClientBusinessObject cbo : cbos) {
if (oidSet.contains(cbo.getAttributeValue(primaryKeyName))) {
oidSet.remove(cbo.getAttributeValue(primaryKeyName));
}
--
Gitblit v1.9.3