Browse Source

信息点从excel读取成功,另外两种报警直接恢复

menglu 3 years ago
parent
commit
137926fb07

+ 19 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExcelCommonUtil.java

@@ -62,6 +62,25 @@ public class ExcelCommonUtil {
 		return content;
 	}
 
+	public static String getContentInner(ExcelSheet sheetContent, String col, int row) {
+		int buildingIndex = -1;
+		for (int i = 0; i < sheetContent.titleColList.size(); i++) {
+			String name = sheetContent.titleColList.get(i);
+			if (name.equals(col)) {
+				buildingIndex = i;
+				break;
+			}
+		}
+
+		String content = null;
+		if (buildingIndex == -1) {
+		} else {
+			content = sheetContent.contentListList.get(row).get(buildingIndex);
+		}
+
+		return content;
+	}
+
 	public static void Write(String filepath, Map<String, ExcelSheet> sheetMap) throws Exception {
 		Workbook wb;
 		if (filepath.endsWith("xlsx")) {

+ 4 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/RWDAlarmUtil.java

@@ -609,6 +609,10 @@ public class RWDAlarmUtil {
 					}
 					if (paramJSON.containsKey("nature")) {
 						handleJSON.put("nature", paramJSON.get("nature"));
+						String nature = paramJSON.get("nature").toString();
+						if (nature.equals("1") || nature.equals("3")) {
+							handleJSON.put("state", 2);
+						}
 					}
 					log.warn(Constant.alarm_url + "/alarm-record/handleAlarm" + "\n" + handleJSON.toJSONString());
 					String post_result = HttpClientUtil.put(Constant.alarm_url + "/alarm-record/handleAlarm", handleJSON.toJSONString());

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

@@ -858,6 +858,54 @@ public class RWDLoadUtil {
 		String validPath = Constant.info_point;
 
 		{
+			JSONArray InfoPointListArray = new JSONArray();
+			JSONArray InfoPointRelationArray = new JSONArray();
+			Map<String, ExcelSheet> sheetMap = ExcelCommonUtil.Read(validPath + Constant.getSeperator() + "info-point.xlsx", true);
+			for (String sheetName : sheetMap.keySet()) {
+				ExcelSheet sheet = sheetMap.get(sheetName);
+				for (int i = 0; i < sheet.contentListList.size(); i++) {
+					String equipTypeName = ExcelCommonUtil.getContentInner(sheet, "设备类型名称", i);
+					String infoType = ExcelCommonUtil.getContentInner(sheet, "信息点类型", i);
+					String infoCode = ExcelCommonUtil.getContentInner(sheet, "信息点编码", i);
+					String isBatchControlParam = ExcelCommonUtil.getContentInner(sheet, "是否批量控制", i);
+					String isKeyPoint = ExcelCommonUtil.getContentInner(sheet, "是否关键参数", i);
+					String feedback = ExcelCommonUtil.getContentInner(sheet, "控制反馈点", i);
+					String force = ExcelCommonUtil.getContentInner(sheet, "强制模式", i);
+					String force_feedback = ExcelCommonUtil.getContentInner(sheet, "强制模式反馈", i);
+					{
+						JSONObject pointListItem = new JSONObject();
+						pointListItem.put("equipTypeName", equipTypeName);
+						pointListItem.put("infoCode", infoCode);
+						pointListItem.put("isControlParam", infoType.equals("设定参数") ? true : false);
+						pointListItem.put("isRunParam", infoType.equals("运行参数") ? true : false);
+						pointListItem.put("isBatchControlParam", (isBatchControlParam != null && isBatchControlParam.equals("Y")) ? true : false);
+						pointListItem.put("isKeyPoint", (isKeyPoint != null && isKeyPoint.equals("Y")) ? true : false);
+						InfoPointListArray.add(pointListItem);
+					}
+					{
+						JSONObject pointRelationItem = new JSONObject();
+						if (feedback != null) {
+							pointRelationItem.put("控制反馈点", feedback);
+						}
+						if (force != null) {
+							pointRelationItem.put("强制模式", force);
+						}
+						if (force_feedback != null) {
+							pointRelationItem.put("强制模式反馈", force_feedback);
+						}
+						if (pointRelationItem.size() > 0) {
+							pointRelationItem.put("equipTypeName", equipTypeName);
+							pointRelationItem.put("控制点", infoCode);
+							InfoPointRelationArray.add(pointRelationItem);
+						}
+					}
+				}
+			}
+			FileUtil.Save(validPath + Constant.getSeperator() + "info-point-list" + ".json", FastJsonUtil.toFormatString(InfoPointListArray));
+			FileUtil.Save(validPath + Constant.getSeperator() + "info-point-relation" + ".json", FastJsonUtil.toFormatString(InfoPointRelationArray));
+		}
+
+		{
 			JSONArray classArray = FastJsonReaderUtil.Instance()
 					.ReadJSONArray(new File(validPath + Constant.getSeperator() + "info-point-list.json"));
 			SceneDataSet SceneDataSet = new SceneDataSet(false);