From f89c8d19d96fdbff3081ba4ac48ea3e72168bc59 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期五, 20 五月 2022 15:52:44 +0800
Subject: [PATCH] 日志
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/XiXunController.java | 62 +++++++++++++++++-------------
1 files changed, 35 insertions(+), 27 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 397febb..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;
@@ -234,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();
@@ -260,11 +258,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 +335,6 @@
}
- /**
- * 娴嬭瘯
- *
- * @param
- * @return
- */
- @AnonymousAccess
- @PostMapping("/test/{str}")
- public ResponseVO<Object> setBrightness(@PathVariable String str) {
- return ResponseUtil.success(lightemitUtils.getIsScreenOpen(str));
- }
-
-
/*
璁剧疆浜害
*/
@@ -423,6 +406,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));
}
@@ -503,7 +495,7 @@
/**
* 娓呭睆鎿嶄綔
*/
- @GetMapping("/clearScreen")
+ @PostMapping("/clearScreen")
public ResponseVO<Object> clearScreen(@RequestBody List<Long> ids) {
if (!permissionConfig.check(MenuEnum.XIXUN_CLEAN.getCode())) {
return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
@@ -515,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