From dda268997ca8f8a364f7c19b45d7a43a50a98efe Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 25 十月 2022 18:00:11 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 22 +++++++---------------
1 files changed, 7 insertions(+), 15 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
index 76e52ae..102a414 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.service;
+import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -96,7 +97,9 @@
}
//鎺掑簭鏂瑰紡
String orderBy = orderByResult + " " + orderBySeq;
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ if (baseConditionVO != null) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), orderBy);
+ }
return list(wrapper);
}
@@ -260,7 +263,7 @@
layerPro.getSources().forEach(sourcePro -> {
long fileId = Long.parseLong(sourcePro.getId());
LedSFile file = xiXunFileService.getById(fileId);
- if(file != null){
+ if (file != null) {
String fileUrl = file.getFileUrl();
String[] split = fileUrl.split("/");
sourcePro.setId(split[split.length - 1]);
@@ -299,6 +302,8 @@
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
String jsondata = gson.toJson(xixun);
+ System.out.println("鎺ㄩ�佸唴瀹�" + JSONUtil.toJsonStr(jsondata));
+
Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(lightemitIds);
@@ -403,19 +408,6 @@
lightemitUtils.clearPlayerTask(lightemitControlCode);
//鎺ㄩ�佹渶鍚庡懡浠�
lightemitUtils.sendLastCommand(lightemitControlCode);
-
- /**
- * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曞紑濮�
- // */
-// String content = "{璁惧code锛�" + lightemitControlCode
-// + "锛� 鎺ㄩ�佸唴瀹癸細" + body
-// + " }";
-// List<String> listCode = new ArrayList<>();
-// listCode.add(lightemitControlCode);
-// StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕澶ф皵鏁版嵁鎺ㄩ��", content);
- /**
- * 鐔欐睕澶ф皵鏁版嵁鎺ㄩ�佹棩蹇楄褰曠粨鏉�
- */
}
}, 60 * 1000);
}
--
Gitblit v1.9.3