From 2d2e88f66e280858f61a1ca17abc49de7a5c99e4 Mon Sep 17 00:00:00 2001 From: chusifeng Date: Fri, 29 Sep 2017 15:35:20 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B8=E5=85=B3=E7=9A=84=E7=B1=BB=E5=88=AB?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=93=8D=E4=BD=9C=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/config/Const.kt | 4 ++++ src/main/java/route/CrtlGroup.kt | 25 ++++++++++++++++++++----- src/main/java/route/CtrlMenu.kt | 25 ++++++++++++++++++++----- src/main/java/route/CtrlPerm.kt | 25 ++++++++++++++++++++----- src/main/java/route/CtrlRole.kt | 24 ++++++++++++++++++++---- src/main/java/route/CtrlUser.kt | 21 +-------------------- src/main/java/util/Util.kt | 25 +++++++++++++++++++++++++ 7 files changed, 110 insertions(+), 39 deletions(-) diff --git a/src/main/java/config/Const.kt b/src/main/java/config/Const.kt index 6f6c1f9..6ded3a3 100644 --- a/src/main/java/config/Const.kt +++ b/src/main/java/config/Const.kt @@ -10,6 +10,10 @@ object Const { val msgNotFoundById = "根据id没有找到对应资源" val msgInsertUserFailed = "新增用户失败，请检查参数，或许已有相同用户存在" val msgUpdateUserFailed = "更新用户信息失败" + val msgUpdateRoleFailed = "更新角色信息失败" + val msgUpdateGroupFailed = "更新组信息失败" + val msgUpdateMenuFailed = "更新菜单信息失败" + val msgUpdatepermFailed = "更新perm信息失败" val msgInvalidParams = "参数错误" val msgOperationFailed = "操作失败" } \ No newline at end of file diff --git a/src/main/java/route/CrtlGroup.kt b/src/main/java/route/CrtlGroup.kt index c328730..4f79b20 100644 --- a/src/main/java/route/CrtlGroup.kt +++ b/src/main/java/route/CrtlGroup.kt @@ -1,16 +1,15 @@ package route import com.jfinal.kit.JsonKit +import com.jfinal.plugin.activerecord.Db +import com.jfinal.plugin.activerecord.Record import config.Const import model.JSONResponse import model.ModelGroup import ro.pippo.controller.* import ro.pippo.controller.extractor.Param import service.Service -import util.responseInvalidParams -import util.responseNotFoundById -import util.responseOperationFailed -import util.responseSuccess +import util.* @Path("/group") class CrtlGroup : Controller() { @@ -82,7 +81,23 @@ class CrtlGroup : Controller() { responseOperationFailed() } } - + //更新 + @POST("/update") + @Produces(Produces.JSON) + fun updateGrou() : JSONResponse { + if (null != request.parameters["id"]) { + val record = Record() + updateUtil(record,request) + val isSuccess = Db.update("group","id",record) + return if (isSuccess){ + responseSuccess(true) + } else{ + responseUpdateGroupFailed() + } + }else { + return responseUpdateGroupFailed() + } + } @POST("/del/{id: [0-9]+}") @Produces(Produces.JSON) fun delGroup(@Param("id") id: Int): JSONResponse { diff --git a/src/main/java/route/CtrlMenu.kt b/src/main/java/route/CtrlMenu.kt index 0057421..f99ae96 100644 --- a/src/main/java/route/CtrlMenu.kt +++ b/src/main/java/route/CtrlMenu.kt @@ -1,16 +1,15 @@ package route import com.jfinal.kit.JsonKit +import com.jfinal.plugin.activerecord.Db +import com.jfinal.plugin.activerecord.Record import model.JSONResponse import model.ModelMenu import model.ModelMenu2 import ro.pippo.controller.* import ro.pippo.controller.extractor.Param import service.Service -import util.responseInvalidParams -import util.responseNotFoundById -import util.responseOperationFailed -import util.responseSuccess +import util.* import java.util.* @Path("/menu") @@ -89,7 +88,23 @@ class CtrlMenu : Controller() { responseOperationFailed() } } - + //更新 + @POST("/update") + @Produces(Produces.JSON) + fun updateMen() : JSONResponse { + if (null != request.parameters["id"]) { + val record = Record() + updateUtil(record,request) + val isSuccess = Db.update("menu","id",record) + return if (isSuccess){ + responseSuccess(true) + } else{ + responseUpdateMenuFailed() + } + }else { + return responseUpdateMenuFailed() + } + } @POST("/del/{id: [0-9]+}") @Produces(Produces.JSON) fun deleteMenu(@Param("id") id: Int): JSONResponse { diff --git a/src/main/java/route/CtrlPerm.kt b/src/main/java/route/CtrlPerm.kt index 2442a3a..6b4cd87 100644 --- a/src/main/java/route/CtrlPerm.kt +++ b/src/main/java/route/CtrlPerm.kt @@ -1,15 +1,14 @@ package route import com.jfinal.kit.JsonKit +import com.jfinal.plugin.activerecord.Db +import com.jfinal.plugin.activerecord.Record import model.JSONResponse import model.ModelPerm import ro.pippo.controller.* import ro.pippo.controller.extractor.Param import service.Service -import util.responseInvalidParams -import util.responseNotFoundById -import util.responseOperationFailed -import util.responseSuccess +import util.* @Path("/perm") class CtrlPerm : Controller() { @@ -76,7 +75,23 @@ class CtrlPerm : Controller() { responseOperationFailed() } } - + //更新 + @POST("/update") + @Produces(Produces.JSON) + fun updatePer() :JSONResponse { + if (request.parameters["id"] != null) { + val record = Record() + updateUtil(record,request) + val isSuccess = Db.update("perm","id",record) + return if (isSuccess){ + responseSuccess(true) + } else{ + responseUpdatePermFailed() + } + }else { + return responseUpdatePermFailed() + } + } @POST("/del/{id: [0-9]+}") @Produces(Produces.JSON) fun deletePerm(@Param("id") id: Int): JSONResponse { diff --git a/src/main/java/route/CtrlRole.kt b/src/main/java/route/CtrlRole.kt index 90907ec..2db2a54 100644 --- a/src/main/java/route/CtrlRole.kt +++ b/src/main/java/route/CtrlRole.kt @@ -1,15 +1,14 @@ package route import com.jfinal.kit.JsonKit +import com.jfinal.plugin.activerecord.Db +import com.jfinal.plugin.activerecord.Record import model.JSONResponse import model.ModelRole import ro.pippo.controller.* import ro.pippo.controller.extractor.Param import service.Service -import util.responseInvalidParams -import util.responseNotFoundById -import util.responseOperationFailed -import util.responseSuccess +import util.* @Path("/role") class CtrlRole : Controller() { @@ -96,4 +95,21 @@ class CtrlRole : Controller() { responseOperationFailed() } } + //更新 + @POST("/update") + @Produces(Produces.JSON) + fun updateRol() :JSONResponse{ + if (request.parameters["id"] != null) { + val record = Record() + updateUtil(record,request) + val isSuccess = Db.update("role","id",record) + return if (isSuccess){ + responseSuccess(true) + } else{ + responseUpdateRoleFailed() + } + }else { + return responseUpdateRoleFailed() + } + } } \ No newline at end of file diff --git a/src/main/java/route/CtrlUser.kt b/src/main/java/route/CtrlUser.kt index def9cb5..06401e0 100644 --- a/src/main/java/route/CtrlUser.kt +++ b/src/main/java/route/CtrlUser.kt @@ -5,12 +5,10 @@ import com.jfinal.plugin.activerecord.Db import com.jfinal.plugin.activerecord.Record import model.JSONResponse import model.ModelUser -import model.ModelUser2 import ro.pippo.controller.* import ro.pippo.controller.extractor.Param import service.Service import util.* -import java.sql.Timestamp @Path("/user") @@ -77,24 +75,7 @@ class CtrlUser : Controller() { fun updateUser() :JSONResponse{ if (request.parameters["id"] != null) { val record = Record() - if ( null != request.parameters["id"] ) { - record.set("id", request.parameters["id"]?.toInt()) - } - if ( null != request.parameters["name"] ) { - record.set("name", request.parameters["name"]?.toString()) - } - if (null != request.parameters["passwd"] ) { - record.set("passwd", request.parameters["passwd"]?.toString()) - } - if ( null != request.parameters["groupId"] ) { - record.set("groupId", request.parameters["groupId"]?.toString()) - } - if ( null != request.parameters["roleId"]) { - record.set("roleId", request.parameters["roleId"]?.toString()) - } - if ( null != request.parameters["createTime"] ) { - record.set("createTime", Timestamp.valueOf(request.parameters["createTime"]?.toString())) - } + updateUtil(record,request) val isSuccess = Db.update("user","id",record) return if (isSuccess){ responseSuccess(true) diff --git a/src/main/java/util/Util.kt b/src/main/java/util/Util.kt index 0136036..f7a857b 100644 --- a/src/main/java/util/Util.kt +++ b/src/main/java/util/Util.kt @@ -1,7 +1,10 @@ package util +import com.jfinal.plugin.activerecord.Record import config.Const import model.* +import ro.pippo.core.ParameterValue +import ro.pippo.core.Request import java.sql.ResultSet import java.sql.Timestamp import java.text.SimpleDateFormat @@ -18,6 +21,18 @@ fun responseOperationFailed(): JSONResponse { fun responseUpdateUserFailed() : JSONResponse { return JSONResponse(Const.codeServiceOperationFailed,Const.msgUpdateUserFailed,null) } +fun responseUpdateRoleFailed() : JSONResponse { + return JSONResponse(Const.codeServiceOperationFailed,Const.msgUpdateRoleFailed,null) +} +fun responseUpdateGroupFailed() : JSONResponse { + return JSONResponse(Const.codeServiceOperationFailed,Const.msgUpdateGroupFailed,null) +} +fun responseUpdateMenuFailed() : JSONResponse { + return JSONResponse(Const.codeServiceOperationFailed,Const.msgUpdateMenuFailed,null) +} +fun responseUpdatePermFailed() : JSONResponse { + return JSONResponse(Const.codeServiceOperationFailed,Const.msgUpdatepermFailed,null) +} fun responseInvalidParams(): JSONResponse { return JSONResponse(Const.codeInvalidParams, Const.msgInvalidParams, null) @@ -108,3 +123,13 @@ fun menuToInsertSQL(menu: ModelMenu): String { values('${menu.description}','${menu.description}','${menu.permId}','${Timestamp.from(Instant.now())}') """ } +fun updateUtil(record:Record , request:Request) :Record { + + val params : Map = request.parameters + params.forEach{ + if ( null != it.value){ + record.set(it.key, it.value.toString()) + } + } + return record +} \ No newline at end of file