From a36535db12500082c443ef86a0c53bc039f5b615 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期一, 26 九月 2022 18:30:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java | 27 ++++++++++++++++++++++++---
1 files changed, 24 insertions(+), 3 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
index b093af9..284a5e9 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LightController.java
@@ -3,10 +3,11 @@
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
+import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
-import com.sandu.ximon.admin.param.LightControlParam;
-import com.sandu.ximon.admin.param.LightPowerSettingParam;
-import com.sandu.ximon.admin.param.LightRemarkParam;
+import com.sandu.common.util.SpringContextHolder;
+import com.sandu.ximon.admin.param.*;
+import com.sandu.ximon.admin.schedule.LightTimeSynchronizationSchedule;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.LightEnergyDataService;
import com.sandu.ximon.admin.service.LightReportDataService;
@@ -178,4 +179,24 @@
return ResponseUtil.success(reportDataList);
}
+
+ /**
+ * 璁剧疆鏃ュ巻锛堝悓蹇冭烦鍖呬腑鐨�6瀛楄妭鏃ユ湡鏃堕棿锛�
+ */
+ @PostMapping("/SetCalendar")
+ public ResponseVO<Object> SetCalendar(@RequestBody @Validated LightSetCalendarParam lightSetCalendarParam) {
+ if (!permissionConfig.check(MenuEnum.LIGHT_SETCALENDAR.getCode())) {
+ return ResponseUtil.fail("缂哄皯瀵瑰簲鐢ㄦ埛鏉冮檺");
+ }
+
+ return ResponseUtil.success(lightService.SetCalendar(lightSetCalendarParam.getLightId(), lightSetCalendarParam.getAddress()));
+ }
+
+ @AnonymousAccess
+ @GetMapping("/test")
+ public ResponseVO<Object> test() {
+ SpringContextHolder.getBean(LightTimeSynchronizationSchedule.class).UserSubjectRefund();
+
+ return ResponseUtil.success(null);
+ }
}
--
Gitblit v1.9.3