From cf4622df137c26d238730316651f214fd29ca65f Mon Sep 17 00:00:00 2001
From: huang <1532065656@qq.com>
Date: 星期五, 25 七月 2025 16:38:13 +0800
Subject: [PATCH] 修改最新websocket
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/AddTask.java | 68 ++++++++++++++++++++++++----------
1 files changed, 48 insertions(+), 20 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 fefbd4e..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,23 +1,22 @@
package com.mes.job;
import cn.hutool.json.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.mes.md.entity.*;
-import com.mes.md.mapper.MachineMapper;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
+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.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
@@ -32,25 +31,54 @@
@Autowired
KBBTJPDrawingBPService kBBTJPDrawingBPService;
- //@Scheduled(fixedDelay = 30000)
- public void AddTasks() {
- projectService.insertProjectStandard();
+ @Autowired
+ TaskingMapper taskingMapper;
+ @Autowired
+ TaskingLogService taskingLogService;
+ @Scheduled(fixedDelay = 86400000)
+ public void deleteTasking() {
+ 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) {
- webserver.sendMessage(jsonObject.toString());
- List<String> messages = webserver.getMessages();
- if (!messages.isEmpty()) {
- // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- webserver.clearMessages();
+ try {
+ webserver.sendToWeb("",jsonObject.toString());
+ List<String> messages = webserver.getMessages();
+ if (!messages.isEmpty()) {
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ webserver.clearMessages();
+ }
+ }catch (Exception e) {
+
}
} else {
log.info("Home is closed");
--
Gitblit v1.8.0