프로젝트

일반

사용자정보

개정판 266a2d4f

ID266a2d4f0b8f688810566d2f8c0afecf41e6587b
상위 484b88ec
하위 31f18afa, c5a1a6b6

김태성이(가) 5년 이상 전에 추가함

controller 수정

Change-Id: Idf0594d916581de9935e533dc62e16434ea18153

차이점 보기:

ConvertService/ServiceBase/Markus.Service.DataBase/ConvertDatabase.cs
237 237 
        {
238 238 
            var convertWaitingItems = entities.CONVERTER_DOC.OrderBy(x => x.CREATE_DATETIME).Where(
239 239 
                                        x =>
240 
                                        projectList.Contains(x.PROJECT_NO) &&
241 
                                        (x.STATUS == (int)StatusCodeType.None || x.STATUS > (int)StatusCodeType.Completed && x.RECONVERTER < 2))
240 
                                        projectList.Contains(x.PROJECT_NO) && x.RECONVERTER < 2 &&
241 
                                        (x.STATUS == (int)StatusCodeType.None || x.STATUS == (int)StatusCodeType.FileError && x.STATUS == (int)StatusCodeType.Error))
242 242 
                                    .GroupBy(x=>x.DOCUMENT_ID).Select(x => x.FirstOrDefault())
243 243 
                                    .Take(TakeCount);
244 244 

  		












  

    
      ConvertService/ServiceBase/Markus.Service.Station/ServiceStation.ini
    
  





  12
  12
  
    
#MarkusDataBaseConnectionString = data source=DESKTOP-MARKUS;initial catalog=Markus_V3;persist security info=True;user id=doftech;Password=dof1073#;MultipleActiveResultSets=True;


  		




  13
  13
  
    

  		




  14
  14
  
    
# local test


  		




  15
  
  
    
MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow==


  		




  
  15
  
    
#MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow==


  		




  16
  16
  
    

  		




  17
  17
  
    
# remote test MARKUS


  		




  18
  18
  
    
#MarkusDataBaseConnectionString = YNP/egPgsKY5wO/j9T7VgkiSClJH7p9hANqnTbQFNYaOnS1f9eeZS5UzPwsGuI3sy8IS1sJxP4YmPOmv6hnMKUwCZJkjW6ypzHVlGlP3UDDq2i+rz1LKVYIEXpcFMVKUOBMjxQouZ6h/Svf5ohlw3pG4DLKFk7HxUwYot19soGo6wXOTmO722OsWPsVuUbo1


  		




  19
  19
  
    

  		




  20
  20
  
    
# remote test MARKUS_V3


  		




  21
  
  
    
#MarkusDataBaseConnectionString = YNP/egPgsKY5wO/j9T7VgkiSClJH7p9hANqnTbQFNYaOnS1f9eeZS5UzPwsGuI3syNfjUnBbiLk37BjsNNWzZevN8Jbd9EzwE9l5g8upXhNqX9eF2brizRZ4ud+GK/35HvqSjvIaz5ggszA3dHT2b+r9279mJXo42QzRBNbUcBgnl2njNNSB7EfckQ5Hwd7eatvWuf3ESIUv4KTqGU5V6A==


  		




  
  21
  
    
MarkusDataBaseConnectionString = YNP/egPgsKY5wO/j9T7VgkiSClJH7p9hANqnTbQFNYaOnS1f9eeZS5UzPwsGuI3syNfjUnBbiLk37BjsNNWzZevN8Jbd9EzwE9l5g8upXhNqX9eF2brizRZ4ud+GK/35HvqSjvIaz5ggszA3dHT2b+r9279mJXo42QzRBNbUcBgnl2njNNSB7EfckQ5Hwd7eatvWuf3ESIUv4KTqGU5V6A==


  		




  22
  22
  
    

  		




  23
  23
  
    
#daelim


  		




  24
  24
  
    
#MarkusDataBaseConnectionString = yRW0I8OJY/boJcR9rTFeH229g456BwO8BaXQbW8h6iCR10JRc5tOl2BDWa1595q0bvW9uD5HsHn9ke4oK3yaw2OYHh8pgYKdhW48xeAl49510h1DPv8uSbqcWdwZ2AjernORxxaEAUqHZb5DFlndcWuid82ZwP/EGxGNhaaCG+KVogeHwI5FZZKrmUTWe3159qk11Q4XswrHeLy8HQn5Qg==


  		




  ......




  33
  33
  
    

  		




  34
  34
  
    
# 설정된 Resolution으로 강제 변환


  		




  35
  35
  
    
# 기본 = 0


  		




  36
  
  
    
USE_RESOLUTION = 100


  		




  
  36
  
    
USE_RESOLUTION = 150


  		




  37
  37
  
    

  		




  38
  38
  
    
# 상태 저장 간격(페이지당 상태 저장 간각)


  		




  39
  39
  
    
# 기본 5


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/App.config
    
  





  1
  
  
    
<?xml version="1.0" encoding="utf-8"?>


  		




  
  1
  
    
<?xml version="1.0" encoding="utf-8"?>


  		




  2
  2
  
    
<configuration>


  		




  3
  3
  
    
    <startup> 


  		




  4
  
  
    
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5"/>


  		




  
  4
  
    
        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />


  		




  5
  5
  
    
    </startup>


  		




  6
  6
  
    
  <runtime>


  		




  7
  7
  
    
    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">


  		




  8
  8
  
    
      <!--모든 DLL을 Bin폴더에서 참조한다.-->


  		




  9
  
  
    
      <probing privatePath="bin"/>


  		




  
  9
  
    
      <probing privatePath="bin" />


  		




  10
  10
  
    
      <!--<dependentAssembly>


  		




  11
  11
  
    
        <assemblyIdentity name="CommonServiceLocator" publicKeyToken="489b6accfaf20ef0" culture="neutral" />


  		




  12
  12
  
    
        <bindingRedirect oldVersion="0.0.0.0-2.0.4.0" newVersion="2.0.4.0" />


  		




  13
  13
  
    
      </dependentAssembly>-->


  		




  
  14
  
    
      <dependentAssembly>


  		




  
  15
  
    
        <assemblyIdentity name="System.Windows.Interactivity" publicKeyToken="31bf3856ad364e35" culture="neutral" />


  		




  
  16
  
    
        <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />


  		




  
  17
  
    
      </dependentAssembly>


  		




  14
  18
  
    
    </assemblyBinding>


  		




  15
  19
  
    
  </runtime>


  		




  16
  20
  
    
    <system.serviceModel>


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/App.xaml
    
  





  11
  11
  
    
            </ResourceDictionary.MergedDictionaries>


  		




  12
  12
  
    
        </ResourceDictionary>


  		




  13
  13
  
    
    </Application.Resources>


  		




  14
  
  
    
    


  		




  15
  14
  
    
</Application>


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/MainWindow.xaml
    
  





  22
  22
  
    
    <Window.DataContext>


  		




  23
  23
  
    
        <vm:MainViewModel/>


  		




  24
  24
  
    
    </Window.DataContext>


  		




  25
  
  
    
    <materialDesign:DialogHost x:Name="m_dialogHost" Identifier="dialogHost" DialogTheme="Light">


  		




  
  25
  
    
    <materialDesign:DialogHost x:Name="m_dialogHost" Identifier="dialogHost">


  		




  26
  26
  
    
        <materialDesign:DrawerHost IsLeftDrawerOpen="{Binding ElementName=MenuToggleButton, Path=IsChecked}">


  		




  27
  27
  
    
            <materialDesign:DrawerHost.LeftDrawerContent>


  		




  28
  28
  
    
                <DockPanel MinWidth="212">


  		




  ......




  77
  77
  
    
                                  VerticalScrollBarVisibility="Auto">


  		




  78
  78
  
    
                        <ContentControl Content="{Binding SelectNavigationItem.Content}"/>


  		




  79
  79
  
    
                    </ScrollViewer>


  		




  80
  
  
    
                    <materialDesign:Snackbar MessageQueue="{materialDesign:MessageQueue}" x:Name="MainSnackbar"


  		




  81
  
  
    
                                            Grid.Row="1" />


  		




  82
  80
  
    
                </Grid>


  		




  83
  81
  
    
            </Grid>


  		




  84
  82
  
    
        </materialDesign:DrawerHost>


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj
    
  





  65
  65
  
    
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">


  		




  66
  66
  
    
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>


  		




  67
  67
  
    
    </Reference>


  		




  68
  
  
    
    <Reference Include="MaterialDesignColors, Version=1.2.0.325, Culture=neutral, processorArchitecture=MSIL">


  		




  69
  
  
    
      <HintPath>..\packages\MaterialDesignColors.1.2.0\lib\net45\MaterialDesignColors.dll</HintPath>


  		




  
  68
  
    
    <Reference Include="MaterialDesignColors">


  		




  
  69
  
    
      <HintPath>..\..\..\..\..\Lib\MaterialDesignColors.dll</HintPath>


  		




  70
  70
  
    
    </Reference>


  		




  71
  
  
    
    <Reference Include="MaterialDesignExtensions, Version=2.6.0.0, Culture=neutral, processorArchitecture=MSIL">


  		




  72
  
  
    
      <HintPath>..\packages\MaterialDesignExtensions.2.6.0\lib\net45\MaterialDesignExtensions.dll</HintPath>


  		




  73
  
  
    
    </Reference>


  		




  74
  
  
    
    <Reference Include="MaterialDesignThemes.Wpf, Version=2.6.0.325, Culture=neutral, processorArchitecture=MSIL">


  		




  75
  
  
    
      <HintPath>..\packages\MaterialDesignThemes.2.6.0\lib\net45\MaterialDesignThemes.Wpf.dll</HintPath>


  		




  
  71
  
    
    <Reference Include="MaterialDesignThemes.Wpf">


  		




  
  72
  
    
      <HintPath>..\..\..\..\..\Lib\MaterialDesignThemes.Wpf.dll</HintPath>


  		




  76
  73
  
    
    </Reference>


  		




  77
  74
  
    
    <Reference Include="Microsoft.EntityFrameworkCore">


  		




  78
  75
  
    
      <HintPath>C:\Program Files\dotnet\sdk\NuGetFallbackFolder\microsoft.entityframeworkcore\2.2.0\lib\netstandard2.0\Microsoft.EntityFrameworkCore.dll</HintPath>


  		




  79
  76
  
    
    </Reference>


  		




  80
  
  
    
    <Reference Include="Microsoft.Expression.Interactions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">


  		




  81
  
  
    
      <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\Microsoft.Expression.Interactions.dll</HintPath>


  		




  
  77
  
    
    <Reference Include="Microsoft.Expression.Interactions, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">


  		




  
  78
  
    
      <HintPath>..\packages\Expression.Blend.Sdk.WPF.1.0.1\lib\net45\Microsoft.Expression.Interactions.dll</HintPath>


  		




  82
  79
  
    
    </Reference>


  		




  83
  80
  
    
    <Reference Include="System" />


  		




  84
  81
  
    
    <Reference Include="System.Data" />


  		




  ......




  86
  83
  
    
    <Reference Include="System.Runtime.Serialization" />


  		




  87
  84
  
    
    <Reference Include="System.ServiceModel" />


  		




  88
  85
  
    
    <Reference Include="System.Windows.Forms" />


  		




  89
  
  
    
    <Reference Include="System.Windows.Interactivity, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">


  		




  90
  
  
    
      <HintPath>..\packages\System.Windows.Interactivity.WPF.2.0.20525\lib\net40\System.Windows.Interactivity.dll</HintPath>


  		




  
  86
  
    
    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">


  		




  
  87
  
    
      <HintPath>..\packages\Expression.Blend.Sdk.WPF.1.0.1\lib\net45\System.Windows.Interactivity.dll</HintPath>


  		




  91
  88
  
    
    </Reference>


  		




  92
  89
  
    
    <Reference Include="System.Xml" />


  		




  93
  90
  
    
    <Reference Include="Microsoft.CSharp" />


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/Themes/MaterialDesignTheme.xaml
    
  





  3
  3
  
    
                    xmlns:system="clr-namespace:System;assembly=mscorlib"


  		




  4
  4
  
    
                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">


  		




  5
  5
  
    
    <ResourceDictionary.MergedDictionaries>


  		




  6
  
  
    
        <ResourceDictionary Source="/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml" />


  		




  7
  
  
    
        <ResourceDictionary Source="/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml" />


  		




  8
  
  
    
        <ResourceDictionary Source="/MaterialDesignThemes.Wpf;component/Themes/generic.xaml" />


  		




  9
  
  
    
        <ResourceDictionary Source="/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />


  		




  10
  
  
    
        <ResourceDictionary Source="/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Purple.xaml" />


  		




  
  6
  
    
        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Light.xaml"/>


  		




  
  7
  
    
        <ResourceDictionary Source="pack://application:,,,/MaterialDesignThemes.Wpf;component/Themes/MaterialDesignTheme.Defaults.xaml"/>


  		




  
  8
  
    
        <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Primary/MaterialDesignColor.Blue.xaml" />


  		




  
  9
  
    
        <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.DeepPurple.xaml" />


  		




  
  10
  
    
        <ResourceDictionary Source="pack://application:,,,/MaterialDesignColors;component/Themes/Recommended/Accent/MaterialDesignColor.Lime.xaml" />


  		




  11
  11
  
    
    </ResourceDictionary.MergedDictionaries>


  		




  12
  12
  
    
</ResourceDictionary>


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/MainViewModel.cs
    
  





  12
  12
  
    
using Markus.Service.Helper;


  		




  13
  13
  
    
using Markus.Service.StationController.Data;


  		




  14
  14
  
    
using Markus.Service.WcfClient.StationServiceTask;


  		




  15
  
  
    
using MaterialDesignExtensions.Model;


  		




  16
  15
  
    

  		




  17
  16
  
    
namespace Markus.Service.StationController.ViewModel


  		




  18
  17
  
    
{


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/Views/MergeDataView.xaml
    
  





  7
  7
  
    
             xmlns:local="clr-namespace:Markus.Service.StationController.ViewModel"


  		




  8
  8
  
    
             mc:Ignorable="d" 


  		




  9
  9
  
    
             d:DesignHeight="450" d:DesignWidth="800">


  		




  
  10
  
    
    <UserControl.Resources>


  		




  
  11
  
    
    </UserControl.Resources>


  		




  10
  12
  
    
    <Grid>


  		




  11
  13
  
    
        <Grid.RowDefinitions>


  		




  12
  14
  
    
            <RowDefinition Height="3.5*"/>


  		




  ......




  16
  18
  
    
            <GroupBox Header="Service Alive Items" Style="{DynamicResource MaterialDesignGroupBox}" Margin="3" BorderThickness="0">


  		




  17
  19
  
    
                <Views:AliveView /> 


  		




  18
  20
  
    
            </GroupBox>


  		




  19
  
  
    
        <GroupBox Header="Error Items" Grid.Row="1" Style="{DynamicResource MaterialDesignGroupBox}" Margin="3" BorderThickness="0">


  		




  
  21
  
    
        <GroupBox  Header="Error Items" Grid.Row="1" materialDesign:ColorZoneAssist.Mode="Inverted"  Style="{DynamicResource MaterialDesignGroupBox}" Margin="3" BorderThickness="0">


  		




  20
  22
  
    
            <Views:DataBaseByStatusView/>


  		




  21
  23
  
    
        </GroupBox>


  		




  22
  
  
    
        <GroupBox Header="Completed Items"  Grid.Row="2" Style="{DynamicResource MaterialDesignGroupBox}" Margin="3" BorderThickness="0">


  		




  
  24
  
    
        <GroupBox Header="Completed Items"  Grid.Row="2" Style="{DynamicResource MaterialDesignGroupBox}"  Margin="3" BorderThickness="0">


  		




  23
  25
  
    
            <Views:DataBaseByStatusView/>


  		




  24
  26
  
    
        </GroupBox>


  		




  25
  27
  
    
        


  		












  

    
      ConvertService/ServiceBase/Markus.Service.StationController/packages.config
    
  





  1
  1
  
    
<?xml version="1.0" encoding="utf-8"?>


  		




  2
  2
  
    
<packages>


  		




  
  3
  
    
  <package id="Expression.Blend.Sdk.WPF" version="1.0.1" targetFramework="net45" />


  		




  3
  4
  
    
  <package id="Markus.Message" version="1.5.4" targetFramework="net45" />


  		




  4
  
  
    
  <package id="MaterialDesignColors" version="1.2.0" targetFramework="net45" />


  		




  5
  
  
    
  <package id="MaterialDesignExtensions" version="2.6.0" targetFramework="net461" />


  		




  6
  
  
    
  <package id="MaterialDesignThemes" version="2.6.0" targetFramework="net45" />


  		




  7
  5
  
    
  <package id="Microsoft.CSharp" version="4.5.0" targetFramework="net45" />


  		




  8
  6
  
    
  <package id="Salaros.ConfigParser" version="0.3.3" targetFramework="net461" />


  		




  9
  
  
    
  <package id="System.Windows.Interactivity.WPF" version="2.0.20525" targetFramework="net461" />


  		




  10
  7
  
    
</packages>


  		












내보내기  Unified diff




         
        

    















   



  

  
  클립보드 이미지 추가
  (최대 크기: 500 MB)