From 8f5c8891aba521570fa63c4baf616e3a3c8d9526 Mon Sep 17 00:00:00 2001 From: ulysseskao <ulysseskao@gmail.com> Date: Sun, 01 May 2016 01:12:51 +0800 Subject: [PATCH] update for logger --- CCSTrace/CCS/Object/CCSCodelist.cs | 41 ++++++++++++++++++++++------------------- 1 files changed, 22 insertions(+), 19 deletions(-) diff --git a/CCSTrace/CCS/Object/CCSCodelist.cs b/CCSTrace/CCS/Object/CCSCodelist.cs index 48cd876..5cb3b18 100644 --- a/CCSTrace/CCS/Object/CCSCodelist.cs +++ b/CCSTrace/CCS/Object/CCSCodelist.cs @@ -5,12 +5,16 @@ using System.Data.OracleClient; using System.Linq; using CCSTrace.CCS.Domain; +using CCSTrace.TPower.DMMS.Model.CCS; +using NLog; namespace CCSTrace.CCS.Object { public class CcsCodelist { - private readonly Dictionary<int, Dictionary<int, Codelist>> _mTotalData = new Dictionary<int, Dictionary<int, Codelist>>(); + private static readonly Logger Logger = LogManager.GetCurrentClassLogger(); + + private readonly Dictionary<int, Dictionary<int, CODELIST>> _mTotalData = new Dictionary<int, Dictionary<int, CODELIST>>(); public CcsCodelist(OracleConnection connectionTpc) { @@ -26,12 +30,12 @@ var keyId = Convert.ToInt32(reader["KEYID"].ToString()); var item = (reader["ITEM"].ToString()); var content = (reader["CONTENT"].ToString()); - Codelist codelist = new Codelist(indexId, keyId, item, content); + CODELIST codelist = new CODELIST(indexId, keyId, item, content); if (!_mTotalData.ContainsKey(indexId)) { - _mTotalData.Add(indexId, new Dictionary<int, Codelist>()); + _mTotalData.Add(indexId, new Dictionary<int, CODELIST>()); } - Dictionary<int, Codelist> keys = _mTotalData[indexId]; + Dictionary<int, CODELIST> keys = _mTotalData[indexId]; if (keys.ContainsKey(keyId)) { keys.Add(keyId, codelist); @@ -41,8 +45,7 @@ } catch (Exception e) { - Console.WriteLine("Error on Startup EOSCodelist: " + e.Message); - Console.WriteLine(e.StackTrace); + Logger.Warn(e, "Error on Startup CCSCodelist: " + e.Message); } finally { @@ -51,27 +54,27 @@ } } - public Codelist[] GetAllContent(int mIndexId) + public CODELIST[] GetAllContent(int mIndexId) { return _mTotalData[mIndexId].Values.ToArray(); } public string GetContent(int mIndexId, int mKeyId) { - return _mTotalData[mIndexId][mKeyId].Content; + return _mTotalData[mIndexId][mKeyId].CONTENT; } public string GetContent(int mIndexId, string mItem) { string mResult = ""; - Dictionary<int, Codelist> mTmp = _mTotalData[mIndexId]; + Dictionary<int, CODELIST> mTmp = _mTotalData[mIndexId]; - foreach (KeyValuePair<int, Codelist> pair in mTmp) + foreach (KeyValuePair<int, CODELIST> pair in mTmp) { - if (pair.Value.Item.Equals(mItem)) + if (pair.Value.ITEM.Equals(mItem)) { - mResult = pair.Value.Content; + mResult = pair.Value.CONTENT; break; } } @@ -80,12 +83,12 @@ public int GetKeyId(int mIndexId, string mContent) { - Dictionary<int, Codelist> mTmp = _mTotalData[mIndexId]; + Dictionary<int, CODELIST> mTmp = _mTotalData[mIndexId]; int mResult = 0; - foreach (KeyValuePair<int, Codelist> pair in mTmp) + foreach (KeyValuePair<int, CODELIST> pair in mTmp) { - if (pair.Value.Content.Equals(mContent)) + if (pair.Value.CONTENT.Equals(mContent)) { mResult = pair.Key; break; @@ -96,14 +99,14 @@ public string GetItem(int mIndexId, string mContent) { - Dictionary<int, Codelist> mTmp = _mTotalData[mIndexId]; + Dictionary<int, CODELIST> mTmp = _mTotalData[mIndexId]; string mResult = ""; - foreach (KeyValuePair<int, Codelist> pair in mTmp) + foreach (KeyValuePair<int, CODELIST> pair in mTmp) { - if (pair.Value.Content.Equals(mContent)) + if (pair.Value.CONTENT.Equals(mContent)) { - mResult = pair.Value.Item; + mResult = pair.Value.ITEM; break; } } -- Gitblit v0.0.0-SNAPSHOT