From d799fbde44cc568a3e15d78dc6e582ff244ffa89 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期六, 29 三月 2025 16:05:44 +0800
Subject: [PATCH] 1、卧式理片重置任务调整,避免无任务情况下无法将任务交互表的数据清掉 2、中空领取任务界面新增产品名称,便于识别产品 3、调整部分定时任务间隔时间 4、定时任务分隔开,按照两个/多个界面的websocket由一个分为多个 5、取消钢化功能开发中z

---
 hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
index 2a52753..e53a18c 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java
@@ -36,7 +36,7 @@
      * fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
      */
 
-    @Scheduled(fixedDelay = 10000)
+//    @Scheduled(fixedDelay = 10000)
     public void screenHome() {
         JSONObject jsonObject = new JSONObject();
         Reportingdamage reportingdamage = new Reportingdamage();
@@ -55,12 +55,12 @@
         reportingdamage.setReportingWorkTime(startOfPeriodStr);
         reportingdamage.setReportingWorkTime2(endOfPeriodStr);
         //鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
-        List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
-        jsonObject.append("device", device);
+//        List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
+//        jsonObject.append("device", device);
 
         //鑾峰彇娆$牬鏈ˉ淇℃伅
-        List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
-        jsonObject.append("awaitingRepairs", awaitingRepairs);
+//        List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
+//        jsonObject.append("awaitingRepairs", awaitingRepairs);
         //鑾峰彇姝e湪杩涜鐨勫伐绋�
         List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
         jsonObject.append("DoingTask", optimizeProjects);

--
Gitblit v1.8.0