From 986aa62ed00bee39363bab41b4eeb8259d446efd Mon Sep 17 00:00:00 2001 From: ludc <ludc@vci-tech.com> Date: 星期四, 16 一月 2025 18:20:32 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/Service/BOFactory/src/com/vci/server/bof/server/transfer/BatchTransferBO.java | 42 ++++++++++++++++++------------------------ 1 files changed, 18 insertions(+), 24 deletions(-) diff --git a/Source/Service/BOFactory/src/com/vci/server/bof/server/transfer/BatchTransferBO.java b/Source/Service/BOFactory/src/com/vci/server/bof/server/transfer/BatchTransferBO.java index c0a0af8..04fa639 100644 --- a/Source/Service/BOFactory/src/com/vci/server/bof/server/transfer/BatchTransferBO.java +++ b/Source/Service/BOFactory/src/com/vci/server/bof/server/transfer/BatchTransferBO.java @@ -5,6 +5,7 @@ import com.vci.corba.omd.lcm.LifeCycle; import com.vci.corba.omd.lcm.TransitionVO; import com.vci.server.base.persistence.dao.HibernateSessionFactory; +import com.vci.server.base.utility.LogRecordUtil; import com.vci.server.base.utility.ServerServiceProvider; import com.vci.server.bof.server.ServiceFacadeExecuteHelper; import com.vci.server.bof.service.BOFactoryServices; @@ -15,12 +16,12 @@ import com.vci.corba.common.VCIError; -public class BatchTransferBO extends ServiceFacadeExecuteHelper{ +public class BatchTransferBO extends ServiceFacadeExecuteHelper { private static ServiceFacadeExecuteHelper instance = null; public static ServiceFacadeExecuteHelper getInstance() { - if(instance == null) { + if (instance == null) { instance = new BatchTransferBO(); } return instance; @@ -37,8 +38,7 @@ TransitionVO vo2 = null; String boLcStatus = bos[i].lcStatus; if (boLcStatus == null || boLcStatus == "") { - throw getLocalString("", new VCIError("P0010SOF-00023", - new String[] { bos[i].name })); + throw getLocalString("", new VCIError("P0010SOF-00023", new String[] { bos[i].name })); // throw getLocalString("", new // VCIError("褰撳墠鎵�閫夌殑涓氬姟瀵硅薄\"{0}\"鐨勭敓鍛藉懆鏈熺姸鎬佸�间负绌猴紝涓嶇敤鏈夋晥鎵ц璺冭縼鎿嶄綔銆�",new // String[]{bos[i].name})); @@ -52,8 +52,7 @@ } if (curLC == null) { // TODO:鎻愮ず鍑烘潵 - throw getLocalString("", new VCIError("P0010SOF-00024", - new String[] { bos[i].name })); + throw getLocalString("", new VCIError("P0010SOF-00024", new String[] { bos[i].name })); } if (!vos[i].destination.equals("") && !vos[i].connect.equals("")) { for (int l = 0; l < curLC.routes.length; ++l) { @@ -66,8 +65,7 @@ } } if (vo2 == null) { - throw getLocalString("", new VCIError("P0010SOF-00027", - new String[] { vos[i].destination })); + throw getLocalString("", new VCIError("P0010SOF-00027", new String[] { vos[i].destination })); } } else if (!vos[i].destination.equals("")) { for (int l = 0; l < curLC.routes.length; ++l) { @@ -80,8 +78,7 @@ } } if (vo2 == null) { - throw getLocalString("", new VCIError("P0010SOF-00027", - new String[] { vos[i].destination })); + throw getLocalString("", new VCIError("P0010SOF-00027", new String[] { vos[i].destination })); } } else if (!vos[i].connect.equals("")) { for (int l = 0; l < curLC.routes.length; ++l) { @@ -94,12 +91,10 @@ } } if (vo2 == null) { - throw getLocalString("", new VCIError("P0010SOF-00025", - new String[] { vos[i].connect })); + throw getLocalString("", new VCIError("P0010SOF-00025", new String[] { vos[i].connect })); } } else { - throw getLocalString("", new VCIError("P0010SOF-00026", - new String[] {})); + throw getLocalString("", new VCIError("P0010SOF-00026", new String[] {})); } // 鎵ц璺冭縼浜嬩欢 TransitionEventsExcuter excuter = new TransitionEventsExcuter(); @@ -111,20 +106,19 @@ return rs; } // 鏃ュ織璁板綍 - VCIInvocationInfo info = HibernateSessionFactory - .getVciSessionInfo(); - String ip = "127.0.0.1"; - if (info != null) { - ip = info.clientIPInfo == null || "".equals(info.clientIPInfo) ? "127.0.0.1" - : info.clientIPInfo; - } - batchRecordLog(bos, ip, "璺冭縼"); +// VCIInvocationInfo info = HibernateSessionFactory.getVciSessionInfo(); +// String ip = "127.0.0.1"; +// if (info != null) { +// ip = info.clientIPInfo == null || "".equals(info.clientIPInfo) ? "127.0.0.1" : info.clientIPInfo; +// } + //batchRecordLog(bos, ip, "璺冭縼"); + LogRecordUtil.batchWriteLog(bos, "璺冭縼"); } catch (Exception e) { e.printStackTrace(); - + throw this.getLocalString("P0010SOF-00008", e); } catch (Throwable t) { - + t.printStackTrace(); throw this.getLocalString("P0010SOF-00008", t); } -- Gitblit v1.9.3