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 44c8e144aaa5e94f0291cdddad2a200ac86f05b8..f2f7cba94bdabaa5e80d5c49bef5dfd22f0a73ca 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;
@@ -81,4 +84,22 @@ public class SysOperlogController extends BaseController
         operLogService.cleanOperLog();
         return success();
     }
+
+    @Operation(summary = "业务监控")
+    @GetMapping("/business")
+    public R<Map<String, Object>> business(SysOperLog operLog) {
+        // 查询并获取统计数据
+        List<Map<String, Object>> successStats = operLogService.getSuccessOperationStats(operLog);
+        List<Map<String, Object>> failureStats = operLogService.getFailureOperationStats(operLog);
+        List<Map<String, Object>> statusStats = operLogService.getStatusStats(operLog);
+        List<Map<String, Object>> moduleOperationStats = operLogService.getModuleOperationStats(operLog);
+        // 创建一个新的 Map 来组织数据
+        Map<String, Object> 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/pom.xml b/ruoyi-system/pom.xml
index 9bba1f9d029ec479601c370adc90864b601c7a68..ba05c64bc7693564db7fa81a705155975066f7a7 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -10,6 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>ruoyi-system</artifactId>
+    <packaging>jar</packaging>  <!-- 添加打包类型声明 -->
 
     <description>
         system系统模块
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 0000000000000000000000000000000000000000..2bf6b0c67a5a388b6e6ed7c3cc33a267473b0d6b
--- /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 57112db04a9d2906dfd06216d1237e3ec66899d0..b853ac364a50db7fe610682a3ee62aadf9488ac1 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 2ae6457f78ccc9f960f398342dda1714192641ac..a0fa86272be2799c40bc3b808787000699394902 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<Map<String, Object>> getSuccessOperationStats(SysOperLog operLog);
+
+    /**
+     * 获取失败操作的统计信息
+     */
+    List<Map<String, Object>> getFailureOperationStats(SysOperLog operLog);
+
+    /**
+     * 获取按状态分类的操作统计信息
+     */
+    List<Map<String, Object>> getStatusStats(SysOperLog operLog);
+
+    /**
+     * 获取按模块和操作类型分类的操作统计信息
+     */
+    List<Map<String, Object>> 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 0000000000000000000000000000000000000000..d376a0b8f545ecfd7542c47e7c2b43d93d94a8ff
--- /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<SysScript> 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 776dbafafad1b6f99a275fb30c6fac79454d71ea..e84dbed562efac7cec4d5bbe2a6d17b08dfd960c 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
@@ -142,3 +142,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 4fd8e5a851cbfe51b6536bb9e90068223f382bdc..686abc8f6f60ebccc189e55d8faa515460f766d4 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<Map<String, Object>> getSuccessOperationStats(SysOperLog operLog);
+
+    /**
+     * 获取失败操作的统计信息
+     */
+    List<Map<String, Object>> getFailureOperationStats(SysOperLog operLog);
+
+    /**
+     * 获取按状态分类的操作统计信息
+     */
+    List<Map<String, Object>> getStatusStats(SysOperLog operLog);
+
+    /**
+     * 获取按模块和操作类型分类的操作统计信息
+     */
+    List<Map<String, Object>> 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 0000000000000000000000000000000000000000..822c960e747d0e5e414f1bc65205ecadcfacfd8b
--- /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<SysScript> 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 853620953d77d5e59e2e6cd41c570808cb58470e..a3cef83c9b9b3b8fefd4d263aeac30b0179a021d 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
@@ -106,6 +106,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 d3fd7fe36c6bf96dd73151a402445b630bf88388..805757b04d89e5f3c8a1497ae4c3160eaa1ab655 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,11 @@ 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.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 +19,8 @@ import com.ruoyi.system.mapper.SysDictDataMapper;
 import com.ruoyi.system.mapper.SysDictTypeMapper;
 import com.ruoyi.system.service.ISysDictTypeService;
 
+import jakarta.annotation.PostConstruct;
+
 /**
  * 字典 业务层处理
  * 
@@ -177,7 +180,7 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
         int row = dictTypeMapper.insertDictType(dict);
         if (row > 0)
         {
-            DictUtils.setDictCache(dict.getDictType(), null);
+            DictUtils.removeDictCache(dict.getDictType());
         }
         return row;
     }
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 54898152e3dc4557121e3b1044f662853f9ea701..748924240999368332d056fd8c071657daaedfc5 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<Map<String, Object>> getSuccessOperationStats(SysOperLog operLog) {
+        return operLogMapper.getSuccessOperationStats(operLog);
+    }
+
+    @Override
+    public List<Map<String, Object>> getFailureOperationStats(SysOperLog operLog) {
+        return operLogMapper.getFailureOperationStats(operLog);
+    }
+
+    @Override
+    public List<Map<String, Object>> getStatusStats(SysOperLog operLog) {
+        return operLogMapper.getStatusStats(operLog);
+    }
+
+    @Override
+    public List<Map<String, Object>> 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 0000000000000000000000000000000000000000..0d4ce46338489e96bdb95505b234b57ad2ca5f6b
--- /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<SysScript> 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 f3ecf44c2609d4b746ba333bce6037a353bf77d1..d776ec6c4efac37c0a8ff294ef44ed4de86584b8 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
@@ -214,12 +214,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 +528,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 7ab9fef3aa60dfab872807c32ec0ba1f4ea45473..dfae11519a71c1589253af7c16b74a633d202712 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}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 		</where>
     </select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictTypeMapper.xml
index a608c06a052c9580108b65482dbae5de27bce845..7b1407d24461260e1579293fa171844d731402f2 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}, '%')
 			</if>
 			<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+				and date_format(create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 			</if>
 			<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-				and date_format(create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+				and date_format(create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 			</if>
 	    </where>
 	</select>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
index a13cd80e02665755d706314914e63a86e68a1454..84e87c9173b400c3dc2ad1de3744ec501c4eb402 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 @@
 	</resultMap>
 
 	<sql id="selectMenuVo">
-        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
     </sql>
     
@@ -50,13 +50,13 @@
 	</select>
 	
 	<select id="selectMenuTreeAll" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, m.visible, m.status, COALESCE(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
-		from sys_menu m where m.menu_type in ('M', 'C') and m.status = '0'
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 	
 	<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, m.visible, m.status, COALESCE(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		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
@@ -75,13 +75,13 @@
 	</select>
     
     <select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
-		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.route_name, m.visible, m.status, COALESCE(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
+		select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.route_name, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
 		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
 			 left join sys_role ro on ur.role_id = ro.role_id
 			 left join sys_user u on ur.user_id = u.user_id
-		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = '0'  AND ro.status = 0
+		where u.user_id = #{userId} and m.menu_type in ('M', 'C') and m.status = 0  AND ro.status = 0
 		order by m.parent_id, m.order_num
 	</select>
 	
@@ -141,7 +141,7 @@
 			<if test="orderNum != null">order_num = #{orderNum},</if>
 			<if test="path != null and path != ''">path = #{path},</if>
 			<if test="component != null">component = #{component},</if>
-			<if test="query != null">query = #{query},</if>
+			<if test="query != null">`query` = #{query},</if>
 			<if test="routeName != null">route_name = #{routeName},</if>
 			<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
 			<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
@@ -165,7 +165,7 @@
 		<if test="orderNum != null">order_num,</if>
 		<if test="path != null and path != ''">path,</if>
 		<if test="component != null and component != ''">component,</if>
-		<if test="query != null and query != ''">query,</if>
+		<if test="query != null and query != ''">`query`,</if>
 		<if test="routeName != null">route_name,</if>
 		<if test="isFrame != null and isFrame != ''">is_frame,</if>
 		<if test="isCache != null and isCache != ''">is_cache,</if>
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysOperLogMapper.xml
index 96bc6218aeeb8eac44a9eb92c481dda71834307b..a4f3922aad1e7a3726ea8c038ce29f9ab1b820f6 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"
 			<if test="businessType != null">
 				AND business_type = #{businessType}
 			</if>
+			<if test="requestMethod != null">
+				AND request_method = #{requestMethod}
+			</if>
 			<if test="businessTypes != null and businessTypes.length > 0">
 			    AND business_type in
 			    <foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
@@ -81,4 +84,74 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         truncate table sys_oper_log
     </update>
 
+	<!-- 公共操作日志查询条件 -->
+	<sql id="commonOperLogConditions">
+		<if test="title != null and title != ''">
+			AND title like concat('%', #{title}, '%')
+		</if>
+		<if test="businessType != null">
+			AND business_type = #{businessType}
+		</if>
+		<if test="requestMethod != null">
+			AND request_method = #{requestMethod}
+		</if>
+		<if test="businessTypes != null and businessTypes.length > 0">
+			AND business_type in
+			<foreach collection="businessTypes" item="businessType" open="(" separator="," close=")">
+				#{businessType}
+			</foreach> 
+		</if>
+		<if test="status != null">
+			AND status = #{status}
+		</if>
+		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
+			AND oper_time &gt;= #{params.beginTime}
+		</if>
+		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
+			AND oper_time &lt;= #{params.endTime}
+		</if>
+	</sql>
+
+	<!-- 成功操作统计 -->
+	<select id="getSuccessOperationStats" parameterType="SysOperLog" resultType="java.util.LinkedHashMap">
+		SELECT title,  COUNT(*) AS success_count FROM sys_oper_log
+			<where>
+            status = 0
+       			 <include refid="commonOperLogConditions"/>
+			</where>
+			GROUP BY title
+			ORDER BY success_count DESC
+	</select>
+
+	<!-- 失败操作统计 -->
+	<select id="getFailureOperationStats" parameterType="SysOperLog" resultType="java.util.LinkedHashMap">
+		SELECT title, COUNT(*) AS failure_count FROM sys_oper_log
+		<where>
+			status = 1
+			<include refid="commonOperLogConditions"/>
+		</where>
+		GROUP BY title
+		ORDER BY failure_count DESC
+	</select>
+	<!-- 按状态分类统计 -->
+	<select id="getStatusStats" parameterType="SysOperLog" resultType="java.util.LinkedHashMap">
+		SELECT CASE status WHEN 0 THEN '成功' WHEN 1 THEN '失败' ELSE '未知' END AS status_desc, COUNT(*) AS status_count FROM sys_oper_log
+		<where>
+			<include refid="commonOperLogConditions"/>
+		</where>
+		GROUP BY status
+	</select>
+
+	<!-- 模块和操作类型分类统计 -->
+	<select id="getModuleOperationStats" parameterType="SysOperLog" resultType="java.util.LinkedHashMap">
+		SELECT title, 
+			business_type,
+			COUNT(CASE WHEN status = 0 THEN 1 END) AS success_count,
+			COUNT(CASE WHEN status = 1 THEN 1 END) AS failure_count
+		FROM sys_oper_log
+		<where>
+			<include refid="commonOperLogConditions"/>
+		</where>
+		GROUP BY title, business_type
+	</select>
 </mapper> 
\ 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 9f27439e5ecccf85b38705cd04f05e13658e758b..6fd135eea0ee5a1c22a552467ebb3cc3b2f75af6 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}, '%')
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
-			and date_format(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+			and date_format(r.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
-			and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			and date_format(r.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
 		<!-- 数据范围过滤 -->
 		${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 0000000000000000000000000000000000000000..081f984f4b04a3d066b29e81db7f29094c10f3d8
--- /dev/null
+++ b/ruoyi-system/src/main/resources/mapper/system/SysScriptMapper.xml
@@ -0,0 +1,80 @@
+<?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.system.mapper.SysScriptMapper">
+    
+    <resultMap type="SysScript" id="SysScriptResult">
+        <result property="scriptId"    column="script_id"    />
+        <result property="scriptTitle"    column="script_title"    />
+        <result property="content"    column="content"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectSysScriptVo">
+        select script_id, script_title, create_by, create_time, update_by, update_time, remark from sys_script
+    </sql>
+
+    <select id="selectSysScriptList" parameterType="SysScript" resultMap="SysScriptResult">
+        <include refid="selectSysScriptVo"/>
+        <where>  
+            <if test="scriptTitle != null  and scriptTitle != ''"> and script_title like concat('%', #{scriptTitle}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectSysScriptByScriptId" parameterType="Long" resultMap="SysScriptResult">
+        select script_id, script_title, content, create_by, create_time, update_by, update_time, remark from sys_script
+        where sys_script.script_id = #{scriptId}
+    </select>
+        
+    <insert id="insertSysScript" parameterType="SysScript" useGeneratedKeys="true" keyProperty="scriptId">
+        insert into sys_script
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="scriptTitle != null and scriptTitle != ''">script_title,</if>
+            <if test="content != null and content != ''">content,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="scriptTitle != null and scriptTitle != ''">#{scriptTitle},</if>
+            <if test="content != null and content != ''">#{content},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateSysScript" parameterType="SysScript">
+        update sys_script
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="scriptTitle != null and scriptTitle != ''">script_title = #{scriptTitle},</if>
+            <if test="content != null and content != ''">content = #{content},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where sys_script.script_id = #{scriptId}
+    </update>
+
+    <delete id="deleteSysScriptByScriptId" parameterType="Long">
+        delete from sys_script where script_id = #{scriptId}
+    </delete>
+
+    <delete id="deleteSysScriptByScriptIds" parameterType="String">
+        delete from sys_script where script_id in 
+        <foreach item="scriptId" collection="array" open="(" separator="," close=")">
+            #{scriptId}
+        </foreach>
+    </delete>
+</mapper>
\ 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 b4c3219da49a94016681796b06f89467c0c00bc6..0b46c6c50dcf5ceff2d6032f5b7a70b95523605e 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"
 		<if test="userId != null and userId != 0">
 			AND u.user_id = #{userId}
 		</if>
+		<if test="nickName != null and nickName != ''">
+			AND u.nick_name like concat('%', #{nickName}, '%')
+		</if>
 		<if test="userName != null and userName != ''">
 			AND u.user_name like concat('%', #{userName}, '%')
 		</if>
@@ -73,10 +76,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 			AND u.phonenumber like concat('%', #{phonenumber}, '%')
 		</if>
 		<if test="params.beginTime != null and params.beginTime != ''">			<!-- 开始时间检索 -->
-			AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
+			AND date_format(u.create_time,'%y%m%d') &gt;= date_format(#{params.beginTime},'%y%m%d')
 		</if>
 		<if test="params.endTime != null and params.endTime != ''">			<!-- 结束时间检索 -->
-			AND date_format(u.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
+			AND date_format(u.create_time,'%Y%m%d') &lt;= date_format(#{params.endTime},'%Y%m%d')
 		</if>
 		<if test="deptId != null and deptId != 0">
 			AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId}, ancestors) ))
@@ -119,7 +122,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 	</select>
-
+	
 	<select id="selectUserByUserName" parameterType="String" resultMap="SysUserResult">
 		<include refid="selectUserVo"/>
 		where u.user_name = #{userName} and u.del_flag = '0'