From bdfd8c81d02a172bb2f7424ca7a1af2a3999e3dd Mon Sep 17 00:00:00 2001 From: 18616268358 <1440265357@qq.com> Date: Mon, 22 May 2023 18:36:13 +0800 Subject: [PATCH] =?UTF-8?q?#20230510=20=E6=AC=A3=E5=BD=B1=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysLoginController.java | 5 +++-- .../xymanager_common/entity/UserSession.java | 2 +- .../resources/mappers/SysUserMapperDao.xml | 5 ++++- .../main/resources/mappers/TerminalsDao.xml | 5 ++++- .../impl/LoginServiceImpl.java | 20 +++++++++++++------ .../service/LoginService.java | 2 +- 6 files changed, 27 insertions(+), 12 deletions(-) diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java index 1d5cc4f..27cf259 100644 --- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java +++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/controller/SysLoginController.java @@ -5,6 +5,7 @@ import com.shxy.xymanager_common.base.ResponseReult; import com.shxy.xymanager_common.bean.ServiceBody; import com.shxy.xymanager_common.bean.ServiceStatus; import com.shxy.xymanager_common.bean.SysUser; +import com.shxy.xymanager_common.entity.UserSession; import com.shxy.xymanager_common.model.SysUserModel; import com.shxy.xymanager_common.vo.PageVo; import com.shxy.xymanager_common.vo.SysUserUpdateVo; @@ -40,8 +41,8 @@ public class SysLoginController { @ApiOperation(value = "登录", notes = "登录", httpMethod = "POST") @ApiResponses({@ApiResponse(code = 200, message = "请求成功"), @ApiResponse(code = 400, message = "请求参数没填好"), @ApiResponse(code = 404, message = "请求路径没有或页面跳转路径不对")}) @RequestMapping("/login") - public ResponseReult login(@RequestBody SysUser sysUser) throws Exception { - ServiceBody serviceBody = loginService.remoteLogin(sysUser); + public ResponseReult login(@RequestBody SysUser sysUser) { + ServiceBody serviceBody = loginService.remoteLogin(sysUser); if (serviceBody.getCode() == ServiceStatus.SUCCESS) { return ResponseReult.success(serviceBody.getData()); } else { diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/UserSession.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/UserSession.java index 312fb7b..559a991 100644 --- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/UserSession.java +++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/UserSession.java @@ -7,7 +7,7 @@ import java.math.BigInteger; @Data public class UserSession implements Serializable { - private BigInteger id; + private Integer id; private String sessionId; diff --git a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml b/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml index 1f85860..88bb1df 100644 --- a/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml +++ b/xymanager_dao/src/main/resources/mappers/SysUserMapperDao.xml @@ -2,7 +2,7 @@ - + @@ -87,6 +87,9 @@ nick_name = #{nickName}, + + password = #{password}, + role = #{role}, diff --git a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml index 0f23b42..99d4ea7 100644 --- a/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml +++ b/xymanager_dao/src/main/resources/mappers/TerminalsDao.xml @@ -139,12 +139,15 @@ a.latitude as latitude, a.longitude as longitude, e.id as channel_id, + tpm. e.channel_name as channel_name from - ((((terminals a left join `lines` b on a.line_id = b.id ) + ((((((terminals a left join `lines` b on a.line_id = b.id ) left join tower c on a.tower_id = c.id) left join terminal_channel_mapper d on a.id = d.term_id) left join terminal_channels e on d.channel_id = e.id) + left join terminal_photo_marks tpm on a.id = tpm.term_id and e.id = tpm.channel_id) + left join terminal_photo_mark_paths tpmp on tpmp.mark_id = tpm.id) WHERE a.status = 1 order by a.create_time desc diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java index 9509b23..b217f2a 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/LoginServiceImpl.java @@ -69,12 +69,19 @@ public class LoginServiceImpl implements LoginService { * @param sysUser * @return */ - public ServiceBody remoteLogin(SysUser sysUser) throws Exception { - UserSession user = getLoginUser(sysUser); - user.setSessionId(UuidUtils.getUUID()); - sysUserMapperDao.insertUserSession(user); - // 生成token - return Asserts.success(user.getSessionId()); + public ServiceBody remoteLogin(SysUser sysUser) { + String sessionId = UuidUtils.getUUID(); + try { + UserSession user = getLoginUser(sysUser); + user.setSessionId(sessionId); + sysUserMapperDao.insertUserSession(user); + return Asserts.success(user); + } catch (UserPasswordNotMatchException e){ + return Asserts.error(e.getMessage()); + } catch (Exception e) { + log.error("登录异常:{}",e.getMessage()); + } + return Asserts.error("登录失败"); } /** @@ -104,6 +111,7 @@ public class LoginServiceImpl implements LoginService { user.setRole(account.getRole()); BigInteger date = MyDateUtils.TimeMillSecond2Second(new DateTime()); user.setExpireTime(date); + user.setId(account.getUserId()); return user; } } diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java index 5217c7f..b91c699 100644 --- a/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java +++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/service/LoginService.java @@ -17,7 +17,7 @@ public interface LoginService { ServiceBody login(String username, String password) throws Exception; - ServiceBody remoteLogin(SysUser sysUser) throws Exception; + ServiceBody remoteLogin(SysUser sysUser); UserSession getLoginUser(SysUser sysUser) throws Exception;