From f23efcba1bbbb84b603403711df00af138bdf3da Mon Sep 17 00:00:00 2001
From: 18582019636 <1657978663@qq.com>
Date: 星期三, 26 六月 2024 17:41:15 +0800
Subject: [PATCH] feat: 代码初始化
---
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java | 29 +---
ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ProblemMapper.xml | 2
ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/RecoveryServe.java | 4
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java | 7 +
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java | 6
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java | 2
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java | 2
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java | 4
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java | 8
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java | 3
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Problem.java | 4
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java | 4
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java | 4
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java | 2
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/NoticesController.java | 9 +
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java | 5
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java | 6 +
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ProblemController.java | 2
ruoyi-service/ruoyi-user/src/main/resources/mapper/user/RecoveryClassifyMapper.xml | 2
ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java | 2
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java | 2
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 3
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java | 6
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 7
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml | 2
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Problem.java | 4
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java | 5
ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java | 55 +++-----
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java | 8 +
ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java | 46 +++----
ruoyi-service/ruoyi-worker/src/main/resources/mapper/worker/RecoveryServeMapper.xml | 2
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java | 5
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java | 24 ++-
ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/NoticesMapper.xml | 19 +-
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/config/MyDateObjectHandler.java | 1
37 files changed, 158 insertions(+), 146 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Problem.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Problem.java
index d7e8ecd..faf7d18 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Problem.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Problem.java
@@ -35,7 +35,7 @@
private String detail;
@ApiModelProperty("排序权重")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
}
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java
index 484ad77..3c6f676 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Rotate.java
@@ -31,8 +31,8 @@
private String rotatePicture;
@ApiModelProperty("排序")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
@ApiModelProperty("跳转服务id")
@TableField("rotate_serve_id")
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
index af404f6..3be5572 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/model/LoginUser.java
@@ -56,6 +56,11 @@
private String role;
/**
+ * 角色id
+ */
+ private Long roleId;
+
+ /**
* 用户信息
*/
private SysUser sysUser;
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index 7a8ffa8..6f86adf 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -41,6 +41,7 @@
@Resource
private SysUserClient sysUserClient;
+
@PostMapping("login")
@ApiOperation(value = "登录", tags = "后台-登录")
public R<?> login(@RequestBody LoginBody form) {
@@ -55,6 +56,8 @@
}
map.put("roleName", roles);
map.put("info", userInfo);
+ // 权限集合
+ map.put("permissions", userInfo.getPermissions());
// 修改用户最后登录时间
SysUser sysUser = new SysUser();
sysUser.setUserId(userInfo.getSysUser().getUserId());
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
index a3189ba..ab93d3c 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/constant/Constants.java
@@ -255,6 +255,6 @@
/**
* 手机号码正则
*/
- public static final String PHONE = ("^((13[0-9])|(14[0,1,4-9])|(15[0-3,5-9])|(16[2,5,6,7])|(17[0-8])|(18[0-9])|(19[0-3,5-9]))\\d{8}$");
+ public static final String PHONE = "^1[34578]\\d{9}$";
}
diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
index d7e94ec..67ae6a2 100644
--- a/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/context/SecurityContextHolder.java
@@ -1,98 +1,83 @@
package com.ruoyi.common.core.context;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import com.alibaba.ttl.TransmittableThreadLocal;
import com.ruoyi.common.core.constant.SecurityConstants;
import com.ruoyi.common.core.text.Convert;
import com.ruoyi.common.core.utils.StringUtils;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
/**
- * 获取当前线程变量中的 用户id、用户名称、Token等信息
+ * 获取当前线程变量中的 用户id、用户名称、Token等信息
* 注意： 必须在网关通过请求头的方法传入，同时在HeaderInterceptor拦截器设置值。 否则这里无法获取
*
* @author ruoyi
*/
-public class SecurityContextHolder
-{
+public class SecurityContextHolder {
private static final TransmittableThreadLocal<Map<String, Object>> THREAD_LOCAL = new TransmittableThreadLocal<>();
- public static void set(String key, Object value)
- {
+ public static void set(String key, Object value) {
Map<String, Object> map = getLocalMap();
map.put(key, value == null ? StringUtils.EMPTY : value);
}
- public static String get(String key)
- {
+ public static String get(String key) {
Map<String, Object> map = getLocalMap();
return Convert.toStr(map.getOrDefault(key, StringUtils.EMPTY));
}
- public static <T> T get(String key, Class<T> clazz)
- {
+ public static <T> T get(String key, Class<T> clazz) {
Map<String, Object> map = getLocalMap();
return StringUtils.cast(map.getOrDefault(key, null));
}
- public static Map<String, Object> getLocalMap()
- {
+ public static Map<String, Object> getLocalMap() {
Map<String, Object> map = THREAD_LOCAL.get();
- if (map == null)
- {
+ if (map == null) {
map = new ConcurrentHashMap<String, Object>();
THREAD_LOCAL.set(map);
}
return map;
}
- public static void setLocalMap(Map<String, Object> threadLocalMap)
- {
+ public static void setLocalMap(Map<String, Object> threadLocalMap) {
THREAD_LOCAL.set(threadLocalMap);
}
- public static Long getUserId()
- {
+ public static Long getUserId() {
return Convert.toLong(get(SecurityConstants.DETAILS_USER_ID), 0L);
}
- public static void setUserId(String account)
- {
+ public static void setUserId(String account) {
set(SecurityConstants.DETAILS_USER_ID, account);
}
- public static String getUserName()
- {
+ public static String getUserName() {
return get(SecurityConstants.DETAILS_USERNAME);
}
- public static void setUserName(String username)
- {
+ public static void setUserName(String username) {
set(SecurityConstants.DETAILS_USERNAME, username);
}
- public static String getUserKey()
- {
+ public static String getUserKey() {
return get(SecurityConstants.USER_KEY);
}
- public static void setUserKey(String userKey)
- {
+ public static void setUserKey(String userKey) {
set(SecurityConstants.USER_KEY, userKey);
}
- public static String getPermission()
- {
+ public static String getPermission() {
return get(SecurityConstants.ROLE_PERMISSION);
}
- public static void setPermission(String permissions)
- {
+ public static void setPermission(String permissions) {
set(SecurityConstants.ROLE_PERMISSION, permissions);
}
- public static void remove()
- {
+ public static void remove() {
THREAD_LOCAL.remove();
}
}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
index 4b787a0..3452f1f 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/Logical.java
@@ -2,12 +2,10 @@
/**
* 权限注解的验证模式
- *
- * @author ruoyi
*
+ * @author ruoyi
*/
-public enum Logical
-{
+public enum Logical {
/**
* 必须具有所有的元素
*/
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
index aef624d..81b601f 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/annotation/RequiresPermissions.java
@@ -7,14 +7,12 @@
/**
* 权限认证：必须具有指定权限才能进入该方法
- *
- * @author ruoyi
*
+ * @author ruoyi
*/
@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.METHOD, ElementType.TYPE })
-public @interface RequiresPermissions
-{
+@Target({ElementType.METHOD, ElementType.TYPE})
+public @interface RequiresPermissions {
/**
* 需要校验的权限码
*/
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
index bc75873..c6730c6 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/aspect/PreAuthorizeAspect.java
@@ -1,31 +1,30 @@
package com.ruoyi.common.security.aspect;
-import java.lang.reflect.Method;
+import com.ruoyi.common.security.annotation.RequiresLogin;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
+import com.ruoyi.common.security.annotation.RequiresRoles;
+import com.ruoyi.common.security.auth.AuthUtil;
import org.aspectj.lang.ProceedingJoinPoint;
import org.aspectj.lang.annotation.Around;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Pointcut;
import org.aspectj.lang.reflect.MethodSignature;
import org.springframework.stereotype.Component;
-import com.ruoyi.common.security.annotation.RequiresLogin;
-import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.ruoyi.common.security.annotation.RequiresRoles;
-import com.ruoyi.common.security.auth.AuthUtil;
+
+import java.lang.reflect.Method;
/**
* 基于 Spring Aop 的注解鉴权
- *
+ *
* @author kong
*/
@Aspect
@Component
-public class PreAuthorizeAspect
-{
+public class PreAuthorizeAspect {
/**
* 构建
*/
- public PreAuthorizeAspect()
- {
+ public PreAuthorizeAspect() {
}
/**
@@ -39,31 +38,26 @@
* 声明AOP签名
*/
@Pointcut(POINTCUT_SIGN)
- public void pointcut()
- {
+ public void pointcut() {
}
/**
* 环绕切入
- *
+ *
* @param joinPoint 切面对象
* @return 底层方法执行后的返回值
* @throws Throwable 底层方法抛出的异常
*/
@Around("pointcut()")
- public Object around(ProceedingJoinPoint joinPoint) throws Throwable
- {
+ public Object around(ProceedingJoinPoint joinPoint) throws Throwable {
// 注解鉴权
MethodSignature signature = (MethodSignature) joinPoint.getSignature();
checkMethodAnnotation(signature.getMethod());
- try
- {
+ try {
// 执行原有逻辑
Object obj = joinPoint.proceed();
return obj;
- }
- catch (Throwable e)
- {
+ } catch (Throwable e) {
throw e;
}
}
@@ -71,26 +65,22 @@
/**
* 对一个Method对象进行注解检查
*/
- public void checkMethodAnnotation(Method method)
- {
+ public void checkMethodAnnotation(Method method) {
// 校验 @RequiresLogin 注解
RequiresLogin requiresLogin = method.getAnnotation(RequiresLogin.class);
- if (requiresLogin != null)
- {
+ if (requiresLogin != null) {
AuthUtil.checkLogin();
}
// 校验 @RequiresRoles 注解
RequiresRoles requiresRoles = method.getAnnotation(RequiresRoles.class);
- if (requiresRoles != null)
- {
+ if (requiresRoles != null) {
AuthUtil.checkRole(requiresRoles);
}
// 校验 @RequiresPermissions 注解
RequiresPermissions requiresPermissions = method.getAnnotation(RequiresPermissions.class);
- if (requiresPermissions != null)
- {
+ if (requiresPermissions != null) {
AuthUtil.checkPermi(requiresPermissions);
}
}
diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
index 2040a70..c4281e7 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
@@ -318,7 +318,7 @@
* 判断是否包含角色
*
* @param roleStr 角色列表
- * @param role 角色
+ * @param role 角色
* @return 用户是否具备某角色权限
*/
public boolean hasRole(String roleStr, String role) {
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index cc075f5..1e17891 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -126,12 +126,13 @@
return R.fail("用户名或密码错误");
}
// 角色集合
- String roles = permissionService.getRolePermission(sysUser);
+ SysRole roles = permissionService.getRolePermission(sysUser);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(sysUser);
LoginUser sysUserVo = new LoginUser();
sysUserVo.setSysUser(sysUser);
- sysUserVo.setRole(roles);
+ sysUserVo.setRole(roles.getRoleName());
+ sysUserVo.setRoleId(roles.getRoleId());
sysUserVo.setPermissions(permissions);
return R.ok(sysUserVo);
}
@@ -145,7 +146,7 @@
public AjaxResult getInfo() {
SysUser user = userService.selectUserById(SecurityUtils.getUserId());
// 角色集合
- String roles = permissionService.getRolePermission(user);
+ SysRole roles = permissionService.getRolePermission(user);
// 权限集合
Set<String> permissions = permissionService.getMenuPermission(user);
AjaxResult ajax = AjaxResult.success();
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java
index 1f26c77..33c8c97 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPermissionService.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service;
+import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import java.util.Set;
@@ -16,7 +17,7 @@
* @param user 用户信息
* @return 角色权限信息
*/
- public String getRolePermission(SysUser user);
+ public SysRole getRolePermission(SysUser user);
/**
* 获取菜单数据权限
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
index d4cc5a2..68d0b7a 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java
@@ -34,7 +34,7 @@
* @param userId 用户ID
* @return 权限列表
*/
- public String selectRolePermissionByUserId(Long userId);
+ public SysRole selectRolePermissionByUserId(Long userId);
/**
* 查询所有角色
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
index c40b206..483fc8e 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
@@ -89,7 +89,7 @@
Set<String> permsSet = new HashSet<>();
for (String perm : perms) {
if (StringUtils.isNotEmpty(perm)) {
- permsSet.addAll(Arrays.asList(perm.trim().split(",")));
+ permsSet.add(perm);
}
}
return permsSet;
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
index 9c01949..b4dc309 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPermissionServiceImpl.java
@@ -1,5 +1,6 @@
package com.ruoyi.system.service.impl;
+import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.service.ISysMenuService;
import com.ruoyi.system.service.ISysPermissionService;
@@ -30,15 +31,8 @@
* @return 角色权限信息
*/
@Override
- public String getRolePermission(SysUser user) {
- String roles;
- // 管理员拥有所有权限
- if (user.isAdmin()) {
- roles = "admin";
- } else {
- roles = roleService.selectRolePermissionByUserId(user.getUserId());
- }
- return roles;
+ public SysRole getRolePermission(SysUser user) {
+ return roleService.selectRolePermissionByUserId(user.getUserId());
}
/**
@@ -50,18 +44,13 @@
@Override
public Set<String> getMenuPermission(SysUser user) {
Set<String> perms = new HashSet<String>();
- // 管理员拥有所有权限
- if (user.isAdmin()) {
- perms.add("*:*:*");
+ Long roleId = user.getSysRole().getRoleId();
+ if (null == roleId) {
+ perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
} else {
- Long roleId = user.getSysRole().getRoleId();
- if (null == roleId) {
- perms.addAll(menuService.selectMenuPermsByUserId(user.getUserId()));
- } else {
- // 多角色设置permissions属性，以便数据权限匹配权限
- Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
- perms.addAll(rolePerms);
- }
+ // 多角色设置permissions属性，以便数据权限匹配权限
+ Set<String> rolePerms = menuService.selectMenuPermsByRoleId(roleId);
+ perms.addAll(rolePerms);
}
return perms;
}
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
index b398af9..e23f4d4 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java
@@ -73,9 +73,8 @@
* @return 权限列表
*/
@Override
- public String selectRolePermissionByUserId(Long userId) {
- SysRole perms = roleMapper.selectRolePermissionByUserId(userId);
- return perms.getRoleKey();
+ public SysRole selectRolePermissionByUserId(Long userId) {
+ return roleMapper.selectRolePermissionByUserId(userId);
}
/**
diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index 073b69f..2d7d2ce 100644
--- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
+++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
@@ -117,7 +117,7 @@
</select>
<select id="selectMenuPermsByUserId" parameterType="Long" resultType="String">
- select distinct m.perms
+ select distinct m.component
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/config/MyDateObjectHandler.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/config/MyDateObjectHandler.java
index 404dbb5..f2b90a4 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/config/MyDateObjectHandler.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/config/MyDateObjectHandler.java
@@ -35,7 +35,6 @@
// 是否软删除
this.setFieldValByName("isDelete", 0, metaObject);
// 是否启用 默认启用
- this.setFieldValByName("isEnable", 1, metaObject);
this.setFieldValByName("delFlag", 0, metaObject);
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
index 7ae9246..48c97fb 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/AgreementController.java
@@ -4,6 +4,8 @@
import com.ruoyi.admin.entity.Agreement;
import com.ruoyi.admin.service.AgreementService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.Logical;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -33,6 +35,7 @@
*
* @param type 查询类型
*/
+ @RequiresPermissions(value = {"system_agreement", "system_operate"}, logical = Logical.OR)
@ApiOperation(value = "根据类型获取注册协议、隐私政策、司机操作指南", tags = {"后台-隐私政策/司机操作指南"})
@GetMapping(value = "/dataInfo")
@ApiImplicitParams({
@@ -47,6 +50,7 @@
*
* @param agreement 协议信息
*/
+ @RequiresPermissions(value = {"system_agreement", "system_operate"}, logical = Logical.OR)
@ApiOperation(value = "保存政策协议", tags = {"后台-隐私政策/司机操作指南"})
@PostMapping(value = "/saveData")
public R<String> saveData(@RequestBody Agreement agreement) {
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java
index a2cba6c..40b74a0 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ChangeDispatchController.java
@@ -15,6 +15,7 @@
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -55,6 +56,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("reassignment_apply")
@ApiOperation(value = "订单改派分页查询列表", tags = {"后台-系统设置-订单改派管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -80,6 +82,7 @@
*
* @param id 订单改派id
*/
+ @RequiresPermissions("reassignment_apply")
@ApiOperation(value = "订单改派详情", tags = {"后台-系统设置-订单改派管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -94,6 +97,7 @@
*
* @param ids 订单改派多条id拼接
*/
+ @RequiresPermissions("reassignment_apply")
@ApiOperation(value = "批量删除订单改派", tags = {"后台-系统设置-订单改派管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
@@ -112,6 +116,7 @@
* @param orderId 订单id
* @param workerId 师傅id
*/
+ @RequiresPermissions("reassignment_apply")
@ApiOperation(value = "订单改派师傅", tags = {"后台-系统设置-订单改派管理"})
@GetMapping(value = "/changeWorker")
@ApiImplicitParams({
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
index 352c5b5..9b4187a 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/EvaluateController.java
@@ -7,6 +7,7 @@
import com.ruoyi.admin.service.EvaluateService;
import com.ruoyi.admin.vo.EvaluatePageVO;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -43,6 +44,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("order_evaluate")
@ApiOperation(value = "订单评价分页查询列表", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -63,6 +65,7 @@
*
* @param id 订单评价id
*/
+ @RequiresPermissions("order_evaluate")
@ApiOperation(value = "订单评价详情", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -77,6 +80,7 @@
*
* @param ids 订单评价多条id拼接
*/
+ @RequiresPermissions("order_evaluate")
@ApiOperation(value = "批量删除订单评价", tags = {"后台-系统设置-订单评价管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
index 49b67fb..85e8c4f 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/FranchiseeController.java
@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.exception.GlobalException;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -45,6 +46,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("franchisee")
@ApiOperation(value = "加盟商信息分页查询列表", tags = {"后台-加盟商管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -72,6 +74,7 @@
*
* @param id 加盟商信息id
*/
+ @RequiresPermissions("franchisee")
@ApiOperation(value = "加盟商信息详情", tags = {"后台-加盟商管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -86,6 +89,7 @@
*
* @param franchisee 加盟商信息信息
*/
+ @RequiresPermissions("franchisee")
@ApiOperation(value = "新增加盟商信息", tags = {"后台-加盟商管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody @Validated Franchisee franchisee) {
@@ -102,6 +106,7 @@
*
* @param franchisee 加盟商信息信息
*/
+ @RequiresPermissions("franchisee")
@ApiOperation(value = "修改加盟商信息", tags = {"后台-加盟商管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody @Validated Franchisee franchisee) {
@@ -115,6 +120,7 @@
* @param id 加盟商id
* @param enable 启用/关闭
*/
+ @RequiresPermissions("franchisee")
@ApiOperation(value = "启用/关闭加盟商", tags = {"后台-加盟商管理"})
@GetMapping(value = "/enable")
@ApiImplicitParams({
@@ -153,6 +159,7 @@
*
* @param ids 加盟商信息多条id拼接
*/
+ @RequiresPermissions("franchisee")
@ApiOperation(value = "批量删除加盟商信息", tags = {"后台-加盟商管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
index 6d8cfd7..9d190b4 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/MasterWorkerController.java
@@ -51,18 +51,18 @@
@ApiOperation(value = "师傅列表", tags = {"后台-师傅管理"})
@GetMapping(value = "/selectServe")
@ApiImplicitParams({
- @ApiImplicitParam(value = "师傅姓名", name = "workerName", dataType = "String"),
- @ApiImplicitParam(value = "师傅电话", name = "workerPhone", dataType = "String"),
+ @ApiImplicitParam(value = "师傅姓名", name = "name", dataType = "String"),
+ @ApiImplicitParam(value = "师傅电话", name = "phone", dataType = "String"),
@ApiImplicitParam(value = "服务城市", name = "city", dataType = "String"),
@ApiImplicitParam(value = "页码", name = "pageNum", dataType = "Integer", required = true),
@ApiImplicitParam(value = "每页显示条数", name = "pageSize", dataType = "Integer", required = true)
})
- public R<IPage<MasterWorker>> selectServe(String workerName, String workerPhone, String city,
+ public R<IPage<MasterWorker>> selectServe(String name, String phone, String city,
@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
LambdaQueryChainWrapper<MasterWorker> wrapper = masterWorkerService.lambdaQuery();
- wrapper = StringUtils.isNotBlank(workerName) ? wrapper.like(MasterWorker::getRealName, workerName) : wrapper;
- wrapper = StringUtils.isNotBlank(workerPhone) ? wrapper.like(MasterWorker::getPhone, workerPhone) : wrapper;
+ wrapper = StringUtils.isNotBlank(name) ? wrapper.like(MasterWorker::getRealName, name) : wrapper;
+ wrapper = StringUtils.isNotBlank(phone) ? wrapper.like(MasterWorker::getPhone, phone) : wrapper;
wrapper = StringUtils.isNotBlank(city) ? wrapper.like(MasterWorker::getCity, city) : wrapper;
return R.ok(wrapper.eq(MasterWorker::getIsDelete, 0)
.orderByDesc(MasterWorker::getCreateTime).page(Page.of(pageNum, pageSize)));
@@ -130,7 +130,7 @@
}
/**
- * 新增师傅信息
+ * 师傅详细信息
*
* @param workerId 师傅id
*/
@@ -151,11 +151,13 @@
List<Evaluate> evaluateList = evaluateService.lambdaQuery().eq(Evaluate::getWorkerId, workerId)
.eq(Evaluate::getIsDelete, 0).list();
List<BigDecimal> star = evaluateList.stream().map(Evaluate::getStarRating).collect(Collectors.toList());
- // 总评分 / 评价数量
- BigDecimal starRating = star.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
- BigDecimal result = starRating.divide(new BigDecimal(star.size()), 1, RoundingMode.HALF_UP);
- workerDetail.setStarRating(result);
- return R.fail(workerDetail);
+ if (!star.isEmpty()) {
+ // 总评分 / 评价数量
+ BigDecimal starRating = star.stream().reduce(BigDecimal.ZERO, BigDecimal::add);
+ BigDecimal result = starRating.divide(new BigDecimal(star.size()), 1, RoundingMode.HALF_UP);
+ workerDetail.setStarRating(result);
+ }
+ return R.ok(workerDetail);
}
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/NoticesController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/NoticesController.java
index d6017c4..f13dd04 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/NoticesController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/NoticesController.java
@@ -6,6 +6,7 @@
import com.ruoyi.admin.entity.Notices;
import com.ruoyi.admin.service.NoticesService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -39,6 +40,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("system_notice")
@ApiOperation(value = "系统通知分页查询列表", tags = {"后台-系统设置-系统通知管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -53,8 +55,8 @@
/**
* 系统通知列表
- *
*/
+ @RequiresPermissions("system_notice")
@ApiOperation(value = "系统通知列表(不分页)", tags = {"后台-系统设置-系统通知管理"})
@GetMapping(value = "/noticesList")
public R<List<Notices>> noticesList() {
@@ -67,6 +69,7 @@
*
* @param id 系统通知id
*/
+ @RequiresPermissions("system_notice")
@ApiOperation(value = "系统通知详情", tags = {"后台-系统设置-系统通知管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -81,9 +84,11 @@
*
* @param notices 系统通知信息
*/
+ @RequiresPermissions("system_notice")
@ApiOperation(value = "新增系统通知", tags = {"后台-系统设置-系统通知管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody Notices notices) {
+ notices.setNoticeDetail(String.valueOf(notices.getNoticeDetail()));
return noticesService.save(notices) ? R.ok() : R.fail();
}
@@ -92,6 +97,7 @@
*
* @param notices 系统通知信息
*/
+ @RequiresPermissions("system_notice")
@ApiOperation(value = "修改系统通知", tags = {"后台-系统设置-系统通知管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody Notices notices) {
@@ -103,6 +109,7 @@
*
* @param ids 系统通知多条id拼接
*/
+ @RequiresPermissions("system_notice")
@ApiOperation(value = "批量删除系统通知", tags = {"后台-系统设置-系统通知管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java
index daddfec..c943048 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/PrizeController.java
@@ -6,6 +6,7 @@
import com.ruoyi.admin.entity.Prize;
import com.ruoyi.admin.service.PrizeService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.security.annotation.RequiresPermissions;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -39,6 +40,7 @@
* @param pageNum 页码
* @param pageSize 每页显示条数
*/
+ @RequiresPermissions("system_site")
@ApiOperation(value = "奖品分页查询列表", tags = {"后台-系统设置-奖品管理"})
@GetMapping(value = "/page")
@ApiImplicitParams({
@@ -56,6 +58,7 @@
*
* @param id 奖品id
*/
+ @RequiresPermissions("system_site")
@ApiOperation(value = "奖品详情", tags = {"后台-系统设置-奖品管理"})
@GetMapping(value = "/detail")
@ApiImplicitParams({
@@ -70,6 +73,7 @@
*
* @param prize 奖品信息
*/
+ @RequiresPermissions("system_site")
@ApiOperation(value = "新增奖品", tags = {"后台-系统设置-奖品管理"})
@PostMapping(value = "/save")
public R<String> save(@RequestBody Prize prize) {
@@ -81,6 +85,7 @@
*
* @param prize 奖品信息
*/
+ @RequiresPermissions("system_site")
@ApiOperation(value = "编辑奖品", tags = {"后台-系统设置-奖品管理"})
@PostMapping(value = "/update")
public R<String> update(@RequestBody Prize prize) {
@@ -92,6 +97,7 @@
*
* @param ids 奖品id拼接
*/
+ @RequiresPermissions("system_site")
@ApiOperation(value = "批量删除奖品", tags = {"后台-系统设置-奖品管理"})
@GetMapping(value = "/batchDelete")
@ApiImplicitParams({
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ProblemController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ProblemController.java
index 80120c2..9e30c45 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ProblemController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/ProblemController.java
@@ -57,7 +57,7 @@
@GetMapping(value = "/problemList")
public R<List<Problem>> problemList() {
return R.ok(problemService.lambdaQuery().eq(Problem::getIsDelete, 0)
- .orderByAsc(Problem::getOrder).list());
+ .orderByAsc(Problem::getSort).list());
}
/**
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
index 95e79f5..32772ba 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/SiteController.java
@@ -27,7 +27,7 @@
*/
@RestController
@RequestMapping("/site")
-@Api( tags = {"后台-系统设置-站点管理"})
+@Api(tags = {"后台-系统设置-站点管理"})
public class SiteController {
@Resource
@@ -47,7 +47,9 @@
})
public R<IPage<Site>> queryPageList(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) {
- return R.ok(siteService.lambdaQuery().orderByDesc(Site::getCreateTime).page(Page.of(pageNum, pageSize)));
+ return R.ok(siteService.lambdaQuery().orderByDesc(Site::getCreateTime)
+ .eq(Site::getIsDelete, 0)
+ .page(Page.of(pageNum, pageSize)));
}
/**
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java
index b2a68e6..427fcb6 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/MasterWorker.java
@@ -89,4 +89,8 @@
@TableField("is_enable")
private Integer isEnable;
+ @ApiModelProperty("管辖城市二维数组")
+ @TableField("city_str")
+ private String cityStr;
+
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java
index 028d091..f65fa78 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Notices.java
@@ -24,8 +24,12 @@
@ApiModel(value = "Notices对象", description = "系统通知管理")
public class Notices extends BaseEntity {
- @TableId(value = "id",type = IdType.AUTO)
+ @TableId(value = "id", type = IdType.AUTO)
private Integer id;
+
+ @ApiModelProperty("排序")
+ @TableField("sort")
+ private Integer sort;
@ApiModelProperty("通知标题")
@TableField("notice_title")
@@ -33,6 +37,6 @@
@ApiModelProperty("通知内容")
@TableField("notice_detail")
- private String noticeDetail;
+ private Object noticeDetail;
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Problem.java b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Problem.java
index f2afa31..035684e 100644
--- a/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Problem.java
+++ b/ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Problem.java
@@ -36,7 +36,7 @@
private String detail;
@ApiModelProperty("排序权重")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
}
diff --git a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/NoticesMapper.xml b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/NoticesMapper.xml
index 0aec8c0..b555741 100644
--- a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/NoticesMapper.xml
+++ b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/NoticesMapper.xml
@@ -1,17 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.admin.mapper.NoticesMapper">
-
<!-- 通用查询映射结果 -->
<resultMap id="BaseResultMap" type="com.ruoyi.admin.entity.Notices">
- <id column="id" property="id" />
- <result column="notice_title" property="noticeTitle" />
- <result column="notice_detail" property="noticeDetail" />
- <result column="createBy" property="createBy" />
- <result column="updateBy" property="updateBy" />
- <result column="createTime" property="createTime" />
- <result column="updateTime" property="updateTime" />
- <result column="is_delete" property="isDelete" />
+ <id column="id" property="id"/>
+ <result column="notice_title" property="noticeTitle"/>
+ <result column="sort" property="sort"/>
+ <result column="notice_detail" property="noticeDetail"/>
+ <result column="createBy" property="createBy"/>
+ <result column="updateBy" property="updateBy"/>
+ <result column="createTime" property="createTime"/>
+ <result column="updateTime" property="updateTime"/>
+ <result column="is_delete" property="isDelete"/>
</resultMap>
-
</mapper>
diff --git a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ProblemMapper.xml b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ProblemMapper.xml
index 2bbab50..ae4421c 100644
--- a/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ProblemMapper.xml
+++ b/ruoyi-service/ruoyi-admin/src/main/resources/mapper/admin/ProblemMapper.xml
@@ -7,7 +7,7 @@
<id column="id" property="id" />
<result column="title" property="title" />
<result column="detail" property="detail" />
- <result column="order" property="order" />
+ <result column="sort" property="sort" />
<result column="createBy" property="createBy" />
<result column="updateBy" property="updateBy" />
<result column="createTime" property="createTime" />
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
index 2551710..419a098 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/controller/UserController.java
@@ -182,7 +182,7 @@
@ApiOperation(value = "首页回收分类推荐", tags = {"用户端-首页"})
public R<List<RecoveryClassify>> recommend() {
return R.ok(recoveryClassifyService.lambdaQuery().eq(RecoveryClassify::getIsRecommend, Constants.ONE)
- .eq(RecoveryClassify::getIsDelete, 0).orderByAsc(RecoveryClassify::getOrder).list());
+ .eq(RecoveryClassify::getIsDelete, 0).orderByAsc(RecoveryClassify::getSort).list());
}
/**
diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java
index d409224..198b4ea 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/RecoveryClassify.java
@@ -48,8 +48,8 @@
private String typeDescribe;
@ApiModelProperty("排序权重")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
@ApiModelProperty("分类简介")
@TableField("brief_introduction")
diff --git a/ruoyi-service/ruoyi-user/src/main/resources/mapper/user/RecoveryClassifyMapper.xml b/ruoyi-service/ruoyi-user/src/main/resources/mapper/user/RecoveryClassifyMapper.xml
index 472ecbf..067894e 100644
--- a/ruoyi-service/ruoyi-user/src/main/resources/mapper/user/RecoveryClassifyMapper.xml
+++ b/ruoyi-service/ruoyi-user/src/main/resources/mapper/user/RecoveryClassifyMapper.xml
@@ -10,7 +10,7 @@
<result column="home_page_name" property="homePageName" />
<result column="classification_picture" property="classificationPicture" />
<result column="type_describe" property="typeDescribe" />
- <result column="order" property="order" />
+ <result column="sort" property="sort" />
<result column="brief_introduction" property="briefIntroduction" />
<result column="is_recommend" property="isRecommend" />
<result column="createBy" property="createBy" />
diff --git a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/RecoveryServe.java b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/RecoveryServe.java
index 363ddc5..3c1bd2a 100644
--- a/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/RecoveryServe.java
+++ b/ruoyi-service/ruoyi-worker/src/main/java/com/ruoyi/worker/entity/RecoveryServe.java
@@ -50,8 +50,8 @@
private BigDecimal defaultPrice;
@ApiModelProperty("排序权重")
- @TableField("order")
- private Integer order;
+ @TableField("sort")
+ private Integer sort;
@ApiModelProperty("封面图片")
@TableField("cover")
diff --git a/ruoyi-service/ruoyi-worker/src/main/resources/mapper/worker/RecoveryServeMapper.xml b/ruoyi-service/ruoyi-worker/src/main/resources/mapper/worker/RecoveryServeMapper.xml
index 4bee689..b7fd941 100644
--- a/ruoyi-service/ruoyi-worker/src/main/resources/mapper/worker/RecoveryServeMapper.xml
+++ b/ruoyi-service/ruoyi-worker/src/main/resources/mapper/worker/RecoveryServeMapper.xml
@@ -9,7 +9,7 @@
<result column="serve_describe" property="serveDescribe"/>
<result column="estimate_price" property="estimatePrice"/>
<result column="default_price" property="defaultPrice"/>
- <result column="order" property="order"/>
+ <result column="sort" property="sort"/>
<result column="cover" property="cover"/>
<result column="rotate" property="rotate"/>
<result column="createBy" property="createBy"/>
--
Gitblit v1.7.1