From 0860a6d956dd77010d063ed06a65d70c9dab119c Mon Sep 17 00:00:00 2001
From: Administrator <1051256694@qq.com>
Date: 星期二, 17 三月 2026 16:42:23 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/service/CommonService.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index d8d455e..0fe6c84 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -1,5 +1,6 @@
package com.zy.common.service;
+import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.common.Cools;
@@ -272,12 +273,12 @@
StationProtocol stationProtocol = statusMap.get(command.getStationId());
JSONObject data = new JSONObject();
- data.put("oldTaskNo", wrkMast.getWrkNo());
- data.put("newTaskNo", stationProtocol.getTaskNo());
+ data.put("oldTaskNo", stationProtocol.getTaskNo());
+ data.put("newTaskNo", wrkMast.getWrkNo());
data.put("command", command);
data.put("stationId", command.getStationId());
data.put("deviceNo", 1);
- redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + command.getStationId(), JSONObject.toJSONString(data), 60 * 5);
+ redisUtil.set(RedisKeyType.RECEIVE_IN_TASK_CHANGE_STATION_TASK.key + command.getStationId(), JSON.toJSONString(data), 60 * 5);
if (findCrnResult.getCrnType().equals(SlaveType.Crn)) {
wrkMast.setCrnNo(findCrnResult.getCrnNo());
--
Gitblit v1.9.1