From 8493e4701abe57202bcd215e67a209ce3819d958 Mon Sep 17 00:00:00 2001
From: lyf666 <lyf666@gmail.com>
Date: Wed, 11 Oct 2017 18:33:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3add=20menu=20=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89order=E5=92=8Ctype?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/model/Model.kt     |  6 ++++--
 src/main/java/route/CtrlMenu.kt  | 36 +++++++++++++++++---------------
 src/main/java/service/Service.kt |  2 +-
 src/main/java/util/Util.kt       |  2 ++
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/src/main/java/model/Model.kt b/src/main/java/model/Model.kt
index 29a85a1..2b5e3d3 100644
--- a/src/main/java/model/Model.kt
+++ b/src/main/java/model/Model.kt
@@ -75,7 +75,7 @@ data class ModelPerm(val id: Int?, val description: String?, val perm: String?,
     constructor() : this(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?) {
+data class ModelMenu(val id: Int?, val description: String?, val url: String?, val permId: Int?, val parentId: Int?, val order: Int?, val type: Int, val createTime: Timestamp?) {
     companion object {
         fun fromJFinal(model: Model<*>): ModelMenu {
             return ModelMenu(
@@ -84,6 +84,8 @@ data class ModelMenu(val id: Int?, val description: String?, val url: String?, v
                     url = model.getStr("url"),
                     permId = model.getInt("permId"),
                     parentId = model.getInt("parentId"),
+                    order = model.getInt("order"),
+                    type = model.getInt("type"),
                     createTime = model.getTimestamp("createTime")
             )
         }
@@ -97,7 +99,7 @@ data class ModelMenu(val id: Int?, val description: String?, val url: String?, v
         return model
     }
 
-    constructor() : this(null, null, null, -1, -1, null)
+    constructor() : this(null, null, null, -1, -1, null, -1, null)
 }
 
 data class ModelRole(val id: Int?, val description: String?, val createTime: Timestamp?) {
diff --git a/src/main/java/route/CtrlMenu.kt b/src/main/java/route/CtrlMenu.kt
index 9d6d30b..0c40546 100644
--- a/src/main/java/route/CtrlMenu.kt
+++ b/src/main/java/route/CtrlMenu.kt
@@ -5,12 +5,10 @@ import com.jfinal.plugin.activerecord.Db
 import com.jfinal.plugin.activerecord.Record
 import model.JSONResponse
 import model.ModelMenu
-import model.JFinalModelMenu
 import ro.pippo.controller.*
 import ro.pippo.controller.extractor.Param
 import service.Service
 import util.*
-import java.util.*
 
 @Path("/menu")
 class CtrlMenu : Controller() {
@@ -29,8 +27,8 @@ class CtrlMenu : Controller() {
 
     @GET("/{page: [0-9]+}/{size: [0-9]+}")
     @Produces(Produces.JSON)
-    fun pagi(@Param("page") num:Int, @Param("size") size:Int) :String {
-        val page = service.pagiMenu(num,size)
+    fun pagi(@Param("page") num: Int, @Param("size") size: Int): String {
+        val page = service.pagiMenu(num, size)
         return JsonKit.toJson(responseSuccess(page))
     }
 
@@ -53,14 +51,16 @@ class CtrlMenu : Controller() {
         if (menu == null) {
             return responseInvalidParams()
         }
-        val menu2 = JFinalModelMenu()
-        menu2.put("description", menu.description)
-        menu2.put("url", menu.url)
-        menu2.put("permId", menu.permId)
-        menu2.put("createTime", Date())
-        val isSuccess = menu2.save()
+
+//        val menu2 = JFinalModelMenu()
+//        menu2.put("description", menu.description)
+//        menu2.put("url", menu.url)
+//        menu2.put("permId", menu.permId)
+//        menu2.put("createTime", Date())
+//        val isSuccess = menu2.save()
+        val isSuccess = service.save(ModelMenu::class, menu)
         return if (isSuccess) {
-            responseSuccess(menu2)
+            responseSuccess("")
         } else {
             responseOperationFailed()
         }
@@ -88,23 +88,25 @@ class CtrlMenu : Controller() {
             responseOperationFailed()
         }
     }
+
     //更新
     @POST("/update")
     @Produces(Produces.JSON)
-    fun updateMen() : JSONResponse {
+    fun updateMen(): JSONResponse {
         if (null != request.parameters["id"]) {
             val record = Record()
-            updateUtil(record,request)
-            val isSuccess = Db.update("menu","id",record)
-            return  if (isSuccess){
+            updateUtil(record, request)
+            val isSuccess = Db.update("menu", "id", record)
+            return if (isSuccess) {
                 responseSuccess(true)
-            } else{
+            } else {
                 responseUpdateMenuFailed()
             }
-        }else {
+        } else {
             return responseUpdateMenuFailed()
         }
     }
+
     @POST("/del/{id: [0-9]+}")
     @Produces(Produces.JSON)
     fun deleteMenu(@Param("id") id: Int): JSONResponse {
diff --git a/src/main/java/service/Service.kt b/src/main/java/service/Service.kt
index 79dbfa1..54acbde 100644
--- a/src/main/java/service/Service.kt
+++ b/src/main/java/service/Service.kt
@@ -63,7 +63,7 @@ class Service {
     }
 
     fun update(cls: KClass<*>, instance: Any): Boolean {
-        val model = instance::class.functions.filter { "toJFinal" == it.name }.first() as Model<*>
+        val model = instance::class.functions.filter { "toJFinal" == it.name }.first().call(instance) as Model<*>
         return model.update()
     }
 
diff --git a/src/main/java/util/Util.kt b/src/main/java/util/Util.kt
index 439800a..b796fed 100644
--- a/src/main/java/util/Util.kt
+++ b/src/main/java/util/Util.kt
@@ -126,6 +126,8 @@ fun rsToMenu(rs: ResultSet): ModelMenu {
             url = rs.getString("url"),
             permId = rs.getInt("permId"),
             parentId = rs.getInt("parentId"),
+            order = rs.getInt("order"),
+            type = rs.getInt("type"),
             createTime = rs.getTimestamp("createTime")
     )
 }