rdkartono/AAS_NewGeneration
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

commit 10/09/2025

Browse Source
This commit is contained in:
rdkartono
2025-09-10 16:08:24 +07:00
parent f48ead1b44
commit 34fc71cfbc
4 changed files with 159 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/database/MariaDB.kt
View File

@@ -126,7 +126,7 @@ class MariaDB(
try {
val statement =
connection?.prepareStatement("INSERT INTO log (datenya, timenya, machine, description) VALUES (?, ?, ?, ?)")
connection?.prepareStatement("INSERT INTO logs (datenya, timenya, machine, description) VALUES (?, ?, ?, ?)")
statement?.setString(1, dateString)
statement?.setString(2, timeString)
statement?.setString(3, machine)
@@ -152,16 +152,15 @@ class MariaDB(
try {
val statement = connection?.prepareStatement(
if (logFilter.isBlank()) {
"SELECT * FROM log WHERE datenya = ?"
"SELECT * FROM logs WHERE datenya = ?"
} else {
"SELECT * FROM log WHERE datenya = ? AND (description LIKE ? OR machine LIKE ?)"
"SELECT * FROM logs WHERE datenya = ? AND (description LIKE ?)"
}
)
statement?.setString(1, logDate)
if (!logFilter.isBlank()) {
val filter = "%$logFilter%"
statement?.setString(2, filter)
statement?.setString(3, filter)
}
val resultSet = statement?.executeQuery()
val workbook = XSSFWorkbook()
@@ -223,12 +222,15 @@ class MariaDB(
*/
fun GetLogForHtml(date: String, consumer: Consumer<ArrayList<Log>>) {
val logList = ArrayList<Log>()
println("GetLogForHtml Date: $date" )
if (ValiDateForLogHtml(date)) {
try {
// must convert from DD-MM-YYYY to DD/MM/YYYY, because in database we use DD/MM/YYYY
val adjusteddate = date.replace("-", "/")
val statement = connection?.prepareStatement("SELECT * FROM logs WHERE datenya = ?")
statement?.setString(1, adjusteddate)
println("GetLogForHtml Date: $adjusteddate" )
println("GetLogForHtml SQL: " +statement?.toString())
val resultSet = statement?.executeQuery()
while (resultSet?.next() == true) {
val log = Log(
@@ -256,6 +258,8 @@ class MariaDB(
*/
fun GetLogForHtml(date: String, filter: String, consumer: Consumer<ArrayList<Log>>) {
val logList = ArrayList<Log>()
println("GetLogForHtml Date: $date Filter: $filter" )
if (ValiDateForLogHtml(date)) {
try {
// must convert from DD-MM-YYYY to DD/MM/YYYY, because in database we use DD/MM/YYYY
@@ -264,6 +268,8 @@ class MariaDB(
connection?.prepareStatement("SELECT * FROM logs WHERE datenya = ? AND description LIKE ?")
statement?.setString(1, adjusteddate)
statement?.setString(2, "%$filter%")
println("GetLogForHtml Date: $adjusteddate , Filter=$filter" )
println("GetLogForHtml SQL: " +statement?.toString())
val resultSet = statement?.executeQuery()
while (resultSet?.next() == true) {
val log = Log(
@@ -594,7 +600,7 @@ class MariaDB(
*/
fun Add_LanguageLink(languageLink: LanguageLink): Boolean {
try {
val statement = connection?.prepareStatement("INSERT INTO languagelink (TAG, Language) VALUES (?, ?)")
val statement = connection?.prepareStatement("INSERT INTO languagelinking (TAG, Language) VALUES (?, ?)")
statement?.setString(1, languageLink.TAG)
statement?.setString(2, languageLink.Language)
val rowsAffected = statement?.executeUpdate()
@@ -620,7 +626,7 @@ class MariaDB(
try {
if (connection != null) {
connection!!.autoCommit = false
val sql = "INSERT INTO languagelink (TAG, Language) VALUES (?, ?)"
val sql = "INSERT INTO languagelinking (TAG, Language) VALUES (?, ?)"
val statement = connection!!.prepareStatement(sql)
for (ll in languageLinkList) {
statement.setString(1, ll.TAG)
@@ -629,12 +635,12 @@ class MariaDB(
}
statement.executeBatch()
connection!!.commit()
Logger.info("Bulk languagelink insert successful: ${languageLinkList.size} entries" as Any)
Logger.info("Bulk languagelinking insert successful: ${languageLinkList.size} entries" as Any)
connection!!.autoCommit = true
return true
}
} catch (e: Exception) {
Logger.error("Error adding languagelink entries: ${e.message}" as Any)
Logger.error("Error adding languagelinking entries: ${e.message}" as Any)
}
}
return false
@@ -650,7 +656,7 @@ class MariaDB(
fun Update_LanguageLink_by_index(index: UInt, languageLink: LanguageLink): Boolean {
try {
val statement =
connection?.prepareStatement("UPDATE languagelink SET TAG = ?, Language = ? WHERE `index` = ?")
connection?.prepareStatement("UPDATE languagelinking SET TAG = ?, Language = ? WHERE `index` = ?")
statement?.setString(1, languageLink.TAG)
statement?.setString(2, languageLink.Language)
statement?.setLong(3, index.toLong())
@@ -674,17 +680,17 @@ class MariaDB(
*/
fun Delete_LanguageLink_by_index(index: UInt): Boolean {
try {
val statement = connection?.prepareStatement("DELETE FROM languagelink WHERE `index` = ?")
val statement = connection?.prepareStatement("DELETE FROM languagelinking WHERE `index` = ?")
statement?.setLong(1, index.toLong())
val rowsAffected = statement?.executeUpdate()
if (rowsAffected != null && rowsAffected > 0) {
Logger.info("Deleted $rowsAffected row(s) from languagelink with index $index" as Any)
Logger.info("Deleted $rowsAffected row(s) from languagelinking with index $index" as Any)
return true
} else {
Logger.warn("No rows deleted from languagelink with index $index" as Any)
Logger.warn("No rows deleted from languagelinking with index $index" as Any)
}
} catch (e: Exception) {
Logger.error("Error deleting from languagelink with index $index: ${e.message}" as Any)
Logger.error("Error deleting from languagelinking with index $index: ${e.message}" as Any)
}
return false
}
@@ -696,12 +702,12 @@ class MariaDB(
try {
val statement = connection?.createStatement()
// use TRUNCATE to reset auto increment index
statement?.executeUpdate("TRUNCATE TABLE languagelink")
Logger.info("LanguageLink table cleared" as Any)
statement?.executeUpdate("TRUNCATE TABLE languagelinking")
Logger.info("languagelinking table cleared" as Any)
LanguageLinkList.clear()
return true
} catch (e: Exception) {
Logger.error("Error clearing LanguageLink table: ${e.message}" as Any)
Logger.error("Error clearing languagelinking table: ${e.message}" as Any)
}
return false
}
@@ -713,9 +719,9 @@ class MariaDB(
fun Export_LanguageLink_XLSX(): XSSFWorkbook? {
try {
val statement = connection?.createStatement()
val resultSet = statement?.executeQuery("SELECT * FROM languagelink")
val resultSet = statement?.executeQuery("SELECT * FROM languagelinking")
val workbook = XSSFWorkbook()
val sheet = workbook.createSheet("LanguageLink")
val sheet = workbook.createSheet("languagelinking")
val headerRow = sheet.createRow(0)
val headers = arrayOf("Index", "TAG", "Language")
for ((colIndex, header) in headers.withIndex()) {
@@ -734,7 +740,7 @@ class MariaDB(
}
return workbook
} catch (e: Exception) {
Logger.error { "Error exporting LanguageLink, Msg: ${e.message}" }
Logger.error { "Error exporting languagelinking, Msg: ${e.message}" }
}
return null
}