From 6fe1fa45a4c3a49971ab3ea22ce86851bca432f3 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Tue, 25 Apr 2023 09:17:04 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=AC=A3=E5=BD=B1=E7=AE=A1=E7=90=86?=
=?UTF-8?q?=E5=B9=B3=E5=8F=B0=E8=A3=85=E7=BD=AE=E9=80=9A=E9=81=93=E8=A1=A8?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
xymanager_admin/src/main/resources/log4j2.xml | 4 +--
.../entity/TerminalPhoto.java | 7 ++--
.../model/TerminalPhotoListModel.java | 2 +-
.../xymanager_common/util/MyDateUtils.java | 34 ++++++++++++++-----
.../xymanager_dao/dao/TerminalPhotoDao.java | 3 +-
.../resources/mappers/TerminalPhotoDao.xml | 8 ++---
.../impl/TerminalPhotoServiceImpl.java | 32 ++++++++++++++---
7 files changed, 67 insertions(+), 23 deletions(-)
diff --git a/xymanager_admin/src/main/resources/log4j2.xml b/xymanager_admin/src/main/resources/log4j2.xml
index 401b3a7..ccd427f 100644
--- a/xymanager_admin/src/main/resources/log4j2.xml
+++ b/xymanager_admin/src/main/resources/log4j2.xml
@@ -21,8 +21,8 @@
value="%d{yyyy-MM-dd HH:mm:ss.SSS} %highlight{%-5level}[%thread] %style{%logger{36}}{cyan} : %msg%n"/>
-
-
+
+
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
index 84920d9..87797ee 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalPhoto.java
@@ -3,6 +3,7 @@ package com.shxy.xymanager_common.entity;
import lombok.Data;
import java.io.Serializable;
+import java.math.BigInteger;
import java.util.Date;
@Data
@@ -13,7 +14,7 @@ public class TerminalPhoto implements Serializable {
private Integer channelId;
- private Byte presetId;
+ private Integer presetId;
private Integer width;
@@ -21,9 +22,9 @@ public class TerminalPhoto implements Serializable {
private Integer fileSize;
- private Date photoTime;
+ private BigInteger photoTime;
- private Date recvTime;
+ private BigInteger recvTime;
private String path;
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
index f7993fc..882228a 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalPhotoListModel.java
@@ -34,7 +34,7 @@ public class TerminalPhotoListModel implements Serializable {
private Integer channelId;
@ApiModelProperty(value = "预置位编号", example = "123456")
- private Byte presetId;
+ private Integer presetId;
@ApiModelProperty(value = "宽度", example = "123456")
private Integer width;
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
index d66feb9..5acbf75 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/MyDateUtils.java
@@ -9,6 +9,7 @@ import cn.hutool.core.lang.Range;
import org.apache.commons.lang3.time.DateFormatUtils;
import java.lang.management.ManagementFactory;
+import java.math.BigInteger;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
@@ -31,8 +32,8 @@ public class MyDateUtils extends DateUtil {
public static String[] parsePatterns = {
"yyyy-MM-dd", "yyyy-MM-dd HH:mm:ss", "yyyy-MM-dd HH:mm", "yyyy-MM", "yyyy年MM月dd日",
- "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "HH时mm分", "HH:mm","HH:mm:ss",
- "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM","yyyyMMdd"};
+ "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM", "HH时mm分", "HH:mm", "HH:mm:ss",
+ "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM", "yyyyMMdd"};
/**
* 获取当前Date型日期
@@ -116,6 +117,7 @@ public class MyDateUtils extends DateUtil {
}
return format(str, "HH:mm");
}
+
/**
* 日期型转化为"MM/dd" 格式
*/
@@ -125,6 +127,7 @@ public class MyDateUtils extends DateUtil {
}
return format(str, "MM/dd");
}
+
/**
* 获取服务器启动时间
*/
@@ -132,12 +135,14 @@ public class MyDateUtils extends DateUtil {
long time = ManagementFactory.getRuntimeMXBean().getStartTime();
return new Date(time);
}
+
/**
* 日期型转化为"yyyy-MM-dd HH:mm" 格式
*/
public static String formatYmdHmTime(Date date) {
return null == date ? null : DatePattern.NORM_DATETIME_MINUTE_FORMAT.format(date);
}
+
/**
* 计算两个时间差
*/
@@ -159,10 +164,23 @@ public class MyDateUtils extends DateUtil {
return day + "天" + hour + "小时" + min + "分钟";
}
-// public static String dfdsa(Date start, Date end, DateField unit, int step, boolean isIncludeStart, boolean isIncludeEnd){
-// new Range(DateUtil.date(start), DateUtil.date(end), (current, end1, index) -> {
-// DateTime dt = DateUtil.date(start).offsetNew(unit, (index + 1) * step);
-// return dt.isAfter(end1) ? null : dt;
-// }, isIncludeStart, isIncludeEnd);
-// }
+ /**
+ * 13位时间戳转10位时间戳
+ *
+ * @return
+ */
+ public static BigInteger TimeMillSecond2Second(DateTime dateTime) {
+ BigInteger l = BigInteger.valueOf(Math.floorDiv(dateTime.getTime(), 1000l));
+ return l;
+ }
+
+ /**
+ * 10位时间戳转13位时间戳
+ *
+ * @return
+ */
+ public static BigInteger TimeSecond2MillSecond(long time) {
+ BigInteger l = BigInteger.valueOf(time * 1000l);
+ return l;
+ }
}
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
index dbdf667..567cee9 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalPhotoDao.java
@@ -4,12 +4,13 @@ import com.shxy.xymanager_common.entity.TerminalPhoto;
import org.apache.ibatis.annotations.Param;
import javax.xml.crypto.Data;
+import java.math.BigInteger;
import java.util.Date;
import java.util.List;
public interface TerminalPhotoDao {
- List selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid, @Param("time") Date time);
+ List selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") Integer channelid, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
int deleteByPrimaryKey(Long id);
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index b856509..5037cce 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -5,12 +5,12 @@
-
+
-
-
+
+
@@ -23,7 +23,7 @@
select
from terminal_photos
- where term_id = #{terminalid} and channel_id = #{channelid} and photo_time = date_format(#{time},'%y%m%d')
+ where term_id = #{terminalid} and channel_id = #{channelid} and photo_time between #{starttime} and #{endtime}