From 663878fdcd0d44c105888014f4cdf7fc926f609f Mon Sep 17 00:00:00 2001
From: yuxc <yuxc@vci-tech.com>
Date: 星期三, 19 六月 2024 10:27:04 +0800
Subject: [PATCH] 1、去掉client包的相关更改。 2、修改登录鉴权修改。
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java | 38 +++++++++++++++++++++-----------------
1 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
index 77b29f6..f0721d5 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/WebProcessDefineServiceImpl.java
@@ -1,7 +1,6 @@
package com.vci.web.service.impl;
-import com.vci.client.bof.ClientLinkObject;
-import com.vci.client.workflow.editor.FlowConstants;
+import com.vci.corba.omd.data.LinkObject;
import com.vci.file.pagemodel.VciFileObjectVO;
import com.vci.frameworkcore.compatibility.OrgDeptQueryServiceI;
import com.vci.frameworkcore.compatibility.SmRoleQueryServiceI;
@@ -23,6 +22,7 @@
import com.vci.web.pageModel.*;
import com.vci.web.properties.WebProperties;
import com.vci.web.service.*;
+import com.vci.web.util.PlatformClientUtil;
import com.vci.web.util.WebUtil;
import org.apache.commons.lang3.StringUtils;
import org.dom4j.Document;
@@ -60,6 +60,9 @@
@Autowired
private WebProcessCommandServiceI proCmdService;
+
+ @Autowired
+ private PlatformClientUtil platformClientUtil;
/**
* 涓氬姟鏁版嵁鏈嶅姟
@@ -440,14 +443,14 @@
map.put("detailUrl",detailUrl== null?"":detailUrl);
map.put("UIContentCode",UIContent);
//澧炲姞鏌ヨ鍏宠仈鐨勪笟鍔℃暟鎹�
- List<ClientLinkObject> linkObjects = processDao.getDataCloInTask("",executionid);
+ List<LinkObject> linkObjects = processDao.getDataCloInTask("",executionid);
StringBuilder sb = new StringBuilder();
String thisBusinessOid = "";
if(linkObjects!=null && linkObjects.size()>0){
Set<String> oidSet = new HashSet<String>();
//鍘婚櫎閲嶅
- for(ClientLinkObject clo : linkObjects){
- oidSet.add(clo.getToOid());
+ for(LinkObject clo : linkObjects){
+ oidSet.add(clo.toOid);
}
for(String oidString : oidSet) {
sb.append(oidString).append(",");
@@ -480,11 +483,12 @@
}
for (Iterator<?> a = root.elementIterator(); a.hasNext();) {
Element next = (Element) a.next();
- String cellName = next.attributeValue(FlowConstants.XMLNAME);
- if(cellName != null && cellName.equals(name)) {
- map.put("customerbuttoninfo",next.attributeValue(FlowConstants.URL_PATH));
- break;
- }
+ //todo FlowConstants姝ゅ崰鏃犳硶寮曠敤锛屽悗缁細杩涜璋冩暣锛屽啀杩涜寮曠敤
+// String cellName = next.attributeValue(FlowConstants.XMLNAME);
+// if(cellName != null && cellName.equals(name)) {
+// map.put("customerbuttoninfo",next.attributeValue(FlowConstants.URL_PATH));
+// break;
+// }
}
}catch (Exception e) {
throw new VciBaseException("璇诲彇娴佺▼鐨剎ml鍐呭鍑虹幇浜嗛敊璇�");
@@ -644,19 +648,19 @@
*/
@Override
public DataGrid getFilesInProcess(Map<String, String> conditionMap, String taskOid, String executionId,PageHelper pageHelper) throws VciBaseException{
- List<ClientLinkObject> cloByTask = processDao.getDataCloInTask(taskOid,executionId);
+ List<LinkObject> cloByTask = processDao.getDataCloInTask(taskOid,executionId);
if(cloByTask == null || cloByTask.size() == 0){
throw new VciBaseException("娌℃湁鍏宠仈鐨勪笟鍔℃暟鎹�");
}
Map<String,List<String>> busOid_btmMap = new HashMap<String, List<String>>();
Set<String> fileOidSet = new HashSet();
- for(ClientLinkObject clo:cloByTask){
- if(FileTypeConstants.FILE_DATA_TABLE.equals(clo.getToBTMName())){
- fileOidSet.add(clo.getToOid());
+ for(LinkObject clo:cloByTask){
+ if(FileTypeConstants.FILE_DATA_TABLE.equals(clo.toBTName)){
+ fileOidSet.add(clo.toOid);
}else {
- List<String> thisBtmOids = busOid_btmMap.getOrDefault(clo.getToBTMName(),new ArrayList<>());
- thisBtmOids.add(clo.getToOid());
- busOid_btmMap.put(clo.getToBTMName(), thisBtmOids);
+ List<String> thisBtmOids = busOid_btmMap.getOrDefault(clo.toBTName,new ArrayList<>());
+ thisBtmOids.add(clo.toOid);
+ busOid_btmMap.put(clo.toBTName, thisBtmOids);
}
}
DataGrid dg = new DataGrid();
--
Gitblit v1.9.3