Merge branch 'pudong_jdk8' of http://101.95.0.106:8888/panzhaov5/bsth_control into pudong_jdk8

娄高锋
2 parents 2f962e3b 158804f2
Showing 3 changed files with 21 additions and 7 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/application-test.properties
src/main/resources/static/pages/home.html
@@ -32,6 +32,7 @@ import java.util.regex.Pattern;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
 import org.slf4j.Logger;
@@ -621,7 +622,15 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
     public Map<String, Object> addToHistory(ScheduleRealInfo t) {
         Map<String, Object> rs = new HashMap<>();
         try {
+            // 检查调度日期
+            DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+            long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(t.getScheduleDateStr());
             String clZbh = t.getClZbh(), lpName = t.getLpName();
+            if (today < scheduleDate || today - scheduleDate > 172800000) {
+                rs.put("status", ResponseCode.ERROR);
+                rs.put("msg", "无效的调度日期");
+                return rs;
+            }
             if (StringUtils.isEmpty(lpName) || StringUtils.isEmpty(lpName.trim())) {
                 rs.put("status", ResponseCode.ERROR);
                 rs.put("msg", "路牌信息缺失");
@@ -4667,6 +4676,14 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
         rs.put("status", ResponseCode.ERROR);
  
         ScheduleRealInfo oldSch = super.findById(sch.getId());
+        // 检查调度日期
+        DateTimeFormatter formatter = DateTimeFormat.forPattern("yyyy-MM-dd");
+        long today = formatter.parseMillis(new DateTime().toString("yyyy-MM-dd")), scheduleDate = formatter.parseMillis(sch.getScheduleDateStr());
+        if (today < scheduleDate || today - scheduleDate > 172800000) {
+            rs.put("status", ResponseCode.ERROR);
+            rs.put("msg", "无效的调度日期");
+            return rs;
+        }
         //事后日志记录
         AfterwardsLogger aflog = AfterwardsLogger.start(oldSch, "事后调整");
  
@@ -32,7 +32,7 @@ spring.datasource.hikari.register-mbeans=true
  
 kafka.use= true
 spring.kafka.consumer.bootstrap-servers= 192.170.100.114:9092,192.170.100.114:9093,192.170.100.114:9094
-spring.kafka.consumer.group-id= schedule-system
+spring.kafka.consumer.group-id= schedule-system-test
 spring.kafka.consumer.auto-offset-reset= latest
 spring.kafka.consumer.key-deserializer= org.apache.kafka.common.serialization.StringDeserializer
 spring.kafka.consumer.value-deserializer= org.apache.kafka.common.serialization.StringDeserializer
@@ -59,14 +59,11 @@
     }
 </style>
 <div class="system_change_log">
-    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2023-08-06 更新说明 Changelog</h2>
+    <h2 style="text-indent: 35px;margin: 10px 0 5px;">2023-09-16 更新说明 Changelog</h2>
     <br><br>
     <ul>
-        <li class="sub_title"><h6>线调</h6></li>
-        <li><span class="label s_c_change">新增</span>1.线调增加企业信息化运行监控中心推送的异常停车信息</li>
-        <li><span class="label s_c_change">新增</span>2.线调模拟图、地图增加车辆的实时电量信息显示</li>
-        <li class="sub_title"><h6>系统安全</h6></li>
-        <li><span class="label s_c_change">新增</span>1.启用统一门户集群调度的单点登录功能，原登录页面暂时沿用</li>
+        <li class="sub_title"><h6>线调、油电管理</h6></li>
+        <li><span class="label s_c_change">修改</span>1.历史路单维护、进出场存油(恒定)、进出场存电(恒定)的编辑限制统一为T+2(以今日为锚点，可以编辑今日、昨日、前日的数据)</li>
     </ul>
  
 </div>