diff --git a/src/main/java/Main.kt b/src/main/java/Main.kt index c08d9c2..f80acd3 100644 --- a/src/main/java/Main.kt +++ b/src/main/java/Main.kt @@ -1,5 +1,6 @@ import com.jfinal.plugin.activerecord.ActiveRecordPlugin import com.jfinal.plugin.druid.DruidPlugin +import model.ModelMenu2 import org.slf4j.LoggerFactory import ro.pippo.controller.ControllerApplication import ro.pippo.core.Pippo @@ -62,6 +63,7 @@ class BasicApplication : ControllerApplication() { "shzhyjxy", "Admin111") val arp = ActiveRecordPlugin(dp) + arp.addMapping("menu", ModelMenu2::class.java) dp.start() arp.start() diff --git a/src/main/java/model/Model.kt b/src/main/java/model/Model.kt index 27178e0..94aa40a 100644 --- a/src/main/java/model/Model.kt +++ b/src/main/java/model/Model.kt @@ -1,5 +1,6 @@ package model +import com.jfinal.plugin.activerecord.Model import java.sql.Timestamp class ModelUser(val id: Int?, var name: String?, var passwd: String?, val groupId: Int/*default -1*/, val roleId: Int/*default -1*/, val createTime: Timestamp?) { @@ -11,13 +12,19 @@ data class ModelGroup(val id: Int?, val description: String, val createTime: Tim } data class ModelPerm(val id: Int?, val description: String?, val perm: String?, val createTime: Timestamp?) { - constructor():this(null,null,null,null) + constructor() : this(null, null, null, null) } -data class ModelMenu(val id: Int?, val description: String?, val url: String?, val permId: Int?, val createTime: Timestamp?) { - constructor():this(null,null,null,null,null) +data class ModelMenu(val id: Int?, val description: String?, val url: String?, val permId: Int?, val parentId:Int?, val createTime: Timestamp?) { + constructor() : this(null, null, null, -1, -1,null) } -data class ModelRole(val id: Int?, val description: String?, val createTime: Timestamp?){ - constructor():this(null,null,null) +class ModelMenu2() : Model() { + companion object { + val DAO: ModelMenu2 = ModelMenu2() + } +} + +data class ModelRole(val id: Int?, val description: String?, val createTime: Timestamp?) { + constructor() : this(null, null, null) } \ No newline at end of file diff --git a/src/main/java/route/CtrlMenu.kt b/src/main/java/route/CtrlMenu.kt index 7545fd4..0057421 100644 --- a/src/main/java/route/CtrlMenu.kt +++ b/src/main/java/route/CtrlMenu.kt @@ -3,6 +3,7 @@ package route import com.jfinal.kit.JsonKit import model.JSONResponse import model.ModelMenu +import model.ModelMenu2 import ro.pippo.controller.* import ro.pippo.controller.extractor.Param import service.Service @@ -10,6 +11,7 @@ import util.responseInvalidParams import util.responseNotFoundById import util.responseOperationFailed import util.responseSuccess +import java.util.* @Path("/menu") class CtrlMenu : Controller() { @@ -52,13 +54,24 @@ class CtrlMenu : Controller() { if (menu == null) { return responseInvalidParams() } - - val isSuccess = service.saveMenu(menu) + val menu2 = ModelMenu2() + menu2.put("description", menu.description) + menu2.put("url", menu.url) + menu2.put("permId", menu.permId) + menu2.put("createTime", Date()) + val isSuccess = menu2.save() return if (isSuccess) { - responseSuccess(menu) + responseSuccess(menu2) } else { responseOperationFailed() } + +// val isSuccess = service.saveMenu(menu) +// return if (isSuccess) { +// responseSuccess(menu) +// } else { +// responseOperationFailed() +// } } @POST("/{id: [0-9]+}") diff --git a/src/main/java/util/Util.kt b/src/main/java/util/Util.kt index d7bb638..0844f44 100644 --- a/src/main/java/util/Util.kt +++ b/src/main/java/util/Util.kt @@ -96,6 +96,7 @@ fun rsToMenu(rs: ResultSet): ModelMenu { description = rs.getString("description"), url = rs.getString("url"), permId = rs.getInt("permId"), + parentId = rs.getInt("parentId"), createTime = rs.getTimestamp("createTime") ) }