개정판 06f13e11
한글 파일명 다운로드 에러 수정
멀티 서비스 수정
Change-Id: I1a7eb48f1c758d32c805eb0394c66b92f9d27330
| ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationWCF.cs | ||
|---|---|---|
| 34 | 34 |
|
| 35 | 35 |
try |
| 36 | 36 |
{
|
| 37 |
result = ConvertProcessAdd(ProjectNo,ConvertID); |
|
| 37 |
result = ConvertProcessAdd(ProjectNo, ConvertID);
|
|
| 38 | 38 |
|
| 39 | 39 |
logger.Info($"ConvertAdd Call Item ProjectNo : {ProjectNo} ConvertID : {ConvertID} result : {result}");
|
| 40 | 40 |
} |
| ... | ... | |
| 57 | 57 |
public string ConvertMenualAdd(string ProjectNo, string originfilePath, string DocumentID) |
| 58 | 58 |
{
|
| 59 | 59 |
string result = false.ToString(); |
| 60 |
string convertID = new Guid().CreateUniqueGuid().ToString().Replace("-","");
|
|
| 60 |
string convertID = new Guid().CreateUniqueGuid().ToString().Replace("-", "");
|
|
| 61 | 61 |
|
| 62 | 62 |
try |
| 63 | 63 |
{
|
| ... | ... | |
| 69 | 69 |
} |
| 70 | 70 |
else |
| 71 | 71 |
{
|
| 72 |
result = ConvertProcessAdd(ProjectNo,convertID); |
|
| 72 |
result = ConvertProcessAdd(ProjectNo, convertID);
|
|
| 73 | 73 |
} |
| 74 | 74 |
} |
| 75 | 75 |
} |
| ... | ... | |
| 78 | 78 |
result = "DataBase SetConvert Error"; |
| 79 | 79 |
logger.Error($"ConvertMenualAdd Error- database.SetConvertDoc ProjectNo:{ProjectNo} UniqueID:{convertID} originfilePath:{originfilePath} DocumentID:{DocumentID}", ex);
|
| 80 | 80 |
} |
| 81 |
|
|
| 81 |
|
|
| 82 | 82 |
return result; |
| 83 | 83 |
} |
| 84 | 84 |
|
| ... | ... | |
| 135 | 135 |
|
| 136 | 136 |
using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(MarkusDBConnectionString)) |
| 137 | 137 |
{
|
| 138 |
var convertItem = database.GetConvertItem(ProjectNo,convertID); |
|
| 138 |
var convertItem = database.GetConvertItem(ProjectNo, convertID);
|
|
| 139 | 139 |
|
| 140 | 140 |
/// 순서별 Convert Item 처리 |
| 141 | 141 |
if (convertItem != null) |
| ... | ... | |
| 186 | 186 |
/// <param name="TotalPage"></param> |
| 187 | 187 |
/// <param name="Error"></param> |
| 188 | 188 |
/// <returns></returns> |
| 189 |
public bool ConvertProcessState(string ConvertID, int status, int CurrentPage, int TotalPage,string Error) |
|
| 189 |
public bool ConvertProcessState(string ConvertID, int status, int CurrentPage, int TotalPage, string Error)
|
|
| 190 | 190 |
{
|
| 191 |
var items =AliveConvertQueue.Where(x => x.ConvertID == ConvertID); |
|
| 192 |
|
|
| 193 |
if(items.Count() > 0) |
|
| 191 |
var items = AliveConvertQueue.Where(x => x.ConvertID == ConvertID);
|
|
| 192 |
|
|
| 193 |
if (items.Count() > 0)
|
|
| 194 | 194 |
{
|
| 195 | 195 |
var item = items.First(); |
| 196 | 196 |
|
| ... | ... | |
| 222 | 222 |
/// <param name="TotalPage"></param> |
| 223 | 223 |
/// <param name="Error"></param> |
| 224 | 224 |
/// <returns></returns> |
| 225 |
public bool ConvertFinish( string ConvertID, int status, int CurrentPage, int TotalPage, string Error)
|
|
| 225 |
public bool ConvertFinish(string ConvertID, int status, int CurrentPage, int TotalPage, string Error) |
|
| 226 | 226 |
{
|
| 227 | 227 |
using (Markus.Service.DataBase.ConvertDatabase database = new Markus.Service.DataBase.ConvertDatabase(MarkusDBConnectionString)) |
| 228 | 228 |
{
|
| ... | ... | |
| 235 | 235 |
var _convertItem = ServiceStation.AliveConvertQueue.Where(f => f.ConvertID == ConvertID); |
| 236 | 236 |
|
| 237 | 237 |
if (_convertItem.Count() > 0) |
| 238 |
{
|
|
| 238 | 239 |
ConvertFinish(_convertItem.First()); |
| 240 |
} |
|
| 239 | 241 |
|
| 240 | 242 |
return true; |
| 241 | 243 |
} |
| ... | ... | |
| 262 | 264 |
/// <returns></returns> |
| 263 | 265 |
public List<ConvertItem> AliveConvertList() |
| 264 | 266 |
{
|
| 265 |
ServiceStation.AliveConvertQueue.ToList(); |
|
| 266 |
|
|
| 267 |
return ServiceStation.AliveConvertQueue.ToList(); |
|
| 267 |
return ServiceStation.AliveConvertQueue; |
|
| 268 | 268 |
} |
| 269 | 269 |
|
| 270 | 270 |
/// <summary> |
| ... | ... | |
| 343 | 343 |
return result; |
| 344 | 344 |
} |
| 345 | 345 |
|
| 346 |
public bool ReleaseConvertItems() |
|
| 347 |
{
|
|
| 348 |
System.Diagnostics.Debug.WriteLine("Call ReleaseConvertItems");
|
|
| 349 |
setDataBaseWaitingList(); |
|
| 350 |
System.Diagnostics.Debug.WriteLine("end ReleaseConvertItems");
|
|
| 351 |
return true; |
|
| 352 |
} |
|
| 346 | 353 |
} |
| 347 | 354 |
} |
내보내기 Unified diff
