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

Entfernung von Oracle-Support und Refactoring

Browse Source 
Oracle-Datenbankoperationen entfernt, Windream-Integration verbessert.
Referenzen aktualisiert und Pfade angepasst.
Timer-Logik optimiert, neue Einstellung `PMREFRESH_INTERVALL_MIN` eingeführt.
Assembly-Versionen und generierte Code-Versionen aktualisiert.
This commit is contained in:
Developer01
2026-05-18 10:02:33 +02:00
parent 7f35fecfa2
commit ac71f0ce9a
12 changed files with 86 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
app/.vs/windream-Result-Handler/FileContentIndex/read.lock
View File

27
app/ClassWMResulthandler/DD_WMResulthandler.vbproj
View File

@@ -44,30 +44,33 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DigitalData.Modules.Base"> <Reference Include="DigitalData.Modules.Base, Version=1.3.6.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Messaging"> <Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="Interop.WINDREAMLib"> <Reference Include="DigitalData.Modules.Messaging, Version=1.9.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\2_DLL Projekte\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll</HintPath>
</Reference>
<Reference Include="Interop.WINDREAMLib, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<EmbedInteropTypes>False</EmbedInteropTypes> <EmbedInteropTypes>False</EmbedInteropTypes>
<HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WINDREAMLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Interop.WMOBRWSLib"> <Reference Include="Interop.WMOBRWSLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll</HintPath> <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOBRWSLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="Interop.WMOSRCHLib"> <Reference Include="Interop.WMOSRCHLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll</HintPath> <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOSRCHLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="Interop.WMOTOOLLib"> <Reference Include="Interop.WMOTOOLLib">
<HintPath>P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll</HintPath> <HintPath>M:\Bibliotheken\3rdParty\windream\Interop.WMOTOOLLib.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes> <EmbedInteropTypes>True</EmbedInteropTypes>
</Reference> </Reference>
<Reference Include="Microsoft.CSharp" /> <Reference Include="Microsoft.CSharp" />

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

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

164
app/ClassWMResulthandler/clsDatabase.vb
View File

@@ -26,103 +26,6 @@ Public Class clsDatabase
End Try End Try
End Function End Function
Public Function ExecuteonOracleDb(CONSTRING As String, ByVal plsqlcommand As String)
Try
Logger.Debug("plsqlcommand: " & plsqlcommand)
' die nötigen Variablen definieren
Dim result As Object = Nothing
Dim conn As New OracleConnectionStringBuilder
Dim Oracle_Conn As OracleConnection = New OracleConnection(CONSTRING)
Dim Oracle_Command As OracleCommand = Nothing
Dim DataAdapter As OracleDataAdapter = Nothing
' Verbindung zur Datenbank aufbauen
Try
Oracle_Conn.Open()
Catch ex As Exception
Logger.Error(ex)
'clsLogger.Add(ex.Message, True, "clsDatatabase.ExecuteonOracleDb(OpenConnection)")
Return False
End Try
' SQL-Abfrage definieren
Try
Oracle_Command = New OracleCommand(plsqlcommand, Oracle_Conn)
Oracle_Command.AddToStatementCache = True
Catch ex As Exception
Logger.Warn($"PLSQL-Command: [{plsqlcommand}]")
Logger.Error(ex)
'clsLogger.Add(ex.Message, True, "clsDatatabase.plsqlcommandDefine")
Oracle_Conn.Close()
Return False
End Try
' *** Ausführen des Command ***
If Command() IsNot Nothing Then
Try
Oracle_Command.ExecuteNonQuery()
' DB-Connection schliessen
Oracle_Conn.Close()
Return True
Catch ex As Exception
Logger.Warn($"PLSQL-Command: [{plsqlcommand}]")
Logger.Error(ex)
'clsLogger.Add(ex.Message & vbNewLine & "Execute Command => (" & plsqlcommand & ")", True, "clsDatatabase.ExecuteonOracleDb")
Oracle_Conn.Close()
Return False
End Try
Else
Logger.Info("SQL-Command ist ungültig bzw konnte nicht erstellt werden (SQL: " & plsqlcommand & ")")
' kann eintreten, wenn entweder die SQL-Anweisung falsch ist oder wenn die DataConnection nicht richtig aufgebaut werden konnte
' Eintrag in Logdatei machen
'clsLogger.Add("SQL-Command ist ungültig bzw konnte nicht erstellt werden (SQL: " & plsqlcommand & ")", True, "clsDatatabase.ExecuteonOracleDb")
Return False
End If
Catch ex As Exception
Logger.Warn($"PLSQL-Command: [{plsqlcommand}]")
Logger.Error(ex)
'clsLogger.Add("Unexpected Error in ExecuteonOracleDb: " & ex.Message & vbNewLine & "SQL: " & plsqlcommand, True, "clsDatatabase.ExecuteonOracleDb")
' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
Return False
End Try
End Function
Public Function Oracle_CS_Test(CONSTRING As String)
Try
Dim conn As New OracleConnectionStringBuilder
Dim Oracle_Conn As OracleConnection = New OracleConnection(CONSTRING)
' Verbindung zur Datenbank aufbauen
Try
Oracle_Conn.Open()
Catch ex As Exception
Logger.Error(ex)
'clsLogger.Add(ex.Message, True, "clsDatatabase.Oracle_CS_Test(OpenConnection)")
Return False
End Try
Oracle_Conn.Close()
Return True
Catch ex As Exception
Logger.Error(ex)
'clsLogger.Add("Unexpected Error in Oracle_CS_Test: " & ex.Message, True, "clsDatatabase.Oracle_CS_Test")
' an dieser Stelle sollte jeder unvorhergesehene Fehler der Funktion abgefangen werden
Return False
End Try
End Function
Public Function MSSQL_CS_Test(CONSTRING As String) Public Function MSSQL_CS_Test(CONSTRING As String)
Try Try
@@ -331,71 +234,4 @@ Public Class clsDatabase
Return Nothing Return Nothing
End Try End Try
End Function End Function
Public Function OracleExecute_Scalar(cmdscalar As String, OracleConnection As String)
Dim result
Try
Logger.Debug("cmdscalar: " & cmdscalar)
Dim SQLconnect As New OracleConnection
Dim SQLcommand As New OracleCommand
SQLconnect.ConnectionString = OracleConnection
SQLconnect.Open()
SQLcommand = SQLconnect.CreateCommand
'Update Last Created Record in Foo
SQLcommand.CommandText = cmdscalar
result = SQLcommand.ExecuteScalar()
SQLcommand.Dispose()
SQLconnect.Close()
Return result
Catch ex As Exception
Logger.Error(ex)
'clsLogger.Add("Error in OracleExecute_Scalar: " & ex.Message, True)
'clsLogger.Add("#SQL: " & cmdscalar, False)
Return Nothing
End Try
End Function
Public Function OracleExecute_non_Query(ExecuteCMD As String, OracleConnection As String, Optional userInput As Boolean = False)
Try
Logger.Debug("ExecuteCMD: " & ExecuteCMD)
Dim SQLconnect As New OracleConnection
Dim SQLcommand As OracleCommand
SQLconnect.ConnectionString = OracleConnection
SQLconnect.Open()
SQLcommand = SQLconnect.CreateCommand
'Update Last Created Record in Foo
SQLcommand.CommandText = ExecuteCMD
SQLcommand.ExecuteNonQuery()
SQLcommand.Dispose()
SQLconnect.Close()
Return True
Catch ex As Exception
Logger.Error(ex)
'clsLogger.Add("Error in OracleExecute_non_Query: " & ex.Message, True)
'clsLogger.Add("#SQL: " & ExecuteCMD, False)
Return False
End Try
End Function
Public Function Oracle_Return_Datatable(Select_anweisung As String, OracleConnection As String, Optional userInput As Boolean = False)
Try
Logger.Debug("Select_anweisung: " & Select_anweisung)
Dim SQLconnect As New OracleConnection
Dim SQLcommand As OracleCommand
SQLconnect.ConnectionString = OracleConnection
SQLconnect.Open()
SQLcommand = SQLconnect.CreateCommand
SQLcommand.CommandText = Select_anweisung
Dim adapter1 As OracleDataAdapter = New OracleDataAdapter(SQLcommand)
Dim dt As DataTable = New DataTable()
adapter1.Fill(dt)
SQLconnect.Close()
Return dt
Catch ex As Exception
Logger.Error(ex)
'clsLogger.Add("Error in Oracle_Return_Datatable: " & ex.Message, True)
'clsLogger.Add("#SQL: " & Select_anweisung, False)
Return Nothing
End Try
End Function
End Class End Class

7
app/ClassWMResulthandler/clsDateiverarbeitung.vb
View File

@@ -531,16 +531,11 @@ Public Class clsDateiverarbeitung
Return False Return False
End If End If
Logger.Warn($"Executing Oracle Command is no longer implemented")
If _database.ExecuteonOracleDb(OracleCS, result) = True Then
Return True
Else
Return False Return False
End If
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)
Return False Return False
End Try End Try
End Function End Function

13
app/ClassWMResulthandler/clsWindream_Allgemein.vb
View File

@@ -10,7 +10,7 @@ Imports WMOSRCHLib
Imports System.IO Imports System.IO
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Public Class clsWindream_allgemein Public Class ClsWindream_allgemein
Dim Logger As Logger Dim Logger As Logger
#Region "+++++ Konstanten +++++" #Region "+++++ Konstanten +++++"
Const DEBUG = AUS Const DEBUG = AUS
@@ -59,7 +59,13 @@ Public Class clsWindream_allgemein
Try Try
Dim oHourDifference As Integer Dim oHourDifference As Integer
oHourDifference = CInt(DateDiff(DateInterval.Hour, CURRENToWMSession_Created, Now)) oHourDifference = CInt(DateDiff(DateInterval.Hour, CURRENToWMSession_Created, Now))
'If IsNothing(CURRENToWMConnect) Or oHourDifference >= 2 Then
If Not IsNothing(CURRENToWMSession) AndAlso CURRENToWMSession.aLoggedin AndAlso oHourDifference < 2 Then
Logger.Debug("oWMSession already created!")
oWMSession = CURRENToWMSession
Return True
End If
Try Try
'Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen 'Session-Objekt instanziieren und mit dem im Client ausgewählten Server belegen
oWMSession = CreateObject("Windream.WMSession", GetCurrentServer) oWMSession = CreateObject("Windream.WMSession", GetCurrentServer)
@@ -260,7 +266,8 @@ Public Class clsWindream_allgemein
For Each index As String In indexnamen For Each index As String In indexnamen
If index = indexname Then Return True If index = indexname Then Return True
Next Next
Logger.Warn($"Index '{indexname}' does not exist in Objecttype '{objekttyp}'")
Return False
Catch ex As Exception Catch ex As Exception
Logger.Error(ex) Logger.Error(ex)

4
app/DDWDResultHandler/App.config
View File

@@ -19,8 +19,8 @@
<setting name="SQLSERVER_CS_PMRefresh" serializeAs="String"> <setting name="SQLSERVER_CS_PMRefresh" serializeAs="String">
<value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</value> <value>Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</value>
</setting> </setting>
<setting name="PMREFRESH_INTERVALL" serializeAs="String"> <setting name="PMREFRESH_INTERVALL_MIN" serializeAs="String">
<value>2</value> <value>1</value>
</setting> </setting>
</DDWDResultHandler.My.MySettings> </DDWDResultHandler.My.MySettings>
</applicationSettings> </applicationSettings>

6
app/DDWDResultHandler/DDWDResultHandler.vb
View File

@@ -67,7 +67,7 @@ Public Class DDWDResultHandler
' Set the Interval ' Set the Interval
Timer_Durchlauf.Interval = 60000 Timer_Durchlauf.Interval = 60000
Timer_Durchlauf.Enabled = True Timer_Durchlauf.Enabled = True
Logger.Debug("Timer gestartet") Logger.Debug("Timer Resulthandler gestartet")
' Und den Durchlauf das erste Mal starten ' Und den Durchlauf das erste Mal starten
@@ -84,9 +84,11 @@ Public Class DDWDResultHandler
AddHandler TimerPMRefresh.Elapsed, AddressOf ThreadPMRefreshRun AddHandler TimerPMRefresh.Elapsed, AddressOf ThreadPMRefreshRun
' Set the Interval ' Set the Interval
TimerPMRefresh.Interval = 120000 '2 minutes Dim oIntervallMS = (My.Settings.PMREFRESH_INTERVALL_MIN * 60000)
TimerPMRefresh.Interval = oIntervallMS
'ClassLogger.Add("Timer - Intervall: " & clsSQLITE.konf_intervall & " Minuten", False) 'ClassLogger.Add("Timer - Intervall: " & clsSQLITE.konf_intervall & " Minuten", False)
TimerPMRefresh.Enabled = True TimerPMRefresh.Enabled = True
Logger.Debug($"Timer PM Refresh gestartet, mit Intervall {My.Settings.PMREFRESH_INTERVALL_MIN} Minuten ")
'End If 'End If
If My.Settings.SQLSERVER_CS_RH = "" And My.Settings.SQLSERVER_CS_PMRefresh <> "" Then If My.Settings.SQLSERVER_CS_RH = "" And My.Settings.SQLSERVER_CS_PMRefresh <> "" Then
Logger.Info("Thread PM Refresh will now be started for initial Run as Resulthandler's ConnString is empty...") Logger.Info("Thread PM Refresh will now be started for initial Run as Resulthandler's ConnString is empty...")

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

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

8
app/DDWDResultHandler/My Project/Settings.Designer.vb generated
View File

@@ -15,7 +15,7 @@ Option Explicit On
Namespace My Namespace My
<Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _ <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"), _ Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"), _
Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _ Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
Partial Friend NotInheritable Class MySettings Partial Friend NotInheritable Class MySettings
Inherits Global.System.Configuration.ApplicationSettingsBase Inherits Global.System.Configuration.ApplicationSettingsBase
@@ -76,10 +76,10 @@ Namespace My
<Global.System.Configuration.ApplicationScopedSettingAttribute(), _ <Global.System.Configuration.ApplicationScopedSettingAttribute(), _
Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _ Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
Global.System.Configuration.DefaultSettingValueAttribute("2")> _ Global.System.Configuration.DefaultSettingValueAttribute("1")> _
Public ReadOnly Property PMREFRESH_INTERVALL() As Integer Public ReadOnly Property PMREFRESH_INTERVALL_MIN() As Integer
Get Get
Return CType(Me("PMREFRESH_INTERVALL"),Integer) Return CType(Me("PMREFRESH_INTERVALL_MIN"),Integer)
End Get End Get
End Property End Property
End Class End Class

4
app/DDWDResultHandler/My Project/Settings.settings
View File

@@ -8,8 +8,8 @@
<Setting Name="SQLSERVER_CS_PMRefresh" Type="System.String" Scope="Application"> <Setting Name="SQLSERVER_CS_PMRefresh" Type="System.String" Scope="Application">
<Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</Value> <Value Profile="(Default)">Data Source=SDD-VMP04-SQL17\DD_DEVELOP01;Initial Catalog=DD_ECM;Persist Security Info=True;User ID=sa;Password=dd</Value>
</Setting> </Setting>
<Setting Name="PMREFRESH_INTERVALL" Type="System.Int32" Scope="Application"> <Setting Name="PMREFRESH_INTERVALL_MIN" Type="System.Int32" Scope="Application">
<Value Profile="(Default)">2</Value> <Value Profile="(Default)">1</Value>
</Setting> </Setting>
</Settings> </Settings>
</SettingsFile> </SettingsFile>

5
app/DDWDResultHandler/ServiceDDWDResultHandler.vbproj
View File

@@ -52,8 +52,9 @@
<OptionInfer>On</OptionInfer> <OptionInfer>On</OptionInfer>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging, Version=2.6.3.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>
<Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"> <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
<HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath> <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>