개정판 59a29a3b
Reconvert & Convert-RealGrid realtime 수정
Change-Id: Ief366643905646a40c71b6a75a22abf5849f3a5e
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj | ||
---|---|---|
41 | 41 |
<OutputPath>bin\Debug\</OutputPath> |
42 | 42 |
<DefineConstants>DEBUG;TRACE</DefineConstants> |
43 | 43 |
<ErrorReport>prompt</ErrorReport> |
44 |
<WarningLevel>4</WarningLevel>
|
|
44 |
<WarningLevel>3</WarningLevel>
|
|
45 | 45 |
<Prefer32Bit>false</Prefer32Bit> |
46 | 46 |
</PropertyGroup> |
47 | 47 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> |
ConvertService/ServiceBase/Markus.Service.StationController/StationController.ini | ||
---|---|---|
15 | 15 |
|
16 | 16 |
|
17 | 17 |
#효성 복사본 |
18 |
#MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q=
|
|
18 |
MarkusDataBaseConnectionString = w0RfRwPwWVzkhKYSFkzqaccCbanjnTfSeig1IFc1IQ2MDThANWCNLmZqA6e2emQZqdM0l2Hsk1Ns/1Bfk6Vy+23gcbZlEDSBfSz7+eQaliiW9b2Wes1FDJ/C1Ho+35kTHGBbQk0tlIA0SWQHbR0KFo8TH5AbCyrLkjI87W6iXJVBpfI1QmTK0guIlTPnEEtCzXnXtgY9e8IHVnRIqT1PDq7ennJLPbB3f5FQ0Q1ry+Q= |
|
19 | 19 |
|
20 | 20 |
#Doftech 개발 |
21 |
MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w== |
|
21 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
|
|
22 | 22 |
|
23 | 23 |
# remote test MARKUS_V3 |
24 | 24 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w== |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs | ||
---|---|---|
713 | 713 |
{ |
714 | 714 |
try |
715 | 715 |
{ |
716 |
IEnumerable<ConvertPDF> Listitems = Enumerable.Empty<ConvertPDF>();
|
|
716 |
List<ConvertPDF> Listitems = new List<ConvertPDF>();
|
|
717 | 717 |
|
718 | 718 |
foreach (var coll in collection) |
719 | 719 |
{ |
720 |
Listitems = from num in await WcfClient.GET_SELECT_CONVERT_ITEMAsync(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null)
|
|
720 |
var collectionItems = from num in await WcfClient.GET_SELECT_CONVERT_ITEMAsync(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null)
|
|
721 | 721 |
let MarkusLink = "kcom://" + CreateMarkusParam(num.PROJECT_NO, num.DOCUMENT_ID, "doftech") |
722 | 722 |
select new ConvertPDF(num.SERVICE_ID, num.ID, num.PROJECT_NO, num.STATUS, num.DOCUMENT_ID, num.DOCUMENT_NAME, num.DOCUMENT_NO, num.DOCUMENT_URL, num.REVISION, num.CURRENT_PAGE, |
723 | 723 |
num.TOTAL_PAGE, num.EXCEPTION, num.GROUP_NO, num.CREATE_DATETIME, num.START_DATETIME, num.END_DATETIME, num.DOCUMENT_URL, num.CONVERT_PATH, MarkusLink, num.RECONVERTER); |
724 |
|
|
725 |
var collectionItem = collectionItems.Cast<ConvertPDF>().ToList(); |
|
726 |
|
|
727 |
Listitems.AddRange(collectionItem); |
|
724 | 728 |
} |
725 | 729 |
|
726 | 730 |
foreach (var Listitem in Listitems) |
... | ... | |
759 | 763 |
var Listitems = from num in await WcfClient.GET_SELECT_CONVERT_ITEMAsync(null, null, null, _status, SelectedCount.ValueMember, null, null, null, null, null, null, null, null, null, null, null, null, null, null) |
760 | 764 |
let MarkusLink = "kcom://" + CreateMarkusParam(num.PROJECT_NO, num.DOCUMENT_ID, "doftech") |
761 | 765 |
select new ConvertPDF(num.SERVICE_ID, num.ID, num.PROJECT_NO, num.STATUS, num.DOCUMENT_ID, num.DOCUMENT_NAME, num.DOCUMENT_NO, num.DOCUMENT_URL, num.REVISION, num.CURRENT_PAGE, |
762 |
num.TOTAL_PAGE, num.EXCEPTION, num.GROUP_NO, num.CREATE_DATETIME, num.START_DATETIME, num.END_DATETIME, num.DOCUMENT_URL, num.CONVERT_PATH, MarkusLink, num.RECONVERTER); |
|
766 |
num.TOTAL_PAGE, num.EXCEPTION, num.GROUP_NO, num.CREATE_DATETIME, num.START_DATETIME, num.END_DATETIME, num.DOCUMENT_URL, num.CONVERT_PATH, MarkusLink, num.RECONVERTER);
|
|
763 | 767 |
|
764 | 768 |
if (collection.Count() == 0) |
765 | 769 |
{ |
... | ... | |
858 | 862 |
ProjectNames.Add(projectName); |
859 | 863 |
} |
860 | 864 |
} |
861 |
|
|
862 | 865 |
|
863 | 866 |
var Listitems = from num in await WcfClient.GET_SELECT_CONVERT_ITEMAsync(null, ProjectNumberFilter.Project_NO, UniqueKeyFilter, _status, SelectedCount.ValueMember, Start_CreateTime, Finish_CreateTime, null, |
864 | 867 |
null, null, null, GroupNOFilter, Document_NameFilter, Docuemnt_NOFilter, RevisionFilter, Service_IDFilter, ReconverterFilter, DOCUMENT_URLFilter, ExcptionCheck) |
... | ... | |
1131 | 1134 |
} |
1132 | 1135 |
else |
1133 | 1136 |
{ |
1134 |
var resultRealConvert = 0; |
|
1135 |
var resultFiltertConvert = 0; |
|
1136 | 1137 |
if (SelectRealConvert != null) |
1137 | 1138 |
{ |
1138 |
resultRealConvert = SetCleanUpItem(SelectRealConvert).Result;//ConvertDataBase
|
|
1139 |
SetCleanUpItem(SelectRealConvert);//ConvertDataBase
|
|
1139 | 1140 |
} |
1140 | 1141 |
if (SelectFilterConvertList != null) |
1141 | 1142 |
{ |
1142 | 1143 |
foreach (var SelectFilterConvert in SelectFilterConvertList) |
1143 | 1144 |
{ |
1144 |
resultFiltertConvert = SetCleanUpItem(SelectFilterConvert).Result;
|
|
1145 |
SetCleanUpItem(SelectFilterConvert);
|
|
1145 | 1146 |
} |
1146 | 1147 |
} |
1147 |
System.Diagnostics.Debug.WriteLine(resultRealConvert + " " + resultFiltertConvert); |
|
1148 |
|
|
1149 |
|
|
1150 | 1148 |
|
1151 | 1149 |
foreach (var SelectFilterConvert in SelectFilterConvertList) |
1152 | 1150 |
{ |
... | ... | |
1170 | 1168 |
} |
1171 | 1169 |
|
1172 | 1170 |
|
1173 |
public async Task<int> SetCleanUpItem(ConvertPDF _ConvertItem)
|
|
1171 |
public async void SetCleanUpItem(ConvertPDF _ConvertItem)
|
|
1174 | 1172 |
{ |
1175 |
int result = 0; |
|
1176 |
|
|
1177 |
var items = await WcfClient.GET_SELECT_CONVERT_ITEMAsync(_ConvertItem.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null, null); |
|
1178 |
|
|
1173 |
|
|
1174 |
var items = await WcfClient.GET_SELECT_CONVERT_ITEMAsync(_ConvertItem.ConvertID, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null); |
|
1175 |
|
|
1179 | 1176 |
if (items.Count() > 0) |
1180 | 1177 |
{ |
1181 | 1178 |
var item = items.First(); |
... | ... | |
1186 | 1183 |
|
1187 | 1184 |
await WcfClient.GET_SELECT_RERECONVERT_ITEMAsync(_ConvertItem.ConvertID, _RECONVERTER, _CREATE_DATETIME, _STATUS, null);//_END_DATETIME = null 에러 |
1188 | 1185 |
} |
1189 |
return result; |
|
1190 | 1186 |
} |
1191 | 1187 |
|
1192 | 1188 |
|
ConvertService/ServiceBase/StationControllerService/Properties/PublishProfiles/FolderProfile.pubxml | ||
---|---|---|
1 |
<?xml version="1.0" encoding="utf-8"?> |
|
2 |
<!-- |
|
3 |
이 파일은 웹 프로젝트의 게시/패키지 프로세스에서 사용됩니다. 이 MSBuild 파일을 편집하여 이 프로세스의 동작을 |
|
4 |
사용자 지정할 수 있습니다. 이에 대한 자세한 내용은 https://go.microsoft.com/fwlink/?LinkID=208121을 참조하세요. |
|
5 |
--> |
|
6 |
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
|
7 |
<PropertyGroup> |
|
8 |
<WebPublishMethod>FileSystem</WebPublishMethod> |
|
9 |
<PublishProvider>FileSystem</PublishProvider> |
|
10 |
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration> |
|
11 |
<LastUsedPlatform>Any CPU</LastUsedPlatform> |
|
12 |
<SiteUrlToLaunchAfterPublish /> |
|
13 |
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish> |
|
14 |
<ExcludeApp_Data>False</ExcludeApp_Data> |
|
15 |
<publishUrl>bin\Release\Publish</publishUrl> |
|
16 |
<DeleteExistingFiles>False</DeleteExistingFiles> |
|
17 |
</PropertyGroup> |
|
18 |
</Project> |
ConvertService/ServiceBase/StationControllerService/StationControllerService.csproj | ||
---|---|---|
25 | 25 |
<UseGlobalApplicationHostFile /> |
26 | 26 |
<NuGetPackageImportStamp> |
27 | 27 |
</NuGetPackageImportStamp> |
28 |
<TargetFrameworkProfile /> |
|
28 | 29 |
</PropertyGroup> |
29 | 30 |
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> |
30 | 31 |
<DebugSymbols>true</DebugSymbols> |
... | ... | |
52 | 53 |
</Reference> |
53 | 54 |
<Reference Include="Microsoft.CSharp" /> |
54 | 55 |
<Reference Include="System.ComponentModel.DataAnnotations" /> |
56 |
<Reference Include="System.Data.DataSetExtensions" /> |
|
55 | 57 |
<Reference Include="System.Security" /> |
56 | 58 |
<Reference Include="System.Web.DynamicData" /> |
57 | 59 |
<Reference Include="System.Web.Entity" /> |
58 | 60 |
<Reference Include="System.Web.ApplicationServices" /> |
59 | 61 |
<Reference Include="System" /> |
60 | 62 |
<Reference Include="System.Configuration" /> |
61 |
<Reference Include="System.Core" /> |
|
62 | 63 |
<Reference Include="System.Data" /> |
63 | 64 |
<Reference Include="System.Drawing" /> |
64 | 65 |
<Reference Include="System.EnterpriseServices" /> |
... | ... | |
145 | 146 |
<DependentUpon>MarkusModel.edmx</DependentUpon> |
146 | 147 |
</Content> |
147 | 148 |
<None Include="packages.config" /> |
149 |
<None Include="Properties\PublishProfiles\FolderProfile.pubxml" /> |
|
148 | 150 |
<None Include="Properties\Settings.settings"> |
149 | 151 |
<Generator>SettingsSingleFileGenerator</Generator> |
150 | 152 |
<LastGenOutput>Settings.Designer.cs</LastGenOutput> |
내보내기 Unified diff