add plant integ
This commit is contained in:
@@ -39,7 +39,7 @@ object Session {
|
||||
private val logger = LoggerFactory.getLogger("session")
|
||||
private val currentUser = object : ThreadLocal<AuthUser>() {
|
||||
override fun initialValue(): AuthUser {
|
||||
return AuthUser("", "", emptyList(), "", LocalDateTime.now())
|
||||
return AuthUser("", "", emptyList(), "", LocalDateTime.now(), emptyList())
|
||||
}
|
||||
}
|
||||
|
||||
@@ -182,6 +182,13 @@ object Session {
|
||||
fun currentTenant() = currentUser.get().tenant
|
||||
fun currentRoles() = currentUser.get().roles
|
||||
fun currentToken() = currentUser.get().token
|
||||
fun currentUserPlants() = currentUser.get().plantIds.map {
|
||||
Session.database.find(Plant::class.java)
|
||||
.where()
|
||||
.eq("plantId", it)
|
||||
.findOne()
|
||||
}.filterNotNull()
|
||||
|
||||
fun jwk() = keypair.toParams(JsonWebKey.OutputControlLevel.PUBLIC_ONLY)
|
||||
|
||||
fun Database.findDataModelByEntityAndUniqId(entity: String, uniqId: String): DataModel {
|
||||
|
||||
@@ -14,11 +14,7 @@ import javax.persistence.*
|
||||
|
||||
data class Comments(val text: String = "", val by: String = "", val at: LocalDateTime = LocalDateTime.now())
|
||||
data class POProducts(
|
||||
val productId: String = "",
|
||||
val productName: String = "",
|
||||
val unitPrice: Double = 0.0,
|
||||
val quantity: Double = 0.0,
|
||||
val description: String = ""
|
||||
val productId: String = "", val productName: String = "", val unitPrice: Double = 0.0, val quantity: Double = 0.0, val description: String = ""
|
||||
)
|
||||
|
||||
|
||||
@@ -112,15 +108,13 @@ open class AuditLog : BaseTenantModel() {
|
||||
|
||||
@DbJsonB
|
||||
@Index(
|
||||
definition = "create index audit_log_values_idx on audit_log using GIN (data)",
|
||||
platforms = [Platform.POSTGRES]
|
||||
definition = "create index audit_log_values_idx on audit_log using GIN (data)", platforms = [Platform.POSTGRES]
|
||||
)
|
||||
var data: Map<String, Any> = hashMapOf()
|
||||
|
||||
@DbJsonB
|
||||
@Index(
|
||||
definition = "create index audit_log_changes_idx on audit_log using GIN (changes)",
|
||||
platforms = [Platform.POSTGRES]
|
||||
definition = "create index audit_log_changes_idx on audit_log using GIN (changes)", platforms = [Platform.POSTGRES]
|
||||
)
|
||||
var changes: Map<String, Any> = hashMapOf()
|
||||
}
|
||||
@@ -545,7 +539,7 @@ open class Fleet : BaseTenantModel() {
|
||||
var name: String = ""
|
||||
var type: String = ""
|
||||
var regNumber: String = ""
|
||||
var regDate: LocalDate?=null
|
||||
var regDate: LocalDate? = null
|
||||
var model: String = ""
|
||||
var make: String = ""
|
||||
var driver: String = ""
|
||||
@@ -635,4 +629,11 @@ open class ReminderLog : BaseTenantModel() {
|
||||
|
||||
@DbArray
|
||||
var documents: List<String>? = null
|
||||
}
|
||||
|
||||
@Entity
|
||||
@Index(name="plantid_idx", columnNames = ["plant_id"], unique = true)
|
||||
open class Plant : BaseModel() {
|
||||
var plantId: String = ""
|
||||
var plantName: String = ""
|
||||
}
|
||||
Reference in New Issue
Block a user