Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/es-server

dbscript/init/generate/01-appcodeInit.sql

@@ -70,9 +70,18 @@ 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 ('attLengthType4','service','attLengthType', 'km', '3','千米',4);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attLengthType5','service','attLengthType', 'ft', '4','英尺',5);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attLengthType6','service','attLengthType', 'in', '5','英寸',6);
+-- 压力单位
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attPressureType1','service','attPressureType', 'Pa', '0','Pa',1);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attPressureType2','service','attPressureType', 'kPa', '1','kPa',2);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attPressureType3','service','attPressureType', 'mBar', '2','mBar',3);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attPressureType4','service','attPressureType', 'bar', '3','bar',4);
 -- 重量单位
 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 ('attTemperatureType1','service','attTemperatureType', '℃', '0','℃',1);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType2','service','attTemperatureType', '℉', '1','℉',2);
+INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attTemperatureType3','service','attTemperatureType', 'K', '2','K',3);
 -- 属性值类型
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueType1','service','attValueType', 'v0', '0','固定值',1);
 INSERT INTO SYS_APPCODE(CODE_ID, SYSID, CODE_TYPE, CODE_NAME, CODE_VALUE, CODE_DESC, CODE_ORDER)VALUES ('attValueType2','service','attValueType', 'v1', '1','下拉值',2);

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

@@ -0,0 +1,68 @@
+package com.miniframe.generate.appcode;
+
+/**
+ * 压力单位
+ */
+public enum AttPressureType {
+
+	Pa("Pa", "0", "Pa"),
+	kPa("kPa", "1", "kPa"),
+	mBar("mBar", "2", "mBar"),
+	bar("bar", "3", "bar");
+
+	// 成员变量
+	private String index; // value
+	private String name; // key
+	private String desc; // 描述
+	
+	/**
+	 * 构造方法
+	 * @param name
+	 * @param index
+	 * @param desc
+	 */
+	private AttPressureType(String name, String index, String desc) {
+		this.name = name;
+		this.index = index;
+		this.desc = desc;
+	}
+
+	/**
+	 * 通过index获取对象
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public static AttPressureType getAttPressureType(String index) {
+		for (AttPressureType c : AttPressureType.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/AttTemperatureType.java

@@ -0,0 +1,67 @@
+package com.miniframe.generate.appcode;
+
+/**
+ * 温度单位
+ */
+public enum AttTemperatureType {
+
+	℃("℃", "0", "℃"),
+	℉("℉", "1", "℉"),
+	K("K", "2", "K");
+
+	// 成员变量
+	private String index; // value
+	private String name; // key
+	private String desc; // 描述
+	
+	/**
+	 * 构造方法
+	 * @param name
+	 * @param index
+	 * @param desc
+	 */
+	private AttTemperatureType(String name, String index, String desc) {
+		this.name = name;
+		this.index = index;
+		this.desc = desc;
+	}
+
+	/**
+	 * 通过index获取对象
+	 * 
+	 * @param index
+	 * @return
+	 */
+	public static AttTemperatureType getAttTemperatureType(String index) {
+		for (AttTemperatureType c : AttTemperatureType.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;
+	}
+}

系统设计/数据定义/标准数据/attPressureType(压力单位).csv

@@ -0,0 +1,5 @@
+序号,代码编号,代码值,代码名称
+"0","Pa","0","Pa"
+"1","kPa","1","kPa"
+"2","mBar","2","mBar"
+"3","bar","3","bar"

系统设计/数据定义/标准数据/attTemperatureType(温度单位).csv

@@ -0,0 +1,4 @@
+序号,代码编号,代码值,代码名称
+"0","℃","0","℃"
+"1","℉","1","℉"
+"2","K","2","K"