diff --git a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java index d870762..e8d285d 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java +++ b/cloud-auth/src/main/java/com/muyu/auth/controller/TokenController.java @@ -34,7 +34,7 @@ public class TokenController { @PostMapping("login") public Result login (@RequestBody LoginBody form) { // 用户登录 - LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword()); + LoginUser userInfo = sysLoginService.login(form.getUsername(), form.getPassword(), form.getFirmId()); // 获取登录token return Result.success(tokenService.createToken(userInfo)); } diff --git a/cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java b/cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java index add72cd..41af09d 100644 --- a/cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java +++ b/cloud-auth/src/main/java/com/muyu/auth/form/LoginBody.java @@ -1,10 +1,20 @@ package com.muyu.auth.form; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + /** * 用户登录对象 * * @author muyu */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor public class LoginBody { /** * 用户名 @@ -15,24 +25,10 @@ public class LoginBody { * 用户密码 */ private String password; + /** * 公司数据信息id */ private Long firmId; - public String getUsername () { - return username; - } - - public void setUsername (String username) { - this.username = username; - } - - public String getPassword () { - return password; - } - - public void setPassword (String password) { - this.password = password; - } } 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 ff0af1a..85af155 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 @@ -40,9 +40,9 @@ public class SysLoginService { /** * 登录 */ - public LoginUser login (String username, String password) { + public LoginUser login(String username, String password, Long firmId) { // 用户名或密码为空 错误 - if (StringUtils.isAnyBlank(username, password)) { + if (StringUtils.isAnyBlank(username, password, String.valueOf(firmId))) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "用户/密码必须填写"); throw new ServiceException("用户/密码必须填写"); } @@ -65,7 +65,9 @@ public class SysLoginService { throw new ServiceException("很遗憾，访问IP已被列入系统黑名单"); } // 查询用户信息 - Result userResult = remoteUserService.getUserInfo(username, SecurityConstants.INNER); + Result userResult = null; + // 查询用户信息 + userResult = remoteUserService.getUserInfo(username, firmId, SecurityConstants.INNER); if (StringUtils.isNull(userResult) || StringUtils.isNull(userResult.getData())) { recordLogService.recordLogininfor(username, Constants.LOGIN_FAIL, "登录用户不存在"); @@ -91,14 +93,14 @@ public class SysLoginService { return userInfo; } - public void logout (String loginName) { + public void logout(String loginName) { recordLogService.recordLogininfor(loginName, Constants.LOGOUT, "退出成功"); } /** * 注册 */ - public void register (String username, String password) { + public void register(String username, String password) { // 用户名或密码为空 错误 if (StringUtils.isAnyBlank(username, password)) { throw new ServiceException("用户/密码必须填写"); diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 3f67fd2..b84ada3 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9500 + port: 19500 # nacos线上地址 nacos: diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java index 0cc8f95..5649b9d 100644 --- a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java @@ -9,29 +9,32 @@ package com.muyu.common.cache; * * @Version: 1.0 * * @description: */ -public interface PrimaryKeyBasic { +public interface PrimaryKeyBasic { /** * 主键前缀 + * * @return */ public String keyPre(); /** * 主键编码 + * * @param key 缓存建 * @return 装修建 */ - public default String encode(K key){ - return keyPre() + key.toString(); + public default String encode(K key) { + return key.toString() + keyPre(); } /** * 主键解码 + * * @param key 缓存建 * @return 装修建 */ public default K decode(String key) { - return (K) key.substring(keyPre().length()); + return (K) key.substring(0, key.lastIndexOf(keyPre())); } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java index 532c9f2..e492715 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/CacheConstants.java @@ -9,12 +9,12 @@ public class CacheConstants { /** * 缓存有效期，默认720（分钟） */ - public final static long EXPIRATION = 720; + public final static Long EXPIRATION = 720L; /** * 缓存刷新时间，默认120（分钟） */ - public final static long REFRESH_TIME = 120; + public final static Long REFRESH_TIME = 120L; /** * 密码最大错误次数 @@ -24,7 +24,7 @@ public class CacheConstants { /** * 密码锁定时间，默认10（分钟） */ - public final static long PASSWORD_LOCK_TIME = 10; + public final static Long PASSWORD_LOCK_TIME = 10L; /** * 权限缓存前缀 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/Constants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/Constants.java index a3540fc..82679f5 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/Constants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/Constants.java @@ -109,7 +109,7 @@ public class Constants { /** * 验证码有效期（分钟） */ - public static final long CAPTCHA_EXPIRATION = 2; + public static final Long CAPTCHA_EXPIRATION = 2L; /** * 资源映射路径 前缀 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java index fde9967..e6deb9a 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/GenConstants.java @@ -54,7 +54,7 @@ public class GenConstants { /** * 数据库文本类型 */ - public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "longtext"}; + public static final String[] COLUMNTYPE_TEXT = {"tinytext", "text", "mediumtext", "Longtext"}; /** * 数据库时间类型 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java index c862929..fd07bfd 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/SecurityConstants.java @@ -45,4 +45,13 @@ public class SecurityConstants { * 角色权限 */ public static final String ROLE_PERMISSION = "role_permission"; + + /** + * 公司key + */ + public static final String FIRM_KEY = "firm_key"; + /** + * 公司Id + */ + public static final String FIRM_ID = "firm_id"; } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index c2a492f..0a38f2a 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -24,6 +24,6 @@ public class ServiceNameConstants { /** * 车辆服务的serviceid */ - public static final String ENTERPRISE_SERVICE = "cloud-saas"; + public static final String ENTERPRISE_SERVICE = "cloud-enterprise"; } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java index 78453ac..dddf22a 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/domain/Result.java @@ -32,7 +32,7 @@ public class Result implements Serializable { */ public static final int WARN = HttpStatus.WARN; - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; private int code; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java index eb32d0b..7967f1a 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CaptchaException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class CaptchaException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public CaptchaException (String msg) { super(msg); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java index 4f12893..b6cd4e4 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/CheckedException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class CheckedException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public CheckedException (String message) { super(message); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java index 82249cf..ba0ee03 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/DemoModeException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class DemoModeException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public DemoModeException () { } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java index b14e03c..9f41a33 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/GlobalException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class GlobalException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 错误提示 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java index f211c7f..b35ed65 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/InnerAuthException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class InnerAuthException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public InnerAuthException (String message) { super(message); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java index 6cb8636..009e8e8 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/PreAuthorizeException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class PreAuthorizeException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public PreAuthorizeException () { } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java index 11bb283..57dcae3 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/ServiceException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class ServiceException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 错误码 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java index 8de4bbf..b611061 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/UtilException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception; * @author muyu */ public class UtilException extends RuntimeException { - private static final long serialVersionUID = 8247610319171014183L; + private static final Long serialVersionUID = 8247610319171014183L; public UtilException (Throwable e) { super(e.getMessage(), e); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java index 40293bf..1ae0630 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotLoginException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception.auth; * @author muyu */ public class NotLoginException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public NotLoginException (String message) { super(message); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java index e464840..1ea5f12 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotPermissionException.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; * @author muyu */ public class NotPermissionException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public NotPermissionException (String permission) { super(permission); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java index 53a1522..6676ac3 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/auth/NotRoleException.java @@ -8,7 +8,7 @@ import org.apache.commons.lang3.StringUtils; * @author muyu */ public class NotRoleException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public NotRoleException (String role) { super(role); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java index 9bb1356..6dd3955 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/base/BaseException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception.base; * @author muyu */ public class BaseException extends RuntimeException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 所属模块 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java index ae2e184..336228b 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileException.java @@ -8,7 +8,7 @@ import com.muyu.common.core.exception.base.BaseException; * @author muyu */ public class FileException extends BaseException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public FileException (String code, Object[] args, String msg) { super("file", code, args, msg); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java index 3a85df3..61665de 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileNameLengthLimitExceededException.java @@ -6,9 +6,9 @@ package com.muyu.common.core.exception.file; * @author muyu */ public class FileNameLengthLimitExceededException extends FileException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public FileNameLengthLimitExceededException (int defaultFileNameLength) { - super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}, "the filename is too long"); + super("upload.filename.exceed.length", new Object[]{defaultFileNameLength}, "the filename is too Long"); } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java index 7570be5..0c0278b 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileSizeLimitExceededException.java @@ -6,9 +6,9 @@ package com.muyu.common.core.exception.file; * @author muyu */ public class FileSizeLimitExceededException extends FileException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; - public FileSizeLimitExceededException (long defaultMaxSize) { + public FileSizeLimitExceededException (Long defaultMaxSize) { super("upload.exceed.maxSize", new Object[]{defaultMaxSize}, "the filesize is too large"); } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java index 94341ab..31dc588 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/FileUploadException.java @@ -10,7 +10,7 @@ import java.io.PrintWriter; */ public class FileUploadException extends Exception { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; private final Throwable cause; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java index 3a993c2..4b48492 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/file/InvalidExtensionException.java @@ -8,7 +8,7 @@ import java.util.Arrays; * @author muyu */ public class InvalidExtensionException extends FileUploadException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; private String[] allowedExtension; private String extension; @@ -34,7 +34,7 @@ public class InvalidExtensionException extends FileUploadException { } public static class InvalidImageExtensionException extends InvalidExtensionException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public InvalidImageExtensionException (String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); @@ -42,7 +42,7 @@ public class InvalidExtensionException extends FileUploadException { } public static class InvalidFlashExtensionException extends InvalidExtensionException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public InvalidFlashExtensionException (String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); @@ -50,7 +50,7 @@ public class InvalidExtensionException extends FileUploadException { } public static class InvalidMediaExtensionException extends InvalidExtensionException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public InvalidMediaExtensionException (String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); @@ -58,7 +58,7 @@ public class InvalidExtensionException extends FileUploadException { } public static class InvalidVideoExtensionException extends InvalidExtensionException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public InvalidVideoExtensionException (String[] allowedExtension, String extension, String filename) { super(allowedExtension, extension, filename); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java index aee364a..a104250 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/job/TaskException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception.job; * @author muyu */ public class TaskException extends Exception { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; private Code code; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java index a95a57b..46498cc 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/CaptchaExpireException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception.user; * @author muyu */ public class CaptchaExpireException extends UserException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public CaptchaExpireException () { super("user.jcaptcha.expire", null); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java index f113749..1ddab5f 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserException.java @@ -8,7 +8,7 @@ import com.muyu.common.core.exception.base.BaseException; * @author muyu */ public class UserException extends BaseException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public UserException (String code, Object[] args) { super("user", code, args, null); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java index 7615cda..e32acb8 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/exception/user/UserPasswordNotMatchException.java @@ -6,7 +6,7 @@ package com.muyu.common.core.exception.user; * @author muyu */ public class UserPasswordNotMatchException extends UserException { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; public UserPasswordNotMatchException () { super("user.password.not.match", null); diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java index fb57cb9..01fecbd 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java @@ -313,12 +313,12 @@ public class Convert { return new Long[]{}; } String[] arr = str.split(split); - final Long[] longs = new Long[arr.length]; + final Long[] Longs = new Long[arr.length]; for (int i = 0 ; i < arr.length ; i++) { final Long v = toLong(arr[i], null); - longs[i] = v; + Longs[i] = v; } - return longs; + return Longs; } /** @@ -345,7 +345,7 @@ public class Convert { } /** - * 转换为long
+ * 转换为Long
* 如果给定的值为空，或者转换失败，返回默认值
* 转换失败不会报错 * @@ -377,7 +377,7 @@ public class Convert { } /** - * 转换为long
+ * 转换为Long
* 如果给定的值为null，或者转换失败，返回默认值null
* 转换失败不会报错 * diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java index fb15c59..4d53710 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/DateUtils.java @@ -109,7 +109,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * 获取服务器启动时间 */ public static Date getServerStartDate () { - long time = ManagementFactory.getRuntimeMXBean().getStartTime(); + Long time = ManagementFactory.getRuntimeMXBean().getStartTime(); return new Date(time); } @@ -122,20 +122,20 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils { * @return 时间差（天/小时/分钟） */ public static String timeDistance (Date endDate, Date startTime) { - long nd = 1000 * 24 * 60 * 60; - long nh = 1000 * 60 * 60; - long nm = 1000 * 60; - // long ns = 1000; + Long nd = 1000 * 24 * 60 * 60L; + Long nh = 1000 * 60 * 60L; + Long nm = 1000 * 60L; + // Long ns = 1000; // 获得两个时间的毫秒时间差异 - long diff = endDate.getTime() - startTime.getTime(); + Long diff = endDate.getTime() - startTime.getTime(); // 计算差多少天 - long day = diff / nd; + Long day = diff / nd; // 计算差多少小时 - long hour = diff % nd / nh; + Long hour = diff % nd / nh; // 计算差多少分钟 - long min = diff % nd % nh / nm; + Long min = diff % nd % nh / nm; // 计算差多少秒//输出结果 - // long sec = diff % nd % nh % nm / ns; + // Long sec = diff % nd % nh % nm / ns; return day + "天" + hour + "小时" + min + "分钟"; } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java index 62816cb..19e937f 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/JwtUtils.java @@ -162,4 +162,21 @@ public class JwtUtils { public static String getValue (Claims claims, String key) { return Convert.toStr(claims.get(key), ""); } + + /** + * 根据 + * @param claims + * @return + */ + public static String getFirmKey(Claims claims) { + return getValue(claims, SecurityConstants.FIRM_KEY); + } + /** + * 根据 + * @param claims + * @return + */ + public static String getFirmId(Claims claims) { + return getValue(claims, SecurityConstants.FIRM_ID); + } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java index 68221f3..34f6586 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/html/HTMLFilter.java @@ -45,7 +45,7 @@ public final class HTMLFilter { private static final ConcurrentMap P_REMOVE_SELF_BLANKS = new ConcurrentHashMap<>(); /** - * set of allowed html elements, along with allowed attributes for each element + * set of allowed html elements, aLong with allowed attributes for each element **/ private final Map> vAllowed; /** diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java index e750583..5e4d301 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/ip/IpUtils.java @@ -127,7 +127,7 @@ public class IpUtils { byte[] bytes = new byte[4]; String[] elements = text.split("\\.", -1); try { - long l; + Long l; int i; switch (elements.length) { case 1: @@ -141,12 +141,12 @@ public class IpUtils { bytes[3] = (byte) (int) (l & 0xFF); break; case 2: - l = Integer.parseInt(elements[0]); + l = (long) Integer.parseInt(elements[0]); if ((l < 0L) || (l > 255L)) { return null; } bytes[0] = (byte) (int) (l & 0xFF); - l = Integer.parseInt(elements[1]); + l = (long) Integer.parseInt(elements[1]); if ((l < 0L) || (l > 16777215L)) { return null; } @@ -156,13 +156,13 @@ public class IpUtils { break; case 3: for (i = 0; i < 2 ; ++i) { - l = Integer.parseInt(elements[i]); + l = (long) Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { return null; } bytes[i] = (byte) (int) (l & 0xFF); } - l = Integer.parseInt(elements[2]); + l = (long) Integer.parseInt(elements[2]); if ((l < 0L) || (l > 65535L)) { return null; } @@ -171,7 +171,7 @@ public class IpUtils { break; case 4: for (i = 0; i < 4 ; ++i) { - l = Integer.parseInt(elements[i]); + l = (long) Integer.parseInt(elements[i]); if ((l < 0L) || (l > 255L)) { return null; } @@ -290,14 +290,14 @@ public class IpUtils { String[] sips = iparea.substring(0, idx).split("\\."); String[] sipe = iparea.substring(idx + 1).split("\\."); String[] sipt = ip.split("\\."); - long ips = 0L, ipe = 0L, ipt = 0L; + Long ips = 0L, ipe = 0L, ipt = 0L; for (int i = 0 ; i < 4 ; ++i) { ips = ips << 8 | Integer.parseInt(sips[i]); ipe = ipe << 8 | Integer.parseInt(sipe[i]); ipt = ipt << 8 | Integer.parseInt(sipt[i]); } if (ips > ipe) { - long t = ips; + Long t = ips; ips = ipe; ipe = t; } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java index 37c3c9e..ef55cb0 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/uuid/UUID.java @@ -30,8 +30,8 @@ public final class UUID implements java.io.Serializable, Comparable { * @param data 数据 */ private UUID (byte[] data) { - long msb = 0; - long lsb = 0; + long msb = 0L; + long lsb = 0L; assert data.length == 16 : "data must be 16 bytes in length"; for (int i = 0 ; i < 8 ; i++) { msb = (msb << 8) | (data[i] & 0xff); @@ -131,15 +131,15 @@ public final class UUID implements java.io.Serializable, Comparable { components[i] = "0x" + components[i]; } - long mostSigBits = Long.decode(components[0]).longValue(); + long mostSigBits = Long.decode(components[0]); mostSigBits <<= 16; - mostSigBits |= Long.decode(components[1]).longValue(); + mostSigBits |= Long.decode(components[1]); mostSigBits <<= 16; - mostSigBits |= Long.decode(components[2]).longValue(); + mostSigBits |= Long.decode(components[2]); - long leastSigBits = Long.decode(components[3]).longValue(); + long leastSigBits = Long.decode(components[3]); leastSigBits <<= 48; - leastSigBits |= Long.decode(components[4]).longValue(); + leastSigBits |= Long.decode(components[4]); return new UUID(mostSigBits, leastSigBits); } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java index add8e3e..2746836 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java @@ -24,7 +24,7 @@ import java.util.Map; @NoArgsConstructor @AllArgsConstructor public class BaseEntity implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 搜索值 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java index 85ea8df..fc21637 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/TreeEntity.java @@ -17,7 +17,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class TreeEntity extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 父菜单名称 diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java index d677cce..ed28ff7 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java @@ -20,12 +20,12 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor public class TableDataInfo implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 总记录数 */ - private long total; + private Long total; /** * 列表数据 diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java index 2c298f4..2988506 100644 --- a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/config/IotDBSessionConfig.java @@ -71,7 +71,7 @@ public class IotDBSessionConfig { * @param value */ public void insertRecord(SessionPool sessionPool,String deviceId, - long time, List measurements,List dataTypeList, JSONObject value) { + Long time, List measurements,List dataTypeList, JSONObject value) { try { log.info("iotdb数据入库：device_id:[{}], measurements:[{}], values:[{}]", deviceId, measurements, value); sessionPool.insertRecord(deviceId, time, measurements,dataTypeList,new Object[]{value.toJSONString()}); @@ -153,26 +153,26 @@ public class IotDBSessionConfig { SessionDataSet sessionDataSet = iotDBSessionConfig.selectRecord(sessionPool,SELECT_ROOT_DATA_DATAJSON_DATASOURCE); - HashMap> longMapHashMap = new HashMap<>(); + HashMap> LongMapHashMap = new HashMap<>(); try { while (sessionDataSet.hasNext()){ RowRecord next = sessionDataSet.next(); - long timestamp = next.getTimestamp(); + Long timestamp = next.getTimestamp(); Map fieldMap = new HashMap<>(); for (Field field : next.getFields()) { TSDataType dataType = field.getDataType(); String stringValue = field.getStringValue(); fieldMap.put(dataType.name(), stringValue); } - longMapHashMap.put(timestamp, fieldMap); + LongMapHashMap.put(timestamp, fieldMap); } } catch (StatementExecutionException e) { throw new RuntimeException(e); } catch (IoTDBConnectionException e) { throw new RuntimeException(e); } - log.info("数据为：{}", JSONObject.toJSONString(longMapHashMap)); + log.info("数据为：{}", JSONObject.toJSONString(LongMapHashMap)); } } diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/IotDBService.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/IotDBService.java index b2e068e..92837ac 100644 --- a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/IotDBService.java +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/IotDBService.java @@ -23,9 +23,9 @@ public interface IotDBService { void insertTablets(Map tablets); - void insertStringRecord(String deviceId, long time, List measurements, List values); + void insertStringRecord(String deviceId, Long time, List measurements, List values); - void insertRecord(String deviceId, long time, List measurements, List types, List values); + void insertRecord(String deviceId, Long time, List measurements, List types, List values); void insertStringRecords(List deviceIds, List times, List> measurementsList, List> valuesList); @@ -35,17 +35,17 @@ public interface IotDBService { void insertRecordsOfOneDevice(String deviceId, List times, List> measurementsList, List> typesList, List> valuesList); - void deleteData(String path, long endTime); + void deleteData(String path, Long endTime); - void deleteData(List paths, long endTime); + void deleteData(List paths, Long endTime); - SessionDataSet executeRawDataQuery(List paths, long startTime, long endTime, long timeOut); + SessionDataSet executeRawDataQuery(List paths, Long startTime, Long endTime, Long timeOut); - List executeRawDataQuery(List paths, long startTime, long endTime, long timeOut, Class clazz); + List executeRawDataQuery(List paths, Long startTime, Long endTime, Long timeOut, Class clazz); - SessionDataSet executeLastDataQuery(List paths, long lastTime); + SessionDataSet executeLastDataQuery(List paths, Long lastTime); - List executeLastDataQuery(List paths, long lastTime, Class clazz); + List executeLastDataQuery(List paths, Long lastTime, Class clazz); SessionDataSet executeLastDataQueryForOneDevice(String db, String device, List sensors, boolean isLegalPathNodes); @@ -53,11 +53,11 @@ public interface IotDBService { SessionDataSet executeAggregationQuery(List paths, List aggregations); - SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime); + SessionDataSet executeAggregationQuery(List paths, List aggregations, Long startTime, Long endTime); - SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval); + SessionDataSet executeAggregationQuery(List paths, List aggregations, Long startTime, Long endTime, Long interval); - SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval, long slidingStep); + SessionDataSet executeAggregationQuery(List paths, List aggregations, Long startTime, Long endTime, Long interval, Long slidingStep); SessionDataSet executeQueryStatement(String sql); diff --git a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/impl/IotDBServiceImpl.java b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/impl/IotDBServiceImpl.java index 4bf659a..c8b206b 100644 --- a/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/impl/IotDBServiceImpl.java +++ b/cloud-common/cloud-common-iotdb/src/main/java/com/muyu/common/iotdb/service/impl/IotDBServiceImpl.java @@ -77,7 +77,7 @@ public class IotDBServiceImpl implements IotDBService { * @param values 数据项对应值列表 */ @Override - public void insertStringRecord(String deviceId, long time, List measurements, List values) { + public void insertStringRecord(String deviceId, Long time, List measurements, List values) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); try { log.info("iotdb数据入库：device_id:[{}], measurements:[{}], values:[{}]", deviceId, measurements, values); @@ -98,7 +98,7 @@ public class IotDBServiceImpl implements IotDBService { * @param values 数据项对应值列表 */ @Override - public void insertRecord(String deviceId, long time, List measurements, List types, List values) { + public void insertRecord(String deviceId, Long time, List measurements, List types, List values) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); try { log.info("iotdb数据入库：device_id:[{}], measurements:[{}], types:[{}], values:[{}]", deviceId, measurements, types, values); @@ -198,7 +198,7 @@ public class IotDBServiceImpl implements IotDBService { * @param endTime 删除时间点 */ @Override - public void deleteData(String path, long endTime) { + public void deleteData(String path, Long endTime) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); try { log.info("iotdb数据删除：path:[{}], endTime:[{}]", path, endTime); @@ -215,7 +215,7 @@ public class IotDBServiceImpl implements IotDBService { * @param endTime 删除时间点 */ @Override - public void deleteData(List paths, long endTime) { + public void deleteData(List paths, Long endTime) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); try { log.info("iotdb数据删除：paths:[{}], endTime:[{}]", paths, endTime); @@ -235,7 +235,7 @@ public class IotDBServiceImpl implements IotDBService { * @return SessionDataSet (Time,paths) */ @Override - public SessionDataSet executeRawDataQuery(List paths, long startTime, long endTime, long outTime) { + public SessionDataSet executeRawDataQuery(List paths, Long startTime, Long endTime, Long outTime) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); SessionDataSetWrapper sessionDataSetWrapper = null; try { @@ -262,7 +262,7 @@ public class IotDBServiceImpl implements IotDBService { * @return */ @Override - public List executeRawDataQuery(List paths, long startTime, long endTime, long outTime, Class clazz) { + public List executeRawDataQuery(List paths, Long startTime, Long endTime, Long outTime, Class clazz) { SessionDataSet sessionDataSet = executeRawDataQuery(paths, startTime, endTime, outTime); List columnNames = sessionDataSet.getColumnNames(); List resultEntities = null; @@ -282,7 +282,7 @@ public class IotDBServiceImpl implements IotDBService { * @return SessionDataSet */ @Override - public SessionDataSet executeLastDataQuery(List paths, long lastTime) { + public SessionDataSet executeLastDataQuery(List paths, Long lastTime) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); SessionDataSetWrapper sessionDataSetWrapper = null; try { @@ -307,7 +307,7 @@ public class IotDBServiceImpl implements IotDBService { * @return */ @Override - public List executeLastDataQuery(List paths, long lastTime, Class clazz) { + public List executeLastDataQuery(List paths, Long lastTime, Class clazz) { SessionDataSet sessionDataSet = executeLastDataQuery(paths, lastTime); List columnNames = sessionDataSet.getColumnNames(); List resultEntities = null; @@ -399,7 +399,7 @@ public class IotDBServiceImpl implements IotDBService { * @return SessionDataSet */ @Override - public SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime) { + public SessionDataSet executeAggregationQuery(List paths, List aggregations, Long startTime, Long endTime) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); SessionDataSetWrapper sessionDataSetWrapper = null; try { @@ -425,7 +425,7 @@ public class IotDBServiceImpl implements IotDBService { * @return SessionDataSet */ @Override - public SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval) { + public SessionDataSet executeAggregationQuery(List paths, List aggregations, Long startTime, Long endTime, Long interval) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); SessionDataSetWrapper sessionDataSetWrapper = null; try { @@ -452,7 +452,7 @@ public class IotDBServiceImpl implements IotDBService { * @return SessionDataSet */ @Override - public SessionDataSet executeAggregationQuery(List paths, List aggregations, long startTime, long endTime, long interval, long slidingStep) { + public SessionDataSet executeAggregationQuery(List paths, List aggregations, Long startTime, Long endTime, Long interval, Long slidingStep) { SessionPool sessionPool = iotDBSessionConfig.getSessionPool(); SessionDataSetWrapper sessionDataSetWrapper = null; @@ -648,7 +648,7 @@ public class IotDBServiceImpl implements IotDBService { return TSDataType.DOUBLE; } else if ("int".equals(typeName) || "integer".equals(typeName)) { return TSDataType.INT32; - } else if ("long".equals(typeName)) { + } else if ("Long".equals(typeName)) { return TSDataType.INT64; } else if ("float".equals(typeName)) { return TSDataType.FLOAT; diff --git a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java index 131d36f..acf8517 100644 --- a/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java +++ b/cloud-common/cloud-common-redis/src/main/java/com/muyu/common/redis/service/RedisService.java @@ -53,7 +53,7 @@ public class RedisService { * * @return true=设置成功；false=设置失败 */ - public boolean expire (final String key, final long timeout) { + public boolean expire (final String key, final Long timeout) { return expire(key, timeout, TimeUnit.SECONDS); } @@ -66,7 +66,7 @@ public class RedisService { * * @return true=设置成功；false=设置失败 */ - public boolean expire (final String key, final long timeout, final TimeUnit unit) { + public boolean expire (final String key, final Long timeout, final TimeUnit unit) { return redisTemplate.expire(key, timeout, unit); } @@ -77,7 +77,7 @@ public class RedisService { * * @return 有效时间 */ - public long getExpire (final String key) { + public Long getExpire (final String key) { return redisTemplate.getExpire(key); } @@ -132,7 +132,7 @@ public class RedisService { * * @return 缓存的对象 */ - public long setCacheList (final String key, final List dataList) { + public Long setCacheList (final String key, final List dataList) { Long count = redisTemplate.opsForList().rightPushAll(key, dataList); return count == null ? 0 : count; } diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java index 21ced55..3eaa4fe 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/ManyDataSource.java @@ -3,19 +3,15 @@ package com.muyu.cloud.common.many.datasource; import com.alibaba.druid.pool.DruidDataSource; import com.alibaba.fastjson2.JSON; import com.baomidou.mybatisplus.autoconfigure.MybatisPlusAutoConfiguration; -import com.muyu.cloud.common.many.datasource.constents.DatasourceContent; -import com.muyu.cloud.common.saas.domain.model.EntInfo; -import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory; import com.muyu.cloud.common.many.datasource.domain.model.DataSourceInfo; +import com.muyu.cloud.common.many.datasource.factory.DruidDataSourceFactory; import com.muyu.cloud.common.many.datasource.role.DynamicDataSource; +import com.muyu.cloud.common.saas.domain.model.EntInfo; import com.muyu.cloud.common.saas.exception.SaaSException; import com.muyu.common.core.constant.SecurityConstants; -import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.SpringUtils; -import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysFirmDatasource; -import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; import lombok.extern.log4j.Log4j2; import org.springframework.boot.ApplicationArguments; @@ -64,20 +60,9 @@ public class ManyDataSource implements ApplicationRunner { throw new RuntimeException("远调数据源错误,远调--》 firmList "); } } -// private List dataPrimarySourceInfoList(){ -// List list = new ArrayList<>(); -// list.add( -// EntInfo.builder() -// .entCode() -// .ip(DatasourceContent.IP) -// .port(DatasourceContent.PORT) -// .build() -// ); -// return list; -// } @Bean - public DynamicDataSource dynamicDataSource(DruidDataSourceFactory druidDataSourceFactory) { + public DynamicDataSource dynamicDataSource() { // 企业列表 企业CODE，端口，IP Map dataSourceMap = new HashMap<>(); dataSourceInfoList() @@ -104,15 +89,19 @@ public class ManyDataSource implements ApplicationRunner { @Override public void run(ApplicationArguments args) throws Exception { - DruidDataSourceFactory druidDataSourceFactory = SpringUtils.getBean(DruidDataSourceFactory.class); DynamicDataSource dynamicDataSource = SpringUtils.getBean(DynamicDataSource.class); - for (EntInfo entInfo : dataSourceInfoList()) { - DataSourceInfo dataSourceInfo = DataSourceInfo.hostAndPortBuild( - entInfo.getEntCode(), entInfo.getIp(), entInfo.getPort(),entInfo.getUserName(), entInfo.getPassword() - ); - DruidDataSource druidDataSource = druidDataSourceFactory.create(dataSourceInfo); - dynamicDataSource.put(dataSourceInfo.getKey(), druidDataSource); - log.info("存储数据连接池为：key:{}",dataSourceInfo.getKey()); - } + dataSourceInfoList() + .stream() + .map(entInfo -> DataSourceInfo.hostAndPortBuild( + entInfo.getEntCode(), + entInfo.getIp(), + entInfo.getPort(), + entInfo.getUserName(), + entInfo.getPassword())) + .map(DruidDataSourceFactory::create) + .filter(Objects::nonNull) + .forEach(druidDataSource -> { + dynamicDataSource.put(druidDataSource.getName(), druidDataSource); + }); } } diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java index ff8163b..5578c82 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/domain/model/DataSourceInfo.java @@ -43,8 +43,8 @@ public class DataSourceInfo { return DataSourceInfo.builder() .key(key) .url(StringUtils.format(DatasourceContent.DATASOURCE_URL, host, port, key)) - .password(userName) - .userName(password) + .password(password) + .userName(userName) .build(); } } diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java index eca9f04..5bad384 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/SaaSInterceptor.java @@ -5,6 +5,7 @@ import com.muyu.cloud.common.saas.contents.SaaSConstant; import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.cloud.common.saas.exception.SaaSException; import com.muyu.cloud.common.many.datasource.role.DynamicDataSource; +import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.core.utils.SpringUtils; import jakarta.servlet.http.HttpServletRequest; @@ -33,11 +34,11 @@ public class SaaSInterceptor implements AsyncHandlerInterceptor { if (!(handler instanceof HandlerMethod)) { return true; } - String SaaSKey = ServletUtils.getHeader(request, SaaSConstant.SAAS_KEY); + String SaaSKey = ServletUtils.getHeader(request, SecurityConstants.FIRM_KEY); if (SaaSKey == null) { throw new SaaSException("SaaS非法访问"); } - if (SaaSKey.equals("-")){ + if (SaaSKey.equals("1")){ log.info("使用 [ nacos ] 配置数据库 "); flag = true; return true; diff --git a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java index 3955ddc..427d9c6 100644 --- a/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java +++ b/cloud-common/cloud-common-security/src/main/java/com/muyu/common/security/service/TokenService.java @@ -27,11 +27,11 @@ import java.util.concurrent.TimeUnit; */ @Component public class TokenService { - protected static final long MILLIS_SECOND = 1000; - protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND; + protected static final Long MILLIS_SECOND = 1000L; + protected static final Long MILLIS_MINUTE = 60 * MILLIS_SECOND; private final static Long MILLIS_MINUTE_TEN = CacheConstants.REFRESH_TIME * MILLIS_MINUTE; private static final Logger log = LoggerFactory.getLogger(TokenService.class); - private final static long expireTime = CacheConstants.EXPIRATION; + private final static Long expireTime = CacheConstants.EXPIRATION; private final static String ACCESS_TOKEN = CacheConstants.LOGIN_TOKEN_KEY; @Autowired @@ -43,6 +43,7 @@ public class TokenService { public Map createToken (LoginUser loginUser) { String token = IdUtils.fastUUID(); Long userId = loginUser.getSysUser().getUserId(); + Long firmId = loginUser.getSysUser().getFirmId(); String userName = loginUser.getSysUser().getUserName(); loginUser.setToken(token); loginUser.setUserid(userId); @@ -55,7 +56,8 @@ public class TokenService { claimsMap.put(SecurityConstants.USER_KEY, token); claimsMap.put(SecurityConstants.DETAILS_USER_ID, userId); claimsMap.put(SecurityConstants.DETAILS_USERNAME, userName); - + claimsMap.put(SecurityConstants.FIRM_KEY, loginUser.getSysUser().getDatabaseName()); + claimsMap.put(SecurityConstants.FIRM_ID, loginUser.getSysUser().getFirmId()); // 接口返回信息 Map rspMap = new HashMap(); rspMap.put("access_token", JwtUtils.createToken(claimsMap)); @@ -127,8 +129,8 @@ public class TokenService { * @param loginUser */ public void verifyToken (LoginUser loginUser) { - long expireTime = loginUser.getExpireTime(); - long currentTime = System.currentTimeMillis(); + Long expireTime = loginUser.getExpireTime(); + Long currentTime = System.currentTimeMillis(); if (expireTime - currentTime <= MILLIS_MINUTE_TEN) { refreshToken(loginUser); } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java index a18af37..9173363 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/LoginUser.java @@ -16,7 +16,7 @@ import java.util.Set; @NoArgsConstructor @AllArgsConstructor public class LoginUser implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 用户唯一标识 diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java index 100bbe8..21a7e82 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java @@ -22,7 +22,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysDept extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 部门ID diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java index 5beee3f..b9b4cc5 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictData.java @@ -21,7 +21,7 @@ import jakarta.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysDictData extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 字典编码 diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java index d623333..706e0ca 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDictType.java @@ -21,7 +21,7 @@ import jakarta.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysDictType extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 字典主键 diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirm.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirm.java new file mode 100644 index 0000000..891263a --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirm.java @@ -0,0 +1,60 @@ +package com.muyu.common.system.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 公司信息 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "公司信息") +@TableName("sys_firm") +public class SysFirm { + + /** + * 公司Id + */ + @TableId(type = IdType.AUTO) + @Schema(name = "公司Id") + private Long id; + /** + * 公司名称 + */ + @Schema(name = "公司名称") + private String name; + /** + * 公司数据源 + */ + @Schema(name = "公司数据源") + private Long did; + /** + * 公司logo + */ + @Schema(name = "公司logo") + private String logo; + /** + * 唯一标识 + */ + @Schema(name = "唯一标识") + private String sole; + /** + * 状态 + */ + @Schema(name = "车辆状态") + private String status; + +} diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmResp.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmResp.java deleted file mode 100644 index e6debec..0000000 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmResp.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.muyu.common.system.domain; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 公司下拉响应对象 - * @Author WangXin - * @Data 2024/10/8 - * @Version 1.0.0 -*/ -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@Tag(name = "公司下拉响应对象",description = "登录公司下拉框数据") -public class SysFirmResp { - - private String name; - - private String firmId; -} diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java index c66f131..76bae5a 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java @@ -23,7 +23,7 @@ import java.util.Date; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysLogininfor extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * ID diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java index b207611..c12cef1 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysOperLog.java @@ -23,7 +23,7 @@ import java.util.Date; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysOperLog extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 日志主键 diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java index 1aab56a..32bbf4e 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java @@ -22,7 +22,7 @@ import java.util.Set; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysRole extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 角色ID diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java index 999b22c..9087cf5 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysUser.java @@ -29,7 +29,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysUser extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 用户ID @@ -134,6 +134,15 @@ public class SysUser extends BaseEntity { * 角色ID */ private Long roleId; + /** + * 公司Id + */ + private Long firmId; + + /** + * 公司数据库 + */ + private String databaseName; public SysUser (Long userId) { this.userId = userId; diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/resp/SysFirmResp.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/resp/SysFirmResp.java new file mode 100644 index 0000000..4461886 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/resp/SysFirmResp.java @@ -0,0 +1,36 @@ +package com.muyu.common.system.domain.resp; + +import com.muyu.common.system.domain.SysFirm; +import com.muyu.common.system.domain.SysFirmDatasource; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 公司信息响应对象 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "公司信息响应对象") +public class SysFirmResp { + /** + * 公司信息 + */ + @Schema(name = "公司信息") + private SysFirm firm; + /** + * 公司数据源信息 + */ + @Schema(name = "公司数据源信息") + private SysFirmDatasource firmDatasource; + +} diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java index a709949..a1824fa 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/RemoteUserService.java @@ -23,12 +23,12 @@ public interface RemoteUserService { * 通过用户名查询用户信息 * * @param username 用户名 + * @param firmId * @param source 请求来源 - * * @return 结果 */ - @GetMapping("/user/info/{username}") - public Result getUserInfo (@PathVariable("username") String username, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); + @GetMapping("/user/info/{username}/{firmId}") + public Result getUserInfo (@PathVariable("username") String username,@PathVariable("firmId") Long firmId, @RequestHeader(SecurityConstants.FROM_SOURCE) String source); /** * 注册用户信息 @@ -48,4 +48,5 @@ public interface RemoteUserService { */ @GetMapping("/firmDatasource/firmDatasourceList") Result> selectFirmDatabaseList(@RequestHeader(SecurityConstants.FROM_SOURCE) String inner); + } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java index 20474c6..767fdaf 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/remote/factory/RemoteUserFallbackFactory.java @@ -26,7 +26,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory getUserInfo (String username, String source) { + public Result getUserInfo (String username, Long firmId, String source) { return Result.error("获取用户失败:" + throwable.getMessage()); } diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AccessLogFilter.java b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AccessLogFilter.java index 9ceec12..9ced628 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AccessLogFilter.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AccessLogFilter.java @@ -192,7 +192,7 @@ public class AccessLogFilter implements GlobalFilter, Ordered { @Override public HttpHeaders getHeaders() { - long contentLength = headers.getContentLength(); + Long contentLength = headers.getContentLength(); HttpHeaders httpHeaders = new HttpHeaders(); httpHeaders.putAll(super.getHeaders()); if (contentLength > 0) { diff --git a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java index 47e073f..a0cda5d 100644 --- a/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java +++ b/cloud-gateway/src/main/java/com/muyu/gateway/filter/AuthFilter.java @@ -10,6 +10,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.gateway.config.properties.IgnoreWhiteProperties; import io.jsonwebtoken.Claims; +import jakarta.annotation.Resource; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -37,7 +38,6 @@ public class AuthFilter implements GlobalFilter, Ordered { @Autowired private RedisService redisService; - @Override public Mono filter (ServerWebExchange exchange, GatewayFilterChain chain) { ServerHttpRequest request = exchange.getRequest(); @@ -63,6 +63,8 @@ public class AuthFilter implements GlobalFilter, Ordered { } String userid = JwtUtils.getUserId(claims); String username = JwtUtils.getUserName(claims); + String firmKey = JwtUtils.getFirmKey(claims); + String firmId = JwtUtils.getFirmId(claims); if (StringUtils.isEmpty(userid) || StringUtils.isEmpty(username)) { return unauthorizedResponse(exchange, "令牌验证失败"); } @@ -71,6 +73,8 @@ public class AuthFilter implements GlobalFilter, Ordered { addHeader(mutate, SecurityConstants.USER_KEY, userkey); addHeader(mutate, SecurityConstants.DETAILS_USER_ID, userid); addHeader(mutate, SecurityConstants.DETAILS_USERNAME, username); + addHeader(mutate, SecurityConstants.FIRM_KEY, firmKey); + addHeader(mutate, SecurityConstants.FIRM_ID, firmId); // 内部请求来源参数清除 removeHeader(mutate, SecurityConstants.FROM_SOURCE); return chain.filter(exchange.mutate().request(mutate.build()).build()); diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index dfefd86..ccac39c 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 8080 + port: 18080 # nacos线上地址 nacos: diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/core/IotdbStrategy.java b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/core/IotdbStrategy.java index 56e8cc4..f451d23 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/core/IotdbStrategy.java +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-common/src/main/java/com/muyu/data/core/IotdbStrategy.java @@ -27,6 +27,7 @@ public class IotdbStrategy private static ConcurrentHashMap> map = new ConcurrentHashMap<>(); + private static ExecutorService executor = Executors.newFixedThreadPool(3); @Override public Information apply(Information param) { return applyStrategy(param); @@ -39,23 +40,12 @@ public class IotdbStrategy if (isEventMapSize()){ log.info("[没有事件执行]"); }else { - ExecutorService executor = Executors.newFixedThreadPool(map.size()); for (EventEnum eventEnum : map.keySet()) { executor.submit(() -> { log.info("开始执行 [{}] ",eventEnum.getEventName()); return map.get(eventEnum); }); } - // 关闭线程池 - executor.shutdown(); - try { - // 等待所有任务完成 - if (!executor.awaitTermination(60, TimeUnit.SECONDS)) { - executor.shutdownNow(); - } - } catch (InterruptedException e) { - executor.shutdownNow(); - } } return new EndStrategy(); }; diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/DataProcessApplication.java b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/DataProcessApplication.java index 43599d7..33521a3 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/DataProcessApplication.java +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/DataProcessApplication.java @@ -8,7 +8,7 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; @EnableCustomConfig @EnableMyFeignClients -@SpringBootApplication(exclude = {DataSourceAutoConfiguration.class}) +@SpringBootApplication public class DataProcessApplication { public static void main(String[] args) { SpringApplication.run(DataProcessApplication.class, args); diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/controller/TestController.java b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/controller/TestController.java index b09a1a4..81d5e26 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/controller/TestController.java +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/java/com/muyu/data/controller/TestController.java @@ -77,7 +77,7 @@ public class TestController { } @GetMapping("/insertData") - public void insertData(@RequestParam("deviceId") String deviceId, @RequestParam("time") long time, @RequestParam("value") double value) throws Exception { + public void insertData(@RequestParam("deviceId") String deviceId, @RequestParam("time") Long time, @RequestParam("value") double value) throws Exception { String sql = String.format("insert into root.one.%s(timestamp, temperature) values (%d, %f)", deviceId, time, value); iotDBConfig.getSessionPool().executeNonQueryStatement(sql); } diff --git a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml index 8c50a21..988beb1 100644 --- a/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-data-process/cloud-modules-data-process-server/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9701 + port: 29701 # nacos线上地址 nacos: diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml index cc43740..db9c66f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml @@ -30,8 +30,6 @@ cloud-common-cache - - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java index 0fd1d59..db7e73c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/MessageValueCacheService.java @@ -22,7 +22,7 @@ public class MessageValueCacheService extends CacheAbsBasic { @Override public String keyPre() { - return "sysCar:info:"; + return ":sysCar"; } @Override diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java index 0e91b29..3817ebd 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacjeService.java @@ -18,7 +18,7 @@ public class WarnStrategyCacjeService extends CacheAbsBasicswagger-annotations-jakarta - - - + + com.muyu + cloud-common-system + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java index 8e40ee3..a90f2ad 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java @@ -37,12 +37,12 @@ public class CarFaultRule { * 时间戳时间戳时间戳 */ @Schema(name = "车辆类型Id") - private long timestamp; + private Long timestamp; /** * 经度经度经度 */ @Schema(name = "车速") - private double longitude; + private double Longitude; /** * 纬度纬度纬度 */ @@ -57,7 +57,7 @@ public class CarFaultRule { * 总里程总里程总里程 */ @Schema(name = "加速踏板行程值") - private long TM; + private Long TM; /** * 总电压总电压总电压 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java index d66ec14..1a6b49f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java @@ -30,7 +30,7 @@ public class CarType { */ @TableId(value = "car_type_id",type = IdType.AUTO) @Schema(name = "车辆类型ID") - private long carTypeId; + private Long carTypeId; /** * 车辆类型名 */ @@ -40,5 +40,5 @@ public class CarType { * 车辆规则外键ID */ @Schema(name = "车辆规则外键ID") - private long carTypeRules; + private Long carTypeRules; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java index 0926e99..61fcfb8 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java @@ -35,12 +35,12 @@ public class FaultCode { */ @TableId(value = "faultcode_id", type = IdType.AUTO) @Schema(name = "故障码Id") - private long faultcodeId; + private Long faultcodeId; /** * 故障名称Id */ @Schema(name = "故障名称Id") - private long messageTypeId; + private Long messageTypeId; /** * 故障码 */ @@ -86,11 +86,11 @@ public class FaultCode { * 故障类型所属 */ @Schema(name = "故障类型所属") - private String messageTypeBelongs; + private String messageTypeBeLongs; public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq) { return FaultCode.builder() - .faultcodeId(0) + .faultcodeId(0L) .messageTypeId(faultCodeAddReq.getMessageTypeId()) .faultcodeNumber(faultCodeAddReq.getFaultcodeNumber()) .faultGroup(faultCodeAddReq.getFaultGroup()) diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java index 3ca99a1..f35a1ee 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java @@ -35,17 +35,17 @@ public class FaultCondition { */ @TableId(value = "carcondition_id",type = IdType.AUTO) @Schema(name = "故障规则表Id") - private long carconditionId; + private Long carconditionId; /** * 车辆类型Id */ @Schema(name = "车辆类型Id") - private long carTypeId; + private Long carTypeId; /** *故障名称Id */ @Schema(name = "故障名称Id") - private long messageTypeId; + private Long messageTypeId; /** * 故障条件 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java index 3c59288..aa64424 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java @@ -46,6 +46,6 @@ public class FaultLabel { *报文所属类别 */ @Schema(name = "报文所属类别") - private String messageTypeBelongs; + private String messageTypeBeLongs; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java index cd68c1d..a2e811e 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java @@ -34,17 +34,17 @@ public class FaultLog { */ @TableId(value = "log_id",type = IdType.AUTO) @Schema(name = "故障日志Id") - private long logId; + private Long logId; /** * 故障码Id */ @Schema(name = "故障码Id") - private long faultcodeId; + private Long faultcodeId; /** * 车辆Id */ @Schema(name = "车辆Id") - private long carInformationId; + private Long carInformationId; /** * 车辆VIN */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java index 3ce7cd2..f37d083 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java @@ -32,13 +32,13 @@ public class FaultRule { */ @TableId(value = "condition_id",type = IdType.AUTO) @Schema(name = "触发条件Id") - private long conditionId; + private Long conditionId; /** * 故障码Id */ @Schema(name = "故障码Id") - private long faultcodeId; + private Long faultcodeId; /** * 触发条件描述 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java index 993fecd..56b686d 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java @@ -30,7 +30,7 @@ public class FaultType { */ @TableId(value = "faulttype_id",type = IdType.AUTO) @Schema(name = "故障类型Id") - private long faulttypeId; + private Long faulttypeId; /** *故障类型名称 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java index 8960c69..63c4b64 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java @@ -27,7 +27,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; @TableName(value = "sys_car_fault", autoResultMap = true) @Tag(name = "车辆故障对象") public class SysCarFault extends BaseEntity{ - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** 自增主键 */ @TableId( type = IdType.AUTO,value = "id") diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java index afceacd..56d0f37 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java @@ -32,7 +32,7 @@ import java.util.Date; @TableName("warn_logs") @Tag(name = "预警日志管理") public class WarnLogs extends BaseEntity{ - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** 预警日志id */ @TableId( type = IdType.AUTO) diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java index f33ea7a..fa14c3f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java @@ -28,7 +28,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; @TableName("warn_rule") @Tag(name = "预警规则管理") public class WarnRule extends BaseEntity{ - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** 规则id */ @TableId( type = IdType.AUTO) diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java index def2c90..1801918 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java @@ -29,7 +29,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; @TableName("warn_strategy") @Tag(name = "预警策略管理") public class WarnStrategy extends BaseEntity{ - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** 策略id */ @TableId( type = IdType.AUTO) diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java index 5f2ae59..e7fed12 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java @@ -36,7 +36,7 @@ public class Message { * id */ @TableId(value = "id",type = IdType.AUTO) - private long id; + private Long id; /** * 发送者 @@ -72,7 +72,7 @@ public class Message { * 登录人Id */ @Schema(description = "登录人Id",defaultValue = "1",type = "Long") - private long userId; + private Long userId; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java index f26367d..87e9061 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java @@ -39,5 +39,5 @@ public class MessageReq { * 登录人Id */ @Schema(name = "登录人Id") - private long userId; + private Long userId; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java index ca0cfe1..7479163 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java @@ -49,7 +49,7 @@ public class MessageSendReq { * 登录人Id */ @Schema(name = "登录人Id") - private long userId; + private Long userId; /** * 创建时间 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java index 73aacc9..0c12933 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java @@ -35,5 +35,5 @@ public class MessageReq { * 登录人Id */ @Schema(name = "登录人Id") - private long userId; + private Long userId; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java index eb3a62c..9c933f4 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java @@ -46,7 +46,7 @@ public class MessageSendReq { * 登录人Id */ @Schema(name = "登录人Id") - private long userId; + private Long userId; /** * 创建时间 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java index aae17c6..4720e7f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java @@ -33,7 +33,7 @@ public class FaultCodeAddReq { */ @Schema(description = "故障名称Id") @TableId(value = "message_type_id", type = IdType.AUTO) - private long messageTypeId; + private Long messageTypeId; /** * 故障名称 */ @@ -54,7 +54,7 @@ public class FaultCodeAddReq { * 故障分类Id */ @Schema(description = "故障分类Id") - private long faulttypeId; + private Long faulttypeId; /** * 是否产生报警 */ @@ -84,7 +84,7 @@ public class FaultCodeAddReq { *报文所属类别 */ @Schema(name = "报文所属类别") - private String messageTypeBelongs; + private String messageTypeBeLongs; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java index 2fd7703..e6e4733 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java @@ -34,12 +34,12 @@ public class FaultCodeUpdReq { */ @TableId(value = "faultcode_id", type = IdType.AUTO) @Schema(title = "故障码Id") - private long faultcodeId; + private Long faultcodeId; /** *故障名称Id */ @Schema(name = "故障名称Id") - private long messageTypeId; + private Long messageTypeId; /** * 故障名称 */ @@ -59,7 +59,7 @@ public class FaultCodeUpdReq { * 故障分类Id */ @Schema(name = "故障分类Id") - private long faulttypeId; + private Long faulttypeId; /** * 是否产生报警 */ @@ -94,7 +94,7 @@ public class FaultCodeUpdReq { *报文所属类别 */ @Schema(name = "报文所属类别") - private String messageTypeBelongs; + private String messageTypeBeLongs; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java index 6d123ef..10d72c3 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java @@ -35,17 +35,17 @@ public class FaultConditionAddReq { */ @TableId(value = "id", type = IdType.AUTO) @Schema(title = "故障规则表Id") - private long carconditionId; + private Long carconditionId; /** * 车辆类型Id */ @Schema(name = "车辆类型Id") - private long carTypeId; + private Long carTypeId; /** *故障名称Id */ @Schema(name = "故障名称Id") - private long messageTypeId; + private Long messageTypeId; /** * 故障条件 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java index 6b50599..dc8b27b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java @@ -35,12 +35,12 @@ public class FaultConditionListReq { */ @TableId(value = "car_type_id", type = IdType.INPUT) @Schema (description = "车辆类型Id") - private long carTypeId; + private Long carTypeId; /** *故障名称Id */ @Schema(name = "故障名称Id") - private long messageTypeId; + private Long messageTypeId; /** * 页码，从1开始 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java index 67e7c8a..424f0db 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java @@ -35,17 +35,17 @@ public class FaultConditionUpdReq { */ @TableId(value = "carcondition_id", type = IdType.ASSIGN_ID) @Schema(name = "故障规则表Id") - private long carconditionId; + private Long carconditionId; /** * 车辆类型Id */ @Schema(name = "车辆类型Id") - private long carTypeId; + private Long carTypeId; /** *故障名称Id */ @Schema(name = "故障名称Id") - private long messageTypeId; + private Long messageTypeId; /** * 故障条件 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java index 447dc88..52c8e97 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java @@ -37,7 +37,7 @@ public class FaultLogListReq { */ @TableId(value = "type", type = IdType.AUTO) @Schema(description = "故障码Id",example = "1") - private long faultcodeId; + private Long faultcodeId; /** * 车辆VIN */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java index c11bae5..e4c8768 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java @@ -33,12 +33,12 @@ public class FaultCodeListResp { */ @TableId(value = "faultcode_id", type = IdType.AUTO) @Schema(description = "故障码Id",example = "1") - private long faultcodeId; + private Long faultcodeId; /** *故障名称Id */ @Schema(description = "故障名称Id",example = "1") - private long messageTypeId; + private Long messageTypeId; /** *故障码 */ @@ -83,7 +83,7 @@ public class FaultCodeListResp { *报文所属类别 */ @Schema(description = "报文所属类别",example = "1") - private String messageTypeBelongs; + private String messageTypeBeLongs; /** * 数据库对象构建为返回结果对象 @@ -102,7 +102,7 @@ public class FaultCodeListResp { .faulttypeName(faultCodeVO.getFaulttypeName()) .messageTypeName(faultCodeVO.getMessageTypeName()) .messageTypeCode(faultCodeVO.getMessageTypeCode()) - .messageTypeBelongs(faultCodeVO.getMessageTypeBelongs()) + .messageTypeBeLongs(faultCodeVO.getMessageTypeBeLongs()) .build(); } } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java index c286fd8..9b271c7 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java @@ -35,9 +35,9 @@ public class FaultCodeTotalListResp { * 总数 */ @Schema(name = "总数") - private long total; + private Long total; - public static FaultCodeTotalListResp faultCodeTotalListResp(List faultCodeListRespList,long total){ + public static FaultCodeTotalListResp faultCodeTotalListResp(List faultCodeListRespList,Long total){ FaultCodeTotalListResp faultCodeTotalListResp = new FaultCodeTotalListResp(); faultCodeTotalListResp.setFaultCodeListRespList(faultCodeListRespList); faultCodeTotalListResp.setTotal(total); diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java index 646259c..67c1b0b 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java @@ -37,17 +37,17 @@ public class FaultConditionListResp { */ @TableId(value = "carcondition_id",type = IdType.AUTO) @Schema(description = "故障规则表Id") - private long carconditionId; + private Long carconditionId; /** * 车辆类型Id */ @Schema(description = "车辆类型Id") - private long carTypeId; + private Long carTypeId; /** *故障名称Id */ @Schema(description = "故障名称Id") - private long messageTypeId; + private Long messageTypeId; /** * 故障条件 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java index cd5d162..c296c7c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java @@ -33,9 +33,9 @@ public class FaultConditionTotalListResp { private List faultConditionListRespList; @Schema(description = "故障规则数据总数") - private long total; + private Long total; - public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,long total){ + public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,Long total){ FaultConditionTotalListResp faultConditionTotalListResp = new FaultConditionTotalListResp(); faultConditionTotalListResp.setFaultConditionListRespList(faultConditionListRespList); faultConditionTotalListResp.setTotal(total); diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java index c086202..9f809d0 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java @@ -39,17 +39,17 @@ public class FaultLogListResp { */ @TableId(value = "log_id",type = IdType.AUTO) @Schema(description = "故障日志Id",example = "1") - private long logId; + private Long logId; /** * 故障码Id */ @Schema(name = "故障码Id") - private long faultcodeId; + private Long faultcodeId; /** * 车辆Id */ @Schema(name = "车辆Id") - private long carInformationId; + private Long carInformationId; /** * 车辆VIN */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java index 0626794..1f29a0e 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java @@ -33,9 +33,9 @@ public class FaultLogTotalListResp { private List faultLogListRespList; @Schema(description = "总数") - private long total; + private Long total; - public static FaultLogTotalListResp faultLogTotalListResp(List faultLogListRespList,long total){ + public static FaultLogTotalListResp faultLogTotalListResp(List faultLogListRespList,Long total){ FaultLogTotalListResp faultLogTotalListResp = new FaultLogTotalListResp(); faultLogTotalListResp.setFaultLogListRespList(faultLogListRespList); faultLogTotalListResp.setTotal(total); diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java index b668cb7..0b62a9c 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java @@ -44,7 +44,7 @@ public class FaultCodeVo extends FaultCode { *报文所属类别 */ @Schema(description = "报文所属类别") - private String messageTypeBelongs; + private String messageTypeBeLongs; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml index e94a784..d9fd4f6 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml @@ -21,7 +21,6 @@ com.muyu enterpise-common - ${muyu.version} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteFirmUserService.java b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteFirmUserService.java new file mode 100644 index 0000000..d240540 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteFirmUserService.java @@ -0,0 +1,29 @@ +package com.muyu.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysUser; +import com.muyu.domain.req.MessageValueReq; +import com.muyu.domain.resp.MessageValueListResp; +import com.muyu.remote.factory.RemoteMessageValueFallbackFactory; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 查询公司员工信息 + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/28 21:00 + */ +@FeignClient(contextId = "remoteMessageValueService", value = ServiceNameConstants.ENTERPRISE_SERVICE, fallbackFactory = RemoteMessageValueFallbackFactory.class,path = "messageValue") +public interface RemoteFirmUserService { + + @GetMapping("/firmUser/info/{username}") + public Result info(@PathVariable("username") String username); + + + +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteFirmFallbackFactory.java b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteFirmFallbackFactory.java new file mode 100644 index 0000000..1846b25 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteFirmFallbackFactory.java @@ -0,0 +1,28 @@ +package com.muyu.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysUser; +import com.muyu.remote.RemoteFirmUserService; +import lombok.extern.log4j.Log4j2; +import org.springframework.cloud.openfeign.FallbackFactory; + +/** + * 公司员工信息工厂 + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Log4j2 +public class RemoteFirmFallbackFactory implements FallbackFactory { + + @Override + public RemoteFirmUserService create(Throwable cause) { + return new RemoteFirmUserService() { + + @Override + public Result info(String username) { + return Result.error("查询数据失败："+cause.getMessage()); + } + }; + } +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index f47b915..5b0f363 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1 +1,2 @@ com.muyu.remote.factory.RemoteMessageValueFallbackFactory +com.muyu.remote.factory.RemoteFirmFallbackFactory diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index fbc3dda..d686058 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -29,7 +29,6 @@ com.muyu enterpise-common - ${muyu.version} @@ -90,16 +89,22 @@ com.muyu cloud-common-api-doc - + + + + com.muyu + cloud-common-xxl + + + + com.muyu + cloud-common-saas + + com.muyu enterpise-cache - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java index 703d222..f97528f 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java @@ -84,7 +84,7 @@ public class FaultConditionController { */ @PostMapping("/faultconditiondel/{carconditionId}") @Operation(summary = "删除规则",description = "删除故障规则") - public Result faultconditiondel(@PathVariable("carconditionId") long carconditionId){ + public Result faultconditiondel(@PathVariable("carconditionId") Long carconditionId){ faultConditionService.removeById(carconditionId); return Result.success(null,"规则删除成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FirmUserController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FirmUserController.java new file mode 100644 index 0000000..65f216e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FirmUserController.java @@ -0,0 +1,44 @@ +package com.muyu.enterpise.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.system.domain.SysUser; +import com.muyu.enterpise.service.FirmUserService; +import io.swagger.v3.oas.annotations.media.Schema; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; + +/** + * 公司员工信息控制层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@RestController +@RequestMapping("/firmUser") +public class FirmUserController extends BaseController { + + @Resource + private FirmUserService firmUserService; + + /** + * 通过用户名查询用户信息 + * @param username 用户名 + * @return 用户信息 + */ + @Schema(name = "通过用户名查询用户信息",description = "通过用户名查询用户信息") + @GetMapping("/info/{username}") + public Result info(@PathVariable("username") String username) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(SysUser::getUserName, username); + return success(firmUserService.getOne(wrapper)); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java index 0461600..cae3c5d 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java @@ -39,6 +39,6 @@ public interface FaultCodeMapper extends BaseMapper { - Integer delfaultcode(@Param("messageTypeId") long messageTypeId); - Integer delfaultlabel(@Param("messageTypeId") long messageTypeId); + Integer delfaultcode(@Param("messageTypeId") Long messageTypeId); + Integer delfaultlabel(@Param("messageTypeId") Long messageTypeId); } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FirmUserMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FirmUserMapper.java new file mode 100644 index 0000000..c734130 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FirmUserMapper.java @@ -0,0 +1,16 @@ +package com.muyu.enterpise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.common.system.domain.SysUser; +import org.apache.ibatis.annotations.Mapper; + +/** + * 公司员工持久层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Mapper +public interface FirmUserMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FirmUserService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FirmUserService.java new file mode 100644 index 0000000..94b7fe1 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FirmUserService.java @@ -0,0 +1,18 @@ +package com.muyu.enterpise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.system.domain.SysFirm; +import com.muyu.common.system.domain.SysUser; +import org.springframework.stereotype.Service; + +/** + * 公司员工业务层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Service +public interface FirmUserService extends IService { + +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java index 2978b89..c2ee389 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java @@ -45,7 +45,7 @@ public class FaultCodeServiceImpl extends ServiceImpl faultCodeVOList = this.list(queryWrapper); List faultCodeListRespList = faultCodeVOList.stream() @@ -63,7 +63,7 @@ public class FaultCodeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); + Long count = this.count(queryWrapper); int offset = (faultCodeListReq.getPageNum() - 1) * faultCodeListReq.getPageSize(); faultCodeListReq.setPageNum(offset); List selectfaultcodelist = faultCodeMapper.selectfaultcodelist(faultCodeListReq); @@ -116,8 +116,8 @@ public class FaultCodeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); + Long count = this.count(queryWrapper); int offset = (faultConditionListReq.getPageNum() - 1) * faultConditionListReq.getPageSize(); faultConditionListReq.setPageNum(offset); diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java index ecb4add..2df35a7 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java @@ -34,7 +34,7 @@ public class FaultLogServiceImpl extends ServiceImpl i @Override public FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); + Long count = this.count(queryWrapper); int offset = (faultLogListReq.getPageNum() - 1) * faultLogListReq.getPageSize(); faultLogListReq.setPageNum(offset); List faultLogListResps = faultLogMapper.selectfaultLogMapper(faultLogListReq); diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FirmUserServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FirmUserServiceImpl.java new file mode 100644 index 0000000..1fa2d64 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FirmUserServiceImpl.java @@ -0,0 +1,20 @@ +package com.muyu.enterpise.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.system.domain.SysUser; +import com.muyu.enterpise.mapper.FirmUserMapper; +import com.muyu.enterpise.service.FirmUserService; +import org.springframework.stereotype.Service; + +/** + * 公司员工业务实现层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Service +public class FirmUserServiceImpl + extends ServiceImpl + implements FirmUserService { +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml index 9e5a7b8..3b136cc 100644 --- a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml @@ -15,7 +15,7 @@ - + @@ -59,7 +59,7 @@ INSERT INTO `eight`.`car_fault_label` - (`message_type_id`, `message_type_code`, `message_type_name`, `message_type_belongs`) VALUES + (`message_type_id`, `message_type_code`, `message_type_name`, `message_type_beLongs`) VALUES (0, #{messageTypeCode}, #{messageTypeName}, '车辆基础'); @@ -75,7 +75,7 @@ UPDATE `eight`.`car_fault_label` SET `message_type_code` = #{messageTypeCode}, `message_type_name` = #{messageTypeName}, - `message_type_belongs` =#{messageTypeBelongs} + `message_type_beLongs` =#{messageTypeBeLongs} WHERE `message_type_id` = #{messageTypeId}; diff --git a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java index 0a48cbf..860534f 100644 --- a/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java +++ b/cloud-modules/cloud-modules-file/src/main/java/com/muyu/file/utils/FileUploadUtils.java @@ -26,7 +26,7 @@ public class FileUploadUtils { /** * 默认大小 50M */ - public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; + public static final Long DEFAULT_MAX_SIZE = 50 * 1024 * 1024; /** * 默认的文件名最大长度 100 @@ -118,7 +118,7 @@ public class FileUploadUtils { */ public static final void assertAllowed (MultipartFile file, String[] allowedExtension) throws FileSizeLimitExceededException, InvalidExtensionException { - long size = file.getSize(); + Long size = file.getSize(); if (size > DEFAULT_MAX_SIZE) { throw new FileSizeLimitExceededException(DEFAULT_MAX_SIZE / 1024 / 1024); } diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index 18064a0..7707b6c 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9300 + port: 19300 # nacos线上地址 nacos: diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java index c906725..d10d168 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTable.java @@ -28,7 +28,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class GenTable extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 编号 diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java index 98e4c28..d58cd62 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/domain/GenTableColumn.java @@ -21,7 +21,7 @@ import jakarta.validation.constraints.NotBlank; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class GenTableColumn extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 编号 diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 2e7396c..c71d3b0 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9709 + port: 19709 # nacos线上地址 nacos: diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm index 4c89918..cdf1eff 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/domain.java.vm @@ -37,7 +37,7 @@ import com.baomidou.mybatisplus.annotation.IdType; @AllArgsConstructor @TableName("${tableName}") public class ${ClassName} extends ${Entity}{ - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; #foreach ($column in $columns) #if(!$table.isSuperColumn($column.javaField)) diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm index 61c6273..27bace6 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/sub-domain.java.vm @@ -18,7 +18,7 @@ import com.muyu.common.core.web.domain.BaseEntity; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class ${subClassName} extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; #foreach ($column in $subTable.columns) #if(!$table.isSuperColumn($column.javaField)) diff --git a/cloud-modules/cloud-modules-parse/pom.xml b/cloud-modules/cloud-modules-parse/pom.xml index 2df78f0..d95bbc5 100644 --- a/cloud-modules/cloud-modules-parse/pom.xml +++ b/cloud-modules/cloud-modules-parse/pom.xml @@ -74,6 +74,11 @@ cloud-common-api-doc + + + com.muyu + cloud-common-xxl + @@ -86,7 +91,11 @@ lombok - + + + com.muyu + enterpise-remote + com.muyu diff --git a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml index a184915..fba9649 100644 --- a/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-parse/src/main/resources/bootstrap.yml @@ -1,13 +1,13 @@ # Tomcat server: - port: 9705 + port: 29705 # nacos线上地址 nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: xyr + namespace: wx # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -51,7 +51,10 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - #kafka共享配置 application-kafka-config-dev.yml + # xxl-job 配置文件 + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + #kafka共享配置 + #application-kafka-config-dev.yml - application-kafka-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: diff --git a/cloud-modules/cloud-modules-system/pom.xml b/cloud-modules/cloud-modules-system/pom.xml index 8849251..b538410 100644 --- a/cloud-modules/cloud-modules-system/pom.xml +++ b/cloud-modules/cloud-modules-system/pom.xml @@ -77,6 +77,11 @@ cloud-common-xxl + + com.muyu + enterpise-remote + + diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java new file mode 100644 index 0000000..87ce6a8 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java @@ -0,0 +1,95 @@ +package com.muyu.system.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.system.domain.SysFirm; +import com.muyu.common.system.domain.resp.SysFirmResp; +import com.muyu.system.service.SysFirmDatasourceService; +import com.muyu.system.service.SysFirmService; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 公司信息控制层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@RestController +@RequestMapping("/sysFirm") +@Tag(name = "公司信息控制层") +@Tag(name = "公司信息控制层", description = "主要处理公司数据的 CRUD") +public class SysFirmController extends BaseController { + + @Resource + private SysFirmService sysFirmService; + @Resource + private SysFirmDatasourceService sysFirmDatasourceService; + + /** + * 公司信息列表 + * + * @return 公司信息列表 + */ + @GetMapping("/list") + @Schema(name = "公司信息列表", description = "对于公司信息进行列表展示") + public Result> list() { + return success(sysFirmService.list() + .stream() + .map(sysfirm ->SysFirmResp.builder() + .firm(sysfirm) + .firmDatasource(sysFirmDatasourceService.getById(sysfirm.getDid()))) + .toList() + ); + } + + @Schema(name = "公司信息下拉框") + @GetMapping("/firmList") + public Result> listAll() { + return success(sysFirmService.list()); + } + + /** + * 添加公司信息 + * @param sysFirm 公司信息 + * @return 添加公司信息 + */ + @PostMapping("/add") + @Schema(name = "添加公司信息", description = "添加公司信息") + public Result add(@RequestBody SysFirm sysFirm) { + sysFirmService.save(sysFirm); + return success(sysFirm); + } + + /** + * 修改公司信息 + * @param sysFirm 公司信息 + * @return 修改的数据 + */ + @PutMapping("/update") + @Schema(name = "修改公司信息", description = "修改公司信息") + public Result update(@RequestBody SysFirm sysFirm) { + sysFirmService.updateById(sysFirm); + return success(sysFirm); + } + + /** + * 修改公司信息 + * @param id 公司信息 id + * @return 修改的数据 + */ + @DeleteMapping("/{id}") + @Schema(name = "修改公司信息", description = "修改公司信息") + public Result delete(@PathVariable Long id) { + return success(sysFirmService.removeById(id)); + } + + + +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmDatasourceController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmDatasourceController.java index 53d8d3d..306e8c7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmDatasourceController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmDatasourceController.java @@ -5,7 +5,6 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.system.domain.SysFirmDatasource; -import com.muyu.common.system.domain.SysFirmResp; import com.muyu.system.service.SysFirmDatasourceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -29,15 +28,6 @@ public class SysFirmDatasourceController extends BaseController { @Resource private SysFirmDatasourceService sysFirmDatasourceService; - /** - * 登录公司下拉框 - * @return 公司数据下拉框 - */ - @GetMapping("/firmList") - public Result> firmList(){ - return success(sysFirmDatasourceService.firmList()); - } - /** * saas数据源 * @return 公司数据源 @@ -66,15 +56,21 @@ public class SysFirmDatasourceController extends BaseController { */ @Operation(summary = "添加数据原信息",description = "在给公司分配数据源时添加数据源") @PostMapping("/addFirmDatasource") - public Result addFirmDatasource(@RequestBody SysFirmDatasource sysFirmDatasource) { - return success(sysFirmDatasourceService.save(sysFirmDatasource)); + public Result addFirmDatasource(@RequestBody SysFirmDatasource sysFirmDatasource) { + sysFirmDatasourceService.save(sysFirmDatasource); + return success(sysFirmDatasource); } - + /** + * 修改数据源 + * @param sysFirmDatasource 修改数据源信息 + * @return 数据源信息 + */ @Operation(summary = "根据id修改数据源信息", description = "根据id修改数据源信息") @PutMapping("/updFindById") - public Result updFindById(@RequestBody SysFirmDatasource sysFirmDatasource) { - return success(sysFirmDatasourceService.updateById(sysFirmDatasource)); + public Result updFindById(@RequestBody SysFirmDatasource sysFirmDatasource) { + sysFirmDatasourceService.updateById(sysFirmDatasource); + return success(sysFirmDatasource); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java index 64ff4ea..cd6de1e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysProfileController.java @@ -1,5 +1,6 @@ package com.muyu.system.controller; +import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.file.FileTypeUtils; @@ -43,9 +44,9 @@ public class SysProfileController extends BaseController { * 个人信息 */ @GetMapping - public Result profile () { + public Result profile (@RequestHeader(SecurityConstants.FIRM_KEY) Long firmId) { String username = SecurityUtils.getUsername(); - SysUser user = userService.selectUserByUserName(username); + SysUser user = userService.selectUserByUserName(username, firmId); return Result.success( ProfileResp.builder() .roleGroup( userService.selectUserRoleGroup(username) ) @@ -86,9 +87,9 @@ public class SysProfileController extends BaseController { */ @Log(title = "个人信息", businessType = BusinessType.UPDATE) @PutMapping("/updatePwd") - public Result updatePwd (String oldPassword, String newPassword) { + public Result updatePwd (String oldPassword, String newPassword, @RequestHeader(SecurityConstants.FIRM_KEY) Long firmId) { String username = SecurityUtils.getUsername(); - SysUser user = userService.selectUserByUserName(username); + SysUser user = userService.selectUserByUserName(username, firmId); String password = user.getPassword(); if (!SecurityUtils.matchesPassword(oldPassword, password)) { return error("修改密码失败，旧密码错误"); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index effee4a..776dda8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -1,5 +1,6 @@ package com.muyu.system.controller; +import com.muyu.common.core.constant.SecurityConstants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -11,10 +12,8 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysRole; -import com.muyu.common.system.domain.SysUser; -import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.*; +import com.muyu.remote.RemoteFirmUserService; import com.muyu.system.domain.resp.AuthRoleResp; import com.muyu.system.domain.resp.UserDetailInfoResp; import com.muyu.system.domain.resp.UserInfoResp; @@ -26,6 +25,8 @@ import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; import jakarta.servlet.http.HttpServletResponse; + +import javax.annotation.Resource; import java.io.IOException; import java.util.List; import java.util.Set; @@ -57,6 +58,12 @@ public class SysUserController extends BaseController { @Autowired private SysConfigService configService; + @Resource + private RemoteFirmUserService remoteFirmUserService; + + @Resource + private SysFirmDatasourceService firmDatasourceService; + /** * 获取用户列表 */ @@ -98,12 +105,14 @@ public class SysUserController extends BaseController { * 获取当前用户信息 */ @InnerAuth - @GetMapping("/info/{username}") - public Result info (@PathVariable("username") String username) { - SysUser sysUser = userService.selectUserByUserName(username); + @GetMapping("/info/{username}/{firmId}") + public Result info (@PathVariable("username") String username, @PathVariable("firmId") Long firmId) { + SysFirmDatasource byId = firmDatasourceService.getById(firmId); + SysUser sysUser = userService.selectUserByUserName(username,firmId); if (StringUtils.isNull(sysUser)) { return Result.error("用户名或密码错误"); } + sysUser.setDatabaseName(byId.getDatabaseName()); // 角色集合 Set roles = permissionService.getRolePermission(sysUser); // 权限集合 @@ -260,9 +269,9 @@ public class SysUserController extends BaseController { */ @RequiresPermissions("system:user:query") @GetMapping("/authRole/{userId}") - public Result authRole (@PathVariable("userId") Long userId) { + public Result authRole (@PathVariable("userId") Long userId, @RequestHeader(SecurityConstants.FIRM_ID) Long firmId) { SysUser user = userService.selectUserById(userId); - List roles = roleService.selectRolesByUserId(userId); + List roles = roleService.selectRolesByUserId(userId,firmId); return Result.success( AuthRoleResp.builder() .roles(SysUser.isAdmin(userId) ? roles : roles.stream().filter(r -> !r.isAdmin()).collect(Collectors.toList())) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java index 6f7e8bf..9646f8a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java @@ -27,7 +27,7 @@ import jakarta.validation.constraints.Size; @EqualsAndHashCode(callSuper = true) @TableName("sys_config") public class SysConfig extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 参数主键 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java index e4ad4e4..abecc13 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java @@ -21,7 +21,7 @@ import java.util.List; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysMenu extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 菜单ID diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java index a0c30e0..2ce8235 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java @@ -22,7 +22,7 @@ import jakarta.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysNotice extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 公告ID diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java index 326987c..32e8b5a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java @@ -21,7 +21,7 @@ import jakarta.validation.constraints.Size; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) public class SysPost extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 岗位序号 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java index d1ef75f..49c9f94 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/vo/TreeSelect.java @@ -22,7 +22,7 @@ import java.util.stream.Collectors; @NoArgsConstructor @AllArgsConstructor public class TreeSelect implements Serializable { - private static final long serialVersionUID = 1L; + private static final Long serialVersionUID = 1L; /** * 节点ID diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java index b7943dd..d5fe21f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysDeptMapper.java @@ -2,8 +2,6 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysFirmResp; -import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -131,10 +129,5 @@ public interface SysDeptMapper extends BaseMapper { */ public int deleteDeptById (Long deptId); - /** - * 查询公司下拉框 - * @return 登录公司下拉框数据 - */ - List firmList(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysFirmMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysFirmMapper.java new file mode 100644 index 0000000..6347c35 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysFirmMapper.java @@ -0,0 +1,18 @@ +package com.muyu.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.common.system.domain.SysFirm; +import org.apache.ibatis.annotations.Mapper; + +/** + * 公司信息数据层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Mapper +public interface SysFirmMapper extends BaseMapper { + + +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java index 83bd4e2..7a46805 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMenuMapper.java @@ -55,7 +55,7 @@ public interface SysMenuMapper extends BaseMapper { * * @return 权限列表 */ - public List selectMenuPermsByUserId (Long userId); + public List selectMenuPermsByUserId (@Param("userId") Long userId, @Param("firmId") Long firmId); /** * 根据用户ID查询菜单 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java index b1b87c7..364a417 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java @@ -2,8 +2,9 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysRole; -import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import javax.management.relation.Role; import java.util.List; /** @@ -25,10 +26,10 @@ public interface SysRoleMapper extends BaseMapper { * 根据用户ID查询角色 * * @param userId 用户ID - * + * @param firmId 公司ID * @return 角色列表 */ - public List selectRolePermissionByUserId (Long userId); + public List selectRolePermissionByUserId (@Param("userId") Long userId, @Param("firmId") Long firmId); /** * 查询所有角色 @@ -117,4 +118,12 @@ public interface SysRoleMapper extends BaseMapper { * @return 结果 */ public int deleteRoleByIds (Long[] roleIds); + + /** + * 通过用户id和公司id获取角色信息 + * @param userId 用户Id + * @param firmId 公司Id + * @return 角色信息 + */ + List findByUserIdAndFirmId(@Param("userId") Long userId, @Param("firmId") Long firmId); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java deleted file mode 100644 index 82c1c25..0000000 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/rabbit/RabbitTest.java +++ /dev/null @@ -1,53 +0,0 @@ -//package com.muyu.system.rabbit; -// -//import com.alibaba.fastjson2.JSONObject; -//import com.muyu.system.domain.SysConfig; -//import jakarta.annotation.PostConstruct; -//import lombok.extern.log4j.Log4j2; -//import org.springframework.amqp.core.Queue; -//import org.springframework.amqp.rabbit.annotation.RabbitHandler; -//import org.springframework.amqp.rabbit.annotation.RabbitListener; -//import org.springframework.amqp.rabbit.core.RabbitTemplate; -//import org.springframework.beans.factory.annotation.Autowired; -//import org.springframework.context.annotation.Bean; -//import org.springframework.web.bind.annotation.RequestMapping; -//import org.springframework.web.bind.annotation.RestController; -// -//@Log4j2 -//@RestController -//@RequestMapping("/rabbit/test") -//public class RabbitTest { -// -// @Autowired -// private RabbitTemplate rabbitTemplate; -// -// @Bean -// public Queue initQueue(){ -// return new Queue("rabbit.test.init"); -// } -// -// @RabbitListener(queues = "rabbit.test.init") -// public void msg(SysConfig sysConfig){ -// log.info("消息队列：[{}], 消息内容：[{}]", "rabbit.test.init", JSONObject.toJSONString(sysConfig)); -// } -// -// @PostConstruct -// public void init(){ -// new Thread(() -> { -// try { -// Thread.sleep(5000); -// } catch (InterruptedException e) { -// throw new RuntimeException(e); -// } -// SysConfig sysConfig = SysConfig.builder() -// .configId(1L) -// .configKey("ceshi-key") -// .configName("测试名称") -// .configType("测试类型") -// .configValue("测试值") -// .build(); -// rabbitTemplate.convertAndSend("rabbit.test.init",sysConfig); -// }).start(); -// } -// -//} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java index 232b993..62aae72 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java @@ -2,7 +2,6 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysFirmResp; import com.muyu.system.domain.vo.TreeSelect; import java.util.List; @@ -137,11 +136,4 @@ public interface SysDeptService extends IService { */ public int deleteDeptById (Long deptId); - /** - * 公司下拉框数据 - * @return - */ - List firmList(); - - } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysFirmDatasourceService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysFirmDatasourceService.java index 43ba84f..79eff9c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysFirmDatasourceService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysFirmDatasourceService.java @@ -2,7 +2,6 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysFirmDatasource; -import com.muyu.common.system.domain.SysFirmResp; import java.util.List; @@ -14,11 +13,6 @@ import java.util.List; */ public interface SysFirmDatasourceService extends IService { - /** - * 公司下拉框 - * @return 公司下拉框数据 - */ - List firmList(); /** * saas数据源 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysFirmService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysFirmService.java new file mode 100644 index 0000000..9f8454e --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysFirmService.java @@ -0,0 +1,14 @@ +package com.muyu.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.system.domain.SysFirm; + +/** + * 公司数据源 业务层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +public interface SysFirmService extends IService { +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 29bfb07..5fac16e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -37,10 +37,10 @@ public interface SysMenuService extends IService { * 根据用户ID查询权限 * * @param userId 用户ID - * + * @param firmId * @return 权限列表 */ - public Set selectMenuPermsByUserId (Long userId); + public Set selectMenuPermsByUserId (Long userId, Long firmId); /** * 根据角色ID查询权限 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java index 47009f8..cda01dd 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java @@ -26,19 +26,19 @@ public interface SysRoleService extends IService { * 根据用户ID查询角色列表 * * @param userId 用户ID - * + * @param firmId * @return 角色列表 */ - public List selectRolesByUserId (Long userId); + public List selectRolesByUserId (Long userId, Long firmId); /** * 根据用户ID查询角色权限 * * @param userId 用户ID - * + * @param firmId * @return 权限列表 */ - public Set selectRolePermissionByUserId (Long userId); + public Set selectRolePermissionByUserId (Long userId, Long firmId); /** * 查询所有角色 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index f4c6167..c628b2c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -42,10 +42,10 @@ public interface SysUserService extends IService { * 通过用户名查询用户 * * @param userName 用户名 - * + * @param firmId * @return 用户对象信息 */ - public SysUser selectUserByUserName (String userName); + public SysUser selectUserByUserName (String userName, Long firmId); /** * 通过用户ID查询用户 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index b5a18d2..a55301b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -9,7 +9,6 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; -import com.muyu.common.system.domain.SysFirmResp; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.vo.TreeSelect; @@ -281,15 +280,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl return deptMapper.deleteDeptById(deptId); } - /** - * 登录公司下拉框 - * @return 公司数据下拉框 - */ - @Override - public List firmList() { - return deptMapper.firmList(); - } - /** * 递归列表 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmDatasourceServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmDatasourceServiceImpl.java index f5d489f..0f460ed 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmDatasourceServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmDatasourceServiceImpl.java @@ -3,7 +3,6 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.system.domain.SysFirmDatasource; -import com.muyu.common.system.domain.SysFirmResp; import com.muyu.system.mapper.SysFirmDatasourceMapper; import com.muyu.system.service.SysDeptService; import com.muyu.system.service.SysFirmDatasourceService; @@ -26,14 +25,6 @@ public class SysFirmDatasourceServiceImpl @Resource private SysDeptService sysDeptService; - /** - * 登录公司下拉框 - * @return 公司数据下拉框 - */ - @Override - public List firmList() { - return sysDeptService.firmList(); - } /** * saas数据源 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java new file mode 100644 index 0000000..bb6b7b6 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java @@ -0,0 +1,20 @@ +package com.muyu.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.system.domain.SysFirm; +import com.muyu.system.mapper.SysFirmMapper; +import com.muyu.system.service.SysFirmService; +import org.springframework.stereotype.Service; + +/** + * 公司数据源 服务实现层 + * + * @Author WangXin + * @Data 2024/10/9 + * @Version 1.0.0 + */ +@Service +public class SysFirmServiceImpl + extends ServiceImpl + implements SysFirmService { +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index d23ecdb..4c65f39 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -75,12 +75,12 @@ public class SysMenuServiceImpl extends ServiceImpl impl * 根据用户ID查询权限 * * @param userId 用户ID - * + * @param firmId * @return 权限列表 */ @Override - public Set selectMenuPermsByUserId (Long userId) { - List perms = menuMapper.selectMenuPermsByUserId(userId); + public Set selectMenuPermsByUserId (Long userId, Long firmId) { + List perms = menuMapper.selectMenuPermsByUserId(userId,firmId); Set permsSet = new HashSet<>(); for (String perm : perms) { if (StringUtils.isNotEmpty(perm)) { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java index a8641a1..a6342d7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPermissionServiceImpl.java @@ -30,7 +30,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { /** * 获取角色数据权限 * - * @param userId 用户Id + * @param user 用户Id * * @return 角色权限信息 */ @@ -41,7 +41,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { if (user.isAdmin()) { roles.add("admin"); } else { - roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId())); + roles.addAll(roleService.selectRolePermissionByUserId(user.getUserId(),user.getFirmId())); } return roles; } @@ -49,7 +49,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { /** * 获取菜单数据权限 * - * @param userId 用户Id + * @param user 用户Id * * @return 菜单权限信息 */ @@ -69,7 +69,7 @@ public class SysPermissionServiceImpl implements SysPermissionService { perms.addAll(rolePerms); } } else { - perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId())); + perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId(),user.getFirmId())); } } return perms; diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index fa832da..3271df9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -46,12 +46,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 根据条件分页查询角色数据 * * @param role 角色信息 - * * @return 角色数据集合信息 */ @Override @DataScope(deptAlias = "d") - public List selectRoleList (SysRole role) { + public List selectRoleList(SysRole role) { return roleMapper.selectRoleList(role); } @@ -59,12 +58,12 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 根据用户ID查询角色 * * @param userId 用户ID - * + * @param firmId * @return 角色列表 */ @Override - public List selectRolesByUserId (Long userId) { - List userRoles = roleMapper.selectRolePermissionByUserId(userId); + public List selectRolesByUserId(Long userId, Long firmId) { + List userRoles = roleMapper.selectRolePermissionByUserId(userId,firmId); List roles = selectRoleAll(); for (SysRole role : roles) { for (SysRole userRole : userRoles) { @@ -81,12 +80,12 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 根据用户ID查询权限 * * @param userId 用户ID - * + * @param firmId * @return 权限列表 */ @Override - public Set selectRolePermissionByUserId (Long userId) { - List perms = roleMapper.selectRolePermissionByUserId(userId); + public Set selectRolePermissionByUserId(Long userId, Long firmId) { + List perms = roleMapper.selectRolePermissionByUserId(userId, firmId); Set permsSet = new HashSet<>(); for (SysRole perm : perms) { if (StringUtils.isNotNull(perm)) { @@ -102,7 +101,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @return 角色列表 */ @Override - public List selectRoleAll () { + public List selectRoleAll() { return SpringUtils.getAopProxy(this).selectRoleList(new SysRole()); } @@ -110,11 +109,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 根据用户ID获取角色选择框列表 * * @param userId 用户ID - * * @return 选中角色ID列表 */ @Override - public List selectRoleListByUserId (Long userId) { + public List selectRoleListByUserId(Long userId) { return roleMapper.selectRoleListByUserId(userId); } @@ -122,11 +120,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 通过角色ID查询角色 * * @param roleId 角色ID - * * @return 角色对象信息 */ @Override - public SysRole selectRoleById (Long roleId) { + public SysRole selectRoleById(Long roleId) { return roleMapper.selectRoleById(roleId); } @@ -134,11 +131,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 校验角色名称是否唯一 * * @param role 角色信息 - * * @return 结果 */ @Override - public boolean checkRoleNameUnique (SysRole role) { + public boolean checkRoleNameUnique(SysRole role) { Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); SysRole info = roleMapper.checkRoleNameUnique(role.getRoleName()); if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) { @@ -151,11 +147,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 校验角色权限是否唯一 * * @param role 角色信息 - * * @return 结果 */ @Override - public boolean checkRoleKeyUnique (SysRole role) { + public boolean checkRoleKeyUnique(SysRole role) { Long roleId = StringUtils.isNull(role.getRoleId()) ? -1L : role.getRoleId(); SysRole info = roleMapper.checkRoleKeyUnique(role.getRoleKey()); if (StringUtils.isNotNull(info) && info.getRoleId().longValue() != roleId.longValue()) { @@ -170,7 +165,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @param role 角色信息 */ @Override - public void checkRoleAllowed (SysRole role) { + public void checkRoleAllowed(SysRole role) { if (StringUtils.isNotNull(role.getRoleId()) && role.isAdmin()) { throw new ServiceException("不允许操作超级管理员角色"); } @@ -182,7 +177,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @param roleId 角色id */ @Override - public void checkRoleDataScope (Long roleId) { + public void checkRoleDataScope(Long roleId) { if (!SysUser.isAdmin(SecurityUtils.getUserId())) { SysRole role = new SysRole(); role.setRoleId(roleId); @@ -197,11 +192,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 通过角色ID查询角色使用数量 * * @param roleId 角色ID - * * @return 结果 */ @Override - public int countUserRoleByRoleId (Long roleId) { + public int countUserRoleByRoleId(Long roleId) { return userRoleMapper.countUserRoleByRoleId(roleId); } @@ -209,12 +203,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 新增保存角色信息 * * @param role 角色信息 - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int insertRole (SysRole role) { + public int insertRole(SysRole role) { // 新增角色信息 roleMapper.insertRole(role); return insertRoleMenu(role); @@ -224,12 +217,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 修改保存角色信息 * * @param role 角色信息 - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int updateRole (SysRole role) { + public int updateRole(SysRole role) { // 修改角色信息 roleMapper.updateRole(role); // 删除角色与菜单关联 @@ -241,11 +233,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 修改角色状态 * * @param role 角色信息 - * * @return 结果 */ @Override - public int updateRoleStatus (SysRole role) { + public int updateRoleStatus(SysRole role) { return roleMapper.updateRole(role); } @@ -253,12 +244,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 修改数据权限信息 * * @param role 角色信息 - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int authDataScope (SysRole role) { + public int authDataScope(SysRole role) { // 修改角色信息 roleMapper.updateRole(role); // 删除角色与部门关联 @@ -272,7 +262,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * * @param role 角色对象 */ - public int insertRoleMenu (SysRole role) { + public int insertRoleMenu(SysRole role) { int rows = 1; // 新增用户与角色管理 List list = new ArrayList(); @@ -293,7 +283,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl * * @param role 角色对象 */ - public int insertRoleDept (SysRole role) { + public int insertRoleDept(SysRole role) { int rows = 1; // 新增角色与部门（数据权限）管理 List list = new ArrayList(); @@ -313,12 +303,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 通过角色ID删除角色 * * @param roleId 角色ID - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteRoleById (Long roleId) { + public int deleteRoleById(Long roleId) { // 删除角色与菜单关联 roleMenuMapper.deleteRoleMenuByRoleId(roleId); // 删除角色与部门关联 @@ -330,12 +319,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 批量删除角色信息 * * @param roleIds 需要删除的角色ID - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int deleteRoleByIds (Long[] roleIds) { + public int deleteRoleByIds(Long[] roleIds) { for (Long roleId : roleIds) { checkRoleAllowed(new SysRole(roleId)); checkRoleDataScope(roleId); @@ -355,11 +343,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * 取消授权用户角色 * * @param userRole 用户和角色关联信息 - * * @return 结果 */ @Override - public int deleteAuthUser (SysUserRole userRole) { + public int deleteAuthUser(SysUserRole userRole) { return userRoleMapper.deleteUserRoleInfo(userRole); } @@ -368,11 +355,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * * @param roleId 角色ID * @param userIds 需要取消授权的用户数据ID - * * @return 结果 */ @Override - public int deleteAuthUsers (Long roleId, Long[] userIds) { + public int deleteAuthUsers(Long roleId, Long[] userIds) { return userRoleMapper.deleteUserRoleInfos(roleId, userIds); } @@ -381,11 +367,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl * * @param roleId 角色ID * @param userIds 需要授权的用户数据ID - * * @return 结果 */ @Override - public int insertAuthUsers (Long roleId, Long[] userIds) { + public int insertAuthUsers(Long roleId, Long[] userIds) { // 新增用户与角色管理 List list = new ArrayList(); for (Long userId : userIds) { diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index c1d3f18..7f3a304 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.SpringUtils; import com.muyu.common.core.utils.StringUtils; @@ -10,12 +11,14 @@ import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; +import com.muyu.remote.RemoteFirmUserService; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; import com.muyu.system.mapper.*; import com.muyu.system.service.SysUserService; import com.muyu.system.service.SysConfigService; +import jakarta.annotation.Resource; import jakarta.validation.Validator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -50,6 +53,8 @@ public class SysUserServiceImpl extends ServiceImpl impl private SysUserPostMapper userPostMapper; @Autowired private SysConfigService configService; + @Resource + private RemoteFirmUserService remoteFirmUserService; /** * 根据条件分页查询用户列表 @@ -94,12 +99,24 @@ public class SysUserServiceImpl extends ServiceImpl impl * 通过用户名查询用户 * * @param userName 用户名 - * + * @param firmId * @return 用户对象信息 */ @Override - public SysUser selectUserByUserName (String userName) { - return userMapper.selectUserByUserName(userName); + public SysUser selectUserByUserName (String userName, Long firmId) { + SysUser sysUser = null; + sysUser.setFirmId(firmId); + if (firmId == 1){ + sysUser = userMapper.selectUserByUserName(userName); + }else { + Result result = remoteFirmUserService.info(userName); + if (result.getCode() == Result.SUCCESS){ + sysUser = result.getData(); + } + List byUserIdAndFirmId = roleMapper.findByUserIdAndFirmId(sysUser.getUserId(), sysUser.getFirmId()); + sysUser.setRoles(byUserIdAndFirmId); + } + return sysUser; } /** diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml index fab60ff..36974db 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -23,11 +23,6 @@ - - - - - select d.dept_id, d.parent_id, @@ -45,13 +40,6 @@ from sys_dept d - - select - d.dept_name, - d.firm_id - from sys_dept d - - - insert into sys_dept( diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml index 1dac5c4..7615669 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -159,7 +159,7 @@ left join sys_role r on r.role_id = ur.role_id where m.status = '0' and r.status = '0' - and ur.user_id = #{userId} + and ur.user_id = #{userId} and ur.firm_id = #{firmId} where r.del_flag = '0' @@ -67,7 +101,7 @@ + insert into sys_role( diff --git a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml index 32764e5..9d365d4 100644 --- a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml @@ -1,13 +1,13 @@ # Tomcat -#server: -# port: 9703 +server: + port: 9902 # nacos线上地址 nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: lhd + namespace: wx # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -51,6 +51,10 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # xxl-job 配置文件 + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} + # rabbit 配置文件 + - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/element-variables.scss b/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/element-variables.scss index 1615ff2..98899aa 100644 --- a/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/element-variables.scss +++ b/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/element-variables.scss @@ -1,5 +1,5 @@ /** -* I think element-ui's default theme color is too light for long-term use. +* I think element-ui's default theme color is too light for Long-term use. * So I modified the default color and you can modify it to your liking. **/ diff --git a/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/sidebar.scss b/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/sidebar.scss index be7c919..ea37d31 100644 --- a/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/sidebar.scss +++ b/cloud-modules/cloud-vx/cloud-ui/src/assets/styles/sidebar.scss @@ -206,7 +206,7 @@ } } - // the scroll bar appears when the subMenu is too long + // the scroll bar appears when the subMenu is too Long > .el-menu--popup { max-height: 100vh; overflow-y: auto; diff --git a/cloud-modules/cloud-vx/src/main/java/com/muyu/domain/AccessToken.java b/cloud-modules/cloud-vx/src/main/java/com/muyu/domain/AccessToken.java index 8b555fd..3e052b8 100644 --- a/cloud-modules/cloud-vx/src/main/java/com/muyu/domain/AccessToken.java +++ b/cloud-modules/cloud-vx/src/main/java/com/muyu/domain/AccessToken.java @@ -22,7 +22,7 @@ public class AccessToken { } // public boolean isExpired(Long expiresIn){ -// long now = System.currentTimeMillis(); +// Long now = System.currentTimeMillis(); // return now>expiresIn; // } } diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index 5290f09..c62c9e9 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9100 + port: 19100 # nacos线上地址 nacos: diff --git a/init-file/cloud-seata.sql b/init-file/cloud-seata.sql index 30fb7fa..6dfbba7 100644 --- a/init-file/cloud-seata.sql +++ b/init-file/cloud-seata.sql @@ -102,7 +102,7 @@ CREATE TABLE `undo_log` ( `branch_id` bigint NOT NULL COMMENT 'branch transaction id', `xid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'global transaction id', `context` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'undo_log context,such as serialization', - `rollback_info` longblob NOT NULL COMMENT 'rollback info', + `rollback_info` Longblob NOT NULL COMMENT 'rollback info', `log_status` int NOT NULL COMMENT '0:normal status,1:defense status', `log_created` datetime(6) NOT NULL COMMENT 'create datetime', `log_modified` datetime(6) NOT NULL COMMENT 'modify datetime', diff --git a/init-file/cloud-system.sql b/init-file/cloud-system.sql index 3322763..e38964e 100644 --- a/init-file/cloud-system.sql +++ b/init-file/cloud-system.sql @@ -386,7 +386,7 @@ CREATE TABLE `sys_notice` ( `notice_id` int NOT NULL AUTO_INCREMENT COMMENT '公告ID', `notice_title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '公告标题', `notice_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '公告类型（1通知 2公告）', - `notice_content` longblob COMMENT '公告内容', + `notice_content` Longblob COMMENT '公告内容', `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '公告状态（0正常 1关闭）', `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', `create_time` datetime DEFAULT NULL COMMENT '创建时间', diff --git a/pom.xml b/pom.xml index 00e19f2..caa95f5 100644 --- a/pom.xml +++ b/pom.xml @@ -283,6 +283,12 @@ ${muyu.version} + + + + + + org.eclipse.paho @@ -349,6 +355,7 @@ cloud-common-saas ${muyu.version} + diff --git a/skywalking/agent/LICENSE b/skywalking/agent/LICENSE index a5c6f78..da365b1 100644 --- a/skywalking/agent/LICENSE +++ b/skywalking/agent/LICENSE @@ -110,12 +110,12 @@ pertain to any part of the Derivative Works, in at least one of the following places: within a NOTICE text file distributed as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, + documentation, if provided aLong with the Derivative Works; or, within a display generated by the Derivative Works, if and wherever such third-party notices normally appear. The contents of the NOTICE file are for informational purposes only and do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside + notices within Derivative Works that You distribute, aLongside or as an addendum to the NOTICE text from the Work, provided that such additional attribution notices cannot be construed as modifying the License.