shu/OnDoc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update 20241113

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-13 17:55:15 +01:00
parent 09bcee5a2a
commit 1682465067
117 changed files with 346 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
API_NetFramework/Controllers/AntwortAdressController.cs
View File

@@ -37,11 +37,15 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetAll", LogLevelType.Debug);
Database.DB db = new Database.DB(connectionstring);
string SQL = "Select * from Antwortadresse order by bezeichnung";
if (OutFormat == "JSON") { SQL = SQL + " for json path"; }
if (OutFormat == "XML") { SQL = SQL + " for xml path"; }
db.Get_Tabledata(SQL, false, true);
APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAll", LogLevelType.Debug);
return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString());
}
catch (Exception e)
@@ -69,12 +73,22 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetByID ID:"+ID, LogLevelType.Debug);
Database.DB db = new Database.DB(connectionstring);
string SQL = "Select * from Antwortadresse where id=" + ID;
if (OutFormat == "JSON") { SQL = SQL + " for json path"; }
if (OutFormat == "XML") { SQL = SQL + " for xml path"; }
db.Get_Tabledata(SQL, false, true);
if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); };
if (db.dsdaten.Tables[0].Rows.Count == 0) {
APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetByID ID:" + ID, LogLevelType.Debug);
return Ok();
} else {
APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetByID ID:" + ID, LogLevelType.Debug);
return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString());
};
}
catch (Exception e)
{
@@ -101,12 +115,22 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetAllMitarbeiterByTGNummer", LogLevelType.Debug);
Database.DB db = new Database.DB(connectionstring);
string SQL = "Select * from AntwortAdresse_Mitarbeiter where aktiv=1 and tgnummer='" + tgnummer + "' order by bezeichnung ";
if (OutFormat == "JSON") { SQL = SQL + " for json path"; }
if (OutFormat == "XML") { SQL = SQL + " for xml path"; }
db.Get_Tabledata(SQL, false, true);
if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); };
if (db.dsdaten.Tables[0].Rows.Count == 0) {
APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByTGNummer", LogLevelType.Debug);
return Ok();
} else {
APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByTGNummer", LogLevelType.Debug);
return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString());
};
}
catch (Exception e)
{
@@ -132,12 +156,20 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start Adresse GetAllMitarbeiterByMitarbeiterNr Ma-Nr:"+Mitarbeiternr, LogLevelType.Debug);
Database.DB db = new Database.DB(connectionstring);
string SQL = "Select * from AntwortAdresse_Mitarbeiter where aktiv=1 and Mitarbeiternr='" + Mitarbeiternr + "' ";
if (OutFormat == "JSON") { SQL = SQL + " for json path"; }
if (OutFormat == "XML") { SQL = SQL + " for xml path"; }
db.Get_Tabledata(SQL, false, true);
if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); };
if (db.dsdaten.Tables[0].Rows.Count == 0) {
APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByMitarbeiterNr Ma-Nr:" + Mitarbeiternr, LogLevelType.Debug);
return Ok();
} else {
APILogging.Log((HttpRequestMessage)Request, "Ende Adresse GetAllMitarbeiterByMitarbeiterNr Ma-Nr:" + Mitarbeiternr, LogLevelType.Debug);
return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString());
};
}
catch (Exception e)
{
@@ -166,12 +198,19 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start GetMitarbeiterByID ID: "+ID, LogLevelType.Debug);
Database.DB db = new Database.DB(connectionstring);
string SQL = "Select * from AntwortAdresse_Mitarbeiter where id=" + ID;
if (OutFormat == "JSON") { SQL = SQL + " for json path"; }
if (OutFormat == "XML") { SQL = SQL + " for xml path"; }
db.Get_Tabledata(SQL, false, true);
if (db.dsdaten.Tables[0].Rows.Count == 0) { return Ok(); } else { return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); };
if (db.dsdaten.Tables[0].Rows.Count == 0) {
APILogging.Log((HttpRequestMessage)Request, "Ende GetMitarbeiterByID ID: " + ID, LogLevelType.Debug);
return Ok();
} else {
APILogging.Log((HttpRequestMessage)Request, "Ende GetMitarbeiterByID ID: " + ID, LogLevelType.Debug);
return Ok(db.dsdaten.Tables[0].Rows[0][0].ToString()); };
}
catch (Exception e)
{
@@ -197,6 +236,8 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start GetGASAdressen_Einzeilig TGNummer: " + TGNummer, LogLevelType.Debug);
Database.DB db = new Database.DB(connectionstring);
db.clear_parameter();
db.add_parameter("@tgnummer", TGNummer);
@@ -204,10 +245,12 @@ namespace API_NetFramework.Controllers
db.Get_Tabledata("sp_get_gas_einzeilig", true, false);
if (db.dsdaten.Tables[0].Rows.Count == 0)
{
APILogging.Log((HttpRequestMessage)Request, "Ende GetGASAdressen_Einzeilig TGNummer: " + TGNummer, LogLevelType.Debug);
return Content(HttpStatusCode.NotFound, "");
}
else
{
APILogging.Log((HttpRequestMessage)Request, "Ende GetGASAdressen_Einzeilig TGNummer: " + TGNummer, LogLevelType.Debug);
return Content(HttpStatusCode.OK, db.dsdaten.Tables[0].Rows[0][0].ToString());
};
}

83
API_NetFramework/Controllers/ArchivController.cs
View File

@@ -49,6 +49,8 @@ namespace API_NetFramework.Controllers
private void Update_IL_Log(ref ILResponse ilr, string dokumentid)
{
APILogging.Log((HttpRequestMessage)Request, "Start Updaet IL_Log: DokumentID:" + dokumentid, LogLevelType.Debug);
DB dB = new DB(ConfigurationManager.ConnectionStrings["JournalConnectionstring"].ConnectionString);
string sql = "Insert OnDoc_IL_Log (dokumentid, ilresponse,error, erstellt_am) values ('" + dokumentid + "',";
sql = sql + "'" + ilr.response.ToString() + "',";
@@ -56,6 +58,7 @@ namespace API_NetFramework.Controllers
sql = sql + "'" + DateTime.Now.ToString("yyyy-MM-dd hh:mm:ss") + "')";
dB.Exec_SQL(sql);
dB = null;
APILogging.Log((HttpRequestMessage)Request, "Ende Updaet IL_Log: DokumentID:" + dokumentid, LogLevelType.Debug);
}
private void update_dokumentstatus(string dokumentid)
@@ -85,6 +88,7 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start ArchiveDocFromDatabase: DokumentID:"+DokumentID, LogLevelType.Debug);
DB db = new DB(connectionstring);
db.clear_parameter();
db.add_parameter("@dokumentid", DokumentID);
@@ -128,7 +132,6 @@ namespace API_NetFramework.Controllers
string SendToFile = System.Configuration.ConfigurationManager.AppSettings["SendToFile"];
string debugdir = System.Configuration.ConfigurationManager.AppSettings["DebugDir"];
string jsonstring = Newtonsoft.Json.JsonConvert.SerializeObject(onbasedoc);
IHttpActionResult transferResult = null;
if (SendToOnBase != "Yes")
{
@@ -139,9 +142,14 @@ namespace API_NetFramework.Controllers
{
debugfilename = debugfilename + DokumentID + ".json";
System.IO.File.WriteAllText(debugfilename, jsonstring);
debugfilename = debugfilename + ".pdf";
Helper.clsFileHelper fh = new Helper.clsFileHelper();
fh.SaveBase64ToFile(onbasedoc.dokumentDatei, debugfilename);
fh = null;
}
}
}
APILogging.Log((HttpRequestMessage)Request, "Ende ArchiveDocFromDatabase: DokumentID:" + DokumentID, LogLevelType.Debug);
//Log nachführen
Update_IL_Log(ref ilr,DokumentID);
@@ -166,36 +174,36 @@ namespace API_NetFramework.Controllers
}
[HttpGet]
[Route("API/ArchiveDocBase64")]
/// <summary>
/// Archiviert das als Base64String übergebene Dokument in OnBase
/// </summary>
/// <param name="DokumentID"></param>
/// <param name="Dokumenttyp"></param>
/// <returns>
/// Returncode: 200 (OK)
/// Dokumenthandle aus OnBase
/// </returns>
/// <remarks></remarks>
//
public IHttpActionResult ArchivDocBase64(string DokumentID, string Dokumenttyp)
{
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
{
return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
}
try
{
//[HttpGet]
//[Route("API/ArchiveDocBase64")]
///// <summary>
///// Archiviert das als Base64String übergebene Dokument in OnBase
///// </summary>
///// <param name="DokumentID"></param>
///// <param name="Dokumenttyp"></param>
///// <returns>
///// Returncode: 200 (OK)
///// Dokumenthandle aus OnBase
///// </returns>
///// <remarks></remarks>
////
//public IHttpActionResult ArchivDocBase64(string DokumentID, string Dokumenttyp)
//{
// if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
// {
// return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
// }
// try
// {
return Ok();
}
catch (Exception e)
{
APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error);
return Content(HttpStatusCode.InternalServerError, e.Message);
}
}
// return Ok();
// }
// catch (Exception e)
// {
// APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error);
// return Content(HttpStatusCode.InternalServerError, e.Message);
// }
//}
/// <summary>
/// CheckDocID prüft auf eine vorhandene DokumentID in OnDoc (DokumentID OFFEDK... / Barcode-Klenber-Nr)
/// </summary>
@@ -215,6 +223,7 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start Check DokumentID: DokumentID:" + DokumentID, LogLevelType.Debug);
Database.DB db = new Database.DB(connectionstring);
db.Get_Tabledata("Select * from dokument where dokumentid = '" + DokumentID + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
@@ -226,6 +235,8 @@ namespace API_NetFramework.Controllers
{
return Ok(DokumentID);
}
APILogging.Log((HttpRequestMessage)Request, "Ende Check DokumentID: DokumentID:" + DokumentID, LogLevelType.Debug);
return Content(HttpStatusCode.NotFound, DokumentID);
}
catch (Exception e)
@@ -248,6 +259,7 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start ArchivDocFromIRIS DokumentID: " + dokumentid, LogLevelType.Debug);
if (dokumentid.Substring(0, 6).ToUpper() == "ONDOC00")
{
return (ArchivDocFromDatabase(dokumentid));
@@ -265,7 +277,7 @@ namespace API_NetFramework.Controllers
//return Content(HttpStatusCode.OK, "");
APILogging.Log((HttpRequestMessage)Request, dokumentid+" Archivierung ausgelöst", LogLevelType.Info);
APILogging.Log((HttpRequestMessage)Request, "Ende ArchivDocFromIRIS DokumentID:" + dokumentid, LogLevelType.Debug);
return Ok(dokumentid);
}
catch (Exception e)
@@ -277,12 +289,14 @@ namespace API_NetFramework.Controllers
[HttpPost]
[Route("API/ArchivSBDoc")]
public IHttpActionResult ArchivSBDoc(string sbnr, string intid, int partnernr )
public IHttpActionResult ArchivSBDoc(string sbnr, string intid, int partnernr, string dokumentid )
{
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
{
return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
}
APILogging.Log((HttpRequestMessage)Request, "Start ArchivSBDoc DokumentID: DokumentID:" + dokumentid, LogLevelType.Debug);
string json = "";
if (HttpContext.Current.Request.InputStream.Length > 0)
{
@@ -316,6 +330,7 @@ namespace API_NetFramework.Controllers
//Log nachführen
Update_IL_Log(ref ilr, "SB_" + sbnr.ToString() + "_" + intid.ToString());
APILogging.Log((HttpRequestMessage)Request, "Ende ArchivSBDoc DokumentID: DokumentID:" + dokumentid, LogLevelType.Debug);
return transferResult;
//return Content(HttpStatusCode.OK, "");
}
@@ -325,8 +340,9 @@ namespace API_NetFramework.Controllers
//ILResponse ilr = new ILResponse();
string response;
WebRequest request;
APILogging.Log((HttpRequestMessage)Request, "Start Transfer to OnBase", LogLevelType.Debug);
string url="";
string url ="";
switch (utype){
case uploadtype.fast:
url= System.Configuration.ConfigurationManager.AppSettings["ILFast"];
@@ -362,6 +378,7 @@ namespace API_NetFramework.Controllers
ilr.StatusCode = 0;
ilr.senderror = 0;
ilr.response=response;
APILogging.Log((HttpRequestMessage)Request, "Ende Transfer to OnBase", LogLevelType.Debug);
return Content(HttpStatusCode.OK, ilr);
}
catch (Exception ex)

17
API_NetFramework/Controllers/DocumentController.cs
View File

@@ -35,9 +35,13 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start GetDocument DokumentID:"+dokid, LogLevelType.Debug);
DOCGEN.DocGet gd = new DocGet(connectionstring);
clsdok dok = new clsdok("", "", "");
dok = gd.GetDoc(dokid);
APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug);
return Ok(dok);
}
catch (Exception e)
@@ -69,11 +73,15 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start GetDocumentPDF DokumentID:" + dokid, LogLevelType.Debug);
DOCGEN.DocGet gd = new DocGet(connectionstring);
clsdok dok = new clsdok("", "", "");
dok = gd.GetDocAsPDF(dokid);
dok.extension = "pdf";
dok.doktype = "P";
APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug);
return Ok(dok);
}
catch (Exception e)
@@ -94,11 +102,14 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start SendToOnBase:" + dokid, LogLevelType.Debug);
DB db = new DB(connectionstring);
db.Get_Tabledata("Select * from dokument where dokumentid='" + dokid + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count < 1)
{
db = null;
APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug);
return BadRequest("Dokument " + dokid + " not found");
}
else
@@ -110,6 +121,8 @@ namespace API_NetFramework.Controllers
db.Exec_SQL("Update dokument set loeschgrund='Archiviert' where dokumentid='" + dokid + "'");
db = null;
APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug);
return Ok("Archivierung ausgelöst");
}
}
@@ -131,6 +144,8 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start GenDoc " , LogLevelType.Debug);
if (!(ParamCheck("partnernr", Partnernr))) { return BadRequest("Partnernr " + Partnernr + " ist ungültig"); }
if (!(ParamCheck("dokumenttyp", Dokumenttypnr))) { return BadRequest("Dokumenttyp " + Dokumenttypnr + " ist ungültig"); }
if (!(ParamCheck("tgcreator", TGCreator))) { return BadRequest("TGCreator " + TGCreator + " ist ungültig"); }
@@ -189,6 +204,8 @@ namespace API_NetFramework.Controllers
clsdok dok = new clsdok("", "", "");
dok = Generator.Generate_Doc_EDOKA(dokumentid, ref dokdata);
db.Save_To_DB(dokumentid, "", dok.dokument);
APILogging.Log((HttpRequestMessage)Request, "Ende GenDoc DokumentID:"+dokumentid, LogLevelType.Debug);
return Ok(dokumentid);
}
catch (Exception e)

4
API_NetFramework/Controllers/UnterschriftController.cs
View File

@@ -47,6 +47,7 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start GetUnterschriftAsBase64 TGNummer: " + TGNummer, LogLevelType.Debug);
string path = System.Configuration.ConfigurationManager.AppSettings["UnterschriftPath"];
string filename = path + TGNummer + ".pdf";
if (!File.Exists(filename))
@@ -86,6 +87,7 @@ namespace API_NetFramework.Controllers
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start GetUnterschrift TGNummer: " + TGNummer, LogLevelType.Debug);
string path = System.Configuration.ConfigurationManager.AppSettings["UnterschriftPath"];
string filename = path + TGNummer + ".jpg";
if (!File.Exists(filename))
@@ -98,6 +100,8 @@ namespace API_NetFramework.Controllers
byte[] b = File.ReadAllBytes(filename);
var dataStream = new MemoryStream(b);
string imageName = TGNummer + ".jpg";
APILogging.Log((HttpRequestMessage)Request, "Ende GetUnterschrift TGNummer: " + TGNummer, LogLevelType.Debug);
return new unterschriftResult(dataStream, Request, imageName);
}
catch (Exception e)