Browse Source

meter-funcid改到应用实现

menglu 3 years ago
parent
commit
fb6978f409

+ 1 - 1
ibms-data-sdk/pom.xml

@@ -216,7 +216,7 @@
 		<dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>sailfish</artifactId>
-			<version>0.0.22</version>
+			<version>0.0.24</version>
 		</dependency>
 	</dependencies>
 

+ 2 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/DaemonThread.java

@@ -45,6 +45,8 @@ public class DaemonThread extends Thread {
 	public void run() {
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss");
 		KeywordUtil.keyWordMap = Constant.keyWordMap;
+		KeywordUtil.prefixMap = Constant.prefixMap;
+		KeywordUtil.suffixMap = Constant.suffixMap;
 		// 没有就下载
 		{
 			Date currTime = new Date();

+ 7 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/Constant.java

@@ -46,8 +46,15 @@ public class Constant {
 	public static Map<String, Boolean> objType_hasRelation = new HashMap<String, Boolean>();
 	public static List<ConfigRelation> ConfigRelationList = new ArrayList<ConfigRelation>();
 	public static Map<String, Boolean> keyWordMap = new HashMap<String, Boolean>();
+	public static Map<String, Boolean> prefixMap;
+	public static Map<String, Boolean> suffixMap;
 
 	static {
+		{
+			suffixMap = new HashMap<String, Boolean>();
+			suffixMap.put("-" + "meter-funcid", true);
+		}
+
 		try (InputStream stream = getStream("config.xml")) {
 			SAXReader saxReader = new SAXReader();
 			Document document = saxReader.read(stream);

+ 16 - 8
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDLoadUtil.java

@@ -276,6 +276,14 @@ public class RWDLoadUtil {
 								}
 								SceneDataValue data = RepositoryContainer.RepositoryBase.point2sdv.get(point);
 								obj.put(Key, data);
+								{
+									SceneDataValue sdv = new SceneDataValue(null, null, null, null);
+									sdv.finish = true;
+									sdv.value_prim = new SceneDataPrimitive();
+									sdv.value_prim.change = false;
+									sdv.value_prim.value = point;
+									obj.put(Key + "-" + "meter-funcid", sdv);
+								}
 							} else {
 								obj.remove(Key);
 							}
@@ -300,6 +308,14 @@ public class RWDLoadUtil {
 								}
 								SceneDataValue data = RepositoryContainer.RepositoryBase.set2sdv.get(point);
 								obj.put(Key, data);
+								{
+									SceneDataValue sdv = new SceneDataValue(null, null, null, null);
+									sdv.finish = true;
+									sdv.value_prim = new SceneDataPrimitive();
+									sdv.value_prim.change = false;
+									sdv.value_prim.value = point;
+									obj.put(Key + "-" + "meter-funcid", sdv);
+								}
 							} else {
 								obj.remove(Key);
 							}
@@ -402,10 +418,6 @@ public class RWDLoadUtil {
 											log.error(ConfigRelation.graphCode + "\t" + ConfigRelation.relCode + "\t"
 													+ FromObject.value_object.get("id") + " " + "有多个" + " " + ConfigRelation.nameInFrom + "\t"
 													+ sdvInner.value_prim.value + "\t" + sdoInner.get("id").value_prim.value);
-											// TODO
-											// throw new Exception(ConfigRelation.graphCode + "\t" + ConfigRelation.relCode + "\t"
-											// + FromObject.value_object.get("id") + " " + "有多个" + " " + ConfigRelation.nameInFrom + "\t"
-											// + sdvInner.value_primitive + "\t" + sdoInner.get("id").value_primitive);
 										}
 									}
 								}
@@ -452,10 +464,6 @@ public class RWDLoadUtil {
 											log.error(ConfigRelation.graphCode + "\t" + ConfigRelation.relCode + "\t"
 													+ ToObject.value_object.get("id") + " " + "有多个" + " " + ConfigRelation.nameInTo + "\t"
 													+ sdvInner.value_prim.value + "\t" + sdoInner.get("id").value_prim.value);
-											// TODO
-											// throw new Exception(ConfigRelation.graphCode + "\t" + ConfigRelation.relCode + "\t"
-											// + ToObject.value_object.get("id") + " " + "有多个" + " " + ConfigRelation.nameInTo + "\t"
-											// + sdvInner.value_primitive + "\t" + sdoInner.get("id").value_primitive);
 										}
 									}
 								}