From cc36c77ea67cf8893da5443d4a42c9bd2add5d0b Mon Sep 17 00:00:00 2001
From: lihongyu <504404568@qq.com>
Date: Wed, 28 Dec 2022 15:48:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E5=B8=83=E6=8E=A8?=
 =?UTF-8?q?=E9=80=81EHSQ=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pubEvent/ProcessEndAfterEvent.java        | 50 +++++++++++--------
 1 file changed, 29 insertions(+), 21 deletions(-)

diff --git a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java
index c732bf39..bed04100 100644
--- a/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java
+++ b/com.actionsoft.apps.coe.pal.publisher/src/com/actionsoft/apps/coe/pal/publisher/pubEvent/ProcessEndAfterEvent.java
@@ -27,6 +27,8 @@ import com.actionsoft.apps.coe.pal.pal.output.dao.OutputTask;
 import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppManager;
 import com.actionsoft.apps.coe.pal.pal.output.extend.OutputAppProfile;
 import com.actionsoft.apps.coe.pal.pal.output.model.OutputTaskModel;
+import com.actionsoft.apps.coe.pal.pal.repository.cache.PALRepositoryCache;
+import com.actionsoft.apps.coe.pal.pal.repository.model.PALRepositoryModel;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.model.UpfileModel;
 import com.actionsoft.apps.coe.pal.pal.repository.upfile.web.UpfileWeb;
 import com.actionsoft.apps.resource.plugin.profile.DCPluginProfile;
@@ -335,7 +337,23 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
 					}
 
 				}
-
+				/**
+				 * 推送到EHSQ
+				 */
+				if ("true".equals(isSendEHSQ)) {
+					try {
+						// 推送EHSQ
+						if(bo_act_coe_publish_n.size()>0) {
+							sendEHSQ(processExecutionContext, bo_act_coe_publish_n);
+						}
+						// 更新EHSQ
+						if(bo_act_coe_publish_c.size()>0) {
+							updateEHSQ(processExecutionContext, bo_act_coe_publish_c);
+						}
+					} catch (Exception e) {
+						// TODO: handle exception
+					}
+				}
 				/**
 				 * 更新数据看板底表
 				 */
@@ -345,19 +363,7 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
 					// TODO: handle exception
 				}
 
-				/**
-				 * 推送到EHSQ
-				 */
-				if ("true".equals(isSendEHSQ)) {
-					try {
-						// 推送EHSQ
-						sendEHSQ(processExecutionContext, bo_act_coe_publish_n);
-						// 更新EHSQ
-						updateEHSQ(processExecutionContext, bo_act_coe_publish_c);
-					} catch (Exception e) {
-						// TODO: handle exception
-					}
-				}
+				
 
 			} catch (Exception e) {
 				e.printStackTrace();
@@ -1437,11 +1443,12 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
 					bo.getString("TASKID"), publishfileid);
 			jsonObject_ehsq.put("fileid", bo.getString("TASKID"));
 			jsonObject_ehsq.put("filename", bo.getString("PUBLISHFILENAME"));
-			// jsonObject_ehsq.put("filecode",bo.getString("PUBLISH_NUMBER"));
-			jsonObject_ehsq.put("filecode", "123456");
+			jsonObject_ehsq.put("filecode",bo.getString("PUBLISH_NUMBER"));
+			//jsonObject_ehsq.put("filecode", "123456");
 			String sql_n = "select * from APP_ACT_COE_PAL_REPOSITORY where id = '" + publishfileid + "'";
 			RowMap map = DBSql.getMap(sql_n);
-			jsonObject_ehsq.put("version", map.getString("PLVER"));
+			PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(publishfileid);
+			jsonObject_ehsq.put("verion", palRepositoryModel.getVersion());
 			jsonObject_ehsq.put("releasedate", simpleDateFormat.format(new Date()));
 			jsonObject_ehsq.put("effectivedate", simpleDateFormat.format(new Date()));
 			jsonObject_ehsq.put("authorcode", processExecutionContext.getTaskInstance().getTarget()); // jsonObject_ehsq.put("authorcode","00116465");
@@ -1544,11 +1551,12 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
 					publishfileid);
 			jsonObject_ehsq.put("fileid", bo.getString("TASKID"));
 			jsonObject_ehsq.put("filename", bo.getString("CHANGEDFILENAMENEW"));
-			// jsonObject_ehsq.put("filecode",bo.getString("CHANGE_NUMBER"));
-			jsonObject_ehsq.put("filecode", "123456");
+			jsonObject_ehsq.put("filecode",bo.getString("CHANGE_NUMBER"));
+			//jsonObject_ehsq.put("filecode", "123456");
 			String sql_n = "select * from APP_ACT_COE_PAL_REPOSITORY where id = '" + publishfileid + "'";
 			RowMap map = DBSql.getMap(sql_n);
-			jsonObject_ehsq.put("verion", map.getString("PLVER"));
+			PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(publishfileid);
+			jsonObject_ehsq.put("verion", palRepositoryModel.getVersion());
 			jsonObject_ehsq.put("releasedate", simpleDateFormat.format(new Date()));
 			jsonObject_ehsq.put("effectivedate", simpleDateFormat.format(new Date()));
 			jsonObject_ehsq.put("authorcode", processExecutionContext.getTaskInstance().getTarget());
@@ -1559,7 +1567,7 @@ public class ProcessEndAfterEvent extends ExecuteListener implements ExecuteList
 			jsonObject_ehsq.put("authorcompany", UserContext
 					.fromUID(processExecutionContext.getTaskInstance().getTarget()).getDepartmentModel().getName());
 			BO bo1 = SDK.getBOAPI().query("BO_ACT_PUBLISH_PERM_SCOPE", true)
-					.addQuery("PALNAME=", bo.getString("PUBLISHFILENAME")).detail();
+					.addQuery("PALNAME=", bo.getString("CHANGEDFILENAMENEW")).detail();
 			if (bo1 != null) {
 				if (bo1.getString("PERMTYPE").equals("1")) {
 					jsonObject_ehsq.put("releasescope", "内蒙古伊利实业集团股份有限公司");