From 15fe445c820f28139e4e7e1a4cb286ad6ae37e6e Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 06 六月 2022 11:05:17 +0800
Subject: [PATCH] bug修复
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
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 9ee66ea..c59172b 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
@@ -18,6 +18,7 @@
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.service.*;
import com.sandu.ximon.admin.utils.LightemitUtils;
+import com.sandu.ximon.admin.utils.ListPagingUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
@@ -239,18 +240,10 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, order, seq, isOnLine);
- poleLightemitEntityList.forEach(led -> {
- led.setStreetlightId(led.getPoleId());
- led.setStreetlightName(led.getPoleName());
- });
- CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);
- int size = poleLightemitEntityList.size();
- commonPage.setTotal((long) size);
- commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
- if (size % baseConditionVO.getPageSize() == 0) {
- commonPage.setTotalPage(size / baseConditionVO.getPageSize());
- }
+
+ CommonPage commonPage = ListPagingUtils.pages(poleLightemitEntityList, baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+
return ResponseUtil.success(commonPage);
}
@@ -513,7 +506,12 @@
throw new BusinessException("鏈�夋嫨LED灞�");
}
for (PoleLightemitEntity playerId : list) {
- lightemitUtils.clear(playerId.getLightemitControlCode());
+ //娓呭睆
+ String clear = lightemitUtils.clear(playerId.getLightemitControlCode());
+ //娓呴櫎鎾斁鍒楄〃
+ lightemitUtils.clearVideoPlay(playerId.getLightemitControlCode());
+ //娓呴櫎鑺傜洰鍒楄〃
+ lightemitUtils.clearPlayerTask(playerId.getLightemitControlCode());
}
/**
--
Gitblit v1.9.3