From d81fe653d65bd5fa7a35a75c1d478d25bc735ac6 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期五, 16 八月 2024 16:24:50 +0800
Subject: [PATCH] 增加大屏推送的间隔时间，更改订单详情查询数据，增加扇形图点击查询方法，
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java | 28 ++++++++++++--
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java | 5 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java | 4 ++
hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java | 4 +-
hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java | 1
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcScreenTask.java | 21 +++++++++-
6 files changed, 53 insertions(+), 10 deletions(-)
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
index 372dc35..b0b4078 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/order/entity/Orderdetail.java
@@ -28,6 +28,14 @@
private String project;
/**
+ * 娴佺▼鍗″彿
+ */
+ private String processId;
+ /**
+ * 璁㈠崟搴忓彿
+ */
+ private String orderNumber;
+ /**
* 浜у搧鍚嶇О
*/
private String productName;
@@ -50,13 +58,25 @@
*/
private Integer quantity;
/**
- * 鍔犲伐鏂瑰紡
+ * 琛ョ墖鏁伴噺
*/
- private String processingNote;
+ private Integer numberPatches;
/**
- * 閫佽揣鏃堕棿
+ * 宸插叆鏁伴噺
*/
- private String deliveryDate;
+ private Integer receivedQuantity;
+ /**
+ * 鐢熶骇鐘舵��
+ */
+ private Integer terminationStatus;
+ /**
+ * 鍖呰鏂瑰紡
+ */
+ private String packType;
+ /**
+ * 宸ョ▼鍙�
+ */
+ private String projectNo;
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
index 375cbc7..853e007 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/controller/ReportingWorkController.java
@@ -27,14 +27,15 @@
@Autowired
private ReportingWorkService reportingWorkService;
- @ApiOperation("鏄剧ず宸ョ▼閫夋嫨淇℃伅")
+ @ApiOperation("鏄剧ず澶у睆鏄剧ず鎵囧舰鍥句俊鎭�")
@PostMapping("/selectDamage") //鏄剧ず宸ョ▼閫夋嫨淇℃伅
@ResponseBody
public Result<List<Reportingdamage>> selectDamage(@RequestBody Reportingdamage reportingdamage) {
log.info("灏嗚姹傚弬鏁板皝瑁呭湪璇锋眰绫婚噷闈�");
List<Reportingdamage> glass = reportingWorkService.selectDamage(reportingdamage);
- log.info("鏄剧ず宸ョ▼閫夋嫨淇℃伅:{}", glass);
+ log.info("鏄剧ず澶у睆鏄剧ず鎵囧舰鍥句俊鎭�:{}", glass);
return Result.build(200, "", glass);
}
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
index cd88ede..130ce69 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/entity/request/Reportingdamage.java
@@ -31,6 +31,10 @@
* 娆＄牬鏃堕棿
*/
private String reportingWorkTime;
+ /**
+ * 娆＄牬鏃堕棿2
+ */
+ private String reportingWorkTime2;
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
index 47f829c..92d51e5 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/pp/service/impl/ReportingWorkServiceImpl.java
@@ -42,6 +42,7 @@
//.eq("this_process", reportingdamage.getThisProcess())
//.eq("device_name",reportingdamage.getDeviceName())
.ge("reporting_work_time", reportingdamage.getReportingWorkTime())
+ .le("reporting_work_time",reportingdamage.getReportingWorkTime2())
.groupBy("this_process");
return reportingDamageMapper.selectList(queryWrapper);
}
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
index 0118321..94b3a59 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/java/com/mes/job/PlcLoadGlassTask.java
@@ -166,12 +166,12 @@
}
}
}
- @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 10000)
public void loadGlassIsRun() {
JSONObject jsonObject = new JSONObject();
//鏄惁寮�濮嬪伐绋�
Engineering engineering = engineeringService.selectInitiate(1);
- jsonObject.append("engineering", engineering);
+ jsonObject.append("engineering", engineering);
//宸ヤ綅淇℃伅
List<UpWorkstation> upWorkstations = upWorkstationService.list();
jsonObject.append("list", upWorkstations);
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 ea60109..3d06990 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;
@@ -33,14 +36,28 @@
* fixedDelay : 涓婁竴涓皟鐢ㄧ粨鏉熷悗鍐嶆璋冪敤鐨勫欢鏃�
*/
- @Scheduled(fixedDelay = 2000)
+ @Scheduled(fixedDelay = 10000)
public void screenHome() {
JSONObject jsonObject = new JSONObject();
Reportingdamage reportingdamage = new Reportingdamage();
- reportingdamage.setReportingWorkTime("2024-05-11");
+ //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("2024-05-11" + " 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);
--
Gitblit v1.8.0