From bce5a6d8ddcb867e35e7c5d57d7a48bef2617bbf Mon Sep 17 00:00:00 2001
From: MercuryZ <zdmisif@126.com>
Date: 星期五, 23 九月 2022 17:14:43 +0800
Subject: [PATCH] fix bug

---
 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
index 8aaa080..0227b49 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightTaskService.java
@@ -7,6 +7,7 @@
 import cn.hutool.core.util.HexUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.druid.support.json.JSONUtils;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -153,7 +154,7 @@
 //                    commend.setSysScheduled(s);
                     if (commend.getIssueStatus() == 0) {
                         //涓嬪彂鎴愬姛  鏇存柊绯荤粺瀹氭椂鍜岀‖浠跺畾鏃�
-                        commend.setDeviceScheduled(JSONUtils.toJSONString(newLightTask));
+                        commend.setDeviceScheduled(JSONObject.toJSONString(newLightTask));
                     } else {
                         //涓嬪彂澶辫触  鏇存柊绯荤粺瀹氭椂  淇濈暀纭欢瀹氭椂 纭欢瀹氭椂
 //                        commend.setSysScheduled(s);
@@ -161,7 +162,7 @@
                             if (task.getLightAddress().equals(commend.getLightAddress()) && task.getDeviceCode().equals(commend.getDeviceCode())) {
                                 //鍚屼竴涓伅澶�
                                 LightTask oldTask = getById(task.getTaskId());
-                                commend.setDeviceScheduled(JSONUtils.toJSONString(oldTask));
+                                commend.setDeviceScheduled(JSONObject.toJSONString(oldTask));
                             }
                         });
 

--
Gitblit v1.9.3