remove the plantIds fetch
This commit is contained in:
parent
09bc25346d
commit
3b5a0379cb
@ -75,27 +75,27 @@ object Auth {
|
||||
val roles = ((jwtClaims.jwtClaims.claimsMap["realm_access"] as Map<String, Any>)["roles"]) as List<String>
|
||||
val date = Date(jwtClaims.jwtClaims.expirationTime.valueInMillis)
|
||||
|
||||
try {
|
||||
HttpClients.createDefault().use { h ->
|
||||
//sync plant's from rmc to here, just name and id
|
||||
for (plantId in plantIds) {
|
||||
|
||||
val existing = Session.database.find(Plant::class.java).where().eq("plantId", plantId).findOne()
|
||||
if (existing == null) {
|
||||
h.execute(HttpGet("${appConfig.integrationRmc()}/plant?id=${plantId}")).use { r ->
|
||||
if (r.statusLine.statusCode == 200) {
|
||||
Session.database.save(Plant().apply {
|
||||
this.plantId = plantId
|
||||
this.plantName = EntityUtils.toString(r.entity)
|
||||
})
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
logger.warn("Exception in syncing plants", e)
|
||||
}
|
||||
// try {
|
||||
// HttpClients.createDefault().use { h ->
|
||||
// //sync plant's from rmc to here, just name and id
|
||||
// for (plantId in plantIds) {
|
||||
//
|
||||
// val existing = Session.database.find(Plant::class.java).where().eq("plantId", plantId).findOne()
|
||||
// if (existing == null) {
|
||||
// h.execute(HttpGet("${appConfig.integrationRmc()}/plant?id=${plantId}")).use { r ->
|
||||
// if (r.statusLine.statusCode == 200) {
|
||||
// Session.database.save(Plant().apply {
|
||||
// this.plantId = plantId
|
||||
// this.plantName = EntityUtils.toString(r.entity)
|
||||
// })
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// } catch (e: Exception) {
|
||||
// logger.warn("Exception in syncing plants", e)
|
||||
// }
|
||||
|
||||
return AuthUser(
|
||||
userName = userId,
|
||||
@ -107,23 +107,26 @@ object Auth {
|
||||
)
|
||||
}
|
||||
|
||||
private val userToTenant = ConcurrentHashMap<String, String>()
|
||||
private fun getTenantWithCompany(userId: String, tenant: String): String {
|
||||
try {
|
||||
HttpClients.createDefault().use { h ->
|
||||
//sync plant's from rmc to here, just name and id
|
||||
return userToTenant.computeIfAbsent(userId) {
|
||||
try {
|
||||
HttpClients.createDefault().use { h ->
|
||||
//sync plant's from rmc to here, just name and id
|
||||
|
||||
h.execute(HttpGet("${appConfig.integrationRmc()}/tenant?id=${userId}")).use { r ->
|
||||
if (r.statusLine.statusCode == 200) {
|
||||
h.execute(HttpGet("${appConfig.integrationRmc()}/tenant?id=${userId}")).use { r ->
|
||||
if (r.statusLine.statusCode == 200) {
|
||||
|
||||
"$tenant${EntityUtils.toString(r.entity)}"
|
||||
}
|
||||
|
||||
return "$tenant${EntityUtils.toString(r.entity)}"
|
||||
}
|
||||
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
logger.warn("Exception in syncing plants", e)
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
logger.warn("Exception in syncing plants", e)
|
||||
tenant
|
||||
}
|
||||
return tenant
|
||||
}
|
||||
|
||||
fun keys(ctx: Context) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user