From 14ce780fb9977acad2b6dabf9033635b076f590b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期六, 07 五月 2022 14:49:12 +0800
Subject: [PATCH] Changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java | 58 +++++++++++++++++-----------------------------------------
1 files changed, 17 insertions(+), 41 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
index 8d20209..ee17684 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java
@@ -2,7 +2,6 @@
import com.alibaba.fastjson.JSONObject;
import com.google.gson.Gson;
-import com.sandu.ximon.admin.config.NginxConfigBean;
import com.sandu.ximon.admin.config.RealtimeServerBean;
import com.sandu.ximon.admin.service.PoleLightemitService;
import com.sandu.ximon.admin.utils.request.*;
@@ -29,8 +28,6 @@
PoleLightemitService poleLightemitService;
@Autowired
ApplicationContext applicationContext;
- @Autowired
- NginxConfigBean nginxConfigBean;
//body灏佽缂栫爜
private final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
@@ -144,24 +141,6 @@
String result = post(url, postBody);
}
- /**
- * html浼犺緭鑷砽ed灞�, 閫氳繃url鑾峰彇html
- *
- * @param ledCode
- * @param username
- */
- public void postHtmlUseNginx(String ledCode, String username) {
-
- PostHtml postHtml = new PostHtml(nginxConfigBean.getUrl() + username + "_" + ledCode + ".html");
- String postBody = new Gson().toJson(postHtml);
-
- //璇锋眰鍦板潃
- String url = realtimeServerBean.getCommand() + ledCode;
- //淇濆瓨led鏁版嵁
- poleLightemitService.updateRequestBody(ledCode, postBody);
- //璇锋眰
- String result = post(url, postBody);
- }
/**
* 瑙嗛浼犺緭鑷砽ed灞�
@@ -234,6 +213,7 @@
/**
* 鍙戦�佹渶鏂扮殑鏁版嵁
+ *
* @param lightemitControlCode
*/
public void sendLastCommand(String lightemitControlCode) {
@@ -279,6 +259,7 @@
*/
public String getIsScreenOpen(String ledCode) {
String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new IsScreenOpen()));
+ LogUtils.error("getIsScreenOpen:" + result);
//鑾峰彇base64鍥剧墖鏁版嵁
if (StringUtils.isNotBlank(result)) {
String re;
@@ -293,28 +274,23 @@
}
}
- /*
- 鍚姩xwalk
- */
- /*public void startActivity(String ledCode){
- String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new StartActivity()));
- }*/
- /*
- 浣跨敤xwalk鍔犺浇缃戦〉
- */
- /*public void callXwalkFn(String ledCode,String username){
+ public boolean getLedOnLine(String ledCode) {
+ String result = this.post(realtimeServerBean.getCommand() + ledCode, new Gson().toJson(new IsScreenOpen()));
+ LogUtils.error("getLedOnLine:" + result);
+ //鑾峰彇base64鍥剧墖鏁版嵁
+ if (StringUtils.isNotBlank(result)) {
+ String re;
+ if (result.contains("not exist")) {
+ return false;
+ } else {
+ return true;
+ }
+ } else {
+ return false;
+ }
+ }
- CallXwalkFn callXwalkFn = new CallXwalkFn();
-
- callXwalkFn.setArgUrl(realtimeServerBean.getUrl() + username + "_" + ledCode + ".html");
- String postBody = new Gson().toJson(callXwalkFn);
-
- //璇锋眰鍦板潃
- String url = realtimeServerBean.getCommand() + ledCode;
- //璇锋眰
- String result = post(url,postBody);
- }*/
/*
鎺у埗灞忓箷寮�鍏�
--
Gitblit v1.9.3