refactor code

ulysseskao

2016-05-03 bd2c873a725ed9b9909f04b66378be83665d9032

refactor code

 CCSTrace/CCS/Object/AddrContrast.cs

File was renamed from CCSTrace/CCS/Object/Addr_Contrast.cs
@@ -16,19 +16,19 @@


        public static AddrContrast Instance { get; } = new AddrContrast();



        private Dictionary<string, List<ADDRCONTRAST>> totalAddrData = null;

        private Dictionary<string, List<ADDRCONTRAST>> _totalAddrData = null;


        private AddrContrast()

        {

        }



        public void initialize(OracleConnection conn)

        public void Initialize(OracleConnection conn)
        {



            if (totalAddrData != null)

            if (_totalAddrData != null)
                return;



            totalAddrData = new Dictionary<string, List<ADDRCONTRAST>>();

            _totalAddrData = new Dictionary<string, List<ADDRCONTRAST>>();


            var sqlStmt = "SELECT DEPTID,CITY,TOWN,ROAD FROM CCS.ADDR_CONTRAST ORDER BY CITY,TOWN,ROAD";



@@ -60,17 +60,17 @@
                    }

                    else

                    {

                        totalAddrData.Add(tmp, addrcontrasts);

                        _totalAddrData.Add(tmp, addrcontrasts);
                        tmp = item.CITY;

                        addrcontrasts = new List<ADDRCONTRAST> { item };

                    }

                }

                totalAddrData.Add(tmp, addrcontrasts);

                _totalAddrData.Add(tmp, addrcontrasts);
            }

            catch (Exception e)

            {

                Logger.Warn(e, e.Message);

                totalAddrData = null;

                _totalAddrData = null;
            }

            finally

            {

@@ -81,7 +81,7 @@


        public int FindDeptId(string city, string region, string road)

        {

            var addrcontrasts = totalAddrData[city];

            var addrcontrasts = _totalAddrData[city];


            try

            {