From cd46940e70c60b3ff62cb9a20e4bc831b1fad8ee Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sat, 28 Sep 2024 20:12:04 +0800 Subject: [PATCH] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83(=E6=B3=A8=E9=87=8A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../muyu/auth/service/SysLoginService.java | 24 +++++++++---------- .../cloud-modules-enterprise-server/pom.xml | 8 ++++++- .../enterprise/service/FaultLogService.java | 3 +-- .../service/FaultMessageService.java | 2 +- .../enterprise/service/FaultTypeService.java | 2 +- .../enterprise/service/FaultrRuleService.java | 2 +- .../service/SysCarFaultService.java | 2 +- .../system/controller/SysEntController.java | 2 +- 8 files changed, 24 insertions(+), 21 deletions(-) diff --git a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java index 4e3d228..9de01cc 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java +++ b/cloud-auth/src/main/java/com/muyu/auth/service/SysLoginService.java @@ -76,19 +76,18 @@ public class SysLoginService { if (Result.FAIL == userResult.getCode()) { throw new ServiceException(userResult.getMsg()); } - LoginUser userInfo = userResult.getData(); SysUser user = userResult.getData().getSysUser(); - if (UserStatus.DELETED.getCode().equals(user.getDelFlag())) { - recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "对不起，您的账号已被删除"); - throw new ServiceException("对不起，您的账号：" + username + " 已被删除"); + if(UserStatus.DELETED.getCode().equals(user.getDelFlag())){ + recordLogService.recordLogininfor(username,Constants.LOGIN_FAIL,"对不起，您的账号已被删除"); + throw new ServiceException("对不起，您的账号：" + username + " 已被删除 "); } - if (UserStatus.DISABLE.getCode().equals(user.getStatus())) { - recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户已停用，请联系管理员"); - throw new ServiceException("对不起，您的账号：" + username + " 已停用"); + if(UserStatus.DISABLE.getCode().equals(user.getStatus())){ + recordLogService.recordLogininfor(username,Constants.LOGIN_FAIL,"用户已停用,请联系管理官"); + throw new ServiceException("对不起，您的账号:" + username + " 已停用"); } - passwordService.validate(user, password); - recordLogService.recordLogininfor(username, Constants.LOGIN_SUCCESS, "登录成功"); + passwordService.validate(user,password); + recordLogService.recordLogininfor(username,Constants.LOGIN_SUCCESS,"登录成功"); return userInfo; } @@ -128,16 +127,15 @@ public class SysLoginService { throw new ServiceException("密码长度必须在5到20个字符之间"); } - // 注册用户信息 + //注册用户信息 SysUser sysUser = new SysUser(); sysUser.setUserName(username); sysUser.setNickName(username); sysUser.setPassword(SecurityUtils.encryptPassword(password)); - Result registerResult = remoteUserService.registerUserInfo(registerBody, SecurityConstants.INNER); - + Result registerResult = remoteUserService.registerUserInfo(registerBody, SecurityConstants.INNER); if (Result.FAIL == registerResult.getCode()) { throw new ServiceException(registerResult.getMsg()); } - recordLogService.recordLogininfor(username, Constants.REGISTER, "注册成功"); + recordLogService.recordLogininfor(username,Constants.REGISTER,"注册成功"); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index 911a9a6..100e143 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -82,6 +82,12 @@ com.muyu cloud-modules-enterprise-common + + + com.github.yulichang + mybatis-plus-join + 1.4.13 + @@ -101,4 +107,4 @@ - \ No newline at end of file + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java index 2ba7cf8..8f6c7e2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java @@ -7,14 +7,13 @@ import java.util.List; /** * 故障日志业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultLogService:故障日志业务层 */ public interface FaultLogService extends IService { List faultLogList(FaultLog faultLog); - FaultLog byidId(Long faultLogId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java index f012de9..f871dbc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.FaultMessage; import java.util.List; /** * 站内信业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultMessageService:站内信业务层 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java index c5f88fd..730a7e9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.FaultType; import java.util.List; /** * 故障类型业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultTypeService:故障类型业务层 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java index 4851358..22b4898 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.FaultrRule; import java.util.List; /** * 故障规则业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description FaultrRuleService:故障规则业务层 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java index 295082f..0fb6895 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java @@ -6,7 +6,7 @@ import com.muyu.enterprise.domain.SysCarFault; import java.util.List; /** * 故障管理业务层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 12.19 * @Description SysCarFaultService:故障管理业务层 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java index 0b7ad98..20b59ca 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java @@ -21,7 +21,7 @@ import java.util.List; /** * 企业管理控制层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/26 0:21 * @Description 企业管理控制层 */