0821 修改组件查询接口，修改filebase64插入记录格式

generated/com/miniframe/generate/comm/es/D_ES0027.java

@@ -4,23 +4,22 @@
 package com.miniframe.generate.comm.es;
 import com.miniframe.core.BaseMapModel;
 import java.io.Serializable;
-import java.util.*;
 /**
  * 图片base64编码查询
  */
 public class D_ES0027 extends BaseMapModel implements Serializable {
 	private static final long serialVersionUID = -1463838678425832212L;
-	List <D_ES0027_ROWS_RECODE> rows;//数据
+	String base64Data;//数据
 	/**
 	 *数据
 	 */
-	public void setRows(List <D_ES0027_ROWS_RECODE> rows) {
-		this.rows=rows;
+	public void setBase64Data(String base64Data) {
+		this.base64Data=base64Data;
 	}
 	/**
 	 *数据
 	 */
-	public List <D_ES0027_ROWS_RECODE> getRows() {
-		return this.rows;
+	public String getBase64Data() {
+		return this.base64Data;
 	}
 }

generated/validateform/d_es0027Form.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE form-validation PUBLIC "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1//EN" "http://jakarta.apache.org/commons/dtds/validator_1_1.dtd">
+<!-- 图片base64编码查询Form配置文件系统生成请勿修改,否则重新生成将覆盖 -->
+<form-validation>
+<formset>
+<form name="d_es0027Form">
+<field property="base64Data" depends="minlength">
+    <arg0 key="d_es0027.base64Data"/>
+    <arg1 name="minlength" key="${var:minlength}"/>
+    <var>
+      <var-name>minlength</var-name>
+      <var-value>0</var-value>
+    </var>
+</field>
+</form>
+</formset>
+</form-validation>

generated/validator/resources_d_es0027Form_validator.properties

@@ -1 +1,2 @@
-d_es0027Form = false
+d_es0027.base64Data = \u6570\u636E
+d_es0027Form = true

generated/validator/resources_d_es0027Form_validator_zh_CN.properties

@@ -1 +1,2 @@
-d_es0027Form = false
+d_es0027.base64Data = \u6570\u636E
+d_es0027Form = true

src/main/java/com/miniframe/bisiness/es/ES0027Service.java

@@ -25,17 +25,9 @@ public class ES0027Service extends ES0027BaseModel implements ExecProcessFlow {
 		String fbId = this.getA_es0027().getFbId();
 		FileBase64Mapper fileBase64Mapper = UtilTools.getBean(FileBase64Mapper.class);
 		FileBase64 fileBase64 = fileBase64Mapper.selectByPrimaryKey(fbId);
-		List<D_ES0027_ROWS_RECODE> dEs0027RowsRecodeList = new ArrayList<>();
 		D_ES0027_ROWS_RECODE dEs0027RowsRecode = new D_ES0027_ROWS_RECODE();
-		dEs0027RowsRecode.setFbId(fbId);
-		dEs0027RowsRecode.setFileBase64(fileBase64.getFileBase64());
-		dEs0027RowsRecode.setFilename(fileBase64.getFilename());
-		dEs0027RowsRecode.setMime(fileBase64.getMime());
-		dEs0027RowsRecode.setRemark(fileBase64.getRemark());
-		dEs0027RowsRecode.setCreateTime(XIDateTimeUtils.getStrFromDate(fileBase64.getCreateTime()));
-		dEs0027RowsRecode.setUpdateTime(XIDateTimeUtils.getStrFromDate(fileBase64.getUpdateTime()));
-		dEs0027RowsRecodeList.add(dEs0027RowsRecode);
-		this.getD_es0027().setRows(dEs0027RowsRecodeList);
+		String data = fileBase64.getMime()+fileBase64.getFileBase64();
+		this.getD_es0027().setBase64Data(data);
 	}
 	
 	/**

src/test/java/com/miniframe/base64Test.java

@@ -55,10 +55,11 @@ public class base64Test {
 
         for(int i=0;i<filenameList.size();i++){
             FileBase64  fileBase64 = new FileBase64();
-            fileBase64.setFbId(stringList1.get(i)+getFilePrefix(filenameList.get(i)));
+            fileBase64.setFbId(stringList1.get(i));
             fileBase64.setFileBase64(convertToBase64("C:\\Users\\Administrator\\Desktop\\fsdownload\\"+filenameList.get(i)));
             fileBase64.setFilename(filenameList.get(i));
-            fileBase64.setMime(getFileExtension(filenameList.get(i)));
+            String mime = "data:image/" + getFileExtension(filenameList.get(i))+";base64,";
+            fileBase64.setMime(mime);
             fileBase64.setCreateTime(new Date());
             fileBase64.setUpdateTime(new Date());
             fileBase64.setRemark("");
@@ -72,7 +73,7 @@ public class base64Test {
 
         // 使用Base64编码器进行编码
         String baseStr =  Base64.getEncoder().encodeToString(fileContent);
-        return "data:image/png;base64,"+baseStr;
+        return baseStr;
     }
 
     //取后缀

系统设计/通信设计/通讯报文/es(无锡发动机)/报文体/ES0027_D(图片base64编码查询).csv

@@ -1,9 +1,2 @@
 "序号","英文名称","中文名称","数据类型","默认值","格式化","非空/引用","最小(长度/值)","最大(长度/值)","验证规则","标准数据ID","XML样式","TAG标签","映射/子标签","CDATA"
-1,rows,数据,list,,,,0,,,,,,,
-1.1,fbId,图片base64编码ID,string,,,,,,,,,,,
-1.2,fileBase64,图片base64编码,string,,,,,,,,,,,
-1.3,filename,文件名,string,,,,,,,,,,,
-1.4,mime,前缀名,string,,,,,,,,,,,
-1.5,remark,项目描述,string,,,,,,,,,,,
-1.6,createTime,创建时间,string,,,,,,,,,,,
-1.7,updateTime,修改时间,string,,,,,,,,,,,
+1,base64Data,数据,string,,,,0,,,,,,,