From ec63fb17c5ba3e5b2a5a4106c25b4e249a2f980f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 22 十一月 2022 18:44:51 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/XiXunPlayerService.java | 43 ++++++++++++++++++-------------------------
1 files changed, 18 insertions(+), 25 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..7838f84 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);
}
@@ -172,22 +175,21 @@
return updateResult;
}
- public boolean deleteProgram(Long pid) {
- PoleXixunPlayerEntity byId = getById(pid);
- if (byId == null) {
+ public boolean deleteProgram(List<Long> pids) {
+ List<PoleXixunPlayerEntity> poleXixunPlayerEntities = listByIds(pids);
+ if (poleXixunPlayerEntities.isEmpty()) {
throw new BusinessException("鏈壘鍒拌鑺傜洰");
}
/**
* 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍寮�濮�
*/
- String content = "{鍒犻櫎鐨勮妭鐩甶d锛�" + byId.getProgramId()
- + "锛� 鍒犻櫎鐨勮妭鐩悕绉帮細" + byId.getProgramName()
+ String content = "{鍒犻櫎鐨勮妭鐩甶d锛�" + pids
+ " }";
StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕鑺傜洰鍒犻櫎", content);
/**
* 鐔欐睕鑺傜洰鍒犻櫎鏃ュ織璁板綍缁撴潫
*/
- return removeById(pid);
+ return removeByIds(pids);
}
public Object getByPid(Long pid) {
@@ -260,10 +262,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 +301,8 @@
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
String jsondata = gson.toJson(xixun);
+ System.out.println("鎺ㄩ�佸唴瀹�" + JSONUtil.toJsonStr(jsondata));
+
Collection<PoleLightemitEntity> poleLightemitEntities = poleLightemitService.listByIds(lightemitIds);
@@ -401,19 +407,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