From 60525d151c7a1de6fe455acb61a7a29017935279 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 12 九月 2025 09:05:01 +0800
Subject: [PATCH] 1、修改150配置
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 61 ++++++++++++++++--------------
1 files changed, 33 insertions(+), 28 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 b4a5334..f547e88 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
@@ -1,4 +1,5 @@
package com.mes.job;
+
import cn.hutool.json.JSONObject;
import com.mes.order.entity.Orders;
import com.mes.order.service.OrdersService;
@@ -31,48 +32,52 @@
private OptimizeProjectService optimizeProjectService;
@Autowired
private OrdersService ordersService;
+
/**
* fixedRate : 涓婁竴涓皟鐢ㄥ紑濮嬪悗鍐嶆璋冪敤鐨勫欢鏃讹紙涓嶇敤绛夊緟涓婁竴娆¤皟鐢ㄥ畬鎴愶級
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 10000)
+ @Scheduled(fixedDelay = 1000)
public void screenHome() {
JSONObject jsonObject = new JSONObject();
- Reportingdamage reportingdamage = new Reportingdamage();
- //reportingdamage.setReportingWorkTime("2024-05-11");
- // 鑾峰彇褰撳墠鏃ユ湡
- LocalDate today = LocalDate.now();
- // 璁＄畻鏈�杩戜竷澶╃殑寮�濮嬫棩鏈�
- LocalDate startOfPeriod = today.minusDays(6); // 7澶╃殑鑼冨洿鍖呮嫭浠婂ぉ锛屾墍浠ュ噺鍘�6澶�
- // 鏈�杩戜竷澶╃殑缁撴潫鏃ユ湡灏辨槸浠婂ぉ
- LocalDate endOfPeriod = today;
- // 鏍煎紡鍖栨棩鏈熶负瀛楃涓�
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
- String startOfPeriodStr = startOfPeriod.format(formatter);
- String endOfPeriodStr = endOfPeriod.format(formatter);
- // 璁剧疆涓烘渶杩戜竷澶╃殑鏃堕棿鑼冨洿
- reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
- //reportingdamage.setReportingWorkTime(startOfPeriodStr + " to " + endOfPeriodStr);
- //鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
- List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("device", device);
- //鑾峰彇娆＄牬鏈ˉ淇℃伅
- List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
- jsonObject.append("awaitingRepairs", awaitingRepairs);
- //鑾峰彇姝ｅ湪杩涜鐨勫伐绋�
- List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
- jsonObject.append("DoingTask", optimizeProjects);
- //鑾峰彇褰撳墠璁㈠崟
- List<Orders> orders = ordersService.selectOrders();
- jsonObject.append("orders", orders);
/*鐜板満瑙勫垝鍥炬樉绀�*/
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("screen");
if (sendwServer != null) {
+ Reportingdamage reportingdamage = new Reportingdamage();
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate today = LocalDate.now();
+ // 璁＄畻鏈�杩戜竷澶╃殑寮�濮嬫棩鏈�
+ LocalDate startOfPeriod = today.minusDays(6); // 7澶╃殑鑼冨洿鍖呮嫭浠婂ぉ锛屾墍浠ュ噺鍘�6澶�
+ // 鏈�杩戜竷澶╃殑缁撴潫鏃ユ湡灏辨槸浠婂ぉ
+ LocalDate endOfPeriod = today;
+ // 鏍煎紡鍖栨棩鏈熶负瀛楃涓�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+ String startOfPeriodStr = startOfPeriod.format(formatter);
+ String endOfPeriodStr = endOfPeriod.format(formatter);
+ // 璁剧疆涓烘渶杩戜竷澶╃殑鏃堕棿鑼冨洿
+// reportingdamage.setReportingWorkTime("2024-05-11");
+// reportingdamage.setReportingWorkTime(startOfPeriodStr);
+// reportingdamage.setReportingWorkTime2(endOfPeriodStr);
+ reportingdamage.setReportingWorkTime("2025-04-15");
+ reportingdamage.setReportingWorkTime2("2025-04-22");
+ //鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
+ List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
+ jsonObject.append("device", device);
+
+ //鑾峰彇娆＄牬鏈ˉ淇℃伅
+ List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
+ jsonObject.append("awaitingRepairs", awaitingRepairs);
+ //鑾峰彇姝ｅ湪杩涜鐨勫伐绋�
+// List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
+// jsonObject.append("DoingTask", optimizeProjects);
+ //鑾峰彇褰撳墠璁㈠崟
+ List<Orders> orders = ordersService.selectOrders();
+ jsonObject.append("orders", orders);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
--
Gitblit v1.8.0