From bf5d9682beb8fa53c5adbd14bb3e458c1c859038 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 23 五月 2022 15:59:21 +0800
Subject: [PATCH] 单灯任务返回指令修改
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 130 +++++++++++++++++++++++++++++++++---------
1 files changed, 101 insertions(+), 29 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 2b72e00..00cb0e3 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
@@ -1,5 +1,6 @@
package com.sandu.ximon.admin.controller;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
@@ -7,7 +8,6 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
-import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.entity.ProgramPro;
@@ -19,6 +19,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.StoreOperationRecordsUtils;
import com.sandu.ximon.admin.vo.LedScheduleVO;
import com.sandu.ximon.dao.domain.PoleLightemitEntity;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
@@ -43,8 +44,7 @@
private final PoleLightemitService poleLightemitService;
private final LightemitUtils lightemitUtils;
private final LedScheduleService scheduleService;
- private final PoleBindingService bindingService;
- private final PoleService poleService;
+
private PermissionConfig permissionConfig;
// private final ListPageUtil listPageUtil;
@@ -56,6 +56,9 @@
*/
@PostMapping("/addProgram")
public ResponseVO<Object> addProgram(@RequestBody ProgramPro programPro) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(xiXunPlayerService.insert(programPro));
}
@@ -63,8 +66,10 @@
* 淇敼
*/
@PostMapping("/updateProgram")
- // @RequiresPermissions("pole:polexixunplayer:update")
public ResponseVO<Object> update(@RequestBody ProgramPro programPro) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
PoleXixunPlayerEntity byId = xiXunPlayerService.getById(programPro.getProgramId());
if (byId == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
@@ -87,6 +92,9 @@
*/
@PostMapping("/deleteProgram/{pid}")
public ResponseVO<Object> deleteProgram(@PathVariable Long pid) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(xiXunPlayerService.deleteProgram(pid));
}
@@ -98,6 +106,9 @@
*/
@GetMapping("/getByPid/{pid}")
public ResponseVO<Object> getByPid(@PathVariable Long pid) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(xiXunPlayerService.getByPid(pid));
}
@@ -129,6 +140,9 @@
*/
@PostMapping("/pushToXixun/{pid}")
public ResponseVO<Object> pushByPid(@PathVariable Long pid, @RequestBody List<Long> lightemitIds) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_PUSH.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
xiXunPlayerService.videoXixunPlayer(pid, lightemitIds);
return ResponseUtil.success("鎺ㄩ�佹垚鍔�");
}
@@ -136,6 +150,9 @@
//鎵ц涓殑鑺傜洰
@GetMapping("/getProgram/{lightemitId}")
public ResponseVO<Object> getProgram(@PathVariable Long lightemitId) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_PLAYING.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(xiXunPlayerService.getByPid(lightemitId));
}
@@ -148,6 +165,9 @@
*/
@PostMapping("/saveLed")
public ResponseVO<Object> save(@RequestBody PoleLightemitEntity poleLightemit) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_LED_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
int count = poleLightemitService.count(new QueryWrapper<PoleLightemitEntity>().eq("lightemit_control_code", poleLightemit.getLightemitControlCode()));
if (count != 0) {
throw new BusinessException("LED鎺у埗鍗＄紪鍙蜂笉鑳介噸澶�");
@@ -174,6 +194,9 @@
*/
@PostMapping("/updateLed/{ledId}")
public ResponseVO<Object> updatePoleLightemit(@PathVariable Long ledId, @RequestBody PoleLightemitEntity poleLightemit) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_LED_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
poleLightemitService.updatePoleLightemit(ledId, poleLightemit);
return ResponseUtil.success("淇敼鎴愬姛");
}
@@ -186,6 +209,9 @@
*/
@PostMapping("/deleteLed")
public ResponseVO<Object> deleteLed(@RequestBody List<Long> ledIds) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_LED_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
boolean b = poleLightemitService.deletePoleLightemit(ledIds);
if (b) {
return ResponseUtil.success("鍒犻櫎鎴愬姛");
@@ -208,12 +234,10 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);
- poleLightemitEntityList.forEach(
- led -> {
- led.setStreetlightId(led.getPoleId());
- led.setStreetlightName(led.getPoleName());
- }
- );
+ poleLightemitEntityList.forEach(led -> {
+ led.setStreetlightId(led.getPoleId());
+ led.setStreetlightName(led.getPoleName());
+ });
CommonPage commonPage = CommonPage.restPage(poleLightemitEntityList);
int size = poleLightemitEntityList.size();
@@ -234,13 +258,14 @@
return ResponseUtil.success(poleLightemitService.getLedByLightControlCode(lightemitControlCode));
}
- /*
- 璁剧疆灞忓箷寮�鍏�
+ /**
+ * 璁剧疆灞忓箷寮�鍏�
*/
-
- @AnonymousAccess
@PostMapping("/setScreenOpen")
public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_ON_OFF.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (setScreenOpenEntity.getIds() == null || setScreenOpenEntity.getIds().length == 0 || setScreenOpenEntity.getBool() == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
@@ -274,6 +299,9 @@
*/
@GetMapping("/getPicture/{id}")
public ResponseVO<Object> getPicture(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_SCREENSHOT.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (id == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
@@ -291,6 +319,9 @@
*/
@PostMapping("/getVolume/{id}")
public ResponseVO<Object> getVolume(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_VOL_CHANGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (id == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
@@ -304,24 +335,14 @@
}
- /**
- * 娴嬭瘯
- * @param
- * @return
- */
- @AnonymousAccess
- @PostMapping("/test/{str}")
- public ResponseVO<Object> setBrightness(@PathVariable String str) {
- return ResponseUtil.success(lightemitUtils.getIsScreenOpen(str));
- }
-
-
/*
璁剧疆浜害
*/
@PostMapping("/setBrightness")
public ResponseVO<Object> setBrightness(@RequestBody SetBrightnessParam setBrightnessParam) {
-
+ if (!permissionConfig.check(MenuEnum.XIXUN_BRIGHTNESS_CHANGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (setBrightnessParam == null || setBrightnessParam.getIds() == null || setBrightnessParam.getBrightness() > 255) {
throw new BusinessException("鍙傛暟閿欒涓虹┖鎴栦寒搴︿笉鑳借秴杩�255");
}
@@ -344,7 +365,9 @@
*/
@PostMapping("/setVolume")
public ResponseVO<Object> setVolume(@RequestBody SetVolumeParam setVolumeEntity) {
-
+ if (!permissionConfig.check(MenuEnum.XIXUN_VOL_CHANGE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (setVolumeEntity == null || setVolumeEntity.getIds() == null || setVolumeEntity.getVolume() > 15) {
throw new BusinessException("闊抽噺鑼冨洿涓�0---15");
}
@@ -364,21 +387,42 @@
@PostMapping("/addSchedule")
public ResponseVO<Object> addSchedule(@RequestBody LEDScheduleParam_xixun ledEntity) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_ADD.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(scheduleService.insert(ledEntity));
}
@PostMapping("/updateSchedule")
public ResponseVO<Object> updateSchedule(@RequestBody LEDScheduleParam_xixun ledEntity) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_UPDATE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(scheduleService.updateSchedule(ledEntity));
}
@PostMapping("/deleteSchedule")
public ResponseVO<Object> deleteSchedule(@RequestBody List<Integer> ids) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_DELETE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ /**
+ * 鐔欐睕瀹氭椂鍒犻櫎 鏃ュ織璁板綍寮�濮�
+ */
+
+ String content = "{鍒犻櫎鐨勭啓姹涘畾鏃秈d锛�" + ids + " }";
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂浠诲姟鍒犻櫎", content);
+ /**
+ * 鐔欐睕瀹氭椂鍒犻櫎 鏃ュ織璁板綍缁撴潫
+ */
return ResponseUtil.success(scheduleService.removeByIds(ids));
}
@GetMapping("/getSchedule/{id}")
public ResponseVO<Object> getSchedule(@PathVariable Integer id) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_DETAIL.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
return ResponseUtil.success(scheduleService.getSchedule(id));
}
@@ -402,6 +446,9 @@
*/
@PostMapping("/pushSchedule/{id}")
public ResponseVO<Object> pushSchedule(@PathVariable Integer id, @RequestBody Long[] lightemitIds) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_PUSH_SCHEDULE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
scheduleService.ledschedulepush(id, lightemitIds);
return ResponseUtil.success("璁剧疆鎴愬姛");
}
@@ -415,6 +462,9 @@
@PostMapping("/getPushSchedule")
public ResponseVO<Object> getPushSchedule(@RequestBody List<Long> ids) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_SCHEDULE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (ids.isEmpty()) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
@@ -432,6 +482,9 @@
*/
@GetMapping("/closeWeatherPush/{id}")
public ResponseVO<Object> closeWeatherPush(@PathVariable Long id) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_CLOSE_AIR.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
if (id == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
@@ -442,8 +495,11 @@
/**
* 娓呭睆鎿嶄綔
*/
- @GetMapping("/clearScreen")
+ @PostMapping("/clearScreen")
public ResponseVO<Object> clearScreen(@RequestBody List<Long> ids) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_CLEAN.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
List<PoleLightemitEntity> list = poleLightemitService.listByIds(ids);
if (ids.isEmpty() && list.isEmpty()) {
throw new BusinessException("鏈�夋嫨LED灞�");
@@ -451,6 +507,22 @@
for (PoleLightemitEntity playerId : list) {
lightemitUtils.clear(playerId.getLightemitControlCode());
}
+
+ /**
+ * 鐔欐睕娓呭睆 鏃ュ織璁板綍寮�濮�
+ */
+ //鑾峰彇listCode
+ List<String> listCode = new ArrayList<>();
+ List<String> msg = new ArrayList<>();
+ for (PoleLightemitEntity poleLightemitEntity : list) {
+ listCode.add(poleLightemitEntity.getLightemitControlCode());
+ msg.add("[灞忓箷鍚嶇О" + poleLightemitEntity.getLightemitName() + "璁惧缂栫爜" + poleLightemitEntity.getLightemitControlCode() + "],");
+ }
+ String content = JSON.toJSONString(msg);
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕娓呭睆", content);
+ /**
+ * 鐔欐睕娓呭睆 鏃ュ織璁板綍缁撴潫
+ */
return ResponseUtil.success("娓呭睆鎴愬姛");
}
}
--
Gitblit v1.9.3