From 2f0370645ddd5cabfecd77238f6e38c05cd6a466 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期四, 19 九月 2024 08:06:29 +0800
Subject: [PATCH] liquibase使用说明：1、changeset zsh:20240904003 设置创建者及序号id（唯一不能重复） preconditions onFail:CONTINUE onError:CONTINUE 设置异常错误规则 precondition-sql-check expectedResult:0 SELECT COUNT(*) FROM sys_dict_type 设置sql执行的前置条件，符合执行，不符合直接结束 2、建表sql判断表是否存在需要在表名的基础上加库限制：SELECT count(1) FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME = 'raw_glass_storage_station' and table_schema = 'hangzhoumes'; 防止因为同一连接其他库已有该表造成无法创建表或者重复建表的情况发生。
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 62 +++++++++++++++----------------
1 files changed, 30 insertions(+), 32 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 d5d59a5..2a52753 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
@@ -12,6 +12,9 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
@@ -25,7 +28,7 @@
@Autowired
private ReportingWorkService reportingWorkService;
@Autowired
- private OptimizeProjectService optimizeProjectService;
+ private OptimizeProjectService optimizeProjectService;
@Autowired
private OrdersService ordersService;
/**
@@ -33,46 +36,41 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 2000)
- public void screenHome(){
+ @Scheduled(fixedDelay = 10000)
+ public void screenHome() {
JSONObject jsonObject = new JSONObject();
- //姝ｅ湪绛夊緟杩涚墖鐨勭幓鐠�
Reportingdamage reportingdamage = new Reportingdamage();
- reportingdamage.setReportingWorkTime("2024-05-11");
- //鑾峰彇鍒囧壊淇℃伅
- reportingdamage.setThisProcess("鍒囧壊");
- List<Reportingdamage> cutting = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("cutting", cutting);
- //鑾峰彇纾ㄨ竟淇℃伅
- reportingdamage.setThisProcess("纾ㄨ竟");
- List<Reportingdamage> edging = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("edging", edging);
- //鑾峰彇閽㈠寲淇℃伅
- reportingdamage.setThisProcess("閽㈠寲");
- List<Reportingdamage> tempering = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("tempering", tempering);
- //鑾峰彇澶硅兌淇℃伅
- reportingdamage.setThisProcess("澶硅兌");
- List<Reportingdamage> doubling = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("doubling", doubling);
- //鑾峰彇涓┖淇℃伅
- reportingdamage.setThisProcess("涓┖");
- List<Reportingdamage> hollow = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("hollow", hollow);
- //鑾峰彇鍖呰淇℃伅
- reportingdamage.setThisProcess("鍖呰");
- List<Reportingdamage> packaging = reportingWorkService.selectDamage(reportingdamage);
- jsonObject.append("packaging", packaging);
+ // 鑾峰彇褰撳墠鏃ユ湡
+ 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);
+ //鎵囧舰鍥惧悇璁惧鐨勫姞宸ョ牬鎹熸暟閲�
+ List<Reportingdamage> device = reportingWorkService.selectDamage(reportingdamage);
+ jsonObject.append("device", device);
+
//鑾峰彇娆＄牬鏈ˉ淇℃伅
- List<AwaitingRepair>awaitingRepairs = reportingWorkService.selectAwaitingRepair();
+ List<AwaitingRepair> awaitingRepairs = reportingWorkService.selectAwaitingRepair();
jsonObject.append("awaitingRepairs", awaitingRepairs);
//鑾峰彇姝ｅ湪杩涜鐨勫伐绋�
- List<OptimizeProject>optimizeProjects= optimizeProjectService.getDoingTask();
+ List<OptimizeProject> optimizeProjects = optimizeProjectService.getDoingTask();
jsonObject.append("DoingTask", optimizeProjects);
//鑾峰彇褰撳墠璁㈠崟
- List<Orders>orders=ordersService.selectOrders();
+ List<Orders> orders = ordersService.selectOrders();
jsonObject.append("orders", orders);
+ /*鐜板満瑙勫垝鍥炬樉绀�*/
+
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("screen");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
--
Gitblit v1.8.0