From 4e3b8155722b66e25df3c6fd42cc586b68dea391 Mon Sep 17 00:00:00 2001
From: zhoushihao <zsh19950802@163.com>
Date: 星期五, 06 六月 2025 13:55:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
hangzhoumesParent/moduleService/TemperingGlassModule/src/main/java/com/mes/job/PlcTemperingGlassTask.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
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