From 4ea5caad9d1f58f3d206fb30cb419c0f025590c2 Mon Sep 17 00:00:00 2001
From: rqian <1206436827@qq.com>
Date: Mon, 20 Apr 2026 09:20:50 +0800
Subject: [PATCH] #update
---
.idea/workspace.xml | 739 ++----------------
.../src/main/resources/application.yml | 2 +-
.../com/maibu/config/ApplicationConfig.java | 2 +-
.../resources/mapper/iot/EventLogMapper.xml | 2 +-
.../resources/system/AppLanguageMapper.xml | 4 +-
.../resources/system/AppPreferencesMapper.xml | 4 +-
.../main/resources/system/SysClientMapper.xml | 2 +-
.../main/resources/system/SysConfigMapper.xml | 2 +-
.../main/resources/system/SysDeptMapper.xml | 2 +-
.../resources/system/SysDictDataMapper.xml | 441 ++++++-----
.../resources/system/SysDictTypeMapper.xml | 4 +-
.../resources/system/SysLogininforMapper.xml | 2 +-
.../main/resources/system/SysMenuMapper.xml | 4 +-
.../main/resources/system/SysNoticeMapper.xml | 2 +-
.../resources/system/SysOperLogMapper.xml | 2 +-
.../main/resources/system/SysPostMapper.xml | 2 +-
.../resources/system/SysRoleDeptMapper.xml | 2 +-
.../main/resources/system/SysRoleMapper.xml | 2 +-
.../resources/system/SysRoleMenuMapper.xml | 2 +-
.../resources/system/SysTranslateMapper.xml | 4 +-
.../resources/system/SysUserClientMapper.xml | 2 +-
.../main/resources/system/SysUserMapper.xml | 4 +-
.../resources/system/SysUserPostMapper.xml | 2 +-
.../resources/system/SysUserRoleMapper.xml | 2 +-
24 files changed, 346 insertions(+), 890 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1df6c13..9bba8c1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,645 +4,31 @@
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -664,36 +50,36 @@
- {
+ "keyToString": {
+ "ASKED_SHARE_PROJECT_CONFIGURATION_FILES": "true",
+ "Maven.MiddlePlatform [clean].executor": "Run",
+ "Maven.MiddlePlatform [install].executor": "Run",
+ "Maven.maibu-netty-server [clean].executor": "Run",
+ "ModuleVcsDetector.initialDetectionPerformed": "true",
+ "RequestMappingsPanelOrder0": "0",
+ "RequestMappingsPanelOrder1": "1",
+ "RequestMappingsPanelWidth0": "75",
+ "RequestMappingsPanelWidth1": "75",
+ "RunOnceActivity.MCP Project settings loaded": "true",
+ "RunOnceActivity.ShowReadmeOnStart": "true",
+ "RunOnceActivity.TerminalTabsStorage.copyFrom.TerminalArrangementManager.252": "true",
+ "RunOnceActivity.git.unshallow": "true",
+ "RunOnceActivity.typescript.service.memoryLimit.init": "true",
+ "Spring Boot.MiddlePlatformApplication.executor": "Debug",
+ "git-widget-placeholder": "main",
+ "kotlin-language-version-configured": "true",
+ "last_opened_file_path": "/home/maibu/Test/MiddlePlatform/maibu-service/maibu-iot-service/src/main/java/com/maibu/service/impl",
+ "node.js.detected.package.eslint": "true",
+ "node.js.detected.package.tslint": "true",
+ "node.js.selected.package.eslint": "(autodetect)",
+ "node.js.selected.package.tslint": "(autodetect)",
+ "nodejs_package_manager_path": "npm",
+ "onboarding.tips.debug.path": "D:/code/MiddlePlatform/maibu-service/maibu-system-service/src/main/java/com/maibu/Main.java",
+ "settings.editor.selected.configurable": "project.propVCSSupport.CommitDialog",
+ "vue.rearranger.settings.migration": "true"
}
-}]]>
+}
@@ -703,7 +89,7 @@
-
+
@@ -716,9 +102,9 @@
-
+
-
+
@@ -784,8 +170,18 @@
-
+
+
+
+
+ 1776417161587
+
+
+
+ 1776417161587
+
+
@@ -795,7 +191,8 @@
-
+
+
diff --git a/maibu-admin/src/main/resources/application.yml b/maibu-admin/src/main/resources/application.yml
index 3969893..a4fa367 100644
--- a/maibu-admin/src/main/resources/application.yml
+++ b/maibu-admin/src/main/resources/application.yml
@@ -115,7 +115,7 @@ token:
# mybatis-plus配置
mybatis-plus:
- typeAliasesPackage: com.fastbee.**.domain # 搜索指定包别名
+ typeAliasesPackage: com.maibu.**.domain # 搜索指定包别名
mapperLocations: classpath*:mapper/**/*Mapper.xml # 配置mapper的扫描,找到所有的mapper.xml映射文件
configLocation: classpath:mybatis/mybatis-config.xml # 加载全局的配置文件
global-config:
diff --git a/maibu-framework/src/main/java/com/maibu/config/ApplicationConfig.java b/maibu-framework/src/main/java/com/maibu/config/ApplicationConfig.java
index b3b1ee2..96e2d45 100644
--- a/maibu-framework/src/main/java/com/maibu/config/ApplicationConfig.java
+++ b/maibu-framework/src/main/java/com/maibu/config/ApplicationConfig.java
@@ -16,7 +16,7 @@ import org.springframework.context.annotation.EnableAspectJAutoProxy;
// 表示通过aop框架暴露该代理对象,AopContext能够访问
@EnableAspectJAutoProxy(exposeProxy = true)
// 指定要扫描的Mapper类的包的路径
-@MapperScan("com.fastbee.**.mapper")
+@MapperScan("com.maibu.**.mapper")
public class ApplicationConfig
{
/**
diff --git a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml
index 67c2498..b8ceb4b 100644
--- a/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml
+++ b/maibu-service/maibu-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-