From 070dd3ec9ad599e9c668351ce3d0bd78b54f9745 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 12 三月 2026 15:10:33 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/system/controller/RoleController.java | 12 +-
src/main/java/com/zy/system/controller/PermissionController.java | 12 +-
src/main/java/com/zy/system/controller/UserController.java | 12 +-
src/main/webapp/views/wrkMast/wrkMast.html | 6 +
src/main/java/com/zy/system/controller/UserLoginController.java | 12 +-
src/main/java/com/zy/common/web/BaseController.java | 25 +++++-
src/main/java/com/zy/system/controller/ResourceController.java | 12 +-
src/main/webapp/static/js/wrkMast/wrkMast.js | 8 ++
src/main/java/com/zy/system/controller/HostController.java | 12 +-
src/main/java/com/zy/system/controller/ConfigController.java | 12 +-
src/main/java/com/zy/system/controller/OperateLogController.java | 12 +-
src/main/webapp/views/user/user.html | 14 ++
src/main/webapp/static/js/config/config.js | 52 +++++++++++++
src/main/java/com/zy/system/controller/ApiController.java | 12 +-
14 files changed, 158 insertions(+), 55 deletions(-)
diff --git a/src/main/java/com/zy/common/web/BaseController.java b/src/main/java/com/zy/common/web/BaseController.java
index 6a18a1f..31ec0c9 100644
--- a/src/main/java/com/zy/common/web/BaseController.java
+++ b/src/main/java/com/zy/common/web/BaseController.java
@@ -1,5 +1,6 @@
package com.zy.common.web;
+import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.core.common.BaseRes;
@@ -69,12 +70,9 @@
|| Modifier.isTransient(field.getModifiers())){
continue;
}
- String column = null;
- if (field.isAnnotationPresent(TableField.class)) {
- column = field.getAnnotation(TableField.class).value();
- }
+ String column = resolveColumn(field);
if (Cools.isEmpty(column)) {
- column = field.getName();
+ continue;
}
if (!set.contains(column) && !set.contains(field.getName())) {
columns.add(column);
@@ -92,4 +90,21 @@
}
});
}
+
+ private String resolveColumn(Field field) {
+ String column = null;
+ if (field.isAnnotationPresent(TableField.class)) {
+ TableField tableField = field.getAnnotation(TableField.class);
+ if (!tableField.exist()) {
+ return null;
+ }
+ column = tableField.value();
+ } else if (field.isAnnotationPresent(TableId.class)) {
+ column = field.getAnnotation(TableId.class).value();
+ }
+ if (Cools.isEmpty(column)) {
+ column = humpToLine(field.getName());
+ }
+ return column;
+ }
}
diff --git a/src/main/java/com/zy/system/controller/ApiController.java b/src/main/java/com/zy/system/controller/ApiController.java
index 5a1c7c3..8dd6e16 100644
--- a/src/main/java/com/zy/system/controller/ApiController.java
+++ b/src/main/java/com/zy/system/controller/ApiController.java
@@ -43,12 +43,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/ConfigController.java b/src/main/java/com/zy/system/controller/ConfigController.java
index 8eb9f90..8051546 100644
--- a/src/main/java/com/zy/system/controller/ConfigController.java
+++ b/src/main/java/com/zy/system/controller/ConfigController.java
@@ -70,12 +70,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/HostController.java b/src/main/java/com/zy/system/controller/HostController.java
index c250ac8..930ca35 100644
--- a/src/main/java/com/zy/system/controller/HostController.java
+++ b/src/main/java/com/zy/system/controller/HostController.java
@@ -43,12 +43,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/OperateLogController.java b/src/main/java/com/zy/system/controller/OperateLogController.java
index f84d857..a8d7f81 100644
--- a/src/main/java/com/zy/system/controller/OperateLogController.java
+++ b/src/main/java/com/zy/system/controller/OperateLogController.java
@@ -43,12 +43,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/PermissionController.java b/src/main/java/com/zy/system/controller/PermissionController.java
index 774bf3f..ea58040 100644
--- a/src/main/java/com/zy/system/controller/PermissionController.java
+++ b/src/main/java/com/zy/system/controller/PermissionController.java
@@ -43,12 +43,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/ResourceController.java b/src/main/java/com/zy/system/controller/ResourceController.java
index 65cc871..f5a36c6 100644
--- a/src/main/java/com/zy/system/controller/ResourceController.java
+++ b/src/main/java/com/zy/system/controller/ResourceController.java
@@ -46,12 +46,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.eq(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.eq(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/RoleController.java b/src/main/java/com/zy/system/controller/RoleController.java
index e2d95ce..a4678ea 100644
--- a/src/main/java/com/zy/system/controller/RoleController.java
+++ b/src/main/java/com/zy/system/controller/RoleController.java
@@ -63,12 +63,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/UserController.java b/src/main/java/com/zy/system/controller/UserController.java
index b7fefb9..ccb1312 100644
--- a/src/main/java/com/zy/system/controller/UserController.java
+++ b/src/main/java/com/zy/system/controller/UserController.java
@@ -80,12 +80,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/java/com/zy/system/controller/UserLoginController.java b/src/main/java/com/zy/system/controller/UserLoginController.java
index 833795b..ac7daf6 100644
--- a/src/main/java/com/zy/system/controller/UserLoginController.java
+++ b/src/main/java/com/zy/system/controller/UserLoginController.java
@@ -43,12 +43,14 @@
private void convert(Map<String, Object> map, QueryWrapper wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
- if (entry.getKey().endsWith(">")) {
- wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
- } else if (entry.getKey().endsWith("<")) {
- wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
+ String val = String.valueOf(entry.getValue());
+ String column = humpToLine(entry.getKey());
+ if (val.contains(" - ")) {
+ String[] dates = val.split(" - ");
+ wrapper.ge(column, DateUtils.convert(dates[0]));
+ wrapper.le(column, DateUtils.convert(dates[1]));
} else {
- wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ wrapper.like(column, val);
}
}
}
diff --git a/src/main/webapp/static/js/config/config.js b/src/main/webapp/static/js/config/config.js
index a3e61fe..55aedab 100644
--- a/src/main/webapp/static/js/config/config.js
+++ b/src/main/webapp/static/js/config/config.js
@@ -998,6 +998,37 @@
}
];
+ function applySelectTypeOptions(options) {
+ var normalizedOptions = [];
+ (options || []).forEach(function (item) {
+ var rawValue = '';
+ var label = '';
+ if (item && typeof item === 'object') {
+ rawValue = item.value !== undefined ? item.value : (item.rawValue !== undefined ? item.rawValue : (item.label !== undefined ? item.label : ''));
+ label = item.label !== undefined ? item.label : rawValue;
+ } else {
+ rawValue = item;
+ label = item;
+ }
+ rawValue = isEmptyValue(rawValue) ? '' : String(rawValue);
+ label = isEmptyValue(label) ? rawValue : String(label);
+ if (!rawValue) {
+ return;
+ }
+ normalizedOptions.push({
+ rawValue: rawValue,
+ label: label
+ });
+ });
+ fieldMeta.forEach(function (field) {
+ if (field.field !== 'selectType') {
+ return;
+ }
+ field.kind = 'enum';
+ field.enumOptions = normalizedOptions;
+ });
+ }
+
function isEmptyValue(value) {
return value === null || value === undefined || value === '';
}
@@ -1436,6 +1467,7 @@
}
},
created: function () {
+ this.fetchSelectTypeOptions();
this.loadTable();
},
mounted: function () {
@@ -1583,6 +1615,26 @@
}
});
},
+ fetchSelectTypeOptions: function () {
+ var self = this;
+ $.ajax({
+ url: baseUrl + '/config/getSelectTypes',
+ method: 'POST',
+ headers: self.authHeaders(),
+ success: function (res) {
+ if (self.handleForbidden(res)) {
+ return;
+ }
+ if (!res || res.code !== 200) {
+ return;
+ }
+ applySelectTypeOptions(Array.isArray(res.data) ? res.data : []);
+ self.fieldMeta = fieldMeta.slice();
+ self.allColumns = fieldMeta.slice();
+ self.requestTableLayout(80);
+ }
+ });
+ },
handleSearch: function () {
this.page.curr = 1;
this.loadTable();
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index daa4b2b..31007e4 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -100,6 +100,14 @@
}
},
methods: {
+ displayCellValue: function (row, column) {
+ var value;
+ if (!row || !column) {
+ return "";
+ }
+ value = row[column.prop];
+ return value === null || value === undefined || value === "" ? "" : value;
+ },
buildQueryParams: function () {
var data = {
curr: this.currentPage,
diff --git a/src/main/webapp/views/user/user.html b/src/main/webapp/views/user/user.html
index 39d872b..3017a7f 100644
--- a/src/main/webapp/views/user/user.html
+++ b/src/main/webapp/views/user/user.html
@@ -115,6 +115,16 @@
line-height: 34px;
}
+ .search-form .el-button {
+ display: inline-flex;
+ align-items: center;
+ justify-content: center;
+ }
+
+ .search-form .el-button [class^="el-icon"] {
+ line-height: 1;
+ }
+
.table-wrap {
padding: 12px 18px 16px;
}
@@ -285,15 +295,13 @@
</el-tag>
</template>
</el-table-column>
- <el-table-column label="鐘舵��" width="130" align="center">
+ <el-table-column label="鐘舵��" width="88" align="center">
<template slot-scope="scope">
<div class="status-switch">
<el-switch
v-model="scope.row.status"
:active-value="1"
:inactive-value="0"
- active-text="姝ｅ父"
- inactive-text="绂佺敤"
@change="toggleStatus(scope.row)">
</el-switch>
</div>
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index dcd8808..979e39f 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -377,8 +377,10 @@
:sortable="column.sortable ? 'custom' : false"
:show-overflow-tooltip="column.showOverflow !== false"
:align="column.align || 'left'">
- <template v-if="column.key === 'systemMsg'" slot-scope="scope">
- <span class="payload-cell">{{ scope.row.systemMsg || '--' }}</span>
+ <template slot-scope="scope">
+ <span :class="column.key === 'systemMsg' ? 'payload-cell' : ''">
+ {{ displayCellValue(scope.row, column) }}
+ </span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" fixed="right" width="100" align="center">
--
Gitblit v1.9.1