개정판 a537d79a
참조 수정/status 수정
Change-Id: Ic86b563e3ee53f3fd73a547379d15e432b1fb4e1
ConvertService/ServiceBase/Markus.Service.Convert/ConvertService.cs | ||
---|---|---|
93 | 93 |
currentPage = 1; |
94 | 94 |
} |
95 | 95 |
|
96 |
if (ConvertProcessContext.SendStatusInterval % currentPage == 0) |
|
97 |
{ |
|
98 |
StationServiceClient.ConvertProcessStateAsync(e.SaveItem.Id, (int)e.SaveItem.Status, e.SaveItem.CurrentPage, e.SaveItem.TotalPages, e.SaveItem.ErrorMessage); |
|
99 |
} |
|
96 |
StationServiceClient.ConvertProcessStateAsync(e.SaveItem.Id, (int)e.SaveItem.Status, e.SaveItem.CurrentPage, e.SaveItem.TotalPages, e.SaveItem.ErrorMessage); |
|
100 | 97 |
|
101 |
|
|
102 | 98 |
switch (e.SaveItem.Status) |
103 | 99 |
{ |
104 | 100 |
case StatusCodeType.None: |
ConvertService/ServiceBase/Markus.Service.Monitor/Markus.Service.MonitorService.csproj | ||
---|---|---|
136 | 136 |
<DependentUpon>ServiceMonitor.cs</DependentUpon> |
137 | 137 |
</EmbeddedResource> |
138 | 138 |
</ItemGroup> |
139 |
<ItemGroup> |
|
140 |
<ProjectReference Include="..\Markus.Service.Extensions\Markus.Service.Extensions.csproj"> |
|
141 |
<Project>{5f983789-3e8f-4f9a-a601-138c3a83ca5f}</Project> |
|
142 |
<Name>Markus.Service.Extensions</Name> |
|
143 |
</ProjectReference> |
|
144 |
</ItemGroup> |
|
139 | 145 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
140 | 146 |
</Project> |
ConvertService/ServiceBase/Markus.Service.StationController/App.xaml.cs | ||
---|---|---|
21 | 21 |
{ |
22 | 22 |
base.OnStartup(e); |
23 | 23 |
MainWindow = new MainWindow(); |
24 |
MainWindow.Closing += MainWindow_Closing; |
|
24 |
//MainWindow.Closing += MainWindow_Closing;
|
|
25 | 25 |
|
26 |
_notifyIcon = new System.Windows.Forms.NotifyIcon(); |
|
27 |
_notifyIcon.DoubleClick += (s, args) => ShowMainWindow(); |
|
28 |
_notifyIcon.Icon = Markus.Service.StationController.Properties.Resources.TRANSFER_ERROR; |
|
29 |
_notifyIcon.Visible = true; |
|
26 |
//_notifyIcon = new System.Windows.Forms.NotifyIcon();
|
|
27 |
//_notifyIcon.DoubleClick += (s, args) => ShowMainWindow();
|
|
28 |
//_notifyIcon.Icon = Markus.Service.StationController.Properties.Resources.TRANSFER_ERROR;
|
|
29 |
//_notifyIcon.Visible = true;
|
|
30 | 30 |
|
31 |
CreateContextMenu(); |
|
31 |
//CreateContextMenu();
|
|
32 | 32 |
} |
33 | 33 |
|
34 | 34 |
private void CreateContextMenu() |
ConvertService/ServiceBase/Markus.Service.StationController/MainWindow.xaml | ||
---|---|---|
15 | 15 |
</Window.DataContext> |
16 | 16 |
<materialDesign:DialogHost x:Name="m_dialogHost" Identifier="dialogHost" DialogTheme="Light"> |
17 | 17 |
<materialDesign:DrawerHost IsLeftDrawerOpen="{Binding Path=IsNavigationDrawerOpen, ElementName=appBar}" LeftDrawerBackground="{DynamicResource MaterialDesignBackground}"> |
18 |
<materialDesign:DrawerHost.LeftDrawerContent> |
|
18 |
<!--<materialDesign:DrawerHost.LeftDrawerContent>
|
|
19 | 19 |
<materialEx:SideNavigation Items="{Binding NavigationItems,Mode=OneTime}" Width="280"/> |
20 |
</materialDesign:DrawerHost.LeftDrawerContent> |
|
20 |
</materialDesign:DrawerHost.LeftDrawerContent>-->
|
|
21 | 21 |
<Grid> |
22 | 22 |
<Grid.ColumnDefinitions> |
23 |
<ColumnDefinition Width="280" />
|
|
23 |
<ColumnDefinition Width="Auto" />
|
|
24 | 24 |
<ColumnDefinition Width="100*" /> |
25 | 25 |
</Grid.ColumnDefinitions> |
26 | 26 |
<Grid.RowDefinitions> |
27 | 27 |
<RowDefinition Height="Auto" /> |
28 | 28 |
<RowDefinition Height="*" /> |
29 | 29 |
</Grid.RowDefinitions> |
30 |
<materialEx:AppBar x:Name="appBar" Grid.ColumnSpan="2" Title="MARKUS CONVERT SERVICE" ShowNavigationDrawerButton="True"> |
|
30 |
<!--<materialEx:AppBar x:Name="appBar" Grid.ColumnSpan="2" Title="MARKUS CONVERT SERVICE" ShowNavigationDrawerButton="True">
|
|
31 | 31 |
<Button Style="{StaticResource MaterialDesignToolForegroundButton}" Margin="8,0" ToolTip="Material Design Exentions on GitHub"> |
32 | 32 |
</Button> |
33 | 33 |
<Button Style="{StaticResource MaterialDesignToolForegroundButton}" Margin="8,0" ToolTip="Documentation"> |
34 | 34 |
</Button> |
35 |
</materialEx:AppBar> |
|
35 |
</materialEx:AppBar>-->
|
|
36 | 36 |
<!--<Border Grid.Row="1" BorderThickness="0,0,1,0" BorderBrush="{DynamicResource MaterialDesignDivider}"> |
37 | 37 |
<materialEx:SideNavigation Items="{Binding NavigationItems,Mode=OneTime}" DataContext="{Binding Mode=OneWay}"/> |
38 | 38 |
</Border>--> |
39 | 39 |
<Grid Grid.Column="1" Grid.Row="1"> |
40 |
<DataGrid ItemsSource="{Binding AliveItems}"
|
|
40 |
<DataGrid ItemsSource="{Binding AliveItems}" AutoGenerateColumns="False"
|
|
41 | 41 |
x:Name="DataGrid" ScrollViewer.CanContentScroll="False"> |
42 |
</DataGrid> |
|
42 |
<DataGrid.Columns> |
|
43 |
<materialDesign:MaterialDataGridTextColumn Header="Convert ID" Binding="{Binding ConvertID}"/> |
|
44 |
<materialDesign:MaterialDataGridTextColumn Header="Project No" Binding="{Binding ProjectNumber}"/> |
|
45 |
<materialDesign:MaterialDataGridTextColumn Header="Status" Binding="{Binding ConvertState}"/> |
|
46 |
<materialDesign:MaterialDataGridTextColumn Header="Current Page" Binding="{Binding CurrentPageNo}"/> |
|
47 |
<materialDesign:MaterialDataGridTextColumn Header="TotalPage" Binding="{Binding TotalPage}"/> |
|
48 |
|
|
49 |
<materialDesign:MaterialDataGridTextColumn Header="Originfile" Binding="{Binding OriginfilePath}"/> |
|
50 |
<materialDesign:MaterialDataGridTextColumn Header="Output Path" Binding="{Binding ConvertPath}"/> |
|
51 |
</DataGrid.Columns> |
|
52 |
</DataGrid> |
|
43 | 53 |
</Grid> |
44 | 54 |
</Grid> |
45 | 55 |
</materialDesign:DrawerHost> |
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj | ||
---|---|---|
39 | 39 |
<Prefer32Bit>false</Prefer32Bit> |
40 | 40 |
</PropertyGroup> |
41 | 41 |
<ItemGroup> |
42 |
<Reference Include="CommonServiceLocator, Version=2.0.4.0, Culture=neutral, PublicKeyToken=489b6accfaf20ef0, processorArchitecture=MSIL"> |
|
43 |
<HintPath>..\packages\CommonServiceLocator.2.0.4\lib\net46\CommonServiceLocator.dll</HintPath> |
|
44 |
</Reference> |
|
45 | 42 |
<Reference Include="ConfigParser, Version=0.3.3.6, Culture=neutral, processorArchitecture=MSIL"> |
46 | 43 |
<HintPath>..\packages\Salaros.ConfigParser.0.3.3\lib\net45\ConfigParser.dll</HintPath> |
47 | 44 |
</Reference> |
48 |
<Reference Include="GalaSoft.MvvmLight, Version=5.4.1.0, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL"> |
|
49 |
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.dll</HintPath> |
|
50 |
</Reference> |
|
51 |
<Reference Include="GalaSoft.MvvmLight.Extras, Version=5.4.1.0, Culture=neutral, PublicKeyToken=669f0b5e8f868abf, processorArchitecture=MSIL"> |
|
52 |
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Extras.dll</HintPath> |
|
53 |
</Reference> |
|
54 |
<Reference Include="GalaSoft.MvvmLight.Platform, Version=5.4.1.0, Culture=neutral, PublicKeyToken=5f873c45e98af8a1, processorArchitecture=MSIL"> |
|
55 |
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\GalaSoft.MvvmLight.Platform.dll</HintPath> |
|
56 |
</Reference> |
|
57 | 45 |
<Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL"> |
58 | 46 |
<HintPath>..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath> |
59 | 47 |
</Reference> |
... | ... | |
73 | 61 |
<Reference Include="System.Runtime.Serialization" /> |
74 | 62 |
<Reference Include="System.ServiceModel" /> |
75 | 63 |
<Reference Include="System.Windows.Forms" /> |
76 |
<Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL"> |
|
77 |
<HintPath>..\packages\MvvmLightLibs.5.4.1.1\lib\net45\System.Windows.Interactivity.dll</HintPath> |
|
78 |
</Reference> |
|
79 | 64 |
<Reference Include="System.Xml" /> |
80 | 65 |
<Reference Include="Microsoft.CSharp" /> |
81 | 66 |
<Reference Include="System.Core" /> |
... | ... | |
158 | 143 |
<Generator>SettingsSingleFileGenerator</Generator> |
159 | 144 |
<LastGenOutput>Settings.Designer.cs</LastGenOutput> |
160 | 145 |
</None> |
146 |
<None Include="StationController.ini"> |
|
147 |
<CopyToOutputDirectory>Always</CopyToOutputDirectory> |
|
148 |
</None> |
|
161 | 149 |
</ItemGroup> |
162 | 150 |
<ItemGroup> |
163 | 151 |
<None Include="App.config" /> |
ConvertService/ServiceBase/Markus.Service.StationController/StationController.ini | ||
---|---|---|
1 |
[SERVICE] |
|
2 |
ADDRESS = http://172.20.101.119:9101/StationService |
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/MainViewModel.cs | ||
---|---|---|
16 | 16 |
|
17 | 17 |
public MainViewModel() |
18 | 18 |
{ |
19 |
BasicHttpBinding myBinding = new BasicHttpBinding(); |
|
20 |
EndpointAddress myEndpoint = new EndpointAddress(UriHelper.UriCreate("http://192.168.0.76:9101/StationService")); |
|
21 |
client = new StationService.StationServiceClient(myBinding, myEndpoint); |
|
22 |
client.AliveConvertListCompleted += Client_AliveConvertListCompleted; |
|
19 |
ServiceConnection(); |
|
23 | 20 |
|
24 | 21 |
System.Windows.Threading.DispatcherTimer timer = new System.Windows.Threading.DispatcherTimer(); |
25 | 22 |
timer.Interval = new TimeSpan(0, 0, 1); |
... | ... | |
37 | 34 |
NavigationItems.First().IsSelected = true; |
38 | 35 |
} |
39 | 36 |
|
37 |
private void ServiceConnection() |
|
38 |
{ |
|
39 |
try |
|
40 |
{ |
|
41 |
if(client != null) |
|
42 |
{ |
|
43 |
client.Abort(); |
|
44 |
client.AliveConvertListCompleted -= Client_AliveConvertListCompleted; |
|
45 |
client = null; |
|
46 |
} |
|
47 |
|
|
48 |
var configFileName = $"StationController.ini"; |
|
49 |
|
|
50 |
var config = ConfigHelper.AppConfig(configFileName); |
|
51 |
|
|
52 |
var serviceUri = config.GetValue("SERVICE", "ADDRESS", "http://LOCALHOST:9101/StationService"); |
|
53 |
|
|
54 |
BasicHttpBinding myBinding = new BasicHttpBinding(); |
|
55 |
EndpointAddress myEndpoint = new EndpointAddress(UriHelper.UriCreate(serviceUri)); |
|
56 |
client = new StationService.StationServiceClient(myBinding, myEndpoint); |
|
57 |
client.AliveConvertListCompleted += Client_AliveConvertListCompleted; |
|
58 |
} |
|
59 |
catch (Exception) |
|
60 |
{ |
|
61 |
} |
|
62 |
|
|
63 |
} |
|
64 |
|
|
40 | 65 |
private void Timer_Tick(object sender, EventArgs e) |
41 | 66 |
{ |
42 |
client.AliveConvertListAsync(); |
|
67 |
try |
|
68 |
{ |
|
69 |
client.AliveConvertListAsync(); |
|
70 |
} |
|
71 |
catch (Exception ex) |
|
72 |
{ |
|
73 |
ServiceConnection(); |
|
74 |
} |
|
43 | 75 |
} |
44 | 76 |
|
45 | 77 |
private void Client_AliveConvertListCompleted(object sender, AliveConvertListCompletedEventArgs e) |
ConvertService/ServiceBase/Markus.Service.StationController/packages.config | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="utf-8"?> |
2 | 2 |
<packages> |
3 |
<package id="CommonServiceLocator" version="2.0.4" targetFramework="net461" /> |
|
4 | 3 |
<package id="MaterialDesignColors" version="1.1.2" targetFramework="net461" /> |
5 | 4 |
<package id="MaterialDesignExtensions" version="2.6.0" targetFramework="net461" /> |
6 | 5 |
<package id="MaterialDesignThemes" version="2.5.1" targetFramework="net461" /> |
7 | 6 |
<package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" /> |
8 |
<package id="MvvmLightLibs" version="5.4.1.1" targetFramework="net472" /> |
|
9 | 7 |
<package id="Salaros.ConfigParser" version="0.3.3" targetFramework="net45" /> |
10 | 8 |
</packages> |
ConvertService/ServiceBase/ServiceBase.sln | ||
---|---|---|
38 | 38 |
EndProject |
39 | 39 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markus.Service.Station", "Markus.Service.Station\Markus.Service.Station.csproj", "{BF8B3B13-30D5-482C-8452-A7511E96DE97}" |
40 | 40 |
EndProject |
41 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonitorTest", "MonitorTest\MonitorTest.csproj", "{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}" |
|
42 |
ProjectSection(ProjectDependencies) = postProject |
|
43 |
{0523C15E-B197-4C34-83BA-D62B384E2B77} = {0523C15E-B197-4C34-83BA-D62B384E2B77} |
|
44 |
EndProjectSection |
|
45 |
EndProject |
|
46 | 41 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConnectionStringBuild", "ConnectionStringBuild\ConnectionStringBuild.csproj", "{2934E21A-D380-43B2-B68A-9B0D7C55A72F}" |
47 | 42 |
EndProject |
48 | 43 |
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConvertWcfCheck", "WcfCheck\ConvertWcfCheck.csproj", "{75D7FDAE-9FBA-4A99-AE96-88F5B42C15EC}" |
... | ... | |
180 | 175 |
{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|x64.Build.0 = Release|x64 |
181 | 176 |
{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|x86.ActiveCfg = Release|Any CPU |
182 | 177 |
{BF8B3B13-30D5-482C-8452-A7511E96DE97}.Release|x86.Build.0 = Release|Any CPU |
183 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
|
184 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Debug|Any CPU.Build.0 = Debug|Any CPU |
|
185 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Debug|x64.ActiveCfg = Debug|Any CPU |
|
186 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Debug|x64.Build.0 = Debug|Any CPU |
|
187 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Debug|x86.ActiveCfg = Debug|Any CPU |
|
188 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Debug|x86.Build.0 = Debug|Any CPU |
|
189 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Release|Any CPU.ActiveCfg = Release|Any CPU |
|
190 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Release|Any CPU.Build.0 = Release|Any CPU |
|
191 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Release|x64.ActiveCfg = Release|Any CPU |
|
192 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Release|x64.Build.0 = Release|Any CPU |
|
193 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Release|x86.ActiveCfg = Release|Any CPU |
|
194 |
{E797AE1B-9FE5-4CBD-905D-D69BC033CBED}.Release|x86.Build.0 = Release|Any CPU |
|
195 | 178 |
{2934E21A-D380-43B2-B68A-9B0D7C55A72F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
196 | 179 |
{2934E21A-D380-43B2-B68A-9B0D7C55A72F}.Debug|Any CPU.Build.0 = Debug|Any CPU |
197 | 180 |
{2934E21A-D380-43B2-B68A-9B0D7C55A72F}.Debug|x64.ActiveCfg = Debug|Any CPU |
ConvertService/ServiceBase/ServiceTestApp/MainWindow.xaml.cs | ||
---|---|---|
40 | 40 |
{ |
41 | 41 |
InitializeComponent(); |
42 | 42 |
|
43 |
var config = Markus.Service.ConfigHelper.AppConfig("ServiceStation.ini"); |
|
43 |
var config = Markus.Service.Helper.ConfigHelper.AppConfig("ServiceStation.ini");
|
|
44 | 44 |
MarkusDBConnectionString = AESEncrypter.Decrypt(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.MARKUS_CONNECTION_STRING)); |
45 | 45 |
|
46 | 46 |
datagrid.ItemsSource = convertItems; |
ConvertService/ServiceBase/ServiceTestApp/ServiceTestApp.csproj | ||
---|---|---|
132 | 132 |
<Generator>MSBuild:Compile</Generator> |
133 | 133 |
<SubType>Designer</SubType> |
134 | 134 |
</Page> |
135 |
<Compile Include="..\Markus.Service.Station\ApplicationDefine.cs"> |
|
136 |
<Link>ApplicationDefine.cs</Link> |
|
137 |
</Compile> |
|
135 | 138 |
<Compile Include="App.xaml.cs"> |
136 | 139 |
<DependentUpon>App.xaml</DependentUpon> |
137 | 140 |
<SubType>Code</SubType> |
... | ... | |
244 | 247 |
<LastGenOutput>Reference.cs</LastGenOutput> |
245 | 248 |
</None> |
246 | 249 |
</ItemGroup> |
250 |
<ItemGroup> |
|
251 |
<ProjectReference Include="..\IServiceBase\Markus.Service.Interface.csproj"> |
|
252 |
<Project>{4a465fd0-8130-4d6b-a65f-c3cd6cc355a4}</Project> |
|
253 |
<Name>Markus.Service.Interface</Name> |
|
254 |
</ProjectReference> |
|
255 |
<ProjectReference Include="..\Markus.Service.DataBase\Markus.Service.DataBase.csproj"> |
|
256 |
<Project>{400736fb-92c9-4bc0-b447-e8274103d813}</Project> |
|
257 |
<Name>Markus.Service.DataBase</Name> |
|
258 |
</ProjectReference> |
|
259 |
<ProjectReference Include="..\Markus.Service.Extensions\Markus.Service.Extensions.csproj"> |
|
260 |
<Project>{5f983789-3e8f-4f9a-a601-138c3a83ca5f}</Project> |
|
261 |
<Name>Markus.Service.Extensions</Name> |
|
262 |
</ProjectReference> |
|
263 |
<ProjectReference Include="..\Markus.Service.Station\Markus.Service.Station.csproj"> |
|
264 |
<Project>{bf8b3b13-30d5-482c-8452-a7511e96de97}</Project> |
|
265 |
<Name>Markus.Service.Station</Name> |
|
266 |
</ProjectReference> |
|
267 |
<ProjectReference Include="..\Markus.Service.WcfService\Markus.Service.IWcfService.csproj"> |
|
268 |
<Project>{0523c15e-b197-4c34-83ba-d62b384e2b77}</Project> |
|
269 |
<Name>Markus.Service.IWcfService</Name> |
|
270 |
</ProjectReference> |
|
271 |
</ItemGroup> |
|
247 | 272 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
248 | 273 |
<PropertyGroup> |
249 | 274 |
<PreBuildEvent> |
ConvertService/ServiceBase/ServiceUnitTest/ServiceUnitTest.csproj | ||
---|---|---|
132 | 132 |
<LastGenOutput>Reference.cs</LastGenOutput> |
133 | 133 |
</None> |
134 | 134 |
</ItemGroup> |
135 |
<ItemGroup> |
|
136 |
<ProjectReference Include="..\IServiceBase\Markus.Service.Interface.csproj"> |
|
137 |
<Project>{4a465fd0-8130-4d6b-a65f-c3cd6cc355a4}</Project> |
|
138 |
<Name>Markus.Service.Interface</Name> |
|
139 |
</ProjectReference> |
|
140 |
<ProjectReference Include="..\Markus.Service.DataBase\Markus.Service.DataBase.csproj"> |
|
141 |
<Project>{400736fb-92c9-4bc0-b447-e8274103d813}</Project> |
|
142 |
<Name>Markus.Service.DataBase</Name> |
|
143 |
</ProjectReference> |
|
144 |
</ItemGroup> |
|
135 | 145 |
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" /> |
136 | 146 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
137 | 147 |
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
내보내기 Unified diff