some changes
This commit is contained in:
parent
06637c21ee
commit
4e80a3d9f2
@ -301,6 +301,7 @@ fun main(args: Array<String>) {
|
||||
}
|
||||
}
|
||||
|
||||
get("/{entity}", Entities::getAll, Roles(adminRole, viewRole, appAdmin) )
|
||||
post("/{entity}/next", Entities::getNextSeqNo, Roles(adminRole, viewRole, appAdmin))
|
||||
get("/{entity}/{id}", Entities::view, Roles(adminRole, viewRole, appAdmin))
|
||||
post("/{entity}/search", Entities::search, Roles(adminRole, viewRole, appAdmin))
|
||||
|
||||
@ -94,6 +94,7 @@ object Entities {
|
||||
e.deletedOn = LocalDateTime.now()
|
||||
e.update()
|
||||
e.delete()
|
||||
ctx.json(OK)
|
||||
}
|
||||
|
||||
fun patch(ctx: Context) {
|
||||
@ -135,6 +136,7 @@ object Entities {
|
||||
verifyKeys(sql.params)
|
||||
|
||||
val entity = ctx.pathParam("entity")
|
||||
val searchJsonMap = sql.params.map { e -> Pair(e.key, e.value.getValue()) }.toMap()
|
||||
val fl = database.find(DataModel::class.java)
|
||||
.setRawSql(
|
||||
RawSqlBuilder.parse(
|
||||
@ -167,14 +169,30 @@ object Entities {
|
||||
.setParameter("from", sql.dateRange.first())
|
||||
.setParameter("to", sql.dateRange.last().plusDays(1))
|
||||
.setParameter("e", entity)
|
||||
.setParameter("search", objectMapper.writeValueAsString(sql.params.map { e -> Pair(e.key, e.value.getValue()) }.toMap()))
|
||||
.setParameter("search", objectMapper.writeValueAsString(searchJsonMap))
|
||||
.findList()
|
||||
|
||||
logger.warn("Search jsonMap [$searchJsonMap] => ${fl.size} entries")
|
||||
|
||||
ctx.json(fl)
|
||||
|
||||
}
|
||||
|
||||
|
||||
fun getAll(ctx: Context) {
|
||||
val entity = ctx.pathParam("entity").uppercase()
|
||||
val pageNo = ctx.queryParam("pageNo")?.toInt() ?: 1
|
||||
val perPage = ctx.queryParam("perPage")?.toInt() ?: 100
|
||||
val cnt = database.find(DataModel::class.java)
|
||||
.where()
|
||||
.eq("entityName", entity.lowercase())
|
||||
.setFirstRow((pageNo - 1) * perPage)
|
||||
.setMaxRows(perPage)
|
||||
.findPagedList()
|
||||
|
||||
ctx.json(cnt)
|
||||
}
|
||||
|
||||
fun getNextSeqNo(ctx: Context) {
|
||||
val entity = ctx.pathParam("entity").uppercase()
|
||||
|
||||
|
||||
@ -21,14 +21,14 @@
|
||||
</appender>
|
||||
|
||||
<!-- SQL and bind values -->
|
||||
<logger name="io.ebean.SQL" level="DEBUG"/>
|
||||
<logger name="io.ebean.SQL" level="INFO"/>
|
||||
<logger name="org.apache.http.client.protocol.ResponseProcessCookies" level="ERROR"/>
|
||||
|
||||
<!-- Transaction Commit and Rollback events -->
|
||||
<logger name="io.ebean.TXN" level="WARN"/>
|
||||
<logger name="io.ebean.SUM" level="WARN"/>
|
||||
|
||||
<root level="WARN">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT" />
|
||||
<appender-ref ref="ROLLING" />
|
||||
</root>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user