From f44cf32b7209f48f4b2efe07971bed7a67862be2 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期三, 11 九月 2024 14:49:18 +0800
Subject: [PATCH] 过程参数调试完成
---
smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
index 077ac14..d6d7c6d 100644
--- a/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
+++ b/smart-man-boot/src/main/java/com/qianwen/smartman/modules/mdc/service/impl/ProcessParameterServiceImpl.java
@@ -180,7 +180,7 @@
String workstationId = vo.getWorkstationId();
LocalDate queryTime = vo.getQueryTime();
Integer shift = vo.getShift();
- Workstation workstation = (Workstation) this.workstationService.getById(Long.valueOf(Func.toLong(workstationId)));
+ Workstation workstation = (Workstation) this.workstationService.getById(Func.toLong(workstationId));
return (ShiftTimeVO) Optional.ofNullable(workstation).map(w -> {
CalendarShiftTimeSlicesDTO timeSliceShift = TimeSliceCache.getTimeSliceShift(workstation.getCalendarCode(), queryTime, shift);
return (ShiftTimeVO) Optional.ofNullable(timeSliceShift).map(time -> {
@@ -674,7 +674,13 @@
return result;
}
-
+ /**
+ * 鑾峰彇宸ヤ綅鏈�鏂板弬鏁板��
+ * @param workstationId 宸ヤ綅id
+ * @param item 鍙傛暟鍚嶇О,濡侱eviceStatus/Output
+ * @param time 鏃堕棿锛屽弬鏁板簲灏忎簬璇ユ椂闂�
+ * @return
+ */
public ProcessParameterVO getLastParameterLessThanTime(long workstationId,String item,Long time) {
//yys
LastProcessParam lp = this.parameterMapper.lastParameterLessThanTime(workstationId,item,time);
@@ -697,6 +703,13 @@
return vo;
}
+ /**
+ * 鑾峰彇宸ヤ綅鏈�鏂板弬鏁板��(閲囬泦鏃堕棿搴斿ぇ浜庢寚瀹氭椂闂�)
+ * @param workstationId
+ * @param item 鍙傛暟鍚嶇О,濡侱eviceStatus/Output
+ * @param time 鎸囧畾鐨勬椂闂�
+ * @return
+ */
public ProcessParameterVO getLastParameterGreaterThenTime(long workstationId,String item,Long time) {
//yys
LastProcessParam lp = this.parameterMapper.lastParameterGreaterThanTime(workstationId,item,time);
--
Gitblit v1.9.3