diff --git a/app.db b/app.db index e0426df..152246a 100644 Binary files a/app.db and b/app.db differ diff --git a/src/main/java/a8k/dbservice/AppUsrDBService.java b/src/main/java/a8k/dbservice/AppUsrDBService.java index 72d8b7c..c10cf82 100644 --- a/src/main/java/a8k/dbservice/AppUsrDBService.java +++ b/src/main/java/a8k/dbservice/AppUsrDBService.java @@ -73,13 +73,19 @@ public class AppUsrDBService { } public AppUser getUsrByAccount(String account) { - return jdbcTemplate.queryForObject("select * from zapp_usr_table where account = ?;", this::rowMapper,// - account); + try { + return jdbcTemplate.queryForObject("select * from zapp_usr_table where account = ?;", this::rowMapper, account); + } catch (Exception e) { + return null; + } } public AppUser getUsrById(Integer id) { - return jdbcTemplate.queryForObject("select * from zapp_usr_table where id = ?;", this::rowMapper,// - id); + try { + return jdbcTemplate.queryForObject("select * from zapp_usr_table where id = ?;", this::rowMapper, id); + } catch (Exception e) { + return null; + } } } diff --git a/src/main/java/a8k/dbservice/type/AppUser.java b/src/main/java/a8k/dbservice/type/AppUser.java index cd8684f..8a9adc3 100644 --- a/src/main/java/a8k/dbservice/type/AppUser.java +++ b/src/main/java/a8k/dbservice/type/AppUser.java @@ -3,11 +3,11 @@ package a8k.dbservice.type; import a8k.utils.ZJsonHelper; public class AppUser { - public int id = -1; + public int id = 0; public String account; public String password; public UsrRole usrRole; - public Boolean isBuiltInUser; + public Boolean isBuiltInUser = false; @Override public String toString() { diff --git a/src/main/java/a8k/service/app/AppUserMgrService.java b/src/main/java/a8k/service/app/AppUserMgrService.java index dff1eb4..b772577 100644 --- a/src/main/java/a8k/service/app/AppUserMgrService.java +++ b/src/main/java/a8k/service/app/AppUserMgrService.java @@ -30,6 +30,7 @@ public class AppUserMgrService { static final int modifyUser = 7; static final int modifyUsrPwd = 8; static final int modifyUsrRole = 9; + static final int modifyUsrAccount = 10; } @Resource @@ -88,38 +89,35 @@ public class AppUserMgrService { return getUsrlist(); } - @ExtApiFn(name = "修改用户", order = ORDER.modifyUser) - public AppRet> modifyUser(Integer id, String account, String password, UsrRole usrRole) { - var user = appUsrDBService.getUsrById(id); + @ExtApiFn(name = "修改用户密码", order = ORDER.modifyUsrPwd) + public AppRet> modifyUsrPwd(String account, String password) { + var user = appUsrDBService.getUsrByAccount(account); if (user == null) { return AppRet.fail(A8kEcode.UsrNotExitError); } - user.account = account; user.password = password; - user.usrRole = usrRole; appUsrDBService.updateUser(user); return getUsrlist(); } - - @ExtApiFn(name = "修改用户密码", order = ORDER.modifyUsrPwd) - public AppRet> modifyUsrPwd(String account, String password) { + @ExtApiFn(name = "修改用户权限", order = ORDER.modifyUsrRole) + public AppRet> modifyUsrRole(String account, UsrRole usrRole) { var user = appUsrDBService.getUsrByAccount(account); if (user == null) { return AppRet.fail(A8kEcode.UsrNotExitError); } - user.password = password; + user.usrRole = usrRole; appUsrDBService.updateUser(user); return getUsrlist(); } - @ExtApiFn(name = "修改用户权限", order = ORDER.modifyUsrRole) - public AppRet> modifyUsrRole(String account, UsrRole usrRole) { + @ExtApiFn(name = "修改用户名称", order = ORDER.modifyUsrAccount) + public AppRet> modifyUsrAccount(String account, String newaccount) { var user = appUsrDBService.getUsrByAccount(account); if (user == null) { return AppRet.fail(A8kEcode.UsrNotExitError); } - user.usrRole = usrRole; + user.account = newaccount; appUsrDBService.updateUser(user); return getUsrlist(); }