From 228d1be133e0fd2f1f46a29af8bc9cbda3d18d74 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 三月 2022 17:11:31 +0800
Subject: [PATCH] 熙讯接口新增
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 34 ++++++++++++++++++++++++++++++----
1 files changed, 30 insertions(+), 4 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 607b135..99d01af 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
@@ -65,7 +65,7 @@
public ResponseVO<Object> update(@RequestBody ProgramPro programPro) {
PoleXixunPlayerEntity byId = xiXunPlayerService.getById(programPro.getProgramId());
if (byId == null) {
- throw new BusinessException("鍙傛暟閿欒");
+ throw new BusinessException("鏈�夋嫨LED灞�");
}
// QueryWrapper<PoleXixunPlayerEntity> queryWrapper = new QueryWrapper<>();
// queryWrapper.eq("program_code", programPro.get_id());
@@ -236,6 +236,8 @@
bind -> {
if (bind.getDeviceCode() != null && led.getLightemitControlCode() == bind.getDeviceCode()) {
led.setStreetlightId(bind.getPoleId());
+ System.out.println("鏈夋病鏈夎繍琛屽埌杩欓噷?---------------" + bind.getPoleId());
+ led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
}
}
);
@@ -257,13 +259,22 @@
bind -> {
if (bind.getDeviceCode() != null && led.getLightemitControlCode().equals(bind.getDeviceCode())) {
led.setStreetlightId(bind.getPoleId());
- led.setPoleName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
+ System.out.println("鏈夋病鏈夎繍琛屽埌杩欓噷?---------------" + bind.getPoleId());
+ led.setStreetlightName(poleService.getOne(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId, bind.getPoleId())).getPoleName());
}
}
);
}
);
- return ResponseUtil.success(list);
+ CommonPage commonPage = CommonPage.restPage(list);
+ int size = list.size();
+ commonPage.setTotal((long) size);
+ commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
+ if (size % baseConditionVO.getPageSize() == 0) {
+ commonPage.setTotalPage(size / baseConditionVO.getPageSize());
+ }
+ return ResponseUtil.success(commonPage);
+ // return ResponseUtil.success(list);
}
// return ResponseUtil.success(poleLightemitService.list(wrapper));
}
@@ -344,7 +355,7 @@
public ResponseVO<Object> setVolume(@RequestBody SetVolumeParam setVolumeEntity) {
if (setVolumeEntity == null || setVolumeEntity.getIds() == null || setVolumeEntity.getVolume() > 15) {
- throw new BusinessException("鍙傛暟閿欒");
+ throw new BusinessException("闊抽噺鑼冨洿涓�0---15");
}
Collection poleLightemitControllers = poleLightemitService.listByIds(Arrays.asList(setVolumeEntity.getIds()));
@@ -375,6 +386,21 @@
return ResponseUtil.success(scheduleService.getSchedule(id));
}
+
+ @GetMapping("/listSchedule")
+ public ResponseVO<Object> listSchedule(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
+ return ResponseUtil.success(scheduleService.listSchedule(baseConditionVO, keyword));
+ }
+
+
+ /**
+ * 璁剧疆瀹氭椂
+ *
+ * @param id
+ * @param lightemitIds
+ * @return
+ */
@PostMapping("/pushSchedule/{id}")
public ResponseVO<Object> pushSchedule(@PathVariable Integer id, @RequestBody Long[] lightemitIds) {
scheduleService.ledschedulepush(id, lightemitIds);
--
Gitblit v1.9.3