AppStd/ResulHandlerMSSQL
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Release 2.6

Browse Source
This commit is contained in:
SchreiberM
2022-03-29 17:53:55 +02:00
parent dfb38dcf5c
commit 255338aa36
44 changed files with 885 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/ClassWMResulthandler/DD_WMResulthandler.vbproj
View File

@@ -70,7 +70,7 @@
<HintPath>..\packages\Newtonsoft.Json.11.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.7.13\lib\net45\NLog.dll</HintPath>
<HintPath>..\packages\NLog.4.7.15\lib\net45\NLog.dll</HintPath>
</Reference>
<Reference Include="Oracle.ManagedDataAccess">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>

4
app/ClassWMResulthandler/My Project/AssemblyInfo.vb
View File

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("2.5.0.0")>
<Assembly: AssemblyFileVersion("1.5.0.0")>
<Assembly: AssemblyVersion("2.6.0.0")>
<Assembly: AssemblyFileVersion("1.6.0.0")>

51
app/ClassWMResulthandler/clsDateiverarbeitung.vb
View File

@@ -1,10 +1,10 @@
Imports WINDREAMLib
Imports System.IO
Imports System.IO
Imports System.Net
Imports Newtonsoft.Json
Imports System.Text
Imports DigitalData.Modules.Logging
Imports System.Text.RegularExpressions
Imports DigitalData.Modules.Logging
Imports Newtonsoft.Json
Imports WINDREAMLib
Public Class clsDateiverarbeitung
Dim Logger As Logger
@@ -15,7 +15,7 @@ Public Class clsDateiverarbeitung
Dim _database As clsDatabase
Public Shared pr_DTPROFIL_REGELN As DataTable
Public Shared aktfile_Exportresult As String
Public Shared CURRFile_Exportresult As String
Public Shared CriticalError As Boolean = False
@@ -154,10 +154,11 @@ Public Class clsDateiverarbeitung
oFilename = oFilenameWM.Substring(0, oSplitIndex)
End If
oFilename = oFilename.Replace("/", "_")
Logger.Debug("Preparing export of WMFile {0}..", oFilenameWM)
Logger.Debug("Filename: {0}", oFilename)
Logger.Debug("Extension: {0}", clsCURRENT.FILE_Extension)
Logger.Debug("pExportPath: {0}", pExportPath)
' build the file path in case the exported file doesn't already exist
oFilenameExport = BuildExportPath(pExportPath, oFilename, clsCURRENT.FILE_Extension)
@@ -182,12 +183,13 @@ Public Class clsDateiverarbeitung
Logger.Debug("Cleaning up..")
oStream.Close()
oStream = Nothing
oWMFileIO = Nothing
Logger.Debug("File exported!")
If File.Exists(oFilenameExport) Then
Logger.Info($"File Export to HDD [{oFilenameExport}]was successfull (File.Exists = True)!")
aktfile_Exportresult = oFilenameExport
Logger.Info($"File Export to HDD [{oFilenameExport}] was successfull!")
CURRFile_Exportresult = oFilenameExport
clsCURRENT.EXPORTED_FILENAME = oFilenameExport
clsCURRENT.TEMP_FILES.Add(oFilenameExport)
Logger.Debug("FileInfo Added to variables...")
@@ -200,6 +202,7 @@ Public Class clsDateiverarbeitung
Return True
Catch ex As Exception
Logger.Error(ex)
Logger.Info($"Unexpected error in Export_WMFile2HDD [{ex.Message}]")
Return False
End Try
End Function
@@ -307,10 +310,10 @@ Public Class clsDateiverarbeitung
End If
Next
Dim version As Integer = 2
Dim ZielPfad As String = Path.GetDirectoryName(aktfile_Exportresult)
Dim ZielPfad As String = Path.GetDirectoryName(CURRFile_Exportresult)
Logger.Debug("ZielPfad: " & ZielPfad)
Dim Filename = konvention
Dim Extension = Path.GetExtension(aktfile_Exportresult)
Dim Extension = Path.GetExtension(CURRFile_Exportresult)
Logger.Debug("Extension: " & Extension)
Dim tempFilename As String = ZielPfad & "\" & Filename & Extension
Logger.Debug("tempFilename: " & tempFilename)
@@ -319,8 +322,20 @@ Public Class clsDateiverarbeitung
tempFilename = ZielPfad & "\" & Filename & "_" & version & Extension
version += 1
Loop
Logger.Debug("RenameFile - OLDFilename: " & aktfile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename))
My.Computer.FileSystem.RenameFile(aktfile_Exportresult, Path.GetFileName(tempFilename))
Logger.Debug("RenameFile - OLDFilename: " & CURRFile_Exportresult)
Logger.Debug("NEWFilename: " & Path.GetFileName(tempFilename))
Threading.Thread.Sleep(500)
Try
My.Computer.FileSystem.RenameFile(CURRFile_Exportresult, Path.GetFileName(tempFilename))
Catch ex As Exception
If ex.Message.Contains("The process cannot access the file") Then
tempFilename = tempFilename.Replace(".pdf", "_X.pdf")
My.Computer.FileSystem.CopyFile(CURRFile_Exportresult, tempFilename)
Logger.Info("File is in use - NewName " & tempFilename)
CURRFile_Exportresult = tempFilename
End If
End Try
Logger.Info("Datei wurde erfolgreich umbenannt.")
Return True
Catch ex As Exception
@@ -329,12 +344,14 @@ Public Class clsDateiverarbeitung
Return False
End Try
End Function
Public Function Rename_File_Vektor(WMFile As WMObject, WMINDEX_NAME As String)
Try
Dim WMIndexwert
Dim ZielPfad As String = Path.GetDirectoryName(aktfile_Exportresult)
Dim ZielPfad As String = Path.GetDirectoryName(CURRFile_Exportresult)
Logger.Debug("ZielPfad: " & ZielPfad)
Dim Extension = Path.GetExtension(aktfile_Exportresult)
Dim Extension = Path.GetExtension(CURRFile_Exportresult)
Logger.Debug("Extension: " & Extension)
If WMINDEX_NAME.StartsWith("[%") Then
@@ -354,8 +371,8 @@ Public Class clsDateiverarbeitung
Dim tempFilename As String = ZielPfad & "\" & WMvalue & Extension
Logger.Debug("tempFilename: " & tempFilename)
If anz = 1 Then
Logger.Debug("RenameFile - OLDFilename: " & aktfile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename))
My.Computer.FileSystem.RenameFile(aktfile_Exportresult, Path.GetFileName(tempFilename))
Logger.Debug("RenameFile - OLDFilename: " & CURRFile_Exportresult & " - NEWFilename: " & Path.GetFileName(tempFilename))
My.Computer.FileSystem.RenameFile(CURRFile_Exportresult, Path.GetFileName(tempFilename))
copybasefile = tempFilename
Else
Dim version As Integer = 2

12
app/ClassWMResulthandler/clsProfil.vb
View File

@@ -166,7 +166,10 @@ Public Class clsProfil
Dim oGesamtFiles As Integer
oGesamtFiles = windreamSucheErgebnisse.Count
Dim oCountDocs As Integer = 0
Dim oEmailAttachment_path As String
For Each WMdok As WMObject In windreamSucheErgebnisse
oEmailAttachment_path = String.Empty
oCountDocs += 1
Logger.Debug($"Working on Doc {oCountDocs.ToString}/{windreamSucheErgebnisse.Count}")
oFileRunNo = "#Doc " & oCountDocs.ToString
@@ -195,13 +198,14 @@ Public Class clsProfil
Logger.Debug("Attached file shall be renamed...")
oRENAMEFILE = _dateiverarbeitung.REGEX_REPLACE(WMdok, oRENAMEFILE)
oAttachment_FullFilename = oRENAMEFILE & clsCURRENT.FILE_Extension
Logger.Debug($"oAttachment: {oAttachment_FullFilename}")
Logger.Info($"oAttachment: {oAttachment_FullFilename}")
End If
End If
If Not IsNothing(clsCURRENT.DT_TBDD_EMAIL) And clsCURRENT.DT_TBDD_EMAIL.Rows.Count >= 1 Then
If _dateiverarbeitung.Export_WMFile2HDD(WMdok, Path.GetTempPath(), oAttachment_FullFilename) = True Then
oAttachment_FullFilename = clsCURRENT.EXPORTED_FILENAME
oEmailAttachment_path = oAttachment_FullFilename
Else
Logger.Warn($"Could not create a tempfile...")
FileJobSuccessful = False
@@ -249,7 +253,9 @@ Public Class clsProfil
oEmail_Betreff = _dateiverarbeitung.REGEX_REPLACE(WMdok, oEmail_Betreff)
Email_Body = _dateiverarbeitung.REGEX_REPLACE(WMdok, Email_Body)
oEmail_Betreff = $"{oEmail_Betreff} [eMail {oCountDocs} von {oGesamtFiles}]"
If oAttachment_FullFilename <> String.Empty Then
Logger.Warn($"Email Attachment {oAttachment_FullFilename}")
End If
If _email.Email_Send(oEmail_Betreff, Email_Body, Email_Empfänger, MAILFROM, MAILSMTP, MAIL_PORT, MAIL_USER, MAIL_USER_PW, MAIL_AUTH_TYPE, oAttachment_FullFilename) = True Then
FileJobSuccessful = True
@@ -275,6 +281,7 @@ Public Class clsProfil
CountExportedDoc += 1
FileJobSuccessful = True
Logger.Info($"{oFileRunNo} Export HDD completed!")
Logger.Debug($"{oFileRunNo} Export HDD completed!")
End If
'Next
Case "BNS json Download".ToUpper
@@ -432,6 +439,7 @@ Public Class clsProfil
Case "Rename File with windream Index".ToLower
Logger.Debug($"{oFileRunNo} Exportierte Datei soll nach Indexvorgaben umbenannt werden...")
_dateiverarbeitung.Rename_File(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString)
Case "Rename File with WMVector (only one)".ToLower
Logger.Debug($"{oFileRunNo} Exportierte Datei soll nach VektorIndexvorgaben umbenannt werden...")
_dateiverarbeitung.Rename_File_Vektor(WMdok, DR_PR_FILE_JOB.Item("STRING1").ToString)

2
app/ClassWMResulthandler/packages.config
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="11.0.2" targetFramework="net461" />
<package id="NLog" version="4.7.13" targetFramework="net461" />
<package id="NLog" version="4.7.15" targetFramework="net461" />
</packages>