From 3c32000216972a73cef885933ddb3e5ccc888749 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期二, 13 五月 2025 14:26:13 +0800
Subject: [PATCH] 大屏样式修改，色块个数查询限制为当天
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java | 7
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java | 5
hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java | 14
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml | 18 +
hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java | 642 +++++++++++++++++++++---------------------
UI-Project/src/lang/en.js | 27 +
UI-Project/src/lang/zh.js | 28 +
UI-Project/src/views/largescreendisplay/screendisplay.vue | 52 ++-
hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java | 2
hangzhoumesParent/common/servicebase/pom.xml | 6
UI-Project/src/views/largescreendisplay/statistics.vue | 46 +++
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 20
12 files changed, 511 insertions(+), 356 deletions(-)
diff --git a/UI-Project/src/lang/en.js b/UI-Project/src/lang/en.js
index 9481841..bbb3108 100644
--- a/UI-Project/src/lang/en.js
+++ b/UI-Project/src/lang/en.js
@@ -511,6 +511,33 @@
createTime: 'Return date',
},
large: {
+ loadstart:'Load start',
+ loadend:'Load end',
+ loadtotal: 'Load total',
+ loadfree: 'Load free',
+ loaddiff: 'Load diff',
+ loadnumber: 'Load number',
+ loadarea: 'Load area',
+ tempstart: 'Temp start',
+ tempend: 'Temp end',
+ temptotal: 'Temp total',
+ tempfree: 'Temp free',
+ tempdiff: 'Temp diff',
+ tempstove: 'temp stove',
+ tempnumber: 'Temp number',
+ temparea: 'Temp area',
+ hollowstart: 'Hollow start',
+ hollowend: 'Hollow end',
+ hollowtotal: 'Hollow total',
+ hollowfree: 'Hollow free',
+ hollowdiff: 'Hollow diff',
+ hollownumber: 'Hollow number',
+ hollowEngineer: 'Hollow engineer',
+ hollowtotal: 'Hollow total',
+ hollowarea: 'Hollow area',
+ engineerId: 'Engineer ID',
+ totalnumber: 'Total number',
+ tatalarea: 'Total area',
statistics: 'Statistics',
ExporttoExcel:'Export to Excel',
slice:'slice',
diff --git a/UI-Project/src/lang/zh.js b/UI-Project/src/lang/zh.js
index 1580d29..69cea14 100644
--- a/UI-Project/src/lang/zh.js
+++ b/UI-Project/src/lang/zh.js
@@ -513,6 +513,34 @@
createTime :'杩斿簱鏃ユ湡',
},
large:{
+ loadstart:'鍒囧壊寮�濮嬫椂闂�',
+ loadend:'鍒囧壊缁撴潫鏃堕棿',
+ loadtotal: '鍒囧壊鎬绘椂闂�',
+ loadfree: '鍒囧壊绌洪棽鏃堕棿',
+ loaddiff: '鍒囧壊宸ヤ綔鏃堕棿',
+ loadnumber: '鍒囧壊鎬绘暟閲�',
+ loadarea: '鍒囧壊鎬婚潰绉�',
+ tempstart: '閽㈠寲寮�濮嬫椂闂�',
+ tempend: '閽㈠寲缁撴潫鏃堕棿',
+ temptotal: '閽㈠寲鎬绘椂闂�',
+ tempfree: '閽㈠寲绌洪棽鏃堕棿',
+ tempdiff: '閽㈠寲宸ヤ綔鏃堕棿',
+ tempstove: '閽㈠寲鐐夊彿',
+ tempnumber: '閽㈠寲鎬绘暟閲�',
+ temparea: '閽㈠寲鎬婚潰绉�',
+ hollowstart: '涓┖寮�濮嬫椂闂�',
+ hollowend: '涓┖缁撴潫鏃堕棿',
+ hollowtotal: '涓┖鎬绘椂闂�',
+ hollowfree: '涓┖绌洪棽鏃堕棿',
+ hollowdiff: '涓┖宸ヤ綔鏃堕棿',
+ hollownumber: '涓┖鎬绘暟閲�',
+ hollowEngineer: '涓┖宸ョ▼',
+ hollowarea: '涓┖鎬婚潰绉�',
+ hollowtotal: '涓┖鎬绘椂闂�',
+ engineerId: '宸ョ▼鍙�',
+ totalnumber: '鎬绘暟閲�',
+ tatalarea: '鎬婚潰绉�',
+
statistics: '鐢熶骇缁熻',
ExporttoExcel:'瀵煎嚭excel',
slice:'鐗�',
diff --git a/UI-Project/src/views/largescreendisplay/screendisplay.vue b/UI-Project/src/views/largescreendisplay/screendisplay.vue
index 6cfe1e4..fc6eada 100644
--- a/UI-Project/src/views/largescreendisplay/screendisplay.vue
+++ b/UI-Project/src/views/largescreendisplay/screendisplay.vue
@@ -64,17 +64,17 @@
temperingGlassInfoList.value = data.temperingGlassInfoList[0];
if (numBoxes3.value != temperingTaskType.value) {
numBoxes3.value = temperingTaskType.value;
- // initBoxes(boxes3, numBoxes3, 'secondleft');
+ initBoxes(boxes3, numBoxes3, 'secondleft');
}
- if (temperingGlassInfoList.value > 1) {
+ if (temperingGlassInfoList.value >= 1) {
if (numBoxes4.value != 1) {
numBoxes4.value = 1;
- // initBoxes(boxes4, numBoxes4, 'right');
+ initBoxes(boxes4, numBoxes4, 'right');
}
} else {
if (numBoxes4.value != 0) {
numBoxes4.value = 0;
- // initBoxes(boxes4, numBoxes4, 'right');
+ initBoxes(boxes4, numBoxes4, 'right');
}
}
@@ -451,6 +451,22 @@
}
}
+const exportToExcel = async () => {
+ try {
+ window.open('http://192.168.0.39:10011/largenScreen/exportDailyProduction', '_blank');
+ // const response = await request.get('/cacheGlass/largenScreen/exportDailyProduction');
+ // if (response.code == 200) {
+ // ElMessage.success(response.message);
+ // tableDatad.value = response.data;
+ // } else {
+ // ElMessage.error(response.message);
+ // }
+ }
+ catch (error) {
+ console.error(error);
+ }
+}
+
const tableData = ref([]);
const dynamicColumns = ref([]);
const flowCardDetail = async (orderId) => {
@@ -539,10 +555,10 @@
closeWebSocket(socket5);
}
});
-const numBoxes = ref(1);
-const numBoxes2 = ref(1);
-const numBoxes3 = ref(1);
-const numBoxes4 = ref(1);
+const numBoxes = ref(0);
+const numBoxes2 = ref(0);
+const numBoxes3 = ref(0);
+const numBoxes4 = ref(0);
const speed = 0.1;
const delayFrames = 600;
@@ -581,11 +597,11 @@
});
} else {
// 閲嶇疆宸叉湁鐨� box 鏁版嵁
- existing[i].x = 0;
- existing[i].y = 0;
- existing[i].direction = direction;
- existing[i].delay = i * delayFrames;
- existing[i].frameCount = 0;
+ // existing[i].x = 0;
+ // existing[i].y = 0;
+ // existing[i].direction = direction;
+ // existing[i].delay = i * delayFrames;
+ // existing[i].frameCount = 0;
}
}
if (existing.length > count) {
@@ -640,7 +656,13 @@
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`;
+
+ if(box.direction=="right"){
+ box.el.style.right = `-${box.x}px`;
+
+ }else{
+ box.el.style.right = `${box.x}px`;
+ }
box.el.style.left = '';
} else {
box.el.style.left = `${box.x}px`;
@@ -889,7 +911,7 @@
<div style="width: 50%;">
<div class="img-screen" alt="Screen">
<div>
- <el-button type="primary" style="top:40px;left:670px;position: absolute;" @click="handlehistorical11()">{{
+ <el-button type="primary" style="top:40px;left:670px;position: absolute;" @click="exportToExcel()">{{
$t('large.statistics') }}</el-button>
</div>
<!-- 閽㈠寲鍗婇�忔槑鑹插潡 -->
diff --git a/UI-Project/src/views/largescreendisplay/statistics.vue b/UI-Project/src/views/largescreendisplay/statistics.vue
index 8dcf943..430287d 100644
--- a/UI-Project/src/views/largescreendisplay/statistics.vue
+++ b/UI-Project/src/views/largescreendisplay/statistics.vue
@@ -7,6 +7,7 @@
</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" @click="exportToExcel">{{$t('large.ExporttoExcel')}}</el-button>
</div>
<el-table ref="table" style="margin-top: 20px;height: 580px;width: 1770px;" :data="tableDatax"
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129' }">
@@ -223,5 +224,50 @@
parseAndSetTime();
historical();
});
+
+import * as XLSX from 'xlsx';
+import { saveAs } from 'file-saver';
+
+const exportToExcel = () => {
+ // 琛ㄦ牸鏁版嵁锛堟繁鎷疯礉闃叉姹℃煋锛�
+ const data = JSON.parse(JSON.stringify(tableDatax.value));
+
+ // 琛ㄥご杞崲涓轰腑鏂囨垨鍥介檯鍖栨枃鏈�
+ const headerMap = {
+ date: t('large.date'),
+ countOutOne: t('large.countOutOne'),
+ totalAreaOutOne: t('large.totalAreaOutOne'),
+ countOutTwo: t('large.countOutTwo'),
+ totalAreaOutTwo: t('large.totalAreaOutTwo'),
+ countIn: t('large.countIn'),
+ totalAreaIn: t('large.totalAreaIn'),
+ countOut: t('large.countOut'),
+ totalAreaOut: t('large.totalAreaOut'),
+ hollowCountOutOne: t('large.hollowCountOutOne'),
+ hollowTotalAreaOutOne: t('large.hollowTotalAreaOutOne'),
+ hollowCountOutTwo: t('large.hollowCountOutTwo'),
+ hollowTotalAreaOutTwo: t('large.hollowTotalAreaOutTwo')
+ };
+
+ // 灏嗘暟鎹腑鐨� key 鏇挎崲涓轰腑鏂囪〃澶�
+ const exportData = data.map(row => {
+ const newRow = {};
+ for (const key in headerMap) {
+ newRow[headerMap[key]] = row[key];
+ }
+ return newRow;
+ });
+
+ // 杞崲涓哄伐浣滆〃
+ const worksheet = XLSX.utils.json_to_sheet(exportData);
+ const workbook = XLSX.utils.book_new();
+ XLSX.utils.book_append_sheet(workbook, worksheet, 'Sheet1');
+
+ // 瀵煎嚭涓烘枃浠�
+ const excelBuffer = XLSX.write(workbook, { bookType: 'xlsx', type: 'array' });
+ const blob = new Blob([excelBuffer], { type: 'application/octet-stream' });
+ saveAs(blob, '鐢熶骇鎯呭喌瀵煎嚭.xlsx');
+};
+
</script>
<style scoped></style>
\ No newline at end of file
diff --git a/hangzhoumesParent/common/servicebase/pom.xml b/hangzhoumesParent/common/servicebase/pom.xml
index 4bb9465..0409010 100644
--- a/hangzhoumesParent/common/servicebase/pom.xml
+++ b/hangzhoumesParent/common/servicebase/pom.xml
@@ -43,7 +43,11 @@
<artifactId>milo-spring-boot-starter</artifactId>
<version>3.0.6.12</version>
</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/entity/DailyProductionData.java b/hangzhoumesParent/common/servicebase/src/main/java/com/mes/largenscreen/entity/DailyProductionData.java
index 8a8e685..6f44066 100644
--- 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
@@ -16,6 +16,13 @@
@ExcelMerge(merge = true, isPrimaryKey = true)
private String productDate;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "宸ョ▼鍙�"})
+ private String engineerId;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬荤墖閲�"})
+ private String glassTotal;
+ @ExcelProperty(value = {"宸ョ▼淇℃伅", "鎬婚潰绉�(m^2)"})
+ private String glassTotalArea;
+
@ExcelProperty(value = {"鍒囧壊", "寮�濮嬫椂闂�"})
@ExcelMerge(merge = true)
private String edgBeginTime;
@@ -87,12 +94,7 @@
@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/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
index cf7b7c0..ec3ade9 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/OpcEdgTask.java
@@ -59,11 +59,11 @@
GlassInfo glassInfo = glassInfoService.getOne(new LambdaQueryWrapper<GlassInfo>().eq(GlassInfo::getGlassId, glassId).last("limit 1"));
List<ReadWriteEntity> ualist = new ArrayList<>();
- miloService.writeToOpcUa(generateReadWriteEntity("MB04.MB04.mes_glass_Id_" + cell, glassId));
ualist.add(generateReadWriteEntity("MB04.MB04.width" + cell, (int) Math.max(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
ualist.add(generateReadWriteEntity("MB04.MB04.height" + cell, (int) Math.min(glassInfo.getWidth() * 10, glassInfo.getHeight() * 10)));
ualist.add(generateReadWriteEntity("MB04.MB04.thickness" + cell, (int) glassInfo.getThickness() * 10));
miloService.writeToOpcWord(ualist);
+ miloService.writeToOpcUa(generateReadWriteEntity("MB04.MB04.mes_glass_Id_" + cell, glassId));
}
private ReadWriteEntity generateReadWriteEntity(String identifier, Object value) {
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 e7a4565..334cfba 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/java/com/mes/job/PushMessageToIndex.java
@@ -24,7 +24,10 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -178,15 +181,19 @@
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("largenScreen");
if (sendwServer != null) {
+ Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
+
List<EdgGlassTaskInfo> edgOneTasks = edgGlassTaskInfoService.list(
new LambdaQueryWrapper<EdgGlassTaskInfo>()
.lt(EdgGlassTaskInfo::getState, 2)
.eq(EdgGlassTaskInfo::getLine, 1)
+ .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
);
List<EdgGlassTaskInfo> edgTwoTasks = edgGlassTaskInfoService.list(
new LambdaQueryWrapper<EdgGlassTaskInfo>()
.lt(EdgGlassTaskInfo::getState, 2)
.eq(EdgGlassTaskInfo::getLine, 2)
+ .ge(EdgGlassTaskInfo::getCreateTime, startOfToday)
);
jsonObject.append("edgOneTasks", edgOneTasks);
jsonObject.append("edgTwoTasks", edgTwoTasks);
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
index f6025e0..02adb4e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
@@ -64,6 +64,22 @@
GROUP BY t1.create_time,t2.create_time
;
</select>
-
+ <select id="queryEdgDailyProduction" 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
+ FROM
+ edg_storage_device_task_history t
+ INNER JOIN glass_info t1 ON t.glass_id_out = t1.glass_id
+ WHERE
+ t.task_type IN ( 2, 3 )
+ <if test="beginDate != null and beginDate != ''">
+ AND STR_TO_DATE( t.create_time, '%Y-%m-%d' ) BETWEEN #{beginDate}
+ AND #{endDate}
+ </if>
+ <if test="deviceId != null and deviceId != 0">
+ AND device_id = #{deviceId}
+ </if>
+ </select>
</mapper>
\ No newline at end of file
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java
index 722766f..31e10e5 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/main/java/com/mes/AppRunnerConfig.java
@@ -1,6 +1,5 @@
package com.mes;
-import com.mes.job.PlcStorageCageTask;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
@@ -13,11 +12,7 @@
public class AppRunnerConfig implements ApplicationRunner {
- private final PlcStorageCageTask plcStorageCageTask;
- public AppRunnerConfig(PlcStorageCageTask plcStorageCageTask) {
- this.plcStorageCageTask = plcStorageCageTask;
- }
@Override
public void run(ApplicationArguments args) throws Exception {
diff --git a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
index c7451b1..398e9a6 100644
--- a/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
+++ b/hangzhoumesParent/moduleService/CacheVerticalGlassModule/src/test/java/com/mes/CacheVerticalGlassModuleApplicationTest.java
@@ -1,322 +1,322 @@
-package com.mes;
-
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.mes.bigstorage.entity.BigStorageCage;
-import com.mes.bigstorage.entity.BigStorageCageDetails;
-import com.mes.bigstorage.service.BigStorageCageDetailsService;
-import com.mes.bigstorage.service.BigStorageCageService;
-import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
-import com.mes.common.config.Const;
-import com.mes.damage.entity.Damage;
-import com.mes.damage.service.DamageService;
-import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
-import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
-import com.mes.job.PlcStorageCageTask;
-import com.mes.pp.entity.ReportingWork;
-import com.mes.pp.entity.ReportingWorkDetail;
-import com.mes.temperingglass.entity.TemperingGlassInfo;
-import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
-
-/**
- * @Author : zhoush
- * @Date: 2024/3/27 16:37
- * @Description:
- */
-@Slf4j
-@RunWith(SpringRunner.class)
-@SpringBootTest(classes = CacheVerticalClassModuleApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
-public class CacheVerticalGlassModuleApplicationTest {
-
- @Autowired
- BigStorageCageService bigStorageCageService;
- @Autowired
- PlcStorageCageTask plcStorageCageTask;
- @Autowired
- BigStorageCageDetailsService bigStorageCageDetailsService;
- @Autowired
- DamageService damageService;
- @Autowired
- EdgGlassTaskInfoService edgGlassTaskInfoService;
-
+//package com.mes;
+//
+//import cn.hutool.json.JSONArray;
+//import cn.hutool.json.JSONObject;
+//import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.mes.bigstorage.entity.BigStorageCage;
+//import com.mes.bigstorage.entity.BigStorageCageDetails;
+//import com.mes.bigstorage.service.BigStorageCageDetailsService;
+//import com.mes.bigstorage.service.BigStorageCageService;
+//import com.mes.bigstoragetask.mapper.BigStorageCageFeedTaskMapper;
+//import com.mes.common.config.Const;
+//import com.mes.damage.entity.Damage;
+//import com.mes.damage.service.DamageService;
+//import com.mes.edgglasstask.entity.EdgGlassTaskInfo;
+//import com.mes.edgglasstask.service.EdgGlassTaskInfoService;
+////import com.mes.job.PlcStorageCageTask;
+//import com.mes.pp.entity.ReportingWork;
+//import com.mes.pp.entity.ReportingWorkDetail;
+//import com.mes.temperingglass.entity.TemperingGlassInfo;
+//import lombok.extern.slf4j.Slf4j;
+//import org.junit.Test;
+//import org.junit.runner.RunWith;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.boot.test.context.SpringBootTest;
+//import org.springframework.test.context.junit4.SpringRunner;
+//
+//import java.io.BufferedReader;
+//import java.io.InputStreamReader;
+//import java.io.OutputStream;
+//import java.net.HttpURLConnection;
+//import java.net.URL;
+//import java.time.LocalDateTime;
+//import java.time.format.DateTimeFormatter;
+//import java.util.*;
+//
+///**
+// * @Author : zhoush
+// * @Date: 2024/3/27 16:37
+// * @Description:
+// */
+//@Slf4j
+//@RunWith(SpringRunner.class)
+//@SpringBootTest(classes = CacheVerticalClassModuleApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+//public class CacheVerticalGlassModuleApplicationTest {
+//
// @Autowired
-// BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper;
-
- @Test
- public void testInsertSlot() {
- List<BigStorageCage> list = new ArrayList();
- for (int j = 1; j <= 5; j++) {
- for (int i = 1 + (55 * (j - 1)); i <= 55 * j; i++) {
- BigStorageCage cage = new BigStorageCage();
- cage.setDeviceId(j);
- cage.setSlot(i);
- cage.setMinThickness(4);
- cage.setMaxThickness(6);
- cage.setEnableState(1);
- cage.setRemainWidth(5000);
- list.add(cage);
- }
- }
- for (int i = 276; i <= 300; i++) {
- BigStorageCage cage = new BigStorageCage();
- cage.setDeviceId(6);
- cage.setSlot(i);
- cage.setMinThickness(8);
- cage.setMaxThickness(12);
- cage.setEnableState(1);
- cage.setRemainWidth(5000);
- list.add(cage);
- }
- for (int i = 301; i <= 330; i++) {
- BigStorageCage cage = new BigStorageCage();
- cage.setDeviceId(7);
- cage.setSlot(i);
- cage.setMinThickness(8);
- cage.setMaxThickness(12);
- cage.setEnableState(1);
- cage.setRemainWidth(5000);
- list.add(cage);
- }
- for (int i = 331; i <= 355; i++) {
- BigStorageCage cage = new BigStorageCage();
- cage.setDeviceId(8);
- cage.setSlot(i);
- cage.setMinThickness(8);
- cage.setMaxThickness(12);
- cage.setEnableState(1);
- cage.setRemainWidth(5000);
- list.add(cage);
- }
- for (int i = 356; i <= 380; i++) {
- BigStorageCage cage = new BigStorageCage();
- cage.setDeviceId(9);
- cage.setSlot(i);
- cage.setMinThickness(15);
- cage.setMaxThickness(19);
- cage.setEnableState(1);
- cage.setRemainWidth(5000);
- list.add(cage);
- }
- bigStorageCageService.saveBatch(list);
- }
-
- @Test
- public void testFindPath() {
- log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
- }
-
- @Test
- public void outGlass() {
- log.info("瀹屾暣璺緞锛歿}", bigStorageCageService.outGlass());
- }
-
- @Test
- public void plcToHomeEdgOutTask() {
- plcStorageCageTask.plcToHomeEdgOutTask();
- }
-
- @Test
- public void plcToHomeEdgFreeCarTask() {
- plcStorageCageTask.plcToHomeEdgFreeCarTask();
- }
-
- @Test
- public void plcStorageCageTask() {
- plcStorageCageTask.plcToHomeEdgScan();
-
- }
-
-
-
- @Test
- public void computeTargetByLine() {
- plcStorageCageTask.computeTargetByLine(2001);
- }
-
- @Test
- public void judgeGlassTypeStatus() {
- plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION, "mesD03Address");
- }
-
- @Test
- public void getStartLine() {
- Integer startLine = plcStorageCageTask.getStartLine();
- log.info("---------{}", startLine);
- }
-
- @Test
- public void selectBigStorageCageUsage() {
- log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageService.selectBigStorageCageUsage());
- }
-
- @Test
- public void selectBigStorageCageDetails() {
- log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageDetailsService.selectBigStorageCageDetails("P24060403|3|6"));
- }
-
- @Test
- public void insertDamage() {
-// Damage damage=new Damage();
-// damage.setGlassId("P24060403|3|6");
-// damage.setLine(2001);
-// damage.setWorkingProcedure("鍐峰姞宸�");
-// damage.setRemark("");
-// damage.setStatus(2);
-// damageService.insertDamage(damage);
- Damage damage=damageService.getOne(
- new LambdaQueryWrapper<Damage>()
- .eq(Damage::getGlassId,"P24071503|12|4")
- );
- damageService.submitReport(damage);
- }
-
- @Test
- public void updateOutGlassStateTask() {
- plcStorageCageTask.updateOutGlassStateTask();
- }
-
- @Test
- public void chaxun(){
- List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
- .select("Top 1 *")
- .eq("glass_id", "P24072402|1|13")
- );
- log.info("鍦ㄥ昂瀵歌〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
- }
-
- @Test
- public void deleteByGlassId(){
- damageService.deleteByGlassId("P24081203|2|5");
- }
-
- @Test
- public void testttt(){
- List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6);
- List<Integer> deviceUseds = deviceUsedList;
- List<BigStorageCageDetails> engineerCount1 = bigStorageCageDetailsService.list(
- new LambdaQueryWrapper<BigStorageCageDetails>()
- .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
- .select(BigStorageCageDetails::getEngineerId)
- .groupBy(BigStorageCageDetails::getEngineerId)
- .between(BigStorageCageDetails::getDeviceId, 1, 5)
- );
- List<BigStorageCageDetails> engineerCount2 = bigStorageCageDetailsService.list(
- new LambdaQueryWrapper<BigStorageCageDetails>()
- .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
- .select(BigStorageCageDetails::getEngineerId)
- .groupBy(BigStorageCageDetails::getEngineerId)
- .between(BigStorageCageDetails::getDeviceId, 6, 8)
- );
- if (engineerCount1.size() > engineerCount2.size()) {
- deviceUsedList.removeIf(device -> device < 6);
- } else {
- deviceUsedList.removeIf(device -> device > 5);
- }
- if (CollectionUtils.isEmpty(deviceUsedList)) {
- deviceUsedList = deviceUseds;
- }
- log.info("zhi:{}",deviceUsedList);
- }
-
-
- @Test
- public void ca(){
- try {
- // 鐩爣绯荤粺鐨凙PI URL
- String url = "http://192.168.3.119:8086/reportingWork/mesSaveReportingWorkWorn";
- URL obj = new URL(url);
- HttpURLConnection con = (HttpURLConnection) obj.openConnection();
-
- // 璁剧疆璇锋眰鏂规硶鍜岃姹傚ご
- con.setRequestMethod("POST");
- con.setRequestProperty("Content-Type", "application/json; utf-8");
- con.setRequestProperty("Accept", "application/json");
- con.setDoOutput(true);
-
- // 鍒涘缓 JSON 瀵硅薄
- JSONObject result = new JSONObject();
-
- ReportingWork reportingWork = new ReportingWork();
- reportingWork.setOrderId("NG24042301");
- reportingWork.setProductionId("NG24042301A");
- reportingWork.setProcessId("NG24042301A001");
- reportingWork.setDeviceName("纾ㄨ竟鏈�");
- reportingWork.setThisProcess("鍒囧壊");
- reportingWork.setNextProcess("纾ㄨ竟");
- reportingWork.setThisCompletedQuantity(1);
- reportingWork.setThisWornQuantity(0);
- reportingWork.setClasses("鏃╃彮");
- reportingWork.setReportingWorkTime(LocalDateTime.now());
- reportingWork.setTeamsGroupsName("灏忓粬涓�鍙�");
- reportingWork.setCreator("灏忓粬");
-
- List<ReportingWorkDetail> reportingWorkDetails = new ArrayList<>();
- ReportingWorkDetail reportingWorkDetail = new ReportingWorkDetail();
- reportingWorkDetail.setTechnologyNumber(1);
- reportingWorkDetail.setOrderNumber(1);
- reportingWorkDetail.setCompletedQuantity(1);
- reportingWorkDetail.setBreakageQuantity(0);
- reportingWorkDetails.add(reportingWorkDetail);
-
- ObjectMapper objectMapper = new ObjectMapper();
-
- // 灏� ReportingWork 杞崲涓� JSONObject
- JSONObject reportingWorkJson = new JSONObject(objectMapper.writeValueAsString(reportingWork));
- reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
- // 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
- JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails));
-
- // 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
- result.put("title", reportingWorkJson);
- result.put("detail", detailsJsonArray);
- result.put("type", 0);
- result.put("userId", "admin");
- result.put("userName", "admin");
- result.put("qualityInsStatus", 0);
-
- // 灏� result 瀵硅薄杞崲涓哄瓧绗︿覆
- String jsonInputString = result.toString();
- System.out.println("jsonInputString : " + result);
- // 鍙戦�佽姹�
- try (OutputStream os = con.getOutputStream()) {
- byte[] input = jsonInputString.getBytes("utf-8");
- os.write(input, 0, input.length);
- }
-
- // 鑾峰彇鍝嶅簲鐮�
- int responseCode = con.getResponseCode();
- System.out.println("Response Code : " + responseCode);
-
- // 鑾峰彇鍝嶅簲鍐呭
- try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))) {
- StringBuilder response = new StringBuilder();
- String inputLine;
- while ((inputLine = in.readLine()) != null) {
- response.append(inputLine);
- }
- System.out.println("Response Body: " + response.toString());
- }
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
-}
+// BigStorageCageService bigStorageCageService;
+//// @Autowired
+//// PlcStorageCageTask plcStorageCageTask;
+// @Autowired
+// BigStorageCageDetailsService bigStorageCageDetailsService;
+// @Autowired
+// DamageService damageService;
+// @Autowired
+// EdgGlassTaskInfoService edgGlassTaskInfoService;
+//
+//// @Autowired
+//// BigStorageCageFeedTaskMapper bigStorageCageFeedTaskMapper;
+//
+// @Test
+// public void testInsertSlot() {
+// List<BigStorageCage> list = new ArrayList();
+// for (int j = 1; j <= 5; j++) {
+// for (int i = 1 + (55 * (j - 1)); i <= 55 * j; i++) {
+// BigStorageCage cage = new BigStorageCage();
+// cage.setDeviceId(j);
+// cage.setSlot(i);
+// cage.setMinThickness(4);
+// cage.setMaxThickness(6);
+// cage.setEnableState(1);
+// cage.setRemainWidth(5000);
+// list.add(cage);
+// }
+// }
+// for (int i = 276; i <= 300; i++) {
+// BigStorageCage cage = new BigStorageCage();
+// cage.setDeviceId(6);
+// cage.setSlot(i);
+// cage.setMinThickness(8);
+// cage.setMaxThickness(12);
+// cage.setEnableState(1);
+// cage.setRemainWidth(5000);
+// list.add(cage);
+// }
+// for (int i = 301; i <= 330; i++) {
+// BigStorageCage cage = new BigStorageCage();
+// cage.setDeviceId(7);
+// cage.setSlot(i);
+// cage.setMinThickness(8);
+// cage.setMaxThickness(12);
+// cage.setEnableState(1);
+// cage.setRemainWidth(5000);
+// list.add(cage);
+// }
+// for (int i = 331; i <= 355; i++) {
+// BigStorageCage cage = new BigStorageCage();
+// cage.setDeviceId(8);
+// cage.setSlot(i);
+// cage.setMinThickness(8);
+// cage.setMaxThickness(12);
+// cage.setEnableState(1);
+// cage.setRemainWidth(5000);
+// list.add(cage);
+// }
+// for (int i = 356; i <= 380; i++) {
+// BigStorageCage cage = new BigStorageCage();
+// cage.setDeviceId(9);
+// cage.setSlot(i);
+// cage.setMinThickness(15);
+// cage.setMaxThickness(19);
+// cage.setEnableState(1);
+// cage.setRemainWidth(5000);
+// list.add(cage);
+// }
+// bigStorageCageService.saveBatch(list);
+// }
+//
+// @Test
+// public void testFindPath() {
+// log.info("瀹屾暣璺緞锛歿}", Arrays.asList("123"));
+// }
+//
+// @Test
+// public void outGlass() {
+// log.info("瀹屾暣璺緞锛歿}", bigStorageCageService.outGlass());
+// }
+//
+// @Test
+// public void plcToHomeEdgOutTask() {
+// plcStorageCageTask.plcToHomeEdgOutTask();
+// }
+//
+// @Test
+// public void plcToHomeEdgFreeCarTask() {
+// plcStorageCageTask.plcToHomeEdgFreeCarTask();
+// }
+//
+// @Test
+// public void plcStorageCageTask() {
+// plcStorageCageTask.plcToHomeEdgScan();
+//
+// }
+//
+//
+//
+// @Test
+// public void computeTargetByLine() {
+// plcStorageCageTask.computeTargetByLine(2001);
+// }
+//
+// @Test
+// public void judgeGlassTypeStatus() {
+// plcStorageCageTask.judgeGlassTypeStatus("P24060403|6|7", Const.A09_OUT_TARGET_POSITION, "mesD03Address");
+// }
+//
+// @Test
+// public void getStartLine() {
+// Integer startLine = plcStorageCageTask.getStartLine();
+// log.info("---------{}", startLine);
+// }
+//
+// @Test
+// public void selectBigStorageCageUsage() {
+// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageService.selectBigStorageCageUsage());
+// }
+//
+// @Test
+// public void selectBigStorageCageDetails() {
+// log.info("鑾峰彇澶х悊鐗囩淇℃伅锛歿}", bigStorageCageDetailsService.selectBigStorageCageDetails("P24060403|3|6"));
+// }
+//
+// @Test
+// public void insertDamage() {
+//// Damage damage=new Damage();
+//// damage.setGlassId("P24060403|3|6");
+//// damage.setLine(2001);
+//// damage.setWorkingProcedure("鍐峰姞宸�");
+//// damage.setRemark("");
+//// damage.setStatus(2);
+//// damageService.insertDamage(damage);
+// Damage damage=damageService.getOne(
+// new LambdaQueryWrapper<Damage>()
+// .eq(Damage::getGlassId,"P24071503|12|4")
+// );
+// damageService.submitReport(damage);
+// }
+//
+// @Test
+// public void updateOutGlassStateTask() {
+// plcStorageCageTask.updateOutGlassStateTask();
+// }
+//
+// @Test
+// public void chaxun(){
+// List<EdgGlassTaskInfo> edgGlassTaskInfoList = edgGlassTaskInfoService.list(new QueryWrapper<EdgGlassTaskInfo>()
+// .select("Top 1 *")
+// .eq("glass_id", "P24072402|1|13")
+// );
+// log.info("鍦ㄥ昂瀵歌〃涓幏鍙栫幓鐠冧俊鎭瘂}", edgGlassTaskInfoList);
+// }
+//
+// @Test
+// public void deleteByGlassId(){
+// damageService.deleteByGlassId("P24081203|2|5");
+// }
+//
+// @Test
+// public void testttt(){
+// List<Integer> deviceUsedList = bigStorageCageService.queryFreeDeviceByUsed(6);
+// List<Integer> deviceUseds = deviceUsedList;
+// List<BigStorageCageDetails> engineerCount1 = bigStorageCageDetailsService.list(
+// new LambdaQueryWrapper<BigStorageCageDetails>()
+// .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
+// .select(BigStorageCageDetails::getEngineerId)
+// .groupBy(BigStorageCageDetails::getEngineerId)
+// .between(BigStorageCageDetails::getDeviceId, 1, 5)
+// );
+// List<BigStorageCageDetails> engineerCount2 = bigStorageCageDetailsService.list(
+// new LambdaQueryWrapper<BigStorageCageDetails>()
+// .notIn(BigStorageCageDetails::getState, Const.GLASS_STATE_OUT,Const.GLASS_STATE_DAMAGE,Const.GLASS_STATE_TAKE)
+// .select(BigStorageCageDetails::getEngineerId)
+// .groupBy(BigStorageCageDetails::getEngineerId)
+// .between(BigStorageCageDetails::getDeviceId, 6, 8)
+// );
+// if (engineerCount1.size() > engineerCount2.size()) {
+// deviceUsedList.removeIf(device -> device < 6);
+// } else {
+// deviceUsedList.removeIf(device -> device > 5);
+// }
+// if (CollectionUtils.isEmpty(deviceUsedList)) {
+// deviceUsedList = deviceUseds;
+// }
+// log.info("zhi:{}",deviceUsedList);
+// }
+//
+//
+// @Test
+// public void ca(){
+// try {
+// // 鐩爣绯荤粺鐨凙PI URL
+// String url = "http://192.168.3.119:8086/reportingWork/mesSaveReportingWorkWorn";
+// URL obj = new URL(url);
+// HttpURLConnection con = (HttpURLConnection) obj.openConnection();
+//
+// // 璁剧疆璇锋眰鏂规硶鍜岃姹傚ご
+// con.setRequestMethod("POST");
+// con.setRequestProperty("Content-Type", "application/json; utf-8");
+// con.setRequestProperty("Accept", "application/json");
+// con.setDoOutput(true);
+//
+// // 鍒涘缓 JSON 瀵硅薄
+// JSONObject result = new JSONObject();
+//
+// ReportingWork reportingWork = new ReportingWork();
+// reportingWork.setOrderId("NG24042301");
+// reportingWork.setProductionId("NG24042301A");
+// reportingWork.setProcessId("NG24042301A001");
+// reportingWork.setDeviceName("纾ㄨ竟鏈�");
+// reportingWork.setThisProcess("鍒囧壊");
+// reportingWork.setNextProcess("纾ㄨ竟");
+// reportingWork.setThisCompletedQuantity(1);
+// reportingWork.setThisWornQuantity(0);
+// reportingWork.setClasses("鏃╃彮");
+// reportingWork.setReportingWorkTime(LocalDateTime.now());
+// reportingWork.setTeamsGroupsName("灏忓粬涓�鍙�");
+// reportingWork.setCreator("灏忓粬");
+//
+// List<ReportingWorkDetail> reportingWorkDetails = new ArrayList<>();
+// ReportingWorkDetail reportingWorkDetail = new ReportingWorkDetail();
+// reportingWorkDetail.setTechnologyNumber(1);
+// reportingWorkDetail.setOrderNumber(1);
+// reportingWorkDetail.setCompletedQuantity(1);
+// reportingWorkDetail.setBreakageQuantity(0);
+// reportingWorkDetails.add(reportingWorkDetail);
+//
+// ObjectMapper objectMapper = new ObjectMapper();
+//
+// // 灏� ReportingWork 杞崲涓� JSONObject
+// JSONObject reportingWorkJson = new JSONObject(objectMapper.writeValueAsString(reportingWork));
+// reportingWorkJson.put("reportingWorkTime", reportingWork.getReportingWorkTime().format(DateTimeFormatter.ISO_LOCAL_DATE_TIME));
+// // 灏� ReportingWorkDetail 鍒楄〃杞崲涓� JSONArray
+// JSONArray detailsJsonArray = new JSONArray(objectMapper.writeValueAsString(reportingWorkDetails));
+//
+// // 灏� JSON 瀵硅薄鍜屾暟缁勬坊鍔犲埌缁撴灉瀵硅薄涓�
+// result.put("title", reportingWorkJson);
+// result.put("detail", detailsJsonArray);
+// result.put("type", 0);
+// result.put("userId", "admin");
+// result.put("userName", "admin");
+// result.put("qualityInsStatus", 0);
+//
+// // 灏� result 瀵硅薄杞崲涓哄瓧绗︿覆
+// String jsonInputString = result.toString();
+// System.out.println("jsonInputString : " + result);
+// // 鍙戦�佽姹�
+// try (OutputStream os = con.getOutputStream()) {
+// byte[] input = jsonInputString.getBytes("utf-8");
+// os.write(input, 0, input.length);
+// }
+//
+// // 鑾峰彇鍝嶅簲鐮�
+// int responseCode = con.getResponseCode();
+// System.out.println("Response Code : " + responseCode);
+//
+// // 鑾峰彇鍝嶅簲鍐呭
+// try (BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream(), "utf-8"))) {
+// StringBuilder response = new StringBuilder();
+// String inputLine;
+// while ((inputLine = in.readLine()) != null) {
+// response.append(inputLine);
+// }
+// System.out.println("Response Body: " + response.toString());
+// }
+//
+// } catch (Exception e) {
+// e.printStackTrace();
+// }
+// }
+//}
diff --git a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
index f7c9623..52b49a6 100644
--- a/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
+++ b/hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java
@@ -2,6 +2,7 @@
import cn.hutool.json.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.mes.common.config.Const;
import com.mes.damage.service.DamageService;
@@ -14,7 +15,10 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.time.LocalDate;
+import java.time.ZoneId;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -105,17 +109,21 @@
public void largenScreen() {
JSONObject jsonObject = new JSONObject();
//澶у睆閽㈠寲淇℃伅
+ Date startOfToday = new Date(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli());
+
Integer putGlass = temperingAgoService.count(
- new LambdaUpdateWrapper<TemperingGlassInfo>()
- .eq(TemperingGlassInfo::getState, Const.TEMPERING_NEW)
+ new QueryWrapper<TemperingGlassInfo>()
+ .eq("state", Const.TEMPERING_NEW)
+ .gt("create_time", startOfToday)
);
jsonObject.append("temperingTaskType", putGlass);
//澶у睆閽㈠寲淇℃伅
List<TemperingGlassInfo> temperingGlassInfoList = temperingAgoService.list(
- new LambdaQueryWrapper<TemperingGlassInfo>()
- .select(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 閫夋嫨瑕佸幓閲嶇殑瀛楁
- .eq(TemperingGlassInfo::getState, Const.TEMPERING_START)
- .groupBy(TemperingGlassInfo::getEngineerId, TemperingGlassInfo::getTemperingLayoutId) // 鎸� engineerId 鍜� temperingLayoutId 鍒嗙粍
+ new QueryWrapper<TemperingGlassInfo>()
+ .select("engineer_id" ,"tempering_layout_id")
+ .eq("state", Const.TEMPERING_START)
+ .gt("create_time", startOfToday)
+ .groupBy("engineer_id" ,"tempering_layout_id")
);
jsonObject.append("temperingGlassInfoList", temperingGlassInfoList.size());
//澶у睆閽㈠寲淇℃伅
--
Gitblit v1.8.0