From 14ddde5c41d8d98fc9b67ebae72b6cdbca73330b Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期五, 25 四月 2025 20:45:10 +0800
Subject: [PATCH] 添加动态字段拦截器
---
/dev/null | 37 -------------------------------------
rsf-server/src/main/java/com/vincent/rsf/server/common/interceptor/DynamicFieldsInterceptor.java | 15 +++++++++++++++
2 files changed, 15 insertions(+), 37 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/common/interceptor/DynamicFieldsInterceptor.java b/rsf-server/src/main/java/com/vincent/rsf/server/common/interceptor/DynamicFieldsInterceptor.java
index 4f29efb..16c8113 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/common/interceptor/DynamicFieldsInterceptor.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/common/interceptor/DynamicFieldsInterceptor.java
@@ -1,11 +1,18 @@
package com.vincent.rsf.server.common.interceptor;
+import com.vincent.rsf.framework.common.SpringUtils;
+import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.system.entity.Fields;
+import com.vincent.rsf.server.system.service.FieldsService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* @author Ryan
@@ -19,6 +26,14 @@
@Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+ List<Fields> fields = FieldsUtils.getFieldsSta();
+ List<String> fieldsKey = fields.stream().filter(item -> item.getFlagEnable() == 1).map(Fields::getFields).collect(Collectors.toList());
+ fieldsKey.forEach(key -> {
+ if (request.getParameterMap().keySet().contains(key)) {
+ request.setAttribute(key, request.getParameterMap().get(key));
+ }
+ })
+
return HandlerInterceptor.super.preHandle(request, response, handler);
}
diff --git a/rsf-server/src/main/java/delivery.sql b/rsf-server/src/main/java/delivery.sql
deleted file mode 100644
index 1a2bd16..0000000
--- a/rsf-server/src/main/java/delivery.sql
+++ /dev/null
@@ -1,32 +0,0 @@
--- save delivery record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.delivery', '0', '/manager/delivery', 'delivery', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:delivery:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:delivery:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:delivery:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:delivery:remove', '3', '1', '1');
-
--- locale menu name
-delivery: 'Delivery',
-
--- locale field
-delivery: {
- code: "code",
- platId: "platId",
- type: "type",
- wkType: "wkType",
- source: "source",
- anfme: "anfme",
- qty: "qty",
- workQty: "workQty",
- platCode: "platCode",
- startTime: "startTime",
- endTime: "endTime",
-},
-
--- ResourceContent
-import delivery from './delivery';
-
-case 'delivery':
- return delivery;
diff --git a/rsf-server/src/main/java/deliveryItem.sql b/rsf-server/src/main/java/deliveryItem.sql
deleted file mode 100644
index 7c68f7f..0000000
--- a/rsf-server/src/main/java/deliveryItem.sql
+++ /dev/null
@@ -1,34 +0,0 @@
--- save deliveryItem record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.deliveryItem', '0', '/manager/deliveryItem', 'deliveryItem', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:deliveryItem:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:deliveryItem:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:deliveryItem:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 缁煎悎鍗曟嵁鏄庣粏', '', '1', 'manager:deliveryItem:remove', '3', '1', '1');
-
--- locale menu name
-deliveryItem: 'DeliveryItem',
-
--- locale field
-deliveryItem: {
- deliveryId: "deliveryId",
- platItemId: "platItemId",
- matnrCode: "matnrCode",
- matnrName: "matnrName",
- fieldsIndex: "fieldsIndex",
- unit: "unit",
- anfme: "anfme",
- qty: "qty",
- nromQty: "nromQty",
- printQty: "printQty",
- splrName: "splrName",
- splrCode: "splrCode",
- splrBatch: "splrBatch",
-},
-
--- ResourceContent
-import deliveryItem from './deliveryItem';
-
-case 'deliveryItem':
- return deliveryItem;
diff --git a/rsf-server/src/main/java/deviceBind.sql b/rsf-server/src/main/java/deviceBind.sql
deleted file mode 100644
index 6ef331b..0000000
--- a/rsf-server/src/main/java/deviceBind.sql
+++ /dev/null
@@ -1,31 +0,0 @@
--- save deviceBind record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.deviceBind', '0', '/manager/deviceBind', 'deviceBind', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 绔嬩綋搴撶珯鐐圭粦瀹�', '', '1', 'manager:deviceBind:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 绔嬩綋搴撶珯鐐圭粦瀹�', '', '1', 'manager:deviceBind:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 绔嬩綋搴撶珯鐐圭粦瀹�', '', '1', 'manager:deviceBind:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 绔嬩綋搴撶珯鐐圭粦瀹�', '', '1', 'manager:deviceBind:remove', '3', '1', '1');
-
--- locale menu name
-deviceBind: 'DeviceBind',
-
--- locale field
-deviceBind: {
- currentRow: "currentRow",
- startRow: "startRow",
- endRow: "endRow",
- deviceQty: "deviceQty",
- startDeviceNo: "startDeviceNo",
- endDeviceNo: "endDeviceNo",
- staList: "staList",
- typeId: "typeId",
- beSimilar: "beSimilar",
- emptySimilar: "emptySimilar",
-},
-
--- ResourceContent
-import deviceBind from './deviceBind';
-
-case 'deviceBind':
- return deviceBind;
diff --git a/rsf-server/src/main/java/locItem.sql b/rsf-server/src/main/java/locItem.sql
deleted file mode 100644
index 68bef1f..0000000
--- a/rsf-server/src/main/java/locItem.sql
+++ /dev/null
@@ -1,37 +0,0 @@
--- save locItem record
--- mysql
-insert into `sys_menu` ( `name`, `parent_id`, `route`, `component`, `type`, `sort`, `tenant_id`, `status`) values ( 'menu.locItem', '0', '/manager/locItem', 'locItem', '0' , '0', '1' , '1');
-
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Query 搴撲綅鏄庣粏', '', '1', 'manager:locItem:list', '0', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Create 搴撲綅鏄庣粏', '', '1', 'manager:locItem:save', '1', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Update 搴撲綅鏄庣粏', '', '1', 'manager:locItem:update', '2', '1', '1');
-insert into `sys_menu` ( `name`, `parent_id`, `type`, `authority`, `sort`, `tenant_id`, `status`) values ( 'Delete 搴撲綅鏄庣粏', '', '1', 'manager:locItem:remove', '3', '1', '1');
-
--- locale menu name
-locItem: 'LocItem',
-
--- locale field
-locItem: {
- locId: "locId",
- orderId: "orderId",
- type: "type",
- orderItemId: "orderItemId",
- wkType: "wkType",
- matnrId: "matnrId",
- maktx: "maktx",
- matnrCode: "matnrCode",
- trackCode: "trackCode",
- unit: "unit",
- anfme: "anfme",
- batch: "batch",
- splrBatch: "splrBatch",
- spec: "spec",
- model: "model",
- fieldsIndex: "fieldsIndex",
-},
-
--- ResourceContent
-import locItem from './locItem';
-
-case 'locItem':
- return locItem;
--
Gitblit v1.9.1