From edbb2fe4eabbb7c526fb2f7313bead37d38928e2 Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期一, 15 八月 2022 14:57:16 +0800
Subject: [PATCH] 充电桩上电请求
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 7b95860..ebfdcdd 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;
@@ -71,7 +72,7 @@
public List<PoleXixunPlayerEntity> listProgram(BaseConditionVO baseConditionVO, Integer order, Integer seq, String keyword) {
LambdaQueryWrapper<PoleXixunPlayerEntity> wrapper = XixunPlayerList(keyword);
//鎺掑簭瀛楁
- String orderByResult = "id";
+ String orderByResult = "program_id";
//姝ｅ簭銆佸�掑彊
String orderBySeq = OrderByEnums.ASC.getCode();
if (order != null) {
@@ -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,10 +263,12 @@
layerPro.getSources().forEach(sourcePro -> {
long fileId = Long.parseLong(sourcePro.getId());
LedSFile file = xiXunFileService.getById(fileId);
- String fileUrl = file.getFileUrl();
- String[] split = fileUrl.split("/");
- sourcePro.setId(split[split.length - 1]);
- sourcePro.setMd5(file.getMd5());
+ if (file != null) {
+ String fileUrl = file.getFileUrl();
+ String[] split = fileUrl.split("/");
+ sourcePro.setId(split[split.length - 1]);
+ sourcePro.setMd5(file.getMd5());
+ }
});
});
} catch (Exception e) {
@@ -297,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);
@@ -359,6 +366,7 @@
Integer screenHeight = Integer.parseInt(lightemitUtils.getScreenHeight(lightemitControlCode));
String size = String.valueOf(screenHeight / 18);
//瀛楀箷涓讳綋鎷兼帴
+ //TODO
String body =
"<head><style type=\"text/css\">body{background-color:#000;}</style></head>" +
"<p style=\"font-size:" + size + "px;line-height:17px;color:#fff\">" +
--
Gitblit v1.9.3