From 16170b1d8429f7c31bb1a323b93c2de5137f2c6f Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期一, 22 九月 2025 08:49:21 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/JiuMuMES
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/AddTask.java | 58 +++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 35 insertions(+), 23 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/AddTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/AddTask.java
index 5ee5fa7..6af91a1 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/AddTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/AddTask.java
@@ -1,25 +1,22 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
-import com.mes.md.entity.*;
-import com.mes.md.mapper.MachineMapper;
+import com.mes.md.entity.KBBTJPDrawingBP;
+import com.mes.md.entity.Tasking;
import com.mes.md.mapper.TaskingMapper;
-import com.mes.md.service.*;
-import com.mes.service.ModbusTcp;
-import com.mes.service.PlcAgreement;
-import com.mes.service.PlcParameter;
-import com.mes.tools.WebSocketServer;
-import com.mes.utils.HexUtil;
-import com.mes.utils.Result;
+import com.mes.md.service.KBBTJPDrawingBPService;
+import com.mes.md.service.ProjectService;
+import com.mes.md.service.TaskingLogService;
+import com.mes.websocket.WebSocketServer;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
-import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
/**
* @author SNG-010
@@ -36,30 +33,45 @@
@Autowired
TaskingMapper taskingMapper;
+ @Autowired
+ TaskingLogService taskingLogService;
@Scheduled(fixedDelay = 86400000)
public void deleteTasking() {
- //鍒涘缓Calendar瀹炰緥
- Calendar cal = Calendar.getInstance();
- //璁剧疆褰撳墠鏃堕棿
- cal.setTime(new Date());
- cal.add(Calendar.DATE, -5);
- int deleteCount=taskingMapper.deleteJoin(new MPJLambdaWrapper<Tasking>()
- .selectAll(Tasking.class)
- .le(Tasking::getOperationRecordTime,cal.getTime()));
- log.info("瀹氭椂娓呴櫎澶氫綑鏁版嵁:{}",deleteCount);
+ try {
+ //鍒涘缓Calendar瀹炰緥
+ Calendar cal = Calendar.getInstance();
+ //璁剧疆褰撳墠鏃堕棿
+ cal.setTime(new Date());
+ cal.add(Calendar.DATE, -5);
+ int deleteCount=taskingMapper.deleteJoin(new MPJLambdaWrapper<Tasking>()
+ .selectAll(Tasking.class)
+ .le(Tasking::getOperationRecordTime,cal.getTime()));
+ log.info("瀹氭椂娓呴櫎澶氫綑鏁版嵁{}",deleteCount);
+
+ }catch (Exception e){
+ log.info("瀹氭椂娓呴櫎澶氫綑鏁版嵁澶辫触");
+ }
+ }
+ @Scheduled(fixedDelay = 100000)
+ public void reportForWork() {
+ try {
+ taskingLogService.reportTaskingLog();
+ }catch (Exception e){
+ log.info("瀹氭椂姹囨姤浠诲姟澶辫触!");
+ }
}
//@Scheduled(fixedDelay = 1000)
public void notReceive() {
JSONObject jsonObject = new JSONObject();
List<KBBTJPDrawingBP> list =kBBTJPDrawingBPService.notReceiveKBBTJPDrawingBP();
jsonObject.append("content", list);
- ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("notReceiveTask");
+ List<WebSocketServer> sendwServer = WebSocketServer.SESSIONMAP.get("notReceiveTask");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
if (webserver != null) {
try {
- webserver.sendMessage(jsonObject.toString());
+ webserver.sendToWeb("",jsonObject.toString());
List<String> messages = webserver.getMessages();
if (!messages.isEmpty()) {
// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
--
Gitblit v1.8.0