Browse Source

供电关系整反了

menglu 3 years ago
parent
commit
3a6954ef2d

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

@@ -18,6 +18,7 @@ import com.persagy.ibms.core.data.SceneDataPrimitive;
 import com.persagy.ibms.core.data.SceneDataSet;
 import com.persagy.ibms.core.data.SceneDataValue;
 import com.persagy.ibms.core.util.FastJsonReaderUtil;
+import com.persagy.ibms.core.util.FastJsonUtil;
 import com.persagy.ibms.core.util.LogUtil;
 import com.persagy.ibms.core.util.RWDUtil;
 
@@ -656,6 +657,8 @@ public class RWDLoadUtil {
 				SceneDataSet SceneDataSet_level1 = new SceneDataSet(false);
 				SceneDataSet_level1.set = RWDUtil.array2SDOList(level1);
 				arrayDic.put("一级编组", SceneDataSet_level1);
+				FileUtil.Save(validPath + Constant.getSeperator() + product + Constant.getSeperator() + "一级编组" + ".json",
+						FastJsonUtil.toFormatString(level1));
 				// 自动生成二级编组
 				JSONArray level2 = new JSONArray();
 				for (SceneDataObject sdo : Repository.IBMSGroupArray.set) {
@@ -688,6 +691,8 @@ public class RWDLoadUtil {
 				SceneDataSet SceneDataSet_level2 = new SceneDataSet(false);
 				SceneDataSet_level2.set = RWDUtil.array2SDOList(level2);
 				arrayDic.put("二级编组", SceneDataSet_level2);
+				FileUtil.Save(validPath + Constant.getSeperator() + product + Constant.getSeperator() + "二级编组" + ".json",
+						FastJsonUtil.toFormatString(level2));
 				// 自动生成回路
 				SceneDataSet zhaominghuilu = arrayDic.get("zhaominghuilu");
 				if (zhaominghuilu == null) {
@@ -771,6 +776,8 @@ public class RWDLoadUtil {
 				SceneDataSet huilu = new SceneDataSet(false);
 				huilu.set = RWDUtil.array2SDOList(huiluArray);
 				arrayDic.put("回路", huilu);
+				FileUtil.Save(validPath + Constant.getSeperator() + product + Constant.getSeperator() + "回路" + ".json",
+						FastJsonUtil.toFormatString(huiluArray));
 
 				for (SceneDataObject sdo : huilu.set) {
 					String id = (String) sdo.get("回路编号").value_prim.value;

+ 1 - 1
ibms-data-sdk/src/main/resources/config.xml

@@ -37,7 +37,7 @@
 	<ConfigRelation graphCode="MechInArch" relCode="Eq2Sp" relValue="GeneralZone" objFrom="equipment" objTo="space" nameInFrom="所在物业空间" multiplicityFrom="n" nameInTo="包含设备" multiplicityTo="n" />
 	<ConfigRelation graphCode="MechInArch" relCode="Eq2Sp" relValue="EnvironmentZone" objFrom="equipment" objTo="space" nameInFrom="所在环境空间" multiplicityFrom="n" nameInTo="包含设备" multiplicityTo="n" />
 	<ConfigRelation graphCode="MechForArch" relCode="Eq2Sp" objFrom="equipment" objTo="space" nameInFrom="服务于空间" multiplicityFrom="n" nameInTo="被设备服务" multiplicityTo="n" />
-	<ConfigRelation graphCode="MechPower" relCode="EqNormal" objFrom="equipment" objTo="equipment" nameInFrom="被设备供电" multiplicityFrom="n" nameInTo="给设备供电" multiplicityTo="n" />
+	<ConfigRelation graphCode="MechPower" relCode="EqNormal" objFrom="equipment" objTo="equipment" nameInFrom="给设备供电" multiplicityFrom="n" nameInTo="被设备供电" multiplicityTo="n" />
 	<ConfigRelation graphCode="MechCtrl" relCode="EqCtrl" objFrom="equipment" objTo="equipment" nameInFrom="控制设备" multiplicityFrom="n" nameInTo="被设备控制" multiplicityTo="n" />
 	<ConfigRelation graphCode="ValveRelationship" relCode="Vv2Eq" objFrom="equipment" objTo="equipment" nameInFrom="限制设备" multiplicityFrom="n" nameInTo="被设备限制" multiplicityTo="n" />
 	<ConfigRelation graphCode="ArchForArch" relCode="Sp2Sp" objFrom="space" objTo="space" nameInFrom="服务于空间" multiplicityFrom="n" nameInTo="被空间服务" multiplicityTo="n" />