From 0b41a5c59028a61bff22f60e74cb1d6d53a40e61 Mon Sep 17 00:00:00 2001
From: wangfei <3597712270@qq.com>
Date: 星期二, 13 五月 2025 14:01:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMergeStrategy.java | 118 +++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/impl/EdgStorageDeviceTaskHistoryServiceImpl.java | 7
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/service/EdgStorageDeviceTaskHistoryService.java | 5
hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml | 24
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/job/OPCPlcSlicecage.java | 15
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/RunTime.java | 29
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java | 29
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/mapper/HollowBigStorageCageHistoryTaskMapper.java | 5
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/mapper/BigStorageCageHistoryTaskMapper.java | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java | 27
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/impl/HollowBigStorageCageHistoryTaskServiceImpl.java | 7
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/opctask/mapper/EdgStorageDeviceTaskHistoryMapper.java | 5
hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java | 80 +
UI-Project/package.json | 1
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 6
UI-Project/src/views/largescreendisplay/statistics.vue | 37
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java | 44 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellStyleHandler.java | 35 +
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/LargenScreenService.java | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellWriteWidthConfig.java | 82 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 63
hangzhoumesParent/common/pom.xml | 6
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml | 25
hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelUtil.java | 19
hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml | 161 ++++
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/impl/BigStorageCageHistoryTaskServiceImpl.java | 8
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml | 2
UI-Project/src/lang/en.js | 2
UI-Project/src/lang/zh.js | 2
hangzhoumesParent/moduleService/hollowGlassModule/src/main/java/com/mes/hollowtask/service/HollowBigStorageCageHistoryTaskService.java | 5
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/controller/LargenScreenController.java | 19
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/bigstoragecagetask/service/BigStorageCageHistoryTaskService.java | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java | 98 ++
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml | 4
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml | 32
UI-Project/src/router/index.js | 12
UI-Project/src/views/largescreendisplay/screendisplay.vue | 1002 +++++++++++++---------------
UI-Project/package-lock.json | 19
hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml | 2
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/mapper/LargenScreenMapper.java | 3
41 files changed, 1,436 insertions(+), 621 deletions(-)
diff --git a/UI-Project/package-lock.json b/UI-Project/package-lock.json
index d4d942e..49c34c8 100644
--- a/UI-Project/package-lock.json
+++ b/UI-Project/package-lock.json
@@ -15,6 +15,7 @@
"dayjs": "^1.11.13",
"echarts": "^5.5.1",
"element-plus": "^2.4.0",
+ "file-saver": "^2.0.5",
"moment": "^2.30.1",
"northglass-mes": "file:",
"pinia": "^2.1.6",
@@ -1012,6 +1013,11 @@
"dependencies": {
"reusify": "^1.0.4"
}
+ },
+ "node_modules/file-saver": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
},
"node_modules/fill-range": {
"version": "7.0.1",
@@ -2971,6 +2977,11 @@
"reusify": "^1.0.4"
}
},
+ "file-saver": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+ },
"fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
@@ -3225,9 +3236,10 @@
"axios": "^1.6.8",
"babel-polyfill": "^6.26.0",
"chart.js": "^4.4.3",
- "dayjs": "*",
+ "dayjs": "^1.11.13",
"echarts": "^5.5.1",
"element-plus": "^2.4.0",
+ "file-saver": "^2.0.5",
"http-proxy-middleware": "^3.0.0",
"moment": "^2.30.1",
"northglass-mes": "file:",
@@ -3979,6 +3991,11 @@
"reusify": "^1.0.4"
}
},
+ "file-saver": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmmirror.com/file-saver/-/file-saver-2.0.5.tgz",
+ "integrity": "sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA=="
+ },
"fill-range": {
"version": "7.0.1",
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
diff --git a/UI-Project/package.json b/UI-Project/package.json
index 7a22777..deea92f 100644
--- a/UI-Project/package.json
+++ b/UI-Project/package.json
@@ -15,6 +15,7 @@
"dayjs": "^1.11.13",
"echarts": "^5.5.1",
"element-plus": "^2.4.0",
+ "file-saver": "^2.0.5",
"moment": "^2.30.1",
"northglass-mes": "file:",
"pinia": "^2.1.6",
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index ec50530..9481841 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -511,6 +511,8 @@
createTime: 'Return date',
},
large: {
+ statistics: 'Statistics',
+ ExporttoExcel:'Export to Excel',
slice:'slice',
load: 'load',
edg: 'edg',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 762e03b..1580d29 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -513,6 +513,8 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ statistics: '鐢熶骇缁熻',
+ ExporttoExcel:'瀵煎嚭excel',
slice:'鐗�',
load:'鍒囧壊',
edg:'纾ㄨ竟',
diff --git a/UI-Project/src/router/index.js b/UI-Project/src/router/index.js
index 64d7215..2e3ce53 100644
--- a/UI-Project/src/router/index.js
+++ b/UI-Project/src/router/index.js
@@ -490,6 +490,18 @@
},
]
},
+ {
+ path: '/productionstatistics',
+ name: 'productionstatistics',
+ component: () => import('../views/largescreendisplay/productionstatistics.vue'),
+ children: [
+ {
+ path: '/largescreendisplay/productionstatistics',
+ name: 'productionstatistics',
+ component: () => import('../views/largescreendisplay/productionstatistics.vue')
+ },
+ ]
+ },
]
})
// 瀵艰埅瀹堝崼
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 6420b46..8c34f72 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -1,5 +1,5 @@
<script setup>
-import { onBeforeUnmount, onMounted, onUnmounted, ref, computed, nextTick } from "vue";
+import { onBeforeUnmount, onMounted, onUnmounted, ref, computed, nextTick, watch } from "vue";
import { useRouter } from "vue-router"
import { host, WebSocketHost } from '@/utils/constants'
import request from "@/utils/request"
@@ -32,7 +32,10 @@
const edgTwoTasks = ref([])
const engineeringOne = ref([])
const engineeringTwo = ref([])
-
+let myChartLoad = null;
+let myChartEdg = null;
+let myChartTemp = null;
+let myChartHollow = null;
const socketUrl1 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreen`;
const handleMessage1 = (data) => {
edgOneTasks.value = data.edgOneTasks[0];
@@ -41,100 +44,15 @@
engineeringTwo.value = data.engineeringTwo[0];
if (numBoxes.value != edgOneTasks.value.length) {
numBoxes.value = edgOneTasks.value.length;
- boxStart();
+ initBoxes(boxes, numBoxes, 'firstup');
+
}
if (numBoxes2.value != edgTwoTasks.value.length) {
numBoxes2.value = edgTwoTasks.value.length;
- boxStart2();
+ initBoxes(boxes2, numBoxes2, 'firstup');
}
- const pieChartVOS = ref([]);
- pieChartVOS.value = data.pieChartVOS[0];
- let oneFinish = ref();
- let twoFinish = ref();
- let oneunFinish = ref();
- let twounFinish = ref();
- if (pieChartVOS.value.length > 0) {
- if (load.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
- twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
- } else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- twoFinish = pieChartVOS.value[0].twoCompletedArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
- twounFinish = pieChartVOS.value[0].twoUncompletedArea;
- }
- } else {
- oneFinish = 0;
- twoFinish = 0;
- oneunFinish = 0;
- twounFinish = 0;
- }
-
-
- const chartDomOne = chartOne.value;
- if (!chartDomOne) {
- console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
- return;
- }
- const myChartOne = echarts.init(chartDomOne);
- const optionOne = {
- title: {
- text: t('large.load'),
- subtext: '',
- left: 'right'
- },
- tooltip: {
- trigger: 'item'
- },
- legend: {
- orient: 'vertical',
- left: 'left'
- },
- series: [
- {
- name: '',
- type: 'pie',
- radius: '50%',
- data: [
- { value: oneFinish, name: t('large.oneFinish') },
- { value: twoFinish, name: t('large.twoFinish') },
- { value: oneunFinish, name: t('large.oneunFinish') },
- { value: twounFinish, name: t('large.twounFinish') },
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ],
- graphic: [
- {
- type: 'rect',
- left: 'center',
- top: 0,
- shape: {
- width: 80,
- height: 30
- },
- style: {
- text: load.value == true ? t('large.quantity') : t('large.are'),
- fill: '#5470C6',
- stroke: '#000',
- lineWidth: 1
- },
- onclick: function () {
- load.value = !load.value;
- }
- }
- ]
- };
-
- myChartOne.setOption(optionOne);
+ timeAxisCreate("鍒囧壊褰撳ぉ杩愯鎯呭喌", chartLoad.value, myChartLoad, data.loadRunTimes[0]);
+ timeAxisCreate("纾ㄨ竟褰撳ぉ杩愯鎯呭喌", chartEdg.value, myChartEdg, data.loadRunTimes[0]);
};
let socket2 = null;
const temperingTaskType = ref([])
@@ -146,287 +64,250 @@
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
if (numBoxes3.value != temperingTaskType.value) {
numBoxes3.value = temperingTaskType.value;
- boxStart3();
+ // initBoxes(boxes3, numBoxes3, 'secondleft');
}
if (temperingGlassInfoList.value > 1) {
- numBoxes4.value = 1;
- } else {
- numBoxes4.value = 0;
- }
- temperingGlassInfoInList.value = data.temperingGlassInfoInList[0];
- const pieChartVOS = ref([]);
- pieChartVOS.value = data.pieChartVOS[0];
- let oneFinish = ref();
- let ondDamage = ref();
- let oneunFinish = ref();
- if (pieChartVOS.value.length > 0) {
- if (temp.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- ondDamage = pieChartVOS.value[0].oneDamageQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
- } else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- ondDamage = pieChartVOS.value[0].oneDamageArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
+ if (numBoxes4.value != 1) {
+ numBoxes4.value = 1;
+ // initBoxes(boxes4, numBoxes4, 'right');
}
} else {
- oneFinish = 0;
- ondDamage = 0;
- oneunFinish = 0;
+ if (numBoxes4.value != 0) {
+ numBoxes4.value = 0;
+ // initBoxes(boxes4, numBoxes4, 'right');
+ }
+
}
+ temperingGlassInfoInList.value = data.temperingGlassInfoInList[0];
- const chartDomOne = chartThree.value;
- if (!chartDomOne) {
- console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
- return;
- }
- const myChartOne = echarts.init(chartDomOne);
- const optionOne = {
- title: {
- text: t('large.temp'),
- subtext: '',
- left: 'right'
- },
- tooltip: {
- trigger: 'item'
- },
- legend: {
- orient: 'vertical',
- left: 'left'
- },
- series: [
- {
- name: '',
- type: 'pie',
- radius: '50%',
- data: [
- { value: oneFinish, name: t('large.oneFinish') },
- { value: ondDamage, name: t('large.ondDamage') },
- { value: oneunFinish, name: t('large.oneunFinish') },
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ],
- graphic: [
- {
- type: 'rect',
- left: 'center',
- top: 0,
- shape: {
- width: 80,
- height: 30
- },
- style: {
- text: temp.value == true ? t('large.quantity') : t('large.are'),
- fill: '#5470C6',
- stroke: '#000',
- lineWidth: 1
- },
- onclick: function () {
- temp.value = !temp.value;
- }
- }
- ]
- };
-
- myChartOne.setOption(optionOne);
};
let socket3 = null;
const bigStorageCageUsage = ref([])
const socketUrl3 = `ws://${WebSocketHost}:${host}/api/cacheVerticalGlass/api/talk/largenScreen`;
const handleMessage3 = (data) => {
bigStorageCageUsage.value = data.bigStorageCageUsage[0];
- const pieChartVOS = ref([]);
- pieChartVOS.value = data.pieChartVOS[0];
- let oneFinish = ref();
- let twoFinish = ref();
- let oneunFinish = ref();
- let twounFinish = ref();
- if (pieChartVOS.value.length > 0) {
- if (edg.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
- twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
- } else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- twoFinish = pieChartVOS.value[0].twoCompletedArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
- twounFinish = pieChartVOS.value[0].twoUncompletedArea;
- }
- } else {
- oneFinish = 0;
- twoFinish = 0;
- oneunFinish = 0;
- twounFinish = 0;
- }
+ timeAxisCreate("閽㈠寲褰撳ぉ杩愯鎯呭喌", chartTemp.value, myChartTemp, data.tempRunTimes[0]);
+};
+// let mychart = null; // 寤鸿璁句负澶栭儴鍙橀噺閬垮厤閲嶅鍒濆鍖�
+// const formatToTimeString(datetime) => {
+const formatToTimeString = (datetime) => {
+ const date = new Date(datetime);
+ const hours = date.getHours().toString().padStart(2, '0');
+ const minutes = date.getMinutes().toString().padStart(2, '0');
+ const seconds = date.getSeconds().toString().padStart(2, '0');
+ return `${hours}:${minutes}:${seconds}`;
+}
- const chartDomOne = chartTwo.value;
- if (!chartDomOne) {
+const timeAxisCreate = (title, chartDom, mychart, RunTimes) => {
+ if (!chartDom) {
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
}
- const myChartOne = echarts.init(chartDomOne);
+
+ if (!mychart) {
+ mychart = echarts.init(chartDom);
+ }
+ let firstTime = null;
+ let secondTime = null;
+ if (RunTimes.length == 0) {
+ firstTime = "00-00-00 00:00:00";
+ secondTime = "00-00-00 00:00:00";
+ } else {
+ firstTime = RunTimes[0].startTimestamp;
+ secondTime = RunTimes[0].endTimestamp;
+ }
+
+ let datas = ref([])
+ RunTimes.forEach((item, index) => {
+ // if (index % 2 === 0) {
+ datas.value.push([item.firstTimestamp, -1, formatToTimeString(item.firstTimestamp)])
+ datas.value.push([item.secondTimestamp, 1, formatToTimeString(item.secondTimestamp)])
+ // } else {
+ // datas.value.push([item.firstTimestamp, -1, item.diffMinutes])
+ // datas.value.push([item.firstTimestamp, -1, item.diffMinutes])
+ // }
+ })
+ // console.log(D)
+ // 鏋勫缓绾挎鏁扮粍
+ const segments = RunTimes.map(item => ({
+ type: 'line',
+ symbol: 'none',
+ data: [
+ [item.firstTimestamp, 0],
+ [item.secondTimestamp, 0]
+ ],
+ lineStyle: {
+ color: 'red', // 鏀寔涓嶅悓棰滆壊
+ width: 4
+ },
+ z: 1
+ }));
+
const optionOne = {
title: {
- text: t('large.edg'),
- subtext: '',
- left: 'right'
+ text: title,
+ left: 'center',
+ top: '5%',
+ textStyle: {
+ fontSize: 16,
+ fontWeight: 'bold',
+ color: '#333'
+ }
},
tooltip: {
- trigger: 'item'
+ trigger: 'axis',
+ axisPointer: { type: 'line' },
+ backgroundColor: 'rgba(50,50,50,0.7)',
+ textStyle: { color: '#fff' }
},
- legend: {
- orient: 'vertical',
- left: 'left'
+ grid: {
+ top: '20%',
+ left: '5%',
+ right: '5%',
+ bottom: '15%'
+ },
+ xAxis: {
+ type: 'time',
+ axisLabel: {
+ formatter: function (value) {
+ const date = new Date(value);
+ return (
+ date.getHours().toString().padStart(2, '0') + ':' +
+ date.getMinutes().toString().padStart(2, '0') + ':' +
+ date.getSeconds().toString().padStart(2, '0')
+ );
+ },
+ fontSize: 10,
+ color: '#666'
+ },
+ splitLine: { show: false },
+ axisLine: { lineStyle: { color: '#aaa' } }
+ },
+ yAxis: {
+ type: 'value',
+ min: -1,
+ max: 1,
+ show: false
},
series: [
+ // 涓绘椂闂寸嚎锛堣摑鑹叉笎鍙橈紝绋嶅井鍔犵矖锛�
{
- name: '',
- type: 'pie',
- radius: '50%',
+ type: 'line',
+ symbol: 'none',
data: [
- { value: oneFinish, name: t('large.oneFinish') },
- { value: twoFinish, name: t('large.twoFinish') },
- { value: oneunFinish, name: t('large.oneunFinish') },
- { value: twounFinish, name: t('large.twounFinish') },
+ [firstTime, 0],
+ [secondTime, 0]
],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
+ lineStyle: {
+ color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+ { offset: 0, color: '#4facfe' },
+ { offset: 1, color: '#00f2fe' }
+ ]),
+ width: 5,
+ shadowColor: 'rgba(0,0,0,0.2)',
+ shadowBlur: 8
+ },
+ z: 0
+ },
+ // 灏忔鏃堕棿绾匡紙缁熶竴鏌斿拰鐨勯粍鑹诧級
+ ...segments.map(seg => ({
+ ...seg,
+ lineStyle: {
+ color: '#ffcc00',
+ width: 3,
+ shadowColor: 'rgba(255,204,0,0.5)',
+ shadowBlur: 5
}
- }
- ],
- graphic: [
+ })),
+ // 鍗＄墖浜嬩欢锛堜紭鍖栨牱寮忥級
{
- type: 'rect',
- left: 'center',
- top: 0,
- shape: {
- width: 80,
- height: 30
+ type: 'custom',
+ renderItem: function (params, api) {
+ const x = api.coord([api.value(0), api.value(1)])[0];
+ const yBase = api.coord([api.value(0), 0])[1];
+ const yOffset = api.value(1) > 0 ? -70 : 30;
+ const cardWidth = 40;
+ const cardHeight = 22;
+ const cardX = x;
+ const cardY = yBase + yOffset;
+ const text = api.value(2);
+
+ return {
+ type: 'group',
+ children: [
+ {
+ type: 'line',
+ shape: {
+ x1: x,
+ y1: yBase,
+ x2: x,
+ y2: cardY + (api.value(1) > 0 ? cardHeight : 0)
+ },
+ style: {
+ stroke: '#888',
+ lineWidth: 1.5,
+ lineDash: [4, 2]
+ }
+ },
+ {
+ type: 'rect',
+ shape: {
+ x: cardX - cardWidth / 2,
+ y: cardY,
+ width: cardWidth,
+ height: cardHeight,
+ r: 6 // 鍦嗚
+ },
+ style: {
+ fill: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+ { offset: 0, color: '#ffffff' },
+ { offset: 1, color: '#e0f7fa' }
+ ]),
+ stroke: '#00acc1',
+ lineWidth: 1,
+ shadowColor: '#ccc',
+ shadowBlur: 6
+ }
+ },
+ {
+ type: 'text',
+ style: {
+ text: text,
+ x: cardX,
+ y: cardY + cardHeight / 2,
+ textAlign: 'center',
+ textVerticalAlign: 'middle',
+ font: '12px sans-serif',
+ fill: '#006064'
+ }
+ }
+ ]
+ };
},
- style: {
- text: edg.value == true ? t('large.quantity') : t('large.are'),
- fill: '#5470C6',
- stroke: '#000',
- lineWidth: 1
+ encode: {
+ x: 0
},
- onclick: function () {
- edg.value = !edg.value;
- }
+ data: datas.value,
+ z: 10
}
]
};
- myChartOne.setOption(optionOne);
+ mychart.setOption(optionOne);
};
+
let socket4 = null;
const hollowBigStorageCageUsage = ref([])
const socketUrl4 = `ws://${WebSocketHost}:${host}/api/hollowGlass/api/talk/largenScreen`;
const handleMessage4 = (data) => {
hollowBigStorageCageUsage.value = data.hollowBigStorageCageUsage[0];
- const pieChartVOS = ref([]);
- pieChartVOS.value = data.pieChartVOS[0];
- let oneFinish = ref();
- let twoFinish = ref();
- let oneunFinish = ref();
- let twounFinish = ref();
- if (pieChartVOS.value.length > 0) {
- if (hollow.value) {
- oneFinish = pieChartVOS.value[0].oneCompletedQuantity;
- twoFinish = pieChartVOS.value[0].twoCompletedQuantity;
- oneunFinish = pieChartVOS.value[0].oneUncompletedQuantity;
- twounFinish = pieChartVOS.value[0].twoUncompletedQuantity;
- } else {
- oneFinish = pieChartVOS.value[0].oneCompletedArea;
- twoFinish = pieChartVOS.value[0].twoCompletedArea;
- oneunFinish = pieChartVOS.value[0].oneUncompletedArea;
- twounFinish = pieChartVOS.value[0].twoUncompletedArea;
- }
- } else {
- oneFinish = 0;
- twoFinish = 0;
- oneunFinish = 0;
- twounFinish = 0;
- }
-
-
- const chartDomOne = chartFour.value;
- if (!chartDomOne) {
- console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
- return;
- }
- const myChartOne = echarts.init(chartDomOne);
- const optionOne = {
- title: {
- text: t('large.hollow'),
- subtext: '',
- left: 'right'
- },
- tooltip: {
- trigger: 'item'
- },
- legend: {
- orient: 'vertical',
- left: 'left'
- },
- series: [
- {
- name: '',
- type: 'pie',
- radius: '50%',
- data: [
- { value: oneFinish, name: t('large.oneFinish') },
- { value: twoFinish, name: t('large.twoFinish') },
- { value: oneunFinish, name: t('large.oneunFinish') },
- { value: twounFinish, name: t('large.twounFinish') },
- ],
- emphasis: {
- itemStyle: {
- shadowBlur: 10,
- shadowOffsetX: 0,
- shadowColor: 'rgba(0, 0, 0, 0.5)'
- }
- }
- }
- ],
- graphic: [
- {
- type: 'rect',
- left: 'center',
- top: 0,
- shape: {
- width: 80,
- height: 30
- },
- style: {
- text: hollow.value == true ? t('large.quantity') : t('large.are'),
- fill: '#5470C6',
- stroke: '#000',
- lineWidth: 1
- },
- onclick: function () {
- hollow.value = !hollow.value;
- }
- }
- ]
- };
-
- myChartOne.setOption(optionOne);
+ timeAxisCreate("涓┖褰撳ぉ杩愯鎯呭喌", chartHollow.value, myChartHollow, data.hollowRunTimes[0]);
};
let socket5 = null;
+let myChart = null;
+let myChart2 = null;
const productionVO = ref([])
const socketUrl5 = `ws://${WebSocketHost}:${host}/api/cacheGlass/api/talk/largenScreenProduction`;
const handleMessage5 = (data) => {
@@ -452,8 +333,13 @@
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
}
-
- const myChart = echarts.init(chartDom);
+ // myChart = echarts.init(chartDom);
+ if (!myChart) {
+ myChart = echarts.init(chartDom);
+ }
+ // else {
+ // myChart.clear();
+ // }
const option = {
@@ -494,7 +380,13 @@
console.error('鍥捐〃瀹瑰櫒鏈壘鍒�');
return;
}
- const myChart2 = echarts.init(chartDom2);
+ // myChart2 = echarts.init(chartDom2);
+ if (!myChart2) {
+ myChart2 = echarts.init(chartDom2);
+ }
+ // else {
+ // myChart2.clear();
+ // }
const option2 = {
title: { text: '' },
tooltip: { trigger: 'axis' },
@@ -609,20 +501,19 @@
};
const chartRef = ref(null)
const chartRef2 = ref(null)
-const chartOne = ref(null)
-const chartTwo = ref(null)
-const chartThree = ref(null)
-const chartFour = ref(null)
+const chartLoad = ref(null)
+const chartEdg = ref(null)
+const chartTemp = ref(null)
+const chartHollow = ref(null)
// 鍦ㄧ粍浠舵寕杞芥椂璁剧疆榛樿鏃堕棿鑼冨洿
onMounted(async () => {
-
- boxStart();
- boxStart2();
- boxStart3();
- boxStart4();
- requestAnimationFrame(animate);
+ // boxStart();
+ // boxStart2()
+ // boxStart3()
+ // boxStart4();
+ // requestAnimationFrame(animate);
socket = initializeWebSocket(socketUrl, handleMessage);
socket1 = initializeWebSocket(socketUrl1, handleMessage1);
socket2 = initializeWebSocket(socketUrl2, handleMessage2);
@@ -648,194 +539,197 @@
closeWebSocket(socket5);
}
});
-onBeforeUnmount(() => {
- closeWebSocket();
-});
-const numBoxes = ref(5);
-const numBoxes2 = ref(5);
-const numBoxes3 = ref(5);
+const numBoxes = ref(1);
+const numBoxes2 = ref(1);
+const numBoxes3 = ref(1);
const numBoxes4 = ref(1);
const speed = 0.1;
-const maxX = 200; // 缁堢偣X鍧愭爣
-const maxY = -75; // 缁堢偣Y鍧愭爣
-const maxX2 = 313; // 缁堢偣X鍧愭爣
-const maxY2 = -165; // 缁堢偣Y鍧愭爣
-const maxX3 = 95; // 缁堢偣X鍧愭爣
-const maxY3 = -85; // 缁堢偣Y鍧愭爣
-const maxX4 = 60; // 缁堢偣X鍧愭爣
-const maxY4 = 0; // 缁堢偣Y鍧愭爣
-const delayFrames = 600; // 姣忎釜 div 鐨勫欢杩熷抚鏁�
-const boxes = ref([]);
-const boxes2 = ref([]);
-const boxes3 = ref([]);
-const boxes4 = ref([]);
-// 鍒濆鍖� div 鏁版嵁
-const boxStart = () => {
- boxes.value = [];
- for (let i = 0; i < numBoxes.value; i++) {
- boxes.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'up',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
- }
-}
-const boxStart2 = () => {
- boxes2.value = [];
- for (let i = 0; i < numBoxes2.value; i++) {
- boxes2.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'up',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
- }
-}
-const boxStart3 = () => {
- boxes3.value = [];
- for (let i = 0; i < numBoxes3.value; i++) {
- boxes3.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'left',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
- }
-}
-const boxStart4 = () => {
- boxes4.value = [];
- for (let i = 0; i < numBoxes4.value; i++) {
- boxes4.value.push({
- x: 0,
- y: 0, // 鍒濆浣嶇疆鍦ㄥ簳閮�
- direction: 'right',
- delay: i * delayFrames,
- style: {
- width: '15px',
- height: '15px',
- backgroundColor: i % 2 === 0 ? '#911005' : '#911005',
- position: 'absolute',
- transform: `translate(0px, 0px)`
- }
- });
- }
-}
-const animate = () => {
- boxes.value.forEach((box) => {
- if (box.delay > 0) {
- box.delay--;
- return;
+const delayFrames = 600;
+
+const maxCoords = {
+ box1: { x: 250, y: -165 },
+ box2: { x: 190, y: -75 },
+ box3: { x: 95, y: -85 },
+ box4: { x: 60, y: 0 },
+};
+
+let boxes = ref([]);
+let boxes2 = ref([]);
+let boxes3 = ref([]);
+let boxes4 = ref([]);
+
+const boxRefs = [];
+const boxRefs2 = [];
+const boxRefs3 = [];
+const boxRefs4 = [];
+let rafId = null;
+
+// 鉁� 鍒濆鍖� boxes锛屽幓闄� style锛屼繚鐣� el
+const initBoxes = (arr, countRef, direction) => {
+ const count = countRef.value;
+ const existing = arr.value;
+
+ for (let i = 0; i < count; i++) {
+ if (!existing[i]) {
+ existing.push({
+ x: 0,
+ y: 0,
+ direction,
+ delay: i * delayFrames,
+ frameCount: 0,
+ el: null
+ });
+ } else {
+ // 閲嶇疆宸叉湁鐨� box 鏁版嵁
+ existing[i].x = 0;
+ existing[i].y = 0;
+ existing[i].direction = direction;
+ existing[i].delay = i * delayFrames;
+ existing[i].frameCount = 0;
}
- if (box.direction === 'up') {
+ }
+ if (existing.length > count) {
+ existing.length = count;
+ }
+};
+
+// 鉁� 鍔ㄧ敾鍑芥暟
+const animateBox = (box, maxX, maxY) => {
+ if (box.delay > 0) {
+ box.delay--;
+ return;
+ }
+
+ switch (box.direction) {
+ case 'firstup':
box.y -= speed;
- if (box.y <= maxY) {
- // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
- box.direction = 'left';
- }
- } else if (box.direction === 'left') {
+ if (box.y <= maxY) box.direction = 'firstleft';
+ break;
+ case 'firstleft':
box.x -= speed;
if (box.x <= -maxX) {
box.x = 0;
- box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
- box.direction = 'up';
+ box.y = 0;
+ box.direction = 'firstup';
}
- }
- box.style = {
- ...box.style,
- transform: `translate(${box.x}px, ${box.y}px)`
- };
- });
- boxes2.value.forEach((box) => {
- if (box.delay > 0) {
- box.delay--;
- return;
- }
- if (box.direction === 'up') {
+ break;
+ case 'secondup':
box.y -= speed;
- if (box.y <= maxY2) {
- // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
- box.direction = 'left';
- }
- } else if (box.direction === 'left') {
- box.x -= speed;
- if (box.x <= -maxX2) {
+ if (box.y <= maxY) {
box.x = 0;
- box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
- box.direction = 'up';
+ box.y = 0;
+ box.direction = 'secondleft';
}
- }
- box.style = {
- ...box.style,
- transform: `translate(${box.x}px, ${box.y}px)`
- };
- });
- boxes3.value.forEach((box) => {
- if (box.delay > 0) {
- box.delay--;
- return;
- }
- if (box.direction === 'up') {
- box.y -= speed;
- if (box.y <= maxY3) {
- // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
- box.direction = 'left';
- box.x = 0;
- box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
- }
- } else if (box.direction === 'left') {
+ break;
+ case 'secondleft':
box.x -= speed;
- if (box.x <= -maxX3) {
-
- box.direction = 'up';
+ if (box.x <= -maxX) {
+ box.direction = 'secondup';
}
- }
- box.style = {
- ...box.style,
- transform: `translate(${box.x}px, ${box.y}px)`
- };
- });
- boxes4.value.forEach((box) => {
- if (box.delay > 0) {
- box.delay--;
- return;
- }
- if (box.direction === 'right') {
+ break;
+ case 'right':
box.x += speed;
- if (box.x >= maxX4) {
- // box.y = 0; // 纭繚涓嶄細瓒呭嚭鐣岄檺
+ if (box.x >= maxX) {
box.x = 0;
- box.y = 0; // 閲嶆柊鍥炲埌搴曢儴
+ box.y = 0;
}
+ break;
+ }
+
+ box.frameCount++;
+ if (box.frameCount % 2 === 0 && box.el) {
+ box.el.style.top = `${box.y}px`;
+ if (box.x > 0) {
+ box.el.style.right = `${box.x}px`;
+ box.el.style.left = '';
+ } else {
+ box.el.style.left = `${box.x}px`;
+ box.el.style.right = '';
}
- box.style = {
- ...box.style,
- transform: `translate(${box.x}px, ${box.y}px)`
- };
- });
- requestAnimationFrame(animate);
+ }
};
+
+const animate = () => {
+ boxes.value.forEach(box => animateBox(box, maxCoords.box1.x, maxCoords.box1.y));
+ boxes2.value.forEach(box => animateBox(box, maxCoords.box2.x, maxCoords.box2.y));
+ boxes3.value.forEach(box => animateBox(box, maxCoords.box3.x, maxCoords.box3.y));
+ boxes4.value.forEach(box => animateBox(box, maxCoords.box4.x, maxCoords.box4.y));
+
+ rafId = requestAnimationFrame(animate);
+};
+
+const boxStart = () => {
+ initBoxes(boxes, numBoxes, 'firstup');
+ initBoxes(boxes2, numBoxes2, 'firstup');
+ initBoxes(boxes3, numBoxes3, 'secondleft');
+ initBoxes(boxes4, numBoxes4, 'right');
+};
+
+watch(
+ () => boxes.value,
+ async (newVal) => {
+ await nextTick();
+ newVal.forEach((box, i) => {
+ box.el = boxRefs[i];
+ });
+ },
+ { deep: true, immediate: true }
+
+);
+watch(
+ () => boxes2.value,
+ async (newVal) => {
+ await nextTick();
+ newVal.forEach((box, i) => {
+ box.el = boxRefs2[i];
+ });
+ },
+ { deep: true, immediate: true }
+);
+
+watch(
+ () => boxes3.value,
+ async (newVal) => {
+ await nextTick();
+ newVal.forEach((box, i) => {
+ box.el = boxRefs3[i];
+ });
+ },
+ { deep: true, immediate: true }
+);
+
+watch(
+ () => boxes4.value,
+ async (newVal) => {
+ await nextTick();
+ newVal.forEach((box, i) => {
+ box.el = boxRefs4[i];
+ });
+ },
+ { deep: true, immediate: true }
+);
+onMounted(() => {
+ boxStart();
+ animate();
+});
+
+onBeforeUnmount(() => {
+ cancelAnimationFrame(rafId);
+ rafId = null;
+ boxes.value.length = 0;
+ boxes2.value.length = 0;
+ boxes3.value.length = 0;
+ boxes4.value.length = 0;
+});
+onUnmounted(() => {
+ if (rafId) {
+ cancelAnimationFrame(rafId); // 鍋滄鍔ㄧ敾锛岄槻姝㈠唴瀛樻硠婕�
+ }
+});
+// onBeforeUnmount(() => {
+// cancelAnimationFrame(rafId);
+// });
+
//宓屽叆鍘嗗彶浠诲姟
const iframeUrl1 = ref('');
const iframe1 = ref(false);
@@ -896,6 +790,12 @@
const handlehistorical10 = () => {
iframe10.value = true;
iframeUrl10.value = `${window.location.origin}/#/largescreendisplay/statistics`;
+};
+const iframeUrl11 = ref('');
+const iframe11 = ref(false);
+const handlehistorical11 = () => {
+ iframe11.value = true;
+ iframeUrl11.value = `${window.location.origin}/#/largescreendisplay/productionstatistics`;
};
const transposedData = computed(() => {
const keys = Object.keys(fieldNames); // 鎸� fieldNames 鐨勯『搴�
@@ -968,6 +868,10 @@
<iframe :src="iframeUrl10" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
frameborder="0"></iframe>
</el-dialog>
+ <el-dialog v-model="iframe11" top="5vh" width="95%" @close="iframeUrl11 = ''">
+ <iframe :src="iframeUrl11" marginwidth="2000px" marginheight="2000px" width="100%" height="750px"
+ frameborder="0"></iframe>
+ </el-dialog>
<div class="awatch" style="display: flex;">
<!-- 鐢熶骇缁熻 -->
@@ -976,60 +880,72 @@
<div ref="chartRef" style="width: 600px; height: 400px;" @dblclick="handlehistorical10()"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartOne" style="width: 100%;"></div>
+ <div ref="chartLoad" style="width: 100%;"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartTwo" style="width: 100%;"></div>
+ <div ref="chartEdg" style="width: 100%;"></div>
</div>
</div>
<div style="width: 50%;">
<div class="img-screen" alt="Screen">
+ <div>
+ <el-button type="primary" style="top:40px;left:670px;position: absolute;" @click="handlehistorical11()">{{
+ $t('large.statistics') }}</el-button>
+ </div>
<!-- 閽㈠寲鍗婇�忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 315px;left: 130px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOut : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOut : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOut : 0 }}m虏</div>
</div>
<!-- 涓┖涓�绾垮崐閫忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 235px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutOne : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutOne : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].hollowTotalAreaOutOne : 0 }}m虏</div>
</div>
<!-- 涓┖浜岀嚎鍗婇�忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 130px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutTwo : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].hollowCountOutTwo : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].hollowTotalAreaOutTwo : 0 }}m虏</div>
</div>
<!-- 鍒囧壊浜岀嚎鍗婇�忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 542px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutOne : 0 }}m虏</div>
</div>
<!-- 鍒囧壊涓�绾垮崐閫忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 490px;left: 410px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutTwo : 0 }}m虏</div>
</div>
<!-- 纾ㄨ竟涓�绾垮崐閫忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 369px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutOne : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutOne : 0 }}m虏</div>
</div>
<!-- 纾ㄨ竟浜岀嚎鍗婇�忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 410px;left: 450px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countOutTwo : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaOutTwo : 0 }}m虏</div>
</div>
<!-- 閽㈠寲鍓嶅ぇ鐞唟{ $t('large.slice') }}鍗婇�忔槑鑹插潡 -->
<div
style="width: 80px;height: 40px;top: 380px;left: 290px;position: absolute;background-color: rgba(0, 0, 0, 0.5);color: white;font-size: 12px;z-index: 999;">
- <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countIn : 0 }}{{ $t('large.slice') }}</div>
+ <div>{{ $t('large.quantity') }}:{{ productionVO.length > 0 ? productionVO[6].countIn : 0 }}{{
+ $t('large.slice') }}</div>
<div>{{ $t('large.are') }}:{{ productionVO.length > 0 ? productionVO[6].totalAreaIn : 0 }}m虏</div>
</div>
@@ -1073,21 +989,22 @@
<!-- 纾ㄨ竟鑹插潡 -->
<div class="container"
style="position: relative;width: 15px;height: 15px;top: 500px;left: 638px;position: absolute;">
- <div v-for="(box, index) in boxes2" :key="index" class="box" :style="box.style"></div>
+ <div v-for="(box, i) in boxes2" :key="`b1-${i}`" class="moving-rect" :ref="el => boxRefs2[i] = el" />
</div>
<div class="container"
style="position: relative;width: 15px;height: 15px;top: 548px;left: 690px;position: absolute;">
- <div v-for="(box, index) in boxes" :key="index" class="box" :style="box.style"></div>
+ <div v-for="(box, i) in boxes" :key="`b1-${i}`" class="moving-rect" :ref="el => boxRefs[i] = el" />
</div>
<!-- 閽㈠寲杩愬姩鑹插潡 -->
<div class="container"
- style="position: relative;width: 15px;height: 15px;top: 370px;left: 195px;position: absolute;background-color: red;">
- <div v-for="(box, index) in boxes3" :key="index" class="box" :style="box.style"></div>
+ style="position: relative;width: 15px;height: 15px;top: 370px;left: 195px;position: absolute;">
+ <div v-for="(box, i) in boxes3" :key="`b1-${i}`" class="moving-rect" :ref="el => boxRefs3[i] = el" />
</div>
<div class="container"
style="position: relative;width: 15px;height: 15px;top: 284px;left: 489px;position: absolute;">
- <div v-for="(box, index) in boxes4" :key="index" class="box" :style="box.style"></div>
+ <div v-for="(box, i) in boxes4" :key="`b1-${i}`" class="moving-rect" :ref="el => boxRefs4[i] = el" />
</div>
+ <!-- <div class="moving-rect lipiana" v-show="true">1111111111</div> -->
<!-- 閽㈠寲鍓嶅ぇ鐞嗙墖鑹插潡 -->
<div class="container" v-for="(item, index) in bigStorageCageUsage.slice(0, 1)" :key="index"
:style='"position: relative;width: " + (37 * item.percentage / 100) + "px;height: 13px;top: 374px;left: 309px;position: absolute;background-color: #911005;"'>
@@ -1145,10 +1062,10 @@
<div ref="chartRef2" style="width: 600px; height: 400px;" @dblclick="handlehistorical10()"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartThree" style="width: 100%;"></div>
+ <div ref="chartTemp" style="width: 100%;"></div>
</div>
<div style="width: 100%;height: 245px;display: flex;">
- <div ref="chartFour" style="width: 100%;"></div>
+ <div ref="chartHollow" style="width: 100%;"></div>
</div>
</div>
</div>
@@ -1287,4 +1204,31 @@
.box {
transition: transform 0.016s linear;
}
+
+.lipiana {
+ width: 15px;
+ height: 9px;
+ background-color: #529b2e;
+ top: 190px;
+ right: 530px;
+ transform: translateX(-50%);
+ animation: move-lipiana 1s infinite;
+}
+
+@keyframes move-lipiana {
+ 0% {
+ right: 530px;
+ }
+
+ 100% {
+ right: calc(100% - 350px);
+ }
+}
+
+.moving-rect {
+ width: 15px;
+ height: 15px;
+ background-color: #911005;
+ position: absolute;
+}
</style>
\ No newline at end of file
diff --git a/UI-Project/src/views/largescreendisplay/statistics.vue b/UI-Project/src/views/largescreendisplay/statistics.vue
index 2fcea07..8dcf943 100644
--- a/UI-Project/src/views/largescreendisplay/statistics.vue
+++ b/UI-Project/src/views/largescreendisplay/statistics.vue
@@ -1,29 +1,30 @@
<template>
<div>
<div style="display: flex;width: 1770px;">
- <el-date-picker v-model="timeRange" type="datetimerange" range-separator="鑷�"
- :start-placeholder="$t('reportmanage.starttime')" style="margin-left: 15px;" value-format="YYYY-MM-DD hh:mm:ss"
- :end-placeholder="$t('reportmanage.endtime')">
+ <el-date-picker v-model="timeRange" type="daterange" range-separator="鑷�"
+ :start-placeholder="$t('reportmanage.starttime')" :end-placeholder="$t('reportmanage.endtime')"
+ value-format="YYYY-MM-DD" style="margin-left: 15px;">
</el-date-picker>
- <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;"
- @click="sethistorical()">{{ $t('reportmanage.inquire') }}</el-button>
+ <el-button type="primary" style="margin-left: 10px;margin-bottom: 10px;" @click="sethistorical()">{{
+ $t('reportmanage.inquire') }}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
<el-table-column prop="date" align="center" :label="$t('large.date')" min-width="70" />
- <el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />
- <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />
- <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />
- <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="50" />
- <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="50" />
- <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="50" />
- <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
- <el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
- <el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
- <el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')" min-width="40" />
- <el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
- <el-table-column prop="hollowTotalAreaOutTwo" align="center" :label="$t('large.hollowTotalAreaOutTwo')"
- min-width="40"/>
+ <el-table-column prop="countOutOne" align="center" :label="$t('large.countOutOne')" min-width="40" />
+ <el-table-column prop="totalAreaOutOne" align="center" :label="$t('large.totalAreaOutOne')" min-width="40" />
+ <el-table-column prop="countOutTwo" align="center" :label="$t('large.countOutTwo')" min-width="50" />
+ <el-table-column prop="totalAreaOutTwo" align="center" :label="$t('large.totalAreaOutTwo')" min-width="50" />
+ <el-table-column prop="countIn" align="center" :label="$t('large.countIn')" min-width="50" />
+ <el-table-column prop="totalAreaIn" align="center" :label="$t('large.totalAreaIn')" min-width="50" />
+ <el-table-column prop="countOut" align="center" :label="$t('large.countOut')" min-width="40" />
+ <el-table-column prop="totalAreaOut" align="center" :label="$t('large.totalAreaOut')" min-width="40" />
+ <el-table-column prop="hollowCountOutOne" align="center" :label="$t('large.hollowCountOutOne')" min-width="40" />
+ <el-table-column prop="hollowTotalAreaOutOne" align="center" :label="$t('large.hollowTotalAreaOutOne')"
+ min-width="40" />
+ <el-table-column prop="hollowCountOutTwo" align="center" :label="$t('large.hollowCountOutTwo')" min-width="40" />
+ <el-table-column prop="hollowTotalAreaOutTwo" align="center" :label="$t('large.hollowTotalAreaOutTwo')"
+ min-width="40" />
</el-table>
<div style="margin-top: 20px;margin-left: 40%;">
<el-pagination v-model:current-page="currentPage2" :page-size="pageSize" :size="large" :disabled="disabled"
diff --git a/hangzhoumesParent/common/pom.xml b/hangzhoumesParent/common/pom.xml
index c8bb428..939354a 100644
--- a/hangzhoumesParent/common/pom.xml
+++ b/hangzhoumesParent/common/pom.xml
@@ -204,6 +204,12 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-thymeleaf</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <version>3.1.3</version>
+ </dependency>
</dependencies>
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/controller/LargenScreenController.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/controller/LargenScreenController.java
index c4d4b17..2e7a68c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/controller/LargenScreenController.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/controller/LargenScreenController.java
@@ -1,6 +1,7 @@
package com.mes.largenscreen.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.largenscreen.entity.DailyProductionData;
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.DateRequest;
import com.mes.largenscreen.service.LargenScreenService;
@@ -8,12 +9,10 @@
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
@@ -34,5 +33,17 @@
return Result.build(200, "鏌ヨ鎴愬姛", largenScreenService.queryDailyProduction(query));
}
+ @ApiOperation("鎸夌収鏉′欢缁熻姣忔棩鐢熶骇鎯呭喌瀵煎嚭")
+ @GetMapping("/exportDailyProduction")
+ public void exportDailyProduction() {
+ largenScreenService.exportDailyProduction();
+ }
+
+ @ApiOperation("鎸夌収鏉′欢缁熻鐢熶骇鎯呭喌")
+ @PostMapping("/queryProduction")
+ public Result<List<DailyProductionData>> queryProduction(@RequestBody @Validated DateRequest query) {
+ return Result.build(200, "鏌ヨ鎴愬姛", largenScreenService.queryProduction(query));
+ }
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
new file mode 100644
index 0000000..8a8e685
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
@@ -0,0 +1,98 @@
+package com.mes.largenscreen.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.mes.utils.excel.ExcelMerge;
+import lombok.Data;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/3/12 14:30
+ * @Description:
+ */
+@Data
+public class DailyProductionData {
+
+ @ExcelProperty(value = "鏃ユ湡")
+ @ExcelMerge(merge = true, isPrimaryKey = true)
+ private String productDate;
+
+ @ExcelProperty(value = {"鍒囧壊", "寮�濮嬫椂闂�"})
+ @ExcelMerge(merge = true)
+ private String edgBeginTime;
+ @ExcelProperty(value = {"鍒囧壊", "缁撴潫鏃堕棿"})
+ @ExcelMerge(merge = true)
+ private String edgEndTime;
+ @ExcelProperty(value = {"鍒囧壊", "鎬昏�楁椂"})
+ @ExcelMerge(merge = true)
+ private String edgTimeTotal;
+ @ExcelProperty(value = {"鍒囧壊", "绌洪棽鏃堕暱"})
+ @ExcelMerge(merge = true)
+ private String edgTimeFree;
+ @ExcelProperty(value = {"鍒囧壊", "宸ヤ綔鏃堕暱"})
+ @ExcelMerge(merge = true)
+ private String edgTimeDiff;
+ @ExcelProperty(value = {"鍒囧壊", "鎬荤墖鏁�"})
+ @ExcelMerge(merge = true)
+ private String countOut;
+ @ExcelProperty(value = {"鍒囧壊", "鎬婚潰绉�(m^2)"})
+ @ExcelMerge(merge = true)
+ private String totalAreaOut;
+
+
+ @ExcelProperty(value = {"閽㈠寲", "寮�濮嬫椂闂�"})
+ @ExcelMerge(merge = true)
+ private String bigBeginTime;
+ @ExcelProperty(value = {"閽㈠寲", "缁撴潫鏃堕棿"})
+ @ExcelMerge(merge = true)
+ private String bigEndTime;
+ @ExcelProperty(value = {"閽㈠寲", "鎬昏�楁椂"})
+ @ExcelMerge(merge = true)
+ private String bigTimeTotal;
+ @ExcelMerge(merge = true)
+ @ExcelProperty(value = {"閽㈠寲", "绌洪棽鏃堕暱"})
+ private String bigTimeFree;
+ @ExcelProperty(value = {"閽㈠寲", "宸ヤ綔鏃堕暱"})
+ @ExcelMerge(merge = true)
+ private String bigTimeDiff;
+ @ExcelProperty(value = {"閽㈠寲", "鎬荤倝鏁�"})
+ @ExcelMerge(merge = true)
+ private String temperingLayoutCount;
+ @ExcelProperty(value = {"閽㈠寲", "鎬荤墖鏁�"})
+ @ExcelMerge(merge = true)
+ private String temperingGlassCount;
+ @ExcelProperty(value = {"閽㈠寲", "鎬婚潰绉�(m^2)"})
+ @ExcelMerge(merge = true)
+ private String temperingArea;
+
+
+ @ExcelProperty(value = {"涓┖", "寮�濮嬫椂闂�"})
+ @ExcelMerge(merge = true)
+ private String hollowBeginTime;
+ @ExcelProperty(value = {"涓┖", "缁撴潫鏃堕棿"})
+ @ExcelMerge(merge = true)
+ private String hollowEndTime;
+ @ExcelProperty(value = {"涓┖", "鎬昏�楁椂"})
+ @ExcelMerge(merge = true)
+ private String hollowTimeTotal;
+ @ExcelProperty(value = {"涓┖", "绌洪棽鏃堕暱"})
+ @ExcelMerge(merge = true)
+ private String hollowTimeFree;
+ @ExcelProperty(value = {"涓┖", "宸ヤ綔鏃堕暱"})
+ @ExcelMerge(merge = true)
+ private String hollowTimeDiff;
+ @ExcelProperty(value = {"涓┖", "鎬荤墖鏁�"})
+ @ExcelMerge(merge = true)
+ private String hollowGlassCount;
+ @ExcelProperty(value = {"涓┖", "鎬婚潰绉�(m^2)"})
+ @ExcelMerge(merge = true)
+ private String hollowArea;
+
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "宸ョ▼鍙�"})
+ private String engineerId;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬荤墖閲�"})
+ private String glassTotal;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬婚潰绉�(m^2)"})
+ private String glassTotalArea;
+
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/RunTime.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/RunTime.java
new file mode 100644
index 0000000..01bc9ea
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/RunTime.java
@@ -0,0 +1,29 @@
+package com.mes.largenscreen.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/3/12 14:30
+ * @Description:
+ */
+@Data
+public class RunTime {
+
+ @ApiModelProperty(value = "鍋滄満寮�濮嬫椂闂�")
+ private String firstTimestamp;
+
+ @ApiModelProperty(value = "鍋滄満缁撴潫鏃堕棿")
+ private String secondTimestamp;
+
+ @ApiModelProperty(value = "鏃堕棿宸�")
+ private String diffMinutes;
+
+ @ApiModelProperty(value = "寮�濮嬫椂闂�")
+ private String startTimestamp;
+
+ @ApiModelProperty(value = "缁撴潫鏃堕棿鎸�")
+ private String endTimestamp;
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/mapper/LargenScreenMapper.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/mapper/LargenScreenMapper.java
index 529b5fd..482f59c 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/mapper/LargenScreenMapper.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/mapper/LargenScreenMapper.java
@@ -1,5 +1,6 @@
package com.mes.largenscreen.mapper;
+import com.mes.largenscreen.entity.DailyProductionData;
import com.mes.largenscreen.entity.DailyProductionVO;
import java.util.List;
@@ -13,4 +14,6 @@
public interface LargenScreenMapper {
List<DailyProductionVO> queryDailyProduction(String beginDate, String endDate);
+
+ List<DailyProductionData> exportDailyProduction(String beginDate, String endDate);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/LargenScreenService.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/LargenScreenService.java
index f3a419f..4179afc 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/LargenScreenService.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/LargenScreenService.java
@@ -1,9 +1,9 @@
package com.mes.largenscreen.service;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.largenscreen.entity.DailyProductionData;
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.DateRequest;
-import com.mes.largenscreen.entity.PieChartVO;
import java.util.List;
@@ -18,4 +18,7 @@
List<DailyProductionVO> querySameDayProduction(DateRequest query);
+ void exportDailyProduction();
+
+ List<DailyProductionData> queryProduction(DateRequest query);
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java
index 1e0505a..f20de1f 100644
--- a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/service/impl/LargenScreenServiceImpl.java
@@ -1,15 +1,23 @@
package com.mes.largenscreen.service.impl;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.support.ExcelTypeEnum;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.mes.largenscreen.entity.DailyProductionData;
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.DateRequest;
import com.mes.largenscreen.mapper.LargenScreenMapper;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.tools.PageUtil;
+import com.mes.utils.excel.CustomCellWriteWidthConfig;
+import com.mes.utils.excel.ExcelMergeStrategy;
+import com.mes.utils.excel.ExcelUtil;
import org.springframework.stereotype.Service;
import org.springframework.util.StringUtils;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
@@ -25,6 +33,8 @@
@Resource
private LargenScreenMapper largenScreenMapper;
+ @Resource
+ private HttpServletResponse response;
@Override
public Page<DailyProductionVO> queryDailyProduction(DateRequest query) {
@@ -50,5 +60,39 @@
return list;
}
+ @Override
+ public void exportDailyProduction() {
+ try {
+
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, -10);
+
+ ExcelUtil.setExcelResponseProp(response, "MES璇曠敓浜ц褰�" + sdf.format(new Date()));
+ List<DailyProductionData> providerList = largenScreenMapper.exportDailyProduction(sdf.format(calendar.getTime()), sdf.format(new Date()));
+ EasyExcel.write(response.getOutputStream())
+ .head(DailyProductionData.class)
+ .registerWriteHandler(new ExcelMergeStrategy(DailyProductionData.class))
+ .registerWriteHandler(new CustomCellWriteWidthConfig())
+ .excelType(ExcelTypeEnum.XLSX).sheet("鐢熶骇璁板綍").doWrite(providerList);
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ @Override
+ public List<DailyProductionData> queryProduction(DateRequest query) {
+ if (StringUtils.isEmpty(query.getBeginDate())) {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DAY_OF_MONTH, -6);
+ query.setBeginDate(sdf.format(calendar.getTime()));
+ query.setEndDate(sdf.format(new Date()));
+ }
+ return largenScreenMapper.exportDailyProduction(query.getBeginDate(), query.getEndDate());
+
+
+ }
+
}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellStyleHandler.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellStyleHandler.java
new file mode 100644
index 0000000..227f445
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellStyleHandler.java
@@ -0,0 +1,35 @@
+package com.mes.utils.excel;
+
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.handler.context.CellWriteHandlerContext;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.xssf.usermodel.XSSFFont;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/5/12 20:32
+ * @Description:
+ */
+public class CustomCellStyleHandler implements CellWriteHandler {
+
+ @Override
+ public void afterCellDispose(CellWriteHandlerContext context) {
+ // 鑾峰彇鍗曞厓鏍�
+ Cell cell = context.getCell();
+ CellStyle cellStyle = cell.getCellStyle();
+
+ // 璁剧疆姘村钩鍜屽瀭鐩村眳涓�
+ cellStyle.setAlignment(HorizontalAlignment.CENTER);
+ cellStyle.setVerticalAlignment(VerticalAlignment.CENTER);
+
+ cellStyle.setFont(new XSSFFont());
+
+ cellStyle.setBorderBottom(BorderStyle.THIN);
+ cellStyle.setBorderLeft(BorderStyle.THIN);
+ cellStyle.setBorderRight(BorderStyle.THIN);
+ cellStyle.setBorderTop(BorderStyle.THIN);
+
+ // 璁剧疆鏍峰紡鍥炲埌鍗曞厓鏍�
+ cell.setCellStyle(cellStyle);
+ }
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellWriteWidthConfig.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellWriteWidthConfig.java
new file mode 100644
index 0000000..fc0db4b
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/CustomCellWriteWidthConfig.java
@@ -0,0 +1,82 @@
+package com.mes.utils.excel;
+
+import com.alibaba.excel.enums.CellDataTypeEnum;
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.CellData;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.style.column.AbstractColumnWidthStyleStrategy;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Sheet;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/5/12 20:34
+ * @Description:
+ */
+public class CustomCellWriteWidthConfig extends AbstractColumnWidthStyleStrategy {
+
+ private final Map<Integer, Map<Integer, Integer>> CACHE = new HashMap<>();
+
+ @Override
+ protected void setColumnWidth(WriteSheetHolder writeSheetHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer integer, Boolean isHead) {
+ boolean needSetWidth = isHead || !CollectionUtils.isEmpty(cellDataList);
+ if (needSetWidth) {
+ Map<Integer, Integer> maxColumnWidthMap = CACHE.computeIfAbsent(writeSheetHolder.getSheetNo(), k -> new HashMap<>());
+ Integer columnWidth = this.dataLength(cellDataList, cell, isHead);
+ if (columnWidth > 0) {
+ if (columnWidth > 10) {
+ columnWidth = 20;
+ } else {
+ columnWidth = 10;
+ }
+ Integer maxColumnWidth = maxColumnWidthMap.get(cell.getColumnIndex());
+ if (maxColumnWidth == null || columnWidth > maxColumnWidth) {
+ maxColumnWidthMap.put(cell.getColumnIndex(), columnWidth);
+ Sheet sheet = writeSheetHolder.getSheet();
+ sheet.setColumnWidth(cell.getColumnIndex(), 256 * columnWidth + 184);
+ }
+ }
+ }
+ }
+
+ /**
+ * 璁＄畻闀垮害
+ *
+ * @param cellDataList
+ * @param cell
+ * @param isHead
+ * @return
+ */
+ private Integer dataLength(List<WriteCellData<?>> cellDataList, Cell cell, Boolean isHead) {
+ if (isHead) {
+ return cell.getStringCellValue().getBytes().length;
+ } else {
+ CellData<?> cellData = cellDataList.get(0);
+ CellDataTypeEnum type = cellData.getType();
+ if (type == null) {
+ return -1;
+ } else {
+ switch (type) {
+ case STRING:
+ // 鎹㈣绗︼紙鏁版嵁闇�瑕佹彁鍓嶈В鏋愬ソ锛�
+ int index = cellData.getStringValue().indexOf("\n");
+ return index != -1 ?
+ cellData.getStringValue().substring(0, index).getBytes().length + 1 : cellData.getStringValue().getBytes().length + 1;
+ case BOOLEAN:
+ return cellData.getBooleanValue().toString().getBytes().length;
+ case NUMBER:
+ return cellData.getNumberValue().toString().getBytes().length;
+ default:
+ return -1;
+ }
+ }
+ }
+ }
+
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java
new file mode 100644
index 0000000..4776f27
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMerge.java
@@ -0,0 +1,27 @@
+package com.mes.utils.excel;
+
+import java.lang.annotation.*;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/5/12 16:51
+ * @Description:
+ */
+@Target({ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface ExcelMerge {
+ /**
+ * 鏄惁鍚堝苟鍗曞厓鏍�
+ *
+ * @return true || false
+ */
+ boolean merge() default true;
+
+ /**
+ * 鏄惁涓轰富閿紙鍗宠瀛楁鐩稿悓鐨勮鍚堝苟锛�
+ *
+ * @return true || false
+ */
+ boolean isPrimaryKey() default false;
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMergeStrategy.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMergeStrategy.java
new file mode 100644
index 0000000..dab4d9f
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelMergeStrategy.java
@@ -0,0 +1,118 @@
+package com.mes.utils.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.write.handler.RowWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/5/12 16:55
+ * @Description:
+ */
+public class ExcelMergeStrategy implements RowWriteHandler {
+
+ /**
+ * 涓婚敭涓嬫爣
+ */
+ private Integer primaryKeyIndex;
+
+ /**
+ * 闇�瑕佸悎骞剁殑鍒楃殑涓嬫爣闆嗗悎
+ */
+ private final List<Integer> mergeColumnIndexList = new ArrayList<>();
+
+ /**
+ * 鏁版嵁绫诲瀷
+ */
+ private final Class<?> elementType;
+
+ public ExcelMergeStrategy(Class<?> elementType) {
+ this.elementType = elementType;
+ }
+
+ @Override
+ public void afterRowDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Integer relativeRowIndex, Boolean isHead) {
+ // 鍒ゆ柇鏄惁涓烘爣棰�
+ if (isHead) {
+ return;
+ }
+ // 鑾峰彇褰撳墠宸ヤ綔琛�
+ Sheet sheet = writeSheetHolder.getSheet();
+ // 鍒濆鍖栦富閿笅鏍囧拰闇�瑕佸悎骞跺瓧娈电殑涓嬫爣
+ if (primaryKeyIndex == null) {
+ this.initPrimaryIndexAndMergeIndex(writeSheetHolder);
+ }
+ // 鍒ゆ柇鏄惁闇�瑕佸拰涓婁竴琛岃繘琛屽悎骞�
+ // 涓嶈兘鍜屾爣棰樺悎骞讹紝鍙兘鏁版嵁琛屼箣闂村悎骞�
+ if (row.getRowNum() <= 1) {
+ return;
+ }
+ // 鑾峰彇涓婁竴琛屾暟鎹�
+ Row lastRow = sheet.getRow(row.getRowNum() - 1);
+ // 灏嗘湰琛屽拰涓婁竴琛屾槸鍚屼竴绫诲瀷鐨勬暟鎹紙閫氳繃涓婚敭瀛楁杩涜鍒ゆ柇锛夛紝鍒欓渶瑕佸悎骞�
+ if (lastRow.getCell(primaryKeyIndex).getStringCellValue().equalsIgnoreCase(row.getCell(primaryKeyIndex).getStringCellValue())) {
+ for (Integer mergeIndex : mergeColumnIndexList) {
+ CellRangeAddress cellRangeAddress = new CellRangeAddress(row.getRowNum() - 1, row.getRowNum(), mergeIndex, mergeIndex);
+ sheet.addMergedRegionUnsafe(cellRangeAddress);
+ }
+ }
+ }
+
+ /**
+ * 鍒濆鍖栦富閿笅鏍囧拰闇�瑕佸悎骞跺瓧娈电殑涓嬫爣
+ *
+ * @param writeSheetHolder WriteSheetHolder
+ */
+ private void initPrimaryIndexAndMergeIndex(WriteSheetHolder writeSheetHolder) {
+ // 鑾峰彇褰撳墠宸ヤ綔琛�
+ Sheet sheet = writeSheetHolder.getSheet();
+ // 鑾峰彇鏍囬琛�
+ Row titleRow = sheet.getRow(0);
+ // 鑾峰彇鎵�鏈夊睘鎬у瓧娈�
+ Field[] fields = this.elementType.getDeclaredFields();
+ // 閬嶅巻鎵�鏈夊瓧娈�
+ for (Field field : fields) {
+ // 鑾峰彇@ExcelProperty娉ㄨВ锛岀敤浜庤幏鍙栬瀛楁瀵瑰簲鍒楃殑涓嬫爣
+ ExcelProperty excelProperty = field.getAnnotation(ExcelProperty.class);
+ // 鍒ゆ柇鏄惁涓虹┖
+ if (null == excelProperty) {
+ continue;
+ }
+ // 鑾峰彇鑷畾涔夋敞瑙ｏ紝鐢ㄤ簬鍚堝苟鍗曞厓鏍�
+ ExcelMerge excelMerge = field.getAnnotation(ExcelMerge.class);
+ // 鍒ゆ柇鏄惁闇�瑕佸悎骞�
+ if (null == excelMerge) {
+ continue;
+ }
+ for (int i = 0; i < fields.length; i++) {
+ Cell cell = titleRow.getCell(i);
+ if (null == cell) {
+ continue;
+ }
+ // 灏嗗瓧娈靛拰琛ㄥご鍖归厤涓�
+ if (excelProperty.value()[0].equalsIgnoreCase(cell.getStringCellValue())) {
+ if (excelMerge.isPrimaryKey()) {
+ primaryKeyIndex = i;
+ }
+ if (excelMerge.merge()) {
+ mergeColumnIndexList.add(i);
+ }
+ }
+ }
+ }
+
+ // 娌℃湁鎸囧畾涓婚敭锛屽垯寮傚父
+ if (null == this.primaryKeyIndex) {
+ throw new IllegalStateException("浣跨敤@ExcelMerge娉ㄨВ蹇呴』鎸囧畾涓婚敭");
+ }
+ }
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelUtil.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelUtil.java
new file mode 100644
index 0000000..b8559ef
--- /dev/null
+++ b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/utils/excel/ExcelUtil.java
@@ -0,0 +1,19 @@
+package com.mes.utils.excel;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+
+/**
+ * @Author : zhoush
+ * @Date: 2025/5/12 17:03
+ * @Description:
+ */
+public class ExcelUtil {
+ public static void setExcelResponseProp(HttpServletResponse response, String rawFileName) throws UnsupportedEncodingException {
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode(rawFileName, "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+ }
+}
diff --git a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml
index 14a179a..f505063 100644
--- a/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml
+++ b/hangzhoumesParent/common/servicebase/src/main/resources/mapper/LargenScreenMapper.xml
@@ -136,6 +136,167 @@
t6.product_date
order by t.date
</select>
+ <select id="exportDailyProduction" resultType="com.mes.largenscreen.entity.DailyProductionData">
+ with edg_storage_history_temp as (
+ select t.glass_id_in as glass_id, t.create_time, STR_TO_DATE(t.create_time, '%Y-%m-%d') as product_date
+ from edg_storage_device_task_history t
+ where t.task_type in
+ (1, 3)
+ and STR_TO_DATE(t.create_time, '%Y-%m-%d') BETWEEN #{beginDate} and #{endDate}
+ )
+ , big_storage_cage_history_temp as (
+ select t.glass_id, t.create_time, STR_TO_DATE(t.create_time, '%Y-%m-%d') as product_date
+ from big_storage_cage_history_task t
+ where t.task_type = 2
+ and STR_TO_DATE(t.create_time, '%Y-%m-%d') BETWEEN #{beginDate} and #{endDate}
+ )
+ , hollow_big_storage_cage_history_temp as (
+ select t.glass_id, t.create_time, STR_TO_DATE(t.create_time, '%Y-%m-%d') as product_date
+ from hollow_big_storage_cage_history_task t
+ where t.task_type = 5
+ and STR_TO_DATE(t.create_time, '%Y-%m-%d') BETWEEN #{beginDate} and #{endDate}
+ )
+ , engineer_temp as (
+ select STR_TO_DATE(create_time, '%Y-%m-%d') as product_date, engineer_id, glass_total, glass_total_area
+ from engineering
+ where STR_TO_DATE(create_time, '%Y-%m-%d') BETWEEN #{beginDate} and #{endDate}
+ )
+ , edg_temp as (
+ select t.product_date,
+ count(t.glass_id) as
+ count_out,
+ round(sum(t1.width * t1.height) / 1000000, 1) as total_area_out
+ from edg_storage_history_temp t
+ inner join glass_info t1 on t.glass_id = t1.glass_id
+ group by product_date
+ )
+ , edg_time_one as (
+ select product_date,
+ min(create_time) as edg_begin_time,
+ max(create_time) as edg_end_time,
+ TIMESTAMPDIFF(MINUTE, min(create_time), max(create_time)) AS edg_time_total
+ from edg_storage_history_temp
+ group by product_date
+ )
+ , edg_time_two as (
+ SELECT t1.product_date,
+ sum(TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time)) AS edg_time_free
+ FROM (SELECT product_date,
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM edg_storage_history_temp
+ ) t1
+ JOIN
+ (SELECT create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM edg_storage_history_temp) t2 ON t1.next_timestamp = t2.create_time
+ WHERE TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) between 6 and 500
+ group by t1.product_date
+ )
+ , big_storage_temp as (
+ select t.product_date,
+ count(distinct t1.engineer_id, t1.tempering_layout_id) as tempering_layout_count,
+ count(distinct t1.glass_id) as tempering_glass_count,
+ round(sum(t1.width * t1.height) / 1000000, 1) as tempering_area
+ from big_storage_cage_history_temp t
+ inner join glass_info t1
+ on t.glass_id = t1.glass_id
+ group by t.product_date
+ )
+ , big_storage_time_base as (
+ select distinct product_date, create_time from big_storage_cage_history_temp
+ )
+ , big_storage_time_one as (select product_date,
+ min(create_time) as big_begin_time,
+ max(create_time) as big_end_time,
+ TIMESTAMPDIFF(MINUTE, min(create_time), max(create_time)) AS big_time_total
+ from big_storage_time_base
+ group by product_date)
+ , big_storage_time_two as (
+ SELECT t1.product_date,
+ IFNULL(sum(TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time)), 0) AS big_time_free
+ FROM (SELECT product_date,
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM big_storage_time_base) t1
+ JOIN
+ (SELECT create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM big_storage_time_base) t2 ON t1.next_timestamp = t2.create_time
+ WHERE TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) between 11 and 500
+ group by t1.product_date
+ )
+ , hollow_big_storage_temp as (
+ select t.product_date,
+ count(distinct t1.glass_id) as hollow_glass_count,
+ round(sum(t1.width * t1.height) / 1000000, 1) as hollow_area
+ from hollow_big_storage_cage_history_temp t
+ inner join glass_info t1
+ on t.glass_id = t1.glass_id
+ group by t.product_date
+ )
+ , hollow_big_storage_time_base as (
+ select distinct product_date, create_time from hollow_big_storage_cage_history_temp
+ )
+ , hollow_big_storage_time_one as (select product_date,
+ min(create_time) as hollow_begin_time,
+ max(create_time) as hollow_end_time,
+ TIMESTAMPDIFF(MINUTE, min(create_time), max(create_time)) AS hollow_time_total
+ from hollow_big_storage_time_base
+ group by product_date)
+ , hollow_big_storage_time_two as (
+ SELECT t1.product_date,
+ IFNULL(sum(TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time)), 0) AS hollow_time_free
+ FROM (SELECT product_date,
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM hollow_big_storage_time_base) t1
+ JOIN
+ (SELECT create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM hollow_big_storage_time_base) t2 ON t1.next_timestamp = t2.create_time
+ WHERE TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) between 11 and 500
+ group by t1.product_date
+ )
+ , result as (
+ select t.count_out,
+ t.total_area_out,
+ t1.*,
+ t2.edg_time_free,
+ t1.edg_time_total - t2.edg_time_free as edg_time_diff,
+ t3.tempering_layout_count,
+ t3.tempering_glass_count,
+ t3.tempering_area,
+ t4.big_begin_time,
+ t4.big_end_time,
+ t4.big_time_total,
+ t5.big_time_free,
+ t4.big_time_total - t5.big_time_free as big_time_diff,
+ t6.hollow_glass_count,
+ t6.hollow_area,
+ t7.hollow_begin_time,
+ t7.hollow_end_time,
+ t7.hollow_time_total,
+ t8.hollow_time_free,
+ t7.hollow_time_total - t8.hollow_time_free as hollow_time_diff,
+ t9.engineer_id,
+ t9.glass_total,
+ t9.glass_total_area
+ from edg_temp t
+ LEFT JOIN edg_time_one t1 on t.product_date = t1.product_date
+ LEFT JOIN edg_time_two t2 on t.product_date = t2.product_date
+ LEFT JOIN big_storage_temp t3 on t.product_date = t3.product_date
+ LEFT JOIN big_storage_time_one t4 on t.product_date = t4.product_date
+ LEFT JOIN big_storage_time_two t5 on t.product_date = t5.product_date
+ LEFT JOIN hollow_big_storage_temp t6 on t.product_date = t6.product_date
+ LEFT JOIN hollow_big_storage_time_one t7 on t.product_date = t7.product_date
+ LEFT JOIN hollow_big_storage_time_two t8 on t.product_date = t8.product_date
+ LEFT JOIN engineer_temp t9 on t.product_date = t9.product_date
+ )
+ select *
+ from result
+ order by product_date
+ </select>
</mapper>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
index 0f83952..6189fd2 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcCacheGlassNewTask.java
@@ -302,20 +302,41 @@
//鑾峰彇瀵瑰簲鐨勮澶囩姸鎬佷俊鎭�
ReadWriteEntity oneOutStateEntity = miloService.readFromOpcUa("WL1.WL1.slotState");
ReadWriteEntity twoOutStateEntity = miloService.readFromOpcUa("WL2.WL2.slotState");
+ ReadWriteEntity d06OutStateEntity = miloService.readFromOpcUa("WL2.WL2.d06SlotState");
//鐘舵�佹湁3涓儏鍐碉細0绌洪棽 1蹇欑 2绂佺敤
- String oneOutState = "2";
- String twoOutState = "2";
+ String oneOutState = Const.OUT_DISABLE;
+ String twoOutState = Const.OUT_DISABLE;
+ String d06OutState = Const.OUT_DISABLE;
if (null != oneOutStateEntity && null != oneOutStateEntity.getValue()) {
oneOutState = oneOutStateEntity.getValue().toString();
}
if (null != twoOutStateEntity && null != twoOutStateEntity.getValue()) {
twoOutState = twoOutStateEntity.getValue().toString();
}
-
- if ((cellFlag == 2 && Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) || (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState))) {
+ //涓ゆ潯绾块兘涓虹鐢ㄥ垯涓嶅嚭鐜荤拑
+ if (Const.OUT_DISABLE.equals(oneOutState) && Const.OUT_DISABLE.equals(twoOutState)) {
log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
return Boolean.FALSE;
}
+ if (null != d06OutStateEntity && null != d06OutStateEntity.getValue()) {
+ d06OutState = d06OutStateEntity.getValue().toString();
+ }
+ //鑾峰彇d06鐗囧彴鐘舵��
+ // 1:涓�瀵逛竴鐨勬儏鍐典笅涓嶉渶瑕佸垽鏂璬06鐘舵��
+ // 2:涓�鍙风嚎涓�瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦簩鍙风嚎纾ㄨ竟鍓嶇墖鍙癉07鐨勭姸鎬侊紝D07闈炵鐢ㄦ椂锛屼簩鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
+ // 3:浜屽彿绾夸竴瀵瑰鐨勬儏鍐典笅锛岃幏鍙栦竴鍙风嚎纾ㄨ竟鍓嶇墖鍙癈08鐨勭姸鎬侊紝C08闈炵鐢ㄦ椂锛屼竴鍙风嚎灏嗘寜鐓06鐗囧彴鐘舵�佽寰楀嚭鐗�
+ if (cellFlag == 2) {
+ if (deviceId == 1) {
+ twoOutState = Const.OUT_DISABLE.equals(twoOutState) ? Const.OUT_DISABLE : d06OutState;
+ } else {
+ oneOutState = Const.OUT_DISABLE.equals(oneOutState) ? Const.OUT_DISABLE : d06OutState;
+ }
+ if (Const.OUT_BUSY.equals(oneOutState) && Const.OUT_BUSY.equals(twoOutState)) {
+ log.info("A09銆丄10涓簕},{}闈炶嚜鍔ㄧ姸鎬侊紝鏃犳硶鍑虹墖", oneOutState, oneOutState);
+ return Boolean.FALSE;
+ }
+ }
+
log.info("寮�濮嬫墽琛屽嚭鐗�/鐩撮�氫换鍔★紝浠诲姟淇℃伅涓猴細{},琛ㄥ悕涓猴細{},璁惧id:{},寮�濮嬫椂闂达細{},涓�鍙风嚎鐘舵�侊細{}锛屼簩鍙风嚎鐘舵�侊細{}",
task, tableName, deviceId, startDate, oneOutState, twoOutState);
//鑾峰彇褰撳墠闇�瑕佽蛋閭ｆ潯绾�
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 0c1e86a..e7a4565 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
@@ -13,6 +13,7 @@
import com.mes.largenscreen.entity.DailyProductionVO;
import com.mes.largenscreen.entity.DateRequest;
import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.largenscreen.service.LargenScreenService;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import com.mes.opctask.service.EdgStorageDeviceTaskHistoryService;
@@ -151,11 +152,10 @@
@Scheduled(fixedDelay = 1000)
public void querySameDayProductionTask() {
JSONObject jsonObject = new JSONObject();
- List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
- jsonObject.append("productionVO", productionVO);
-
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreenProduction");
if (sendwServer != null) {
+ List<DailyProductionVO> productionVO = largenScreenService.querySameDayProduction(new DateRequest());
+ jsonObject.append("productionVO", productionVO);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
@@ -171,38 +171,41 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 500)
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//纾ㄨ竟淇℃伅
- List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
- new LambdaQueryWrapper<EdgGlassTaskInfo>()
- .lt(EdgGlassTaskInfo::getState, 2)
- .eq(EdgGlassTaskInfo::getLine, 1)
- );
- List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
- new LambdaQueryWrapper<EdgGlassTaskInfo>()
- .lt(EdgGlassTaskInfo::getState, 2)
- .eq(EdgGlassTaskInfo::getLine, 2)
- );
- jsonObject.append("edgOneTasks", edgOneTasks);
- jsonObject.append("edgTwoTasks", edgTwoTasks);
- List<Engineering> engineeringOne = engineeringService.list(
- new LambdaQueryWrapper<Engineering>()
- .eq(Engineering::getStationCell, 5)
- .eq(Engineering::getState, 0)
- );
- List<Engineering> engineeringTow = engineeringService.list(
- new LambdaQueryWrapper<Engineering>()
- .eq(Engineering::getStationCell, 6)
- .eq(Engineering::getState, 0)
- );
- jsonObject.append("engineeringOne", engineeringOne);
- jsonObject.append("engineeringTwo", engineeringTow);
- List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
- jsonObject.append("pieChartVOS", pieChartVOS);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
+ List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
+ new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .lt(EdgGlassTaskInfo::getState, 2)
+ .eq(EdgGlassTaskInfo::getLine, 1)
+ );
+ List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
+ new LambdaQueryWrapper<EdgGlassTaskInfo>()
+ .lt(EdgGlassTaskInfo::getState, 2)
+ .eq(EdgGlassTaskInfo::getLine, 2)
+ );
+ jsonObject.append("edgOneTasks", edgOneTasks);
+ jsonObject.append("edgTwoTasks", edgTwoTasks);
+ List<Engineering> engineeringOne = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 5)
+ .eq(Engineering::getState, 0)
+ );
+ List<Engineering> engineeringTow = engineeringService.list(
+ new LambdaQueryWrapper<Engineering>()
+ .eq(Engineering::getStationCell, 6)
+ .eq(Engineering::getState, 0)
+ );
+ jsonObject.append("engineeringOne", engineeringOne);
+ jsonObject.append("engineeringTwo", engineeringTow);
+ List<PieChartVO> pieChartVOS = edgStorageCageDetailsService.queryPieChart();
+ jsonObject.append("pieChartVOS", pieChartVOS);
+ List<RunTime> loadRunTimes = edgStorageDeviceTaskHistoryService.queryRunTimes();
+ jsonObject.append("loadRunTimes", loadRunTimes);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
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 3479324..be8810d 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
@@ -2,8 +2,11 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.opctask.entity.EdgStorageDeviceTaskHistory;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* (EdgStorageDeviceTaskHistory)琛ㄦ暟鎹簱璁块棶灞�
@@ -14,5 +17,7 @@
public interface EdgStorageDeviceTaskHistoryMapper extends BaseMapper<EdgStorageDeviceTaskHistory> {
DailyProductionVO queryEdgDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate, @Param("deviceId") Integer deviceId);
+
+ List<RunTime> queryRunTimes();
}
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 6d60973..38bd770 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
@@ -3,8 +3,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
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 java.util.List;
/**
* (EdgStorageDeviceTaskHistory)琛ㄦ湇鍔℃帴鍙�
@@ -17,5 +20,7 @@
Page<EdgStorageDeviceTaskHistory> queryEdgStorageDeviceTaskHistory(TaskHistoryRequest request);
DailyProductionVO queryEdgDailyProduction(TaskHistoryRequest request);
+
+ List<RunTime> queryRunTimes();
}
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 c7cf26a..e065451 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
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.mapper.EdgStorageDeviceTaskHistoryMapper;
@@ -12,6 +13,7 @@
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.List;
/**
* (EdgStorageDeviceTaskHistory)琛ㄦ湇鍔″疄鐜扮被
@@ -49,5 +51,10 @@
}
return baseMapper.queryEdgDailyProduction(beginDate, endDate, request.getDeviceId());
}
+
+ @Override
+ public List<RunTime> queryRunTimes(){
+ return baseMapper.queryRunTimes();
+ }
}
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
index 96caa07..563cca9 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/application-dev.yml
@@ -32,11 +32,11 @@
password: 123456
kangaroohy:
milo:
- enabled: false
+ enabled: true
primary: default
config:
default:
- endpoint: opc.tcp://192.168.2.100:49320
+ endpoint: opc.tcp://10.153.19.150:49320
security-policy: basic256sha256
username: admin
password: 1qaz2wsx3edc4rfv
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
index 238ae73..f6025e0 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
@@ -18,8 +18,7 @@
<result column="hollow_total_area_out_two" property="hollowTotalAreaOutTwo"/>
</resultMap>
-
- <select id="queryEdgDailyProduction" resultMap="baseMap">
+ <select id="queryDailyProduction" resultMap="baseMap">
SELECT
count( t.glass_id_out ) AS count_out_one,
round( sum( t1.width * t1.height )/ 1000000, 2 ) AS total_area_out_one
@@ -36,6 +35,35 @@
AND device_id = #{deviceId}
</if>
</select>
+ <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)
+ )
+ SELECT
+ t1.create_time AS first_timestamp,
+ t2.create_time AS second_timestamp,
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) as diff_minutes
+ ,(select min(create_time) from edg_storage_cage_history_task_temp) as start_timestamp
+ ,(select max(create_time) from edg_storage_cage_history_task_temp) as end_timestamp
+ FROM
+ (SELECT
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM
+ edg_storage_cage_history_task_temp ) t1
+ JOIN
+ (SELECT
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM
+ edg_storage_cage_history_task_temp ) t2 ON t1.next_timestamp = t2.create_time
+
+ WHERE
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) between 6 and 500
+ GROUP BY t1.create_time,t2.create_time
+ ;
+ </select>
</mapper>
\ No newline at end of file
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 885a0fa..0aab936 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
@@ -4,7 +4,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* (BigStorageCageHistoryTask)琛ㄦ暟鎹簱璁块棶灞�
@@ -15,5 +18,7 @@
public interface BigStorageCageHistoryTaskMapper extends BaseMapper<BigStorageCageHistoryTask> {
DailyProductionVO queryBigDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+ List<RunTime> queryRunTimes();
}
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 34e8a83..aca6e5b 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
@@ -6,6 +6,9 @@
import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask;
import com.mes.bigstoragecagetask.entity.request.BigStorageCageHistoryRequest;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
+
+import java.util.List;
/**
* (BigStorageCageHistoryTask)琛ㄦ湇鍔℃帴鍙�
@@ -18,5 +21,7 @@
Page<BigStorageCageHistoryTask> queryBigStorageCageHistoryTask(BigStorageCageHistoryRequest request);
DailyProductionVO queryBigDailyProduction(BigStorageCageHistoryRequest request);
+
+ List<RunTime> queryRunTimes();
}
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 992eb0a..d1b7045 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
@@ -11,10 +11,12 @@
import com.mes.bigstoragecagetask.mapper.BigStorageCageHistoryTaskMapper;
import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.tools.DateUtil;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.List;
/**
* (BigStorageCageHistoryTask)琛ㄦ湇鍔″疄鐜扮被
@@ -54,5 +56,11 @@
}
return baseMapper.queryBigDailyProduction(beginDate, endDate);
}
+
+ @Override
+ public List<RunTime> queryRunTimes(){
+ return baseMapper.queryRunTimes();
+ }
+
}
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 6502165..54bf769 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
@@ -8,12 +8,15 @@
import com.mes.bigstorage.entity.dto.BigStorageSummaryDTO;
import com.mes.bigstorage.service.BigStorageCageDetailsService;
import com.mes.bigstorage.service.BigStorageCageService;
+import com.mes.bigstoragecagetask.entity.BigStorageCageHistoryTask;
import com.mes.bigstoragecagetask.entity.BigStorageCageTask;
import com.mes.bigstoragecagetask.entity.BigStorageTaskVO;
+import com.mes.bigstoragecagetask.service.BigStorageCageHistoryTaskService;
import com.mes.bigstoragecagetask.service.BigStorageCageTaskService;
import com.mes.common.config.Const;
import com.mes.glassinfo.service.GlassInfoService;
import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.temperingglass.entity.TemperingGlassInfo;
import com.mes.temperingglass.service.TemperingGlassInfoService;
import com.mes.tools.WebSocketServer;
@@ -47,6 +50,8 @@
private GlassInfoService glassInfoService;
@Resource
private BigStorageCageTaskService bigStorageCageTaskService;
+ @Resource
+ private BigStorageCageHistoryTaskService bigStorageCageHistoryTaskService;
@Autowired(required = false)
MiloService miloService;
@@ -209,12 +214,14 @@
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//鐞嗙墖绗间娇鐢ㄦ儏鍐�
- List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
- jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
- List<PieChartVO> pieChartVOS = bigStorageCageService.queryPieChart();
- jsonObject.append("pieChartVOS", pieChartVOS);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
+ List<Map<String, Object>> bigStorageCageUsage = bigStorageCageService.selectBigStorageCageUsage();
+ jsonObject.append("bigStorageCageUsage", bigStorageCageUsage);
+ List<PieChartVO> pieChartVOS = bigStorageCageService.queryPieChart();
+ jsonObject.append("pieChartVOS", pieChartVOS);
+ List<RunTime> tempRunTimes = bigStorageCageHistoryTaskService.queryRunTimes();
+ jsonObject.append("tempRunTimes", tempRunTimes);
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
webserver.sendMessage(jsonObject.toString());
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml
index c0bcd39..b6f1e94 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/application-dev.yml
@@ -30,7 +30,7 @@
password: 123456
kangaroohy:
milo:
- enabled: true
+ enabled: false
primary: default
config:
default:
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml
index 8cc0c74..0b84c32 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/resources/mapper/BigStorageCageHistoryTaskMapper.xml
@@ -42,7 +42,32 @@
select *
from big_storage_in_temp
INNER join big_storage_out_temp on 1 = 1
+ </select>
+ <select id="queryRunTimes" resultType="com.mes.largenscreen.entity.RunTime">
+ with big_storage_cage_history_task_temp as (
+ 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)
+ )
+ SELECT t1.create_time AS first_timestamp,
+ t2.create_time AS second_timestamp,
+ 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,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM big_storage_cage_history_task_temp) t1
+ JOIN
+ (SELECT create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM big_storage_cage_history_task_temp) t2 ON t1.next_timestamp = t2.create_time
+ WHERE TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) between 11 and 500
+ GROUP BY t1.create_time, t2.create_time
+ ;
</select>
</mapper>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
index 33c73b3..62d17e9 100644
--- a/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
+++ b/hangzhoumesParent/moduleService/GlassStorageModule/src/main/java/com/mes/job/RawGlassTask.java
@@ -3,6 +3,7 @@
import cn.hutool.core.collection.CollectionUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.github.xingshuangs.iot.protocol.s7.serializer.S7Serializer;
import com.kangaroohy.milo.model.ReadWriteEntity;
import com.kangaroohy.milo.service.MiloService;
import com.mes.common.config.Const;
@@ -16,6 +17,8 @@
import com.mes.rawglassstation.service.RawGlassStorageStationService;
import com.mes.rawglasstask.entity.RawGlassStorageTask;
import com.mes.rawglasstask.service.RawGlassStorageTaskService;
+import com.mes.s7.entity.S7Data;
+import com.mes.s7.job.S7Job;
import com.mes.uppattenusage.entity.UpPattenUsage;
import com.mes.uppattenusage.entity.vo.UpPattenUsageVO;
import com.mes.uppattenusage.mapper.UpPattenUsageMapper;
@@ -57,6 +60,9 @@
@Autowired(required = false)
private MiloService miloService;
+ @Autowired(required = false)
+ S7Serializer s7Serializer;
+
private static final String LOAD_GLASS_DEVICE_ONE_TASK = "load_glass_device_one_task";
@@ -64,6 +70,7 @@
private static final List<Integer> LOAD_STATION_01 = Arrays.asList(101, 102);
private static final List<Integer> LOAD_STATION_02 = Arrays.asList(103, 104);
+ private static final List<Integer> LOAD_STATION_ALL = Arrays.asList(101, 102, 103, 104);
private static final Integer LEFTING_01 = 98;
private static final Integer LEFTING_02 = 99;
private static final Integer LOAD_GLASS_ONE_DEVICE = 5;
@@ -71,23 +78,40 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageTask() throws Exception {
- ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
- ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
- ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
- ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
- String requestValue = requestWord.getValue() + "";
+
+ String requestWord = S7Job.S7DataWL1.getRequest().toString();
+ String confireWord = S7Job.S7DataWL1.getConfirmation().toString();
+ String reportWord = S7Job.S7DataWL1.getReportWord().toString();
+ String taskWord = S7Job.S7DataWL1.getTaskWord().toString();
+
+// ReadWriteEntity requestWord = miloService.readFromOpcUa("CC.CC.request");
+// ReadWriteEntity confireWord = miloService.readFromOpcUa("CC.CC.confirmation");
+// ReadWriteEntity reportWord = miloService.readFromOpcUa("CC.CC.reportWord");
+// ReadWriteEntity taskWord = miloService.readFromOpcUa("CC.CC.taskWord");
+ String requestValue = requestWord;
+// String requestValue = requestWord.getValue() + "";
if ("0".equals(requestValue)) {
- if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
- miloService.writeToOpcWord(list);
+ if ("1".equals(confireWord) && "0".equals(reportWord)) {
+// if ("1".equals(confireWord.getValue() + "") && "0".equals(reportWord.getValue() + "")) {
+ S7Data s7Data=new S7Data();
+ s7Data.setConfirmation((short)0);
+ s7Serializer.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.confirmation", 0));
+// miloService.writeToOpcWord(list);
}
- if ("1".equals(taskWord.getValue() + "")) {
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
- list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
- list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
- miloService.writeToOpcWord(list);
+ if ("1".equals(taskWord)) {
+// if ("1".equals(taskWord.getValue() + "")) {
+ S7Data s7Data=new S7Data();
+ s7Data.setTaskWord((short)0);
+ s7Data.setStartSlot((short)0);
+ s7Data.setEndSlot((short)0);
+ s7Serializer.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.taskWord", 0));
+// list.add(generateReadWriteEntity("CC.CC.startSlot", 0));
+// list.add(generateReadWriteEntity("CC.CC.endSlot", 0));
+// miloService.writeToOpcWord(list);
}
return;
}
@@ -127,8 +151,9 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageInCar() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
- String value = entity.getValue() + "";
+ String value = S7Job.S7DataWL1.getInCar().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.inCar");
+// String value = entity.getValue() + "";
if (!"1".equals(value)) {
log.info("澶ц溅涓婃病鏈夋灦瀛�");
return;
@@ -146,8 +171,9 @@
@Scheduled(fixedDelay = 1000)
public void rawStorageFinish() throws Exception {
- ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
- String value = entity.getValue() + "";
+ String value = S7Job.S7DataWL1.getReportWord().toString();
+// ReadWriteEntity entity = miloService.readFromOpcUa("CC.CC.reportWord");
+// String value = entity.getValue() + "";
if ("0".equals(value)) {
log.info("褰撳墠浠诲姟鏈眹鎶ワ紝缁撴潫鏈浠诲姟");
return;
@@ -210,9 +236,12 @@
.set(RawGlassStorageTask::getTaskState, Const.RAW_GLASS_TASK_FAILURE));
}
- List<ReadWriteEntity> list = new ArrayList<>();
- list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
- miloService.writeToOpcWord(list);
+ S7Data s7Data=new S7Data();
+ s7Data.setConfirmation((short)1);
+ s7Serializer.write(s7Data);
+// List<ReadWriteEntity> list = new ArrayList<>();
+// list.add(generateReadWriteEntity("CC.CC.confirmation", 1));
+// miloService.writeToOpcWord(list);
}
private boolean isHasRunningTask() {
@@ -405,6 +434,10 @@
if (CollectionUtils.isEmpty(loadStationList)) {
log.info("1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
+ if(CollectionUtils.isEmpty(loadStationList)){
+ log.info("浠撳簱鍐呮棤鍖归厤鐨勭幓鐠�");
+ return Boolean.FALSE;
+ }
rawGlassStorageDetailsService.generateTask(rawDetails.getSlot(), loadStation.get(0), rawDetails.getShelf(), rawDetails.getRemainQuantity(), Const.RAW_GLASS_TASK_TYPE_DISPATCH);
//缁撴潫璋冨害浠诲姟 淇敼宸ヤ綅鐘舵��(璧峰浣嶏級鐘舵�佷负103 RAW_GLASS_STATE_RUNNING 浠诲姟瀹屾垚鍚庡皢鐘舵�佹敼涓�101 鐩爣浣嶆柊澧炰竴鏉℃暟鎹紝鏋跺瓙鍙蜂负锛堣捣濮嬩綅锛�
rawGlassStorageDetailsService.update(new LambdaUpdateWrapper<RawGlassStorageDetails>()
@@ -424,7 +457,7 @@
log.info("2鍙蜂笂鐗囦綅鐜荤拑灏哄涓嶄竴鑷达紝1鍙蜂笂鐗囦綅鐢熸垚璋冨害浠诲姟");
//鎸夌収灏哄鍙婃暟閲忚幏鍙栨暟閲忔渶鎺ヨ繎鐨勬牸瀛愪俊鎭�
RawGlassStorageDetails rawDetails = getRawGlassStorageDetailsBySize(usageVOS.get(0), usageVOS.size());
- if(null == rawDetails){
+ if (null == rawDetails) {
log.info("浠撳簱鍐呮棤闇�瑕佷笂鏋剁殑鐜荤拑");
return Boolean.FALSE;
}
@@ -546,6 +579,7 @@
.eq(RawGlassStorageDetails::getPatternWidth, usageVO.getWidth())
.eq(RawGlassStorageDetails::getPatternHeight, usageVO.getHeight())
.eq(RawGlassStorageDetails::getPatternThickness, usageVO.getThickness())
+ .notIn(RawGlassStorageDetails::getSlot, LOAD_STATION_ALL)
.eq(RawGlassStorageDetails::getState, Const.GLASS_STATE_IN)
.orderByAsc(RawGlassStorageDetails::getRemainQuantity)
.last("order by abs(t.remain_quantity - " + remainQuantity + ") asc")
diff --git a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
index 50e65c8..36c5ff7 100644
--- a/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/LoadGlassModule/src/main/resources/application-dev.yml
@@ -5,7 +5,7 @@
strict: false #璁剧疆涓ユ牸妯″紡,榛樿false涓嶅惎鍔�. 鍚姩鍚庡湪鏈尮閰嶅埌鎸囧畾鏁版嵁婧愭椂鍊欏洖鎶涘嚭寮傚父,涓嶅惎鍔ㄤ細浣跨敤榛樿鏁版嵁婧�.
datasource:
northGlassMes:
- url: jdbc:mysql://127.0.0.1:3306/north_glass_mes?serverTimezone=GMT%2b8
+ url: jdbc:mysql://127.0.0.1:3306/north_glass_mes?serverTimezone=GMT%2b8&allowMultiQueries=true
username: root
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
index b54025e..be8de32 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/resources/application-dev.yml
@@ -10,7 +10,7 @@
password: beibo.123/
driver-class-name: com.mysql.cj.jdbc.Driver
salve_northGlassMes:
- url: jdbc:sqlserver://10.153.19.150:1433;databasename=north_glass_mes
+ url: jdbc:sqlserver://127.0.0.1:1433;databasename=north_glass_mes
username: sa
password: beibo.123/
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
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 5906e51..28b1db2 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
@@ -3,7 +3,10 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mes.hollowtask.entity.HollowBigStorageCageHistoryTask;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* (HollowBigStorageCageHistoryTask)琛ㄦ暟鎹簱璁块棶灞�
@@ -14,5 +17,7 @@
public interface HollowBigStorageCageHistoryTaskMapper extends BaseMapper<HollowBigStorageCageHistoryTask> {
DailyProductionVO queryHollowDailyProduction(@Param("beginDate") String beginDate, @Param("endDate") String endDate);
+
+ List<RunTime> queryRunTimes();
}
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 3d98cb3..771f5ac 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
@@ -5,6 +5,9 @@
import com.mes.hollowtask.entity.HollowBigStorageCageHistoryTask;
import com.mes.hollowtask.entity.request.HollowBigStorageCageHistoryRequest;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
+
+import java.util.List;
/**
* (HollowBigStorageCageHistoryTask)琛ㄦ湇鍔℃帴鍙�
@@ -17,5 +20,7 @@
Page<HollowBigStorageCageHistoryTask> queryHollowBigStorageCageHistoryTask(HollowBigStorageCageHistoryRequest request);
DailyProductionVO queryHollowDailyProduction(HollowBigStorageCageHistoryRequest request);
+
+ List<RunTime> queryRunTimes();
}
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 a43904e..a22f2c7 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
@@ -10,10 +10,12 @@
import com.mes.hollowtask.mapper.HollowBigStorageCageHistoryTaskMapper;
import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.DailyProductionVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.tools.DateUtil;
import org.springframework.stereotype.Service;
import java.text.SimpleDateFormat;
+import java.util.List;
/**
* (HollowBigStorageCageHistoryTask)琛ㄦ湇鍔″疄鐜扮被
@@ -53,5 +55,10 @@
}
return baseMapper.queryHollowDailyProduction(beginDate, endDate);
}
+
+ @Override
+ public List<RunTime> queryRunTimes(){
+ return baseMapper.queryRunTimes();
+ }
}
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 c131268..3fb4640 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
@@ -19,7 +19,9 @@
import com.mes.hollow.service.HollowGlassRelationInfoService;
import com.mes.hollowqueue.entity.HollowGlassQueueInfo;
import com.mes.hollowqueue.service.HollowGlassQueueInfoService;
+import com.mes.hollowtask.service.HollowBigStorageCageHistoryTaskService;
import com.mes.largenscreen.entity.PieChartVO;
+import com.mes.largenscreen.entity.RunTime;
import com.mes.tools.WebSocketServer;
import com.mes.utils.RedisUtil;
import lombok.extern.slf4j.Slf4j;
@@ -54,6 +56,8 @@
BigStorageCageTaskService bigStorageCageTaskService;
@Resource
HollowGlassRelationInfoService hollowGlassRelationInfoService;
+ @Resource
+ HollowBigStorageCageHistoryTaskService hollowBigStorageCageHistoryTaskService;
@Autowired(required = false)
MiloService miloService;
@@ -230,6 +234,8 @@
//閽㈠寲楗煎浘鏁版嵁
List<PieChartVO> pieChartVOS = hollowGlassOutRelationInfoService.queryPieChart();
jsonObject.append("pieChartVOS", pieChartVOS);
+ List<RunTime> hollowRunTimes = hollowBigStorageCageHistoryTaskService.queryRunTimes();
+ jsonObject.append("hollowRunTimes", hollowRunTimes);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
diff --git a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
index 6629e95..66f2369 100644
--- a/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
+++ b/hangzhoumesParent/moduleService/hollowGlassModule/src/main/resources/mapper/HollowBigStorageCageHistoryTaskMapper.xml
@@ -47,4 +47,28 @@
from hollow_out_one_temp
inner join hollow_out_two_temp on 1 = 1
</select>
+ <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)
+ )
+ SELECT
+ t1.create_time AS first_timestamp,
+ t2.create_time AS second_timestamp,
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) as diff_minutes
+ FROM
+ (SELECT
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM
+ big_storage_cage_history_task_temp ) t1
+ JOIN
+ (SELECT
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM
+ big_storage_cage_history_task_temp ) t2 ON t1.next_timestamp = t2.create_time
+ WHERE
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) between 11 and 500;
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0