From 6c9369ab9b7da99687857004470e8d7824eb69ae Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期三, 03 九月 2025 08:02:00 +0800
Subject: [PATCH] 修改plc连接读取失败导致无法重新链接
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
index a9f3de8..917fd58 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java
@@ -193,9 +193,13 @@
int dayCount = lastDayCal.get(Calendar.DAY_OF_MONTH);
QueryWrapper<TaskingLog> queryWrapper = new QueryWrapper<>();
- queryWrapper.select("CAST(operation_record_time AS DATE) AS CreateDate,ifNull(sum(task_quantity),0) as task_quantity_sum,ifNull(sum(length*width*task_quantity)/1000000,0) as area_sum")
- .ge("operation_record_time",startDate).le("operation_record_time",endDate).eq("work_state","瀹屽伐").groupBy("CAST(operation_record_time AS DATE)")
- .orderByAsc("CAST(operation_record_time AS DATE)");;
+ queryWrapper.select("CAST(operation_record_time AS DATE) AS CreateDate,ifNull(sum(task_quantity),0) as task_quantity_sum,ifNull(sum(length*width)/1000000,0) as area_sum")
+ .ge("operation_record_time",startDate).le("operation_record_time",endDate)
+ .in("operation_record","鏃嬭浆1","鏃嬭浆2")
+ .eq("operation_mode","缁撴潫")
+ .eq("work_state","瀹屽伐")
+ .groupBy("CAST(operation_record_time AS DATE)")
+ .orderByAsc("CAST(operation_record_time AS DATE)");
List<Map> list=taskingLogMapper.selectMaps((QueryWrapper)queryWrapper);
List<Map> resultDate=new ArrayList<>();
--
Gitblit v1.8.0