添加解析表单参数数据

fill-manager/db/add.sql

@@ -11,35 +11,6 @@ ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `idCard` varchar(64) defau
 ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `idName` varchar(64) default ''     COMMENT '身份证名称' AFTER idCard;
 ALTER TABLE mortals_xhx_matter_datum_print ADD COLUMN `mobile` varchar(64) default ''     COMMENT '手机号码' AFTER idName;
 
-
-
--- ----------------------------
-2024-04-24
--- ----------------------------
-DROP TABLE IF EXISTS `mortals_xhx_datum_info_field`;
-CREATE TABLE `mortals_xhx_datum_info_field` (
-  `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
-  `datum_print_id` bigint(20) DEFAULT NULL COMMENT '填单打印id',
-  `idCard` varchar(64) DEFAULT '' COMMENT '身份证号',
-  `fieldCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字段编码',
-  `fieldName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字段名称',
-  `fieldType` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）',
-  `fieldTypeValue` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值',
-  `dataType` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '数据类型（number.数字,string.字符串,arrays.数组,obj.对象）',
-  `fieldValue` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '字段值',
-  `defaultValue` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '字段默认值',
-  `fieldLen` int(9) DEFAULT NULL COMMENT '数据长度，默认128',
-  `fieldNull` tinyint(2) DEFAULT NULL COMMENT '是否允许为空，(0.否,1.是)',
-  `isList` tinyint(2) DEFAULT NULL COMMENT '字段是否列表显示(0.否,1.是)',
-  `fieldOrderNo` int(9) DEFAULT NULL COMMENT '排序号',
-  `remark` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
-  `createTime` datetime DEFAULT NULL COMMENT '创建时间',
-  `createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
-  `updateTime` datetime DEFAULT NULL COMMENT '修改时间',
-  `updateUserId` bigint(20) DEFAULT NULL COMMENT '修改用户',
-  PRIMARY KEY (`id`) USING BTREE
-) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='填单用户信息字段';
-
 -- ----------------------------
 2023-03-22
 -- ----------------------------
@@ -83,3 +54,31 @@ ALTER TABLE mortals_xhx_device
 
 ALTER TABLE mortals_xhx_device
     ADD COLUMN  `resolution` varchar(255)      COMMENT '分辨率';
+
+
+-- ----------------------------
+2024-04-24
+-- ----------------------------
+DROP TABLE IF EXISTS `mortals_xhx_datum_info_field`;
+CREATE TABLE `mortals_xhx_datum_info_field` (
+    `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '序号，主键，自增长',
+    `datum_print_id` bigint(20) DEFAULT NULL COMMENT '填单打印id',
+    `idCard` varchar(64) DEFAULT '' COMMENT '身份证号',
+    `fieldCode` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字段编码',
+    `fieldName` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字段名称',
+    `fieldType` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '字段类型（input.单行输入框,textarea.多行输入框,SELECT.下拉选项框,date.日期选择框,checkbox.多项选择框）',
+    `fieldTypeValue` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '字段类型值，当字段类型为多选，单选时候，预设复选值',
+    `dataType` varchar(64) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '数据类型（number.数字,string.字符串,arrays.数组,obj.对象）',
+    `fieldValue` text CHARACTER SET utf8 COLLATE utf8_general_ci COMMENT '字段值',
+    `defaultValue` varchar(255) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT '' COMMENT '字段默认值',
+    `fieldLen` int(9) DEFAULT NULL COMMENT '数据长度，默认128',
+    `fieldNull` tinyint(2) DEFAULT NULL COMMENT '是否允许为空，(0.否,1.是)',
+    `isList` tinyint(2) DEFAULT NULL COMMENT '字段是否列表显示(0.否,1.是)',
+    `fieldOrderNo` int(9) DEFAULT NULL COMMENT '排序号',
+    `remark` varchar(1024) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '备注',
+    `createTime` datetime DEFAULT NULL COMMENT '创建时间',
+    `createUserId` bigint(20) DEFAULT NULL COMMENT '创建用户',
+    `updateTime` datetime DEFAULT NULL COMMENT '修改时间',
+    `updateUserId` bigint(20) DEFAULT NULL COMMENT '修改用户',
+    PRIMARY KEY (`id`) USING BTREE
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8 ROW_FORMAT=DYNAMIC COMMENT='填单用户信息字段';
\ No newline at end of file

fill-manager/src/main/java/com/mortals/xhx/module/datum/web/DatumInfoFieldController.java

@@ -2,45 +2,28 @@ package com.mortals.xhx.module.datum.web;
 
 import com.mortals.framework.annotation.UnAuth;
 import com.mortals.framework.common.Rest;
+import com.mortals.framework.model.Context;
 import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
+import com.mortals.xhx.common.code.DataTypeEnum;
+import com.mortals.xhx.common.code.FieldTypeEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
+import com.mortals.xhx.module.datum.model.DatumInfoFieldEntity;
 import com.mortals.xhx.module.datum.model.DatumInfoFieldQuery;
-import com.mortals.xhx.module.device.model.DeviceEntity;
+import com.mortals.xhx.module.datum.service.DatumInfoFieldService;
 import com.mortals.xhx.module.matter.model.MatterDatumPrintEntity;
 import com.mortals.xhx.module.matter.model.MatterDatumPrintQuery;
 import com.mortals.xhx.module.matter.service.MatterDatumPrintService;
-import org.checkerframework.checker.units.qual.A;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-import com.mortals.framework.model.Context;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
-import com.mortals.xhx.module.datum.model.DatumInfoFieldEntity;
-import com.mortals.xhx.module.datum.service.DatumInfoFieldService;
-import org.apache.commons.lang3.ArrayUtils;
-import com.mortals.framework.util.StringUtils;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-
-import com.alibaba.fastjson.JSONObject;
-
-import java.util.Arrays;
-
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import static com.mortals.framework.ap.SysConstains.*;
-
-import com.mortals.xhx.common.code.*;
 
 /**
  * 填单用户信息字段
@@ -66,8 +49,6 @@ public class DatumInfoFieldController extends BaseCRUDJsonBodyMappingController<
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "fieldType", FieldTypeEnum.getEnumMap());
         this.addDict(model, "dataType", DataTypeEnum.getEnumMap());
-        this.addDict(model, "fieldNull", FieldNullEnum.getEnumMap());
-        this.addDict(model, "isList", IsListEnum.getEnumMap());
         super.init(model, context);
     }
 

fill-manager/src/test/java/com/mortals/httpclient/http-client.env.json

@@ -13,8 +13,8 @@
   },
 
   "test-remote": {
-    "baseUrl": "http://8.136.255.30:11078/fm",
-    "baseLogin": "http://8.136.255.30:11078/fm"
+    "baseUrl": "http://8.136.255.30:11090/fm",
+    "baseLogin": "http://8.136.255.30:11090/fm"
   },
   "portal": {
     "baseUrl": "http://192.168.0.98:11072/zwfw",