From aeec50b8f8ac920884bb2f466cca27e8ee8bc089 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 25 二月 2022 18:03:33 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 4 ++++
ximon-admin/src/main/resources/application.yml | 6 ++++--
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 19 +++++++++++++++++++
ximon-admin/pom.xml | 5 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/LightemitUtils.java | 1 +
5 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/ximon-admin/pom.xml b/ximon-admin/pom.xml
index a6f69ac..63eb7ce 100644
--- a/ximon-admin/pom.xml
+++ b/ximon-admin/pom.xml
@@ -52,6 +52,11 @@
<artifactId>aliyun-sdk-oss</artifactId>
<version>3.13.1</version>
</dependency>
+ <dependency>
+ <groupId>com.github.jsqlparser</groupId>
+ <artifactId>jsqlparser</artifactId>
+ <version>4.3</version>
+ </dependency>
<!--闃块噷浜戠墿鑱旂綉 -->
</dependencies>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
index 5cf223e..f3852ec 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java
@@ -15,6 +15,7 @@
import com.sandu.ximon.admin.service.ClientService;
import com.sandu.ximon.admin.service.PoleLightemitService;
import com.sandu.ximon.admin.service.XiXunPlayerService;
+import com.sandu.ximon.admin.utils.LightemitUtils;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import com.sandu.ximon.dao.domain.PlayPlanNv;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -39,6 +40,7 @@
private final XiXunPlayerService xiXunPlayerService;
private final ClientService clientService;
private final PoleLightemitService poleLightemitService;
+ private final LightemitUtils lightemitUtils;
@PostMapping("/addProgram")
public ResponseVO<Object> addProgram(@RequestBody ProgramPro programPro){
@@ -143,4 +145,21 @@
}
return ResponseUtil.success(poleLightemitService.list(wrapper));
}
+
+ /*
+ 鑾峰彇led瀹炴椂鐢婚潰
+ */
+ @GetMapping("/getPicture/{id}")
+ public ResponseVO<Object> getPicture(@PathVariable Long id){
+ if(id == null){
+ throw new BusinessException("鏈�夋嫨LED灞�");
+ }
+ PoleLightemitEntity poleLightemitEntity = poleLightemitService.getById(id);
+ if(poleLightemitEntity != null){
+ String result = lightemitUtils.getPicture(poleLightemitEntity.getLightemitControlCode());
+ return ResponseUtil.success(result);
+ }else {
+ throw new BusinessException("鏈�夋嫨LED灞�");
+ }
+ }
}
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 53df1ad..e125127 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 com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -90,6 +91,9 @@
queryWrapper.eq("program_id", programId);
poleXixunPlayerEntity = this.getOne(queryWrapper);
String json = poleXixunPlayerEntity.getRequestBody();
+
+ System.out.println( JSON.parseArray(json, ProgramPro.class));
+
try {
pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
} catch (Exception e) {
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 1c9e8ac..89038bc 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
@@ -117,6 +117,7 @@
//璇锋眰
// poleLightemitService.updateRequestBody(ledCode, "");
String result = post(url, postBody);
+ LogUtils.error("娓呭睆缁撴灉:"+result);
}
/**
diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index 1a67ec0..b1e9486 100644
--- a/ximon-admin/src/main/resources/application.yml
+++ b/ximon-admin/src/main/resources/application.yml
@@ -32,8 +32,10 @@
# led灞忓箷鏈嶅姟鍣ㄥ湴鍧�锛堟洿鏀归渶瑕佸悓鏃舵洿鏀癸級
realtime-server:
- command: http://101.132.131.91:8081/payload/
- url: http://101.132.131.91:8081/
+# command: http://101.132.131.91:8081/payload/
+# url: http://101.132.131.91:8081/
+ command: http://112.74.63.130:20018/command/
+ url: http://112.74.63.130:20018/
# nginx鐩稿叧鍦板潃
nginx:
--
Gitblit v1.9.3