/ - Diff - MARKUS - 일정관리

개정판 2decfbdf

ID	2decfbdfc05f09bb5b2ef1618d265f315f6ba8f0
상위	1e901a8d
하위	dfc86b71

alzkakdixm 이(가) 약 5년 전에 추가함

DataBaseItemsModel 수정

Change-Id: I96830cad0b3990bb84346f438ba04e20d55ec26c

ConvertService/ServiceBase/IServiceBase/ConvertItem.cs
1	1	using System;
2		using System.Collections.Generic;
3	2	using System.ComponentModel;
4		using System.Linq;
5	3	using System.Runtime.Serialization;
6		using System.Text;
7		using System.Threading.Tasks;
8
	4	using System.Linq.Expressions;
	5	using Markus.Message;
9	6	namespace Markus.Service.Interface
10	7	{
11	8	[DataContract]
12		public class ConvertItem : IEquatable<ConvertItem> ,INotifyPropertyChanged
	9	public class ConvertItem :IEquatable<ConvertItem> ,INotifyPropertyChanged
13	10	{
14	11	public bool Equals(ConvertItem other)
15	12	{
...	...
28	25	return (id + project).GetHashCode();
29	26	}
30	27
	28	public ConvertItem()
	29	{
	30
	31	}
31	32
32	33	public ConvertItem(string ProjectNo, string ID)
33	34	{
...	...
74	75	this._FileName = result;
75	76	}
76	77
77		public ConvertItem(string key, string ProjectNo, string ID, string originfilePath, string convertPath,string Status,int currentPageNo,int totalPage,string exception)
	78	public ConvertItem(string key, string ProjectNo, string ID, string originfilePath, string convertPath, StatusCodeType Status,int currentPageNo,int totalPage,string exception)
78	79	{
79	80	this._uniqueKey = key;
80	81	this._projectNumber = ProjectNo;
81	82	this._convertID = ID;
82	83	this._originfilePath = originfilePath;
83	84	this._convertPath = convertPath;
84		this._convertState = Status;
	85	this._convertState = (StatusCodeType)Status;
85	86	this._currentPageNo = currentPageNo;
86	87	this._totalPage = totalPage;
87	88	this._exception = exception;
...	...
98	99	this._FileName = result;
99	100	}
100	101
	102	//public ConvertItem(string key, string ProjectNo, string ID, string originfilePath, string convertPath, string Status, int currentPageNo, int totalPage, string exception
	103	// ,string revision, string documentNo, string documentName, string groupName)
	104	//{//세미
	105	// this._uniqueKey = key;
	106	// this._projectNumber = ProjectNo;
	107	// this._convertID = ID;
	108	// this._originfilePath = originfilePath;
	109	// this._convertPath = convertPath;
	110	// this._convertState = Status;
	111	// this._currentPageNo = currentPageNo;
	112	// this._totalPage = totalPage;
	113	// this._exception = exception;
	114	// this._revision = revision;
	115	// this._documentNo = documentNo;
	116	// this._docuemnt_Name = documentName;
	117	// this._GroupName = groupName;
	118
	119	// string result = "";
	120	// if (originfilePath.Contains("/"))
	121	// {
	122	// result = originfilePath.Substring(originfilePath.LastIndexOf("/") + 1);
	123	// }
	124	// else
	125	// {
	126	// result = originfilePath.Substring(originfilePath.LastIndexOf("%") + 1);
	127	// }
	128	// this._FileName = result;
	129	//}
	130
101	131
102	132	string _uniqueKey;
103	133	string _projectNumber;
...	...
107	137	string _originfilePath;
108	138	string _FileName;
109	139	string _convertPath;
110		string _convertState;
	140	//string _convertState;
	141	StatusCodeType _convertState;
111	142	int _currentPageNo;
112	143	int _totalPage;
113	144	string _exception;
	145	string _revision;//↓ DOCUMENT_ITEM
	146	string _documentNo;
	147	string _docuemnt_Name;
	148	string _GroupName;
	149	string _documentID;
	150	string _validation;
	151
114	152
115	153
116	154	DateTime _createtime;
117	155
118	156	public event PropertyChangedEventHandler PropertyChanged;
	157
119	158	private void OnPropertyChanged(string propertyName)
120	159	{
121	160	if (PropertyChanged != null)
...	...
124	163	}
125	164	}
126	165
127
128	166	[DataMember]
129	167	public string ConvertID
130	168	{
...	...
154	192	if (_serviceID != value)
155	193	{
156	194	_serviceID = value;
157		this.OnPropertyChanged("ServiceID");
	195	OnPropertyChanged("ServiceID");
158	196	}
159	197	}
160	198	}
...	...
171	209	if (_reConverter != value)
172	210	{
173	211	_reConverter = value;
174		this.OnPropertyChanged("ReConverter");
	212	OnPropertyChanged("ReConverter");
175	213	}
176	214	}
177	215	}
...	...
188	226	if (_originfilePath != value)
189	227	{
190	228	_originfilePath = value;
191		this.OnPropertyChanged("OriginfilePath");
	229	OnPropertyChanged("OriginfilePath");
192	230	}
193	231	}
194	232	}
...	...
206	244	if (_FileName != value)
207	245	{
208	246	_FileName = value;
209		this.OnPropertyChanged("FileName");
	247	OnPropertyChanged("FileName");
210	248	}
211	249	}
212	250	}
...	...
224	262	if (_convertPath != value)
225	263	{
226	264	_convertPath = value;
227		this.OnPropertyChanged("ConvertPath");
	265	OnPropertyChanged("ConvertPath");
228	266	}
229	267	}
230	268	}
231	269
232	270	[DataMember]
233		public string ConvertState
	271	public StatusCodeType ConvertState
234	272	{
235	273	get
236	274	{
...	...
241	279	if (_convertState != value)
242	280	{
243	281	_convertState = value;
244		this.OnPropertyChanged("ConvertState");
	282	OnPropertyChanged("ConvertState");
245	283	}
246	284	}
247	285	}
...	...
263	301	}
264	302	}
265	303
266		[DataMember]
	304	[DataMember]
267	305	public int TotalPage
268	306	{
269	307	get
...	...
275	313	if (_totalPage != value)
276	314	{
277	315	_totalPage = value;
278		this.OnPropertyChanged("TotalPage");
	316	OnPropertyChanged("TotalPage");
279	317	}
280	318	}
281	319	}
...	...
292	330	if (_currentPageNo != value)
293	331	{
294	332	_currentPageNo = value;
295		this.OnPropertyChanged("CurrentPageNo");
	333	OnPropertyChanged("CurrentPageNo");
296	334	}
297	335	}
298	336	}
...	...
309	347	if (_createtime != value)
310	348	{
311	349	_createtime = value;
312		this.OnPropertyChanged("CreateTime");
	350	OnPropertyChanged("CreateTime");
313	351	}
314	352	}
315	353	}
...	...
326	364	if (_uniqueKey != value)
327	365	{
328	366	_uniqueKey = value;
329		this.OnPropertyChanged("UniqueKey");
	367	OnPropertyChanged("UniqueKey");
330	368	}
331	369	}
332	370	}
...	...
344	382	if (_exception != value)
345	383	{
346	384	_exception = value;
347		this.OnPropertyChanged("Exception");
	385	OnPropertyChanged("Exception");
	386
348	387	}
349	388	}
350	389	}
351	390
352	391	[DataMember]
353	392	public Int64 ProcessorAffinity { get; set; }
	393
	394	[DataMember]
	395	public string Revision
	396	{
	397	get
	398	{
	399	return _revision;
	400	}
	401	set
	402	{
	403	if (_revision != value)
	404	{
	405	_revision = value;
	406	OnPropertyChanged("REVISION");
	407
	408	}
	409	}
	410	}
	411
	412	[DataMember]
	413	public string DocumnetNo
	414	{
	415	get
	416	{
	417	return _documentNo;
	418	}
	419	set
	420	{
	421	if (_documentNo != value)
	422	{
	423	_documentNo = value;
	424	OnPropertyChanged("DOCUMENT_NO");
	425
	426	}
	427	}
	428	}
	429
	430	[DataMember]
	431	public string DocumnetName
	432	{
	433	get
	434	{
	435	return _docuemnt_Name;
	436	}
	437	set
	438	{
	439	if (_docuemnt_Name != value)
	440	{
	441	_docuemnt_Name = value;
	442	OnPropertyChanged("DOCUMENT_NAME");
	443
	444	}
	445	}
	446	}
	447
	448	[DataMember]
	449	public string GroupNo
	450	{
	451	get
	452	{
	453	return _GroupName;
	454	}
	455	set
	456	{
	457	if (_GroupName != value)
	458	{
	459	_GroupName = value;
	460	OnPropertyChanged("GROUP_NO");
	461
	462	}
	463	}
	464	}
	465
	466
	467	[DataMember]
	468	public string DocumentID
	469	{
	470	get
	471	{
	472	return _documentID;
	473	}
	474	set
	475	{
	476	if (_documentID != value)
	477	{
	478	_documentID = value;
	479	OnPropertyChanged("DocumentID");
	480
	481	}
	482	}
	483	}
	484
	485
	486	[DataMember]
	487	public string Validation
	488	{
	489	get
	490	{
	491	return _validation;
	492	}
	493	set
	494	{
	495	if (_validation != value)
	496	{
	497	_validation = value;
	498	OnPropertyChanged("Validation");
	499
	500	}
	501	}
	502	}
354	503	}
355	504	}

     using System.Collections.Generic;
     using System.IO;
     using System.Linq;
     using static Markus.Service.DataBase.ConvertDatabase;
     using System.Windows;
     using System.Linq.Expressions;
     using Markus.Service.Interface;
     namespace Markus.Service.DataBase
+    {
-...
                     RECONVERTER = 0
                 };
                 entities.CONVERTER_DOC.Add(convert_doc);
                 if (entities.SaveChanges() == 1)
-...
                 return result;
+            }
             //public bool SetDocument_Item(string Revision, string Document_No, string Document_Name, string Group_No)//세미
             //{
             //    bool result = false;
             //    if (Revision.IsNullOrEmpty())
             //    {
             //        throw new Exception("Revision is Null");
             //    }
             //    if (Document_No.IsNullOrEmpty())
             //    {
             //        throw new Exception("Document_No is Null");
             //    }
             //    if (Document_Name.IsNullOrEmpty())
             //    {
             //        throw new Exception("Document_Name is Null");
             //    }
             //    DOCUMENT_ITEM document_item = new DOCUMENT_ITEM
             //    {
             //        REVISION = Revision,
             //        DOCUMENT_NO = Document_No,
             //        DOCUMENT_NAME = Document_Name,
             //        GROUP_NO = Group_No
             //    };
             //    entities.DOCUMENT_ITEM.Add(document_item);
             //    if (entities.SaveChanges() == 1)
             //    {
             //        result = true;
             //    }
             //    return result;
             //}
             /// <summary>
             /// 컨버터서비스를 이용하는 문서 정보 저장
             /// UniqueID
-...
                     if (convertItem.STATUS == (int)StatusCodeType.Completed)
+                    {
                         result = new Interface.ConvertItem(convertItem.DOCUMENT_ID, convertItem.PROJECT_NO, convertItem.ID, convertItem.DOCUMENT_URL, convertPath,
                                                             convertItem.STATUS.ToString(), convertItem.CURRENT_PAGE, convertItem.TOTAL_PAGE, convertItem.EXCEPTION);
                                                             (StatusCodeType)convertItem.STATUS, convertItem.CURRENT_PAGE, convertItem.TOTAL_PAGE, convertItem.EXCEPTION);
+                    }
                     else
+                    {
-...
             /// <param name="convertID">StatusCodeType을 변경하고자 하는 ConvertItem의 ID</param>
             /// <param name="ReConvert">ReConvert가 2이면 다시 Convert를 시도 안하기 때문에 기존 값으로 유지 하고 계속 시도 할수 있도록 0을 주는 경우가 있다.</param>
             /// <returns></returns>
             public int SetCleanUpItem(string convertID,int ReConvert)
             ///
             public int SetCleanUpItem(ConvertItem _ConvertItem)
+            {
                 int result = 0;
                 var items = entities.CONVERTER_DOC.Where(x=> x.ID == convertID);
                 //var items = entities.CONVERTER_DOC.Where(x => x.ID == _ConvertItem.ConvertID && x.DOCUMENT_ID == _ConvertItem.DocumentID);
                 var items = entities.CONVERTER_DOC.Where(x => x.ID == _ConvertItem.ConvertID);
                 result = items.Count();
-...
+                {
                     var item = items.First();
                     item.RECONVERTER = item.RECONVERTER - ReConvert;
                     item.CREATE_DATETIME = DateTime.Now;
                     item.RECONVERTER = item.RECONVERTER - _ConvertItem.ReConverter;
                     item.CREATE_DATETIME = DateTime.Now;//여기서도 변경 되고 디비에서도 변경됨
                     //item.START_DATETIME = null;
                     item.END_DATETIME = null;
                     item.STATUS = (int)StatusCodeType.None;
                     //item.END_DATETIME = null;
                     item.STATUS = (int)StatusCodeType.None; //여기서는 값 변경 되는데 디비에서 변경 안됨 => 0 되었다가 파일수에 따라 점차 늘어나는것
                     result = entities.SaveChanges();
+                }
                 return result;
+            }
             //public int SetCleanUpItem(string convertID,int ReConvert)
             //{
             //    int result = 0;
             //    var items = entities.CONVERTER_DOC.Where(x=> x.ID == convertID);
             //    result = items.Count();
             //    if (items.Count() > 0)
             //    {
             //        var item = items.First();
             //        item.RECONVERTER = item.RECONVERTER - ReConvert;
             //        item.CREATE_DATETIME = DateTime.Now;//여기서도 변경 되고 디비에서도 변경됨
             //        //item.START_DATETIME = null;
             //        //item.END_DATETIME = null;
             //        item.STATUS = (int)StatusCodeType.None; //여기서는 값 변경 되는데 디비에서 변경 안됨 => 0 되었다가 파일수에 따라 점차 늘어나는것
             //        result = entities.SaveChanges();
             //    }
             //    return result;
             //}
             /// <summary>
-...
+                        {
                             ReConverter = item.RECONVERTER,
                             ServiceID = item.SERVICE_ID,
                             ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                             ConvertState = ((StatusCodeType)item.STATUS),
                             CreateTime = item.CREATE_DATETIME,
                             TotalPage = item.TOTAL_PAGE,
                             CurrentPageNo = item.CURRENT_PAGE,
-...
+                        {
                             ReConverter = item.RECONVERTER,
                             ServiceID = item.SERVICE_ID,
                             ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                             //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                             ConvertState = ((StatusCodeType)item.STATUS),
                             CreateTime = item.CREATE_DATETIME,
                             TotalPage = item.TOTAL_PAGE,
                             CurrentPageNo = item.CURRENT_PAGE,
-...
                 return convertItems;
+            }
             public IEnumerable<Interface.ConvertItem> GetConvertProjects(Func<CONVERTER_DOC, bool> @where)
+            {
                 var items = entities.CONVERTER_DOC.Where(@where);
             //List<Interface.ConvertItem> StatusKeep = new List<Interface.ConvertItem>();
                 if (items.Count() > 0)
             public IEnumerable<Interface.ConvertItem> GetConvertProjects(Markus.Service.Interface.ConvertItem selectedConvert)
+            {
                 List<Interface.ConvertItem> StatusKeep = new List<Interface.ConvertItem>();
                 System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();///////////////디비 테스트 후 해보기
                 stopwatch.Start();
                 List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>();//디비 다 조인 후 조건 비교 후 그리드 출력
                 var query = from items in entities.CONVERTER_DOC //세미
                             join documents in entities.DOCUMENT_ITEM on items.DOCUMENT_ID equals documents.DOCUMENT_ID into GroupItems
                             from subpet in GroupItems.DefaultIfEmpty()
                             where items.PROJECT_NO == selectedConvert.ProjectNumber && items.DOCUMENT_ID == selectedConvert.DocumentID
                             orderby items.CREATE_DATETIME descending
                             select new
+                            {
                                 ID = items.ID,
                                 DOCUMENT_URL = items.DOCUMENT_URL,
                                 RECONVERTER = items.RECONVERTER,
                                 SERVICE_ID = items.SERVICE_ID,
                                 STATUS = items.STATUS,
                                 CREATE_DATETIME = items.CREATE_DATETIME,
                                 TOTAL_PAGE = items.TOTAL_PAGE,
                                 CURRENT_PAGE = items.CURRENT_PAGE,
                                 EXCEPTION = items.EXCEPTION,
                                 PROJECT_NO = items.PROJECT_NO,
                                 DOCUMENT_ID = items.DOCUMENT_ID,
                                 REVISION = subpet.REVISION,
                                 DOCUMENT_NO = subpet.DOCUMENT_NO,
                                 DOCUMENT_NAME = subpet.DOCUMENT_NAME,
                                 GROUP_NO = subpet.GROUP_NO
                             };
                 if (query.Count() > 0)//세미
+                {
                     foreach (var item in items)
                     foreach (var item in query)
+                    {
                         yield return new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                         //var convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                         Interface.ConvertItem convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
+                        {
                             ReConverter = item.RECONVERTER,
                             ServiceID = item.SERVICE_ID,
                             //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                             ConvertState = (item.STATUS).ToString(),
                             //ConvertState = (item.STATUS).ToString(),
                             ConvertState = (StatusCodeType)item.STATUS,
                             CreateTime = item.CREATE_DATETIME,
                             TotalPage = item.TOTAL_PAGE,
                             CurrentPageNo = item.CURRENT_PAGE,
                             Exception = item.EXCEPTION,
                             ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID)
                             ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
                             Revision = item.REVISION,
                             DocumnetNo = item.DOCUMENT_NO,
                             DocumnetName = item.DOCUMENT_NAME,
                             GroupNo = item.GROUP_NO
                         };
                         //if (@whereq(convertitem))
                         //{
                             ////convertItems.Add(convertitem);
                             StatusKeep.Add(convertitem);
                        // }
+                    }
+                }
+            }
                 System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks).ToString());
                 //return convertItems;//디비 다 조인 후 조건 비교 후 그리드 출력
                 return StatusKeep;
             public List<Interface.ConvertItem> GetConvertProjects(Func<CONVERTER_DOC, bool> @where, StatusCodeType status)
+            }
             public IEnumerable<Interface.ConvertItem> GetConvertProjects(System.Collections.ObjectModel.ObservableCollection<Interface.ConvertItem> selectedConvert)
+            {
                 List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>();
                 List<Interface.ConvertItem> StatusKeep = new List<Interface.ConvertItem>();
                 //System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();///////////////디비 테스트 후 해보기
                 //stopwatch.Start();
                 List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>();//디비 다 조인 후 조건 비교 후 그리드 출력
                 foreach (var selectedConvertItem in selectedConvert)
+                {
                     var query = from items in entities.CONVERTER_DOC //세미
                                 join documents in entities.DOCUMENT_ITEM on items.DOCUMENT_ID equals documents.DOCUMENT_ID into GroupItems
                                 from subpet in GroupItems.DefaultIfEmpty()
                                 where items.PROJECT_NO == selectedConvertItem.ProjectNumber && items.ID == selectedConvertItem.ConvertID
                                 select new
+                                {
                                     ID = items.ID,
                                     DOCUMENT_URL = items.DOCUMENT_URL,
                                     RECONVERTER = items.RECONVERTER,
                                     SERVICE_ID = items.SERVICE_ID,
                                     STATUS = items.STATUS,
                                     CREATE_DATETIME = items.CREATE_DATETIME,
                                     TOTAL_PAGE = items.TOTAL_PAGE,
                                     CURRENT_PAGE = items.CURRENT_PAGE,
                                     EXCEPTION = items.EXCEPTION,
                                     PROJECT_NO = items.PROJECT_NO,
                                     DOCUMENT_ID = items.DOCUMENT_ID,
                                     REVISION = subpet.REVISION,
                                     DOCUMENT_NO = subpet.DOCUMENT_NO,
                                     DOCUMENT_NAME = subpet.DOCUMENT_NAME,
                                     GROUP_NO = subpet.GROUP_NO
                                 };
                     if (query.Count() > 0)//세미
+                    {
                         foreach (var item in query)
+                        {
                             //var convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                             Interface.ConvertItem convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
+                            {
                 //var items = entities.CONVERTER_DOC.Where(x => x.STATUS == (int)statusCodeType).Take(takeCount).ToList(); //.Where(x => x.PROJECT_NO == gProjectNo);
                 var items = entities.CONVERTER_DOC.Where(x => x.STATUS == (int)status).ToList();
                                 ReConverter = item.RECONVERTER,
                                 ServiceID = item.SERVICE_ID,
                                 //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                                 //ConvertState = (item.STATUS).ToString(),
                                 ConvertState = (StatusCodeType)item.STATUS,
                                 CreateTime = item.CREATE_DATETIME,
                                 TotalPage = item.TOTAL_PAGE,
                                 CurrentPageNo = item.CURRENT_PAGE,
                                 Exception = item.EXCEPTION,
                                 ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
                                 Revision = item.REVISION,
                                 DocumnetNo = item.DOCUMENT_NO,
                                 DocumnetName = item.DOCUMENT_NAME,
                                 GroupNo = item.GROUP_NO
                             };
                             //if (@whereq(convertitem))
                             //{
                             ////convertItems.Add(convertitem);
                             StatusKeep.Add(convertitem);
                             // }
                 if (items.Count() > 0)
+                        }
+                    }
+                }
                     //System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks).ToString());
                     //return convertItems;//디비 다 조인 후 조건 비교 후 그리드 출력
                     return StatusKeep;
+            }
             //public IEnumerable<Interface.ConvertItem> GetConvertProjects(Func<Interface.ConvertItem, bool> @whereq, int status)//조인 후 조건 & 조건and조인
             ////public List<Interface.ConvertItem> GetConvertProjects(Expression<Func<CONVERTER_DOC, bool>> @where) //linq and entity and sql
             ////public IEnumerable<Interface.ConvertItem> GetConvertProjects(Func<CONVERTER_DOC, bool> @where) //원본
             //{
             //    System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();///////////////디비 테스트 후 해보기
             //    stopwatch.Start();
             //    List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>();//디비 다 조인 후 조건 비교 후 그리드 출력
             //    var query = from items in entities.CONVERTER_DOC //세미
             //                join documents in entities.DOCUMENT_ITEM on items.DOCUMENT_ID equals documents.DOCUMENT_ID
             //                where items.PROJECT_NO == documents.PROJECT_NO && items.STATUS == status
             //                orderby items.CREATE_DATETIME descending
             //                select new
             //                {
             //                    ID = items.ID,
             //                    DOCUMENT_URL = items.DOCUMENT_URL,
             //                    RECONVERTER = items.RECONVERTER,
             //                    SERVICE_ID = items.SERVICE_ID,
             //                    STATUS = items.STATUS,
             //                    CREATE_DATETIME = items.CREATE_DATETIME,
             //                    TOTAL_PAGE = items.TOTAL_PAGE,
             //                    CURRENT_PAGE = items.CURRENT_PAGE,
             //                    EXCEPTION = items.EXCEPTION,
             //                    PROJECT_NO = items.PROJECT_NO,
             //                    DOCUMENT_ID = items.DOCUMENT_ID,
             //                    REVISION = documents.REVISION,
             //                    DOCUMENT_NO = documents.DOCUMENT_NO,
             //                    DOCUMENT_NAME = documents.DOCUMENT_NAME,
             //                    GROUP_NO = documents.GROUP_NO
             //                };
             //    if (query.Count() > 0)//세미
             //    {
             //        foreach (var item in query)
             //        {
             //            //var convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
             //            Interface.ConvertItem convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
             //            {
             //                ReConverter = item.RECONVERTER,
             //                ServiceID = item.SERVICE_ID,
             //                //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
             //                ConvertState = (item.STATUS).ToString(),
             //                CreateTime = item.CREATE_DATETIME,
             //                TotalPage = item.TOTAL_PAGE,
             //                CurrentPageNo = item.CURRENT_PAGE,
             //                Exception = item.EXCEPTION,
             //                //ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
             //                Revision = item.REVISION,
             //                DocumnetNo = item.DOCUMENT_NO,
             //                DocumnetName = item.DOCUMENT_NAME,
             //                GroupNo = item.GROUP_NO
             //            };
             //            if (@whereq(convertitem))
             //            {
             //                //convertItems.Add(convertitem);
             //                StatusKeep.Add(convertitem);
             //            }
             //        }
             //    }
             //    System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks).ToString());
             //    //return convertItems;//디비 다 조인 후 조건 비교 후 그리드 출력
             //    return StatusKeep;
             //}
             //public IEnumerable<Interface.ConvertItem> GetConvertProjects(Func<CONVERTER_DOC, bool> @where) //@where는 입력값이 CONVERTER_DOC이고 출력값이 bool //부장님
             //public List<Interface.ConvertItem> GetConvertProjects(Func<CONVERTER_DOC, bool> @where) //@where는 입력값이 CONVERTER_DOC이고 출력값이 bool
             //System.Linq.IQueryable
             public IEnumerable<Interface.ConvertItem> GetConvertProjects(int status)//조인 후 조건 & 조건and조인
             //public List<Interface.ConvertItem> GetConvertProjects(Expression<Func<CONVERTER_DOC, bool>> @where) //linq and entity and sql
             //public IEnumerable<Interface.ConvertItem> GetConvertProjects(Func<CONVERTER_DOC, bool> @where) //원본
+            {
                 // System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();///////////////디비 테스트 후 해보기
                 // stopwatch.Start();
                 // //@ 심벌 ex) string filename = "C:\\Temp\\1.txt"; -> filename = @"C:\Temp\1.txt"; and 여러 문자열 사용 가능
                 ////var items = entities.CONVERTER_DOC.Where(@where);//부장님
                 // List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>();
                 // var query = from items in entities.CONVERTER_DOC //세미
                 //              join documents in entities.DOCUMENT_ITEM on items.DOCUMENT_ID equals documents.DOCUMENT_ID
                 //              //where @where(items)
                 //             select new//new 다음에 클래스 이름 넣으면 안됨
                 //             {
                 //                 ID = items.ID,
                 //                 DOCUMENT_URL = items.DOCUMENT_URL,
                 //                 RECONVERTER = items.RECONVERTER,
                 //                 SERVICE_ID = items.SERVICE_ID,
                 //                 STATUS = items.STATUS,
                 //                 CREATE_DATETIME = items.CREATE_DATETIME,
                 //                 TOTAL_PAGE = items.TOTAL_PAGE,
                 //                 CURRENT_PAGE = items.CURRENT_PAGE,
                 //                 EXCEPTION = items.EXCEPTION,
                 //                 PROJECT_NO = items.PROJECT_NO,
                 //                 DOCUMENT_ID = items.DOCUMENT_ID,
                 //                 REVISION = documents.REVISION,
                 //                 DOCUMENT_NO = documents.DOCUMENT_NO,
                 //                 DOCUMENT_NAME = documents.DOCUMENT_NAME,
                 //                 GROUP_NO = documents.GROUP_NO
                 //             };
                 // if (query.Count() > 0)//ConvertItem에 값들 넣어야 함 그래야 값이 바뀌면 propertychanged로 그리드 실시간 없데이트 가능
                 // {
                 //     foreach (var item in query)
                 //     {
                 //         var convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                 //         {
                 //             ReConverter = item.RECONVERTER,
                 //             ServiceID = item.SERVICE_ID,
                 //             //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                 //             ConvertState = (item.STATUS).ToString(),
                 //             CreateTime = item.CREATE_DATETIME,
                 //             TotalPage = item.TOTAL_PAGE,
                 //             CurrentPageNo = item.CURRENT_PAGE,
                 //             Exception = item.EXCEPTION,
                 //             ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
                 //             Revision = item.REVISION,
                 //             DocumnetNo = item.DOCUMENT_NO,
                 //             DocumnetName = item.DOCUMENT_NAME,
                 //             GroupNo = item.GROUP_NO
                 //         };
                 //         convertItems.Add(convertitem);
                 //     }
                 // }
                 //System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks).ToString());
                 //return convertItems;///////////////디비 테스트 후 해보기
                 //select new Interface.ConvertItem(ConvertDoc.DOCUMENT_ID, ConvertDoc.PROJECT_NO, ConvertDoc.ID, ConvertDoc.DOCUMENT_URL)
                 //{
                 //    ReConverter = ConvertDoc.RECONVERTER,
                 //    ServiceID = ConvertDoc.SERVICE_ID,
                 //    //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                 //    ConvertState = (ConvertDoc.STATUS).ToString(),
                 //    CreateTime = ConvertDoc.CREATE_DATETIME,
                 //    TotalPage = ConvertDoc.TOTAL_PAGE,
                 //    CurrentPageNo = ConvertDoc.CURRENT_PAGE,
                 //    Exception = ConvertDoc.EXCEPTION,
                 //    ConvertPath = GetConvertPath(ConvertDoc.PROJECT_NO, ConvertDoc.DOCUMENT_ID),
                 //    Revision = documents.REVISION,
                 //    DocumnetNo = documents.DOCUMENT_NO,
                 //    DocumnetName = documents.DOCUMENT_NAME,
                 //    GroupNo = documents.GROUP_NO
                 //};
                 //System.Diagnostics.Stopwatch stopwatch = new System.Diagnostics.Stopwatch();///////////////디비 테스트 후 해보기
                 //stopwatch.Start();
                 List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>();//디비 다 조인 후 조건 비교 후 그리드 출력
                 var query = from items in entities.CONVERTER_DOC //세미
                             join documents in entities.DOCUMENT_ITEM on items.DOCUMENT_ID equals documents.DOCUMENT_ID into GroupItems
                             from subpet in GroupItems.DefaultIfEmpty()
                             where items.STATUS == status
                             orderby items.CREATE_DATETIME descending
                             select new
+                            {
                                 ID = items.ID,
                                 DOCUMENT_URL = items.DOCUMENT_URL,
                                 RECONVERTER = items.RECONVERTER,
                                 SERVICE_ID = items.SERVICE_ID,
                                 STATUS = items.STATUS,
                                 CREATE_DATETIME = items.CREATE_DATETIME,
                                 TOTAL_PAGE = items.TOTAL_PAGE,
                                 CURRENT_PAGE = items.CURRENT_PAGE,
                                 EXCEPTION = items.EXCEPTION,
                                 PROJECT_NO = items.PROJECT_NO,
                                 DOCUMENT_ID = items.DOCUMENT_ID,
                                 REVISION = subpet.REVISION,
                                 DOCUMENT_NO = subpet.DOCUMENT_NO,
                                 DOCUMENT_NAME = subpet.DOCUMENT_NAME,
                                 GROUP_NO = subpet.GROUP_NO
                                 //REVISION = documents.REVISION,
                                 //DOCUMENT_NO = documents.DOCUMENT_NO,
                                 //DOCUMENT_NAME = documents.DOCUMENT_NAME,
                                 //GROUP_NO = documents.GROUP_NO
                             };
                 if (query.Count() > 0)//세미
+                {
                     foreach (var item in items)
                     foreach (var item in query)
+                    {
                         var convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                         //var convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                         Interface.ConvertItem convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
+                        {
                             ReConverter = item.RECONVERTER,
                             ServiceID = item.SERVICE_ID,
                             //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                             ConvertState = (item.STATUS).ToString(),
                             //ConvertState = (item.STATUS).ToString(),
                             ConvertState = (StatusCodeType)item.STATUS,
                             CreateTime = item.CREATE_DATETIME,
                             TotalPage = item.TOTAL_PAGE,
                             CurrentPageNo = item.CURRENT_PAGE,
                             Exception = item.EXCEPTION,
                             ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID)
                         };
                             //ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
                             Revision = item.REVISION,
                             DocumnetNo = item.DOCUMENT_NO,
                             DocumnetName = item.DOCUMENT_NAME,
                             GroupNo = item.GROUP_NO,
                             DocumentID = item.DOCUMENT_ID
                         };
                             convertItems.Add(convertitem);
+                    }
+                }
                 //System.Diagnostics.Debug.WriteLine(new TimeSpan(stopwatch.ElapsedTicks).ToString());
                 return convertItems;//디비 다 조인 후 조건 비교 후 그리드 출력
                                     //if (Wheredel(convertitem) == false)
                         //if (@where(convertitem) == false)
                         //{
                         //    break;
                         //}
                         //if (@where(convertitem))
                         //{
                         //    convertItems.Add(convertitem);
                         //}
                         //yield return new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                         //{
                         //    ReConverter = item.RECONVERTER,
                         //    ServiceID = item.SERVICE_ID,
                         //    //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                         //    ConvertState = (item.STATUS).ToString(),
                         //    CreateTime = item.CREATE_DATETIME,
                         //    TotalPage = item.TOTAL_PAGE,
                         //    CurrentPageNo = item.CURRENT_PAGE,
                         //    Exception = item.EXCEPTION,
                         //    ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
                         //    Revision = item.REVISION,
                         //    DocumnetNo = item.DOCUMENT_NO,
                         //    DocumnetName = item.DOCUMENT_NAME,
                         //    GroupNo = item.GROUP_NO
                         //};
                 //var query = entities.CONVERTER_DOC.Where(@where);//이렇게 해서 두 테이블 조인하는  프로시저 만들어라
                 //if (query.Count() > 0)
                 //{
                 //    foreach (var item in query)
                 //    {
                 //        //var docitem = entities.DOCUMENT_ITEM.Where(x => x.DOCUMENT_ID == item.DOCUMENT_ID);
                 //        if (@where(item))
                 //        {
                 //            //string rev = "";
                 //            //string docNo = "";
                 //            //string docName = "";
                 //            //string grpNo = "";
                 //            //if (item.Count() > 0)
                 //            //{
                 //            //    rev = docitem.First().REVISION;
                 //            //    docNo = docitem.First().DOCUMENT_NO;
                 //            //    docName = docitem.First().DOCUMENT_NAME;
                 //            //    grpNo = docitem.First().GROUP_NO;
                 //            //}
                 //            yield return new Interface.ConvertItem(item.DOCUMENT_ID, item.projectNo, item.ID, item.DOCUMENT_URL)
                 //            {
                 //                ReConverter = item.RECONVERTER,
                 //                ServiceID = item.SERVICE_ID,
                 //                //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                 //                CreateTime = item.CREATE_DATETIME,
                 //                TotalPage = item.TOTAL_PAGE,
                 //                CurrentPageNo = item.CURRENT_PAGE,
                 //                Exception = item.EXCEPTION,
                 //                ConvertPath = GetConvertPath(item.projectNo, item.DOCUMENT_ID),
                 //                Revision = item.REVISION,
                 //                DocumnetNo = item.DOCUMENT_NO,
                 //                DocumnetName = item.DOCUMENT_NAME,
                 //                GroupNo = item.GROUP_NO
                 //            };
                 //        }
                 //    }
                 //}//프로시저
                 //var items = entities.CONVERTER_DOC.Where(@where);//부장님원본
                 //if (items.Count() > 0)//원본
                 //{
                 //    foreach (var item in items)
                 //    {
                 //        yield return new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                 //        {
                 //            ReConverter = item.RECONVERTER,
                 //            ServiceID = item.SERVICE_ID,
                 //            //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                 //            ConvertState = (item.STATUS).ToString(),
                 //            CreateTime = item.CREATE_DATETIME,
                 //            TotalPage = item.TOTAL_PAGE,
                 //            CurrentPageNo = item.CURRENT_PAGE,
                 //            Exception = item.EXCEPTION,
                 //            ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID)
                 //        };
                 //    }
                 //}//원본
                 //LINQKit 하다 말음
                 //List<Interface.ConvertItem> convertItems = new List<Interface.ConvertItem>();
                 //var query =
                 //    from items in entities.CONVERTER_DOC //세미
                 //    join documents in entities.DOCUMENT_ITEM on items.DOCUMENT_ID equals documents.DOCUMENT_ID
                 //    select new//new 다음에 클래스 이름 넣으면 안됨
                 //            {
                 //                ID = items.ID,
                 //                DOCUMENT_URL = items.DOCUMENT_URL,
                 //                RECONVERTER = items.RECONVERTER,
                 //                SERVICE_ID = items.SERVICE_ID,
                 //                STATUS = items.STATUS,
                 //                CREATE_DATETIME = items.CREATE_DATETIME,
                 //                TOTAL_PAGE = items.TOTAL_PAGE,
                 //                CURRENT_PAGE = items.CURRENT_PAGE,
                 //                EXCEPTION = items.EXCEPTION,
                 //                PROJECT_NO = items.PROJECT_NO,
                 //                DOCUMENT_ID = items.DOCUMENT_ID,
                 //                REVISION = documents.REVISION,
                 //                DOCUMENT_NO = documents.DOCUMENT_NO,
                 //                DOCUMENT_NAME = documents.DOCUMENT_NAME,
                 //                GROUP_NO = documents.GROUP_NO
                 //            };
                 //if (query.Count() > 0)//ConvertItem에 값들 넣어야 함 그래야 값이 바뀌면 propertychanged로 그리드 실시간 없데이트 가능
                 //{
                 //    foreach (var item in query)
                 //    {
                 //        var convertitem = new Interface.ConvertItem(item.DOCUMENT_ID, item.PROJECT_NO, item.ID, item.DOCUMENT_URL)
                 //        {
                 //            ReConverter = item.RECONVERTER,
                 //            ServiceID = item.SERVICE_ID,
                 //            //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                 //            ConvertState = (item.STATUS).ToString(),
                 //            CreateTime = item.CREATE_DATETIME,
                 //            TotalPage = item.TOTAL_PAGE,
                 //            CurrentPageNo = item.CURRENT_PAGE,
                 //            Exception = item.EXCEPTION,
                 //            ConvertPath = GetConvertPath(item.PROJECT_NO, item.DOCUMENT_ID),
                 //            Revision = item.REVISION,
                 //            DocumnetNo = item.DOCUMENT_NO,
                 //            DocumnetName = item.DOCUMENT_NAME,
                 //            GroupNo = item.GROUP_NO
                 //        };
                 //        convertItems.Add(convertitem);
                 //    }
                 //}
                 //return convertItems;
                 //LINQKit
                 return convertItems;
+            }
             public List<Interface.ConvertItem> GetConvertProjectsStatus(Func<CONVERTER_DOC, bool> @where)
-...
                             ReConverter = item.RECONVERTER,
                             ServiceID = item.SERVICE_ID,
                             //ConvertState = ((StatusCodeType)item.STATUS).ToString(),
                             ConvertState = (item.STATUS).ToString(),
                             //ConvertState = (item.STATUS).ToString(),
                             ConvertState = (StatusCodeType)item.STATUS,
                             CreateTime = item.CREATE_DATETIME,
                             TotalPage = item.TOTAL_PAGE,
                             CurrentPageNo = item.CURRENT_PAGE,

           <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
         </Reference>
         <Reference Include="Markus.EntityModel, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
           <HintPath>..\packages\MarkusDatabase.1.7.2\lib\net45\Markus.EntityModel.dll</HintPath>
           <HintPath>..\packages\MarkusDatabase.1.8.0\lib\net45\Markus.EntityModel.dll</HintPath>
         </Reference>
         <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
           <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>

ConvertService/ServiceBase/Markus.Service.DataBase/packages.config
3	3	<package id="EntityFramework" version="6.2.0" targetFramework="net45" />
4	4	<package id="EntityFramework.ko" version="6.2.0" targetFramework="net45" />
5	5	<package id="Markus.Message" version="1.5.4" targetFramework="net45" />
6		<package id="MarkusDatabase" version="1.7.2" targetFramework="net45" />
	6	<package id="MarkusDatabase" version="1.8.0" targetFramework="net45" developmentDependency="true" />
7	7	</packages>

ConvertService/ServiceBase/Markus.Service.Extensions/Exntensions/CollectionExtenstions.cs
168	168	foreach (var item in enumerable)
169	169	{
170	170	if (where(item))//UpdateWhere에서 맨마지막 조건
171		{
172		update(item);
173		}
	171	{//그리드 collection 돌면서 where절 조건 만족하면 update
	172	update(item);//그리드 status와 디비 status 같으면 업데이트
	173	}//업데이트 함수
174	174	}
175	175	return enumerable;
176	176	}

     #MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow==
     # remote test MARKUS_V3
     MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5pT5Vi9KdIFiJ/icpeXrUfa2LTnWdibJ7Oz+4QcYCftqVNPaS3nbiAo67l93XLRVqCpyt4tTSgwhRhdJob48gZhx+zmvoKmAwBR/ofCam3SNjx85gHFWc+gFffVOACIGbvM940SGroUFzK85kDd7Xlg==
     #MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5pT5Vi9KdIFiJ/icpeXrUfa2LTnWdibJ7Oz+4QcYCftqVNPaS3nbiAo67l93XLRVqCpyt4tTSgwhRhdJob48gZhx+zmvoKmAwBR/ofCam3SNjx85gHFWc+gFffVOACIGbvM940SGroUFzK85kDd7Xlg==
     #효성 복사본
     MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5/7jdSUr5EUZM30ywChLhQpD7JcUP0OmFolKm/ESAXOyQExjIscSgqZRobsvvTqCJXTB9cMiVyw40ez2n/sz6jEVUlTnXcrgyES00Kne7l1/Vxq1xlZB35sr7iyMcMkAFI6eGTZyU34DfS3t1LQu55A==
     DownloadTempFolder = C:\CONVERT_SERVICE_TEMP
     MULTI_TRHEAD_MAX_PAGE = 150

ConvertService/ServiceBase/Markus.Service.StationController/App.config
4	4	<!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
5	5	<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
6	6	</configSections>
	7	<connectionStrings />
7	8	<startup>
8	9	<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
9	10	</startup>

ConvertService/ServiceBase/Markus.Service.StationController/Controls/RowIndexColumn.cs
36	36	{
37	37	if (e.Action == System.Collections.Specialized.NotifyCollectionChangedAction.Remove)
38	38	{
39		this.Refresh();
	39	this.Dispatcher.InvokeAsync(() => this.Refresh());
	40	//이거 때믄에 row 개수 옮길때 ex)200개 -> 50개 할때 에러 하지만 이게 있어야 row컨버터 후 삭제 및 다시add 할때 index번호가 들어감
	41	//후 조취: 그냥 에러부분을 messagebox가 아닌 오류 목록에 놨음
40	42	}
41	43	};
42	44	}

ConvertService/ServiceBase/Markus.Service.StationController/Extensions/ConvertItemChangeValue.cs
23	23	{
24	24	if (item.GetValue(changeitem) != newinfo.First().GetValue(newitem))
25	25	{
26		item.SetValue(changeitem, newinfo.First().GetValue(newitem));
	26	item.SetValue(changeitem, newinfo.First().GetValue(newitem));//오브젝트, 객체
27	27	}
28	28	}
29	29	}

         <Reference Include="GemBox.Spreadsheet, Version=39.3.30.1215, Culture=neutral, PublicKeyToken=b1b72c69714d4847, processorArchitecture=MSIL">
           <HintPath>..\packages\GemBox.Spreadsheet.39.3.30.1215\lib\net30\GemBox.Spreadsheet.dll</HintPath>
         </Reference>
         <Reference Include="LinqKit, Version=1.1.17.0, Culture=neutral, PublicKeyToken=bc217f8844052a91, processorArchitecture=MSIL">
           <HintPath>..\packages\LinqKit.1.1.17\lib\net45\LinqKit.dll</HintPath>
         </Reference>
         <Reference Include="Markus.EntityModel, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
           <HintPath>..\packages\MarkusDatabase.1.7.2\lib\net45\Markus.EntityModel.dll</HintPath>
           <HintPath>..\packages\MarkusDatabase.1.8.0\lib\net45\Markus.EntityModel.dll</HintPath>
         </Reference>
         <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
           <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
-...
         <Compile Include="Extensions\ConvertItemChangeValue.cs" />
         <Compile Include="Extensions\GetStatusTypeEnums.cs" />
         <Compile Include="Extensions\VisualTreeHelper.cs" />
         <Compile Include="ViewModel\DataBaseByStatusViewModel.cs" />
         <Compile Include="ViewModel\AliveViewModel.cs" />
         <Compile Include="ViewModel\DataBaseByStatusViewModel.cs" />
         <Compile Include="ViewModel\DataBaseItemsModel.cs" />
         <Compile Include="ViewModel\MergeDataViewModel.cs" />
         <Compile Include="ViewModel\MainViewModel.cs" />

     <?xml version='1.0' encoding='utf-8'?>
     <SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
       <Profiles>
         <Profile Name="(Default)" />
       </Profiles>
     <SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)">
       <Profiles />
       <Settings />
     </SettingsFile>

     #MarkusDataBaseConnectionString = yRW0I8OJY/boJcR9rTFeH229g456BwO8BaXQbW8h6iCR10JRc5tOl2BDWa1595q0bvW9uD5HsHn9ke4oK3yaw2OYHh8pgYKdhW48xeAl49510h1DPv8uSbqcWdwZ2AjernORxxaEAUqHZb5DFlndcWuid82ZwP/EGxGNhaaCG+KVogeHwI5FZZKrmUTWe3159qk11Q4XswrHeLy8HQn5Qg==
     # remote test MARKUS_V3
     #효성 복사본
     MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
     # remote test MARKUS_V3
     #MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==

ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/AliveViewModel.cs
12	12
13	13	namespace Markus.Service.StationController.ViewModel
14	14	{
15		public class AliveViewModel :Mvvm.ToolKit.ViewModelBase
	15	public class AliveViewModel : Mvvm.ToolKit.ViewModelBase
16	16	{
17	17	BackgroundWorker backgroundWorker;
18	18
...	...
47	47	get => connectionLog;
48	48	set
49	49	{
50		if(connectionLog != value)
	50	if (connectionLog != value)
51	51	{
52	52	connectionLog = value;
53	53	OnPropertyChanged(() => ConnectionLog);
...	...
74	74	{
75	75	while (IsAcitve)
76	76	{
77		System.Threading.Thread.Sleep(new TimeSpan(0,0,3));
78	77
79	78	if (!IsLoading)
80	79	{
...	...
124	123	}
125	124	}
126	125
127
	126
128	127
129	128	private void ItemsUpdate(List<ConvertItem> newitems)
130	129	{
...	...
181	180	}
182	181	}
183	182
184		private void LogWrite(string log,bool IsError)
	183	private void LogWrite(string log, bool IsError)
185	184	{
186		if(IsError)
	185	if (IsError)
187	186	{
188	187	System.Diagnostics.Trace.Fail(log);
189	188	}
...	...
202	201	{
203	202	using (System.Net.Http.HttpClient Client = new System.Net.Http.HttpClient())
204	203	{
205		Client.Timeout = new TimeSpan(0, 0,60);
206
	204	Client.Timeout = new TimeSpan(0, 0, 60);
	205
207	206	var message = await Client.GetAsync(uri);
208	207
209	208	System.Net.HttpStatusCode StatusCode = message.StatusCode;

ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseByStatusViewModel.cs
63	63	}
64	64	}
65	65
66
	66
67	67
68	68	public DataBaseByStatusViewModel()
69	69	{
...	...
144	144	System.Diagnostics.Debug.WriteLine(ex.ToString());
145	145	}
146	146	}
147
	147
148	148	}
149	149
150	150	public override void Loaded()

     using Markus.Message;
     using Markus.Service.DataBase;
     using Markus.Service.Extensions;
     //using Markus.Service.Interface;
     using Markus.Service.StationController;
     using Markus.Service.StationController.Behaviors;
     using Markus.Service.StationController.Extensions;
     using Microsoft.Win32;
     using System;
     using System.Collections.Generic;
     using System.Collections.ObjectModel;
     using System.ComponentModel;
     using System.Diagnostics;
     using System.Linq;
     using System.Threading.Tasks;
     using System.Web;
     using System.Windows;
     using Telerik.Windows.Controls;
     using Telerik.Windows.Data;
     using ConvertItem = Markus.Service.Interface.ConvertItem;
     //using AliveConvertItem = Markus.Service.WcfClient.StationServiceTask.ConvertItem;
     using Markus.Service.WcfClient.StationServiceTask;
     using System.Text;
     using Markus.Service.Helper;
     namespace Markus.Service.StationController.ViewModel
+    {
         //세미
         public class DataBaseItemsModel : Mvvm.ToolKit.ViewModelBase
         public class DataBaseItemsModel : Mvvm.ToolKit.ViewModelBase, INotifyPropertyChanged
+        {
             //alive
             private BackgroundWorker AlivebackgroundWorker;
             private bool isLoading;
             private System.Windows.Documents.FlowDocument connectionLog;
             private System.Collections.ObjectModel.ObservableCollection<ConvertItem> _AliveItems;
             public System.Collections.ObjectModel.ObservableCollection<ConvertItem> AliveItems
+            {
                 get => _AliveItems; set
+                {
                   _AliveItems = value;
                     OnPropertyChanged(() => AliveItems);
+                }
+            }
             public bool AliveIsLoading
+            {
                 get => isLoading; set
+                {
                     if (isLoading != value)
+                    {
                         isLoading = value;
                         OnPropertyChanged(() => AliveIsLoading);
+                    }
+                }
+            }
             public System.Windows.Documents.FlowDocument ConnectionLog
+            {
                 get => connectionLog;
                 set
+                {
                     if (connectionLog != value)
+                    {
                         connectionLog = value;
                         OnPropertyChanged(() => ConnectionLog);
+                    }
+                }
+            }
             //public AliveViewModel()
             //{
             //}
             //// 진행률에 변화가 있을때 이벤트가 발생
             //private void backgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
             //{
             //}
             //// 일이 모두 마쳤을때 수행되어야할 코드
             //private void backgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
             //{
             //}
             // BackgroundWorker에서 수행할 일을 정의.
             private void AlivebackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e)
+            {
+            }
             private void AlivebackgroundWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
+            {
+            }
             private async void AlivebackgroundWorker_DoWork(object sender, DoWorkEventArgs e)
+            {
                 while (IsAcitve)
+                {
                     //System.Threading.Thread.Sleep(new TimeSpan(0, 0, 3));
                     if (!IsLoading)
+                    {
                         IsLoading = true;
                         try
+                        {
                             List<ConvertItem> newitems = new List<ConvertItem>();
                             foreach (var client in App.StationClientList)
+                            {
                                 if (await SimplePingAsync(client.Endpoint.Address.ToString()))
+                                {
                                     try
+                                    {
                                         List<ConvertItem> itemsToList = new List<ConvertItem>();
                                         var items = await client.AliveConvertListAsync();
                                         //int i = 0;
                                         foreach (var item in items)
+                                        {
                                             ConvertItem itemsToEach = new ConvertItem();
                                             itemsToEach.ServiceID = item.ServiceID;
                                             itemsToEach.ConvertID = item.ConvertID;
                                             itemsToEach.ProjectNumber = item.ProjectNumber;
                                             //itemsToEach.ConvertState = (StatusCodeType.)item.ConvertState;// (StatusCodeType) item.ConvertState;
                                             itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState);
                                             itemsToEach.CurrentPageNo = item.CurrentPageNo;
                                             itemsToEach.TotalPage = item.TotalPage;
                                             itemsToEach.OriginfilePath = item.OriginfilePath;
                                             itemsToEach.ConvertPath = item.ConvertPath;
                                             itemsToList.Add(itemsToEach);
                                             //i++;
+                                        }
                                         newitems.AddRange(itemsToList);
                                         //System.Diagnostics.Trace.WriteLine($"{client.Endpoint.Address} ping");
                                         if (items.Count() == 0)
+                                        {
                                             //System.Diagnostics.Trace.WriteLine($"{client.Endpoint.Address} Alive Items is zero.");
+                                        }
+                                    }
                                     catch (Exception ex)
+                                    {
                                         //System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} {ex.Message}");
+                                    }
+                                }
                                 else
+                                {
                                     //System.Diagnostics.Trace.Fail($"{client.Endpoint.Address} ping Error");
+                                }
+                            }
                            // ItemsUpdate(newitems);
                             await System.Windows.Application.Current.Dispatcher.InvokeAsync(() => ItemsUpdate(newitems));
+                        }
                         catch (Exception ex)
+                        {
                             System.Diagnostics.Debug.WriteLine(ex.ToString());
+                        }
                         IsLoading = false;
+                    }
+                }
+            }
             private async void AliveDataSelect()
+            {
                 try
+                {
                     List<ConvertItem> newitems = new List<ConvertItem>();
                     foreach (var client in App.StationClientList)
+                    {
                         if (await SimplePingAsync(client.Endpoint.Address.ToString()))
+                        {
                             try
+                            {
                                 List<ConvertItem> itemsToList = new List<ConvertItem>();
                                 var items = await client.AliveConvertListAsync();
                                 //int i = 0;
                                 foreach (var item in items)
+                                {
                                     ConvertItem itemsToEach = new ConvertItem();
                                     itemsToEach.ServiceID = item.ServiceID;
                                     itemsToEach.ConvertID = item.ConvertID;
                                     itemsToEach.ProjectNumber = item.ProjectNumber;
                                     //itemsToEach.ConvertState = (StatusCodeType.)item.ConvertState;// (StatusCodeType) item.ConvertState;
                                     try
+                                    {
                                         itemsToEach.ConvertState = (StatusCodeType)Enum.Parse(typeof(StatusCodeType), item.ConvertState);
+                                    }
                                     catch (Exception ex)
+                                    {
                                         throw ex;

... 이 차이점은 표시할 수 있는 최대 줄수를 초과해서 이 차이점은 잘렸습니다.

내보내기 Unified diff

프로젝트

일반

사용자정보

MARKUS

개정판 2decfbdf