From 28b5cc39d0a2d9939f70b4c980a31d9b27fc1e4c Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 19 七月 2022 14:27:30 +0800
Subject: [PATCH] 修复更新推流状态sql错误
---
src/test/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImplTest.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
diff --git a/src/test/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImplTest.java b/src/test/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImplTest.java
index 23b9f6b..c627511 100644
--- a/src/test/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImplTest.java
+++ b/src/test/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImplTest.java
@@ -2,12 +2,16 @@
import com.genersoft.iot.vmp.gb28181.bean.DeviceAlarm;
import com.genersoft.iot.vmp.service.IDeviceAlarmService;
+import com.genersoft.iot.vmp.utils.DateUtil;
import org.junit.runner.RunWith;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.test.context.junit4.SpringRunner;
import javax.annotation.Resource;
-import java.text.SimpleDateFormat;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.time.temporal.TemporalAccessor;
import java.util.Date;
@@ -17,8 +21,6 @@
@Resource
private IDeviceAlarmService deviceAlarmService;
-
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@org.junit.jupiter.api.Test
void getAllAlarm() {
@@ -66,8 +68,8 @@
* * 7鍏朵粬鎶ヨ;鍙互涓虹洿鎺ョ粍鍚堝12涓虹數璇濇姤璀︽垨 璁惧鎶ヨ-
*/
deviceAlarm.setAlarmMethod((int)(Math.random()*7 + 1) + "");
- Date date = randomDate("2021-01-01 00:00:00", "2021-06-01 00:00:00");
- deviceAlarm.setAlarmTime(format.format(date));
+ Instant date = randomDate("2021-01-01 00:00:00", "2021-06-01 00:00:00");
+ deviceAlarm.setAlarmTime(DateUtil.formatter.format(date));
/**
* 鎶ヨ绾у埆, 1涓轰竴绾ц鎯�, 2涓轰簩绾ц鎯�, 3涓轰笁绾ц鎯�, 4涓哄洓绾� 璀︽儏-
*/
@@ -87,17 +89,20 @@
- private Date randomDate(String beginDate, String endDate) {
+ private Instant randomDate(String beginDate, String endDate) {
try {
- Date start = format.parse(beginDate);//鏋勯�犲紑濮嬫棩鏈�
- Date end = format.parse(endDate);//鏋勯�犵粨鏉熸棩鏈�
+ //鏋勯�犲紑濮嬫棩鏈�
+ LocalDateTime start = LocalDateTime.parse(beginDate, DateUtil.formatter);
+
+ //鏋勯�犵粨鏉熸棩鏈�
+ LocalDateTime end = LocalDateTime.parse(endDate, DateUtil.formatter);
//getTime()琛ㄧず杩斿洖鑷� 1970 骞� 1 鏈� 1 鏃� 00:00:00 GMT 浠ユ潵姝� Date 瀵硅薄琛ㄧず鐨勬绉掓暟銆�
- if (start.getTime() >= end.getTime()) {
+ if (start.isAfter(end)) {
return null;
}
- long date = random(start.getTime(), end.getTime());
- return new Date(date);
+ long date = random(start.toInstant(ZoneOffset.of("+8")).toEpochMilli(), end.toInstant(ZoneOffset.of("+8")).toEpochMilli());
+ return Instant.ofEpochMilli(date);
} catch (Exception e) {
e.printStackTrace();
}
--
Gitblit v1.8.0