개정판 c1597feb
issue #00000 select문 수정
Change-Id: Ia31d739ef0fcf84f624530f8df7c5a4a945d550a
ConvertService/ServiceBase/Markus.Service.DataBase.Dapper/Markus.Service.DataBase.Dapper.csproj | ||
---|---|---|
90 | 90 |
<Compile Include="Entities\PROPERTIES.cs" /> |
91 | 91 |
<Compile Include="Entities\SERVICEPROPERTIES.cs" /> |
92 | 92 |
<Compile Include="Extensions.cs" /> |
93 |
<Compile Include="Handler\ParameterHandler.cs" /> |
|
94 | 93 |
<Compile Include="MixParameters.cs" /> |
95 | 94 |
<Compile Include="PropertiesTypeDefine.cs" /> |
96 | 95 |
<Compile Include="Properties\AssemblyInfo.cs" /> |
... | ... | |
142 | 141 |
</BootstrapperPackage> |
143 | 142 |
</ItemGroup> |
144 | 143 |
<ItemGroup> |
144 |
<Folder Include="Handler\" /> |
|
145 | 145 |
<Folder Include="Providers\" /> |
146 | 146 |
</ItemGroup> |
147 | 147 |
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> |
ConvertService/ServiceBase/Markus.Service.DataBase.Dapper/Repositories/DOCUMENTITEMRepository.cs | ||
---|---|---|
20 | 20 |
|
21 | 21 |
public async Task<DOCUMENTITEM> GetFirstAsync(string projectNo, string documentID) |
22 | 22 |
{ |
23 |
string SQL = "SELECT * FROM CDOCUMENT_ITEM WHERE PROJECT_NO = PROJECT_NO AND DOCUMENT_ID = DOCUMENT_ID"; |
|
23 |
string SQL = "SELECT * FROM CDOCUMENT_ITEM WHERE PROJECT_NO = PROJECT_NO AND DOCUMENT_ID = @DOCUMENT_ID";
|
|
24 | 24 |
|
25 | 25 |
var parameter = new MixParameters(DBMS); |
26 |
parameter.Add("PROJECT_NO", projectNo); |
|
27 |
parameter.Add("DOCUMENT_ID", documentID); |
|
26 |
parameter.Add("@PROJECT_NO", projectNo);
|
|
27 |
parameter.Add("@DOCUMENT_ID", documentID);
|
|
28 | 28 |
|
29 | 29 |
return await base.GetFirstAsync<DOCUMENTITEM>(SQL, parameter); |
30 | 30 |
} |
ConvertService/ServiceBase/Markus.Service.DataBase.Dapper/Repositories/PROPERTIESRepository.cs | ||
---|---|---|
21 | 21 |
|
22 | 22 |
} |
23 | 23 |
|
24 |
public async Task<List<PROPERTIES>> GetAsync(string PROPERTY, string TYPE) |
|
25 |
{ |
|
26 |
List<PROPERTIES> list = null; |
|
27 |
string SQL = "SELECT ID, TYPE, PROPERTY, VALUE FROM PROPERTIES WHERE "; |
|
28 |
|
|
29 |
var parameters = new MixParameters(DBMS); |
|
30 |
parameters.Add("PROPERTY", PROPERTY); |
|
31 |
parameters.Add("TYPE", TYPE); |
|
32 | 24 |
|
33 |
var result = await base.QueryAsync<PROPERTIES>(SQL, parameters); |
|
34 |
|
|
35 |
if (result == null) return null; |
|
36 |
list = result.ToList(); |
|
37 |
return list; |
|
38 |
} |
|
39 | 25 |
public async Task<PROPERTIES> GetFirstAsync(string PROPERTY, string TYPE) |
40 | 26 |
{ |
41 |
string SQL = "SELECT ID, TYPE, PROPERTY, VALUE FROM PROPERTIES WHERE PROPERTY = PROPERTY AND TYPE = TYPE"; |
|
27 |
string SQL = "SELECT ID, TYPE, PROPERTY, VALUE FROM PROPERTIES WHERE PROPERTY = PROPERTY AND TYPE = @TYPE";
|
|
42 | 28 |
|
43 | 29 |
var parameters = new MixParameters(DBMS); |
44 |
parameters.Add("PROPERTY", PROPERTY); |
|
45 |
parameters.Add("TYPE", TYPE); |
|
30 |
parameters.Add("@PROPERTY", PROPERTY);
|
|
31 |
parameters.Add("@TYPE", TYPE);
|
|
46 | 32 |
|
47 | 33 |
return await base.GetFirstAsync<PROPERTIES>(SQL, parameters); |
48 | 34 |
} |
ConvertService/ServiceBase/Markus.Service.DataBase.Dapper/Repositories/SERVICEPROPERTIESRepository.cs | ||
---|---|---|
36 | 36 |
|
37 | 37 |
public async Task<SERVICEPROPERTIES> GetSingleAsync(string ServiceID) |
38 | 38 |
{ |
39 |
string sql = "SELECT * FROM SERVICE_PROPERTIES WHERE ID = SERVICE_ID"; |
|
39 |
string sql = "SELECT * FROM SERVICE_PROPERTIES WHERE ID = @SERVICE_ID";
|
|
40 | 40 |
|
41 | 41 |
var parameter = new MixParameters(DBMS); |
42 |
parameter.Add("SERVICE_ID", ServiceID); |
|
42 |
parameter.Add("@SERVICE_ID", ServiceID);
|
|
43 | 43 |
|
44 | 44 |
var result = await base.GetFirstAsync<SERVICEPROPERTIES>(sql, parameter); |
45 | 45 |
|
ConvertService/ServiceBase/Markus.Service.DataBase.Dapper/RepositoriesInterfaces/IPROPERTIESRepository.cs | ||
---|---|---|
6 | 6 |
{ |
7 | 7 |
public interface IPROPERTIESRepository |
8 | 8 |
{ |
9 |
Task<List<PROPERTIES>> GetAsync(string PROPERTY, string TYPE); |
|
10 | 9 |
Task<PROPERTIES> GetFirstAsync(string PROPERTY, string TYPE); |
11 | 10 |
} |
12 | 11 |
} |
ConvertService/ServiceBase/Markus.Service.Station/ServiceStation.cs | ||
---|---|---|
1 | 1 |
using log4net; |
2 |
using Markus.Service.DataBase; |
|
2 | 3 |
using Markus.Service.DataBase.Entities; |
3 | 4 |
using Markus.Service.DataBase.Repositories; |
4 | 5 |
using Markus.Service.Extensions; |
... | ... | |
43 | 44 |
private Uri gServiceHostAddress; |
44 | 45 |
|
45 | 46 |
private string MarkusDBConnectionString; |
46 |
private DataBase.DBMSType DBMSType;
|
|
47 |
private DBMSType DBMSType; |
|
47 | 48 |
private string DownloadTempFolder; |
48 | 49 |
private string FontsFolder; |
49 | 50 |
private int MultiThreadMaxPages; |
... | ... | |
102 | 103 |
MarkusDBConnectionString = AESEncrypter.Decrypt(config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.MARKUS_CONNECTION_STRING)); |
103 | 104 |
|
104 | 105 |
var dbtype = config.GetValue(CONFIG_DEFINE.SERVICE, CONFIG_DEFINE.DBTYPE); |
105 |
|
|
106 |
if(string.IsNullOrWhiteSpace(dbtype)) |
|
106 |
if (string.IsNullOrWhiteSpace(dbtype)) |
|
107 | 107 |
{ |
108 | 108 |
throw new Exception("DBTYPE not defined in SERVICE section"); |
109 | 109 |
} |
110 | 110 |
else |
111 | 111 |
{ |
112 |
if (!Enum.TryParse<Markus.Service.DataBase.DBMSType>(dbtype, out DBMSType))
|
|
112 |
if (!Enum.TryParse<DBMSType>(dbtype, out DBMSType)) |
|
113 | 113 |
{ |
114 | 114 |
throw new Exception("DBTYPE of SERVICE is MSSQL,POSTGRESQL."); |
115 | 115 |
} |
ConvertService/ServiceBase/Markus.Service.Station/ServiceStation.ini | ||
---|---|---|
11 | 11 |
#구분자는 ',' |
12 | 12 |
SERVICE_LIST = |
13 | 13 |
|
14 |
#MSQL,POSTGRESQL |
|
15 |
DBTYPE = POSTGRESQL
|
|
14 |
#MSSQL,POSTGRESQL
|
|
15 |
DBTYPE = MSSQL
|
|
16 | 16 |
# DAELIM |
17 | 17 |
#MarkusDataBaseConnectionString = yRW0I8OJY/boJcR9rTFeH229g456BwO8BaXQbW8h6iCR10JRc5tOl2BDWa1595q0bvW9uD5HsHn9ke4oK3yaw2OYHh8pgYKdhW48xeAl49510h1DPv8uSbqcWdwZ2AjernORxxaEAUqHZb5DFlndcWuid82ZwP/EGxGNhaaCG+KVogeHwI5FZZKrmUTWe3159qk11Q4XswrHeLy8HQn5Qg== |
18 | 18 |
|
... | ... | |
20 | 20 |
#MarkusDataBaseConnectionString = AkxeK6rlR/pvDogtyJST7sHEFe9zDPwVf8W7ulsvVrFnqBcpEKFhacEE4OpBvuJYrkkubP91v40LyQ6mReCd3pXhTAPs5gL4W6eRhG6GszFyxlv0fncEZ+aacRQNNIzTlQCenZdTJdt2ylaRyCRYXb9HZCIeZKcuDef2pn1ny3dp90lB2vv15bn5UIaqIZA8bLSbBTXt8Ft4Xttl4In5Ow== |
21 | 21 |
|
22 | 22 |
# remote test MARKUS POSTGRESQL |
23 |
MarkusDataBaseConnectionString = /OABmwV82Qh0NiGGPkGQ6WxBKqFZ/2obCsNBYln3yXlxqkXiRDjsXuhObbmlar2N+Bezj9Z+czN7bSou6H3wMssGj9WVxlTzbh2RwjipTQ4= |
|
23 |
#MarkusDataBaseConnectionString = /OABmwV82Qh0NiGGPkGQ6WxBKqFZ/2obCsNBYln3yXlxqkXiRDjsXuhObbmlar2N+Bezj9Z+czN7bSou6H3wMssGj9WVxlTzbh2RwjipTQ4=
|
|
24 | 24 |
|
25 | 25 |
# remote test MARKUS mssql |
26 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w==
|
|
26 |
MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5q/RkHKkgbsc6TL5EdTsnSwK0ngDgXD0P0yPKObgtPfk0MX0wmEG95SDQzGzbT6sH73Lkzde0AeChQWveAWZGvACoQISpdUwNj96c2AQuTqaUHwSkCwSI84HZCYugjlg3gAF1FpPggKCIeu4r/qFi0w== |
|
27 | 27 |
|
28 | 28 |
#효성 복사본 |
29 | 29 |
#MarkusDataBaseConnectionString = ScTg8MgTdbARVQXhb1K9YI3/6emjnMuODvTWZ+UnUZQ8z/Gv4TksSLRn84HTZiC5/7jdSUr5EUZM30ywChLhQpD7JcUP0OmFolKm/ESAXOyQExjIscSgqZRobsvvTqCJXTB9cMiVyw40ez2n/sz6jEVUlTnXcrgyES00Kne7l1/Vxq1xlZB35sr7iyMcMkAFI6eGTZyU34DfS3t1LQu55A== |
ConvertService/ServiceBase/Markus.Service.Station/ServiceStation_DEBUG.ini | ||
---|---|---|
10 | 10 |
SERVICE_LIST = 03A98B3B-ECCD-4972-B658-43C7571965DA,0AC6FD8E-5060-4B0F-9E6B-A7380B9FCF7B |
11 | 11 |
|
12 | 12 |
|
13 |
#MSQL,POSTGRESQL |
|
14 |
DBTYPE = MSQL |
|
13 |
#MSSQL,POSTGRESQL
|
|
14 |
DBTYPE = MSSQL
|
|
15 | 15 |
|
16 | 16 |
#MarkusDataBaseConnectionString = data source=.\SQLEXPRESS;initial catalog=Markus;persist security info=True;user id=ConvertService;Password=ConvertService;MultipleActiveResultSets=True; |
17 | 17 |
#MarkusDataBaseConnectionString = data source=DESKTOP-MARKUS;initial catalog=Markus_V3;persist security info=True;user id=doftech;Password=dof1073#;MultipleActiveResultSets=True; |
ConvertService/ServiceBase/Markus.Service.Station/StationService/ServiceStationWCF.cs | ||
---|---|---|
237 | 237 |
{ |
238 | 238 |
AliveConvertQueue.Remove(convertItem); |
239 | 239 |
} |
240 |
else |
|
241 |
{ |
|
242 |
if(Environment.UserInteractive) |
|
243 |
{ |
|
244 |
Console.WriteLine($"run Process {convertItem.ID}"); |
|
245 |
} |
|
246 |
} |
|
240 | 247 |
|
241 | 248 |
result = true.ToString(); |
242 | 249 |
} |
내보내기 Unified diff