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

update 20241121

Browse Source
This commit is contained in:
Stefan Hutter
2024-11-21 19:32:26 +01:00
parent d3bf9458eb
commit 6bdbc4173e
56 changed files with 362 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
API_NetFramework/Controllers/ArchivController.cs
View File

@@ -18,6 +18,7 @@ using System.Security.Policy;
using System.Text;
using Microsoft.AspNetCore.Http.Features;
using System.Security.Cryptography;
using System.Net.Http.Headers;
namespace API_NetFramework.Controllers
@@ -233,7 +234,8 @@ namespace API_NetFramework.Controllers
db.Get_Tabledata("Select barcodenr from barcodeetikette where dokumentid='" + DokumentID + "'", false, true);
if (db.dsdaten.Tables[0].Rows.Count > 0)
{
return Ok(DokumentID);
return (ArchivDocFromIRIS(DokumentID));
//return Ok(DokumentID);
}
APILogging.Log((HttpRequestMessage)Request, "Ende Check DokumentID: DokumentID:" + DokumentID, LogLevelType.Debug);
@@ -260,27 +262,35 @@ namespace API_NetFramework.Controllers
try
{
APILogging.Log((HttpRequestMessage)Request, "Start ArchivDocFromIRIS DokumentID: " + dokumentid, LogLevelType.Debug);
if (dokumentid.Substring(0, 9).ToUpper() == "OFFEDK008")
{
return (ArchivDocFromDatabase(dokumentid));
}
else
{
DB db = new DB(connectionstring);
db.clear_parameter();
db.add_parameter("@dokumentid", dokumentid);
if (db.Get_Tabledata("[OnDoc_IRIS_Archivierung]", true, false) == null)
{
APILogging.Log((HttpRequestMessage)Request, "ArchivDocFromIRIS Archivierung fehlgeschlagen - DokumentID:" + dokumentid, LogLevelType.Debug);
return Content(HttpStatusCode.NotFound, "Archivierung fehlgeschlagen");
db.Get_Tabledata("[OnDoc_IRIS_Archivierung]", true, false);
string returnmessage = db.dsdaten.Tables[0].Rows[0][0].ToString();
switch (db.dsdaten.Tables[0].Rows[0][1].ToString())
{
case "1":
case "2":
case "3":
APILogging.Log((HttpRequestMessage)Request, db.dsdaten.Tables[0].Rows[0].ToString() + dokumentid, LogLevelType.Debug);
return Content(HttpStatusCode.NotFound, returnmessage);
case "0":
APILogging.Log((HttpRequestMessage)Request, "Ende ArchivDocFromIRIS DokumentID:" + dokumentid, LogLevelType.Debug);
return Ok(dokumentid);
default:
break;
};
}
//return Content(HttpStatusCode.OK, "");
APILogging.Log((HttpRequestMessage)Request, "Ende ArchivDocFromIRIS DokumentID:" + dokumentid, LogLevelType.Debug);
return Ok(dokumentid);
}

72
API_NetFramework/Controllers/DocumentController.cs
View File

@@ -92,47 +92,47 @@ namespace API_NetFramework.Controllers
}
[HttpGet]
[Route("API/SendToOnBase")]
public IHttpActionResult SendToOnBase(string dokid)
{
if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
{
return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
}
try
{
APILogging.Log((HttpRequestMessage)Request, "Start SendToOnBase:" + dokid, LogLevelType.Debug);
//[HttpGet]
//[Route("API/SendToOnBase")]
//public IHttpActionResult SendToOnBase(string dokid)
//{
// if (SecuringWebApiUsingApiKey.Middleware.ApiKeyMiddleware.Authorized((HttpRequestMessage)Request, tokenfunction) == false)
// {
// return Content(HttpStatusCode.Unauthorized, "Invalid Token or API-Key");
// }
// 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
{
DocGet dg = new DocGet(connectionstring);
clsdok dok = new clsdok("", "", "");
// 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
// {
// DocGet dg = new DocGet(connectionstring);
// clsdok dok = new clsdok("", "", "");
dok = dg.GetDocAsPDF(dokid);
// dok = dg.GetDocAsPDF(dokid);
db.Exec_SQL("Update dokument set loeschgrund='Archiviert' where dokumentid='" + dokid + "'");
db = null;
APILogging.Log((HttpRequestMessage)Request, "Ende GetDocument DokumentID:" + dokid, LogLevelType.Debug);
// 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");
}
}
catch (Exception e)
{
APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error);
return Content(HttpStatusCode.InternalServerError, e.Message);
}
// return Ok("Archivierung ausgelöst");
// }
// }
// catch (Exception e)
// {
// APILogging.Log((HttpRequestMessage)Request, e.Message, LogLevelType.Error);
// return Content(HttpStatusCode.InternalServerError, e.Message);
// }
}
//}
[HttpPost]
[Route("API/GenDoc")]