From f6893cf95b15531dfc45950fea7e780e045ba2ae Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 11 五月 2022 18:37:24 +0800
Subject: [PATCH] 优化设备在线状态
---
src/test/java/com/genersoft/iot/vmp/service/impl/DeviceAlarmServiceImplTest.java | 10 ++++------
1 files changed, 4 insertions(+), 6 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..6d6ff37 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,12 @@
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.util.Date;
@@ -17,8 +17,6 @@
@Resource
private IDeviceAlarmService deviceAlarmService;
-
- SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
@org.junit.jupiter.api.Test
void getAllAlarm() {
@@ -67,7 +65,7 @@
*/
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));
+ deviceAlarm.setAlarmTime(DateUtil.format.format(date));
/**
* 鎶ヨ绾у埆, 1涓轰竴绾ц鎯�, 2涓轰簩绾ц鎯�, 3涓轰笁绾ц鎯�, 4涓哄洓绾� 璀︽儏-
*/
@@ -90,8 +88,8 @@
private Date randomDate(String beginDate, String endDate) {
try {
- Date start = format.parse(beginDate);//鏋勯�犲紑濮嬫棩鏈�
- Date end = format.parse(endDate);//鏋勯�犵粨鏉熸棩鏈�
+ Date start = DateUtil.format.parse(beginDate);//鏋勯�犲紑濮嬫棩鏈�
+ Date end = DateUtil.format.parse(endDate);//鏋勯�犵粨鏉熸棩鏈�
//getTime()琛ㄧず杩斿洖鑷� 1970 骞� 1 鏈� 1 鏃� 00:00:00 GMT 浠ユ潵姝� Date 瀵硅薄琛ㄧず鐨勬绉掓暟銆�
if (start.getTime() >= end.getTime()) {
return null;
--
Gitblit v1.8.0