Jelajahi Sumber

0.0.32版sailfish,解决in和notin空对象的bug和getDataPath的空bug

menglu 3 tahun lalu
induk
melakukan
c0bd794b80

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

@@ -214,7 +214,7 @@
 		<dependency>
 			<groupId>com.persagy</groupId>
 			<artifactId>sailfish</artifactId>
-			<version>0.0.31</version>
+			<version>0.0.32</version>
 		</dependency>
 	</dependencies>
 

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

@@ -758,7 +758,7 @@ public class RWDLoadUtil {
 				SceneDataSet SceneDataSet_level1 = new SceneDataSet(false);
 				SceneDataSet_level1.set = RWDUtil.array2SDOList(level1);
 				arrayDic.put("一级编组", SceneDataSet_level1);
-				FileUtil.Save("一级编组" + ".json", FastJsonUtil.toFormatString(level1));
+				FileUtil.Save(product + "-" + "一级编组" + ".json", FastJsonUtil.toFormatString(level1));
 				// 自动生成二级编组
 				JSONArray level2 = new JSONArray();
 				for (SceneDataObject sdo : Repository.IBMSGroupArray.set) {
@@ -791,7 +791,7 @@ public class RWDLoadUtil {
 				SceneDataSet SceneDataSet_level2 = new SceneDataSet(false);
 				SceneDataSet_level2.set = RWDUtil.array2SDOList(level2);
 				arrayDic.put("二级编组", SceneDataSet_level2);
-				FileUtil.Save("二级编组" + ".json", FastJsonUtil.toFormatString(level2));
+				FileUtil.Save(product + "-" + "二级编组" + ".json", FastJsonUtil.toFormatString(level2));
 				// 自动生成回路
 				SceneDataSet zhaominghuilu = arrayDic.get("zhaominghuilu");
 				if (zhaominghuilu == null) {
@@ -881,7 +881,7 @@ public class RWDLoadUtil {
 				SceneDataSet huilu = new SceneDataSet(false);
 				huilu.set = RWDUtil.array2SDOList(huiluArray);
 				arrayDic.put("回路", huilu);
-				FileUtil.Save("回路" + ".json", FastJsonUtil.toFormatString(huiluArray));
+				FileUtil.Save(product + "-" + "回路" + ".json", FastJsonUtil.toFormatString(huiluArray));
 
 				for (SceneDataObject sdo : huilu.set) {
 					String id = (String) sdo.get("回路编号").value_prim.value;