From b0c18d369abd06075c83759b0e19823c2a11d716 Mon Sep 17 00:00:00 2001
From: ulysseskao <ulysseskao@gmail.com>
Date: Fri, 29 Apr 2016 18:45:41 +0800
Subject: [PATCH] update for new model
---
CCSTrace/CCS/Function/MergeCase.cs | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/CCSTrace/CCS/Function/MergeCase.cs b/CCSTrace/CCS/Function/MergeCase.cs
index 89d4f03..353cb7e 100644
--- a/CCSTrace/CCS/Function/MergeCase.cs
+++ b/CCSTrace/CCS/Function/MergeCase.cs
@@ -1,58 +1,53 @@
using System;
-using System.Data;
-using System.Configuration;
-using System.Web;
-using System.Web.Security;
-using System.Web.UI;
-using System.Web.UI.HtmlControls;
-using System.Web.UI.WebControls;
-using System.Web.UI.WebControls.WebParts;
using System.Data.OracleClient;
+using CCSTrace.CCS.Object;
namespace CCSTrace.CCS.Function
{
public class MergeCase
{
- private CCS.Object.EventRecord l_Eventrecord;
- private CCS.EventAI.JudgeCase m_JudgeCase;
+ private EventRecord _lEventrecord;
+ private EventAI.JudgeCase _mJudgeCase;
- public MergeCase()
+ public MergeCase()
{
}
- public void Merge(CCS.Object.EventRecord m_Eventrecord, OracleConnection _Conn, OracleTransaction _Trx, String _traceConnection, RecordLog _Log)
+ public void Merge(EventRecord mEventrecord, OracleConnection conn, OracleTransaction trx, string traceConnection, RecordLog log)
{
try
{
- m_JudgeCase = new CCS.EventAI.JudgeCase(m_Eventrecord.getFdrID(), m_Eventrecord.getFsc(), m_Eventrecord.getUfid(),
- m_Eventrecord.getCaseID(), m_Eventrecord.getAcceptDate(), _Conn, _Trx, _traceConnection, _Log);
- l_Eventrecord = m_Eventrecord;
- m_JudgeCase.AIBegin();
- l_Eventrecord.setParentID(m_JudgeCase.getParentCaseID());
- l_Eventrecord.setFsc(m_JudgeCase.getInferEquipment().getFSC());
- l_Eventrecord.setUfid(m_JudgeCase.getInferEquipment().getUFID());
+ _mJudgeCase = new EventAI.JudgeCase(mEventrecord.FdrId, mEventrecord.Fsc, mEventrecord.Ufid,
+ mEventrecord.CaseId, mEventrecord.AcceptDate, conn, trx, traceConnection, log);
+ _lEventrecord = mEventrecord;
+ _mJudgeCase.AiBegin();
+ _lEventrecord.ParentId = _mJudgeCase.GetParentCaseId();
+ _lEventrecord.Fsc = _mJudgeCase.GetInferEquipment().Fsc;
+ _lEventrecord.Ufid = _mJudgeCase.GetInferEquipment().Ufid;
}
- catch (CCS.EventAI.TraceLoopException tle) {
- _Log.Error(tle.Message);
+ catch (EventAI.TraceLoopException tle)
+ {
+ log.Error(tle.Message);
throw tle;
}
- catch (Exception e) {
- _Log.Error(e.Message);
+ catch (Exception e)
+ {
+ log.Error(e.Message);
throw e;
}
-
}
- public CCS.EventAI.Equipment getOldEquipment() {
- return m_JudgeCase.getOldrEquipment();
+ public EventAI.Equipment GetOldEquipment()
+ {
+ return _mJudgeCase.GetOldrEquipment();
}
}
- class TraceException : Exception
+ internal class TraceException : Exception
{
- public TraceException()
- {
- }
+ public TraceException()
+ {
+ }
}
-}
+}
\ No newline at end of file
--
Gitblit v0.0.0-SNAPSHOT