From faff17f12652f23ff98036b2763fbbaede5afaa5 Mon Sep 17 00:00:00 2001
From: liuguijing <123456>
Date: Thu, 1 Jun 2023 19:33:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E5=9B=BE=E7=89=87=E4=BF=AE?=
=?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
xymanager_admin/pom.xml | 8 +--
.../xymanager_common/model/SysUserModel.java | 2 +-
.../TerminalScheduleRuleTimeListModel.java | 3 +
.../util/ScheduleListUtils.java | 4 +-
.../xymanager_dao/dao/TerminalPhotoDao.java | 3 +
.../shxy/xymanager_dao/dao/TerminalsDao.java | 2 +-
.../com/shxy/xymanager_dao/dao/TowerDao.java | 2 +
.../resources/mappers/TerminalPhotoDao.xml | 28 ++++++--
.../main/resources/mappers/TerminalsDao.xml | 28 +++++---
.../src/main/resources/mappers/TowerDao.xml | 15 +++-
xymanager_framework/pom.xml | 27 ++-----
.../xymanager_framework/config/WebConfig.java | 2 +
.../timeTask/ScheduledTask.java | 4 +-
.../impl/LineServiceImpl.java | 55 +++++++-------
.../impl/SysUserServiceImpl.java | 20 ++++--
.../impl/TerminalPhotoServiceImpl.java | 72 ++++++++++++++-----
.../impl/TerminalScheduleRuleServiceImpl.java | 22 +++---
17 files changed, 190 insertions(+), 107 deletions(-)
diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml
index f059729..cc9ce76 100644
--- a/xymanager_admin/pom.xml
+++ b/xymanager_admin/pom.xml
@@ -89,11 +89,11 @@
src/main/resources
-
- **/*.properties
- **/*.yml
+
+
+
-
+
xymanager-admin
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/SysUserModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/SysUserModel.java
index 53940a1..b33afec 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/SysUserModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/SysUserModel.java
@@ -42,7 +42,7 @@ public class SysUserModel implements Serializable {
private String nickName;
@ApiModelProperty(value = "创建时间", example = "120")
- private BigInteger createTime;
+ private Date createTime;
}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java
index c8d0088..b72021d 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/model/TerminalScheduleRuleTimeListModel.java
@@ -22,4 +22,7 @@ public class TerminalScheduleRuleTimeListModel implements Serializable {
@ApiModelProperty(value = "是否最新", example = "123456")
private Boolean isNew = false;
+ @ApiModelProperty(value = "偏移量", example = "123456")
+ private Integer offset ;
+
}
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java
index 4cf938b..8b5f40f 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/util/ScheduleListUtils.java
@@ -75,7 +75,7 @@ public class ScheduleListUtils {
String string = "";
if (XyNumberUtils.remainder(i, 3) == 0) {
index = index + 3;
- Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), 60);
+ Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), offset);
if (add.intValue() >= 60) {
Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1);
if (add1.intValue() >= 24) {
@@ -92,7 +92,7 @@ public class ScheduleListUtils {
string = " --hour" + index + "=" + startHour + " --min" + index + "=" + startMin + " --preset" + index + "=" + perset;
} else if (XyNumberUtils.remainder(i, 3) == 1) {
index = index - 1;
- Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), 60);
+ Number add = XyNumberUtils.add((Number) dtoList.get(i).getMinute(), offset);
if (add.intValue() >= 60) {
Number add1 = XyNumberUtils.add((Number) dtoList.get(i).getHour(), 1);
if (add1.intValue() >= 24) {
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 475b0a5..2112c3c 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
@@ -1,6 +1,7 @@
package com.shxy.xymanager_dao.dao;
import com.shxy.xymanager_common.dto.*;
+import com.shxy.xymanager_common.entity.Lines;
import com.shxy.xymanager_common.entity.TerminalPhoto;
import com.shxy.xymanager_common.vo.*;
import org.apache.ibatis.annotations.Param;
@@ -14,6 +15,8 @@ public interface TerminalPhotoDao {
List selectPhotoList(@Param("terminalid") Integer terminalid, @Param("channelid") List channelid, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
+ List selectPhotoListByTermList(@Param("terminalidlist") List terminalid, @Param("channelidlist") List channelid, @Param("starttime") BigInteger starttime, @Param("endtime") BigInteger endtime);
+
int deleteByPrimaryKey(Long id);
int insert(TerminalPhoto record);
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java
index 2b15974..4dae99c 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TerminalsDao.java
@@ -24,7 +24,7 @@ public interface TerminalsDao {
List selectByTowerId(@Param("towerid") Integer towerid, @Param("status") Integer status);
- Terminals selectByToweridAndLineid(@Param("lineid") Integer lineid,@Param("towerid") Integer towerid, @Param("status") Integer status);
+ List selectByToweridAndLineid(@Param("toweridlist") List towerid, @Param("status") Integer status);
int insertList(@Param("item") Terminals record, @Param("status") Integer status, @Param("createat") Date create, @Param("updateat") Date update);
diff --git a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java
index 7d56ca2..62779d8 100644
--- a/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java
+++ b/xymanager_dao/src/main/java/com/shxy/xymanager_dao/dao/TowerDao.java
@@ -16,6 +16,8 @@ public interface TowerDao {
List selectAllByLineid(@Param("lineid") Integer id,@Param("status") Integer status);
+ List selectAllByLineidList(@Param("lineidlist") List id,@Param("status") Integer status);
+
int deleteById(@Param("list") List record, @Param("status") Integer status, @Param("update") Date update);
int updateByPrimaryKeySelective(@Param("data") Tower record, @Param("update") Date update);
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
index f8bc630..e5b9a0e 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalPhotoDao.xml
@@ -52,7 +52,8 @@
-
+
@@ -98,7 +99,7 @@
select
from terminal_photos
- where photo_time between #{starttime} and #{endtime}
+ where photo_time between #{starttime} and #{endtime}
and term_id = #{terminalid}
@@ -110,6 +111,25 @@
order by photo_time desc
+
@@ -397,7 +417,8 @@
order by create_time desc limit 1
-
+
insert into terminal_photo_marks (term_id, channel_id,
color, width, height,boder_width ,create_time
)
@@ -451,7 +472,6 @@
-
+
+