From 410dc2d04dbecf019129cd8cd65a3be2c62b4d0c Mon Sep 17 00:00:00 2001
From: ulysseskao <ulysseskao@gmail.com>
Date: Tue, 03 May 2016 18:36:41 +0800
Subject: [PATCH] refator code

---
 CCSTrace/CCS/Function/Leach.cs |   29 ++++++++++++++---------------
 1 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/CCSTrace/CCS/Function/Leach.cs b/CCSTrace/CCS/Function/Leach.cs
index 21312e1..ce7ce16 100644
--- a/CCSTrace/CCS/Function/Leach.cs
+++ b/CCSTrace/CCS/Function/Leach.cs
@@ -22,7 +22,7 @@
             _traceConnectionString = traceConnection;
         }
 
-        public int LeachCase(Object.EventRecord mNewRec)
+        public int LeachCase(Object.EOSEventRecord mNewRec)
         {
             switch (SameCase(mNewRec))
             {
@@ -51,7 +51,7 @@
             return _mergeCase.GetOldEquipment();
         }
 
-        private int SameCase(Object.EventRecord mNewRec)
+        private int SameCase(Object.EOSEventRecord mNewRec)
         {
             string sqlStmt = "SELECT R.ACCEPTNUM,R.CASEID as CASEID,R.IMPORTCASE as IMPORTCASE,E.CASETYPE as CASETYPE FROM EOS.EVENTRECORD R,"
                            + "EOS.EVENTS E WHERE ";
@@ -89,7 +89,7 @@
             }
             catch (Exception e)
             {
-                Logger.Error(e.Message);
+                Logger.Error(e, e.Message);
                 return GlobalVariable.FailureByDb;
             }
             finally
@@ -264,7 +264,7 @@
             return status;
         }
 
-        private int Judge(Object.EventRecord mNewRec, bool changeCaseType)
+        private int Judge(Object.EOSEventRecord mNewRec, bool changeCaseType)
         {
             int mResult = GlobalVariable.FailureByDb;
 
@@ -278,8 +278,8 @@
             {
                 if (mNewRec.Fsc!= 0)
                 {
-                    mNewRec.LocateEquipment.SetFsc(GlobalVariable.Breaker);
-                    mNewRec.LocateEquipment.SetUfid(mNewRec.Ufid);
+                    mNewRec.LocateEquipment.Fsc = (GlobalVariable.Breaker);
+                    mNewRec.LocateEquipment.Ufid = (mNewRec.Ufid);
                     Logger.Info("饋線全停:" + mNewRec.Fsc+ ", " + mNewRec.Ufid);
                     _mergeCase.Merge(mNewRec, _connectionTpc, _transaction, _traceConnectionString);
                     return GlobalVariable.Success;
@@ -367,7 +367,7 @@
             return mResult;
         }
 
-        private int GetEquipment(Object.EventRecord mNewRec)
+        private int GetEquipment(Object.EOSEventRecord mNewRec)
         {
             string temp;
             string mOwnerTpclid;
@@ -407,8 +407,7 @@
             }
             catch (Exception e)
             {
-                Logger.Error(e.Message);
-                Console.WriteLine(e.StackTrace);
+                Logger.Error(e, e.Message);
                 return GlobalVariable.FailureByDb;
             }
             finally
@@ -418,7 +417,7 @@
             }
         }
 
-        private int GetSxfmr(string mTpclid, string mGroup, Object.EventRecord mNewRec)
+        private int GetSxfmr(string mTpclid, string mGroup, Object.EOSEventRecord mNewRec)
         {
             string sqlStmt;
             int mStatus = GlobalVariable.FailureByDb;
@@ -461,7 +460,7 @@
             return mStatus;
         }
 
-        private int GetHicustomer(string mTpclid, string mGroup, Object.EventRecord mNewRec)
+        private int GetHicustomer(string mTpclid, string mGroup, Object.EOSEventRecord mNewRec)
         {
             string sqlStmt;
 
@@ -503,7 +502,7 @@
             }
         }
 
-        private void GetLocateEquipment(Object.EventRecord mNewRec)
+        private void GetLocateEquipment(Object.EOSEventRecord mNewRec)
         {
             var sqlStmt = "SELECT OWNERFSC as FSC,OWNERUFID as UFID,OWNERTPCLID as TPCLID FROM ";
             switch (mNewRec.Fsc)
@@ -524,9 +523,9 @@
             {
                 if (reader.Read())
                 {
-                    mNewRec.LocateEquipment.SetFsc(Convert.ToInt32(reader["FSC"].ToString()));
-                    mNewRec.LocateEquipment.SetUfid(Convert.ToInt32(reader["UFID"].ToString()));
-                    mNewRec.LocateEquipment.SetTpclid(reader["TPCLID"].ToString());
+                    mNewRec.LocateEquipment.Fsc = (Convert.ToInt32(reader["FSC"].ToString()));
+                    mNewRec.LocateEquipment.Ufid = (Convert.ToInt32(reader["UFID"].ToString()));
+                    mNewRec.LocateEquipment.Tpclid = (reader["TPCLID"].ToString());
                 }
             }
             catch (Exception e)

--
Gitblit v0.0.0-SNAPSHOT