From 8d58c40af40493bd5f066cbfdb1ffd9f113c22fc Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 03 九月 2025 16:37:21 +0800
Subject: [PATCH] 1.前端推数据使用了最新的webSokect客户现场总是掉线，修改为接口方式 2.设备交互整体增加异常处理以及PLC连接方式改为短连接
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/md/controller/PrimitiveTaskController.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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..26d12aa 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
@@ -2,12 +2,11 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mes.md.entity.KBBTJPDrawingBP;
-import com.mes.md.entity.PrimitiveTask;
-import com.mes.md.entity.TaskingLog;
+import com.mes.md.entity.*;
import com.mes.md.mapper.KBBTJPDrawingBPMapper;
import com.mes.md.mapper.TaskingLogMapper;
import com.mes.md.service.KBBTJPDrawingBPService;
+import com.mes.md.service.LineConfigurationService;
import com.mes.md.service.PrimitiveTaskService;
import com.mes.md.service.TaskingLogService;
import com.mes.utils.Result;
@@ -42,12 +41,15 @@
TaskingLogService taskingLogService;
@Autowired
TaskingLogMapper taskingLogMapper;
+ @Autowired
+ LineConfigurationService lineConfigurationService;
@ApiOperation("鏌ヨ褰撳墠璁惧锛屾湭瀹屽伐鐘舵�佺殑绾夸笂浠诲姟")
- @PostMapping("/selectPrimitiveTask")
+ @PostMapping("/findMachineTask")
@ResponseBody
- public Result findMachineTask(@RequestBody PrimitiveTask primitiveTask) {
- List<PrimitiveTask> list =primitiveTaskService.selectPrimitiveTask(primitiveTask);
+ public Result findMachineTask(@RequestBody Machine machine) {
+ LineConfiguration lineConfiguration = lineConfigurationService.machineLineConfiguration(machine);
+ List<PrimitiveTask> list =primitiveTaskService.findPrimitiveTasking(machine,lineConfiguration.getLineId());
return Result.build(200,"鎴愬姛",list);
}
@@ -193,9 +195,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