개정판 0a64fa85
issue #0000 convert service Dapper update
Change-Id: I02cd47be3839ceff08813bd022cb8e13cf534ba0
| ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationWCF.cs | ||
|---|---|---|
| 107 | 107 |
{
|
| 108 | 108 |
using (ConvertDocRepository database = new ConvertDocRepository(MarkusDBConnectionString)) |
| 109 | 109 |
{
|
| 110 |
var convertItem = database.GetConvertDocSingleAsync(ProjectNo: ProjectNo, DocumentID: DocumentID).GetAwaiter().GetResult(); |
|
| 110 |
//var convertItem = database.GetConvertDocSingleAsync(ProjectNo: ProjectNo, DocumentID: DocumentID).GetAwaiter().GetResult();
|
|
| 111 | 111 |
|
| 112 |
if (convertItem != null) |
|
| 112 |
//if (convertItem != null) |
|
| 113 |
//{
|
|
| 114 |
var newConvertDocId = database.CreateAsync(ProjectNo, originfilePath, DocumentID).GetAwaiter().GetResult(); |
|
| 115 |
|
|
| 116 |
if (newConvertDocId == null) |
|
| 113 | 117 |
{
|
| 114 |
var newConvertDocId = database.CreateAsync(ProjectNo, originfilePath, DocumentID).GetAwaiter().GetResult(); |
|
| 118 |
logger.Error($"Set Convert document Insert Error - createId is Null. ProjectNo:{ProjectNo} originfilePath:{originfilePath} DocumentID:{DocumentID}");
|
|
| 119 |
} |
|
| 120 |
else |
|
| 121 |
{
|
|
| 122 |
var aliveItems = AliveConvertQueue.Where(x => x.DOCUMENT_ID == DocumentID); |
|
| 115 | 123 |
|
| 116 |
if (newConvertDocId == null)
|
|
| 124 |
if (aliveItems.Count() == 0)
|
|
| 117 | 125 |
{
|
| 118 |
logger.Error($"Set Convert document Insert Error - createId is Null. ProjectNo:{ProjectNo} originfilePath:{originfilePath} DocumentID:{DocumentID}");
|
|
| 126 |
result = ConvertProcessAdd(ProjectNo, newConvertDocId);
|
|
| 119 | 127 |
} |
| 120 | 128 |
else |
| 121 | 129 |
{
|
| 122 |
var aliveItems = AliveConvertQueue.Where(x => x.DOCUMENT_ID == convertItem.DOCUMENT_ID); |
|
| 123 |
|
|
| 124 |
if (aliveItems.Count() == 0) |
|
| 125 |
{
|
|
| 126 |
result = ConvertProcessAdd(ProjectNo, newConvertDocId); |
|
| 127 |
} |
|
| 128 |
else |
|
| 129 |
{
|
|
| 130 |
logger.Info("ConvertMenualAdd Wait ProjectNo:{ ProjectNo} originfilePath: { originfilePath} DocumentID: { DocumentID}");
|
|
| 131 |
} |
|
| 132 |
|
|
| 133 |
result = true.ToString(); |
|
| 130 |
logger.Info("ConvertMenualAdd Wait ProjectNo:{ ProjectNo} originfilePath: { originfilePath} DocumentID: { DocumentID}");
|
|
| 134 | 131 |
} |
| 132 |
|
|
| 133 |
result = true.ToString(); |
|
| 135 | 134 |
} |
| 135 |
//} |
|
| 136 | 136 |
} |
| 137 | 137 |
} |
| 138 | 138 |
catch (Exception ex) |
| ... | ... | |
| 282 | 282 |
/// <returns></returns> |
| 283 | 283 |
public bool ConvertProcessState(string ConvertDocID, int status, int CurrentPage, int TotalPage, string Error) |
| 284 | 284 |
{
|
| 285 |
bool isStatusChange = false; |
|
| 286 |
|
|
| 285 | 287 |
if (AliveConvertQueue.Count() > 0) |
| 286 | 288 |
{
|
| 287 | 289 |
var items = AliveConvertQueue.Where(x => x.ID == ConvertDocID); |
| ... | ... | |
| 292 | 294 |
|
| 293 | 295 |
item.TOTAL_PAGE = TotalPage; |
| 294 | 296 |
item.CURRENT_PAGE = CurrentPage; |
| 295 |
item.STATUS = status; |
|
| 297 |
|
|
| 298 |
if (item.STATUS != status) |
|
| 299 |
{
|
|
| 300 |
item.STATUS = status; |
|
| 301 |
isStatusChange = true; |
|
| 302 |
} |
|
| 296 | 303 |
} |
| 297 | 304 |
} |
| 298 | 305 |
|
| 299 |
if (CurrentPage % SaveStatusInterval == 0 || !Error.IsNullOrEmpty()) |
|
| 306 |
if (isStatusChange || CurrentPage % SaveStatusInterval == 0 || !Error.IsNullOrEmpty())
|
|
| 300 | 307 |
{
|
| 301 | 308 |
using (ConvertDocRepository database = new ConvertDocRepository(MarkusDBConnectionString)) |
| 302 | 309 |
{
|
| ... | ... | |
| 405 | 412 |
bool result = false; |
| 406 | 413 |
try |
| 407 | 414 |
{
|
| 408 |
gWcfServiceHost.Abort(); |
|
| 415 |
if (gWcfServiceHost != null) |
|
| 416 |
{
|
|
| 417 |
gWcfServiceHost.Abort(); |
|
| 418 |
} |
|
| 419 |
|
|
| 409 | 420 |
result = true; |
| 410 | 421 |
} |
| 411 | 422 |
catch (Exception ex) |
내보내기 Unified diff
