From a65d33716f794633eb9126c520979faac373281c Mon Sep 17 00:00:00 2001
From: Odboy <tianjun@odboy.cn>
Date: Thu, 15 May 2025 19:57:36 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=A8=A1=E5=9D=97=E4=BB=A3=E7=A0=81=E7=BB=93=E6=9E=84?=
 =?UTF-8?q?=E5=92=8C=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 MyMetaObjectHandler 中的时间处理方式，使用 Date 类型替代 Timestamp
- 新增 AnyQueryTool 工具类，提供通用的 MyBatis Plus 查询方法
- 优化 YamlEdit 组件，增加只读模式和默认高度设置
-修复 CuteDeptTree 组件中的数据获取方法名称
- 调整系统菜单组件中的输入框宽度
---
 .../src/components/YamlEdit/index.vue         | 38 ++++-------
 .../components/business/CuteDeptTree.vue      |  4 +-
 .../src/views/system/menu/index.vue           |  4 +-
 .../context/MyMetaObjectHandler.java          |  9 +--
 .../mybatisplus/util/AnyQueryTool.java        | 67 +++++++++++++++++++
 5 files changed, 90 insertions(+), 32 deletions(-)
 create mode 100644 cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/AnyQueryTool.java

diff --git a/cutejava-front/src/components/YamlEdit/index.vue b/cutejava-front/src/components/YamlEdit/index.vue
index 83778f48..a58a2730 100644
--- a/cutejava-front/src/components/YamlEdit/index.vue
+++ b/cutejava-front/src/components/YamlEdit/index.vue
@@ -1,7 +1,5 @@
 <template>
-  <div class="json-editor">
-    <textarea ref="textarea" />
-  </div>
+  <textarea ref="textarea" />
 </template>
 
 <script>
@@ -18,7 +16,13 @@ export default {
     },
     height: {
       type: String,
-      required: true
+      required: false,
+      default: '450px'
+    },
+    readOnly: {
+      type: Boolean,
+      required: false,
+      default: false
     }
   },
   data() {
@@ -33,8 +37,8 @@ export default {
         this.editor.setValue(this.value)
       }
     },
-    height(value) {
-      this.editor.setSize('auto', this.height)
+    height(newHeight) {
+      this.editor.setSize('auto', newHeight)
     }
   },
   mounted() {
@@ -49,7 +53,10 @@ export default {
       theme: 'idea'
     })
     this.editor.setSize('auto', this.height)
-    this.editor.setValue(this.value)
+    if (this.value) {
+      this.editor.setValue(this.value)
+    }
+    this.editor.setOption('readOnly', this.readOnly)
     this.editor.on('change', cm => {
       this.$emit('changed', cm.getValue())
       this.$emit('input', cm.getValue())
@@ -62,20 +69,3 @@ export default {
   }
 }
 </script>
-
-<style scoped>
-  .json-editor{
-    height: 100%;
-    margin-bottom: 10px;
-  }
-  .json-editor >>> .CodeMirror {
-    font-size: 13px;
-    overflow-y:auto;
-    font-weight:normal
-  }
-  .json-editor >>> .CodeMirror-scroll{
-  }
-  .json-editor >>> .cm-s-rubyblue span.cm-string {
-    color: #F08047;
-  }
-</style>
diff --git a/cutejava-front/src/views/components/business/CuteDeptTree.vue b/cutejava-front/src/views/components/business/CuteDeptTree.vue
index 56db9166..02a35af0 100644
--- a/cutejava-front/src/views/components/business/CuteDeptTree.vue
+++ b/cutejava-front/src/views/components/business/CuteDeptTree.vue
@@ -8,7 +8,7 @@
         placeholder="输入部门名称搜索"
         prefix-icon="el-icon-search"
         class="filter-item"
-        @input="getDeptDatas"
+        @input="getDeptData"
       />
     </div>
     <el-tree
@@ -64,7 +64,7 @@ export default {
           if (resolve) {
             resolve(res.content)
           } else {
-            this.deptDatas = res.content
+            this.deptData = res.content
           }
         })
       }, 100)
diff --git a/cutejava-front/src/views/system/menu/index.vue b/cutejava-front/src/views/system/menu/index.vue
index d4604487..6158c1cf 100644
--- a/cutejava-front/src/views/system/menu/index.vue
+++ b/cutejava-front/src/views/system/menu/index.vue
@@ -68,10 +68,10 @@
           <el-input-number v-model.number="form.menuSort" :min="0" :max="999" controls-position="right" style="width: 178px;" />
         </el-form-item>
         <el-form-item v-show="form.iFrame.toString() !== 'true' && form.type.toString() === '1'" label="组件名称" prop="componentName">
-          <el-input v-model="form.componentName" style="width: 178px;" placeholder="匹配组件内Name字段" />
+          <el-input v-model="form.componentName" style="width: 450px;" placeholder="匹配组件内Name字段" />
         </el-form-item>
         <el-form-item v-show="form.iFrame.toString() !== 'true' && form.type.toString() === '1'" label="组件路径" prop="component">
-          <el-input v-model="form.component" style="width: 178px;" placeholder="组件路径" />
+          <el-input v-model="form.component" style="width: 450px;" placeholder="组件路径" />
         </el-form-item>
         <el-form-item label="上级类目" prop="pid">
           <treeselect
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/MyMetaObjectHandler.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/MyMetaObjectHandler.java
index ed4fe001..201a5e25 100644
--- a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/MyMetaObjectHandler.java
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/context/MyMetaObjectHandler.java
@@ -5,16 +5,17 @@ import cn.odboy.core.framework.permission.util.SecurityHelper;
 import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
 import org.apache.ibatis.reflection.MetaObject;
 import org.springframework.stereotype.Component;
-import java.sql.Timestamp;
+import java.util.Date;
 
 @Component
 public class MyMetaObjectHandler implements MetaObjectHandler {
 
     @Override
     public void insertFill(MetaObject metaObject) {
+        DateTime now = DateTime.now();
         /* 创建时间 */
-        this.strictInsertFill(metaObject, "createTime", Timestamp.class, DateTime.now().toTimestamp());
-        this.strictInsertFill(metaObject, "updateTime", Timestamp.class, DateTime.now().toTimestamp());
+        this.strictInsertFill(metaObject, "createTime", Date.class, now);
+        this.strictInsertFill(metaObject, "updateTime", Date.class, now);
         /* 操作人 */
         String username = "System";
         try {
@@ -28,7 +29,7 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
     @Override
     public void updateFill(MetaObject metaObject) {
         /* 更新时间 */
-        this.strictUpdateFill(metaObject, "updateTime", Timestamp.class, DateTime.now().toTimestamp());
+        this.strictUpdateFill(metaObject, "updateTime", Date.class, DateTime.now());
         /* 操作人 */
         String username = "System";
         try {
diff --git a/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/AnyQueryTool.java b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/AnyQueryTool.java
new file mode 100644
index 00000000..90bc9d90
--- /dev/null
+++ b/cutejava/cutejava-system/src/main/java/cn/odboy/core/framework/mybatisplus/util/AnyQueryTool.java
@@ -0,0 +1,67 @@
+package cn.odboy.core.framework.mybatisplus.util;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.springframework.stereotype.Component;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 自定义任意对象查询工具
+ *
+ * @author odboy
+ * @date 2025-05-15
+ */
+@Component
+public class AnyQueryTool {
+    public <T> T selectOne(BaseMapper<T> baseMapper, Object queryParams) {
+        QueryWrapper<T> queryWrapper = MybatisHelper.build(queryParams);
+        return baseMapper.selectOne(queryWrapper);
+    }
+
+    public <T, M> M selectOne(BaseMapper<T> baseMapper, Object queryParams, Class<M> mapperClazz) {
+        QueryWrapper<T> queryWrapper = MybatisHelper.build(queryParams);
+        T mapperTarget = baseMapper.selectOne(queryWrapper);
+        if (mapperTarget == null) {
+            return null;
+        }
+        return BeanUtil.copyProperties(mapperTarget, mapperClazz);
+    }
+
+    public <T> List<T> selectList(BaseMapper<T> baseMapper, Object queryParams) {
+        QueryWrapper<T> queryWrapper = MybatisHelper.build(queryParams);
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    public <T, M> List<M> selectList(BaseMapper<T> baseMapper, Object queryParams, Class<M> mapperClazz) {
+        QueryWrapper<T> queryWrapper = MybatisHelper.build(queryParams);
+        List<T> mapperTarget = baseMapper.selectList(queryWrapper);
+        if (mapperTarget == null) {
+            return new ArrayList<>();
+        }
+        return BeanUtil.copyToList(mapperTarget, mapperClazz);
+    }
+
+    public <T> Long selectCount(BaseMapper<T> baseMapper, Object queryParams) {
+        QueryWrapper<T> queryWrapper = MybatisHelper.build(queryParams);
+        return baseMapper.selectCount(queryWrapper);
+    }
+
+    public <T> Page<T> selectPage(BaseMapper<T> baseMapper, Page<T> page, Object queryParams) {
+        QueryWrapper<T> queryWrapper = MybatisHelper.build(queryParams);
+        return baseMapper.selectPage(page, queryWrapper);
+    }
+
+    public <T, M> Page<M> selectPage(BaseMapper<T> baseMapper, Page<T> page, Object queryParams, Class<M> mapperClazz) {
+        QueryWrapper<T> queryWrapper = MybatisHelper.build(queryParams);
+        Page<T> tPage = baseMapper.selectPage(page, queryWrapper);
+        Page<M> mapperTarget = new Page<>();
+        mapperTarget.setRecords(BeanUtil.copyToList(tPage.getRecords(), mapperClazz));
+        mapperTarget.setTotal(tPage.getTotal());
+        mapperTarget.setSize(tPage.getSize());
+        mapperTarget.setCurrent(tPage.getCurrent());
+        return mapperTarget;
+    }
+}