diff --git a/pom.xml b/pom.xml
index ed9c4e3..c316737 100644
--- a/pom.xml
+++ b/pom.xml
@@ -75,11 +75,11 @@
${swagger.version}
-
-
-
-
-
+
+
+
+
+
@@ -124,12 +124,12 @@
5.7.20
-
-
-
-
-
-
+
+
+
+
+
+
@@ -139,6 +139,15 @@
5.9.0
+
+
+
+
+
+
+
+
+
org.springframework.boot
spring-boot-starter-test
diff --git a/xymanager_admin/pom.xml b/xymanager_admin/pom.xml
index c43a7ec..f059729 100644
--- a/xymanager_admin/pom.xml
+++ b/xymanager_admin/pom.xml
@@ -13,7 +13,7 @@
xymanager_admin
Demo project for Spring Boot
-
+ war
1.8
@@ -39,6 +39,7 @@
test
2.5.6
+
com.shxy
xymanager_framework
@@ -84,17 +85,17 @@
-
-
-
-
-
-
-
+
+
+ src/main/resources
+
+
+ **/*.properties
+ **/*.yml
-
-
-
+
+
+
xymanager-admin
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java
index 902266b..64e64e2 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/SpringBootStartApplication.java
@@ -1,12 +1,12 @@
-package com.shxy.xymanager_admin;
-
-import org.springframework.boot.builder.SpringApplicationBuilder;
-import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
-
-public class SpringBootStartApplication extends SpringBootServletInitializer {
- @Override
- protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
- // 注意这里要指向原先用main方法执行的Application启动类
- return builder.sources(XymanagerAdminApplication.class);
- }
-}
+//package com.shxy.xymanager_admin;
+//
+//import org.springframework.boot.builder.SpringApplicationBuilder;
+//import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
+//
+//public class SpringBootStartApplication extends SpringBootServletInitializer {
+// @Override
+// protected SpringApplicationBuilder configure(SpringApplicationBuilder builder) {
+// // 注意这里要指向原先用main方法执行的Application启动类
+// return builder.sources(XymanagerAdminApplication.class);
+// }
+//}
diff --git a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java
index 4f6145c..fd01e85 100644
--- a/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java
+++ b/xymanager_admin/src/main/java/com/shxy/xymanager_admin/XymanagerAdminApplication.java
@@ -19,7 +19,7 @@ import org.springframework.core.env.Environment;
@Slf4j
@EnableConfigurationProperties
@ComponentScan(basePackages = {"com.shxy"})
-public class XymanagerAdminApplication {
+public class XymanagerAdminApplication extends SpringBootServletInitializer{
public static void main(String[] args) {
try {
@@ -34,5 +34,8 @@ public class XymanagerAdminApplication {
log.error("error>>>>>>>>>>>>>>>>>>>>>>>>>>>", e);
}
}
-
+ @Override
+ protected SpringApplicationBuilder configure(SpringApplicationBuilder application){
+ return application.sources(XymanagerAdminApplication.class);
+ }
}
diff --git a/xymanager_admin/src/main/resources/META-INF/spring.factories b/xymanager_admin/src/main/resources/META-INF/spring.factories
index 8e7c358..5e2059b 100644
--- a/xymanager_admin/src/main/resources/META-INF/spring.factories
+++ b/xymanager_admin/src/main/resources/META-INF/spring.factories
@@ -1 +1 @@
-#org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor
+org.springframework.boot.env.EnvironmentPostProcessor=com.shxy.xymanager_framework.config.MyEnvironmentPostProcessor
diff --git a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java
index 845dc84..d3342a8 100644
--- a/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java
+++ b/xymanager_common/src/main/java/com/shxy/xymanager_common/entity/TerminalSchedule.java
@@ -15,6 +15,8 @@ public class TerminalSchedule implements Serializable {
private Integer scheduleId;
+ private Integer offset;
+
private Date createTime;
private Date updateTime;
diff --git a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml
index f57ebae..7506257 100644
--- a/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml
+++ b/xymanager_dao/src/main/resources/mappers/TerminalScheduleDao.xml
@@ -6,11 +6,12 @@
+
- id, term_id, channel_id, schedule_id, create_time, update_time
+ id, term_id, channel_id, schedule_id, `offset`,create_time, update_time
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
org.springframework.boot
@@ -77,15 +99,6 @@
true
-
-
-
- javax.servlet
- javax.servlet-api
- 3.1.0
- provided
-
-
com.shxy
xymanager_common
diff --git a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/interaction/JwtInterceptor.java b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/interaction/JwtInterceptor.java
index 2f4de07..017cf98 100644
--- a/xymanager_framework/src/main/java/com/shxy/xymanager_framework/interaction/JwtInterceptor.java
+++ b/xymanager_framework/src/main/java/com/shxy/xymanager_framework/interaction/JwtInterceptor.java
@@ -1,19 +1,11 @@
package com.shxy.xymanager_framework.interaction;
-import cn.hutool.core.date.DateTime;
-import cn.hutool.core.util.StrUtil;
-import com.shxy.xymanager_common.annotation.JwtIgnore;
-import com.shxy.xymanager_common.entity.UserSession;
-import com.shxy.xymanager_common.enums.HttpMethod;
-import com.shxy.xymanager_common.exception.Asserts;
-import com.shxy.xymanager_common.util.MyDateUtils;
import com.shxy.xymanager_service.service.SysUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
-import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.HandlerInterceptor;
import org.springframework.web.servlet.ModelAndView;
diff --git a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
index 899d51b..fd221c0 100644
--- a/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
+++ b/xymanager_service/src/main/java/com/shxy/xymanager_service/impl/TerminalScheduleRuleServiceImpl.java
@@ -357,6 +357,10 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
public ServiceBody getChannelSchelduleRule(TerminalAndChannelIdVo vo) {
TerminalScheduleRuleTimeListModel model = new TerminalScheduleRuleTimeListModel();
TerminalSchedule mapper = terminalScheduleDao.selectByChannelId(vo.getChannelid(), vo.getTerminalid());
+ Integer offset = mapper.getOffset();
+ if (offset == null) {
+ offset = 0;
+ }
if (mapper == null) {
model.setList(new ArrayList<>());
} else {
@@ -364,16 +368,23 @@ public class TerminalScheduleRuleServiceImpl implements TerminalScheduleRuleServ
ScheduleAndRuleDto bean = schedulesDao.selectSingleScheduleAndDetailsList(scheduleId, CommonStatus.EFFECTIVE.value());
if (BeanUtil.isEmpty(bean)) {
model.setList(new ArrayList<>());
- }else {
+ } else {
List list = bean.getList();
if (CollectionUtil.isEmpty(list)) {
model.setList(new ArrayList<>());
- }else {
+ } else {
ArrayList detailsBeans = ScheduleListUtils.getScheduleDetailsBeans(list);
ArrayList timestrlist = new ArrayList<>();
for (TerminalScheduleRuleModel.ScheduleRuleBean item : detailsBeans) {
- Time startTime = item.getStartTime();
- Time endTime = item.getEndTime();
+ DateTime startTime = MyDateUtils.offsetMinute(item.getStartTime(), offset);
+ if (startTime.isAfterOrEquals(MyDateUtils.endOfDay(item.getStartTime()))) {
+ startTime = MyDateUtils.endOfDay(item.getStartTime());
+
+ }
+ DateTime endTime = MyDateUtils.offsetMinute(item.getEndTime(), offset);
+ if (endTime.isAfterOrEquals(MyDateUtils.endOfDay(item.getEndTime()))) {
+ endTime = MyDateUtils.endOfDay(item.getEndTime());
+ }
Integer span = item.getSpan();
List dateTimes = MyDateUtils.rangeToList(startTime, endTime, DateField.MINUTE, span);
for (DateTime data : dateTimes) {