diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java index 7953436c..ac649f40 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmContactGroupController.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiOperation; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; +import org.jeecg.modules.entity.AlarmContactGroupAbnormal; import org.jeecg.modules.service.IAlarmContactGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -19,7 +20,7 @@ public class AlarmContactGroupController { @GetMapping("findPage") @ApiOperation(value = "分页查询报警联系人组信息", notes = "分页查询报警联系人组信息") - public Result findPage(QueryRequest queryRequest, AlarmContactGroup alarmContactGroup){ + public Result findPage(QueryRequest queryRequest, AlarmContactGroupAbnormal alarmContactGroup){ return alarmContactGroupService.findPage(queryRequest, alarmContactGroup); } @@ -31,13 +32,13 @@ public class AlarmContactGroupController { @PostMapping("create") @ApiOperation(value = "新增报警人联系人组", notes = "新增报警联系人组") - public Result create(@RequestBody AlarmContactGroup alarmContactGroup){ + public Result create(@RequestBody AlarmContactGroupAbnormal alarmContactGroup){ return alarmContactGroupService.create(alarmContactGroup); } @PutMapping("update") @ApiOperation(value = "修改报警人联系人组", notes = "修改报警联系人组") - public Result update(@RequestBody AlarmContactGroup alarmContactGroup){ + public Result update(@RequestBody AlarmContactGroupAbnormal alarmContactGroup){ return alarmContactGroupService.update(alarmContactGroup); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java index b85ac04a..d8d7361d 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/controller/AlarmRuleController.java @@ -8,6 +8,7 @@ import org.jeecg.modules.base.entity.monitor.Host; import org.jeecg.modules.base.entity.monitor.Servers; import org.jeecg.modules.base.entity.postgre.AlarmRule; import org.jeecg.modules.base.vo.AlarmRuleVo; +import org.jeecg.modules.entity.AlarmRuleAbnormal; import org.jeecg.modules.feignclient.MonitorAlarm; import org.jeecg.modules.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -42,13 +43,13 @@ public class AlarmRuleController { @PostMapping("create") @ApiOperation(value = "新增规则信息", notes = "新增规则信息") - public Result create(@RequestBody AlarmRule alarmRule){ + public Result create(@RequestBody AlarmRuleAbnormal alarmRule){ return alarmRuleService.create(alarmRule); } @PutMapping("update") @ApiOperation(value = "修改规则信息", notes = "修改规则信息") - public Result update(@RequestBody AlarmRule alarmRule){ + public Result update(@RequestBody AlarmRuleAbnormal alarmRule){ return alarmRuleService.update(alarmRule); } diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java index 90c728b8..f8262bc1 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/mapper/AlarmContactGroupMapper.java @@ -1,7 +1,6 @@ package org.jeecg.modules.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; import org.jeecg.modules.entity.AlarmContactGroupAbnormal; public interface AlarmContactGroupMapper extends BaseMapper { diff --git a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java index e03f62f4..7dccbac5 100644 --- a/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java +++ b/jeecg-module-abnormal-alarm/src/main/java/org/jeecg/modules/service/IAlarmContactGroupService.java @@ -3,7 +3,6 @@ package org.jeecg.modules.service; import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.QueryRequest; import org.jeecg.common.api.vo.Result; -import org.jeecg.modules.base.entity.postgre.AlarmContactGroup; import org.jeecg.modules.entity.AlarmContactGroupAbnormal; public interface IAlarmContactGroupService extends IService {