huangxingxing пре 3 месеци
родитељ
комит
1a6bb66c8b

+ 6 - 6
dbscript/init/generate/01-appcodeInit.sql

@@ -5,6 +5,12 @@ INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_D
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('applyState2','service','applyState', 'upchain', '3','已上链',2);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('applyState3','service','applyState', 'legalLetter', '4','已出函',3);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('applyState4','service','applyState', 'notarization', '5','已出证',4);
+-- 横截面形状
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attCrossSectionalShape1','service','attCrossSectionalShape', '圆形', '0','圆形',1);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attCrossSectionalShape2','service','attCrossSectionalShape', '正方形', '1','正方形',2);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attCrossSectionalShape3','service','attCrossSectionalShape', '矩形', '2','矩形',3);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attCrossSectionalShape4','service','attCrossSectionalShape', '六边形', '3','六边形',4);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attCrossSectionalShape5','service','attCrossSectionalShape', '圆环形', '4','圆环形',5);
 -- 流体类型
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attFlowType1','service','attFlowType', 'HELIUM', '0','HELIUM',1);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attFlowType2','service','attFlowType', 'METHANE', '1','METHANE',2);
@@ -71,12 +77,6 @@ INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_D
 -- 重量单位
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attQualityType1','service','attQualityType', 'g', '0','克',1);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attQualityType2','service','attQualityType', 'kg', '1','千克',2);
--- 属性形状类型
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueShapeType1','service','attValueShapeType', 'circle', '0','圆形',1);
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueShapeType2','service','attValueShapeType', 'square', '1','正方形',2);
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueShapeType3','service','attValueShapeType', 'rectangle', '2','矩形',3);
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueShapeType4','service','attValueShapeType', 'hexagon', '3','六边形',4);
-INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueShapeType5','service','attValueShapeType', 'toroidal', '4','圆环形',5);
 -- 属性值类型
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueType1','service','attValueType', '0', '0','固定值',1);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueType2','service','attValueType', '1', '1','下拉值',2);

+ 69 - 0
definitionsrc/com/miniframe/generate/appcode/AttCrossSectionalShape.java

@@ -0,0 +1,69 @@
+package com.miniframe.generate.appcode;
+
+/**
+ * 横截面形状
+ */
+public enum AttCrossSectionalShape {
+
+	圆形("圆形", "0", "圆形"),
+	正方形("正方形", "1", "正方形"),
+	矩形("矩形", "2", "矩形"),
+	六边形("六边形", "3", "六边形"),
+	圆环形("圆环形", "4", "圆环形");
+
+	// 成员变量
+	private String index; // value
+	private String name; // key
+	private String desc; // 描述
+	
+	/**
+	 * 构造方法
+	 * @param name
+	 * @param index
+	 * @param desc
+	 */
+	private AttCrossSectionalShape(String name, String index, String desc) {
+		this.name = name;
+		this.index = index;
+		this.desc = desc;
+	}
+
+	/**
+	 * 通过index获取对象
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public static AttCrossSectionalShape getAttCrossSectionalShape(String index) {
+		for (AttCrossSectionalShape c : AttCrossSectionalShape.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;
+	}
+}

+ 8 - 0
系统设计/数据定义/标准数据/attCrossSectionalShape(横截面形状).csv

@@ -0,0 +1,8 @@
+序号,代码编号,代码值,代码名称
+"0","圆形","0","圆形"
+"1","正方形","1","正方形"
+"2","矩形","2","矩形"
+"3","六边形","3","六边形"
+"4","圆环形","4","圆环形"
+
+

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

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