From c660047d5ab2562e1f22606ad3e25d3fefaf340a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?=
 <wang.haotian@hzleaper.com>
Date: Fri, 6 Jun 2025 10:53:15 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=8F=E8=A1=8C=E7=BB=93=E6=9D=9F=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=E5=85=B3=E7=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/zhehekeji/web/service/CronTab.java    | 34 +++++++++----------
 .../com/zhehekeji/web/service/PlcService.java |  5 +++
 .../web/service/SteeringEngineService.java    |  2 ++
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/web/src/main/java/com/zhehekeji/web/service/CronTab.java b/web/src/main/java/com/zhehekeji/web/service/CronTab.java
index 8beb1f9..5313200 100644
--- a/web/src/main/java/com/zhehekeji/web/service/CronTab.java
+++ b/web/src/main/java/com/zhehekeji/web/service/CronTab.java
@@ -80,23 +80,23 @@ public class CronTab {
         lightTimeMap.put(streetId,System.currentTimeMillis());
     }
 
-    @Scheduled(cron = "0 0/1 * * * ?")
-    public void lightStatus() {
-        log.debug(" lightStatus");
-        long timeStamp = System.currentTimeMillis();
-
-        Iterator<Map.Entry<Integer, Long>> it = lightTimeMap.entrySet().iterator();
-        while (it.hasNext()){
-            Map.Entry<Integer, Long> entry = it.next();
-            if((BigInteger.valueOf(timeStamp).subtract(BigInteger.valueOf(entry.getValue()))).compareTo(timeDIff) > 0){
-                List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id",entry.getKey()));
-                lightSources.forEach(lightSource -> {
-                    lightSourceService.controllerLightSource(lightSource,0);
-                });
-                it.remove();
-            }
-        }
-    }
+//    @Scheduled(cron = "0 0/1 * * * ?")
+//    public void lightStatus() {
+//        log.debug(" lightStatus");
+//        long timeStamp = System.currentTimeMillis();
+//
+//        Iterator<Map.Entry<Integer, Long>> it = lightTimeMap.entrySet().iterator();
+//        while (it.hasNext()){
+//            Map.Entry<Integer, Long> entry = it.next();
+//            if((BigInteger.valueOf(timeStamp).subtract(BigInteger.valueOf(entry.getValue()))).compareTo(timeDIff) > 0){
+//                List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id",entry.getKey()));
+//                lightSources.forEach(lightSource -> {
+//                    lightSourceService.controllerLightSource(lightSource,0);
+//                });
+//                it.remove();
+//            }
+//        }
+//    }
 
 
     public static void checkFileTime(File dir,int days) {
diff --git a/web/src/main/java/com/zhehekeji/web/service/PlcService.java b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
index cc2caca..03f15ee 100644
--- a/web/src/main/java/com/zhehekeji/web/service/PlcService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/PlcService.java
@@ -103,6 +103,7 @@ public class PlcService {
      */
     public void orderStart(PlcCmdInfo plcCmdInfo) {
         Street street = streetService.getStreetByPlcId(plcCmdInfo.getPlcId());
+
         List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id",street.getId()));
         lightSources.forEach(lightSource -> {
             lightSourceService.controllerLightSource(lightSource,1);
@@ -193,6 +194,10 @@ public class PlcService {
         if (street == null) {
             return;
         }
+        List<LightSource> lightSources = lightSourceMapper.selectList(new QueryWrapper<LightSource>().eq("street_id",street.getId()));
+        lightSources.forEach(lightSource -> {
+            lightSourceService.controllerLightSource(lightSource,0);
+        });
         Order order = orderMapper.getOneByOrderNum(plcCmdInfo.getOrderNum());
         if (order == null) {
             log.error("订单结束信号，订单不存在，orderNum:{}", plcCmdInfo.getOrderNum());
diff --git a/web/src/main/java/com/zhehekeji/web/service/SteeringEngineService.java b/web/src/main/java/com/zhehekeji/web/service/SteeringEngineService.java
index d6deb83..3649b85 100644
--- a/web/src/main/java/com/zhehekeji/web/service/SteeringEngineService.java
+++ b/web/src/main/java/com/zhehekeji/web/service/SteeringEngineService.java
@@ -3,6 +3,7 @@ package com.zhehekeji.web.service;
 import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.zhehekeji.web.entity.LightSource;
 import com.zhehekeji.web.entity.SteeringEngine;
 import com.zhehekeji.web.mapper.SteeringEngineMapper;
 import com.zhehekeji.web.mapper.StockLogMapper;
@@ -45,6 +46,7 @@ public class SteeringEngineService extends ServiceImpl<SteeringEngineMapper,Stee
                 // 在跑随行
                 if (!newEngine.getJobnum().equals("0")) {
                     log.info("随行开始");
+
                     plcService.orderStart(SteeringEngine.getPlcCmdInfo(newEngine));
                 }
                 // 随行结束