修改告警

amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/AlarmEventServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.apache.kafka.clients.consumer.ConsumerRecord;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -109,7 +110,8 @@ public class AlarmEventServiceImpl extends BaseService<AlarmEventDto, AlarmEvent
 		calendar.add(Calendar.DAY_OF_MONTH, -2);
 		List<AlarmEvent> alarmEventList = this.baseMapper.getEventList(gatewayId, calendar.getTime());
 
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Calendar car = Calendar.getInstance();
 		alarmEventList.forEach(i -> {
 			if ("true".equals(i.getValue())) {
 				i.setValue("合");
@@ -117,7 +119,10 @@ public class AlarmEventServiceImpl extends BaseService<AlarmEventDto, AlarmEvent
 				i.setValue("分");
 			}
 			i.setStationName("升压站");
-			i.setTime(sdf.format(new Date(i.getCreatedTime())));
+			long mills = i.getCreatedTime()/1000000;
+			car.setTimeInMillis(mills);
+			//System.out.println(sdf.format(car.getTime()));
+			i.setTime(sdf.format(car.getTime()));
 		});
 		PageInfo<EquipAlarmEvent> page = new PageInfo(alarmEventList);
 		// 构建平台数据

amos-boot-system-jxiop/amos-boot-module-jxiop-warn-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EquipAlarmEventServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,7 +43,7 @@ public class EquipAlarmEventServiceImpl
 				equipName = s[0] + "子阵/逆变器" + s[1];
 			} else if ("汇流箱".equals(frontModule)) {
 				String[] s = equipIndex.split("-");
-				if ("0".equals(s[2].indexOf(0))) {
+				if (s[2].indexOf("0")==0) {
 					s[2] = s[2].substring(1);
 				}
 				equipName = s[0] + "子阵/逆变器" + s[1] + "/#" + s[2] + "汇流箱";
@@ -55,14 +56,20 @@ public class EquipAlarmEventServiceImpl
 		List<EquipAlarmEvent> alarmEventList = this.baseMapper.getEventList(gatewayId, equipName, null,
 				calendar.getTime());
 
-		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss");
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		Calendar car = Calendar.getInstance();
 		alarmEventList.forEach(i -> {
 			if ("true".equals(i.getValue())) {
 				i.setValue("合");
 			} else if ("false".equals(i.getValue())) {
 				i.setValue("分");
 			}
-			i.setTime(sdf.format(new Date(i.getCreatedTime())));
+			long mills = i.getCreatedTime()/1000000;
+			car.setTimeInMillis(mills);
+			//System.out.println(sdf.format(car.getTime()));
+			i.setTime(sdf.format(car.getTime()));
+			//car.add(Calendar.HOUR, 12);
+			//System.out.println(sdf.format(car.getTime()));
 		});
 
 		PageInfo<EquipAlarmEvent> page = new PageInfo(alarmEventList);