From e55c8b0a92eb9715edd90c31dfd4de51a47b588b Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 04 十一月 2022 17:40:08 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 242 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 176 insertions(+), 66 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 0e6dee7..d6e85e1 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,13 +1,14 @@
package com.sandu.ximon.admin.controller;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
+import com.sandu.common.file.FileUploadDto;
+import com.sandu.common.file.impl.AliOssFileServiceImpl;
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,12 +20,16 @@
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;
import com.sandu.ximon.dao.domain.PoleXixunPlayerEntity;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import java.util.*;
@@ -43,10 +48,12 @@
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;
+
+
+ private final AliOssFileServiceImpl aliOssFileService;
+ private final FileOperationRecordService fileOperationRecordService;
/**
* 鏂板鑺傜洰
@@ -74,28 +81,30 @@
if (byId == null) {
throw new BusinessException("鏈�夋嫨LED灞�");
}
-// QueryWrapper<PoleXixunPlayerEntity> queryWrapper = new QueryWrapper<>();
-// queryWrapper.eq("program_code", programPro.get_id());
- boolean insert = false;
- if (xiXunPlayerService.removeById(programPro.getProgramId())) {
- insert = xiXunPlayerService.insert(programPro);
+
+ boolean update = xiXunPlayerService.update(programPro);
+ if (update) {
+ return ResponseUtil.success("缂栬緫鎴愬姛锛�");
+
+ } else {
+ return ResponseUtil.fail("缂栬緫澶辫触锛�");
+
}
- ;
- return ResponseUtil.success(insert);
+
}
/**
* 鍒犻櫎鑺傜洰
*
- * @param pid
+ * @param
* @return
*/
- @PostMapping("/deleteProgram/{pid}")
- public ResponseVO<Object> deleteProgram(@PathVariable Long pid) {
+ @PostMapping("/deleteProgram")
+ public ResponseVO<Object> deleteProgram(@RequestBody List<Long> pids) {
if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_DELETE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(xiXunPlayerService.deleteProgram(pid));
+ return ResponseUtil.success(xiXunPlayerService.deleteProgram(pids));
}
/**
@@ -120,14 +129,15 @@
* @return
*/
@GetMapping("/list")
- public ResponseVO<Object> list(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> list(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestParam(value = "keyword", required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.LED_PROGRAM_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- LambdaQueryWrapper<PoleXixunPlayerEntity> wrapper = xiXunPlayerService.XixunPlayerList(keyword);
- PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
-
- return ResponseUtil.success(xiXunPlayerService.list(wrapper));
+ List<PoleXixunPlayerEntity> list = xiXunPlayerService.listProgram(baseConditionVO, order, seq, keyword);
+ return ResponseUtil.success(list);
}
@@ -143,8 +153,8 @@
if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_PUSH.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- xiXunPlayerService.videoXixunPlayer(pid, lightemitIds);
- return ResponseUtil.success("鎺ㄩ�佹垚鍔�");
+
+ return ResponseUtil.success(xiXunPlayerService.videoXixunPlayer(pid, lightemitIds));
}
//鎵ц涓殑鑺傜洰
@@ -153,7 +163,7 @@
if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_PLAYING.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- return ResponseUtil.success(xiXunPlayerService.getByPid(lightemitId));
+ return ResponseUtil.success(poleLightemitService.getProgram(lightemitId));
}
@@ -228,26 +238,19 @@
* @return
*/
@GetMapping("/listLed")
- public ResponseVO<Object> listLed(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
+ public ResponseVO<Object> listLed(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestParam(value = "keyword", required = false) String keyword,
@RequestParam(value = "isOnLine", required = false) boolean isOnLine) {
if (!permissionConfig.check(MenuEnum.LED_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, isOnLine);
- poleLightemitEntityList.forEach(
- led -> {
- led.setStreetlightId(led.getPoleId());
- led.setStreetlightName(led.getPoleName());
- }
- );
+ List<PoleLightemitEntity> poleLightemitEntityList = poleLightemitService.listLed(keyword, order, seq, isOnLine);
- 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);
}
@@ -260,11 +263,9 @@
return ResponseUtil.success(poleLightemitService.getLedByLightControlCode(lightemitControlCode));
}
- /*
- 璁剧疆灞忓箷寮�鍏�
+ /**
+ * 璁剧疆灞忓箷寮�鍏�
*/
-
- @AnonymousAccess
@PostMapping("/setScreenOpen")
public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity) {
if (!permissionConfig.check(MenuEnum.XIXUN_ON_OFF.getCode())) {
@@ -339,19 +340,6 @@
}
- /**
- * 娴嬭瘯
- *
- * @param
- * @return
- */
- @AnonymousAccess
- @PostMapping("/test/{str}")
- public ResponseVO<Object> setBrightness(@PathVariable String str) {
- return ResponseUtil.success(lightemitUtils.getIsScreenOpen(str));
- }
-
-
/*
璁剧疆浜害
*/
@@ -423,6 +411,15 @@
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));
}
@@ -436,12 +433,15 @@
@GetMapping("/listSchedule")
- public ResponseVO<Object> listSchedule(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
+ public ResponseVO<Object> listSchedule(BaseConditionVO baseConditionVO,
+ @RequestParam(value = "order", required = false) Integer order,
+ @RequestParam(value = "seq", required = false) Integer seq,
+ @RequestParam(value = "keyword", required = false) String keyword) {
if (!permissionConfig.check(MenuEnum.PLAYPLAN_LIST.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
- return ResponseUtil.success(scheduleService.listSchedule(baseConditionVO, keyword));
+ return ResponseUtil.success(scheduleService.listSchedule(baseConditionVO, order, seq, keyword));
}
@@ -457,8 +457,23 @@
if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_PUSH_SCHEDULE.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- scheduleService.ledschedulepush(id, lightemitIds);
- return ResponseUtil.success("璁剧疆鎴愬姛");
+ return ResponseUtil.success(scheduleService.ledschedulepush(id, lightemitIds));
+ }
+
+ /**
+ * 娓呯┖瀹氭椂
+ *
+ * @param
+ * @param lightemitIds
+ * @return
+ */
+ @PostMapping("/deletePushSchedule")
+ public ResponseVO<Object> deletePushSchedule(@RequestBody Long[] lightemitIds) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PLAN_PUSH_SCHEDULE.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+ return ResponseUtil.success(scheduleService.deleteSchedulePush(lightemitIds));
}
/**
@@ -488,15 +503,15 @@
/**
* 鍏抽棴澶╂皵鎺ㄩ��
*/
- @GetMapping("/closeWeatherPush/{id}")
- public ResponseVO<Object> closeWeatherPush(@PathVariable Long id) {
+ @GetMapping("/closeWeatherPush/{poleId}")
+ public ResponseVO<Object> closeWeatherPush(@PathVariable Long poleId) {
if (!permissionConfig.check(MenuEnum.XIXUN_CLOSE_AIR.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
- if (id == null) {
- throw new BusinessException("鏈�夋嫨LED灞�");
+ if (poleId == null) {
+ throw new BusinessException("鐏潌id涓嶈兘涓虹┖!");
}
- SpringContextHolder.getBean(PoleService.class).closeXiXunAirPush(id);
+ SpringContextHolder.getBean(PoleService.class).closeXiXunAirPush(poleId);
return ResponseUtil.success("鍏抽棴鎴愬姛");
}
@@ -513,8 +528,103 @@
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());
}
+
+ /**
+ * 鐔欐睕娓呭睆 鏃ュ織璁板綍寮�濮�
+ */
+ //鑾峰彇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("娓呭睆鎴愬姛");
}
+
+
+ /**
+ * 鐔欐睕鐩存帴涓婁紶瑙嗛鍒版挱鏀惧櫒鎾斁
+ */
+ @PostMapping("/pushVideo")
+ @Transactional(rollbackFor = Exception.class)
+ public ResponseVO<Object> video(@RequestParam("file") MultipartFile file,
+ @RequestParam("lightemitId") List<Long> lightemitIds,
+ @RequestParam("type") Integer type) {
+ if (!permissionConfig.check(MenuEnum.XIXUN_PROGRAM_PUSH.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+ if (file == null || lightemitIds.isEmpty()) {
+ throw new BusinessException("鏈�夋嫨LED灞忔垨鏂囦欢");
+ }
+
+ FileUploadDto fileUploadDto = aliOssFileService.uploadFile(file);
+ if (type == null && (type > 2 || type < 1)) {
+ throw new BusinessException("璇烽�夋嫨姝ｇ‘鐨勬挱鏀剧被鍨�");
+ }
+
+ if (type == 1 && !"mp4".equals(fileUploadDto.getFileType())) {
+ throw new BusinessException("璇蜂笉瑕佸湪鎾斁瑙嗛鏃堕�夋嫨闈瀖p4鏂囦欢");
+ } else if (type == 2 && (!"jpg".equals(fileUploadDto.getFileType()) && !"gif".equals(fileUploadDto.getFileType()) && !"png".equals(fileUploadDto.getFileType()))) {
+ throw new BusinessException("璇蜂笉瑕佸湪鎾斁鍥剧墖鏃舵椂閫夋嫨闈瀓pg/gif/png鏂囦欢");
+ }
+
+
+ //鑾峰彇鎵�鏈塴ed鏁版嵁
+ List<PoleLightemitEntity> poleLightemitControllers = poleLightemitService.listByIds(lightemitIds);
+
+ int num = 0;
+ if (!poleLightemitControllers.isEmpty()) {
+
+ Iterator iterator = poleLightemitControllers.iterator();
+ while (iterator.hasNext()) {
+ PoleLightemitEntity poleLightemitEntity = (PoleLightemitEntity) iterator.next();
+ //涓婁紶瑙嗛
+ String s = poleLightemitService.videoUpload(poleLightemitEntity.getLightemitControlCode(), fileUploadDto, type);
+ if ("鎺ㄩ�佸け璐�".equals(s)) {
+ num++;
+ }
+ }
+ } else {
+ throw new BusinessException("鏈纭�夋嫨LED灞�");
+ }
+
+ /**
+ * 鐔欐睕涓婁紶鏂囦欢鎾斁 鏃ュ織璁板綍寮�濮�
+ */
+ //鑾峰彇listCode
+ List<String> listCode = new ArrayList<>();
+ List<String> msg = new ArrayList<>();
+ for (PoleLightemitEntity poleLightemitEntity : poleLightemitControllers) {
+ listCode.add(poleLightemitEntity.getLightemitControlCode());
+ msg.add("[灞忓箷鍚嶇О" + poleLightemitEntity.getLightemitName() + "璁惧缂栫爜" + poleLightemitEntity.getLightemitControlCode() + "],");
+ }
+ String content = JSON.toJSONString(msg);
+ StoreOperationRecordsUtils.storeOperationData(listCode, null, "鐔欐睕鏂囦欢鎺ㄩ��", content);
+ /**
+ * 鐔欐睕涓婁紶鏂囦欢鎾斁 鏃ュ織璁板綍缁撴潫
+ */
+
+ if (num != 0 && num != lightemitIds.size()) {
+ //瀛樺湪澶辫触浣嗘槸涓嶅畬鍏ㄥけ璐�
+ return ResponseUtil.success("閮ㄥ垎鏂囦欢鎾斁鎴愬姛");
+ } else if (num == lightemitIds.size()) {
+ //鍏ㄩ儴澶辫触
+ return ResponseUtil.fail("鏂囦欢鎾斁澶辫触");
+ } else {
+ return ResponseUtil.success("鏂囦欢鎾斁鎴愬姛");
+ }
+ }
}
--
Gitblit v1.9.3