فهرست منبع

完善持续时间

menglu 3 سال پیش
والد
کامیت
157e4f8187

+ 3 - 0
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/service/AlarmDurationThread.java

@@ -38,6 +38,9 @@ public class AlarmDurationThread extends Thread {
 					RWDAlarmUtil.chixushijian(sdf, currentTime, sdoInner);
 				}
 			}
+			for(SceneDataObject sdoInner:RepositoryContainer.RepositoryProject.alarmArray.set){
+				RWDAlarmUtil.chixushijian(sdf, currentTime, sdoInner);
+			}
 		}
 	}
 }

+ 2 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExcelCommonUtil.java

@@ -2,6 +2,7 @@ package com.persagy.ibms.data.sdk.util;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
+import java.nio.charset.Charset;
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
@@ -148,7 +149,7 @@ public class ExcelCommonUtil {
 				if (currentRow.getCell(columnNum) != null) {
 					Cell currentCell = currentRow.getCell(columnNum);
 					if (currentCell.getCellType() == CellType.STRING) {
-						int length = currentCell.getStringCellValue().getBytes().length;
+						int length = currentCell.getStringCellValue().getBytes(Charset.forName("GBK")).length + 2;
 						if (columnWidth < length) {
 							columnWidth = length;
 						}

+ 13 - 1
ibms-data-sdk/src/main/java/com/persagy/ibms/data/sdk/util/ExportUtil.java

@@ -133,6 +133,18 @@ public class ExportUtil {
 			}
 		}
 		{
+			sheet.titleColList.add("报警状态");
+			for (int i = 0; i < content.size(); i++) {
+				JSONObject contentItem = content.getJSONObject(i);
+				List<String> contentList = sheet.contentListList.get(i);
+				String cellValue = null;
+				if (contentItem.containsKey("stateName")) {
+					cellValue = contentItem.getString("stateName");
+				}
+				contentList.add(cellValue);
+			}
+		}
+		{
 			sheet.titleColList.add("报警处理状态");
 			for (int i = 0; i < content.size(); i++) {
 				JSONObject contentItem = content.getJSONObject(i);
@@ -145,7 +157,7 @@ public class ExportUtil {
 			}
 		}
 		{
-			sheet.titleColList.add("报警級別");
+			sheet.titleColList.add("报警级别");
 			for (int i = 0; i < content.size(); i++) {
 				JSONObject contentItem = content.getJSONObject(i);
 				List<String> contentList = sheet.contentListList.get(i);

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

@@ -434,6 +434,12 @@ public class RWDAlarmUtil {
 		{
 			SceneDataValue sdvInner = new SceneDataValue(null, null, null, null);
 			sdvInner.value_prim = new SceneDataPrimitive();
+			sdvInner.value_prim.value = keep_time;
+			sdoInner.put("durationMilli", sdvInner);
+		}
+		{
+			SceneDataValue sdvInner = new SceneDataValue(null, null, null, null);
+			sdvInner.value_prim = new SceneDataPrimitive();
 			sdvInner.value_prim.value = duration;
 			sdoInner.put("duration", sdvInner);
 		}