From ce72201c7cd63b8eb02af930b7b8302d5395ae6a Mon Sep 17 00:00:00 2001
From: zhanzhiqin <895896009@qq.com>
Date: 星期五, 27 五月 2022 14:34:19 +0800
Subject: [PATCH] fix
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 53 ++++++++++++++++++++++++++++++++++-------------------
1 files changed, 34 insertions(+), 19 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 5b2a18b..d12fb0e 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;
@@ -44,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;
@@ -75,14 +74,16 @@
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);
+
}
/**
@@ -144,8 +145,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));
}
//鎵ц涓殑鑺傜洰
@@ -259,11 +260,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())) {
@@ -410,13 +409,13 @@
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
}
/**
- * 鐔欐睕瀹氭椂鍒犻櫎
+ * 鐔欐睕瀹氭椂鍒犻櫎 鏃ュ織璁板綍寮�濮�
*/
String content = "{鍒犻櫎鐨勭啓姹涘畾鏃秈d锛�" + ids + " }";
- StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂鍒犻櫎", content);
+ StoreOperationRecordsUtils.storeOperationData(null, null, "鐔欐睕瀹氭椂浠诲姟鍒犻櫎", content);
/**
- * 鐔欐睕瀹氭椂鍒犻櫎
+ * 鐔欐睕瀹氭椂鍒犻櫎 鏃ュ織璁板綍缁撴潫
*/
return ResponseUtil.success(scheduleService.removeByIds(ids));
}
@@ -510,6 +509,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