From 7fd2c877f44b3835fbcc90e420f52090787f0249 Mon Sep 17 00:00:00 2001 From: 13693261870 <252740454@qq.com> Date: 星期二, 11 十月 2022 10:17:45 +0800 Subject: [PATCH] 1 --- src/main/java/com/lf/server/controller/data/DictController.java | 6 src/main/java/com/lf/server/mapper/data/VerMapper.java | 6 src/main/java/com/lf/server/controller/sys/RoleMenuController.java | 38 ++++ src/main/java/com/lf/server/mapper/sys/ResMapper.java | 6 src/main/java/com/lf/server/controller/sys/AuthController.java | 4 src/main/java/com/lf/server/mapper/sys/AuthMapper.java | 6 src/main/java/com/lf/server/controller/data/StyleController.java | 8 src/main/java/com/lf/server/mapper/sys/DepMapper.java | 2 src/main/java/com/lf/server/mapper/sys/RoleMapper.java | 6 src/main/java/com/lf/server/controller/sys/DepController.java | 8 src/main/java/com/lf/server/mapper/sys/UserMapper.java | 6 src/main/java/com/lf/server/controller/sys/ResController.java | 7 src/main/java/com/lf/server/controller/sys/RoleUserController.java | 38 ++++ src/main/java/com/lf/server/mapper/sys/LoginMapper.java | 2 src/main/java/com/lf/server/mapper/data/DirMapper.java | 7 src/main/java/com/lf/server/controller/sys/TokenController.java | 41 ++++- src/main/java/com/lf/server/controller/sys/UserController.java | 39 ++++- src/main/java/com/lf/server/mapper/data/StyleMapper.java | 6 src/main/java/com/lf/server/controller/sys/RoleController.java | 45 +++++- src/main/java/com/lf/server/controller/sys/LoginController.java | 2 src/main/java/com/lf/server/controller/sys/MenuController.java | 4 src/main/java/com/lf/server/controller/sys/OperateController.java | 4 data/menu-执行.xls | 0 src/main/java/com/lf/server/mapper/sys/MenuMapper.java | 2 src/main/java/com/lf/server/mapper/sys/ResOpMapper.java | 2 src/main/java/com/lf/server/mapper/sys/TokenMapper.java | 6 src/main/java/com/lf/server/mapper/sys/OperateMapper.java | 2 src/main/java/com/lf/server/mapper/data/DictMapper.java | 6 src/main/java/com/lf/server/controller/sys/RoleResController.java | 38 ++++ src/main/java/com/lf/server/controller/data/DirController.java | 16 +- src/main/java/com/lf/server/controller/sys/ResOpController.java | 5 src/main/java/com/lf/server/controller/data/VerController.java | 6 32 files changed, 262 insertions(+), 112 deletions(-) diff --git "a/data/menu-\346\211\247\350\241\214.xls" "b/data/menu-\346\211\247\350\241\214.xls" index 2734f88..0ecaaf0 100644 --- "a/data/menu-\346\211\247\350\241\214.xls" +++ "b/data/menu-\346\211\247\350\241\214.xls" Binary files differ diff --git a/src/main/java/com/lf/server/controller/data/DictController.java b/src/main/java/com/lf/server/controller/data/DictController.java index 8eada1e..8af9ed9 100644 --- a/src/main/java/com/lf/server/controller/data/DictController.java +++ b/src/main/java/com/lf/server/controller/data/DictController.java @@ -100,7 +100,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.DictEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.DictEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDict", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertDict(@RequestBody DictEntity entity, HttpServletRequest req) { @@ -160,7 +160,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteDicts") public ResponseMsg<Integer> deleteDicts(@RequestParam List<Integer> ids) { @@ -180,7 +180,7 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "瀛楀吀闆嗗悎", dataType = "DictEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DictEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateDict", produces = "application/json; charset=UTF-8") diff --git a/src/main/java/com/lf/server/controller/data/DirController.java b/src/main/java/com/lf/server/controller/data/DirController.java index 4d0fc3e..c079c58 100644 --- a/src/main/java/com/lf/server/controller/data/DirController.java +++ b/src/main/java/com/lf/server/controller/data/DirController.java @@ -34,9 +34,9 @@ TokenService tokenService; @SysLog() - @ApiOperation(value = "鎻掑叆鏁版嵁") + @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDir", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertDir(@RequestBody DirEntity entity, HttpServletRequest req) { @@ -57,7 +57,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "list", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertDirs", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertDirs(@RequestBody List<DirEntity> list, HttpServletRequest req) { @@ -78,7 +78,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/deleteDir") public ResponseMsg<Integer> deleteDir(int id) { @@ -94,7 +94,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "DirEntity", value = "鐩綍瀹炰綋绫�", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "com.lf.server.entity.data.DirEntity", paramType = "body", example = "") }) @GetMapping(value = "/deleteDirs") public ResponseMsg<Integer> deleteDirs(@RequestParam List<Integer> ids) { @@ -114,7 +114,7 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "涓婚敭ID闆嗗悎", dataType = "DictEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "DictEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateDir", produces = "application/json; charset=UTF-8") @@ -136,7 +136,7 @@ @SysLog() @ApiOperation(value = "鏇存柊澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "list", value = "涓婚敭ID闆嗗悎", dataType = "DirEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "DirEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateDirs", produces = "application/json; charset=UTF-8") @@ -160,7 +160,7 @@ @SysLog() @ApiOperation(value = "鏍规嵁ID鏌ヨ鏁版嵁") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/selectDir") public ResponseMsg<DirEntity> selectDir(int id) { diff --git a/src/main/java/com/lf/server/controller/data/StyleController.java b/src/main/java/com/lf/server/controller/data/StyleController.java index d934885..4782e46 100644 --- a/src/main/java/com/lf/server/controller/data/StyleController.java +++ b/src/main/java/com/lf/server/controller/data/StyleController.java @@ -101,7 +101,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertStyle", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertStyle(@RequestBody StyleEntity entity, HttpServletRequest req) { @@ -122,7 +122,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "list", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "com.lf.server.entity.data.StyleEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertStyles", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertStyles(@RequestBody List<StyleEntity> list, HttpServletRequest req) { @@ -161,7 +161,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/deleteStyles") public ResponseMsg<Integer> deleteStyles(@RequestParam List<Integer> ids) { @@ -181,7 +181,7 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "ID闆嗗悎", dataType = "StyleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "StyleEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateStyle", produces = "application/json; charset=UTF-8") diff --git a/src/main/java/com/lf/server/controller/data/VerController.java b/src/main/java/com/lf/server/controller/data/VerController.java index 5094751..f2790a7 100644 --- a/src/main/java/com/lf/server/controller/data/VerController.java +++ b/src/main/java/com/lf/server/controller/data/VerController.java @@ -101,7 +101,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.VersionEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.VersionEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertVersion", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertVersion(@RequestBody VerEntity entity, HttpServletRequest req) { @@ -161,7 +161,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteVersions") public ResponseMsg<Integer> deleteVersions(@RequestParam List<Integer> ids) { @@ -179,7 +179,7 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "ID闆嗗悎", dataType = "VersionEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "VersionEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateVersion", produces = "application/json; charset=UTF-8") diff --git a/src/main/java/com/lf/server/controller/sys/AuthController.java b/src/main/java/com/lf/server/controller/sys/AuthController.java index 49bdedd..f55bb2a 100644 --- a/src/main/java/com/lf/server/controller/sys/AuthController.java +++ b/src/main/java/com/lf/server/controller/sys/AuthController.java @@ -98,7 +98,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.AuthEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.AuthEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertAuth", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertAuth(@RequestBody AuthEntity entity, HttpServletRequest req) { @@ -158,7 +158,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteAuths") public ResponseMsg<Integer> deleteAuths(@RequestParam List<Integer> ids) { diff --git a/src/main/java/com/lf/server/controller/sys/DepController.java b/src/main/java/com/lf/server/controller/sys/DepController.java index e87bfb0..541bbb7 100644 --- a/src/main/java/com/lf/server/controller/sys/DepController.java +++ b/src/main/java/com/lf/server/controller/sys/DepController.java @@ -34,7 +34,7 @@ TokenService tokenService; @SysLog() - @ApiOperation(value = "鎻掑叆鏁版嵁") + @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.DepEntity", paramType = "body", example = "") }) @@ -80,7 +80,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/deleteDep") public ResponseMsg<Integer> deleteDep(int id) { @@ -96,7 +96,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/deleteDeps") public ResponseMsg<Integer> deleteDeps(@RequestParam List<Integer> ids) { @@ -162,7 +162,7 @@ @SysLog() @ApiOperation(value = "鏍规嵁ID鏌ヨ") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/selectDep") public ResponseMsg<DepEntity> selectDep(int id) { diff --git a/src/main/java/com/lf/server/controller/sys/LoginController.java b/src/main/java/com/lf/server/controller/sys/LoginController.java index e7da630..7a7210c 100644 --- a/src/main/java/com/lf/server/controller/sys/LoginController.java +++ b/src/main/java/com/lf/server/controller/sys/LoginController.java @@ -169,7 +169,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteLogins") public ResponseMsg<Integer> deleteLogins(@RequestParam List<Integer> ids) { diff --git a/src/main/java/com/lf/server/controller/sys/MenuController.java b/src/main/java/com/lf/server/controller/sys/MenuController.java index 63bcd30..6d92046 100644 --- a/src/main/java/com/lf/server/controller/sys/MenuController.java +++ b/src/main/java/com/lf/server/controller/sys/MenuController.java @@ -81,7 +81,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "id", value = "ID", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/deleteMenu") public ResponseMsg<Integer> deleteMenu(int id) { @@ -97,7 +97,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "id", value = "涓婚敭ID", dataType = "Integer", paramType = "query", example = "1") + @ApiImplicitParam(name = "id", value = "ID鏁扮粍", dataType = "Integer", paramType = "query", example = "1") }) @GetMapping(value = "/deleteMenus") public ResponseMsg<Integer> deleteMenus(@RequestParam List<Integer> ids) { diff --git a/src/main/java/com/lf/server/controller/sys/OperateController.java b/src/main/java/com/lf/server/controller/sys/OperateController.java index 7d6354c..f81e050 100644 --- a/src/main/java/com/lf/server/controller/sys/OperateController.java +++ b/src/main/java/com/lf/server/controller/sys/OperateController.java @@ -108,7 +108,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.OperateEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.OperateEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertOperate", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertOperate(@RequestBody OperateEntity entity, HttpServletRequest req) { @@ -168,7 +168,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteOperates") public ResponseMsg<Integer> deleteOperates(@RequestParam List<Integer> ids) { diff --git a/src/main/java/com/lf/server/controller/sys/ResController.java b/src/main/java/com/lf/server/controller/sys/ResController.java index 60915cb..390657f 100644 --- a/src/main/java/com/lf/server/controller/sys/ResController.java +++ b/src/main/java/com/lf/server/controller/sys/ResController.java @@ -3,7 +3,6 @@ import com.lf.server.aspect.SysLog; import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; -import com.lf.server.entity.sys.AttachEntity; import com.lf.server.entity.sys.ResEntity; import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.ResService; @@ -99,7 +98,7 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.ResEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.ResEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertRes", produces = "application/json; charset=UTF-8") public ResponseMsg<Integer> insertRes(@RequestBody ResEntity entity, HttpServletRequest req) { @@ -159,7 +158,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteRess") public ResponseMsg<Integer> deleteRess(@RequestParam List<Integer> ids) { @@ -177,7 +176,7 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "ID闆嗗悎", dataType = "ResEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "ResEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateRes", produces = "application/json; charset=UTF-8") diff --git a/src/main/java/com/lf/server/controller/sys/ResOpController.java b/src/main/java/com/lf/server/controller/sys/ResOpController.java index 1049214..5a2e632 100644 --- a/src/main/java/com/lf/server/controller/sys/ResOpController.java +++ b/src/main/java/com/lf/server/controller/sys/ResOpController.java @@ -3,7 +3,6 @@ import com.lf.server.aspect.SysLog; import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; -import com.lf.server.entity.sys.AttachEntity; import com.lf.server.entity.sys.ResOpEntity; import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.ResOpService; @@ -169,7 +168,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteResOps") public ResponseMsg<Integer> deleteResOps(@RequestParam List<Integer> ids) { @@ -187,7 +186,7 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "entity", value = "ID闆嗗悎", dataType = "LoginEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "ID鏁扮粍", dataType = "LoginEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateResOp", produces = "application/json; charset=UTF-8") diff --git a/src/main/java/com/lf/server/controller/sys/RoleController.java b/src/main/java/com/lf/server/controller/sys/RoleController.java index 105ad37..edc7f2c 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.RoleEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.RoleService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -25,6 +28,9 @@ public class RoleController extends BaseController { @Autowired RoleService roleService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -95,12 +101,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "roleEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.RoleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.RoleEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertRole", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertRole(@RequestBody RoleEntity roleEntity) { + public ResponseMsg<Integer> insertRole(@RequestBody RoleEntity entity, HttpServletRequest req) { try { - int count = roleService.insertRole(roleEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = roleService.insertRole(entity); return success(count); } catch (Exception ex) { @@ -111,12 +122,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "roleEntity", value = "瀹炰綋绫婚泦鍚�", dataType = "List<RoleEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<RoleEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertRoles", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertRoles(@RequestBody List<RoleEntity> roleEntity) { + public ResponseMsg<Integer> insertRoles(@RequestBody List<RoleEntity> list, HttpServletRequest req) { try { - int count = roleService.insertRoles(roleEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (RoleEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = roleService.insertRoles(list); return success(count); } catch (Exception ex) { @@ -143,7 +161,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteAuths") public ResponseMsg<Integer> deleteRoles(@RequestParam List<Integer> ids) { @@ -151,7 +169,9 @@ if (ids == null || ids.isEmpty()) { return fail("id鏁扮粍涓嶈兘涓虹┖", -1); } + int count = roleService.deleteRoles(ids); + return success(count); } catch (Exception ex) { return fail(ex.getMessage(), -1); @@ -161,13 +181,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "roleEntity", value = "ID闆嗗悎", dataType = "RoleEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateRole", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateRole(@RequestBody RoleEntity roleEntity) { + public ResponseMsg<Integer> updateRole(@RequestBody RoleEntity entity, HttpServletRequest req) { try { - int count = roleService.updateRole(roleEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = roleService.updateRole(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/controller/sys/RoleMenuController.java b/src/main/java/com/lf/server/controller/sys/RoleMenuController.java index c4a14f1..9b68fb9 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleMenuController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleMenuController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.RoleMenuEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.RoleMenuService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class RoleMenuController extends BaseController { @Autowired RoleMenuService roleMenuService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleMenuEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody RoleMenuEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody RoleMenuEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = roleMenuService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "RoleMenuEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<RoleMenuEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<RoleMenuEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (RoleMenuEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = roleMenuService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody RoleMenuEntity entity) { + public ResponseMsg<Integer> update(@RequestBody RoleMenuEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = roleMenuService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<RoleMenuEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<RoleMenuEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (RoleMenuEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = roleMenuService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/RoleResController.java b/src/main/java/com/lf/server/controller/sys/RoleResController.java index f6bd32b..3f1c4fa 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleResController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleResController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.RoleResEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.RoleResService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class RoleResController extends BaseController { @Autowired RoleResService roleResService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleResEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody RoleResEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody RoleResEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = roleResService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "RoleResEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<RoleResEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<RoleResEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (RoleResEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = roleResService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody RoleResEntity entity) { + public ResponseMsg<Integer> update(@RequestBody RoleResEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = roleResService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<RoleResEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<RoleResEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (RoleResEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = roleResService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/RoleUserController.java b/src/main/java/com/lf/server/controller/sys/RoleUserController.java index 855544b..3243472 100644 --- a/src/main/java/com/lf/server/controller/sys/RoleUserController.java +++ b/src/main/java/com/lf/server/controller/sys/RoleUserController.java @@ -4,7 +4,9 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.RoleUserEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.RoleUserService; +import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; @@ -12,6 +14,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -24,6 +27,9 @@ public class RoleUserController extends BaseController { @Autowired RoleUserService roleUserService; + + @Autowired + TokenService tokenService; @SysLog() @ApiOperation(value = "鏌ヨ璁板綍鏁�") @@ -123,8 +129,13 @@ @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "RoleUserEntity", paramType = "body") }) @PostMapping(value = "/insert", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insert(@RequestBody RoleUserEntity entity) { + public ResponseMsg<Integer> insert(@RequestBody RoleUserEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + int count = roleUserService.insert(entity); return success(count); @@ -139,8 +150,15 @@ @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "RoleUserEntity", paramType = "body") }) @PostMapping(value = "/inserts", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> inserts(@RequestBody List<RoleUserEntity> list) { + public ResponseMsg<Integer> inserts(@RequestBody List<RoleUserEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (RoleUserEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + int count = roleUserService.inserts(list); return success(count); @@ -192,8 +210,13 @@ }) @ResponseBody @PostMapping(value = "/update", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> update(@RequestBody RoleUserEntity entity) { + public ResponseMsg<Integer> update(@RequestBody RoleUserEntity entity, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + int count = roleUserService.update(entity); return success(count); @@ -209,8 +232,15 @@ }) @ResponseBody @PostMapping(value = "/updates", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updates(@RequestBody List<RoleUserEntity> list) { + public ResponseMsg<Integer> updates(@RequestBody List<RoleUserEntity> list, HttpServletRequest req) { try { + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (RoleUserEntity entity : list) { + entity.setUpdateUser(ue.getId()); + } + } + int count = roleUserService.updates(list); return success(count); diff --git a/src/main/java/com/lf/server/controller/sys/TokenController.java b/src/main/java/com/lf/server/controller/sys/TokenController.java index eddfbe5..1ea83ef 100644 --- a/src/main/java/com/lf/server/controller/sys/TokenController.java +++ b/src/main/java/com/lf/server/controller/sys/TokenController.java @@ -4,6 +4,7 @@ import com.lf.server.controller.all.BaseController; import com.lf.server.entity.all.ResponseMsg; import com.lf.server.entity.sys.TokenEntity; +import com.lf.server.entity.sys.UserEntity; import com.lf.server.service.sys.TokenService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -12,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; import java.util.List; /** @@ -90,12 +92,18 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "tokenEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.sys.TokenEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.sys.TokenEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertToken", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertToken(@RequestBody TokenEntity tokenEntity) { + public ResponseMsg<Integer> insertToken(@RequestBody TokenEntity entity, HttpServletRequest req) { try { - int count = tokenService.insertToken(tokenEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = tokenService.insertToken(entity); + return success(count); } catch (Exception ex) { return fail(ex.getMessage(), -1); @@ -105,12 +113,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "tokenEntity", value = "瀹炰綋绫婚泦鍚�", dataType = "List<TokenEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<TokenEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertTokens", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertTokens(@RequestBody List<TokenEntity> tokenEntity) { + public ResponseMsg<Integer> insertTokens(@RequestBody List<TokenEntity> list, HttpServletRequest req) { try { - int count = tokenService.insertTokens(tokenEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (TokenEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = tokenService.insertTokens(list); return success(count); } catch (Exception ex) { @@ -137,7 +152,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteTokens") public ResponseMsg<Integer> deleteTokens(@RequestParam List<Integer> ids) { @@ -155,13 +170,19 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "tokenEntity", value = "ID闆嗗悎", dataType = "TokenEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "TokenEntity", paramType = "body", example = "") }) @ResponseBody @PostMapping(value = "/updateToken", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateToken(@RequestBody TokenEntity tokenEntity) { + public ResponseMsg<Integer> updateToken(@RequestBody TokenEntity entity, HttpServletRequest req) { try { - int count = tokenService.updateToken(tokenEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = tokenService.updateToken(entity); + return success(count); } catch (Exception ex) { return fail(ex.getMessage(), -1); diff --git a/src/main/java/com/lf/server/controller/sys/UserController.java b/src/main/java/com/lf/server/controller/sys/UserController.java index bbad097..92a70b7 100644 --- a/src/main/java/com/lf/server/controller/sys/UserController.java +++ b/src/main/java/com/lf/server/controller/sys/UserController.java @@ -100,12 +100,17 @@ @SysLog() @ApiOperation(value = "鎻掑叆涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "userEntity", value = "瀛楀吀瀹炰綋绫�", dataType = "com.lf.server.entity.data.UserEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "com.lf.server.entity.data.UserEntity", paramType = "body", example = "") }) @PostMapping(value = "/insertUser", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertUser(@RequestBody UserEntity userEntity) { + public ResponseMsg<Integer> insertUser(@RequestBody UserEntity entity, HttpServletRequest req) { try { - int count = userService.insertUser(userEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setCreateUser(ue.getId()); + } + + int count = userService.insertUser(entity); return success(count); } catch (Exception ex) { @@ -116,12 +121,19 @@ @SysLog() @ApiOperation(value = "鎻掑叆澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "userEntity", value = "瀹炰綋绫婚泦鍚�", dataType = "List<UserEntity>", paramType = "body", example = "") + @ApiImplicitParam(name = "list", value = "瀹炰綋绫婚泦鍚�", dataType = "List<UserEntity>", paramType = "body", example = "") }) @PostMapping(value = "/insertUsers", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> insertUsers(@RequestBody List<UserEntity> userEntity) { + public ResponseMsg<Integer> insertUsers(@RequestBody List<UserEntity> list, HttpServletRequest req) { try { - int count = userService.insertUsers(userEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + for (UserEntity entity : list) { + entity.setCreateUser(ue.getId()); + } + } + + int count = userService.insertUsers(list); return success(count); } catch (Exception ex) { @@ -148,7 +160,7 @@ @SysLog() @ApiOperation(value = "鍒犻櫎澶氭潯") @ApiImplicitParams({ - @ApiImplicitParam(name = "ids", value = "ID闆嗗悎", dataType = "List<Integer>", paramType = "query", example = "1,2") + @ApiImplicitParam(name = "ids", value = "ID鏁扮粍", dataType = "List<Integer>", paramType = "query", example = "1,2") }) @GetMapping(value = "/deleteUsers") public ResponseMsg<Integer> deleteUsers(@RequestParam List<Integer> ids) { @@ -168,13 +180,18 @@ @SysLog() @ApiOperation(value = "鏇存柊涓�鏉�") @ApiImplicitParams({ - @ApiImplicitParam(name = "userEntity", value = "ID闆嗗悎", dataType = "UserEntity", paramType = "body", example = "") + @ApiImplicitParam(name = "entity", value = "瀹炰綋绫�", dataType = "UserEntity", paramType = "body", example = "") }) @ResponseBody - @PostMapping(value = "/updateUsers", produces = "application/json; charset=UTF-8") - public ResponseMsg<Integer> updateUsers(@RequestBody UserEntity userEntity) { + @PostMapping(value = "/updateUser", produces = "application/json; charset=UTF-8") + public ResponseMsg<Integer> updateUser(@RequestBody UserEntity entity, HttpServletRequest req) { try { - int count = userService.updateUsers(userEntity); + UserEntity ue = tokenService.getCurrentUser(req); + if (ue != null) { + entity.setUpdateUser(ue.getId()); + } + + int count = userService.updateUsers(entity); return success(count); } catch (Exception ex) { diff --git a/src/main/java/com/lf/server/mapper/data/DictMapper.java b/src/main/java/com/lf/server/mapper/data/DictMapper.java index 82a65a0..918e8dd 100644 --- a/src/main/java/com/lf/server/mapper/data/DictMapper.java +++ b/src/main/java/com/lf/server/mapper/data/DictMapper.java @@ -15,7 +15,7 @@ @Repository public interface DictMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param tab 琛ㄥ悕 * @return 璁板綍鏁� @@ -23,7 +23,7 @@ public Integer selectCount(String tab); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param tab 琛ㄥ悕 * @param limit 璁板綍琛� @@ -81,7 +81,7 @@ public DictEntity selectDict(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/data/DirMapper.java b/src/main/java/com/lf/server/mapper/data/DirMapper.java index 12bb7b1..4fd17ba 100644 --- a/src/main/java/com/lf/server/mapper/data/DirMapper.java +++ b/src/main/java/com/lf/server/mapper/data/DirMapper.java @@ -16,7 +16,7 @@ @Repository public interface DirMapper { /** - * 娣诲姞鍗曟潯鏁版嵁 + * 鎻掑叆涓�鏉� * @param dirEntity * @return */ @@ -30,7 +30,7 @@ public Integer insertDirs(List<DirEntity> dirEntity); /** - * 鍒犻櫎鍗曟潯鏁版嵁 + * 鍒犻櫎涓�鏉� * @param id * @return */ @@ -51,12 +51,11 @@ public Integer updateDir(DirEntity dirEntity); /** - * 鎵归噺鏇存柊涓�鏉� + * 鏇存柊澶氭潯 * @param dirEntity * @return */ public Integer updateDirs(List<DirEntity> dirEntity); - /** * 鏌ヨ鍗曟潯鏁版嵁 diff --git a/src/main/java/com/lf/server/mapper/data/StyleMapper.java b/src/main/java/com/lf/server/mapper/data/StyleMapper.java index ab6db39..2943aaa 100644 --- a/src/main/java/com/lf/server/mapper/data/StyleMapper.java +++ b/src/main/java/com/lf/server/mapper/data/StyleMapper.java @@ -15,7 +15,7 @@ @ResponseBody public interface StyleMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param name 鏍峰紡鍚� * @return 璁板綍鏁� @@ -23,7 +23,7 @@ public Integer selectCount(String name); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param name 鏍峰紡鍚� * @param limit 璁板綍琛� @@ -81,7 +81,7 @@ public StyleEntity selectStyle(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/data/VerMapper.java b/src/main/java/com/lf/server/mapper/data/VerMapper.java index 96b61f6..9822a37 100644 --- a/src/main/java/com/lf/server/mapper/data/VerMapper.java +++ b/src/main/java/com/lf/server/mapper/data/VerMapper.java @@ -15,7 +15,7 @@ @ResponseBody public interface VerMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param name 鍚嶇О * @param depName 鍚嶇О @@ -24,7 +24,7 @@ public Integer selectCount(String name,String depName); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param name 鍚嶇О * @param depName 鍚嶇О @@ -83,7 +83,7 @@ public VerEntity selectVersion(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/sys/AuthMapper.java b/src/main/java/com/lf/server/mapper/sys/AuthMapper.java index 2efea9e..31ea4f5 100644 --- a/src/main/java/com/lf/server/mapper/sys/AuthMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/AuthMapper.java @@ -15,7 +15,7 @@ @ResponseBody public interface AuthMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param name 鍚嶇О * @return 璁板綍鏁� @@ -23,7 +23,7 @@ public Integer selectCount(String name); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param name 鍚嶇О * @param limit 璁板綍琛� @@ -81,7 +81,7 @@ public AuthEntity selectAuth(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/sys/DepMapper.java b/src/main/java/com/lf/server/mapper/sys/DepMapper.java index 14db8b6..79b9677 100644 --- a/src/main/java/com/lf/server/mapper/sys/DepMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/DepMapper.java @@ -57,7 +57,7 @@ public DepEntity selectDep(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * @return */ public List<DepEntity> selectDepAll(); diff --git a/src/main/java/com/lf/server/mapper/sys/LoginMapper.java b/src/main/java/com/lf/server/mapper/sys/LoginMapper.java index b2b1d53..0ea7a3d 100644 --- a/src/main/java/com/lf/server/mapper/sys/LoginMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/LoginMapper.java @@ -88,7 +88,7 @@ public LoginEntity selectLogin(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/sys/MenuMapper.java b/src/main/java/com/lf/server/mapper/sys/MenuMapper.java index 2e5afa4..20b498a 100644 --- a/src/main/java/com/lf/server/mapper/sys/MenuMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/MenuMapper.java @@ -57,7 +57,7 @@ public MenuEntity selectMenu(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * @return */ public List<MenuEntity> selectMenuAll(); diff --git a/src/main/java/com/lf/server/mapper/sys/OperateMapper.java b/src/main/java/com/lf/server/mapper/sys/OperateMapper.java index 9bb8cdd..b896277 100644 --- a/src/main/java/com/lf/server/mapper/sys/OperateMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/OperateMapper.java @@ -86,7 +86,7 @@ public OperateEntity selectOperate(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/sys/ResMapper.java b/src/main/java/com/lf/server/mapper/sys/ResMapper.java index 3688f40..b4c0589 100644 --- a/src/main/java/com/lf/server/mapper/sys/ResMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/ResMapper.java @@ -15,7 +15,7 @@ @ResponseBody public interface ResMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param name 琛ㄥ悕 * @return 璁板綍鏁� @@ -23,7 +23,7 @@ public Integer selectCount(String name); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param name 琛ㄥ悕 * @param limit 璁板綍琛� @@ -76,7 +76,7 @@ public ResEntity selectRes(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * @return */ public List<ResEntity> selectResAll(); diff --git a/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java b/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java index 1741178..05890ea 100644 --- a/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/ResOpMapper.java @@ -88,7 +88,7 @@ public ResOpEntity selectResOp(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/sys/RoleMapper.java b/src/main/java/com/lf/server/mapper/sys/RoleMapper.java index 6146442..f532077 100644 --- a/src/main/java/com/lf/server/mapper/sys/RoleMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/RoleMapper.java @@ -15,7 +15,7 @@ @ResponseBody public interface RoleMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param name 鍚嶇О * @param depName 鍚嶇О @@ -24,7 +24,7 @@ public Integer selectCount(String name, String depName); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param name 鍚嶇О * @param depName 鍚嶇О @@ -83,7 +83,7 @@ public RoleEntity selectRole(int id); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/sys/TokenMapper.java b/src/main/java/com/lf/server/mapper/sys/TokenMapper.java index 5addf6b..4a388e2 100644 --- a/src/main/java/com/lf/server/mapper/sys/TokenMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/TokenMapper.java @@ -16,7 +16,7 @@ @ResponseBody public interface TokenMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param token 琛ㄥ悕 * @return 璁板綍鏁� @@ -24,7 +24,7 @@ public Integer selectCount(String token); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param token 琛ㄥ悕 * @param limit 璁板綍琛� @@ -50,7 +50,7 @@ public TokenEntity selectOneByToken(String token); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ diff --git a/src/main/java/com/lf/server/mapper/sys/UserMapper.java b/src/main/java/com/lf/server/mapper/sys/UserMapper.java index f4945f9..4ae1163 100644 --- a/src/main/java/com/lf/server/mapper/sys/UserMapper.java +++ b/src/main/java/com/lf/server/mapper/sys/UserMapper.java @@ -16,7 +16,7 @@ public interface UserMapper { /** - * 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁� + * 鏌ヨ璁板綍鏁� * * @param uname 鐢ㄦ埛鍚� * @return 璁板綍鏁� @@ -24,7 +24,7 @@ public Integer selectCount(String uname); /** - * 鏍规嵁琛ㄥ悕鍒嗛〉鏌ヨ + * 鍒嗛〉鏌ヨ * * @param uname 鐢ㄦ埗鍚� * @param limit 璁板綍琛� @@ -98,7 +98,7 @@ public UserEntity selectByUid(String uid); /** - * 鏌ヨ鍏ㄩ儴鏁版嵁 + * 鏌ヨ鎵�鏈� * * @return */ -- Gitblit v1.9.3