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/service/sys/UserService.java | 75 +++++++++
src/main/java/com/lf/server/controller/sys/UserController.java | 52 +++---
src/main/java/com/lf/server/mapper/data/VerMapper.java | 22 +-
src/main/java/com/lf/server/interceptor/AuthInterceptor.java | 3
src/main/java/com/lf/server/service/data/VerService.java | 65 ++++++++
src/main/java/com/lf/server/aspect/LogAspect.java | 4
src/main/java/com/lf/server/service/sys/TokenService.java | 16 +-
/dev/null | 75 ---------
src/main/java/com/lf/server/controller/all/SignController.java | 22 +-
src/main/java/com/lf/server/entity/sys/UserEntity.java | 2
src/main/java/com/lf/server/service/all/ScheduleService.java | 6
src/main/java/com/lf/server/mapper/sys/UserMapper.java | 26 +-
src/main/resources/mapper/sys/UserMapper.xml | 16 +-
src/main/java/com/lf/server/controller/data/VerController.java | 38 ++--
src/main/resources/mapper/data/VerMapper.xml | 10
src/main/java/com/lf/server/entity/data/VerEntity.java | 2
16 files changed, 248 insertions(+), 186 deletions(-)
diff --git a/src/main/java/com/lf/server/aspect/LogAspect.java b/src/main/java/com/lf/server/aspect/LogAspect.java
index 527b555..a2f1cf7 100644
--- a/src/main/java/com/lf/server/aspect/LogAspect.java
+++ b/src/main/java/com/lf/server/aspect/LogAspect.java
@@ -1,7 +1,7 @@
package com.lf.server.aspect;
import com.lf.server.entity.sys.OperateEntity;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.WebHelper;
import com.lf.server.service.sys.OperateService;
import com.lf.server.service.sys.TokenService;
@@ -103,7 +103,7 @@
oe.setBak(sysLog.value());
}
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
oe.setUserid(ue.getId());
}
diff --git a/src/main/java/com/lf/server/controller/all/SignController.java b/src/main/java/com/lf/server/controller/all/SignController.java
index c950e57..2335ac5 100644
--- a/src/main/java/com/lf/server/controller/all/SignController.java
+++ b/src/main/java/com/lf/server/controller/all/SignController.java
@@ -6,11 +6,11 @@
import com.lf.server.entity.all.StaticData;
import com.lf.server.entity.sys.LoginEntity;
import com.lf.server.entity.sys.TokenEntity;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.*;
import com.lf.server.service.sys.LoginService;
import com.lf.server.service.sys.TokenService;
-import com.lf.server.service.sys.UsersService;
+import com.lf.server.service.sys.UserService;
import com.lf.server.service.all.SignService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -33,7 +33,7 @@
@RequestMapping("/sign")
public class SignController extends BaseController {
@Autowired
- UsersService userService;
+ UserService userService;
@Autowired
LoginService loginService;
@@ -53,7 +53,7 @@
public ModelAndView toIndex(ModelAndView mv, HttpServletRequest req) {
mv.setViewName("index");
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
mv.addObject("msg", "Hello " + ue.getUname() + " !");
}
@@ -78,7 +78,7 @@
mv.setViewName("druid");
try {
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
String sessionId = WebHelper.getCookieByKey(StaticData.DRUID_COOKIE_KEY, req);
if (StringHelper.isNull(sessionId)) {
@@ -99,7 +99,7 @@
try {
mv.setViewName("redirect:/toLogin");
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue != null) {
mv.setViewName("monitor");
}
@@ -116,7 +116,7 @@
@ApiImplicitParam(name = "user", value = "鐢ㄦ埗鍚�", dataType = "UsersEntity", paramType = "body", example = "")
})
@PostMapping(value = "/login", produces = "application/json; charset=UTF-8")
- public ResponseMsg<TokenEntity> login(@RequestBody UsersEntity user, HttpServletRequest req, HttpServletResponse res) {
+ public ResponseMsg<TokenEntity> login(@RequestBody UserEntity user, HttpServletRequest req, HttpServletResponse res) {
try {
if (user == null) {
return fail("璇疯緭鍏ョ敤鎴峰悕鍜屽瘑鐮侊紒", null);
@@ -132,7 +132,7 @@
String uid = RsaHelper.decrypt(user.getUid());
String pwd = RsaHelper.decrypt(user.getPwd());
- UsersEntity ue = userService.selectByUid(uid);
+ UserEntity ue = userService.selectByUid(uid);
if (ue == null) {
return fail("鐢ㄦ埛鍚嶄笉瀛樺湪锛�", null);
}
@@ -190,7 +190,7 @@
Boolean flag = tokenService.isLogin(req, res);
if (flag) {
// 鍐欐棩蹇�
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
LoginEntity le = loginService.getNewLogin(ue.getId(), 2, req);
Integer rows = loginService.insertLogin(le);
}
@@ -204,9 +204,9 @@
@SysLog()
@ApiOperation(value = "鑾峰彇褰撳墠鐢ㄦ埛")
@GetMapping("/getCurrentUser")
- public ResponseMsg<UsersEntity> getCurrentUser(HttpServletRequest req) {
+ public ResponseMsg<UserEntity> getCurrentUser(HttpServletRequest req) {
try {
- UsersEntity ue = tokenService.getCurrentUser(req);
+ UserEntity ue = tokenService.getCurrentUser(req);
if (ue == null) {
return fail("娌℃湁鎵惧埌", null);
}
diff --git a/src/main/java/com/lf/server/controller/data/VersionController.java b/src/main/java/com/lf/server/controller/data/VerController.java
similarity index 82%
rename from src/main/java/com/lf/server/controller/data/VersionController.java
rename to src/main/java/com/lf/server/controller/data/VerController.java
index 8efa195..4d4d59a 100644
--- a/src/main/java/com/lf/server/controller/data/VersionController.java
+++ b/src/main/java/com/lf/server/controller/data/VerController.java
@@ -3,8 +3,8 @@
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.data.VersionEntity;
-import com.lf.server.service.data.VersionService;
+import com.lf.server.entity.data.VerEntity;
+import com.lf.server.service.data.VerService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -23,9 +23,9 @@
@Api(tags = "鏁版嵁绠＄悊\\鐗堟湰绠＄悊")
@RestController
@RequestMapping("/version")
-public class VersionController extends BaseController {
+public class VerController extends BaseController {
@Autowired
- VersionService versionService;
+ VerService versionService;
@SysLog()
@ApiOperation(value = "鏌ヨ璁板綍鏁�")
@@ -53,12 +53,12 @@
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPage")
- public ResponseMsg<List<VersionEntity>> selectByPage(String name, String depName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<VerEntity>> selectByPage(String name, String depName, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
}
- List<VersionEntity> rs = versionService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1));
+ List<VerEntity> rs = versionService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1));
return success(rs);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
@@ -74,7 +74,7 @@
@ApiImplicitParam(name = "pageIndex", value = "鍒嗛〉鏁帮紙浠�1寮�濮嬶級", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectByPageAndCount")
- public ResponseMsg<List<VersionEntity>> selectByPageAndCount(String name,String depName, Integer pageSize, Integer pageIndex) {
+ public ResponseMsg<List<VerEntity>> selectByPageAndCount(String name, String depName, Integer pageSize, Integer pageIndex) {
try {
if (pageSize < 1 || pageIndex < 1) {
return fail("姣忛〉椤垫暟鎴栧垎椤垫暟灏忎簬1", null);
@@ -85,7 +85,7 @@
return success(0, null);
}
- List<VersionEntity> rs = versionService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1));
+ List<VerEntity> rs = versionService.selectByPage(name,depName, pageSize, pageSize * (pageIndex - 1));
return success(count, rs);
} catch (Exception ex) {
@@ -99,9 +99,9 @@
@ApiImplicitParam(name = "versionEntity", 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 VersionEntity versionEntity) {
+ public ResponseMsg<Integer> insertVersion(@RequestBody VerEntity verEntity) {
try {
- int count = versionService.insertVersion(versionEntity);
+ int count = versionService.insertVersion(verEntity);
return success(count);
} catch (Exception ex) {
@@ -115,9 +115,9 @@
@ApiImplicitParam(name = "versionEntity", value = "瀛楀吀瀹炰綋绫婚泦鍚�", dataType = "List<VersionEntity>", paramType = "body", example = "")
})
@PostMapping(value = "/insertVersions", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> insertVersions(@RequestParam List<VersionEntity> versionEntity) {
+ public ResponseMsg<Integer> insertVersions(@RequestParam List<VerEntity> verEntity) {
try {
- int count = versionService.insertVersions(versionEntity);
+ int count = versionService.insertVersions(verEntity);
return success(count);
} catch (Exception ex) {
@@ -166,9 +166,9 @@
})
@ResponseBody
@PostMapping(value = "/updateVersion", produces = "application/json; charset=UTF-8")
- public ResponseMsg<Integer> updateVersion(@RequestBody VersionEntity versionEntity) {
+ public ResponseMsg<Integer> updateVersion(@RequestBody VerEntity verEntity) {
try {
- int count = versionService.updateVersion(versionEntity);
+ int count = versionService.updateVersion(verEntity);
return success(count);
} catch (Exception ex) {
@@ -182,11 +182,11 @@
@ApiImplicitParam(name = "id", value = "瀛楀吀ID", dataType = "Integer", paramType = "query", example = "1")
})
@GetMapping(value = "/selectVersion")
- public ResponseMsg<VersionEntity> selectVersion(int id) {
+ public ResponseMsg<VerEntity> selectVersion(int id) {
try {
- VersionEntity versionEntity = versionService.selectVersion(id);
+ VerEntity verEntity = versionService.selectVersion(id);
- return success(versionEntity);
+ return success(verEntity);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
}
@@ -195,9 +195,9 @@
@SysLog()
@ApiOperation(value = "鏌ヨ鎵�鏈夊瓧鍏�")
@GetMapping(value = "/selectVersionAll")
- public ResponseMsg<List<VersionEntity>> selectVersionAll() {
+ public ResponseMsg<List<VerEntity>> selectVersionAll() {
try {
- List<VersionEntity> list = versionService.selectVersionAll();
+ List<VerEntity> list = versionService.selectVersionAll();
return success(list);
} catch (Exception ex) {
return fail(ex.getMessage(), null);
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("绠＄悊鍛樺瘑鐮佷笉姝ｇ‘锛�", 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) {
diff --git a/src/main/java/com/lf/server/entity/data/VersionEntity.java b/src/main/java/com/lf/server/entity/data/VerEntity.java
similarity index 96%
rename from src/main/java/com/lf/server/entity/data/VersionEntity.java
rename to src/main/java/com/lf/server/entity/data/VerEntity.java
index 88248c3..7996e37 100644
--- a/src/main/java/com/lf/server/entity/data/VersionEntity.java
+++ b/src/main/java/com/lf/server/entity/data/VerEntity.java
@@ -8,7 +8,7 @@
* @author sws
* @date 2022-09-29
*/
-public class VersionEntity implements Serializable {
+public class VerEntity implements Serializable {
private static final long serialVersionUID = 4765222572551658531L;
diff --git a/src/main/java/com/lf/server/entity/sys/UsersEntity.java b/src/main/java/com/lf/server/entity/sys/UserEntity.java
similarity index 98%
rename from src/main/java/com/lf/server/entity/sys/UsersEntity.java
rename to src/main/java/com/lf/server/entity/sys/UserEntity.java
index bab15b9..0d16261 100644
--- a/src/main/java/com/lf/server/entity/sys/UsersEntity.java
+++ b/src/main/java/com/lf/server/entity/sys/UserEntity.java
@@ -8,7 +8,7 @@
* @author sws
* @date 2022-09-27
*/
-public class UsersEntity implements Serializable {
+public class UserEntity implements Serializable {
private static final long serialVersionUID = 5676976561729666299L;
diff --git a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
index b283513..c6d9b4a 100644
--- a/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
+++ b/src/main/java/com/lf/server/interceptor/AuthInterceptor.java
@@ -4,9 +4,6 @@
import com.lf.server.entity.all.HttpStatus;
import com.lf.server.entity.all.ResponseMsg;
import com.lf.server.entity.all.StaticData;
-import com.lf.server.entity.sys.UsersEntity;
-import com.lf.server.helper.StringHelper;
-import com.lf.server.helper.WebHelper;
import com.lf.server.service.sys.TokenService;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/com/lf/server/mapper/data/VersionMapper.java b/src/main/java/com/lf/server/mapper/data/VerMapper.java
similarity index 68%
rename from src/main/java/com/lf/server/mapper/data/VersionMapper.java
rename to src/main/java/com/lf/server/mapper/data/VerMapper.java
index a2d2ac9..6254a54 100644
--- a/src/main/java/com/lf/server/mapper/data/VersionMapper.java
+++ b/src/main/java/com/lf/server/mapper/data/VerMapper.java
@@ -1,6 +1,6 @@
package com.lf.server.mapper.data;
-import com.lf.server.entity.data.VersionEntity;
+import com.lf.server.entity.data.VerEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.web.bind.annotation.ResponseBody;
@@ -13,7 +13,7 @@
*/
@Mapper
@ResponseBody
-public interface VersionMapper {
+public interface VerMapper {
/**
* 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁�
*
@@ -32,23 +32,23 @@
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<VersionEntity> selectByPage(String name,String depName, Integer limit, Integer offset);
+ public List<VerEntity> selectByPage(String name, String depName, Integer limit, Integer offset);
/**
* 娣诲姞鏁版嵁
*
- * @param versionEntity
+ * @param verEntity
* @return
*/
- public Integer insertVersion(VersionEntity versionEntity);
+ public Integer insertVersion(VerEntity verEntity);
/**
* 鎵归噺娣诲姞
*
- * @param versionEntity
+ * @param verEntity
* @return
*/
- public Integer insertVersions(List<VersionEntity> versionEntity);
+ public Integer insertVersions(List<VerEntity> verEntity);
/**
* 鍒櫎鏁版嵁
@@ -69,10 +69,10 @@
/**
* 淇敼鏁版嵁
*
- * @param versionEntity
+ * @param verEntity
* @return
*/
- public Integer updateVersion(VersionEntity versionEntity);
+ public Integer updateVersion(VerEntity verEntity);
/**
* 鏌ヨ鍗曟潯鏁版嵁
@@ -80,12 +80,12 @@
* @param id
* @return
*/
- public VersionEntity selectVersion(int id);
+ public VerEntity selectVersion(int id);
/**
* 鏌ヨ鍏ㄩ儴鏁版嵁
*
* @return
*/
- public List<VersionEntity> selectVersionAll();
+ public List<VerEntity> selectVersionAll();
}
diff --git a/src/main/java/com/lf/server/mapper/sys/UsersMapper.java b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
similarity index 68%
rename from src/main/java/com/lf/server/mapper/sys/UsersMapper.java
rename to src/main/java/com/lf/server/mapper/sys/UserMapper.java
index 1520a37..051d37b 100644
--- a/src/main/java/com/lf/server/mapper/sys/UsersMapper.java
+++ b/src/main/java/com/lf/server/mapper/sys/UserMapper.java
@@ -1,6 +1,6 @@
package com.lf.server.mapper.sys;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
import org.apache.ibatis.annotations.Mapper;
import org.springframework.stereotype.Repository;
@@ -13,7 +13,7 @@
*/
@Mapper
@Repository
-public interface UsersMapper {
+public interface UserMapper {
/**
* 鏍规嵁琛ㄥ悕鏌ヨ璁板綍鏁�
@@ -31,7 +31,7 @@
* @param offset 鍋忕Щ閲�
* @return 鍒楄〃
*/
- public List<UsersEntity> selectByPage(String uname, Integer limit, Integer offset);
+ public List<UserEntity> selectByPage(String uname, Integer limit, Integer offset);
/**
* 鏍规嵁token鏈夋晥鏈熸煡璇�
@@ -39,23 +39,23 @@
* @param token
* @return
*/
- public UsersEntity selectByToken(String token);
+ public UserEntity selectByToken(String token);
/**
* 娣诲姞鏁版嵁
*
- * @param usersEntity
+ * @param userEntity
* @return
*/
- public Integer insertUser(UsersEntity usersEntity);
+ public Integer insertUser(UserEntity userEntity);
/**
* 鎵归噺娣诲姞
*
- * @param usersEntity
+ * @param userEntity
* @return
*/
- public Integer insertUsers(List<UsersEntity> usersEntity);
+ public Integer insertUsers(List<UserEntity> userEntity);
/**
* 鍒櫎鏁版嵁
@@ -76,10 +76,10 @@
/**
* 淇敼鏁版嵁
*
- * @param usersEntity
+ * @param userEntity
* @return
*/
- public Integer updateUsers(UsersEntity usersEntity);
+ public Integer updateUsers(UserEntity userEntity);
/**
* 鏌ヨ鍗曟潯鏁版嵁
@@ -87,7 +87,7 @@
* @param id
* @return
*/
- public UsersEntity selectUser(int id);
+ public UserEntity selectUser(int id);
/**
* 鏍规嵁uid鏌ヨ
@@ -95,12 +95,12 @@
* @param uid
* @return
*/
- public UsersEntity selectByUid(String uid);
+ public UserEntity selectByUid(String uid);
/**
* 鏌ヨ鍏ㄩ儴鏁版嵁
*
* @return
*/
- public List<UsersEntity> selectUserAll();
+ public List<UserEntity> selectUserAll();
}
\ No newline at end of file
diff --git a/src/main/java/com/lf/server/service/all/ScheduleService.java b/src/main/java/com/lf/server/service/all/ScheduleService.java
index c094c64..70cc807 100644
--- a/src/main/java/com/lf/server/service/all/ScheduleService.java
+++ b/src/main/java/com/lf/server/service/all/ScheduleService.java
@@ -2,7 +2,7 @@
import com.lf.server.entity.all.RedisCacheKey;
import com.lf.server.entity.sys.ResEntity;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.helper.StringHelper;
import com.lf.server.service.sys.ResService;
import org.apache.commons.logging.Log;
@@ -122,8 +122,8 @@
Set<String> keys = redisTemplate.keys(RedisCacheKey.signUserKey("*"));
for (String key : keys) {
Object obj = redisTemplate.opsForValue().get(key);
- if (obj != null && obj instanceof UsersEntity) {
- UsersEntity ue = (UsersEntity) obj;
+ if (obj != null && obj instanceof UserEntity) {
+ UserEntity ue = (UserEntity) obj;
JSONObject map = new JSONObject();
map.put("uid", ue.getUid());
diff --git a/src/main/java/com/lf/server/service/data/VerService.java b/src/main/java/com/lf/server/service/data/VerService.java
new file mode 100644
index 0000000..2925e05
--- /dev/null
+++ b/src/main/java/com/lf/server/service/data/VerService.java
@@ -0,0 +1,65 @@
+package com.lf.server.service.data;
+
+import com.lf.server.entity.data.VerEntity;
+import com.lf.server.mapper.data.VerMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鐗堟湰琛�
+ * @author sws
+ * @date 2022-09-29
+ */
+
+@Service
+public class VerService implements VerMapper {
+ @Autowired
+ VerMapper verMapper;
+
+ @Override
+ public Integer selectCount(String name,String depName) {
+ return verMapper.selectCount(name,depName);
+ }
+
+ @Override
+ public List<VerEntity> selectByPage(String name, String depName, Integer limit, Integer offset) {
+ return verMapper.selectByPage(name,depName, limit, offset);
+ }
+
+ @Override
+ public Integer insertVersion(VerEntity verEntity) {
+ return verMapper.insertVersion(verEntity);
+ }
+
+ @Override
+ public Integer insertVersions(List<VerEntity> verEntity) {
+ return verMapper.insertVersions(verEntity);
+ }
+
+ @Override
+ public Integer deleteVersion(int id) {
+ return verMapper.deleteVersion(id);
+ }
+
+ @Override
+ public Integer deleteVersions(List<Integer> ids) {
+ return verMapper.deleteVersions(ids);
+ }
+
+ @Override
+ public Integer updateVersion(VerEntity verEntity) {
+ return verMapper.updateVersion(verEntity);
+ }
+
+ @Override
+ public VerEntity selectVersion(int id) {
+ return verMapper.selectVersion(id);
+ }
+
+ @Override
+ public List<VerEntity> selectVersionAll() {
+ return verMapper.selectVersionAll();
+ }
+}
diff --git a/src/main/java/com/lf/server/service/data/VersionService.java b/src/main/java/com/lf/server/service/data/VersionService.java
deleted file mode 100644
index 63f7473..0000000
--- a/src/main/java/com/lf/server/service/data/VersionService.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package com.lf.server.service.data;
-
-import com.lf.server.entity.data.VersionEntity;
-import com.lf.server.mapper.data.VersionMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 鐗堟湰琛�
- * @author sws
- * @date 2022-09-29
- */
-
-@Service
-public class VersionService implements VersionMapper {
- @Autowired
- VersionMapper versionMapper;
-
- @Override
- public Integer selectCount(String name,String depName) {
- return versionMapper.selectCount(name,depName);
- }
-
- @Override
- public List<VersionEntity> selectByPage(String name,String depName, Integer limit, Integer offset) {
- return versionMapper.selectByPage(name,depName, limit, offset);
- }
-
- @Override
- public Integer insertVersion(VersionEntity versionEntity) {
- return versionMapper.insertVersion(versionEntity);
- }
-
- @Override
- public Integer insertVersions(List<VersionEntity> versionEntity) {
- return versionMapper.insertVersions(versionEntity);
- }
-
- @Override
- public Integer deleteVersion(int id) {
- return versionMapper.deleteVersion(id);
- }
-
- @Override
- public Integer deleteVersions(List<Integer> ids) {
- return versionMapper.deleteVersions(ids);
- }
-
- @Override
- public Integer updateVersion(VersionEntity versionEntity) {
- return versionMapper.updateVersion(versionEntity);
- }
-
- @Override
- public VersionEntity selectVersion(int id) {
- return versionMapper.selectVersion(id);
- }
-
- @Override
- public List<VersionEntity> selectVersionAll() {
- return versionMapper.selectVersionAll();
- }
-}
diff --git a/src/main/java/com/lf/server/service/sys/TokenService.java b/src/main/java/com/lf/server/service/sys/TokenService.java
index 233c8ce..31c2720 100644
--- a/src/main/java/com/lf/server/service/sys/TokenService.java
+++ b/src/main/java/com/lf/server/service/sys/TokenService.java
@@ -2,7 +2,7 @@
import com.lf.server.entity.sys.LoginEntity;
import com.lf.server.entity.sys.TokenEntity;
-import com.lf.server.entity.sys.UsersEntity;
+import com.lf.server.entity.sys.UserEntity;
import com.lf.server.entity.all.RedisCacheKey;
import com.lf.server.helper.StringHelper;
import com.lf.server.helper.WebHelper;
@@ -32,7 +32,7 @@
TokenMapper tokenMapper;
@Autowired
- UsersService usersService;
+ UserService usersService;
@Autowired
LoginService loginService;
@@ -160,7 +160,7 @@
WebHelper.deleteAll(req, res);
// 鑾峰彇褰撳墠鐢ㄦ埛
- UsersEntity ue = getCurrentUser(req);
+ UserEntity ue = getCurrentUser(req);
if (ue == null) {
return false;
}
@@ -220,7 +220,7 @@
* @param req
* @param res
*/
- public void saveToken(UsersEntity ue, TokenEntity te, HttpServletRequest req, HttpServletResponse res) {
+ public void saveToken(UserEntity ue, TokenEntity te, HttpServletRequest req, HttpServletResponse res) {
// 淇濆瓨鑷矯ookie
WebHelper.saveToken2Cookie(te.getToken(), req, res);
@@ -239,7 +239,7 @@
* @param req
* @return
*/
- public UsersEntity getCurrentUser(HttpServletRequest req) {
+ public UserEntity getCurrentUser(HttpServletRequest req) {
String token = WebHelper.getToken(req);
if (StringHelper.isNull(token)) {
return null;
@@ -249,12 +249,12 @@
// redis
Object obj = redisService.get(userKey);
- if (obj != null && obj instanceof UsersEntity) {
- return (UsersEntity) obj;
+ if (obj != null && obj instanceof UserEntity) {
+ return (UserEntity) obj;
}
// db
- UsersEntity ue = usersService.selectByToken(token);
+ UserEntity ue = usersService.selectByToken(token);
if (ue != null) {
TokenEntity te = getEntityByToken(token);
if (te != null) {
diff --git a/src/main/java/com/lf/server/service/sys/UserService.java b/src/main/java/com/lf/server/service/sys/UserService.java
new file mode 100644
index 0000000..f9e370f
--- /dev/null
+++ b/src/main/java/com/lf/server/service/sys/UserService.java
@@ -0,0 +1,75 @@
+package com.lf.server.service.sys;
+
+import com.lf.server.entity.sys.UserEntity;
+import com.lf.server.mapper.sys.UserMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 鐢ㄦ埛琛�
+ * @author sws
+ * @date 2022-09-27
+ */
+
+@Service
+public class UserService implements UserMapper {
+ @Autowired
+ UserMapper userMapper;
+
+ @Override
+ public Integer selectCount(String uname) {
+ return userMapper.selectCount(uname);
+ }
+
+ @Override
+ public UserEntity selectUser(int id) {
+ return userMapper.selectUser(id);
+ }
+
+ @Override
+ public UserEntity selectByUid(String uid) {
+ return userMapper.selectByUid(uid);
+ }
+
+ @Override
+ public List<UserEntity> selectUserAll() {
+ return userMapper.selectUserAll();
+ }
+
+ @Override
+ public List<UserEntity> selectByPage(String uname, Integer limit, Integer offset) {
+ return userMapper.selectByPage(uname, limit, offset);
+ }
+
+ @Override
+ public UserEntity selectByToken(String token) {
+ return userMapper.selectByToken(token);
+ }
+
+ @Override
+ public Integer insertUser(UserEntity userEntity) {
+ return userMapper.insertUser(userEntity);
+ }
+
+ @Override
+ public Integer insertUsers(List<UserEntity> userEntity) {
+ return userMapper.insertUsers(userEntity);
+ }
+
+ @Override
+ public Integer deleteUser(int id) {
+ return userMapper.deleteUser(id);
+ }
+
+ @Override
+ public Integer deleteUsers(List<Integer> ids) {
+ return userMapper.deleteUsers(ids);
+ }
+
+ @Override
+ public Integer updateUsers(UserEntity userEntity) {
+ return userMapper.updateUsers(userEntity);
+ }
+}
diff --git a/src/main/java/com/lf/server/service/sys/UsersService.java b/src/main/java/com/lf/server/service/sys/UsersService.java
deleted file mode 100644
index 23d3adb..0000000
--- a/src/main/java/com/lf/server/service/sys/UsersService.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.lf.server.service.sys;
-
-import com.lf.server.entity.sys.UsersEntity;
-import com.lf.server.mapper.sys.UsersMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-/**
- * 鐢ㄦ埛琛�
- * @author sws
- * @date 2022-09-27
- */
-
-@Service
-public class UsersService implements UsersMapper {
- @Autowired
- UsersMapper usersMapper;
-
- @Override
- public Integer selectCount(String uname) {
- return usersMapper.selectCount(uname);
- }
-
- @Override
- public UsersEntity selectUser(int id) {
- return usersMapper.selectUser(id);
- }
-
- @Override
- public UsersEntity selectByUid(String uid) {
- return usersMapper.selectByUid(uid);
- }
-
- @Override
- public List<UsersEntity> selectUserAll() {
- return usersMapper.selectUserAll();
- }
-
- @Override
- public List<UsersEntity> selectByPage(String uname, Integer limit, Integer offset) {
- return usersMapper.selectByPage(uname, limit, offset);
- }
-
- @Override
- public UsersEntity selectByToken(String token) {
- return usersMapper.selectByToken(token);
- }
-
- @Override
- public Integer insertUser(UsersEntity usersEntity) {
- return usersMapper.insertUser(usersEntity);
- }
-
- @Override
- public Integer insertUsers(List<UsersEntity> usersEntity) {
- return usersMapper.insertUsers(usersEntity);
- }
-
- @Override
- public Integer deleteUser(int id) {
- return usersMapper.deleteUser(id);
- }
-
- @Override
- public Integer deleteUsers(List<Integer> ids) {
- return usersMapper.deleteUsers(ids);
- }
-
- @Override
- public Integer updateUsers(UsersEntity usersEntity) {
- return usersMapper.updateUsers(usersEntity);
- }
-}
diff --git a/src/main/resources/mapper/data/VersionMapper.xml b/src/main/resources/mapper/data/VerMapper.xml
similarity index 94%
rename from src/main/resources/mapper/data/VersionMapper.xml
rename to src/main/resources/mapper/data/VerMapper.xml
index 10f0337..78890df 100644
--- a/src/main/resources/mapper/data/VersionMapper.xml
+++ b/src/main/resources/mapper/data/VerMapper.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lf.server.mapper.data.VersionMapper">
+<mapper namespace="com.lf.server.mapper.data.VerMapper">
<!-- 缁熻琛屾暟 -->
<select id="selectCount" resultType="java.lang.Integer" parameterType="java.lang.String">
@@ -19,7 +19,7 @@
</select>
<!-- 鍒嗛〉鏌ヨ -->
- <select id="selectByPage" resultType="com.lf.server.entity.data.VersionEntity">
+ <select id="selectByPage" resultType="com.lf.server.entity.data.VerEntity">
select a.*,b.name as dep_name
from lf.sys_ver a inner join lf.sys_dir b
on a.dirid = b.id
@@ -38,15 +38,15 @@
</select>
- <select id="selectVersionAll" resultType="com.lf.server.entity.data.VersionEntity">
+ <select id="selectVersionAll" resultType="com.lf.server.entity.data.VerEntity">
select * from lf.sys_ver order by id;
</select>
- <select id="selectVersion" resultType="com.lf.server.entity.data.VersionEntity">
+ <select id="selectVersion" resultType="com.lf.server.entity.data.VerEntity">
select * from lf.sys_ver where id = #{id}
</select>
- <insert id="insertVersion" parameterType="com.lf.server.entity.data.VersionEntity">
+ <insert id="insertVersion" parameterType="com.lf.server.entity.data.VerEntity">
insert into lf.sys_ver
(dirid,name,descr,create_user,create_time)
values
diff --git a/src/main/resources/mapper/sys/UsersMapper.xml b/src/main/resources/mapper/sys/UserMapper.xml
similarity index 92%
rename from src/main/resources/mapper/sys/UsersMapper.xml
rename to src/main/resources/mapper/sys/UserMapper.xml
index f6c1095..f8f1fee 100644
--- a/src/main/resources/mapper/sys/UsersMapper.xml
+++ b/src/main/resources/mapper/sys/UserMapper.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.lf.server.mapper.sys.UsersMapper">
- <resultMap id="resultMap" type="com.lf.server.entity.sys.UsersEntity">
+<mapper namespace="com.lf.server.mapper.sys.UserMapper">
+ <resultMap id="resultMap" type="com.lf.server.entity.sys.UserEntity">
<id property="id" column="id"></id>
<result property="natives" column="native"></result>
<result property="createUser" column="create_user"></result>
@@ -21,7 +21,7 @@
</select>
<!-- 鍒嗛〉鏌ヨ -->
- <select id="selectByPage" resultMap="resultMap" resultType="com.lf.server.entity.sys.UsersEntity">
+ <select id="selectByPage" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
select * from lf.sys_user
<where>
<if test="uname != null">
@@ -32,24 +32,24 @@
limit #{limit} offset #{offset}
</select>
- <select id="selectUserAll" resultMap="resultMap" resultType="com.lf.server.entity.sys.UsersEntity">
+ <select id="selectUserAll" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
select * from lf.sys_user order by id;
</select>
- <select id="selectUser" resultMap="resultMap" resultType="com.lf.server.entity.sys.UsersEntity">
+ <select id="selectUser" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
select * from lf.sys_user where id = #{id}
</select>
- <select id="selectByUid" resultMap="resultMap" resultType="com.lf.server.entity.sys.UsersEntity">
+ <select id="selectByUid" resultMap="resultMap" resultType="com.lf.server.entity.sys.UserEntity">
select * from lf.sys_user where uid = #{uid}
</select>
- <select id="selectByToken" resultType="com.lf.server.entity.sys.UsersEntity">
+ <select id="selectByToken" resultType="com.lf.server.entity.sys.UserEntity">
select * from lf.sys_user where id = (
select create_user from lf.sys_token where token=#{token} and expire > now() limit 1)
</select>
- <insert id="insertUser" parameterType="com.lf.server.entity.sys.UsersEntity">
+ <insert id="insertUser" parameterType="com.lf.server.entity.sys.UserEntity">
insert into lf.sys_user
(depid,uid,uname,pwd,salt,sex,native,contact,job,email,addr,edu,idcard,status,create_user,create_time,bak)
values
--
Gitblit v1.9.3