From 93f7335e1a52591662d5d37f41ac352860b2ca2a Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期二, 04 六月 2024 18:39:50 +0800
Subject: [PATCH] 1、对象引用改动。
---
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java | 6
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java | 55 ++--
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java | 32 +--
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java | 12
Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/AuditTaskController.java | 14
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java | 25 +-
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java | 41 +--
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java | 22 +-
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java | 10
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java | 13
Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/Sql2TableController.java | 9
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java | 23 -
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java | 5
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/OsMapToObjFunction.java | 4
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java | 3
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java | 32 --
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsStatusServiceI.java | 3
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java | 16 -
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java | 6
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java | 12
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java | 38 +--
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java | 14
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java | 119 +++++------
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java | 2
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebDataRightController.java | 30 +-
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java | 3
Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java | 1
Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java | 9
31 files changed, 224 insertions(+), 338 deletions(-)
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
index 297d240..abe3257 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/OrgDeptQueryServiceImpl.java
@@ -23,7 +23,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index e53e4cf..58977d3 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -3,9 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
import com.vci.corba.framework.data.FunctionInfo;
-import com.vci.corba.portal.data.PLTabPage;
import com.vci.corba.portal.data.PLUILayout;
import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
import com.vci.frameworkcore.enumpck.ResourceControlTypeEnum;
@@ -30,7 +28,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
index 94de395..d225f6e 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmRoleQueryServiceImpl.java
@@ -22,7 +22,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.*;
import java.util.stream.Collectors;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
index ea72fe1..e929a85 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmSessionForLoginImpl.java
@@ -1,6 +1,7 @@
package com.vci.frameworkcore.compatibility.impl;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.data.AttributeValue;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.interceptor.VciSessionForLoginI;
@@ -18,7 +19,6 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.common.AttributeValue;
import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
@@ -88,7 +88,7 @@
WebUtil.alertNotNull(userId,"鐢ㄦ埛鍚�");
try{
platformClientUtil.getBOFactoryService().executeUpdateSql("delete from VCI_SESSIONINFO where userid ='" + userId.trim() + "'");
- }catch (VCIError e){
+ }catch (PLException e){
throw WebUtil.getVciBaseException(e);
}
}
@@ -110,7 +110,7 @@
platformClientUtil.getBOFactoryService().executeUpdateSqlByParams(" insert into VCI_SESSIONINFO (USERID, TOKEN, JSONSTRING,lastRequestTime\n" +
" )\n" +
" VALUES (?,?,?," + System.currentTimeMillis() + " )", attrs);
- }catch (VCIError e){
+ }catch (PLException e){
throw WebUtil.getVciBaseException(e);
}
}
@@ -143,7 +143,7 @@
WebUtil.alertNotNull(userToken,"浼氳瘽璁稿彲鐮�");
try{
platformClientUtil.getBOFactoryService().executeUpdateSql("update VCI_SESSIONINFO set lastRequestTime = " + String.valueOf(System.currentTimeMillis()) + " where TOKEN ='" + userToken.trim() + "'");
- }catch (VCIError e){
+ }catch (PLException e){
throw WebUtil.getVciBaseException(e);
}
}
@@ -180,7 +180,7 @@
WebUtil.alertNotNull(userToken,"鐢ㄦ埛璁稿彲");
try{
platformClientUtil.getBOFactoryService().executeUpdateSql("delete from VCI_SESSIONINFO where TOKEN ='" + userToken.trim() + "'");
- }catch (VCIError e){
+ }catch (PLException e){
throw WebUtil.getVciBaseException(e);
}
}
@@ -224,7 +224,7 @@
WebUtil.switchCollectionForOracleIn(tokenList).stream().forEach(tokens -> {
try {
platformClientUtil.getBOFactoryService().executeUpdateSql("delete from VCI_SESSIONINFO where TOKEN in (" + WebUtil.toInSql(tokens.toArray(new String[0])) + ")");
- } catch (VCIError e) {
+ } catch (PLException e) {
if (logger.isErrorEnabled()) {
logger.error("鍒犻櫎浼氳瘽淇℃伅", e);
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
index ea0a8c4..fe1f8a3 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmUserQueryServiceImpl.java
@@ -1,12 +1,10 @@
package com.vci.frameworkcore.compatibility.impl;
import com.vci.client.common.providers.ServiceProvider;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.omd.data.AttributeValue;
+import com.vci.corba.common.PLException;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmPasswordStrategyVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.rmip.allcommon.ThreeDES;
import com.vci.starter.web.enumpck.BooleanEnum;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -27,7 +25,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
import java.util.*;
import java.util.stream.Collectors;
@@ -753,7 +750,7 @@
String sql = "update pllogoninfo set plwrongnum = 0 where pluserid in (select pluid from pluser where plusername='" + userId + "')";
try {
platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -776,7 +773,7 @@
String sql = "update pluser set plpassword = '" + encPassword + "' where pluid = '" + userOid.trim() + "'";
try {
platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -793,7 +790,7 @@
String sql = "update pllogoninfo set plwrongnum = " + wrongCount +" where pluserid ='" + userOid + "'";
try {
platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
@@ -808,7 +805,7 @@
String sql = "update pllogoninfo set pllogontime = sysdate where pluserid ='" + userOid + "'";
try {
platformClientUtil.getBOFactoryService().executeUpdateSql(sql);
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
throw WebUtil.getVciBaseException(vciError);
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java
index d917205..6d9cc51 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/OrgDutyQueryController.java
@@ -4,7 +4,6 @@
import com.vci.frameworkcore.pagemodel.OrgDutyVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
-import com.vci.web.pageModel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
index 3d36af9..d4f644c 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmRoleQueryController.java
@@ -4,7 +4,6 @@
import com.vci.frameworkcore.pagemodel.SmRoleVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
-import com.vci.web.pageModel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
index b931b04..570a070 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/controller/SmUserQueryController.java
@@ -4,10 +4,8 @@
import com.vci.frameworkcore.pagemodel.SmUserVO;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.*;
-import com.vci.web.pageModel.*;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
index e8769f2..b9d65a4 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/frameworkcore/enumpck/DataObjectEnum.java
@@ -1,12 +1,12 @@
package com.vci.frameworkcore.enumpck;
import com.alibaba.fastjson.JSONObject;
+import com.vci.client.common.objects.DeptObject;
+import com.vci.client.common.objects.RoleObject;
+import com.vci.client.common.objects.UserObject;
import com.vci.frameworkcore.pagemodel.OrgDepartmentVO;
import com.vci.frameworkcore.pagemodel.SmRoleVO;
import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.rmip.framework.client.systemConfig.object.DeptObject;
-import com.vci.rmip.framework.client.systemConfig.object.RoleObject;
-import com.vci.rmip.framework.client.systemConfig.object.UserObject;
import java.text.ParsePosition;
import java.text.SimpleDateFormat;
@@ -81,7 +81,7 @@
smUserVO.setPkPasswordStrategy(null);//鎵�灞炲瘑鐮佸畨鍏ㄧ瓥鐣�
smUserVO.setPkPasswordStrategyName(null);//鎵�灞炲瘑鐮佸畨鍏ㄧ瓥鐣�
smUserVO.setLastLoginTime(null);//鏈�鍚庣櫥褰曟椂闂�
- smUserVO.setLastModifyPasswordTime(ChangeStrToDate(userObject.getPwdUpdateTime()));//鏈�鍚庝慨鏀瑰瘑鐮佹槸鍑�
+ smUserVO.setLastModifyPasswordTime(new Date(userObject.getPwdUpdateTime()));//鏈�鍚庝慨鏀瑰瘑鐮佹槸鍑�
smUserVO.setPwdWrongCount(0);//瀵嗙爜閿欒娆℃暟
smUserVO.setSex(null);//鎬у埆
smUserVO.setSexText(null);//鎬у埆鏄剧ず鍚嶇О
@@ -91,9 +91,9 @@
smUserVO.setPhoto(null);//澶村儚
//smUserVO.setSecretGrade(userObject.getSecretGrade());
smUserVO.setCreator(userObject.getCreateUser());//鍒涘缓鑰�
- smUserVO.setCreateTime(ChangeStrToDate(userObject.getCreateTime()));//鍒涘缓鏃堕棿
+ smUserVO.setCreateTime(ChangeStrToDate(String.valueOf(new Date(userObject.getCreateTime()))));//鍒涘缓鏃堕棿
smUserVO.setLastModifier(userObject.getUpdateUser());//淇敼鑰�
- smUserVO.setLastModifyTime(ChangeStrToDate(userObject.getUpdateTime()));//淇敼鏃堕棿
+ smUserVO.setLastModifyTime(new Date(userObject.getUpdateTime()));//淇敼鏃堕棿
return smUserVO;
}
public OrgDepartmentVO[] changeDeptObjectToOrgDepartmentVOs(DeptObject[] deptObjects){
@@ -115,13 +115,13 @@
departmentVOs.setPkFatherDepartment(deptObject.getParentId());
departmentVOs.setDescription(deptObject.getDescription());
departmentVOs.setCreator(deptObject.getCreateUser());
- departmentVOs.setCreateTime(ChangeStrToDate(deptObject.getCreateTime()));
+ departmentVOs.setCreateTime(new Date(deptObject.getCreateTime()));
departmentVOs.setLastModifier(deptObject.getUpdateUser());
- departmentVOs.setLastModifyTime(ChangeStrToDate(deptObject.getUpdateTime()));
+ departmentVOs.setLastModifyTime(new Date(deptObject.getUpdateTime()));
departmentVOs.setLcStatus(deptObject.getStatus()+"");
return departmentVOs;
}
- public SmRoleVO[] changeRoleObjectToSmRoleVOs(RoleObject[] objects){
+ public <RoleObject> SmRoleVO[] changeRoleObjectToSmRoleVOs(com.vci.client.common.objects.RoleObject[] objects){
SmRoleVO[] smRoleVOs=new SmRoleVO[objects.length];
for (int i=0;i<objects.length;i++) {
@@ -135,10 +135,10 @@
smRoleVO.setName(object.getName());
smRoleVO.setDescription(object.getDescription());
smRoleVO.setCreator(object.getCreateUser());
- smRoleVO.setCreateTime(ChangeStrToDate(object.getCreateTime()));
+ smRoleVO.setCreateTime(new Date(object.getCreateTime()));
smRoleVO.setLastModifier(object.getUpdateUser());
smRoleVO.setBtmname("plrole");
- smRoleVO.setLastModifyTime(ChangeStrToDate(object.getUpdateTime()));
+ smRoleVO.setLastModifyTime(new Date(object.getUpdateTime()));
return smRoleVO;
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/AuditTaskController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/AuditTaskController.java
index 78aff9b..45fd51f 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/AuditTaskController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/AuditTaskController.java
@@ -1,6 +1,9 @@
package com.vci.plugins.controller;
-import com.vci.corba.common.VCIError;
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.client.bof.ClientBusinessObjectOperation;
+import com.vci.corba.common.PLException;
+import com.vci.corba.query.data.KV;
import com.vci.plugins.dto.AuditTaskDTO;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.util.VciBaseUtil;
@@ -13,9 +16,6 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
-import plm.corba.qt.KV;
import java.util.ArrayList;
import java.util.Arrays;
@@ -71,12 +71,12 @@
cbo.setAttributeValue("departmentname","PLNAME".equals(kvs[index][0].key.toUpperCase(Locale.ROOT)) ? kvs[index][0].value : kvs[index][1].value);
createList.add(cbo);
}
- } catch (VCIError vciError) {
+ } catch ( PLException vciError) {
vciError.printStackTrace();
}
});
operation.batchSaveCreateBuinessObject(createList.toArray(new ClientBusinessObject[0]));
- } catch (VCIError vciError) {
+ } catch ( PLException vciError) {
vciError.printStackTrace();
return BaseResult.fail("鍒涘缓璇勫浠诲姟澶辫触");
}
@@ -112,7 +112,7 @@
if (StringUtils.isNotBlank(attributeValue)) {
cbo.setAttributeValue(attributeName, attributeValue);
}
- } catch (VCIError vciError) {
+ } catch (PLException vciError) {
vciError.printStackTrace();
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/Sql2TableController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/Sql2TableController.java
index f306f5b..cf6f994 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/Sql2TableController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/plugins/controller/Sql2TableController.java
@@ -1,8 +1,8 @@
package com.vci.plugins.controller;
-import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
+import com.vci.corba.query.data.KV;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.web.util.PlatformClientUtil;
@@ -10,9 +10,6 @@
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import plm.bs.bom.clientobject.ClientBusinessObjectOperation;
-import plm.corba.qt.KV;
-import plm.corba.qt.QTServiceOperations;
import java.util.*;
import java.util.stream.Collectors;
@@ -48,7 +45,7 @@
KV[][] keyValues = new KV[0][0];
try {
keyValues = platformClientUtil.getQueryService().queryBySql(sql);
- } catch (VCIError vciError) {
+ } catch ( PLException vciError) {
vciError.printStackTrace();
return BaseResult.fail("sql璇彞鏈夐棶棰橈紝璇锋鏌ュ悗閲嶈瘯");
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebDataRightController.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebDataRightController.java
index cc36218..31af996 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebDataRightController.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/controller/WebDataRightController.java
@@ -1,10 +1,14 @@
package com.vci.web.controller;
-import com.vci.corba.common.VCIError;
-import com.vci.starter.web.enumpck.DataBaseEnum;
+
+
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.client.uif.actions.client.DataRightUtil;
+import com.vci.client.uif.engine.common.DefaultTableNode;
+import com.vci.client.uif.engine.common.IDataNode;
+import com.vci.corba.common.PLException;
import com.vci.starter.web.enumpck.DataSecretEnum;
import com.vci.starter.web.enumpck.UserSecretEnum;
-import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseResult;
import com.vci.starter.web.pagemodel.SessionInfo;
import com.vci.web.dto.BaseModelDTO;
@@ -16,16 +20,10 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-import plm.uif.actions.client.DataRightUtil;
-import plm.uif.actions.client.RightCheckConstants;
-import plm.uif.engine.common.DefaultTableNode;
-import plm.uif.engine.common.IDataNode;
+
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
@@ -96,22 +94,22 @@
* 鍥炲幓閫夋嫨鐨勬暟鎹�
* @param boData 涓氬姟鏁版嵁鐨勪俊鎭�
* @return 閫夋嫨鐨勬暟鎹�
- * @throws VCIError 缂哄皯鐨勬椂鍊欎細鎶涘嚭寮傚父
+ * @throws PLException 缂哄皯鐨勬椂鍊欎細鎶涘嚭寮傚父
*/
- protected Object getSelectedObject(BaseModelDTO boData) throws VCIError{
+ protected Object getSelectedObject(BaseModelDTO boData) throws PLException {
IDataNode selectedObject = new DefaultTableNode();
ClientBusinessObject cbo = new ClientBusinessObject();
if(StringUtils.isBlank(boData.getOid())){
- throw new VCIError("娌℃湁鑾峰彇鍒版暟鎹殑涓婚敭",new String[0]);
+ throw new PLException("娌℃湁鑾峰彇鍒版暟鎹殑涓婚敭",new String[0]);
}
if(StringUtils.isBlank(boData.getRevisionOid())){
- throw new VCIError("娌℃湁鑾峰彇鍒版暟鎹殑鐗堟湰涓婚敭",new String[0]);
+ throw new PLException("娌℃湁鑾峰彇鍒版暟鎹殑鐗堟湰涓婚敭",new String[0]);
}
if(StringUtils.isBlank(boData.getNameOid())){
- throw new VCIError("娌℃湁鑾峰彇鍒版暟鎹殑椤逛富閿�",new String[0]);
+ throw new PLException("娌℃湁鑾峰彇鍒版暟鎹殑椤逛富閿�",new String[0]);
}
if(StringUtils.isBlank(boData.getBtmname())){
- throw new VCIError("娌℃湁鑾峰彇鍒版暟鎹殑涓氬姟绫诲瀷",new String[0]);
+ throw new PLException("娌℃湁鑾峰彇鍒版暟鎹殑涓氬姟绫诲瀷",new String[0]);
}
cbo.setOid(boData.getOid());
cbo.setRevisionid(boData.getRevisionOid());
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
index fa90624..e45a807 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/WebProcessDaoI.java
@@ -1,16 +1,14 @@
package com.vci.web.dao;
-import com.vci.corba.workflow.method.WorkflowService;
-import com.vci.rmip.workflow.server.template.TasksAssigned;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.corba.workflow.WorkflowService;
+import com.vci.corba.workflow.WorkflowServicePrx;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.model.WFProcessClassifyDO;
import com.vci.web.model.WFProcessTemplateDO;
import com.vci.web.pageModel.*;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-
import java.util.Collection;
import java.util.Date;
import java.util.List;
@@ -298,7 +296,7 @@
* 鑾峰彇骞冲彴鐨勬祦绋嬫湇鍔�
* @return
*/
- WorkflowService getWorkService() throws VciBaseException;
+ WorkflowServicePrx getWorkService() throws VciBaseException;
/**
* 浠诲姟涓庢暟鎹叧鑱旂殑閾炬帴绫诲瀷
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
index 0d760dc..57f82e7 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/dao/impl/WebProcessDaoImpl.java
@@ -1,13 +1,14 @@
package com.vci.web.dao.impl;
-import com.vci.base.common.utility.ObjectUtility;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.framework.data.UserEntityInfo;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.common.utility.ObjectUtility;
+import com.vci.corba.common.PLException;
+import com.vci.corba.common.data.UserEntityInfo;
+import com.vci.corba.workflow.WorkflowService;
+import com.vci.corba.workflow.WorkflowServicePrx;
import com.vci.corba.workflow.data.*;
-import com.vci.corba.workflow.method.WorkflowService;
import com.vci.frameworkcore.compatibility.SmUserQueryServiceI;
import com.vci.frameworkcore.pagemodel.SmUserVO;
-import com.vci.rmip.workflow.server.template.TasksAssigned;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
@@ -16,7 +17,6 @@
import com.vci.starter.web.util.BeanUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.web.constant.WFVariablesKeyConstant;
import com.vci.web.dao.WebProcessDaoI;
import com.vci.web.model.ProcessInstance;
import com.vci.web.model.ProcessTask;
@@ -31,16 +31,11 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
import java.util.*;
-import java.util.stream.Collectors;
-
import static com.vci.frameworkcore.constant.FrameWorkBusLangCodeConstant.DATA_OID_NOT_EXIST;
/**
@@ -82,7 +77,7 @@
/**
* 骞冲彴鐨勬祦绋嬫湇鍔�
*/
- private WorkflowService workService = null;
+ private WorkflowServicePrx workService = null;
/**
* 骞冲彴璋冪敤瀹㈡埛绔�
@@ -563,7 +558,7 @@
WebUtil.alertNotNull(executionId,"娴佺▼鎵ц涓婚敭",key,"鍙傛暟Key");
UserEntityInfo ueo = new UserEntityInfo();
SessionInfo si = WebUtil.getCurrentUserSessionInfo();
- ueo.ip = si.getIp();
+// ueo..ip = si.getIp();
ueo.modules = "娴佺▼";
ueo.userName = si.getUserId();
// while(StringUtils.countMatches(executionId,".")>1){
@@ -611,7 +606,7 @@
* @throws VciBaseException
*/
@Override
- public List<ClientLinkObject> getDataCloInTask(String taskOid,String executionid) throws VciBaseException {
+ public List<ClientLinkObject> getDataCloInTask(String taskOid, String executionid) throws VciBaseException {
Map<String,String> conditionMap = new HashMap<String, String>();
if(StringUtils.isNotBlank(taskOid)) {
conditionMap.put("f_oid", taskOid.trim());
@@ -813,14 +808,9 @@
}
@Override
- public WorkflowService getWorkService() throws VciBaseException{
+ public WorkflowServicePrx getWorkService() throws VciBaseException{
if(workService == null){
- try {
- this.workService = platformClientUtil.getLogonFactoryService().getWorkflowService();
- } catch (VCIError e) {
-// logger.error(e.error_code,e);
- throw WebUtil.getVciBaseException(e);
- }
+ this.workService = platformClientUtil.getLogonFactoryService();
}
return workService;
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
index 8cbffd3..32256c3 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/initTask/VciWebInitTaskComponent.java
@@ -1,16 +1,11 @@
package com.vci.web.initTask;
-import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
-import com.vci.corba.common.VCIError;
-import com.vci.frameworkcore.compatibility.ISmFunctionQueryService;
+import com.vci.client.mw.ClientContextVariable;
+import com.vci.client.mw.LaunchModeEnum;
+import com.vci.corba.omd.data.AttributeValue;
import com.vci.frameworkcore.constant.FrameWorkBtmTypeConstant;
import com.vci.frameworkcore.properties.VciFramworkCompatibilityProperties;
-import com.vci.mw.client.ClientContextVariable;
-import com.vci.mw.client.InvocationUtility;
-import com.vci.mw.client.LaunchModeEnum;
-import com.vci.starter.corba.initializer.JacorbClientRequestInterceptor;
-import com.vci.starter.corba.properties.JacorbClientMapProperties;
import com.vci.starter.web.annotation.config.VciConfigField;
import com.vci.starter.web.annotation.config.VciConfigModule;
import com.vci.starter.web.enumpck.DataSecretEnum;
@@ -25,7 +20,6 @@
import com.vci.web.pageModel.OsAttributeVO;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
-import com.vci.web.service.impl.OsAttributeServiceImpl;
import com.vci.web.service.impl.UIEngineServiceImpl;
import com.vci.web.service.impl.WebContextInfoFetcher;
import com.vci.web.service.impl.WebInitServiceImpl;
@@ -41,15 +35,12 @@
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
import org.springframework.util.ResourceUtils;
-import plm.bs.bom.common.AttributeValue;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
import java.util.*;
import java.util.stream.Collectors;
@@ -133,11 +124,11 @@
@Autowired
private WebSecretServiceI secretService;
- /**
- * corba鐨勫鎴风
- */
- @Autowired(required = false)
- private JacorbClientMapProperties jacorbClientMapProperties;
+// /**
+// * corba鐨勫鎴风
+// */
+// @Autowired(required = false)
+// private JacorbClientMapProperties jacorbClientMapProperties;
/**
* 鎵ц鍒濆鍖�
@@ -258,12 +249,12 @@
properties.load(new FileInputStream(file));
String url = properties.getProperty("NameService");
String name = properties.getProperty("InstanceIdentity");
- if (StringUtils.isNotBlank(url)) {
- jacorbClientMapProperties.setUrl(url);
- }
- if (StringUtils.isNotBlank(name)) {
- jacorbClientMapProperties.setInstanceIdentity(name);
- }
+// if (StringUtils.isNotBlank(url)) {
+// jacorbClientMapProperties.setUrl(url);
+// }
+// if (StringUtils.isNotBlank(name)) {
+// jacorbClientMapProperties.setInstanceIdentity(name);
+// }
}
}catch (IOException e) {
logger.error("璇诲彇骞冲彴鐨刢orb閰嶇疆鏂囦欢鍑虹幇浜嗛敊璇�",e);
@@ -288,8 +279,8 @@
public void initSetting() {
System.out.println("----鍒濆鍖栫敤浜庢煡璇㈤厤缃殑鐢ㄦ埛----");
ClientContextVariable.setClientLanuchMode(LaunchModeEnum.WebApp);
- InvocationUtility.registerIInvocationContext(contextInfoFetcher);
- JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
+// InvocationUtility.registerIInvocationContext(contextInfoFetcher);
+// JacorbClientRequestInterceptor.sessionContext = contextInfoFetcher;
System.out.println("----鍒濆鍖栫敤浜庢煡璇㈤厤缃殑鐢ㄦ埛瀹屾垚----");
System.out.println("----寮�濮嬫壂鎻忔湁VciConfigModule娉ㄨВ鐨勭被----");
String[] namesForAnnotation = ApplicationContextProvider.getApplicationContext().getBeanNamesForAnnotation(VciConfigModule.class);
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/OsMapToObjFunction.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/OsMapToObjFunction.java
index 2db57f5..6e559de 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/OsMapToObjFunction.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/other/OsMapToObjFunction.java
@@ -1,9 +1,5 @@
package com.vci.web.other;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-
-import java.util.Map;
-
/**
* 瀵硅薄鏈嶅姟涓紝map杞垚VO鐨勫璞�
* @author weidy
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
index c978e1a..cfaa1fe 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsAttributeServiceI.java
@@ -4,8 +4,6 @@
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.web.pageModel.OsAttributeVO;
-import com.vci.web.pageModel.OsUsedAttributeVO;
-import plm.corba.attribpool.AttribItem;
import java.util.Collection;
import java.util.List;
@@ -91,13 +89,13 @@
* 鎵归噺娣诲姞灞炴��
* @param attribItemList 灞炴�х殑鍒楄〃
*/
- void batchAddAttribute(List<AttribItem> attribItemList);
+ void batchAddAttribute(List<AttributeDef> attribItemList);
/**
* 鎵归噺缂栬緫灞炴��
* @param editAttrList 灞炴�х殑鍒楄〃
*/
- void batchEditAttribute(List<AttribItem> editAttrList);
+ void batchEditAttribute(List<AttributeDef> editAttrList);
/**
* 灞炴�у垪琛�
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java
index 5345b26..fe80c5f 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsLifeCycleServiceI.java
@@ -8,9 +8,6 @@
import com.vci.web.pageModel.OsLifeCycleLineVO;
import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.pageModel.OsStatusVO;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.common.BusinessObject;
-import plm.corba.lifecycle.LifeCyle;
import java.util.Collection;
import java.util.List;
@@ -89,7 +86,7 @@
* @param lifeCycleVO 鏄剧ず瀵硅薄
* @return 鏁版嵁瀵硅薄
*/
- LifeCyle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO);
+ LifeCycle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO);
/**
* 鏌ヨ鎵�鏈夌敓鍛藉懆鏈熺姸鎬�
@@ -153,13 +150,13 @@
* 鎵归噺娣诲姞鐢熷懡鍛ㄦ湡
* @param lifeCyleList 鐢熷懡鍛ㄦ湡鐨勫唴瀹�
*/
- void batchAddLifeCycle(List<LifeCyle> lifeCyleList);
+ void batchAddLifeCycle(List<LifeCycle> lifeCyleList);
/**
* 鎵归噺淇敼鐢熷懡鍛ㄦ湡
* @param lifeCycleList 鐢熷懡鍛ㄦ湡鐨勫唴瀹�
*/
- void batchEditLifeCycle(List<LifeCyle> lifeCycleList);
+ void batchEditLifeCycle(List<LifeCycle> lifeCycleList);
/**
* 鐘舵�佸湪鐢熷懡鍛ㄦ湡涓娇鐢ㄧ殑鍕ゅ揩
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
index 15c30f5..7143ac9 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsRevisionRuleServiceI.java
@@ -1,8 +1,7 @@
package com.vci.web.service;
+import com.vci.corba.omd.vrm.VersionRule;
import com.vci.web.pageModel.OsRevisionRuleVO;
-import plm.corba.versionRuleManager.VersionRule;
-
import java.util.Collection;
import java.util.List;
import java.util.Map;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsStatusServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
index f2c02c9..2c122d6 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/OsStatusServiceI.java
@@ -1,11 +1,10 @@
package com.vci.web.service;
+import com.vci.corba.omd.stm.StatePool;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.dto.OsStatusDTO;
-import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.pageModel.OsStatusVO;
-import plm.corba.statePoolManager.StatePool;
import java.util.Collection;
import java.util.List;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java
index 09a7282..d529484 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/WebLoServiceI.java
@@ -1,18 +1,14 @@
package com.vci.web.service;
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.client.bof.ClientLinkObjectOperation;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.DataGrid;
import com.vci.starter.web.pagemodel.PageHelper;
import com.vci.web.query.UILinkTypeDataQuery;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-import plm.bs.bom.clientobject.ClientLinkObjectOperation;
-import plm.bs.bom.common.AttributeValue;
-import plm.bs.bom.common.LinkObject;
-import plm.corba.qt.BOAndLO;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
import java.util.Map;
@@ -156,7 +152,7 @@
* @return
* @throws VciBaseException
*/
- Map<String, com.vci.client.bof.ClientBusinessObject> queryLinkedCbo(List los,
+ Map<String, ClientBusinessObject> queryLinkedCbo(List los,
boolean isDirection, List<String> queryColumn) throws VciBaseException;
/**
@@ -165,7 +161,7 @@
* @return map
* @throws VciBaseException
*/
- List<Map> clos2Map(List<com.vci.client.bof.ClientLinkObject> clos) throws VciBaseException;
+ List<Map> clos2Map(List<ClientLinkObject> clos) throws VciBaseException;
/**
* ClientLinkObject 杞负HashMap
@@ -173,7 +169,7 @@
* @return
* @throws VciBaseException
*/
- Map clo2Map(com.vci.client.bof.ClientLinkObject clo) throws VciBaseException;
+ Map clo2Map(ClientLinkObject clo) throws VciBaseException;
/**
* map杞负ClientLinkObject
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
index 7a387cb..d9f627a 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsAttributeServiceImpl.java
@@ -334,12 +334,12 @@
* @param attribItemList 灞炴�х殑鍒楄〃
*/
@Override
- public void batchAddAttribute(List<AttribItem> attribItemList) {
+ public void batchAddAttribute(List<AttributeDef> attribItemList) {
if(!CollectionUtils.isEmpty(attribItemList)){
attribItemList.stream().forEach(attribItem -> {
try {
- platformClientUtil.getAttributeService().addAttribItem(attribItem);
- } catch (VCIError e) {
+ platformClientUtil.getAttributeService().addAttributeDef(attribItem);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
@@ -351,12 +351,12 @@
* @param editAttrList 灞炴�х殑鍒楄〃
*/
@Override
- public void batchEditAttribute(List<AttribItem> editAttrList) {
+ public void batchEditAttribute(List<AttributeDef> editAttrList) {
if(!CollectionUtils.isEmpty(editAttrList)){
editAttrList.stream().forEach(attribItem -> {
try {
- platformClientUtil.getAttributeService().modifyAbItem(attribItem);
- } catch (VCIError e) {
+ platformClientUtil.getAttributeService().modifyAttributeDef(attribItem);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
index a8f477d..a691068 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsLifeCycleServiceImpl.java
@@ -2,44 +2,30 @@
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.lcm.Bound;
import com.vci.corba.omd.lcm.LifeCycle;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
import com.vci.starter.web.pagemodel.DataGrid;
-import com.vci.starter.web.pagemodel.PageHelper;
-import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.constant.CacheKeyConstant;
import com.vci.web.model.OsLifeCycleDO;
-import com.vci.web.model.OsStatusDO;
import com.vci.web.pageModel.*;
import com.vci.web.service.OsLifeCycleServiceI;
-import com.vci.web.service.OsLinkTypeServiceI;
import com.vci.web.service.OsStatusServiceI;
import com.vci.web.service.WebBoServiceI;
import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
-import org.apache.tools.ant.taskdefs.condition.Os;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cache.annotation.CacheEvict;
-import org.springframework.cache.annotation.CachePut;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.common.BusinessObject;
-import plm.bs.bom.common.BusinessObjectHolder;
-import plm.corba.lifecycle.Bound;
-import plm.corba.lifecycle.LifeCyle;
-import plm.corba.lifecycle.TransitionVO;
-import plm.corba.lifecycle.TransitionVOEvent;
import java.util.*;
import java.util.stream.Collectors;
@@ -276,16 +262,16 @@
* @return 鏁版嵁瀵硅薄
*/
@Override
- public LifeCyle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO){
- LifeCyle lifeCyle = new LifeCyle();
+ public LifeCycle lifeCycleVO2DO(OsLifeCycleVO lifeCycleVO){
+ LifeCycle lifeCyle = new LifeCycle();
lifeCyle.name = lifeCycleVO.getId();
lifeCyle.tag = lifeCycleVO.getName();
lifeCyle.oid = lifeCycleVO.getOid();
lifeCyle.creator = lifeCycleVO.getCreator();
lifeCyle.description = lifeCycleVO.getDescription();
lifeCyle.modifier = lifeCycleVO.getLastModifier();
- lifeCyle.modifyTime = VciDateUtil.date2Str(lifeCycleVO.getLastModifyTime(),VciDateUtil.DateTimeFormat);
- lifeCyle.createTime = VciDateUtil.date2Str(lifeCycleVO.getCreateTime(),VciDateUtil.DateTimeFormat);
+ lifeCyle.modifyTime = lifeCycleVO.getLastModifyTime().getTime();
+ lifeCyle.createTime = lifeCycleVO.getCreateTime().getTime();
lifeCyle.startState =lifeCycleVO.getStartStatus();
lifeCyle.ts = VciDateUtil.date2Str(lifeCycleVO.getTs(),VciDateUtil.DateTimeMillFormat);
if(lifeCycleVO.getBounds() !=null && lifeCycleVO.getBounds().length>0) {
@@ -393,7 +379,7 @@
try {
com.vci.corba.omd.lcm.TransitionVO transitionVO = lifeCycleLineVO2DO(lineVO);
// platformClientUtil.getBOFactoryService().transferBusinessObject(new BusinessObjectHolder(obj), transitionVO);
- ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO);
+ ServiceProvider.getBOFService().transferBusinessObject(obj, transitionVO.destination);
} catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
@@ -473,12 +459,12 @@
* @param lifeCyleList 鐢熷懡鍛ㄦ湡鐨勫唴瀹�
*/
@Override
- public void batchAddLifeCycle(List<LifeCyle> lifeCyleList) {
+ public void batchAddLifeCycle(List<LifeCycle> lifeCyleList) {
if(!CollectionUtils.isEmpty(lifeCyleList)){
lifeCyleList.stream().forEach(lifeCyle -> {
try {
- platformClientUtil.getLifeCycleService().addLifeCyle(lifeCyle);
- } catch (VCIError e) {
+ platformClientUtil.getLifeCycleService().addLifeCycle(lifeCyle);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
@@ -491,12 +477,12 @@
* @param lifeCycleList 鐢熷懡鍛ㄦ湡鐨勫唴瀹�
*/
@Override
- public void batchEditLifeCycle(List<LifeCyle> lifeCycleList) {
+ public void batchEditLifeCycle(List<LifeCycle> lifeCycleList) {
if(!CollectionUtils.isEmpty(lifeCycleList)){
lifeCycleList.stream().forEach(lifeCyle -> {
try {
- platformClientUtil.getLifeCycleService().modifyLifeCyle(lifeCyle);
- } catch (VCIError e) {
+ platformClientUtil.getLifeCycleService().modifyLifeCycle(lifeCyle);
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
});
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
index 89fefe7..33607dd 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsRevisionRuleServiceImpl.java
@@ -1,6 +1,7 @@
package com.vci.web.service.impl;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.vrm.VersionRule;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.util.VciDateUtil;
import com.vci.web.constant.CacheKeyConstant;
@@ -13,7 +14,6 @@
import org.springframework.cache.annotation.CachePut;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
-import plm.corba.versionRuleManager.VersionRule;
import java.util.*;
import java.util.stream.Collectors;
@@ -49,8 +49,8 @@
public List<OsRevisionRuleVO> selectAllRevision() {
try {
return revisionRuleDO2VOs(Arrays.stream(platformClientUtil.getVersionService().getVersionRules()).collect(Collectors.toList()));
- } catch (VCIError vciError) {
- throw WebUtil.getVciBaseException(vciError);
+ } catch (PLException e) {
+ throw WebUtil.getVciBaseException(e);
}
}
@@ -96,8 +96,8 @@
ruleVO.setCreator(versionRule.creator);
ruleVO.setLastModifier(versionRule.modifier);
try {
- ruleVO.setCreateTime(VciDateUtil.str2Date(versionRule.createTime,VciDateUtil.DateTimeFormat));
- ruleVO.setLastModifyTime(VciDateUtil.str2Date(versionRule.modifyTime,VciDateUtil.DateTimeFormat));
+ ruleVO.setCreateTime(new Date(versionRule.createTime));
+ ruleVO.setLastModifyTime(new Date(versionRule.modifyTime));
ruleVO.setTs(VciDateUtil.str2Date(versionRule.ts,VciDateUtil.DateTimeFormat));
} catch (Exception e) {
e.printStackTrace();
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
index 272823d..edb75f4 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/OsStatusServiceImpl.java
@@ -2,8 +2,7 @@
import com.vci.client.common.providers.ServiceProvider;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.query.data.KV;
+import com.vci.corba.omd.stm.StatePool;
import com.vci.starter.web.annotation.log.VciUnLog;
import com.vci.starter.web.exception.VciBaseException;
import com.vci.starter.web.pagemodel.BaseQueryObject;
@@ -13,11 +12,8 @@
import com.vci.starter.web.util.LangBaseUtil;
import com.vci.starter.web.util.VciBaseUtil;
import com.vci.starter.web.util.VciDateUtil;
-import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.dto.OsStatusDTO;
-import com.vci.web.model.OsLifeCycleDO;
import com.vci.web.model.OsStatusDO;
-import com.vci.web.pageModel.OsLifeCycleVO;
import com.vci.web.pageModel.OsStatusVO;
import com.vci.web.service.OsLifeCycleServiceI;
import com.vci.web.service.OsStatusServiceI;
@@ -33,7 +29,6 @@
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.corba.statePoolManager.StatePool;
import java.util.*;
import java.util.stream.Collectors;
@@ -187,8 +182,8 @@
for(StatePool statePool : statePoolList) {
try {
platformClientUtil.getStatePoolService().addStatePool(statePool);
- } catch (VCIError vciError) {
- throw WebUtil.getVciBaseException(vciError);
+ } catch (PLException e) {
+ throw WebUtil.getVciBaseException(e);
}
}
}
@@ -204,8 +199,8 @@
for(StatePool statePool : statePoolList) {
try {
platformClientUtil.getStatePoolService().modifyStatePool(statePool);
- } catch (VCIError vciError) {
- throw WebUtil.getVciBaseException(vciError);
+ } catch (PLException e) {
+ throw WebUtil.getVciBaseException(e);
}
}
}
@@ -290,7 +285,7 @@
OsStatusVO statusVO = getObjectByOid(statusDTO.getOid());
StatePool pool = statusDTO2DO(statusDTO);
pool.creator = statusVO.getCreator();
- pool.createTime = VciDateUtil.date2Str(statusVO.getCreateTime(),VciDateUtil.DateTimeMillFormat);
+ pool.createTime = statusVO.getCreateTime().getTime();
List<StatePool> poolList = new ArrayList<>();
poolList.add(pool);
batchEditSave(poolList);
@@ -336,9 +331,9 @@
String userId = VciBaseUtil.getCurrentUserId();
String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
statePool.creator = userId;
- statePool.createTime = now;
+ statePool.createTime = System.currentTimeMillis();
statePool.modifier = userId;
- statePool.modifyTime = now;
+ statePool.modifyTime = System.currentTimeMillis();
statePool.ts = statusDTO.getTs()==null?now:VciDateUtil.date2Str(statusDTO.getTs(),VciDateUtil.DateTimeMillFormat);
statePool.tag = statusDTO.getName();
return statePool;
@@ -358,9 +353,9 @@
String userId = VciBaseUtil.getCurrentUserId();
String now = VciDateUtil.getNowString(VciDateUtil.DateTimeMillFormat);
statePool.creator = statusVO.getCreator();
- statePool.createTime = VciDateUtil.date2Str(statusVO.getCreateTime(),VciDateUtil.DateTimeMillFormat);
+ statePool.createTime = statusVO.getCreateTime().getTime();
statePool.modifier = statusVO.getLastModifier();
- statePool.modifyTime = VciDateUtil.date2Str(statusVO.getLastModifyTime(),VciDateUtil.DateTimeMillFormat);;
+ statePool.modifyTime = statusVO.getLastModifyTime().getTime();
statePool.ts = statusVO.getTs()==null?now:VciDateUtil.date2Str(statusVO.getTs(),VciDateUtil.DateTimeMillFormat);
statePool.tag = statusVO.getName();
return statePool;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
index 56c5f39..c98c43a 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/VciFileUploadServiceImpl.java
@@ -214,9 +214,11 @@
vciFileObjectDO.setLastModifier("admin");
// revisionModelUtil.wrapperForAdd(vciFileObjectDO);
//闅忔満璺緞
- String randomPath = VciBaseUtil.getPk();
+// String randomPath = VciBaseUtil.getPk();
+ String randomPath = "rrt";
//鐩爣鏂囦欢
- String targetFileName = vciFileObjectDO.getOid();
+// String targetFileName = vciFileObjectDO.getOid();
+ String targetFileName = VciBaseUtil.getPk();
String filePath = randomPath+File.separator+targetFileName;
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
index f420a1f..2899e3b 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBoServiceImpl.java
@@ -5,6 +5,7 @@
import com.vci.common.qt.object.*;
import com.vci.common.utility.ObjectUtility;
import com.vci.corba.common.PLException;
+import com.vci.corba.common.VCIError;
import com.vci.corba.omd.data.AttributeValue;
import com.vci.corba.omd.data.BusinessObject;
import com.vci.corba.omd.qtm.QTInfo;
@@ -1104,8 +1105,8 @@
if(results!=null && results.length>0 && results[0] != null && results[0].length>0){
return WebUtil.getInt(results[0][0]);
}
- }catch (VCIError e){
- throw WebUtil.getVciBaseException(e);
+ } catch (PLException e) {
+ throw new RuntimeException(e);
}
return 0;
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
index 0b98e8e..fb6eb24 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebBtmIOServiceImpl.java
@@ -1,7 +1,9 @@
package com.vci.web.service.impl;
-import com.vci.corba.common.VCIError;
import com.vci.corba.omd.etm.EnumType;
+import com.vci.corba.omd.lcm.Bound;
+import com.vci.corba.omd.lcm.LifeCycle;
+import com.vci.corba.omd.lcm.TransitionVO;
import com.vci.starter.poi.bo.WriteExcelData;
import com.vci.starter.poi.bo.WriteExcelOption;
import com.vci.starter.poi.util.ExcelUtil;
@@ -28,28 +30,12 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.omd.linktype.common.LinkTypeProvider;
-import plm.corba.attribpool.AttribItem;
-import plm.corba.btm.BTMServiceOperations;
-import plm.corba.btm.BtmItem;
import com.vci.corba.omd.etm.EnumItem;
-import plm.corba.lifecycle.Bound;
-import plm.corba.lifecycle.LifeCyle;
-import plm.corba.lifecycle.TransitionVO;
-import plm.corba.lifecycle.TransitionVOEvent;
-import plm.corba.linkTypeManager.LinkType;
-import plm.corba.statePoolManager.StatePool;
import plm.ddlTool.client.DDLToolClient;
-import plm.vo.omd.btm.common.BtmProvider;
-import plm.vo.omd.btm.resource.Tool;
-
import java.io.File;
import java.io.FileNotFoundException;
import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
-
-import static plm.vo.omd.attribpool.ui.VTDataTypePanel.*;
/**
@@ -257,21 +243,21 @@
allLifeCycleLowMap.put(id.toLowerCase(Locale.ROOT),lifeCycleVO);
});
//涓嶅瓨鍦ㄧ殑鐢熷懡鍛ㄦ湡瀵硅薄
- List<LifeCyle> unExistLifeCycleList = new ArrayList<LifeCyle>();
- List<LifeCyle> editLifeCycleList = new ArrayList<LifeCyle>();
+ List<LifeCycle> unExistLifeCycleList = new ArrayList<LifeCycle>();
+ List<LifeCycle> editLifeCycleList = new ArrayList<LifeCycle>();
String userId = WebUtil.getCurrentUserId();
String now = VciDateUtil.getNowString(VciDateUtil.DateTimeFormat);
//寰幆鍒嗘瀽闇�瑕佹坊鍔犺繕鏄慨鏀�
for(OsLifeCycleDTO lifeCycleDTO : lifeCycleDTOList){
String lifeCycleId = lifeCycleDTO.getId().toLowerCase().trim();
- LifeCyle lifeCyle = null;
+ LifeCycle lifeCyle = null;
boolean edit = false;
if(!existLifeCycleLowIds.contains(lifeCycleId)) {
- lifeCyle = new LifeCyle();
+ lifeCyle = new LifeCycle();
lifeCyle.oid = "";
lifeCyle.id = "";
lifeCyle.creator = userId;
- lifeCyle.createTime = now;
+ lifeCyle.createTime = System.currentTimeMillis();
lifeCyle.ts = now;
lifeCyle.name = lifeCycleDTO.getId();
}else {
@@ -282,7 +268,7 @@
lifeCyle.description = lifeCycleDTO.getDescription() == null?"":lifeCycleDTO.getDescription();
lifeCyle.startState = lifeCycleDTO.getStartStatus() == null?"":lifeCycleDTO.getStartStatus();
lifeCyle.modifier = userId;
- lifeCyle.modifyTime = now;
+ lifeCyle.modifyTime = System.currentTimeMillis();
//鎵惧尯鍩�
List<OsLifeCycleLineDTO> lineDTOList = lifeCycleDTO.getLineDTOList();
if(CollectionUtils.isEmpty(lineDTOList)){
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
index 2417af1..402f00c 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/service/impl/WebLoServiceImpl.java
@@ -2,10 +2,13 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.vci.base.common.utility.ObjectUtility;
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.client.bof.ClientLinkObjectOperation;
import com.vci.client.common.providers.ServiceProvider;
+import com.vci.common.qt.object.*;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
+import com.vci.corba.omd.data.LinkObject;
import com.vci.corba.query.ObjectQueryService;
import com.vci.starter.web.constant.QueryOptionConstant;
import com.vci.starter.web.exception.VciBaseException;
@@ -21,23 +24,11 @@
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.omg.CORBA.IntHolder;
-import org.omg.CORBA.PRIVATE_MEMBER;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.BOFactoryClient;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-import plm.bs.bom.clientobject.ClientLinkObjectOperation;
-import plm.bs.bom.common.AttributeValue;
-import plm.bs.bom.common.BusinessObject;
-import plm.bs.bom.common.LinkObject;
-import plm.corba.qt.BOAndLO;
-import plm.oq.objectQuery.common.*;
-
-import java.lang.reflect.Field;
import java.util.*;
import java.util.stream.Collectors;
@@ -106,13 +97,13 @@
@Override
public List<ClientLinkObject> queryCLO(String linkType,
- Map<String, String> conditionMap) throws VciBaseException {
+ Map<String, String> conditionMap) throws VciBaseException {
return queryCLO(linkType, "", 1, conditionMap);
}
@Override
public List<ClientBusinessObject> queryLinkCbo(String linkType,
- String toBtmname, Map<String, String> conditionMap)
+ String toBtmname, Map<String, String> conditionMap)
throws VciBaseException {
return queryLinkCbo(linkType, toBtmname, 1, conditionMap);
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
index fff6644..7efe896 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/PlatformClientUtil.java
@@ -1,34 +1,20 @@
package com.vci.web.util;
-import com.vci.corba.logon.method.LogonFactory;
-import com.vci.corba.logon.method.LogonFactoryHelper;
-import com.vci.corba.volumn.method.VolumnFactory;
-import com.vci.corba.volumn.method.VolumnFactoryHelper;
-import com.vci.starter.corba.connector.JacorbClientConnector;
-import com.vci.starter.web.exception.VciBaseException;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.vci.client.common.providers.ServiceProvider;
+import com.vci.corba.bofactory.BOFactoryServicePrx;
+import com.vci.corba.common.PLException;
+import com.vci.corba.omd.atm.AttPoolServicePrx;
+import com.vci.corba.omd.btm.BTMServicePrx;
+import com.vci.corba.omd.etm.EnumServicePrx;
+import com.vci.corba.omd.lcm.LifeCycleServicePrx;
+import com.vci.corba.omd.ltm.LinkTypeServicePrx;
+import com.vci.corba.omd.stm.StatePoolServicePrx;
+import com.vci.corba.omd.vrm.VersionRuleServicePrx;
+import com.vci.corba.portal.PortalServicePrx;
+import com.vci.corba.query.ObjectQueryServicePrx;
+import com.vci.corba.volume.VolumeServicePrx;
+import com.vci.corba.workflow.WorkflowServicePrx;
import org.springframework.stereotype.Component;
-import plm.bs.bom.common.BOFactoryService;
-import plm.bs.bom.common.BOFactoryServiceHelper;
-import plm.corba.attribpool.AttPoolServiceHelper;
-import plm.corba.attribpool.AttPoolServiceOperations;
-import plm.corba.btm.BTMServiceHelper;
-import plm.corba.btm.BTMServiceOperations;
-import plm.corba.enumManager.EnumServiceHelper;
-import plm.corba.enumManager.EnumServiceOperations;
-import plm.corba.lifecycle.LifeCyleServiceHelper;
-import plm.corba.lifecycle.LifeCyleServiceOperations;
-import plm.corba.linkTypeManager.LinkTypeServiceHelper;
-import plm.corba.linkTypeManager.LinkTypeServiceOperations;
-import plm.corba.portal.PortalServiceHelper;
-import plm.corba.portal.PortalServiceOperations;
-import plm.corba.qt.QTServiceHelper;
-import plm.corba.qt.QTServiceOperations;
-import plm.corba.statePoolManager.StatePoolServiceHelper;
-import plm.corba.statePoolManager.StatePoolServiceOperations;
-import plm.corba.versionRuleManager.VersionRuleServiceHelper;
-import plm.corba.versionRuleManager.VersionRuleServiceOperations;
/**
* 骞冲彴鐨勫鎴风璋冪敤宸ュ叿绫�
@@ -91,115 +77,110 @@
*/
private static final String QUERY_SERVICE_NAME = "qtService";
- /**
- * corba鐨勫鎴风璋冪敤
- */
- @Autowired
- private JacorbClientConnector jacorbClientConnector;
/**
* 鑾峰彇涓氬姟绫诲瀷宸ュ巶鐨勬湇鍔�
* @return 鏈嶅姟鐨勫璞�
*/
- public BOFactoryService getBOFactoryService(){
- return BOFactoryServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(BO_FACTORY_SERVICE_NAME));
- }
+ public BOFactoryServicePrx getBOFactoryService(){
+ return ServiceProvider.getBOFService();
+ }
/**
* 鑾峰彇鐧诲綍涓绘湇鍔�
* @return 鏈嶅姟鐨勫璞�
*/
- public LogonFactory getLogonFactoryService(){
- return LogonFactoryHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LOGON_FACTORY_SERVICE_NAME));
- }
+ public WorkflowServicePrx getLogonFactoryService(){
+ return ServiceProvider.getWFService();
+ }
/**
* 鑾峰彇鐘舵�佹睜鐨勬湇鍔�
* @return 鏈嶅姟鐨勫璞�
*/
- public StatePoolServiceOperations getStatePoolService(){
- return StatePoolServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(STATE_POOL_SERVICE_NAME));
- }
+ public StatePoolServicePrx getStatePoolService() throws PLException {
+ return ServiceProvider.getOMDService().getStateService();
+ }
/**
* 鑾峰彇鐢熷懡鍛ㄦ湡鐨勬湇鍔�
* @return 鐢熷懡鍛ㄦ湡鐨勬湇鍔″璞�
*/
- public LifeCyleServiceOperations getLifeCycleService(){
- return LifeCyleServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LIFE_CYCLE_SERVICE_NAME));
- }
+ public LifeCycleServicePrx getLifeCycleService() throws PLException {
+ return ServiceProvider.getOMDService().getLifeCycleService();
+}
/**
* 鑾峰彇鏋氫妇鐨勬湇鍔�
* @return 鏋氫妇鐨勬湇鍔″璞�
*/
- public EnumServiceOperations getEnumService(){
- return EnumServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ENUM_SERVICE_NAME));
+ public EnumServicePrx getEnumService() throws PLException {
+ return ServiceProvider.getOMDService().getEnumService();
+// return EnumServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ENUM_SERVICE_NAME));
}
/**
* 鑾峰彇鐗堟湰瑙勫垯鐨勬湇鍔�
* @return 鐗堟湰瑙勫垯鐨勬湇鍔�
*/
- public VersionRuleServiceOperations getVersionService(){
- return VersionRuleServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(VERSION_SERVICE_NAME));
+ public VersionRuleServicePrx getVersionService() throws PLException {
+ return ServiceProvider.getOMDService().getVerRuleService();
+// return VersionRuleServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(VERSION_SERVICE_NAME));
}
/**
* 灞炴�ф湇鍔�
* @return 鏈嶅姟鐨勫璞�
*/
- public AttPoolServiceOperations getAttributeService(){
- return AttPoolServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ATTRIBUTE_SERVICE_NAME));
+ public AttPoolServicePrx getAttributeService() throws PLException {
+ return ServiceProvider.getOMDService().getAttributeService();
+// return AttPoolServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(ATTRIBUTE_SERVICE_NAME));
}
/**
* 鑾峰彇涓氬姟绫诲瀷
* @return 鏈嶅姟鐨勫璞�
*/
- public BTMServiceOperations getBtmService(){
- return BTMServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(BTM_SERVICE_NAME));
+ public BTMServicePrx getBtmService() throws PLException {
+ return ServiceProvider.getOMDService().getBTMService();
+// return BTMServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(BTM_SERVICE_NAME));
}
/**
* 鑾峰彇閾炬帴绫诲瀷
* @return 鏈嶅姟鐨勫璞�
*/
- public LinkTypeServiceOperations getLinkTypeService(){
- return LinkTypeServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LINK_SERVICE_NAME));
+ public LinkTypeServicePrx getLinkTypeService() throws PLException {
+ return ServiceProvider.getOMDService().getLinkTypeService();
+// return LinkTypeServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(LINK_SERVICE_NAME));
}
/**
* 鑾峰彇UI涓婁笅鏂囨湇鍔�
* @return 鏈嶅姟鐨勫璞�
*/
- public PortalServiceOperations getPortalService(){
- return PortalServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(PORTAL_SERVICE_NAME));
+ public PortalServicePrx getPortalService(){
+ return ServiceProvider.getUIService();
+// return PortalServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(PORTAL_SERVICE_NAME));
}
/**
* 鑾峰彇鏌ヨ鏈嶅姟
* @return 鏈嶅姟鐨勫璞�
*/
- public QTServiceOperations getQueryService(){
- return QTServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(QUERY_SERVICE_NAME));
+ public ObjectQueryServicePrx getQueryService(){
+ return ServiceProvider.getOQService();
+// return QTServiceHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByServiceName(QUERY_SERVICE_NAME));
}
/**
* 鍗锋湇鍔�
- * @param serverUrl 鍛藉悕鏈嶅姟
* @param volumeName 鍗风殑鍚嶇О
* @return 鍗锋湇鍔＄殑鐨勫璞�
*/
- public VolumnFactory getVolumeService(String serverUrl,String volumeName){
- if(StringUtils.isNotBlank(serverUrl)){
- if(StringUtils.countMatches(serverUrl,":") < 2){
- throw new VciBaseException("鍗锋湇鍔＄殑閰嶇疆閿欒锛岄渶瑕佷富鏈哄悕:绔彛:鏈嶅姟鍓嶇紑杩欑褰㈠紡");
- }
- String[] split = serverUrl.split(":");
- serverUrl = "corbaloc::" + split[0] + ":" +split[1] + "/NameService:" +split[2];
- }
- return VolumnFactoryHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByUrlAndServiceName(serverUrl,volumeName));
+ public VolumeServicePrx getVolumeService(String volumeName){
+ return ServiceProvider.getVolumeService(volumeName);
+// return VolumnFactoryHelper.narrow(jacorbClientConnector.getCorbaServiceObjectByUrlAndServiceName(serverUrl,volumeName));
}
}
diff --git a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java
index 20cf192..15dd76a 100644
--- a/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java
+++ b/Source/platformProject/vci-platform-web/src/main/java/com/vci/web/util/WebUtil.java
@@ -2,11 +2,15 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.vci.base.ui.exception.VCIException;
+import com.vci.client.bof.ClientBusinessObject;
+import com.vci.client.bof.ClientLinkObject;
+import com.vci.client.common.objects.UserEntityObject;
+import com.vci.common.exception.VciException;
import com.vci.corba.common.PLException;
-import com.vci.corba.common.VCIError;
-import com.vci.corba.framework.data.UserEntityInfo;
-import com.vci.rmip.framework.client.systemConfig.object.UserEntityObject;
+import com.vci.corba.common.data.UserEntityInfo;
+import com.vci.corba.omd.data.AttributeValue;
+import com.vci.corba.omd.data.BusinessObject;
+import com.vci.corba.omd.data.LinkObject;
import com.vci.starter.revision.bo.TreeWrapperOptions;
import com.vci.starter.web.annotation.*;
import com.vci.starter.web.constant.QueryOptionConstant;
@@ -19,7 +23,6 @@
import com.vci.starter.web.util.*;
import com.vci.starter.web.wrapper.VciQueryWrapperForDO;
import com.vci.web.pageModel.*;
-import com.vci.web.properties.WebProperties;
import com.vci.web.service.impl.WebLoServiceImpl;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -27,14 +30,8 @@
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
-import plm.bs.bom.clientobject.ClientBusinessObject;
-import plm.bs.bom.clientobject.ClientLinkObject;
-import plm.bs.bom.common.AttributeValue;
-import plm.bs.bom.common.BusinessObject;
-import plm.bs.bom.common.LinkObject;
import javax.servlet.http.HttpServletRequest;
import java.beans.IntrospectionException;
@@ -81,16 +78,16 @@
if (e == null) {
return errContent;
}
- if (e instanceof VCIError ) {
+ if (e instanceof PLException ) {
// String error_code = ((VCIError) e).error_code;
// String[] error_message = ((VCIError) e).error_message;
// return MessageUtils.get(error_code, error_message);
return null;
} else if(e instanceof VciBaseException || e.getClass().getSuperclass().equals(VciBaseException.class)){
return LangBaseUtil.getErrorMsg(e);
- }else if (e instanceof VCIException){
- String error_code = ((VCIException) e).getException_code();
- Object[] error_message = ((VCIException) e).getException_objArray();
+ }else if (e instanceof VciException){
+ String error_code = ((VciException) e).getCode();
+ Object[] error_message = ((VciException) e).getObjArray();
return MessageUtils.get(error_code, error_message);
}else if (e.getCause() != null
&& !e.getCause().toString().equals("")) {
@@ -242,7 +239,7 @@
public static UserEntityInfo getUserEntityInfo(String model){
SessionInfo si = WebUtil.getCurrentUserSessionInfo();
UserEntityInfo ueo = new UserEntityInfo();
- ueo.ip = si.getIp();
+// ueo.ip = si.getIp();
ueo.modules = model;
ueo.userName = si.getUserId();
return ueo;
@@ -256,7 +253,7 @@
public static UserEntityObject getUserEntityObject(String model) {
UserEntityObject entityObject = new UserEntityObject();
SessionInfo si = WebUtil.getCurrentUserSessionInfo();
- entityObject.setIp(si.getIp());
+// entityObject.setIp(si.getIp());
entityObject.setModules(model);
entityObject.setUserName(si.getUserId());
return entityObject;
@@ -1321,7 +1318,7 @@
* @param obj 瀵硅薄
* @param fieldAttrMap 灞炴�ap
*/
- public static void copyValueToObjectFromLos(LinkObject lo ,Object obj,Map<String,String> fieldAttrMap){
+ public static void copyValueToObjectFromLos(LinkObject lo , Object obj, Map<String,String> fieldAttrMap){
if(lo!=null && obj != null){
//鍏堟妸鎵�鏈夌殑瀛楁鏄犲皠鎵惧埌
if(fieldAttrMap == null){
@@ -1395,7 +1392,7 @@
}else {
clo.setAttributeValue(key.toLowerCase(), value);
}
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}
@@ -1438,7 +1435,7 @@
setValueToField(fieldName, cbo, value);
}
cbo.setAttributeValue(attrName.toLowerCase(), value);
- } catch (VCIError e) {
+ } catch (PLException e) {
throw WebUtil.getVciBaseException(e);
}
}
@@ -1510,10 +1507,10 @@
* @param e 寮傚父瀵硅薄
* @return base寮傚父瀵硅薄
*/
- public static VciBaseException getVciBaseException(VCIError e){
-// return new VciBaseException(e.error_code, e.error_message);
- return null;
- }
+// public static VciBaseException getVciBaseException(PLException e){
+//// return new VciBaseException(e.error_code, e.error_message);
+// return null;
+// }
/**
* 杞崲寮傚父
@@ -1530,15 +1527,15 @@
* @param e 寮傚父瀵硅薄
* @return base寮傚父瀵硅薄
*/
- public static VciBaseException getVciBaseException(VCIException e){
+ public static VciBaseException getVciBaseException(VciException e){
String[] errorMsgs = new String[0];
- if(e != null && e.getException_objArray() !=null ){
- errorMsgs = new String[e.getException_objArray().length];
+ if(e != null && e.getObjArray() !=null ){
+ errorMsgs = new String[e.getObjArray().length];
for(int i = 0 ; i < errorMsgs.length ; i ++){
- errorMsgs[i] = e.getException_objArray()[i].toString();
+ errorMsgs[i] = e.getObjArray()[i].toString();
}
}
- return new VciBaseException(e == null ?"com.vci.web.base.unknowerror":e.getException_code(), errorMsgs);
+ return new VciBaseException(e == null ?"com.vci.web.base.unknowerror":e.getCode(), errorMsgs);
}
/**
--
Gitblit v1.9.3