프로젝트

일반

사용자정보

개정판 1ae729e4

ID1ae729e493a9e9a23d51cbaabb29993365c56ce6
상위 60723dc9
하위 a34f58f6

김태성이(가) 5년 이상 전에 추가함

contoller Richtextbox 추가
서비스 안정화

Change-Id: I1a18f9d1f9b0aaed92d4e22df779b46c4e8958e0

차이점 보기:

ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationTask.cs
127 127
        /// </summary>
128 128
        public void setDataBaseWaitingList()
129 129
        {
130
            List<EntityModel.CONVERTER_DOC> convertItems = new List<EntityModel.CONVERTER_DOC>();
131

  
130 132
            using (DataBase.ConvertDatabase database = new DataBase.ConvertDatabase(MarkusDBConnectionString))
131 133
            {
132
                var convertItems = database.GetWaitConvertItems(this.RunProjectList, StationServiceList.Where(x=>x.IsOnline).Sum(f=>f.Properties.PROCESS_COUNT));
134
                convertItems = database.GetWaitConvertItems(this.RunProjectList, StationServiceList.Where(x=>x.IsOnline).Sum(f=>f.Properties.PROCESS_COUNT)).ToList();
135
            }
133 136

  
134
                foreach (var convert in convertItems)
135
                {
136
                    //ReflashSubService();
137
            foreach (var convert in convertItems)
138
            {
139
                //ReflashSubService();
137 140

  
138
                    if (convert.STATUS > (int)StatusCodeType.None)
141
                if (convert.STATUS > (int)StatusCodeType.None)
142
                {
143
                    using (DataBase.ConvertDatabase database = new DataBase.ConvertDatabase(MarkusDBConnectionString))
139 144
                    {
140
                        database.SetCleanUpItem(convert.ID);
145
                        database.SetCleanUpItem(convert.ID,1);
141 146
                    }
142

  
143
                    PassConvertItem(convert.PROJECT_NO, convert.ID,convert.DOCUMENT_ID);
144 147
                }
148

  
149
                PassConvertItem(convert.PROJECT_NO, convert.ID,convert.DOCUMENT_ID);
145 150
            }
151
          
146 152
        }
147 153

  
148 154
        public bool IsDataBaseWaitingList(int overListCount)
......
175 181
            {
176 182
                try
177 183
                {
178
                    subservice.IsOnline = SytemNet.Ping(subservice.Properties.SERVICE_ADDRESS);
184
                    subservice.IsOnline = await SytemNet.PingAsync(subservice.Properties.SERVICE_ADDRESS);
179 185

  
180 186
                    if (subservice.IsOnline)
181 187
                    {
......
268 274

  
269 275
                    try
270 276
                    {
271
                        for (int i = convertItems.Count - 1; i >= 0; --i)
277
                        if (convertItems.Count() > 0)
272 278
                        {
273
                            if (argumentList.Count(x => x == convertItems[i].ConvertID) == 0)
279
                            for (int i = convertItems.Count - 1; i >= 0; --i)
274 280
                            {
275
                                AliveConvertQueue.RemoveAt(i);
281
                                if (argumentList.Count(x => x == convertItems[i].ConvertID) == 0)
282
                                {
283
                                    AliveConvertQueue.RemoveAt(i);
284
                                }
276 285
                            }
277 286
                        }
278 287
                    }
......
307 316
                    {
308 317
                        if (aliveItems.Count(x => x.ConvertID == item.ID) == 0)
309 318
                        {
310
                            database.SetCleanUpItem(item.ID);
319
                            database.SetCleanUpItem(item.ID,0);
311 320
                        }
312 321
                    }
313 322
                }
......
379 388

  
380 389
                if (IsStation)
381 390
                {
382
                    if (!IsReleaseItems)
383
                    {
384
                        System.Diagnostics.Debug.WriteLine("ConvertFinish ReleaseItems call");
385
                        ReleaseItems();
386
                    }
391
                    //if (!IsReleaseItems)
392
                    //{
393
                    //    System.Diagnostics.Debug.WriteLine("ConvertFinish ReleaseItems call");
394
                    //    ReleaseItems();
395
                    //}
387 396
                }
388 397
                else
389 398
                {

내보내기 Unified diff

클립보드 이미지 추가 (최대 크기: 500 MB)