diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java
index 5b1e6ba..6459e5f 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceAlarmParameterController.java
@@ -1,8 +1,18 @@
 package com.yfd.platform.modules.auxcontrol.controller;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.yfd.platform.annotation.Log;
+import com.yfd.platform.config.ResponseResult;
+import com.yfd.platform.modules.auxcontrol.domain.DeviceAlarmParameter;
+import com.yfd.platform.modules.auxcontrol.service.IDeviceAlarmParameterService;
 import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * <p>
@@ -17,5 +27,93 @@ import org.springframework.web.bind.annotation.RestController;
 @Api(value = "DeviceAlarmParameterController", tags = "变电站辅控设备告警参数设置")
 public class DeviceAlarmParameterController {
 
+    @Resource
+    private IDeviceAlarmParameterService deviceAlarmParameterService;
+
+    /***********************************
+     * 用途说明：新增变电站辅控设备信息
+     * 参数说明
+     * device     变电站辅控设备
+     * 返回值说明:  com.yfd.platform.config.ResponseResult 返回新增成功或者失败
+     ***********************************/
+    @Log(module = "综合辅控系统", value = "新增辅控设备告警参数！", type = "1")
+    @PostMapping("/addDeviceAlarmParameter")
+    @ApiOperation("新增辅控设备告警参数")
+    @ResponseBody
+    public ResponseResult addDeviceAlarmParameter(@RequestBody DeviceAlarmParameter deviceAlarmParameter) {
+        //对象不能为空
+        if (ObjectUtil.isEmpty(deviceAlarmParameter)) {
+            return ResponseResult.error("参数为空");
+        }
+        boolean isOK = deviceAlarmParameterService.addDeviceAlarmParameter(deviceAlarmParameter);
+        if (isOK) {
+            return ResponseResult.success();
+        } else {
+            return ResponseResult.error();
+        }
+    }
+
+    /***********************************
+     * 用途说明：新增变电站辅控设备信息
+     * 参数说明
+     * device     变电站辅控设备
+     * 返回值说明:  com.yfd.platform.config.ResponseResult 返回新增成功或者失败
+     ***********************************/
+    @Log(module = "综合辅控系统", value = "修改辅控设备告警参数！", type = "1")
+    @PostMapping("/addDeviceAlarmParameter")
+    @ApiOperation("修改辅控设备告警参数")
+    @ResponseBody
+    public ResponseResult updateDeviceAlarmParameter(@RequestBody DeviceAlarmParameter deviceAlarmParameter) {
+        if (ObjectUtil.isEmpty(deviceAlarmParameter)) {
+            return ResponseResult.error("参数为空");
+        }
+        boolean isOK = deviceAlarmParameterService.updateDeviceAlarmParameter(deviceAlarmParameter);
+        if (isOK) {
+            return ResponseResult.success();
+        } else {
+            return ResponseResult.error();
+        }
+    }
+
+    /**********************************
+     * 用途说明: 根据ID删除变电站辅控设备告警参数设置
+     * 参数说明  id 变电站辅控设备告警参数设置ID
+     * 返回值说明: com.yfd.platform.config.ResponseResult 返回删除成功或者失败
+     ***********************************/
+    @Log(module = "数据变电站辅控设备告警参数设置", value = "根据ID删除变电站辅控设备告警参数设置", type = "1")
+    @PostMapping("/deleteDeviceAlarmParameterById")
+    @ApiOperation("根据ID删除变电站辅控设备告警参数设置")
+    public ResponseResult deleteDeviceAlarmParameterById(@RequestParam String id) {
+        if (StrUtil.isBlank(id)) {
+            return ResponseResult.error("参数为空");
+        }
+        boolean isOK = deviceAlarmParameterService.removeById(id);
+        if (isOK) {
+            return ResponseResult.success();
+        } else {
+            return ResponseResult.error();
+        }
+    }
+
+    /**********************************
+     * 用途说明: 批量删除变电站辅控设备告警参数设置
+     * 参数说明  ids 变电站辅控设备告警参数设置id数组
+     * 返回值说明: com.yfd.platform.config.ResponseResult 返回批量删除成功或失败
+     ***********************************/
+    @Log(module = "数据变电站辅控设备告警参数设置", value = "批量删除变电站辅控设备告警参数设置", type = "1")
+    @PostMapping("/deleteDeviceAlarmParameterByIds")
+    @ApiOperation("批量删除变电站辅控设备告警参数设置")
+    public ResponseResult deleteDeviceAlarmParameterByIds(@RequestParam String ids) {
+        if (StrUtil.isBlank(ids)) {
+            return ResponseResult.error("参数为空");
+        }
+        List<String> idList = StrUtil.split(ids, "");
+        boolean isOK = deviceAlarmParameterService.removeByIds(idList);
+        if (isOK) {
+            return ResponseResult.success();
+        } else {
+            return ResponseResult.error();
+        }
+    }
 
 }
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java
index 4440835..2ca599b 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/controller/DeviceSignalController.java
@@ -48,7 +48,6 @@ public class DeviceSignalController {
      ***********************************/
     @GetMapping("/page")
     @ApiOperation("分页查询变电站辅控设备信号")
-    @PreAuthorize("@el.check('select:devicesignal')")
     public ResponseResult getDeviceSignalPage(String deviceId, String signalName, Page<DeviceSignal> page) {
         //参数校验  辅控设备ID不能为空
         if (StrUtil.isBlank(deviceId)) {
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java
index 21a435a..9b19b8b 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/IDeviceAlarmParameterService.java
@@ -13,4 +13,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IDeviceAlarmParameterService extends IService<DeviceAlarmParameter> {
 
+    boolean addDeviceAlarmParameter(DeviceAlarmParameter deviceAlarmParameter);
+
+    boolean updateDeviceAlarmParameter(DeviceAlarmParameter deviceAlarmParameter);
+
 }
diff --git a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java
index c812011..04fc84d 100644
--- a/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java
+++ b/riis-system/src/main/java/com/yfd/platform/modules/auxcontrol/service/impl/DeviceAlarmParameterServiceImpl.java
@@ -17,4 +17,13 @@ import org.springframework.stereotype.Service;
 @Service
 public class DeviceAlarmParameterServiceImpl extends ServiceImpl<DeviceAlarmParameterMapper, DeviceAlarmParameter> implements IDeviceAlarmParameterService {
 
+    @Override
+    public boolean addDeviceAlarmParameter(DeviceAlarmParameter deviceAlarmParameter) {
+        return this.saveOrUpdate(deviceAlarmParameter);
+    }
+
+    @Override
+    public boolean updateDeviceAlarmParameter(DeviceAlarmParameter deviceAlarmParameter) {
+        return this.saveOrUpdate(deviceAlarmParameter);
+    }
 }