From 88cbf1a8c50a15f35dd78a50adc43e71a6530775 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期一, 26 五月 2025 16:22:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 25 +++-
hangzhoumesParent/moduleService/CacheGlassModule/pom.xml | 23 ++++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java | 5
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java | 3
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml | 2
UI-Project/src/views/largescreendisplay/timeaxis.vue | 62 +++++++++--
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml | 6
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java | 4
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 4
UI-Project/src/lang/zh.js | 2
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/HollowBigStorageCageHistoryTaskService.java | 2
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/mapper/HollowBigStorageCageHistoryTaskMapper.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/mapper/BigStorageCageHistoryTaskMapper.java | 2
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/BigStorageCageHistoryTaskService.java | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml | 2
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java | 14 ++
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java | 13 +
UI-Project/src/views/largescreendisplay/screendisplay.vue | 49 ++++++---
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java | 4
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java | 3
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java | 13 +
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 4
22 files changed, 175 insertions(+), 71 deletions(-)
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index f2adb78..92a5c76 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -521,7 +521,7 @@
hollowState:'涓┖褰撳ぉ杩愯鎯呭喌',
switch:'鍒囨崲',
running:'杩愯涓�',
- stopping:'鍋滄涓�',
+ stopping:'鍋滄',
diffMinutes:'鍒嗛挓',
loadstart:'鍒囧壊寮�濮嬫椂闂�',
loadend:'鍒囧壊缁撴潫鏃堕棿',
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 2a858e4..da5687e 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -38,17 +38,17 @@
let myChartHollow = null;
const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
const handleMessage1 = (data) => {
- edgOneTasks.value = data.edgOneTasks[0];
- edgTwoTasks.value = data.edgTwoTasks[0];
+ edgOneTasks.value = data.edgOneCount[0];
+ edgTwoTasks.value = data.edgOneCount[0];
engineeringOne.value = data.engineeringOne[0];
engineeringTwo.value = data.engineeringTwo[0];
- if (numBoxes.value != edgOneTasks.value.length) {
- numBoxes.value = edgOneTasks.value.length;
+ if (numBoxes.value != edgOneTasks.value) {
+ numBoxes.value = edgOneTasks.value;
initBoxes(boxes, numBoxes, 'firstup');
}
- if (numBoxes2.value != edgTwoTasks.value.length) {
- numBoxes2.value = edgTwoTasks.value.length;
+ if (numBoxes2.value != edgTwoTasks.value) {
+ numBoxes2.value = edgTwoTasks.value;
initBoxes(boxes2, numBoxes2, 'firstup');
}
timeAxisCreate(t('large.cuttingState'), chartLoad.value, myChartLoad, tableDataTime(false, data.loadRunTimes[0]));
@@ -106,15 +106,20 @@
const tableData = [];
if (tableDatax.length > 0) {
tableDatax.forEach((item, index) => {
- tableData.push({
- firstTimestamp: index == 0 ? item.startTimestamp : tableDatax[index - 1].secondTimestamp,
- secondTimestamp: index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp,
- diffMinutes: item.diffMinutes,
- startTimestamp: item.startTimestamp,
- endTimestamp: item.endTimestamp,
- state: 1
- });
- if (result) {
+ const time1 = new Date(index == 0 ? item.startTimestamp : tableDatax[index - 1].secondTimestamp);
+ const time2 = new Date(index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp);
+
+ const diffInSeconds = Math.abs(time2 - time1) / 1000;
+ if (diffInSeconds > 60) {
+ tableData.push({
+ firstTimestamp: index == 0 ? item.startTimestamp : tableDatax[index - 1].secondTimestamp,
+ secondTimestamp: index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp,
+ diffMinutes: item.diffMinutes,
+ startTimestamp: item.startTimestamp,
+ endTimestamp: item.endTimestamp,
+ state: 1
+ });
+ if (result) {
tableData.push({
firstTimestamp: item.firstTimestamp,
secondTimestamp: item.secondTimestamp,
@@ -124,6 +129,14 @@
state: 2
});
}
+ // console.log("闂撮殧瓒呰繃60绉�", diffInSeconds, time1, time2);
+ } else {
+ if(index>0){
+ // console.log(tableData,index);
+ }
+ // console.log("闂撮殧涓嶈秴杩�60绉�", diffInSeconds, time1, time2);
+ }
+
});
}
@@ -270,7 +283,7 @@
]
};
- mychart.setOption(optionOne);
+ mychart.setOption(optionOne,true);
};
let socket4 = null;
@@ -347,7 +360,7 @@
]
};
- myChart.setOption(option);
+ myChart.setOption(option,true);
const chartDom2 = chartRef2.value;
@@ -393,7 +406,7 @@
]
};
- myChart2.setOption(option2);
+ myChart2.setOption(option2,true);
};
// 灏嗗師濮嬫暟鎹浆鎹负 ECharts 鍥捐〃鎵�闇�鏍煎紡
let categories = ref([]); // 鑾峰彇鏃ユ湡浣滀负 x 杞�
diff --git a/UI-Project/src/views/largescreendisplay/timeaxis.vue b/UI-Project/src/views/largescreendisplay/timeaxis.vue
index 5f449c6..cd77638 100644
--- a/UI-Project/src/views/largescreendisplay/timeaxis.vue
+++ b/UI-Project/src/views/largescreendisplay/timeaxis.vue
@@ -60,7 +60,14 @@
const historical = async () => {
try {
let startTime = window.localStorage.getItem('startTime')
- const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ let response;
+ if (key == "1" || key == "2") {
+ response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ } else if (key == "3") {
+ response = await request.get("/cacheVerticalGlass/bigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ } else {
+ response = await request.get("/hollowGlass/hollowBigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ }
if (response.code == 200) {
ElMessage.success(response.message);
// const formattedData = response.data.records.map(record => ({
@@ -90,14 +97,24 @@
const tableData = [];
if (tableDatax.value.length > 0) {
tableDatax.value.forEach((item, index) => {
- tableData.push({
- firstTimestamp: index == 0 ? item.startTimestamp : tableDatax.value[index - 1].secondTimestamp,
- secondTimestamp: index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp,
- diffMinutes: item.diffMinutes,
- startTimestamp: item.startTimestamp,
- endTimestamp: item.endTimestamp,
- state: 1
- });
+ const time1 = new Date(index == 0 ? item.startTimestamp : tableDatax.value[index - 1].secondTimestamp);
+ const time2 = new Date(index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp);
+
+ const diffInSeconds = Math.abs(time2 - time1) / 1000;
+ if (diffInSeconds > 60) {
+ tableData.push({
+ firstTimestamp: index == 0 ? item.startTimestamp : tableDatax.value[index - 1].secondTimestamp,
+ secondTimestamp: index == tableDatax.length - 1 ? item.endTimestamp : item.firstTimestamp,
+ diffMinutes: item.diffMinutes,
+ startTimestamp: item.startTimestamp,
+ endTimestamp: item.endTimestamp,
+ state: 1
+ });
+ console.log("闂撮殧瓒呰繃60绉�", diffInSeconds, time1, time2);
+ } else {
+ console.log("闂撮殧涓嶈秴杩�60绉�", diffInSeconds, time1, time2);
+ }
+
if (result) {
tableData.push({
firstTimestamp: item.firstTimestamp,
@@ -130,7 +147,14 @@
}
let page = window.localStorage.getItem('pagenumber')
let startTime = window.localStorage.getItem('startTime')
- const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ let response;
+ if (key == "1" || key == "2") {
+ response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ } else if (key == "3") {
+ response = await request.get("/cacheVerticalGlass/bigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ } else {
+ response = await request.get("/hollowGlass/hollowBigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ }
if (response.code == 200) {
ElMessage.success(response.message);
// const formattedData = response.data.records.map(record => ({
@@ -167,7 +191,14 @@
}
let startTime = window.localStorage.getItem('startTime')
let page = window.localStorage.getItem('pagenumber')
- const response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ let response;
+ if (key == "1" || key == "2") {
+ response = await request.get("/cacheGlass/edgStorageDeviceTaskHistory/queryRunTimes?days=" + timeRange.value[1])
+ } else if (key == "3") {
+ response = await request.get("/cacheVerticalGlass/bigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ } else {
+ response = await request.get("/hollowGlass/hollowBigStorageCageHistoryTask/queryRunTimes?days=" + timeRange.value[1])
+ }
if (response.code == 200) {
currentPage2.value = 1
ElMessage.success(response.message);
@@ -291,6 +322,10 @@
let myChart = null;
const chart = ref(null)
const timeAxisCreate = (title, chartDom, mychart, RunTimes) => {
+ if (mychart) {
+ mychart.clear();
+ // 濡傛灉闇�瑕侊紝鍙互閲嶆柊鍒濆鍖栧浘琛�
+ }
if (!chartDom) {
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
@@ -335,8 +370,7 @@
},
z: 1
}));
-
-
+ console.log("segments", RunTimes.length, segments);
const optionOne = {
title: {
text: title,
@@ -430,7 +464,7 @@
]
};
- mychart.setOption(optionOne);
+ mychart.setOption(optionOne, true);
};
</script>
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
index 27a986a..e773798 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/pom.xml
@@ -34,5 +34,28 @@
<java.run.main.class>com.mes.CacheGlassModuleApplication</java.run.main.class>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <archive>
+ <manifest>
+ <addClasspath>true</addClasspath>
+ <classpathPrefix>lib/</classpathPrefix>
+ <mainClass>com.mes.CacheGlassModuleApplication</mainClass>
+ </manifest>
+ <manifestEntries>
+ <Class-Path>resources/</Class-Path>
+ </manifestEntries>
+ </archive>
+ <outputDirectory>${project.build.directory}</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
</project>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 334cfba..97d0ec5 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -24,8 +24,11 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -182,21 +185,27 @@
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
-
- List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ String formatted = sdf.format(startOfToday);
+ LocalDate date = LocalDate.parse(formatted); // formatted = "2025-05-23"
+ LocalDateTime start = date.atStartOfDay(); // 2025-05-23 00:00:00
+ LocalDateTime end = date.plusDays(1).atStartOfDay();
+ int edgOneCount = edgGlassTaskInfoService.count(
new LambdaQueryWrapper<EdgGlassTaskInfo>()
.lt(EdgGlassTaskInfo::getState, 2)
.eq(EdgGlassTaskInfo::getLine, 1)
- .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
+ .between(EdgGlassTaskInfo::getCreateTime, start, end)
);
- List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
+ edgOneCount = edgOneCount >= 6 ? 6 : edgOneCount;
+ int edgTwoCount = edgGlassTaskInfoService.count(
new LambdaQueryWrapper<EdgGlassTaskInfo>()
.lt(EdgGlassTaskInfo::getState, 2)
.eq(EdgGlassTaskInfo::getLine, 2)
- .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
+ .between(EdgGlassTaskInfo::getCreateTime, start, end)
);
- jsonObject.append("edgOneTasks", edgOneTasks);
- jsonObject.append("edgTwoTasks", edgTwoTasks);
+ edgTwoCount = edgTwoCount >= 6 ? 6 : edgTwoCount;
+ jsonObject.append("edgOneCount", edgOneCount);
+ jsonObject.append("edgTwoCount", edgTwoCount);
List<Engineering> engineeringOne = engineeringService.list(
new LambdaQueryWrapper<Engineering>()
.eq(Engineering::getStationCell, 5)
@@ -211,7 +220,7 @@
jsonObject.append("engineeringTwo", engineeringTow);
List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
jsonObject.append("pieChartVOS", pieChartVOS);
- List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes();
+ List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
jsonObject.append("loadRunTimes", loadRunTimes);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
index 3772cb1..47fc151 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/controller/EdgStorageDeviceTaskHistoryController.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.entity.request.TaskHistoryRequest;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -10,12 +11,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.Date;
+import java.util.List;
/**
* (EdgStorageDeviceTaskHistory)琛ㄦ帶鍒跺眰
@@ -45,5 +45,11 @@
return Result.success(edgStorageDeviceTaskHistoryService.queryEdgDailyProduction(request));
}
+ @ApiOperation(value = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�", notes = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�")
+ @GetMapping("/queryRunTimes")
+ public Result<List<RunTime>> queryRunTimes(String days) {
+ return Result.success(edgStorageDeviceTaskHistoryService.queryRunTimes(days));
+ }
+
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
index be8810d..0a6a640 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java
@@ -6,6 +6,7 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
/**
@@ -18,6 +19,6 @@
DailyProductionVO queryEdgDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("deviceId") Integer deviceId);
- List<RunTime> queryRunTimes();
+ List<RunTime> queryRunTimes(@Param("days") String days);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java
index 38bd770..1e0563c 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java
@@ -7,6 +7,7 @@
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.entity.request.TaskHistoryRequest;
+import java.util.Date;
import java.util.List;
/**
@@ -21,6 +22,6 @@
DailyProductionVO queryEdgDailyProduction(TaskHistoryRequest request);
- List<RunTime> queryRunTimes();
+ List<RunTime> queryRunTimes(String days);
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
index e065451..29cf5f6 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
/**
@@ -53,8 +54,8 @@
}
@Override
- public List<RunTime> queryRunTimes(){
- return baseMapper.queryRunTimes();
+ public List<RunTime> queryRunTimes(String days){
+ return baseMapper.queryRunTimes(days);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
index 02adb4e..1440ce8 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
@@ -38,7 +38,7 @@
<select id="queryRunTimes" resultType="com.mes.largenscreen.entity.RunTime">
with edg_storage_cage_history_task_temp as (
select distinct create_time from edg_storage_device_task_history where task_type in (1,3) and
- create_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+ create_time LIKE '%${days}%'
)
SELECT
t1.create_time AS first_timestamp,
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java
index 72daa96..43e8ebb 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/controller/BigStorageCageHistoryTaskController.java
@@ -5,16 +5,15 @@
import com.mes.bigstoragecagetask.entity.request.BigStorageCageHistoryRequest;
import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* @Author : zhoush
@@ -40,4 +39,10 @@
public Result<DailyProductionVO> queryBigDailyProduction(@RequestBody BigStorageCageHistoryRequest request) {
return Result.success(bigStorageCageHistoryTaskService.queryBigDailyProduction(request));
}
+
+ @ApiOperation(value = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�", notes = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�")
+ @GetMapping("/queryRunTimes")
+ public Result<List<RunTime>> queryRunTimes(String days) {
+ return Result.success(bigStorageCageHistoryTaskService.queryRunTimes(days));
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/mapper/BigStorageCageHistoryTaskMapper.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/mapper/BigStorageCageHistoryTaskMapper.java
index 0aab936..5bb802e 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/mapper/BigStorageCageHistoryTaskMapper.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/mapper/BigStorageCageHistoryTaskMapper.java
@@ -19,6 +19,6 @@
DailyProductionVO queryBigDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
- List<RunTime> queryRunTimes();
+ List<RunTime> queryRunTimes(@Param("days") String days);
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/BigStorageCageHistoryTaskService.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/BigStorageCageHistoryTaskService.java
index aca6e5b..afef636 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/BigStorageCageHistoryTaskService.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/BigStorageCageHistoryTaskService.java
@@ -22,6 +22,6 @@
DailyProductionVO queryBigDailyProduction(BigStorageCageHistoryRequest request);
- List<RunTime> queryRunTimes();
+ List<RunTime> queryRunTimes(String days);
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
index d1b7045..e374567 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java
@@ -58,8 +58,8 @@
}
@Override
- public List<RunTime> queryRunTimes(){
- return baseMapper.queryRunTimes();
+ public List<RunTime> queryRunTimes(String days){
+ return baseMapper.queryRunTimes(days);
}
}
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
index 54bf769..0224a8d 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java
@@ -27,6 +27,8 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -220,7 +222,7 @@
jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
List<PieChartVO> pieChartVOS = bigStorageCageService.queryPieChart();
jsonObject.append("pieChartVOS", pieChartVOS);
- List<RunTime> tempRunTimes = bigStorageCageHistoryTaskService.queryRunTimes();
+ List<RunTime> tempRunTimes = bigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
jsonObject.append("tempRunTimes", tempRunTimes);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml
index 0b84c32..0939802 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml
@@ -48,7 +48,7 @@
select distinct create_time
from big_storage_cage_history_task
where task_type = 2
- and create_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+ and create_time LIKE '%${days}%'
)
SELECT t1.create_time AS first_timestamp,
t2.create_time AS second_timestamp,
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java
index 284cce7..a4d8f90 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/controller/HollowBigStorageCageHistoryTaskController.java
@@ -6,16 +6,15 @@
import com.mes.hollowtask.entity.request.HollowBigStorageCageHistoryRequest;
import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.utils.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* (HollowBigStorageCageHistoryTask)琛ㄦ帶鍒跺眰
@@ -42,5 +41,11 @@
public Result<DailyProductionVO> queryHollowDailyProduction(@RequestBody HollowBigStorageCageHistoryRequest request) {
return Result.success(hollowBigStorageCageHistoryTaskService.queryHollowDailyProduction(request));
}
+
+ @ApiOperation(value = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�", notes = "鏌ヨ鐢熶骇绾胯繍琛屾儏鍐�")
+ @GetMapping("/queryRunTimes")
+ public Result<List<RunTime>> queryRunTimes(String days) {
+ return Result.success(hollowBigStorageCageHistoryTaskService.queryRunTimes(days));
+ }
}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/mapper/HollowBigStorageCageHistoryTaskMapper.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/mapper/HollowBigStorageCageHistoryTaskMapper.java
index 28b1db2..74b9b08 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/mapper/HollowBigStorageCageHistoryTaskMapper.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/mapper/HollowBigStorageCageHistoryTaskMapper.java
@@ -18,6 +18,6 @@
DailyProductionVO queryHollowDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
- List<RunTime> queryRunTimes();
+ List<RunTime> queryRunTimes(@Param("days") String days);
}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/HollowBigStorageCageHistoryTaskService.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/HollowBigStorageCageHistoryTaskService.java
index 771f5ac..4fc5fd9 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/HollowBigStorageCageHistoryTaskService.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/HollowBigStorageCageHistoryTaskService.java
@@ -21,6 +21,6 @@
DailyProductionVO queryHollowDailyProduction(HollowBigStorageCageHistoryRequest request);
- List<RunTime> queryRunTimes();
+ List<RunTime> queryRunTimes(String days);
}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java
index a22f2c7..51a1415 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java
@@ -57,8 +57,8 @@
}
@Override
- public List<RunTime> queryRunTimes(){
- return baseMapper.queryRunTimes();
+ public List<RunTime> queryRunTimes(String days){
+ return baseMapper.queryRunTimes(days);
}
}
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
index 3fb4640..56f4244 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -30,6 +30,8 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
@@ -234,7 +236,7 @@
//閽㈠寲楗煎浘鏁版嵁
List<PieChartVO> pieChartVOS = hollowGlassOutRelationInfoService.queryPieChart();
jsonObject.append("pieChartVOS", pieChartVOS);
- List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes();
+ List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes(LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")));
jsonObject.append("hollowRunTimes", hollowRunTimes);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
index 66f2369..275093f 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
@@ -50,12 +50,14 @@
<select id="queryRunTimes" resultType="com.mes.largenscreen.entity.RunTime">
with big_storage_cage_history_task_temp as (
select distinct create_time from hollow_big_storage_cage_history_task where task_type = 5 and
- create_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+ create_time LIKE '%${days}%'
)
SELECT
t1.create_time AS first_timestamp,
t2.create_time AS second_timestamp,
- TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) as diff_minutes
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) as diff_minutes,
+ (select min(create_time) from big_storage_cage_history_task_temp) as start_timestamp
+ ,(select max(create_time) from big_storage_cage_history_task_temp) as end_timestamp
FROM
(SELECT
create_time,
--
Gitblit v1.8.0