新增unit_type

definitionsrc/com/miniframe/generate/appcode/AttLengthType.java

@@ -0,0 +1,70 @@
+package com.miniframe.generate.appcode;
+
+/**
+ * 长度单位
+ */
+public enum AttLengthType {
+
+	mm("mm", "0", "毫米"),
+	cm("cm", "1", "厘米"),
+	m("m", "2", "米"),
+	km("km", "3", "千米"),
+	ft("ft", "4", "英尺"),
+	in("in", "5", "英寸");
+
+	// 成员变量
+	private String index; // value
+	private String name; // key
+	private String desc; // 描述
+	
+	/**
+	 * 构造方法
+	 * @param name
+	 * @param index
+	 * @param desc
+	 */
+	private AttLengthType(String name, String index, String desc) {
+		this.name = name;
+		this.index = index;
+		this.desc = desc;
+	}
+
+	/**
+	 * 通过index获取对象
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public static AttLengthType getAttLengthType(String index) {
+		for (AttLengthType c : AttLengthType.values()) {
+			if (c.getIndex().equals(index)) {
+				return c;
+			}
+		}
+		return null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

definitionsrc/com/miniframe/generate/appcode/AttQualityType.java

@@ -0,0 +1,66 @@
+package com.miniframe.generate.appcode;
+
+/**
+ * 重量单位
+ */
+public enum AttQualityType {
+
+	g("g", "0", "克"),
+	kg("kg", "1", "千克");
+
+	// 成员变量
+	private String index; // value
+	private String name; // key
+	private String desc; // 描述
+	
+	/**
+	 * 构造方法
+	 * @param name
+	 * @param index
+	 * @param desc
+	 */
+	private AttQualityType(String name, String index, String desc) {
+		this.name = name;
+		this.index = index;
+		this.desc = desc;
+	}
+
+	/**
+	 * 通过index获取对象
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public static AttQualityType getAttQualityType(String index) {
+		for (AttQualityType c : AttQualityType.values()) {
+			if (c.getIndex().equals(index)) {
+				return c;
+			}
+		}
+		return null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

definitionsrc/com/miniframe/generate/appcode/AttValueShapeType.java

@@ -0,0 +1,69 @@
+package com.miniframe.generate.appcode;
+
+/**
+ * 属性形状类型
+ */
+public enum AttValueShapeType {
+
+	circle("circle", "0", "圆形"),
+	square("square", "1", "正方形"),
+	rectangle("rectangle", "2", "矩形"),
+	hexagon("hexagon", "3", "六边形"),
+	toroidal("toroidal", "4", "圆环形");
+
+	// 成员变量
+	private String index; // value
+	private String name; // key
+	private String desc; // 描述
+	
+	/**
+	 * 构造方法
+	 * @param name
+	 * @param index
+	 * @param desc
+	 */
+	private AttValueShapeType(String name, String index, String desc) {
+		this.name = name;
+		this.index = index;
+		this.desc = desc;
+	}
+
+	/**
+	 * 通过index获取对象
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public static AttValueShapeType getAttValueShapeType(String index) {
+		for (AttValueShapeType c : AttValueShapeType.values()) {
+			if (c.getIndex().equals(index)) {
+				return c;
+			}
+		}
+		return null;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getIndex() {
+		return index;
+	}
+
+	public void setIndex(String index) {
+		this.index = index;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

modelsrc/com/miniframe/model/czm/Test.java

@@ -0,0 +1,41 @@
+package com.miniframe.model.czm;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+public class Test extends MiniserviceBaseModel implements Serializable {
+    private String tz;
+
+    private String z2;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @return tz
+     */
+    public String getTz() {
+        return tz;
+    }
+
+    /**
+     * @param tz
+     */
+    public void setTz(String tz) {
+        this.tz = tz == null ? null : tz.trim();
+    }
+
+    /**
+     * @return z2
+     */
+    public String getZ2() {
+        return z2;
+    }
+
+    /**
+     * @param z2
+     */
+    public void setZ2(String z2) {
+        this.z2 = z2 == null ? null : z2.trim();
+    }
+}

modelsrc/com/miniframe/model/czm/TestSQLBuilder.java

@@ -0,0 +1,340 @@
+package com.miniframe.model.czm;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public TestSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andTzIsNull() {
+            addCriterion("tz is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzIsNotNull() {
+            addCriterion("tz is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzEqualTo(String value) {
+            addCriterion("tz =", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzNotEqualTo(String value) {
+            addCriterion("tz <>", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzGreaterThan(String value) {
+            addCriterion("tz >", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzGreaterThanOrEqualTo(String value) {
+            addCriterion("tz >=", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzLessThan(String value) {
+            addCriterion("tz <", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzLessThanOrEqualTo(String value) {
+            addCriterion("tz <=", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzLike(String value) {
+            addCriterion("tz like", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzNotLike(String value) {
+            addCriterion("tz not like", value, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzIn(List<String> values) {
+            addCriterion("tz in", values, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzNotIn(List<String> values) {
+            addCriterion("tz not in", values, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzBetween(String value1, String value2) {
+            addCriterion("tz between", value1, value2, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andTzNotBetween(String value1, String value2) {
+            addCriterion("tz not between", value1, value2, "tz");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2IsNull() {
+            addCriterion("z2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2IsNotNull() {
+            addCriterion("z2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2EqualTo(String value) {
+            addCriterion("z2 =", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2NotEqualTo(String value) {
+            addCriterion("z2 <>", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2GreaterThan(String value) {
+            addCriterion("z2 >", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2GreaterThanOrEqualTo(String value) {
+            addCriterion("z2 >=", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2LessThan(String value) {
+            addCriterion("z2 <", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2LessThanOrEqualTo(String value) {
+            addCriterion("z2 <=", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2Like(String value) {
+            addCriterion("z2 like", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2NotLike(String value) {
+            addCriterion("z2 not like", value, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2In(List<String> values) {
+            addCriterion("z2 in", values, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2NotIn(List<String> values) {
+            addCriterion("z2 not in", values, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2Between(String value1, String value2) {
+            addCriterion("z2 between", value1, value2, "z2");
+            return (Criteria) this;
+        }
+
+        public Criteria andZ2NotBetween(String value1, String value2) {
+            addCriterion("z2 not between", value1, value2, "z2");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

modelsrc/com/miniframe/model/czm/dao/TestMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.czm.dao;
+
+import com.miniframe.model.czm.Test;
+import com.miniframe.model.czm.TestSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface TestMapper extends MiniserviceBaseDao, MFBaseMapper<Test> {
+    long countByExample(TestSQLBuilder example);
+}

modelsrc/com/miniframe/model/czm/dbconfig/MapperConfig-czm.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE configuration PUBLIC "-//mybatis.org//DTD Config 3.0//EN" "http://mybatis.org/dtd/mybatis-3-config.dtd">
+<configuration>
+  <!--
+    This file is generated by MyBatis Generator.
+    This file is the shell of a Mapper Config file - in many cases you will need to add
+      to this file before it is usable by MyBatis.
+    This file was generated on Thu May 22 17:38:42 CST 2025.
+  -->
+  <mappers>
+    <mapper resource="com/miniframe/model/czm/xml/TestMapper.xml" />
+  </mappers>
+</configuration>

modelsrc/com/miniframe/model/czm/xml/TestMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.czm.dao.TestMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.czm.TestSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from test
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

src/main/java/com/miniframe/dbtransfer/TestDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.system.Test;
+
+/**
+ * 实体列表,“TEST”数据库数据转化逻辑处理（重新生成不覆盖）。
+ */
+public class TestDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<Test> list=l;
+		return list;
+	};
+
+}

系统设计/数据定义/标准数据/attValueShapeType(属性形状类型).csv

@@ -0,0 +1,6 @@
+序号,代码编号,代码值,代码名称
+"0","circle","0","圆形"
+"1","square","1","正方形"
+"2","rectangle","2","矩形"
+"3","hexagon","3","六边形"
+"4","toroidal","4","圆环形"