From c45ce58884c59ddf8a6051ba370215e6f62adeb8 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 28 七月 2023 10:11:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java | 46 ++++++++++------------------------------------
1 files changed, 10 insertions(+), 36 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
similarity index 73%
rename from ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
rename to ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
index 7ca67f0..9222774 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
@@ -1,28 +1,22 @@
package com.ruoyi.alarm.config.controller;
-import java.util.List;
-import java.util.Map;
-import javax.servlet.http.HttpServletResponse;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.service.IArdAlarmTypeConfigService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+import java.util.Map;
/**
* 鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈Controller
@@ -64,26 +58,6 @@
util.exportExcel(response, list, "鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈鏁版嵁");
}
- /**
- * 鑾峰彇鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈璇︾粏淇℃伅
- */
- @ApiOperation("鑾峰彇鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('alarm:config:query')")
- @GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") String id)
- {
- return success(ardAlarmTypeConfigService.selectArdAlarmTypeConfigById(id));
- }
- /**
- * 鎵归噺鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
- */
- @Log(title = "鎵归噺閰嶇疆鎶ヨ绫诲瀷", businessType = BusinessType.INSERT)
- @PostMapping("/batchConfig")
- @ApiOperation("鎵归噺閰嶇疆鎶ヨ绫诲瀷")
- public AjaxResult addBatch(@RequestBody Map<String,Object> map)
- {
- return AjaxResult.success(ardAlarmTypeConfigService.insertArdAlarmTypeConfig(map));
- }
/**
* 鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
--
Gitblit v1.9.3