From d5307c30ea63ad37da70bbd9dbd49b78f8672c29 Mon Sep 17 00:00:00 2001 From: ldrop Date: Mon, 20 Jan 2025 14:22:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/monitor/SysOperlogController.java | 9 +++++++++ .../main/resources/mapper/system/SysOperLogMapper.xml | 3 +++ 2 files changed, 12 insertions(+) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 44c8e14..8d7bdab 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -81,4 +81,13 @@ public class SysOperlogController extends BaseController operLogService.cleanOperLog(); return success(); } + + @Operation(summary = "业务监控") + @PreAuthorize("@ss.hasPermi('monitor:operlog:business')") + @GetMapping("/business") + public TableDataInfo business(SysOperLog operLog) + { + List list = operLogService.selectOperLogList(operLog); + return getDataTable(list); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index 96bc621..aa574dc 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -43,6 +43,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND business_type = #{businessType} + + AND request_method = #{requestMethod} + AND business_type in -- Gitee From 2b6ee869a6bb042eb823e5ccc5cd2c833b289f60 Mon Sep 17 00:00:00 2001 From: ldrop Date: Thu, 23 Jan 2025 14:09:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../monitor/SysOperlogController.java | 22 ++++- .../com/ruoyi/system/domain/SysScript.java | 80 ++++++++++++++++ .../ruoyi/system/domain/SysUserOnline.java | 8 ++ .../ruoyi/system/mapper/SysOperLogMapper.java | 22 +++++ .../ruoyi/system/mapper/SysScriptMapper.java | 61 ++++++++++++ .../ruoyi/system/mapper/SysUserMapper.java | 9 ++ .../system/service/ISysOperLogService.java | 22 +++++ .../system/service/ISysScriptService.java | 61 ++++++++++++ .../ruoyi/system/service/ISysUserService.java | 9 ++ .../service/impl/SysDictTypeServiceImpl.java | 31 ++++-- .../service/impl/SysOperLogServiceImpl.java | 23 +++++ .../service/impl/SysScriptServiceImpl.java | 96 +++++++++++++++++++ .../service/impl/SysUserServiceImpl.java | 31 +++++- .../mapper/system/SysConfigMapper.xml | 4 +- .../mapper/system/SysDictTypeMapper.xml | 4 +- .../resources/mapper/system/SysMenuMapper.xml | 16 ++-- .../mapper/system/SysOperLogMapper.xml | 70 ++++++++++++++ .../resources/mapper/system/SysRoleMapper.xml | 4 +- .../mapper/system/SysScriptMapper.xml | 80 ++++++++++++++++ .../resources/mapper/system/SysUserMapper.xml | 13 ++- 20 files changed, 637 insertions(+), 29 deletions(-) create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScript.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysScriptMapper.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysScriptService.java create mode 100644 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysScriptServiceImpl.java create mode 100644 ruoyi-system/src/main/resources/mapper/system/SysScriptMapper.xml diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java index 8d7bdab..f2f7cba 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.monitor; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; @@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.RestController; import com.ruoyi.common.annotation.Log; import com.ruoyi.common.core.controller.BaseController; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.enums.BusinessType; import com.ruoyi.common.utils.poi.ExcelUtil; @@ -83,11 +86,20 @@ public class SysOperlogController extends BaseController } @Operation(summary = "业务监控") - @PreAuthorize("@ss.hasPermi('monitor:operlog:business')") @GetMapping("/business") - public TableDataInfo business(SysOperLog operLog) - { - List list = operLogService.selectOperLogList(operLog); - return getDataTable(list); + public R> business(SysOperLog operLog) { + // 查询并获取统计数据 + List> successStats = operLogService.getSuccessOperationStats(operLog); + List> failureStats = operLogService.getFailureOperationStats(operLog); + List> statusStats = operLogService.getStatusStats(operLog); + List> moduleOperationStats = operLogService.getModuleOperationStats(operLog); + // 创建一个新的 Map 来组织数据 + Map result = new LinkedHashMap<>(); + result.put("successStats", successStats); + result.put("failureStats", failureStats); + result.put("statusStats", statusStats); + result.put("moduleOperationStats", moduleOperationStats); + result.put("total", successStats.size() + failureStats.size() + statusStats.size() + moduleOperationStats.size()); + return R.ok(result); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScript.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScript.java new file mode 100644 index 0000000..2bf6b0c --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysScript.java @@ -0,0 +1,80 @@ +package com.ruoyi.system.domain; + +import io.swagger.v3.oas.annotations.media.Schema; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.ruoyi.common.annotation.Excel; +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 脚本对象 sys_script + * + * @author ruoyi + * @date 2024-09-10 + */ +@Schema(description = "脚本对象") +public class SysScript extends BaseEntity +{ + private static final long serialVersionUID = 1L; + + + /** 主键 */ + @Schema(title = "主键") + private Long scriptId; + + /** 标题 */ + @Schema(title = "标题") + @Excel(name = "标题") + private String scriptTitle; + + /** 内容 */ + @Schema(title = "内容") + private String content; + public void setScriptId(Long scriptId) + { + this.scriptId = scriptId; + } + + public Long getScriptId() + { + return scriptId; + } + + + public void setScriptTitle(String scriptTitle) + { + this.scriptTitle = scriptTitle; + } + + public String getScriptTitle() + { + return scriptTitle; + } + + + public void setContent(String content) + { + this.content = content; + } + + public String getContent() + { + return content; + } + + + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) + .append("scriptId", getScriptId()) + .append("scriptTitle", getScriptTitle()) + .append("content", getContent()) + .append("createBy", getCreateBy()) + .append("createTime", getCreateTime()) + .append("updateBy", getUpdateBy()) + .append("updateTime", getUpdateTime()) + .append("remark", getRemark()) + .toString(); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java index 57112db..b853ac3 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysUserOnline.java @@ -42,6 +42,14 @@ public class SysUserOnline @Schema(title = "登录时间") private Long loginTime; + public SysUserOnline() { + } + + public SysUserOnline(String ipaddr, Long loginTime) { + this.ipaddr = ipaddr; + this.loginTime = loginTime; + } + public String getTokenId() { return tokenId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java index 2ae6457..a0fa862 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysOperLogMapper.java @@ -1,6 +1,8 @@ package com.ruoyi.system.mapper; import java.util.List; +import java.util.Map; + import com.ruoyi.system.domain.SysOperLog; /** @@ -45,4 +47,24 @@ public interface SysOperLogMapper * 清空操作日志 */ public void cleanOperLog(); + + /** + * 获取成功操作的统计信息 + */ + List> getSuccessOperationStats(SysOperLog operLog); + + /** + * 获取失败操作的统计信息 + */ + List> getFailureOperationStats(SysOperLog operLog); + + /** + * 获取按状态分类的操作统计信息 + */ + List> getStatusStats(SysOperLog operLog); + + /** + * 获取按模块和操作类型分类的操作统计信息 + */ + List> getModuleOperationStats(SysOperLog operLog); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysScriptMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysScriptMapper.java new file mode 100644 index 0000000..d376a0b --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysScriptMapper.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.mapper; + +import java.util.List; +import com.ruoyi.system.domain.SysScript; + +/** + * 脚本Mapper接口 + * + * @author ruoyi + * @date 2024-09-10 + */ +public interface SysScriptMapper +{ + /** + * 查询脚本 + * + * @param scriptId 脚本主键 + * @return 脚本 + */ + public SysScript selectSysScriptByScriptId(Long scriptId); + + /** + * 查询脚本列表 + * + * @param sysScript 脚本 + * @return 脚本集合 + */ + public List selectSysScriptList(SysScript sysScript); + + /** + * 新增脚本 + * + * @param sysScript 脚本 + * @return 结果 + */ + public int insertSysScript(SysScript sysScript); + + /** + * 修改脚本 + * + * @param sysScript 脚本 + * @return 结果 + */ + public int updateSysScript(SysScript sysScript); + + /** + * 删除脚本 + * + * @param scriptId 脚本主键 + * @return 结果 + */ + public int deleteSysScriptByScriptId(Long scriptId); + + /** + * 批量删除脚本 + * + * @param scriptIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteSysScriptByScriptIds(Long[] scriptIds); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java index 776dbaf..e943fc2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysUserMapper.java @@ -68,6 +68,14 @@ public interface SysUserMapper { */ public SysUser selectUserByEmail(String email); + /** + * 通过用户昵称查询用户 + * + * @param nick_name 用户昵称 + * @return 用户对象信息 + */ + public SysUser selectUserByNickName(String nickName); + /** * 新增用户信息 * @@ -142,3 +150,4 @@ public interface SysUserMapper { */ public SysUser checkEmailUnique(String email); } + diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java index 4fd8e5a..686abc8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOperLogService.java @@ -1,6 +1,8 @@ package com.ruoyi.system.service; import java.util.List; +import java.util.Map; + import com.ruoyi.system.domain.SysOperLog; /** @@ -45,4 +47,24 @@ public interface ISysOperLogService * 清空操作日志 */ public void cleanOperLog(); + + /** + * 获取成功操作的统计信息 + */ + List> getSuccessOperationStats(SysOperLog operLog); + + /** + * 获取失败操作的统计信息 + */ + List> getFailureOperationStats(SysOperLog operLog); + + /** + * 获取按状态分类的操作统计信息 + */ + List> getStatusStats(SysOperLog operLog); + + /** + * 获取按模块和操作类型分类的操作统计信息 + */ + List> getModuleOperationStats(SysOperLog operLog); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysScriptService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysScriptService.java new file mode 100644 index 0000000..822c960 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysScriptService.java @@ -0,0 +1,61 @@ +package com.ruoyi.system.service; + +import java.util.List; +import com.ruoyi.system.domain.SysScript; + +/** + * 脚本Service接口 + * + * @author ruoyi + * @date 2024-09-10 + */ +public interface ISysScriptService +{ + /** + * 查询脚本 + * + * @param scriptId 脚本主键 + * @return 脚本 + */ + public SysScript selectSysScriptByScriptId(Long scriptId); + + /** + * 查询脚本列表 + * + * @param sysScript 脚本 + * @return 脚本集合 + */ + public List selectSysScriptList(SysScript sysScript); + + /** + * 新增脚本 + * + * @param sysScript 脚本 + * @return 结果 + */ + public int insertSysScript(SysScript sysScript); + + /** + * 修改脚本 + * + * @param sysScript 脚本 + * @return 结果 + */ + public int updateSysScript(SysScript sysScript); + + /** + * 批量删除脚本 + * + * @param scriptIds 需要删除的脚本主键集合 + * @return 结果 + */ + public int deleteSysScriptByScriptIds(Long[] scriptIds); + + /** + * 删除脚本信息 + * + * @param scriptId 脚本主键 + * @return 结果 + */ + public int deleteSysScriptByScriptId(Long scriptId); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java index 8536209..19e939d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysUserService.java @@ -66,6 +66,14 @@ public interface ISysUserService { */ public SysUser selectUserByEmail(String email); + /** + * 通过用户昵称查询用户 + * + * @param nickName 用户昵称 + * @return 用户对象信息 + */ + public SysUser selectUserByNickName(String nickName); + /** * 根据用户ID查询用户所属角色组 * @@ -106,6 +114,7 @@ public interface ISysUserService { */ public boolean checkEmailUnique(SysUser user); + /** * 校验用户是否允许操作 * diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java index d3fd7fe..e217d53 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java @@ -4,10 +4,12 @@ import java.util.Comparator; import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import jakarta.annotation.PostConstruct; + import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; + import com.ruoyi.common.constant.UserConstants; import com.ruoyi.common.core.domain.entity.SysDictData; import com.ruoyi.common.core.domain.entity.SysDictType; @@ -18,6 +20,8 @@ import com.ruoyi.system.mapper.SysDictDataMapper; import com.ruoyi.system.mapper.SysDictTypeMapper; import com.ruoyi.system.service.ISysDictTypeService; +import jakarta.annotation.PostConstruct; + /** * 字典 业务层处理 * @@ -171,15 +175,28 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService * @param dict 字典类型信息 * @return 结果 */ + // @Override + // public int insertDictType(SysDictType dict) + // { + // int row = dictTypeMapper.insertDictType(dict); + // if (row > 0) + // { + // DictUtils.setDictCache(dict.getDictType(), null); + // } + // return row; + // } + + /** + * 新增保存字典类型信息 + * + * @param dict 字典类型信息 + * @return 结果 + */ + @CacheEvict(value = "sys_dict", key = "#dict.dictType") @Override public int insertDictType(SysDictType dict) { - int row = dictTypeMapper.insertDictType(dict); - if (row > 0) - { - DictUtils.setDictCache(dict.getDictType(), null); - } - return row; + return dictTypeMapper.insertDictType(dict); } /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java index 5489815..7489242 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOperLogServiceImpl.java @@ -1,8 +1,11 @@ package com.ruoyi.system.service.impl; import java.util.List; +import java.util.Map; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + import com.ruoyi.system.domain.SysOperLog; import com.ruoyi.system.mapper.SysOperLogMapper; import com.ruoyi.system.service.ISysOperLogService; @@ -73,4 +76,24 @@ public class SysOperLogServiceImpl implements ISysOperLogService { operLogMapper.cleanOperLog(); } + + @Override + public List> getSuccessOperationStats(SysOperLog operLog) { + return operLogMapper.getSuccessOperationStats(operLog); + } + + @Override + public List> getFailureOperationStats(SysOperLog operLog) { + return operLogMapper.getFailureOperationStats(operLog); + } + + @Override + public List> getStatusStats(SysOperLog operLog) { + return operLogMapper.getStatusStats(operLog); + } + + @Override + public List> getModuleOperationStats(SysOperLog operLog) { + return operLogMapper.getModuleOperationStats(operLog); + } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysScriptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysScriptServiceImpl.java new file mode 100644 index 0000000..0d4ce46 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysScriptServiceImpl.java @@ -0,0 +1,96 @@ +package com.ruoyi.system.service.impl; + +import java.util.List; +import com.ruoyi.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.ruoyi.system.mapper.SysScriptMapper; +import com.ruoyi.system.domain.SysScript; +import com.ruoyi.system.service.ISysScriptService; + +/** + * 脚本Service业务层处理 + * + * @author ruoyi + * @date 2024-09-10 + */ +@Service +public class SysScriptServiceImpl implements ISysScriptService +{ + @Autowired + private SysScriptMapper sysScriptMapper; + + /** + * 查询脚本 + * + * @param scriptId 脚本主键 + * @return 脚本 + */ + @Override + public SysScript selectSysScriptByScriptId(Long scriptId) + { + return sysScriptMapper.selectSysScriptByScriptId(scriptId); + } + + /** + * 查询脚本列表 + * + * @param sysScript 脚本 + * @return 脚本 + */ + @Override + public List selectSysScriptList(SysScript sysScript) + { + return sysScriptMapper.selectSysScriptList(sysScript); + } + + /** + * 新增脚本 + * + * @param sysScript 脚本 + * @return 结果 + */ + @Override + public int insertSysScript(SysScript sysScript) + { + sysScript.setCreateTime(DateUtils.getNowDate()); + return sysScriptMapper.insertSysScript(sysScript); + } + + /** + * 修改脚本 + * + * @param sysScript 脚本 + * @return 结果 + */ + @Override + public int updateSysScript(SysScript sysScript) + { + sysScript.setUpdateTime(DateUtils.getNowDate()); + return sysScriptMapper.updateSysScript(sysScript); + } + + /** + * 批量删除脚本 + * + * @param scriptIds 需要删除的脚本主键 + * @return 结果 + */ + @Override + public int deleteSysScriptByScriptIds(Long[] scriptIds) + { + return sysScriptMapper.deleteSysScriptByScriptIds(scriptIds); + } + + /** + * 删除脚本信息 + * + * @param scriptId 脚本主键 + * @return 结果 + */ + @Override + public int deleteSysScriptByScriptId(Long scriptId) + { + return sysScriptMapper.deleteSysScriptByScriptId(scriptId); + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java index f3ecf44..75c62f8 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java @@ -143,6 +143,18 @@ public class SysUserServiceImpl implements ISysUserService { return userMapper.selectUserByEmail(email); } + /** + * 通过用户昵称查询用户 + * + * @param nckName 用户昵称 + * @return 用户对象信息 + */ + @Override + public SysUser selectUserByNickName(String nickName) { + return userMapper.selectUserByNickName(nickName); + } + + /** * 查询用户所属角色组 * @@ -214,12 +226,28 @@ public class SysUserServiceImpl implements ISysUserService { @Override public boolean checkEmailUnique(SysUser user) { Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); - SysUser info = userMapper.checkEmailUnique(user.getEmail()); + SysUser info = userMapper.checkEmailUnique(user.getNickName()); if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { return UserConstants.NOT_UNIQUE; } return UserConstants.UNIQUE; } + // /** + // * 校验用户昵称是否唯一 + // * + // * @param nick_name 用户昵称 + // * @return 结果 + // */ + // @Override + // public boolean checkUserByNickName(SysUser user) { + + // Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId(); + // SysUser info = userMapper.checkNickNameUnique(user.getNickName()); + // if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) { + // return UserConstants.NOT_UNIQUE; + // } + // return UserConstants.UNIQUE; + // } /** * 校验用户是否允许操作 @@ -512,4 +540,5 @@ public class SysUserServiceImpl implements ISysUserService { } return successMsg.toString(); } + } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml index 7ab9fef..dfae115 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml @@ -51,10 +51,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND config_key like concat('%', #{configKey}, '%') - and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml index a608c06..7b1407d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml @@ -33,10 +33,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND dict_type like concat('%', #{dictType}, '%') - and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + and date_format(create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - and date_format(create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + and date_format(create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml index a13cd80..84e87c9 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml @@ -29,7 +29,7 @@ - select menu_id, menu_name, parent_id, order_num, path, component, sys_menu.query, route_name, is_frame, is_cache, menu_type, visible, status, COALESCE(perms,'') as perms, icon, create_time + select menu_id, menu_name, parent_id, order_num, path, component, `query`, route_name, is_frame, is_cache, menu_type, visible, status, ifnull(perms,'') as perms, icon, create_time from sys_menu @@ -50,13 +50,13 @@ @@ -141,7 +141,7 @@ order_num = #{orderNum}, path = #{path}, component = #{component}, - query = #{query}, + `query` = #{query}, route_name = #{routeName}, is_frame = #{isFrame}, is_cache = #{isCache}, @@ -165,7 +165,7 @@ order_num, path, component, - query, + `query`, route_name, is_frame, is_cache, diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml index aa574dc..a4f3922 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml @@ -84,4 +84,74 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" truncate table sys_oper_log + + + + AND title like concat('%', #{title}, '%') + + + AND business_type = #{businessType} + + + AND request_method = #{requestMethod} + + + AND business_type in + + #{businessType} + + + + AND status = #{status} + + + AND oper_time >= #{params.beginTime} + + + AND oper_time <= #{params.endTime} + + + + + + + + + + + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index 9f27439..6fd135e 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -46,10 +46,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND r.role_key like concat('%', #{roleKey}, '%') - and date_format(r.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + and date_format(r.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - and date_format(r.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + and date_format(r.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') ${params.dataScope} diff --git a/ruoyi-system/src/main/resources/mapper/system/SysScriptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysScriptMapper.xml new file mode 100644 index 0000000..081f984 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/system/SysScriptMapper.xml @@ -0,0 +1,80 @@ + + + + + + + + + + + + + + + + + select script_id, script_title, create_by, create_time, update_by, update_time, remark from sys_script + + + + + + + + insert into sys_script + + script_title, + content, + create_by, + create_time, + update_by, + update_time, + remark, + + + #{scriptTitle}, + #{content}, + #{createBy}, + #{createTime}, + #{updateBy}, + #{updateTime}, + #{remark}, + + + + + update sys_script + + script_title = #{scriptTitle}, + content = #{content}, + create_by = #{createBy}, + create_time = #{createTime}, + update_by = #{updateBy}, + update_time = #{updateTime}, + remark = #{remark}, + + where sys_script.script_id = #{scriptId} + + + + delete from sys_script where script_id = #{scriptId} + + + + delete from sys_script where script_id in + + #{scriptId} + + + \ No newline at end of file diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index b4c3219..6d4ce09 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -63,6 +63,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.user_id = #{userId} + + AND u.nick_name like concat('%', #{nickName}, '%') + AND u.user_name like concat('%', #{userName}, '%') @@ -73,10 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND u.phonenumber like concat('%', #{phonenumber}, '%') - AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') + AND date_format(u.create_time,'%y%m%d') >= date_format(#{params.beginTime},'%y%m%d') - AND date_format(u.create_time,'%y%m%d') <= date_format(#{params.endTime},'%y%m%d') + AND date_format(u.create_time,'%Y%m%d') <= date_format(#{params.endTime},'%Y%m%d') AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) )) @@ -120,6 +123,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ${params.dataScope} + + +