From 18646bfbe181408a7e33c421d2da5d9688d698d8 Mon Sep 17 00:00:00 2001
From: shenzhouyu <zhouyu.shen@xujiesoft.com>
Date: Mon, 8 Jun 2026 16:25:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E8=89=B2=E7=81=AF=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=88=E5=8E=9F=E5=9B=A0=E7=BB=B4=E6=8A=A4=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/ThreeColorLampDownlogMapper.java   |  2 +
 .../impl/ModbusCollectServiceImpl.java        | 73 +++++++++++++------
 .../dao/ThreeColorLampDownlogMapper.xml       |  1 +
 3 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/ThreeColorLampDownlogMapper.java b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/ThreeColorLampDownlogMapper.java
index dd03256..b608260 100644
--- a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/ThreeColorLampDownlogMapper.java
+++ b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/mapper/ThreeColorLampDownlogMapper.java
@@ -46,4 +46,6 @@ public interface ThreeColorLampDownlogMapper extends BaseMapper<ThreeColorLampDo
                                            @Param("seqNo") String seqNo,
                                            @Param("orderNo") String orderNo,
                                            @Param("runTime") int runTime);
+
+    ThreeColorLampDownlog selectDownlogLastBySeqNo(String site, String resourceId);
 }
diff --git a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java
index 218c80c..03520a3 100644
--- a/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java
+++ b/threecolor-modbus-collector/src/main/java/com/xujie/modbus/service/impl/ModbusCollectServiceImpl.java
@@ -859,8 +859,13 @@ public class ModbusCollectServiceImpl
                         Date LampDownlogEndTime = new Date();
                         if(downlogChangeLast != null){
                             SfdcTimeHist timeHist = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), resourceScheduled.getSeqNo(), "自动停机");
-                            if("Y".equals(timeHist.getCompletedFlag())){
-                                downlogChangeLast.setEventDesc(timeHist.getEventDesc());
+                            if(timeHist != null && "Y".equals(timeHist.getCompletedFlag()) && resourceScheduled.getSfdcid() != null){
+                                ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), resourceScheduled.getSeqNo());
+                                if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
+                                    downlogChangeLast.setEventDesc(timeHist.getEventDesc()+"(手动结束停机)");
+                                }else{
+                                    downlogChangeLast.setEventDesc(timeHist.getEventDesc());
+                                }
                             }
                             downlogChangeLast.setEndDate(LampDownlogEndTime);
                             threeColorLampDownlogMapper.updateById(downlogChangeLast);
@@ -954,7 +959,7 @@ public class ModbusCollectServiceImpl
                                         if(StringUtils.isNotBlank(sfdcTimeHist1.getEventDesc())){
                                             String startTime = sdf.format(sfdcTimeHist1.getEventTime());
                                             String endTime = sdf.format(sfdcTimeHist1.getTillTime());
-                                            threeColorLampDownlogMapper.updateDownLogEventDescByCreateDate(startTime,
+                                            int sa = threeColorLampDownlogMapper.updateDownLogEventDescByCreateDate(startTime,
                                                     endTime,
                                                     sfdcTimeHist1.getEventDesc(),
                                                     folderLocation.getSite(),
@@ -962,6 +967,7 @@ public class ModbusCollectServiceImpl
                                                     sfdcTimeHist1.getSeqNo(),
                                                     sfdcTimeHist1.getOrderNo(),
                                                     runTime);
+                                            logger.info("更新了downlog表，几条sa:{}",sa);
                                             /*threeColorLampDownlogMapper.updateDownLogEventDesc(
                                                     startTime,
                                                     endTime,
@@ -1024,7 +1030,7 @@ public class ModbusCollectServiceImpl
                             threeColorLampDownlogMapper.insert(downlog);
                         }else{
                             //如果有最后一条，并且灯是100并是无工单运作做试验,就去更新那最后一条数据
-                            if(1 == registerData.get(0) && 0 == registerData.get(1) && 0 == registerData.get(2) && "做试验".equals(downlogChangeLast.getEventDesc())){
+                            /*if(1 == registerData.get(0) && 0 == registerData.get(1) && 0 == registerData.get(2) && "做试验".equals(downlogChangeLast.getEventDesc())){
                                 SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
                                 downlogChangeLast.setWorkShop(soscheduled.getSWorkcenterno() == null ? null : soscheduled.getSWorkcenterno());
                                 downlogChangeLast.setOrderNo(soscheduled.getOrderno()== null ? null : soscheduled.getOrderno());
@@ -1032,13 +1038,24 @@ public class ModbusCollectServiceImpl
                                 downlogChangeLast.setSShiftno(soscheduled.getSShiftno()== null ? null : soscheduled.getSShiftno());
                                 downlogChangeLast.setEventDesc("正常运作");
                                 threeColorLampDownlogMapper.updateById(downlogChangeLast);
-                            }
+                            }*/
                             //如果是999，并且工单是同一个，则结束
                             if("999".equals(downlogChangeLast.getLamp()) && folderLocation.getResourceId().equals(downlogChangeLast.getResourceId())){
                                 downlogChangeLast.setEndDate(new Date());
                                 threeColorLampDownlogMapper.updateById(downlogChangeLast);
                             }
                             if(!downlogChangeLast.getSeqNo().equals(resourceScheduled.getSeqNo())){
+                                SfdcTimeHist sfdcTimeHistNew = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), downlogChangeLast.getSeqNo(), "自动停机");
+                                if(sfdcTimeHistNew != null && "Y".equals(sfdcTimeHistNew.getCompletedFlag())){
+                                    ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), resourceScheduled.getSeqNo());
+                                    if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
+                                        downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc()+"(手动结束停机)");
+                                    }else{
+                                        downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc());
+                                    }
+                                }else{
+                                    downlogChangeLast.setEventDesc("换规格");
+                                }
                                 downlogChangeLast.setEndDate(new Date());
                                 threeColorLampDownlogMapper.updateById(downlogChangeLast);
                                 SoscheduledroutingVo soscheduled = threeColorLampMapper.getSoscheduled(resourceScheduled.getSeqNo());
@@ -1093,7 +1110,7 @@ public class ModbusCollectServiceImpl
                         downlog.setSite(folderLocation.getSite());
                         downlog.setResourceId(folderLocation.getResourceId());
                         if(registerData.get(0) == 1){
-                            downlog.setEventDesc("做试验");
+                            downlog.setEventDesc("正常运作");
                         }else{
                             downlog.setEventDesc("计划停机");
                         }
@@ -1108,7 +1125,7 @@ public class ModbusCollectServiceImpl
                             downlog.setSite(folderLocation.getSite());
                             downlog.setResourceId(folderLocation.getResourceId());
                             if(registerData.get(0) == 1){
-                                downlog.setEventDesc("做试验");
+                                downlog.setEventDesc("正常运作");
                             }else{
                                 downlog.setEventDesc("计划停机");
                             }
@@ -1118,21 +1135,35 @@ public class ModbusCollectServiceImpl
                             downlog.setLamp(nowlamp);
                             threeColorLampDownlogMapper.insert(downlog);
                         }else{
-                            downlogChangeLast.setEndDate(new Date());
-                            threeColorLampDownlogMapper.updateById(downlogChangeLast);
-                            ThreeColorLampDownlog downlog = new ThreeColorLampDownlog();
-                            downlog.setSite(folderLocation.getSite());
-                            downlog.setResourceId(folderLocation.getResourceId());
-                            if(registerData.get(0) == 1){
-                                downlog.setEventDesc("做试验");
-                            }else{
-                                downlog.setEventDesc("计划停机");
+                            if(StringUtils.isNotBlank(downlogChangeLast.getSeqNo())){
+                                SfdcTimeHist sfdcTimeHistNew = sfdcTimeHistMapper.selectSfdcTimeHistByNew(folderLocation.getSite(), downlogChangeLast.getSeqNo(), "自动停机");
+                                if(sfdcTimeHistNew != null && "Y".equals(sfdcTimeHistNew.getCompletedFlag())){
+                                    ResourceScheduled shortScheduled = resourceScheduledMapper.getOneResourceSchedule(folderLocation.getSite(), folderLocation.getResourceId(), downlogChangeLast.getSeqNo());
+                                    if(shortScheduled != null && "Y".equals(shortScheduled.getCloseFlag())){
+                                        downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc()+"(手动结束停机)");
+                                    }else{
+                                        downlogChangeLast.setEventDesc(sfdcTimeHistNew.getEventDesc());
+                                    }
+
+                                }else{
+                                    downlogChangeLast.setEventDesc("换规格");
+                                }
+                                downlogChangeLast.setEndDate(new Date());
+                                threeColorLampDownlogMapper.updateById(downlogChangeLast);
+                                ThreeColorLampDownlog downlog = new ThreeColorLampDownlog();
+                                downlog.setSite(folderLocation.getSite());
+                                downlog.setResourceId(folderLocation.getResourceId());
+                                if(registerData.get(0) == 1){
+                                    downlog.setEventDesc("正常运作");
+                                }else{
+                                    downlog.setEventDesc("计划停机");
+                                }
+                                downlog.setStartDate(new Date());
+                                downlog.setCreateDate(new Date());
+                                String nowlamp = registerData.get(0)+"" + registerData.get(1) + ""+registerData.get(2);
+                                downlog.setLamp(nowlamp);
+                                threeColorLampDownlogMapper.insert(downlog);
                             }
-                            downlog.setStartDate(new Date());
-                            downlog.setCreateDate(new Date());
-                            String nowlamp = registerData.get(0)+"" + registerData.get(1) + ""+registerData.get(2);
-                            downlog.setLamp(nowlamp);
-                            threeColorLampDownlogMapper.insert(downlog);
 
                             if("999".equals(downlogChangeLast.getLamp()) && folderLocation.getResourceId().equals(downlogChangeLast.getResourceId())){
                                 ThreeColorLampDownlog downlogChangeLast1 = threeColorLampDownlogMapper.selectDownlogLast(folderLocation.getSite(),folderLocation.getResourceId());
diff --git a/threecolor-modbus-collector/src/main/resources/dao/ThreeColorLampDownlogMapper.xml b/threecolor-modbus-collector/src/main/resources/dao/ThreeColorLampDownlogMapper.xml
index c2c9fba..0513a89 100644
--- a/threecolor-modbus-collector/src/main/resources/dao/ThreeColorLampDownlogMapper.xml
+++ b/threecolor-modbus-collector/src/main/resources/dao/ThreeColorLampDownlogMapper.xml
@@ -79,6 +79,7 @@
         update three_color_lamp_downlog
         set event_desc = #{eventDesc}
         where FORMAT(start_date, 'yyyy-MM-dd HH:mm') >= #{startTime}
+        and FORMAT(start_date, 'yyyy-MM-dd HH:mm') &lt;= #{endTime}
         and site = #{site}
         and resource_id = #{resourceId}
         and seq_no = #{seqNo}