프로젝트

일반

사용자정보

개정판 b2948d06

IDb2948d06c486bf0589d30b4091a51b9299139370
상위 058a4c0d
하위 69f2fae1, 3ae68e58

김태성이(가) 9달 전에 추가함

issue #00000 FinalPDF Result Link 업데이트 API 추가

Change-Id: I61608d9477c1e2e086bcb858fc8d8b1128a11e1e

차이점 보기:

KCOM/App.xaml.cs
26 26
        public string UserID { get; set; }
27 27
        public int Mode { get; set; }
28 28
    }
29
    public static OpenProperties ParamDecoding(string DecodingText, System.Text.Encoding oEncoding = null)
30
    {
31
        if (oEncoding == null)
32
            oEncoding = System.Text.Encoding.UTF8;
33

  
34
        byte[] byteArray = Convert.FromBase64String(DecodingText);
35

  
36
        string jsonBack = oEncoding.GetString(byteArray);
37

  
38
        return Newtonsoft.Json.JsonConvert.DeserializeObject<OpenProperties>(jsonBack);
39
    }
29 40
    /// <summary>
30 41
    /// App.xaml에 대한 상호 작용 논리
31 42
    /// </summary>
......
107 118
        public static IKCOM.KCOM_SystemInfo SystemInfo { get; set; }
108 119

  
109 120

  
110
        public static OpenProperties ParamDecoding(string DecodingText, System.Text.Encoding oEncoding = null)
111
        {
112
            if (oEncoding == null)
113
                oEncoding = System.Text.Encoding.UTF8;
114

  
115
            byte[] byteArray = Convert.FromBase64String(DecodingText);
116

  
117
            string jsonBack = oEncoding.GetString(byteArray);
118

  
119
            return Newtonsoft.Json.JsonConvert.DeserializeObject<OpenProperties>(jsonBack);
120
        }
121 121

  
122 122
        private string versionPath = null;
123 123
        //public SplashScreen splash = new SplashScreen("splash.png");
KCOM/Controls/SearchPanel.xaml.cs
103 103
                pageoption = chkCurrentPageOnly.IsChecked.Value;
104 104
            }));
105 105

  
106
            extractor.LoadDocumentFromFile(Common.ViewerDataModel.Instance.searchPDF.FullName);
107
            extractor.RegexSearch = true;
108

  
109
            //ocrAnalyzer.LoadDocumentFromFile(Common.ViewerDataModel.Instance.searchPDF.FullName);
106
            //Bytescout.PDFExtractor.SearchablePDFMaker maker = new Bytescout.PDFExtractor.SearchablePDFMaker(RegistrationName, RegistrationKey);
107
            //maker.LoadDocumentFromFile(Common.ViewerDataModel.Instance.searchPDF.FullName);
108
            //maker.MakePDFSearchable(Common.ViewerDataModel.Instance.searchPDF.FullName + ".pdf");
109
            
110
            //maker.Dispose();
111
            extractor.LoadDocumentFromFile(Common.ViewerDataModel.Instance.searchPDF.FullName + ".pdf");
110 112

  
111 113
            if (pageoption)
112 114
            {
......
114 116

  
115 117
                //Bytescout.PDFExtractor.OCRAnalysisResults analysisResults = ocrAnalyzer.AnalyzeByOCRConfidence(currentPage);
116 118
                //ocrAnalyzer.ApplyResults(analysisResults, extractor);
117

  
119
                
118 120
                if (extractor.Find(currentPage, searchString, false))
119 121
                    do
120 122
                    {
KCOM_API/MarkusService.svc.cs
145 145
        }
146 146

  
147 147

  
148
        [WebGet(UriTemplate = "SetFinalPDFUrl?prj_No={prj_No}&document_Id={document_Id}&document_Url={document_Url}", BodyStyle = WebMessageBodyStyle.Wrapped, RequestFormat = WebMessageFormat.Json, ResponseFormat = WebMessageFormat.Json)]
149
        [OperationContract]
150
        public string SetFinalPDFUrl(string prj_No, string document_Id, string document_Url)
151
        {
152
            string _result = null;
153
            try
154
            {
155
                logger.Info($"SetFinalPDFUrl call prj_No : {prj_No}  document_Id : {document_Id}  document_Url : {document_Url}");
156

  
157
                string sCIConnString = ConfigurationManager.ConnectionStrings["CIConnectionString"].ConnectionString;
158
                using (CIEntities _kcomEntity = new CIEntities(sCIConnString))
159
                {
160
                    var doc = _kcomEntity.DOCUMENT_ITEM.Where(d => d.PROJECT_NO == prj_No && d.ID == document_Id).FirstOrDefault();
161
                    if (doc != null)
162
                    {
163
                        doc.RESULT = document_Url;
164
                        _kcomEntity.SaveChanges();
165
                        _result = true.ToString();
166
                    }
167
                    else
168
                    {
169
                        _result = $"prj_No : {prj_No}  document_Id : {document_Id}  document_Url : {document_Url} Not Found";
170
                    }
171
                }
172
            }
173
            catch (Exception ex)
174
            {
175
                logger.Error($"SetFinalPDFUrl call prj_No : {prj_No}  document_Id : {document_Id}  document_Url : {document_Url}",ex);
176
                _result = "Error";
177
            }
178
            return _result;
179
        }
180

  
148 181
        private string SendKcom(string rev_No, string document_No, string document_Name, string group_No, string prj_No, string document_Id, string document_Url)
149 182
        {
150 183
            string result = false.ToString();
KCOM_API/Properties/PublishProfiles/FolderProfile.pubxml.user
7 7
  <PropertyGroup>
8 8
    <TimeStampOfAssociatedLegacyPublishXmlFile />
9 9
    <_PublishTargetUrl>D:\Source\Repos\MARKUS\publish\MarkusAPI</_PublishTargetUrl>
10
    <History>True|2024-03-28T07:09:53.6272860Z;True|2024-03-20T17:07:27.3327545+09:00;True|2024-03-20T16:06:18.5686998+09:00;True|2024-03-20T16:05:52.6835054+09:00;True|2024-03-20T15:43:58.3135951+09:00;True|2024-03-20T15:03:19.8255162+09:00;True|2024-03-20T14:42:26.2958970+09:00;True|2024-01-19T17:15:52.8649804+09:00;True|2024-01-19T09:35:44.7523623+09:00;True|2024-01-18T17:04:43.6538702+09:00;True|2024-01-12T10:31:11.4820004+09:00;True|2023-11-15T12:54:34.6710396+09:00;True|2023-08-05T17:11:18.9473506+09:00;True|2023-08-05T17:10:51.1260416+09:00;True|2023-08-05T17:10:15.6768362+09:00;True|2023-08-05T17:05:00.6983156+09:00;True|2023-08-05T17:03:52.8404213+09:00;True|2023-08-05T17:02:21.8070007+09:00;True|2023-08-05T16:59:21.4828422+09:00;True|2023-04-26T09:20:18.0086339+09:00;True|2023-04-07T16:43:58.8972257+09:00;True|2023-04-07T14:06:40.4572438+09:00;True|2023-04-07T09:30:34.5436846+09:00;True|2023-04-06T14:45:18.6746547+09:00;True|2022-11-08T17:24:41.4219984+09:00;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
10
    <History>True|2024-04-08T05:30:26.6088230Z;True|2024-03-28T16:09:53.6272860+09:00;True|2024-03-20T17:07:27.3327545+09:00;True|2024-03-20T16:06:18.5686998+09:00;True|2024-03-20T16:05:52.6835054+09:00;True|2024-03-20T15:43:58.3135951+09:00;True|2024-03-20T15:03:19.8255162+09:00;True|2024-03-20T14:42:26.2958970+09:00;True|2024-01-19T17:15:52.8649804+09:00;True|2024-01-19T09:35:44.7523623+09:00;True|2024-01-18T17:04:43.6538702+09:00;True|2024-01-12T10:31:11.4820004+09:00;True|2023-11-15T12:54:34.6710396+09:00;True|2023-08-05T17:11:18.9473506+09:00;True|2023-08-05T17:10:51.1260416+09:00;True|2023-08-05T17:10:15.6768362+09:00;True|2023-08-05T17:05:00.6983156+09:00;True|2023-08-05T17:03:52.8404213+09:00;True|2023-08-05T17:02:21.8070007+09:00;True|2023-08-05T16:59:21.4828422+09:00;True|2023-04-26T09:20:18.0086339+09:00;True|2023-04-07T16:43:58.8972257+09:00;True|2023-04-07T14:06:40.4572438+09:00;True|2023-04-07T09:30:34.5436846+09:00;True|2023-04-06T14:45:18.6746547+09:00;True|2022-11-08T17:24:41.4219984+09:00;True|2022-11-05T17:01:00.1307411+09:00;True|2022-11-05T16:59:58.7400279+09:00;</History>
11 11
  </PropertyGroup>
12 12
  <ItemGroup>
13 13
    <File Include="ActiveService.svc">
......
74 74
      <publishTime>03/28/2024 16:09:39</publishTime>
75 75
    </File>
76 76
    <File Include="bin/IKCOM.dll">
77
      <publishTime>03/28/2024 16:09:44</publishTime>
77
      <publishTime>04/02/2024 10:53:19</publishTime>
78 78
    </File>
79 79
    <File Include="bin/IKCOM.pdb">
80
      <publishTime>03/28/2024 16:09:44</publishTime>
80
      <publishTime>04/02/2024 10:53:19</publishTime>
81 81
    </File>
82 82
    <File Include="bin/it/ZedGraph.resources.dll">
83 83
      <publishTime>09/19/2015 15:28:04</publishTime>
......
86 86
      <publishTime>09/19/2015 15:28:04</publishTime>
87 87
    </File>
88 88
    <File Include="bin/KCOMDataModel.dll">
89
      <publishTime>03/20/2024 17:06:13</publishTime>
89
      <publishTime>04/01/2024 16:32:07</publishTime>
90 90
    </File>
91 91
    <File Include="bin/KCOMDataModel.dll.config">
92 92
      <publishTime>06/08/2020 15:07:57</publishTime>
93 93
    </File>
94 94
    <File Include="bin/KCOMDataModel.pdb">
95
      <publishTime>03/20/2024 17:06:13</publishTime>
95
      <publishTime>04/01/2024 16:32:07</publishTime>
96 96
    </File>
97 97
    <File Include="bin/KCOM_API.dll">
98
      <publishTime>03/28/2024 16:09:46</publishTime>
98
      <publishTime>04/08/2024 14:30:22</publishTime>
99 99
    </File>
100 100
    <File Include="bin/KCOM_API.pdb">
101
      <publishTime>03/28/2024 16:09:46</publishTime>
101
      <publishTime>04/08/2024 14:30:22</publishTime>
102 102
    </File>
103 103
    <File Include="bin/Leadtools.Codecs.Cmp.dll">
104 104
      <publishTime>06/29/2017 11:38:22</publishTime>
......
269 269
      <publishTime>02/27/2024 17:30:25</publishTime>
270 270
    </File>
271 271
    <File Include="Web.config">
272
      <publishTime>03/28/2024 16:09:47</publishTime>
272
      <publishTime>04/08/2024 14:30:23</publishTime>
273 273
    </File>
274 274
  </ItemGroup>
275 275
</Project>
MARKUSStart/Markus/MainWindow.xaml.cs
38 38

  
39 39
            Process.Start(startInfo);
40 40
        }
41

  
41 42
        public static string CreateMarkusParam(string projectNo, string documentID, string userID, bool? partner, bool? createfinal, bool? newcomment)
42 43
        {
43 44
            ViewInfo viewInfo = new ViewInfo();
......
61 62
            return Convert.ToBase64String(oEncoding.GetBytes(EncodingText));
62 63

  
63 64
        }
64
    }    
65
    
66
    public class ViewInfo
67
    {
68
        public string DocumentItemID { get; set; }
69
        public bool? bPartner { get; set; } = false;
70
        public bool? CreateFinalPDFPermission { get; set; } = false;
71
        public bool? NewCommentPermission { get; set; } = false;
72
        public string ProjectNO { get; set; }
73
        public string UserID { get; set; }
74 65
    }
75

  
76 66
        /// <summary>
77 67
        /// 생성자 
78 68
        /// </summary>
......
83 73
        //    NewCommentPermission = true;
84 74
        //}
85 75

  
86
    }
87
}
76
 }

내보내기 Unified diff

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