From 66e0f592475cebf0511be54f71217be5ba4245c8 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期三, 09 二月 2022 14:11:25 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SubTitleSet.java | 26 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetVolume.java | 17 +
ximon-admin/src/main/resources/application.yml | 17 +
ximon-admin/src/main/java/com/sandu/ximon/admin/entity/XixunPlayer.java | 14 +
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java | 32 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetPlayList.java | 24 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/setScreenOpen.java | 20 ++
ximon-admin/src/main/java/com/sandu/ximon/admin/entity/TaskItem.java | 15 +
pom.xml | 9 +
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java | 6
ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Source.java | 46 +++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 191 ++++++++++----------
ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java | 68 +++++--
ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SubTitleSetEntity.java | 38 ++++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java | 9
15 files changed, 408 insertions(+), 124 deletions(-)
diff --git a/pom.xml b/pom.xml
index 83f46a3..f398362 100644
--- a/pom.xml
+++ b/pom.xml
@@ -39,6 +39,15 @@
<artifactId>lombok</artifactId>
<optional>true</optional>
</dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ <version>2.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.thymeleaf</groupId>
+ <artifactId>thymeleaf</artifactId>
+ </dependency>
</dependencies>
<dependencyManagement>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
index a9d6e36..6230fc7 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/VnnoxController.java
@@ -12,6 +12,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.net.URISyntaxException;
import java.util.Map;
/**
@@ -67,9 +68,10 @@
}*/
@PostMapping("/validateSN")
- public ResponseVO<Object> validateSN(@RequestBody Map map) {
+ public ResponseVO<Object> validateSN(@RequestBody Map map) throws URISyntaxException {
String sn = (String)map.get("sn");
- LedV2RegisterResultEntity ledV2RegisterResultEntity = vnnoxService.validateSN(sn);
+ String name = (String)map.get("name");
+ LedV2RegisterResultEntity ledV2RegisterResultEntity = vnnoxService.validateSN(name,sn);
return ResponseUtil.success(ledV2RegisterResultEntity);
}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Source.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Source.java
new file mode 100644
index 0000000..8da13ab
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/Source.java
@@ -0,0 +1,46 @@
+package com.sandu.ximon.admin.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: machine-fast
+ * @description:
+ * @author: YSS
+ * @create: 2019-07-17 16:59
+ **/
+@Data
+public class Source implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+
+ private String id;
+
+ private String _id;
+
+ private String _type;
+
+ private String md5; //绱犳潗濡傛灉鏈夊ぇ灏忛渶瑕佽绠楀畠鐨刴d5
+
+ private String name; //绱犳潗鍚嶅瓧
+
+ private int left; //鏄剧ず鍦ㄥ乏涓婅鐨勫潗鏍�
+
+ private int top;
+
+ private int width; //瀹介珮
+
+ private int height;
+
+ private long size; //鏂囦欢澶у皬
+
+ private int playTime; //璧峰鎾斁鏃堕棿
+
+ private int timeSpan; //鎸佺画鎾斁鏃堕暱
+
+ private String fileExt;
+
+ private String mime;
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SubTitleSetEntity.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SubTitleSetEntity.java
new file mode 100644
index 0000000..0228cef
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/SubTitleSetEntity.java
@@ -0,0 +1,38 @@
+package com.sandu.ximon.admin.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @program: machine-fast
+ * @description: 瀛楀箷璁剧疆鎺ュ彈绫�
+ * @author: YSS
+ * @create: 2019-04-24 18:14
+ **/
+@Data
+public class SubTitleSetEntity implements Serializable {
+
+ private Long[] id;
+
+ private String color;
+
+ private String content;
+
+ private String fontSize;
+
+ private String fontColor;
+
+ private Integer num;
+
+ private Integer interval;
+
+ private Integer step;
+
+ private String direction;
+
+ private String align;
+
+ private Integer textType;
+
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/TaskItem.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/TaskItem.java
new file mode 100644
index 0000000..a6adb99
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/TaskItem.java
@@ -0,0 +1,15 @@
+package com.sandu.ximon.admin.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class TaskItem implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String _id; //UUID
+ private Program _program; //灏嗗寘瑁呭ソ鐨勮妭鐩祴鍊肩粰浠�
+ private int repeatTimes; //閲嶅娆℃暟
+ // private List<Schedule> schedules=null; //鍙互涓轰竴涓猵rogram娣诲姞澶氫釜瀹氭椂娈�
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/XixunPlayer.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/XixunPlayer.java
new file mode 100644
index 0000000..2be9b1f
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/entity/XixunPlayer.java
@@ -0,0 +1,14 @@
+package com.sandu.ximon.admin.entity;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class XixunPlayer implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private String type="commandXixunPlayer";
+ private String _id;
+ private Command command;
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
index bec5dee..5a7ff63 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/VnnoxService.java
@@ -13,6 +13,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.net.URISyntaxException;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -42,7 +43,7 @@
* @return
*/
@Transactional(rollbackFor = Exception.class)
- public LedV2RegisterResultEntity validateSN(String sn) {
+ public LedV2RegisterResultEntity validateSN(String name,String sn) throws URISyntaxException {
LedV2RegisterResultEntity ledV2RegisterResultEntity = new LedV2RegisterResultEntity();
// 鍒ゆ柇鏁版嵁搴撴槸鍚﹀瓨鍦紝鑻ヤ笉瀛樺湪锛屽垽鏂槸鍚﹀凡缁忔敞鍐屽埌Vnnox鏈嶅姟鍣�
@@ -56,16 +57,16 @@
}
Integer page = 0;
- Integer limit = 200;
+ Integer limit = 100;
List<VnnoxPlayerResponse> playerList;
// 鑾峰彇Vnnox鏈嶅姟鍣ㄥ垪琛�
- VnnoxPlayerListResponse response = vnnoxAPIUtil.getPlayerList(limit, page);
+ VnnoxPlayerListResponse response = vnnoxAPIUtil.getPlayerList(limit, page,name);
playerList = response.getRows();
Integer total = response.getTotal() - limit;
while (total > 0) {
page = page + 1;
total = total - limit;
- response = vnnoxAPIUtil.getPlayerList(limit, page);
+ response = vnnoxAPIUtil.getPlayerList(limit, page,name);
playerList.addAll(response.getRows());
}
ledPlayerEntity = new LedPlayerEntity();
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 4b05920..c7f89fe 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,102 +1,107 @@
-package com.sandu.ximon.admin.service;
-
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import com.sandu.common.service.impl.BaseServiceImpl;
-import com.sandu.ximon.admin.config.XiXunConfig;
-import com.sandu.ximon.admin.entity.*;
-import com.sandu.ximon.admin.security.SecurityUtils;
-import com.sandu.ximon.admin.utils.JsonUtil;
-import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
-import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
-import lombok.AllArgsConstructor;
-import org.springframework.stereotype.Service;
-
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-@Service
-@AllArgsConstructor
-public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
-
- private final PoleXixunPlayerEntityMapper poleXixunPlayerEntityMapper;
- private final XiXunConfig config;
-
-
- public void insert(ProgramPro programPro, Long userId) {
- SimpleDateFormat sdf=new SimpleDateFormat("yy-MM-dd HH:mm:ss");
- Date date = new Date();
-// Program program = new Program();
+//package com.sandu.ximon.admin.service;
+//
+//import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+//import com.google.gson.Gson;
+//import com.google.gson.GsonBuilder;
+//import com.sandu.common.service.impl.BaseServiceImpl;
+//import com.sandu.ximon.admin.config.RealtimeServerBean;
+//import com.sandu.ximon.admin.config.XiXunConfig;
+//import com.sandu.ximon.admin.entity.*;
+//import com.sandu.ximon.admin.security.SecurityUtils;
+//import com.sandu.ximon.admin.utils.JsonUtil;
+//import com.sandu.ximon.admin.utils.LightemitUtils;
+//import com.sandu.ximon.dao.domain.PoleLightemitEntity;
+//import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
+//import com.sandu.ximon.dao.mapper.PoleXixunPlayerEntityMapper;
+//import lombok.AllArgsConstructor;
+//import org.springframework.stereotype.Service;
+//
+//import java.text.SimpleDateFormat;
+//import java.util.*;
+//
+//@Service
+//@AllArgsConstructor
+//public class XiXunPlayerService extends BaseServiceImpl<PoleXixunPlayerEntityMapper, PoleXixunPlayerEntity> {
+//
+// private final PoleXixunPlayerEntityMapper poleXixunPlayerEntityMapper;
+// private final XiXunConfig config;
+// private final LightemitUtils lightemitUtils;
+// private final RealtimeServerBean realtimeServerBean;
+//
+//
+// public void insert(ProgramPro programPro, Long userId) {
+// SimpleDateFormat sdf=new SimpleDateFormat("yy-MM-dd HH:mm:ss");
+// Date date = new Date();
+//// Program program = new Program();
+//// try {
+//// program = JsonUtil.convertJsonStringToObject(json,Program.class);
+//// } catch (Exception e) {
+//// e.printStackTrace();
+//// }
+// String json = JsonUtil.jsonObj2Sting(programPro);
+// PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
+// poleXixunPlayer.setProgramCode(programPro.get_id());
+// poleXixunPlayer.setProgramName(programPro.getName());
+// poleXixunPlayer.setHeight(programPro.getHeight());
+// poleXixunPlayer.setWidth(programPro.getWidth());
+// poleXixunPlayer.setTotalSize((float) programPro.getTotalSize()/1000000+"MB");
+// poleXixunPlayer.setRequestBody(json);
+// poleXixunPlayer.setCreatTime(sdf.format(date));
+// poleXixunPlayer.setCreateUserId(SecurityUtils.getClientId());
+//
+// this.save(poleXixunPlayer);
+// }
+//
+// public void videoXixunPlayer(long programId,Long[] lightemitIds) {
+//
+// ProgramPro pro = new ProgramPro();
+// ItemPro items = new ItemPro();
+// TaskPro taskPro = new TaskPro();
+// CommandPro command = new CommandPro();
+// XixunPlayerPro xixun = new XixunPlayerPro();
+// PoleXixunPlayerEntity poleXixunPlayerEntity = new PoleXixunPlayerEntity();
+// items.set_id(UUID.randomUUID().toString());
+// QueryWrapper<PoleXixunPlayerEntity> queryWrapper = new QueryWrapper<>();
+// queryWrapper.eq("program_id",programId);
+// poleXixunPlayerEntity = this.getOne(queryWrapper);
+// String json = poleXixunPlayerEntity.getRequestBody();
// try {
-// program = JsonUtil.convertJsonStringToObject(json,Program.class);
+// pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
// } catch (Exception e) {
// e.printStackTrace();
// }
- String json = JsonUtil.jsonObj2Sting(programPro);
- PoleXixunPlayerEntity poleXixunPlayer = new PoleXixunPlayerEntity();
- poleXixunPlayer.setProgramCode(programPro.get_id());
- poleXixunPlayer.setProgramName(programPro.getName());
- poleXixunPlayer.setHeight(programPro.getHeight());
- poleXixunPlayer.setWidth(programPro.getWidth());
- poleXixunPlayer.setTotalSize((float) programPro.getTotalSize()/1000000+"MB");
- poleXixunPlayer.setRequestBody(json);
- poleXixunPlayer.setCreatTime(sdf.format(date));
- poleXixunPlayer.setCreateUserId(SecurityUtils.getClientId());
-
- this.save(poleXixunPlayer);
- }
-
- public void videoXixunPlayer(long programId,Long[] lightemitIds) {
-
- ProgramPro pro = new ProgramPro();
- ItemPro items = new ItemPro();
- TaskPro taskPro = new TaskPro();
- CommandPro command = new CommandPro();
- XixunPlayerPro xixun = new XixunPlayerPro();
- PoleXixunPlayerEntity poleXixunPlayerEntity = new PoleXixunPlayerEntity();
- items.set_id(UUID.randomUUID().toString());
- QueryWrapper<PoleXixunPlayerEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("program_id",programId);
- poleXixunPlayerEntity = this.getOne(queryWrapper);
- String json = poleXixunPlayerEntity.getRequestBody();
- try {
- pro = JsonUtil.convertJsonStringToObject(json, ProgramPro.class);
- } catch (Exception e) {
- e.printStackTrace();
- }
- items.set_program(pro);
- items.setRepeatTimes(1);
- items.setSchedulePros(null);//瀹氭椂娈碉紝涓嶅仛瀹氭椂鍙负null
- taskPro.set_id(UUID.randomUUID().toString());
- taskPro.setName(poleXixunPlayerEntity.getProgramName());
- List<ItemPro> list2=new ArrayList<ItemPro>();
- list2.add(items);
- taskPro.setItems(list2);
- command.setId(UUID.randomUUID().toString());
- //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
- command.setNotificationURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/getJSON");
- //璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご
+// items.set_program(pro);
+// items.setRepeatTimes(1);
+// items.setSchedulePros(null);//瀹氭椂娈碉紝涓嶅仛瀹氭椂鍙负null
+// taskPro.set_id(UUID.randomUUID().toString());
+// taskPro.setName(poleXixunPlayerEntity.getProgramName());
+// List<ItemPro> list2=new ArrayList<ItemPro>();
+// list2.add(items);
+// taskPro.setItems(list2);
+// command.setId(UUID.randomUUID().toString());
+// //杩欓噷鏄笅鏂圭殑post鍥炶皟鍦板潃锛岄渶瑕佷慨鏀笽P鍦板潃
+// command.setNotificationURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/getJSON");
+// //璧勬簮涓嬭浇閾炬帴鐨勮姹傚ご
// command.setPreDownloadURL("http://" + config.getIp() + ":" + config.getPort() + "/machine-fast/serv/download/downliadFileById/");
// command.setTask(taskPro);
// xixun.set_id(UUID.randomUUID().toString());
// xixun.setCommand(command);
// xixun.setType("commandXixunPlayer"); //鍛戒护鍥哄畾绫诲瀷锛屼笉鍙洿鏀�
-
-
- Gson gson = new GsonBuilder().disableHtmlEscaping().create();
-// String jsondata = JSON.toJSONString(xixun);
- String jsondata = gson.toJson(xixun);
-
- /* Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(Arrays.asList(lightemitIds));
-
- if(poleLightemitEntities != null){
- for (PoleLightemitEntity entity: poleLightemitEntities) {
- lightemitUtils.clear(entity.getLightemitControlCode());
- poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
- lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
- }
- }*/
- }
-
-}
+//
+//
+// Gson gson = new GsonBuilder().disableHtmlEscaping().create();
+//// String jsondata = JSON.toJSONString(xixun);
+// String jsondata = gson.toJson(xixun);
+//
+//// Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(Arrays.asList(lightemitIds));
+////
+//// if(poleLightemitEntities != null){
+//// for (PoleLightemitEntity entity: poleLightemitEntities) {
+//// lightemitUtils.clear(entity.getLightemitControlCode());
+//// poleLightemitService.updateRequestBody(entity.getLightemitControlCode(), jsondata);
+//// lightemitUtils.post(realtimeServerBean.getCommand() + entity.getLightemitControlCode(), jsondata);
+//// }
+//// }
+// }
+//
+//}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
index f48ce5f..2ff11cd 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java
@@ -7,8 +7,11 @@
import com.sandu.ximon.admin.utils.response.*;
import com.sandu.ximon.dao.domain.LedPlayerEntity;
import lombok.AllArgsConstructor;
+import org.apache.http.NameValuePair;
+import org.apache.http.message.BasicNameValuePair;
import org.springframework.stereotype.Component;
+import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
@@ -42,21 +45,38 @@
/**
* 鑾峰彇鎾斁鍣ㄥ垪琛�
- *
* @param count 姣忔璇诲彇鏁伴噺锛岄粯璁�20锛屽彇鍊艰寖鍥达細1~100
* @param start 浠庣鍑犳潯璁板綍寮�濮嬭鍙栵紝榛樿0
* @return
*/
- public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start) {
+// public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start) {
+//
+// String result = VnnoxRequestUtil.GetWithHeader(
+// VnnoxUrl.getUrl(VnnoxUrl.GET_PLAYER_LIST),
+// new VnnoxGetPlayerListRequest(count, start).toJson(),
+// new CommonHeader(CommonHeader.JSON, true)
+// );
+// VnnoxPlayerListResponse response =
+// new VnnoxPlayerListResponse().parse(JSON.parseObject(result, CommonResponse.class));
+// System.out.println("----------------------------------------");
+// System.out.println("----------------------------------------");
+// System.out.println("----------------------------------------");
+// System.out.println(response);
+// return response;
+// }
+ public VnnoxPlayerListResponse getPlayerList(Integer count, Integer start,String name) throws URISyntaxException {
+
+ List<NameValuePair> urlParameters = new ArrayList<>();
+ urlParameters.add(new BasicNameValuePair("count",count.toString()));
+ urlParameters.add(new BasicNameValuePair("start",start.toString()));
+ urlParameters.add(new BasicNameValuePair("name",name));
String result = VnnoxRequestUtil.GetWithHeader(
VnnoxUrl.getUrl(VnnoxUrl.GET_PLAYER_LIST),
- new VnnoxGetPlayerListRequest(count, start).toJson(),
+ urlParameters,
new CommonHeader(CommonHeader.JSON, true)
);
- VnnoxPlayerListResponse response =
- new VnnoxPlayerListResponse().parse(JSON.parseObject(result, CommonResponse.class));
- return response;
+ return new VnnoxPlayerListResponse().parse(JSON.parseObject(result,CommonResponse.class));
}
/**
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
index 3b9e37a..3a34f21 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxRequestUtil.java
@@ -2,7 +2,9 @@
import com.sandu.ximon.admin.utils.request.CommonHeader;
import org.apache.http.HttpResponse;
+import org.apache.http.NameValuePair;
import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.utils.URIBuilder;
import org.apache.http.entity.StringEntity;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -12,6 +14,10 @@
import java.io.IOException;
import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+import java.util.Map;
public class VnnoxRequestUtil {
@@ -35,29 +41,53 @@
return result;
}
- public static String GetWithHeader (String url, String params, CommonHeader header) {
- CloseableHttpClient client = HttpClients.createDefault();
- HttpGet get = new HttpGet(url);
- for(String key: header.keySet()) {
- get.setHeader(key, header.get(key));
- }
- String result = null;
- try {
- StringEntity s = new StringEntity(params, UTF8);
- s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
- "application/json"));
- HttpResponse httpResponse = client.execute(get);
- InputStream inStream = httpResponse.getEntity().getContent();
+// public static String GetWithHeader (String url, String params, CommonHeader header) {
+// CloseableHttpClient client = HttpClients.createDefault();
+// HttpGet get = new HttpGet(url);
+// for(String key: header.keySet()) {
+// get.setHeader(key, header.get(key));
+// }
+// String result = null;
+// try {
+// StringEntity s = new StringEntity(params, UTF8);
+// s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
+// "application/json"));
+// HttpResponse httpResponse = client.execute(get);
+// InputStream inStream = httpResponse.getEntity().getContent();
+//
+// result = streamToString(inStream, UTF8);
+//
+// inStream.close();
+// } catch (Exception e) {
+// return null;
+// }
+// return result;
+// }
+public static String GetWithHeader (String url, List<NameValuePair> urlParameters, Map<String, String> header) throws URISyntaxException {
- result = streamToString(inStream, UTF8);
- inStream.close();
- } catch (Exception e) {
- return null;
- }
- return result;
+ URI finalURI = new URIBuilder(url).setParameters(urlParameters).build();
+ CloseableHttpClient client = HttpClients.createDefault();
+ HttpGet get = new HttpGet(finalURI);
+ for(String key: header.keySet()) {
+ get.setHeader(key, header.get(key));
}
+ String result = null;
+ try {
+// StringEntity s = new StringEntity(params, UTF8);
+// s.setContentEncoding(new BasicHeader(HTTP.CONTENT_TYPE,
+// "application/json"));
+ HttpResponse httpResponse = client.execute(get);
+ InputStream inStream = httpResponse.getEntity().getContent();
+ result = streamToString(inStream, UTF8);
+
+ inStream.close();
+ } catch (Exception e) {
+ return null;
+ }
+ return result;
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetPlayList.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetPlayList.java
new file mode 100644
index 0000000..35e7d98
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetPlayList.java
@@ -0,0 +1,24 @@
+package com.sandu.ximon.admin.utils.request;
+
+/**
+ * @program: machine-fast
+ * @description: 璁剧疆鎾斁鍒楄〃璇锋眰body
+ * @author: YSS
+ * @create: 2019-04-24 17:24
+ **/
+public class SetPlayList {
+
+ public final String type = "setPlayList";
+
+ public String[] list = new String[1] ;
+
+// public String[] pathList = new String[1];
+
+ public Integer width = 128;
+
+ public Integer height = 128;
+
+ public Integer top = 0;
+
+ public Integer left = 0;
+}
\ No newline at end of file
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetVolume.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetVolume.java
new file mode 100644
index 0000000..9877b27
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SetVolume.java
@@ -0,0 +1,17 @@
+package com.sandu.ximon.admin.utils.request;
+
+/**
+ * @program: machine-fast
+ * @description: 璁剧疆闊抽噺
+ * @author: YSS
+ * @create: 2019-09-17 18:03
+ **/
+public class SetVolume {
+
+ public final String type = "callCardService";
+
+ public final String fn = "setVolume";
+
+ public Integer arg1 = 15;
+
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SubTitleSet.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SubTitleSet.java
new file mode 100644
index 0000000..12704a5
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/SubTitleSet.java
@@ -0,0 +1,26 @@
+package com.sandu.ximon.admin.utils.request;
+
+/**
+ * @program: machine-fast
+ * @description: led灞忓瓧骞曡缃姹俠ody
+ * @author: YSS
+ * @create: 2019-04-24 18:12
+ **/
+public class SubTitleSet {
+
+ public final String type = "invokeBuildInJs";//method scrollMarquee
+
+ public String method = "scrollMarquee";
+
+ public Number num = -1;// 婊氬姩5娆�, 娉ㄦ剰绫诲瀷涓篘umber, 濉�0鍋滄婊氬姩锛屽～璐熸暟姘镐箙婊氬姩
+
+ public String html = "";
+
+ public Number interval = 100;//姝ヨ繘闂撮殧锛屽崟浣嶆绉掞紝娉ㄦ剰绫诲瀷涓篘umber
+
+ public Number step = 1;//姝ヨ繘璺濈锛屽崟浣嶅儚绱狅紝娉ㄦ剰绫诲瀷涓篘umber
+
+ public String direction = "left";//寰�宸︽粴鍔紝鍙～鍊糽eft銆� right
+
+ public String align = "top";//鍦ㄤ笂鏂规樉绀猴紝鍙～鍊紅op銆乧enter銆乥ottom
+}
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/setScreenOpen.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/setScreenOpen.java
new file mode 100644
index 0000000..59c26ac
--- /dev/null
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/utils/request/setScreenOpen.java
@@ -0,0 +1,20 @@
+package com.sandu.ximon.admin.utils.request;
+
+/**
+ * @program: machine-fast
+ * @description: 璁剧疆led寮�鍏砨ody
+ * @author: YSS
+ * @create: 2019-05-30 17:30
+ **/
+public class setScreenOpen {
+
+ public final String type = "callCardService";
+
+ public final String fn = "setScreenOpen";
+
+ public Boolean arg1 = true;
+
+ public setScreenOpen (Boolean bool){
+ this.arg1 = bool;
+ }
+}
diff --git a/ximon-admin/src/main/resources/application.yml b/ximon-admin/src/main/resources/application.yml
index 48a7ad4..1a67ec0 100644
--- a/ximon-admin/src/main/resources/application.yml
+++ b/ximon-admin/src/main/resources/application.yml
@@ -30,3 +30,20 @@
mchKey: dsd #寰俊鏀粯鍟嗘埛瀵嗛挜
+# led灞忓箷鏈嶅姟鍣ㄥ湴鍧�锛堟洿鏀归渶瑕佸悓鏃舵洿鏀癸級
+realtime-server:
+ command: http://101.132.131.91:8081/payload/
+ url: http://101.132.131.91:8081/
+
+# nginx鐩稿叧鍦板潃
+nginx:
+ port: 443
+ cameraSaveUrl: D:/NginX/nginx-1.15.9/data/file/cameraPresetPoint
+nginx-config:
+ filePath: D:\NginX\nginx-1.15.9\data\file\
+ url: http://47.106.172.9:443/download/
+ apkUrl: http://47.106.172.9:443/apk/
+ lcdUrl: http://47.106.172.9:443/download/lcd/
+
+
+
--
Gitblit v1.9.3