diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java new file mode 100644 index 0000000..d79f7f7 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AlarmConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java new file mode 100644 index 0000000..d79f7f7 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AlarmConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java index 1faf2f6..c2296a2 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.baomidou.mybatisplus.extension.service.IService; +import org.elasticsearch.client.Response; /** *

@@ -13,4 +16,6 @@ */ public interface IAlarmRuleService extends IService { + ResponseData configMonitor( AlarmRule alarmRule); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java new file mode 100644 index 0000000..d79f7f7 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AlarmConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java index 1faf2f6..c2296a2 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.baomidou.mybatisplus.extension.service.IService; +import org.elasticsearch.client.Response; /** *

@@ -13,4 +16,6 @@ */ public interface IAlarmRuleService extends IService { + ResponseData configMonitor( AlarmRule alarmRule); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java index e3ebf5b..df86e39 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java @@ -1,5 +1,9 @@ package com.casic.missiles.modular.system.service.impl; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.dao.AlarmRuleMapper; import com.casic.missiles.modular.system.service.IAlarmRuleService; @@ -17,4 +21,13 @@ @Service public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { + @Override + public ResponseData configMonitor(AlarmRule alarmRule) { + int addFlag = this.baseMapper.insert(alarmRule); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java new file mode 100644 index 0000000..d79f7f7 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AlarmConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java index 1faf2f6..c2296a2 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.baomidou.mybatisplus.extension.service.IService; +import org.elasticsearch.client.Response; /** *

@@ -13,4 +16,6 @@ */ public interface IAlarmRuleService extends IService { + ResponseData configMonitor( AlarmRule alarmRule); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java index e3ebf5b..df86e39 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java @@ -1,5 +1,9 @@ package com.casic.missiles.modular.system.service.impl; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.dao.AlarmRuleMapper; import com.casic.missiles.modular.system.service.IAlarmRuleService; @@ -17,4 +21,13 @@ @Service public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { + @Override + public ResponseData configMonitor(AlarmRule alarmRule) { + int addFlag = this.baseMapper.insert(alarmRule); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 4f39bc1..9d12b2c 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -7,7 +7,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.MonitorConfigDTO; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -85,15 +84,4 @@ return busMonipoiInfoService.monitorDetail(id); } - /** - * 监测点/设备信息详情 - */ - @RequestMapping(value = "/config") - public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); - return busMonipoiInfoService.configMonitor(monitorConfigDTO); - } - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java new file mode 100644 index 0000000..d79f7f7 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AlarmConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java index 1faf2f6..c2296a2 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.baomidou.mybatisplus.extension.service.IService; +import org.elasticsearch.client.Response; /** *

@@ -13,4 +16,6 @@ */ public interface IAlarmRuleService extends IService { + ResponseData configMonitor( AlarmRule alarmRule); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java index e3ebf5b..df86e39 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java @@ -1,5 +1,9 @@ package com.casic.missiles.modular.system.service.impl; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.dao.AlarmRuleMapper; import com.casic.missiles.modular.system.service.IAlarmRuleService; @@ -17,4 +21,13 @@ @Service public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { + @Override + public ResponseData configMonitor(AlarmRule alarmRule) { + int addFlag = this.baseMapper.insert(alarmRule); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 4f39bc1..9d12b2c 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -7,7 +7,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.MonitorConfigDTO; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -85,15 +84,4 @@ return busMonipoiInfoService.monitorDetail(id); } - /** - * 监测点/设备信息详情 - */ - @RequestMapping(value = "/config") - public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); - return busMonipoiInfoService.configMonitor(monitorConfigDTO); - } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java deleted file mode 100644 index a5eeb2f..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@Data -public class MonitorConfigDTO { - - @NotNull - private Long id; - /** - * 默认巡航速度(m/s)1~63 - */ - @NotNull - private String speed; - - /** - * 默认停留时间(s)0~255秒 - */ - @NotNull - private String stopTime; - - /** - * 默认报警阈值 - */ - @NotNull - private String high; - - /** - * 局部扫描角度配置(1~255实际对应0.1°~25.5°), - */ - @NotNull - private String angle; - -} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java new file mode 100644 index 0000000..d79f7f7 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AlarmConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java index 1faf2f6..c2296a2 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.baomidou.mybatisplus.extension.service.IService; +import org.elasticsearch.client.Response; /** *

@@ -13,4 +16,6 @@ */ public interface IAlarmRuleService extends IService { + ResponseData configMonitor( AlarmRule alarmRule); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java index e3ebf5b..df86e39 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java @@ -1,5 +1,9 @@ package com.casic.missiles.modular.system.service.impl; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.dao.AlarmRuleMapper; import com.casic.missiles.modular.system.service.IAlarmRuleService; @@ -17,4 +21,13 @@ @Service public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { + @Override + public ResponseData configMonitor(AlarmRule alarmRule) { + int addFlag = this.baseMapper.insert(alarmRule); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 4f39bc1..9d12b2c 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -7,7 +7,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.MonitorConfigDTO; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -85,15 +84,4 @@ return busMonipoiInfoService.monitorDetail(id); } - /** - * 监测点/设备信息详情 - */ - @RequestMapping(value = "/config") - public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); - return busMonipoiInfoService.configMonitor(monitorConfigDTO); - } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java deleted file mode 100644 index a5eeb2f..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@Data -public class MonitorConfigDTO { - - @NotNull - private Long id; - /** - * 默认巡航速度(m/s)1~63 - */ - @NotNull - private String speed; - - /** - * 默认停留时间(s)0~255秒 - */ - @NotNull - private String stopTime; - - /** - * 默认报警阈值 - */ - @NotNull - private String high; - - /** - * 局部扫描角度配置(1~255实际对应0.1°~25.5°), - */ - @NotNull - private String angle; - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index 7fddde8..eeac8b8 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.MonitorConfigDTO; import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -31,6 +30,4 @@ ResponseData monitorDetail(Long id); - ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); - } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java index 43b9c31..b77e0a7 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRuleController.java @@ -1,18 +1,25 @@ package com.casic.missiles.modular.system.controller; +import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.core.base.controller.ExportController; import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.service.IAlarmRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; +import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; +import javax.validation.Valid; import java.util.List; /** @@ -30,6 +37,8 @@ private IAlarmRuleService alarmRuleService; + + /** * 获取告警规则列表 */ @@ -95,15 +104,14 @@ } /** - * 告警规则详情 + * 监测点/设备信息详情 */ -// @RequestMapping(value = "/detail/{alarmRuleId}") -// @ResponseBody -// public Object detail(@PathVariable("alarmRuleId") String alarmRuleId) { -// ResultData resultData = new ResultData(); -// resultData.setCode(200); -// resultData.setMessage("查询详情成功"); -// resultData.setData(alarmRuleService.selectById(alarmRuleId)); -// return resultData; -// } + @RequestMapping(value = "/config") + public Object configMonitor(@RequestBody @Valid AlarmRule alarmRule, BindingResult bindingResult) { + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return alarmRuleService.configMonitor(alarmRule); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java new file mode 100644 index 0000000..d79f7f7 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmConfigDTO.java @@ -0,0 +1,36 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class AlarmConfigDTO { + + @NotNull + private Long id; + /** + * 默认巡航速度(m/s)1~63 + */ + @NotNull + private String speed; + + /** + * 默认停留时间(s)0~255秒 + */ + @NotNull + private String stopTime; + + /** + * 默认报警阈值 + */ + @NotNull + private String high; + + /** + * 局部扫描角度配置(1~255实际对应0.1°~25.5°), + */ + @NotNull + private String angle; + +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java index 1faf2f6..c2296a2 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRuleService.java @@ -1,7 +1,10 @@ package com.casic.missiles.modular.system.service; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.baomidou.mybatisplus.extension.service.IService; +import org.elasticsearch.client.Response; /** *

@@ -13,4 +16,6 @@ */ public interface IAlarmRuleService extends IService { + ResponseData configMonitor( AlarmRule alarmRule); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java index e3ebf5b..df86e39 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRuleServiceImpl.java @@ -1,5 +1,9 @@ package com.casic.missiles.modular.system.service.impl; +import com.casic.missiles.enums.BusinessExceptionEnum; +import com.casic.missiles.exception.BusinessException; +import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmConfigDTO; import com.casic.missiles.modular.system.model.AlarmRule; import com.casic.missiles.modular.system.dao.AlarmRuleMapper; import com.casic.missiles.modular.system.service.IAlarmRuleService; @@ -17,4 +21,13 @@ @Service public class AlarmRuleServiceImpl extends ServiceImpl implements IAlarmRuleService { + @Override + public ResponseData configMonitor(AlarmRule alarmRule) { + int addFlag = this.baseMapper.insert(alarmRule); + if (addFlag > 0) { + return ResponseData.success(); + } + throw new BusinessException(BusinessExceptionEnum.HANDLE_FAILED); + } + } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java index 4f39bc1..9d12b2c 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/controller/BusMonipoiInfoController.java @@ -7,7 +7,6 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.MonitorConfigDTO; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.service.IBusMonipoiInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -85,15 +84,4 @@ return busMonipoiInfoService.monitorDetail(id); } - /** - * 监测点/设备信息详情 - */ - @RequestMapping(value = "/config") - public Object config(@RequestBody @Valid MonitorConfigDTO monitorConfigDTO, BindingResult bindingResult) { - Assert.isFalse(bindingResult.hasErrors(), () -> { - throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); - }); - return busMonipoiInfoService.configMonitor(monitorConfigDTO); - } - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java b/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java deleted file mode 100644 index a5eeb2f..0000000 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/dto/MonitorConfigDTO.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.casic.missiles.modular.system.dto; - -import lombok.Data; - -import javax.validation.constraints.NotNull; - -@Data -public class MonitorConfigDTO { - - @NotNull - private Long id; - /** - * 默认巡航速度(m/s)1~63 - */ - @NotNull - private String speed; - - /** - * 默认停留时间(s)0~255秒 - */ - @NotNull - private String stopTime; - - /** - * 默认报警阈值 - */ - @NotNull - private String high; - - /** - * 局部扫描角度配置(1~255实际对应0.1°~25.5°), - */ - @NotNull - private String angle; - -} diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java index 7fddde8..eeac8b8 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/IBusMonipoiInfoService.java @@ -2,7 +2,6 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.MonitorConfigDTO; import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.baomidou.mybatisplus.extension.service.IService; @@ -31,6 +30,4 @@ ResponseData monitorDetail(Long id); - ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO); - } diff --git a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java index b75f4da..6c168f3 100644 --- a/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java +++ b/casic-station/src/main/java/com/casic/missiles/modular/system/service/impl/BusMonipoiInfoServiceImpl.java @@ -1,7 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.core.application.context.AbstractPermissionContext; @@ -9,7 +7,6 @@ import com.casic.missiles.enums.BusinessExceptionEnum; import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.response.ResponseData; -import com.casic.missiles.modular.system.dto.MonitorConfigDTO; import com.casic.missiles.modular.system.dto.MonitorPointList; import com.casic.missiles.modular.system.model.BusMonipoiInfo; import com.casic.missiles.modular.system.dao.BusMonipoiInfoMapper; @@ -89,9 +86,4 @@ return ResponseData.success(busMonipoiInfo); } - @Override - public ResponseData configMonitor(MonitorConfigDTO monitorConfigDTO) { - return null; - } - }