From 86698147b0dc4a518bea2cad42e11e4601f7e970 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 10 十月 2022 09:27:30 +0800
Subject: [PATCH] 1

---
 src/main/java/com/lf/server/controller/sys/UserController.java |   52 ++++++++++++++++++++++++++--------------------------
 1 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/main/java/com/lf/server/controller/sys/UsersController.java b/src/main/java/com/lf/server/controller/sys/UserController.java
similarity index 82%
rename from src/main/java/com/lf/server/controller/sys/UsersController.java
rename to src/main/java/com/lf/server/controller/sys/UserController.java
index 5f68242..9763315 100644
--- a/src/main/java/com/lf/server/controller/sys/UsersController.java
+++ b/src/main/java/com/lf/server/controller/sys/UserController.java
@@ -3,11 +3,11 @@
 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.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
 import com.lf.server.helper.Md5Helper;
 import com.lf.server.helper.StringHelper;
 import com.lf.server.service.sys.TokenService;
-import com.lf.server.service.sys.UsersService;
+import com.lf.server.service.sys.UserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -27,9 +27,9 @@
 @Api(tags = "杩愮淮绠$悊\\鐢ㄦ埛绠$悊")
 @RestController
 @RequestMapping("/user")
-public class UsersController extends BaseController {
+public class UserController extends BaseController {
     @Autowired
-    UsersService userService;
+    UserService userService;
 
     @Autowired
     TokenService tokenService;
@@ -58,13 +58,13 @@
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPage")
-    public ResponseMsg<List<UsersEntity>> selectByPage(String uname, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<UserEntity>> selectByPage(String uname, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
             }
 
-            List<UsersEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
+            List<UserEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
 
             return success(rs);
         } catch (Exception ex) {
@@ -80,7 +80,7 @@
             @ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectByPageAndCount")
-    public ResponseMsg<List<UsersEntity>> selectByPageAndCount(String uname, Integer pageSize, Integer pageIndex) {
+    public ResponseMsg<List<UserEntity>> selectByPageAndCount(String uname, Integer pageSize, Integer pageIndex) {
         try {
             if (pageSize < 1 || pageIndex < 1) {
                 return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -89,7 +89,7 @@
             if (count == 0) {
                 return success(0, null);
             }
-            List<UsersEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
+            List<UserEntity> rs = userService.selectByPage(uname, pageSize, pageSize * (pageIndex - 1));
 
             return success(count, rs);
         } catch (Exception ex) {
@@ -103,9 +103,9 @@
             @ApiImplicitParam(name = "userEntity", 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 UsersEntity usersEntity) {
+    public ResponseMsg<Integer> insertUser(@RequestBody UserEntity userEntity) {
         try {
-            int count = userService.insertUser(usersEntity);
+            int count = userService.insertUser(userEntity);
 
             return success(count);
         } catch (Exception ex) {
@@ -119,9 +119,9 @@
             @ApiImplicitParam(name = "userEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<UserEntity>", paramType = "body", example = "")
     })
     @PostMapping(value = "/insertUsers", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> insertUsers(@RequestBody List<UsersEntity> usersEntity) {
+    public ResponseMsg<Integer> insertUsers(@RequestBody List<UserEntity> userEntity) {
         try {
-            int count = userService.insertUsers(usersEntity);
+            int count = userService.insertUsers(userEntity);
 
             return success(count);
         } catch (Exception ex) {
@@ -172,9 +172,9 @@
     })
     @ResponseBody
     @PostMapping(value = "/updateUsers", produces = "application/json; charset=UTF-8")
-    public ResponseMsg<Integer> updateUsers(@RequestBody UsersEntity usersEntity) {
+    public ResponseMsg<Integer> updateUsers(@RequestBody UserEntity userEntity) {
         try {
-            int count = userService.updateUsers(usersEntity);
+            int count = userService.updateUsers(userEntity);
 
             return success(count);
         } catch (Exception ex) {
@@ -188,11 +188,11 @@
             @ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
     })
     @GetMapping(value = "/selectUser")
-    public ResponseMsg<UsersEntity> selectUser(int id) {
+    public ResponseMsg<UserEntity> selectUser(int id) {
         try {
-            UsersEntity usersEntity = userService.selectUser(id);
+            UserEntity userEntity = userService.selectUser(id);
 
-            return success(usersEntity);
+            return success(userEntity);
         } catch (Exception ex) {
             return fail(ex.getMessage(), null);
         }
@@ -201,9 +201,9 @@
     @SysLog()
     @ApiOperation(value = "鏌ヨ鎵�鏈夊瓧鍏�")
     @GetMapping(value = "/selectUserAll")
-    public ResponseMsg<List<UsersEntity>> selectUserAll() {
+    public ResponseMsg<List<UserEntity>> selectUserAll() {
         try {
-            List<UsersEntity> list = userService.selectUserAll();
+            List<UserEntity> list = userService.selectUserAll();
 
             return success(list);
         } catch (Exception ex) {
@@ -217,7 +217,7 @@
             @ApiImplicitParam(name = "user", value = "鐢ㄦ埛瀹炰綋绫�", dataType = "UsersEntity", paramType = "body", example = "")
     })
     @PostMapping(value = "/updateUserPwd")
-    public ResponseMsg<Boolean> updateUserPwd(@RequestBody UsersEntity user, HttpServletRequest req, HttpServletResponse res) {
+    public ResponseMsg<Boolean> updateUserPwd(@RequestBody UserEntity user, HttpServletRequest req, HttpServletResponse res) {
         try {
             if (user == null) {
                 return fail("璇锋彁浜ょ敤鎴蜂俊鎭紒", false);
@@ -232,7 +232,7 @@
                 return fail("鏂板瘑鐮佷笉绗﹀悎瑙勫垯瑕佹眰锛�", false);
             }
 
-            UsersEntity ue = tokenService.getCurrentUser(req);
+            UserEntity ue = tokenService.getCurrentUser(req);
             if (ue == null) {
                 return fail("娌℃湁鐧诲綍鎴栫櫥褰曡秴鏃讹紒", false);
             }
@@ -240,17 +240,17 @@
                 return fail("绠$悊鍛樺瘑鐮佷笉姝g‘锛�", false);
             }
 
-            UsersEntity usersEntity = userService.selectUser(user.getId());
-            if (usersEntity == null) {
+            UserEntity userEntity = userService.selectUser(user.getId());
+            if (userEntity == null) {
                 return fail("娌℃湁鎵惧埌瑕佷慨鏀圭殑鐢ㄦ埛锛�", false);
             }
             // 璁剧疆鏂板瘑鐮�
             String md5 = Md5Helper.reverse(Md5Helper.generate(user.getPwd()));
-            usersEntity.setPwd(md5);
+            userEntity.setPwd(md5);
             // 璁剧疆鏇存柊淇℃伅
-            usersEntity.setUpdateUser(ue.getId());
+            userEntity.setUpdateUser(ue.getId());
 
-            Integer rows = userService.updateUsers(usersEntity);
+            Integer rows = userService.updateUsers(userEntity);
 
             return success(rows > 0 ? "鏇存柊鎴愬姛" : "鏇存柊澶辫触", rows > 0);
         } catch (Exception ex) {

--
Gitblit v1.9.3