프로젝트

일반

사용자정보

개정판 30680747

ID3068074745b89e8579392a3b6ceefea4c872dfd7
상위 889b2b2b
하위 1229f1b3

semi 이(가) 약 5년 전에 추가함

Convert_Path 프로시저 추가 및 DOCUMENT_URLFilter 추가

Change-Id: Ia279d161263beddcc0d8e61404302fbee667c748

차이점 보기:

ConvertService/ServiceBase/Markus.Service.StationController/Controls/DatabaseFilter.xaml
22 22
            <Grid.RowDefinitions>
23 23
                <RowDefinition />
24 24
                <RowDefinition />
25
                <RowDefinition/>
25 26
            </Grid.RowDefinitions>
26 27
            <Grid.ColumnDefinitions>
27 28
                <ColumnDefinition Width="Auto"/>
......
91 92
         HorizontalAlignment="Stretch"
92 93
         VerticalAlignment="Center" Margin="2,0"/>
93 94

  
94

  
95
            <TextBlock Text="Document_URL " Grid.Row="2" Grid.Column="0"  VerticalAlignment="Center" HorizontalAlignment="Left"/>
96
            <telerik:RadMaskedTextInput IsClearButtonVisible="True" 
97
         EmptyContent="DOCUMENT_URL"  Value="{Binding DOCUMENT_URLFilter, UpdateSourceTrigger=PropertyChanged, Mode=TwoWay}"
98
         TextMode="PlainText" Grid.Row="2" Grid.Column="1" Grid.ColumnSpan="11"
99
         HorizontalAlignment="Stretch"
100
         VerticalAlignment="Center" Margin="2,0"/>
95 101
        </Grid>
96 102
        <Grid  Grid.Row="1"/>
97 103
        <StackPanel Grid.Row="3" Grid.ColumnSpan="11">
ConvertService/ServiceBase/Markus.Service.StationController/Markus.Service.StationController.csproj
75 75
    <Reference Include="LinqKit, Version=1.1.17.0, Culture=neutral, PublicKeyToken=bc217f8844052a91, processorArchitecture=MSIL">
76 76
      <HintPath>..\packages\LinqKit.1.1.17\lib\net45\LinqKit.dll</HintPath>
77 77
    </Reference>
78
    <Reference Include="Markus.EntityModel, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
79
      <HintPath>..\packages\MarkusDatabase.1.8.0\lib\net45\Markus.EntityModel.dll</HintPath>
80
    </Reference>
81 78
    <Reference Include="Markus.Message, Version=1.5.3.0, Culture=neutral, processorArchitecture=MSIL">
82 79
      <HintPath>..\packages\Markus.Message.1.5.4\lib\net45\Markus.Message.dll</HintPath>
83 80
    </Reference>
ConvertService/ServiceBase/Markus.Service.StationController/MarkusEntities.cs
1 1

2
namespace Markus.EntityModel
2
namespace Markus.Service.StationController
3 3
{
4 4
    using System;
5 5
    using System.Data.Entity;
......
7 7
    using System.Data.Entity.Infrastructure;
8 8
    using System.Data.SqlClient;
9 9

  
10
    public partial class MarkusModel : DbContext
10
    public partial class markusEntities : DbContext
11 11
    {
12 12
        private const string providerName = "System.Data.SqlClient";
13 13
        private const string MarkusMeta = @"res://*/MarkusModel.csdl|res://*/MarkusModel.ssdl|res://*/MarkusModel.msl";
14 14

  
15
        public MarkusModel(string ConnectionString)
15
        public markusEntities(string ConnectionString)
16 16
            : base(ConnectionStringBuilder(ConnectionString).ToString())
17 17
        {
18 18
            this.Database.CommandTimeout = 60;
ConvertService/ServiceBase/Markus.Service.StationController/MarkusModel.Context.cs
28 28
        }
29 29
    
30 30
    
31
        public virtual ObjectResult<SELECT_CONVERT_ITEM_Result> SELECT_CONVERT_ITEM(string p_ID, string p_PROJECT_NO, string p_DOCUMENT_ID, Nullable<int> p_STATUS, Nullable<int> p_TAKE_COUNT, Nullable<System.DateTime> p_BEGIN_CREATE_DATETIME, Nullable<System.DateTime> p_FINISH_CREATE_DATETIME, Nullable<System.DateTime> p_BEGIN_START_DATETIE, Nullable<System.DateTime> p_FINISH_START_DATETIME, Nullable<System.DateTime> p_BEGIN_END_DATETIME, Nullable<System.DateTime> p_FINISH_END_DATETIME, string p_GROUP_NO, string p_DOCUMENT_NAME, string p_DOCUMENT_NO, string p_REVISION, string p_SERVICE_ID, Nullable<int> p_RECONVERTER)
31
        public virtual ObjectResult<SELECT_CONVERT_ITEM_Result> SELECT_CONVERT_ITEM(string p_ID, string p_PROJECT_NO, string p_DOCUMENT_ID, Nullable<int> p_STATUS, Nullable<int> p_TAKE_COUNT, Nullable<System.DateTime> p_BEGIN_CREATE_DATETIME, Nullable<System.DateTime> p_FINISH_CREATE_DATETIME, Nullable<System.DateTime> p_BEGIN_START_DATETIE, Nullable<System.DateTime> p_FINISH_START_DATETIME, Nullable<System.DateTime> p_BEGIN_END_DATETIME, Nullable<System.DateTime> p_FINISH_END_DATETIME, string p_GROUP_NO, string p_DOCUMENT_NAME, string p_DOCUMENT_NO, string p_REVISION, string p_SERVICE_ID, Nullable<int> p_RECONVERTER, string p_DOCUMENT_URL)
32 32
        {
33 33
            var p_IDParameter = p_ID != null ?
34 34
                new ObjectParameter("P_ID", p_ID) :
......
98 98
                new ObjectParameter("P_RECONVERTER", p_RECONVERTER) :
99 99
                new ObjectParameter("P_RECONVERTER", typeof(int));
100 100
    
101
            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<SELECT_CONVERT_ITEM_Result>("markusEntities.SELECT_CONVERT_ITEM", p_IDParameter, p_PROJECT_NOParameter, p_DOCUMENT_IDParameter, p_STATUSParameter, p_TAKE_COUNTParameter, p_BEGIN_CREATE_DATETIMEParameter, p_FINISH_CREATE_DATETIMEParameter, p_BEGIN_START_DATETIEParameter, p_FINISH_START_DATETIMEParameter, p_BEGIN_END_DATETIMEParameter, p_FINISH_END_DATETIMEParameter, p_GROUP_NOParameter, p_DOCUMENT_NAMEParameter, p_DOCUMENT_NOParameter, p_REVISIONParameter, p_SERVICE_IDParameter, p_RECONVERTERParameter);
101
            var p_DOCUMENT_URLParameter = p_DOCUMENT_URL != null ?
102
                new ObjectParameter("P_DOCUMENT_URL", p_DOCUMENT_URL) :
103
                new ObjectParameter("P_DOCUMENT_URL", typeof(string));
104
    
105
            return ((IObjectContextAdapter)this).ObjectContext.ExecuteFunction<SELECT_CONVERT_ITEM_Result>("markusEntities.SELECT_CONVERT_ITEM", p_IDParameter, p_PROJECT_NOParameter, p_DOCUMENT_IDParameter, p_STATUSParameter, p_TAKE_COUNTParameter, p_BEGIN_CREATE_DATETIMEParameter, p_FINISH_CREATE_DATETIMEParameter, p_BEGIN_START_DATETIEParameter, p_FINISH_START_DATETIMEParameter, p_BEGIN_END_DATETIMEParameter, p_FINISH_END_DATETIMEParameter, p_GROUP_NOParameter, p_DOCUMENT_NAMEParameter, p_DOCUMENT_NOParameter, p_REVISIONParameter, p_SERVICE_IDParameter, p_RECONVERTERParameter, p_DOCUMENT_URLParameter);
102 106
        }
103 107
    
104 108
        public virtual int SELECT_RERECONVERT_ITEM(string p_ID, Nullable<int> p_RECONVERTER, Nullable<System.DateTime> p_CREATE_DATETIME, Nullable<int> p_STATUS, Nullable<System.DateTime> p_END_DATETIME)
ConvertService/ServiceBase/Markus.Service.StationController/MarkusModel.edmx
32 32
          <Parameter Name="P_REVISION" Type="nvarchar" Mode="In" />
33 33
          <Parameter Name="P_SERVICE_ID" Type="nvarchar" Mode="In" />
34 34
          <Parameter Name="P_RECONVERTER" Type="int" Mode="In" />
35
          <Parameter Name="P_DOCUMENT_URL" Type="nvarchar" Mode="In" />
35 36
        </Function>
36 37
        <Function Name="SELECT_FINAL_PDF_DELETE" Aggregate="false" BuiltIn="false" NiladicFunction="false" IsComposable="false" ParameterTypeSemantics="AllowImplicitConversion" Schema="dbo">
37 38
          <Parameter Name="P_ID" Type="nvarchar" Mode="In" />
......
93 94
            <Parameter Name="P_REVISION" Mode="In" Type="String" />
94 95
            <Parameter Name="P_SERVICE_ID" Mode="In" Type="String" />
95 96
            <Parameter Name="P_RECONVERTER" Mode="In" Type="Int32" />
97
            <Parameter Name="P_DOCUMENT_URL" Mode="In" Type="String" />
96 98
          </FunctionImport>
97 99
          <FunctionImport Name="SELECT_RERECONVERT_ITEM">
98 100
            <Parameter Name="P_ID" Mode="In" Type="String" />
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/ConvertAddDialogViewModel.cs
78 78
            try
79 79
            {
80 80

  
81
                using (markusEntities entities = new markusEntities())
81
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
82 82
                {
83 83
                    string ConverAdd_ID = GuidExtension.shortGuid();
84 84
                    var items = entities.SELECT_CONVERT_INSERT(ConverAdd_ID, ConverAdd_Project_NO, ConverAdd_DOCUMENT_URL, ConverAdd_DOCUMENT_ID);
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/DataBaseItemsModel.cs
414 414
            }
415 415
        }
416 416

  
417
        public string _DOCUMENT_URLFilter;
418
        public string DOCUMENT_URLFilter
419
        {
420
            get { return _DOCUMENT_URLFilter; }
421
            set
422
            {
423
                if (_DOCUMENT_URLFilter == "")
424
                {
425
                    _DOCUMENT_URLFilter = null;
426
                }
427
                else if (_DOCUMENT_URLFilter != value)
428
                {
429
                    _DOCUMENT_URLFilter = value;
430
                    OnPropertyChanged(() => DOCUMENT_URLFilter);
431
                }
432
            }
433
        }
434

  
417 435
        static DateTime DefaultCreateTime = DateTime.Now;
418 436
        private DateTime _SelectedCreateTimeBegin = DefaultCreateTime;
419 437
        public DateTime SelectedCreateTimeBegin
......
544 562
                });
545 563
            }
546 564

  
547
            await Task.Delay(5000);
565
            //await Task.Delay(5000);
566
            await Task.Delay(10000);
548 567

  
549 568
            //System.Threading.Thread.Sleep(new TimeSpan(0,0,0,0,100));
550 569

  
......
599 618
        {
600 619
            try
601 620
            {
602
                using (markusEntities entities = new markusEntities())
621
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
603 622
                {
604 623
                    List<ConvertItem> Listitems = new List<ConvertItem>();
605 624

  
606 625
                    foreach (var coll in collection)
607 626
                    {
608
                        var items = entities.SELECT_CONVERT_ITEM(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null).ToList();
627
                        var items = entities.SELECT_CONVERT_ITEM(coll.ConvertID, coll.ProjectNumber, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null,null).ToList();
609 628

  
610 629
                        foreach (var x in items)
611 630
                        {
......
652 671
        {
653 672
            try
654 673
            {
655
                using (markusEntities entities = new markusEntities())
674
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
656 675
                {
657 676

  
658 677
                    int _status = 0;
......
662 681
                    }
663 682

  
664 683
                    var items = entities.SELECT_CONVERT_ITEM(null, null, null, _status, SelectedCount.ValueMember, null, null, null,
665
                        null, null, null, null, null, null, null, null, null).ToList();
684
                        null, null, null, null, null, null, null, null, null, null).ToList();
666 685
                    //var items = database.GetConvertProjects(_status, ProjectNumberFilter, UniqueKeyFilter, Document_NameFilter, Service_IDFilter, Docuemnt_NOFilter
667 686
                    //    , ReconverterFilter, RevisionFilter)//x:database객체 y:statusCodeTypeList의값  Count()안에 predicator 조건 만족하면 count개수안에 넣음
668 687
                    //                      .Take(SelectedCount.ValueMember).ToList();
......
755 774
        {
756 775
            try
757 776
            {
758
                using (markusEntities entities = new markusEntities())
777
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
759 778
                {
760 779
                    int _status = 0;
761 780
                    if (SelectedStatus != null)
......
776 795
                    }
777 796

  
778 797
                    var items = entities.SELECT_CONVERT_ITEM(null, ProjectNumberFilter, UniqueKeyFilter, _status, SelectedCount.ValueMember, Start_CreateTime, Finish_CreateTime, null,
779
                        null, null, null, GroupNOFilter, Document_NameFilter, Docuemnt_NOFilter, RevisionFilter, Service_IDFilter, ReconverterFilter).ToList();
798
                        null, null, null, GroupNOFilter, Document_NameFilter, Docuemnt_NOFilter, RevisionFilter, Service_IDFilter, ReconverterFilter, DOCUMENT_URLFilter).ToList();
780 799

  
781 800
                    List<ConvertItem> Listitems = new List<ConvertItem>();
782 801

  
......
1159 1178
                }
1160 1179
                System.Diagnostics.Debug.WriteLine(resultRealConvert + "  " + resultFiltertConvert);
1161 1180

  
1162
                using (markusEntities entities = new markusEntities())
1181
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1163 1182
                {
1164 1183

  
1165
                    var items = entities.SELECT_CONVERT_ITEM(SelectFilterConvert.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null); //프로시저 이용
1184
                    var items = entities.SELECT_CONVERT_ITEM(SelectFilterConvert.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null); //프로시저 이용
1166 1185

  
1167 1186

  
1168 1187
                    foreach (var x in items)
......
1202 1221

  
1203 1222
        public int SetCleanUpItem(ConvertItem _ConvertItem)
1204 1223
        {
1205
            using (markusEntities entities = new markusEntities())
1224
            using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1206 1225
            {
1207 1226
                int result = 0;
1208 1227

  
1209
                var items = entities.SELECT_CONVERT_ITEM(_ConvertItem.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null).ToList();
1228
                var items = entities.SELECT_CONVERT_ITEM(_ConvertItem.ConvertID, null, null, null, 1, null, null, null, null, null, null, null, null, null, null, null, null, null).ToList();
1210 1229

  
1211 1230
                if (items.Count() > 0)
1212 1231
                {
......
1250 1269

  
1251 1270
        private string BaseStorage(string ProjectNo)
1252 1271
        {
1253
            using (markusEntities entities = new markusEntities())
1272
            using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1254 1273
            {
1255 1274
                string result = "";
1256 1275

  
1257
                var properties = entities.SELECT_CONVERT_ITEM(null, ProjectNo, null, null, 1, null, null, null, null, null, null, null, null,  null, null, null, null).ToList();
1276
                var properties = entities.SELECT_CONVERT_ITEM(null, ProjectNo, null, null, 1, null, null, null, null, null, null, null, null,  null, null, null, null, null).ToList();
1258 1277
                //var properties = entities.PROPERTIES.Where(f => f.PROPERTY == ProjectNo && f.TYPE == PROPERTIES_DEFINE.TILE_SOURCE_STORAGE);//
1259 1278

  
1260 1279

  
......
1380 1399

  
1381 1400
        private void OnClosed(object sender, WindowClosedEventArgs e)
1382 1401
        {
1383
            using (markusEntities entities = new markusEntities())
1402
            using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1384 1403
            {
1385 1404
                var result = e.DialogResult;
1386 1405
                if (result == true)
......
1492 1511
            ReconverterFilter = null;
1493 1512
            RevisionFilter = null;
1494 1513
            GroupNOFilter = null;
1514
            DOCUMENT_URLFilter = null;
1495 1515
            DefaultCreateTime = DateTime.Now;
1496 1516
            SelectedCreateTimeBegin = DefaultCreateTime;
1497 1517
            SelectedCreateTimeEnd = DefaultCreateTime;
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFAddDialogViewModel.cs
76 76
            try
77 77
            {
78 78

  
79
                using (markusEntities entities = new markusEntities())
79
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
80 80
                {
81 81
                    string ConverAdd_ID = GuidExtension.shortGuid();
82 82
                    var items = entities.SELECT_FINAL_PDF_INSERT(ConverAdd_ID, FinalPDFAdd_Project_NO, FinalPDFAdd_DocInfo_ID, FinalPDFAdd_Document_ID);
ConvertService/ServiceBase/Markus.Service.StationController/ViewModel/FinalPDFViewModel.cs
645 645
        {
646 646
            try
647 647
            {
648
                using (markusEntities entities = new markusEntities())
648
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
649 649
                {
650 650
                    List<ConvertItem> Listitems = new List<ConvertItem>();
651 651

  
......
684 684
        {
685 685
            try
686 686
            {
687
                using (markusEntities entities = new markusEntities())
687
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
688 688
                {
689 689
                    int _status = 0;
690 690
                    if (SelectedStatus != null)
......
794 794
        {
795 795
            try
796 796
            {
797
                using (markusEntities entities = new markusEntities())
797
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
798 798
                {
799 799
                    int _status = 0;
800 800
                    if (SelectedStatus != null)
......
1119 1119
                }
1120 1120
                System.Diagnostics.Debug.WriteLine(resultRealConvert + "  " + resultFiltertConvert);
1121 1121

  
1122
                using (markusEntities entities = new markusEntities())
1122
                using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1123 1123
                {
1124 1124

  
1125 1125
                    var items = entities.SELECT_FINAL_PDF_ITEM(SelectFilterConvert.ConvertID, null, null, null, null, null, null, null, null, 1, null, null, null, null, null, null, null, null); //프로시저 이용
......
1149 1149

  
1150 1150
        public int SetCleanUpItem(ConvertItem _ConvertItem)
1151 1151
        {
1152
            using (markusEntities entities = new markusEntities())
1152
            using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1153 1153
            {
1154 1154
                int result = 0;
1155 1155

  
......
1218 1218

  
1219 1219
        private string BaseStorage(string ProjectNo)
1220 1220
        {
1221
            using (markusEntities entities = new markusEntities())
1221
            using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1222 1222
            {
1223 1223
                string result = "";
1224 1224

  
......
1325 1325

  
1326 1326
        private void OnClosed(object sender, WindowClosedEventArgs e)
1327 1327
        {
1328
            using (markusEntities entities = new markusEntities())
1328
            using (markusEntities entities = new markusEntities(App.MarkusDataBaseConnecitonString))
1329 1329
            {
1330 1330
                var result = e.DialogResult;
1331 1331
                if (result == true)

내보내기 Unified diff

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