diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java index 1bb8a74..799141b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.model.AlarmThreshold; import com.casic.missiles.modular.system.service.IAlarmService; import com.casic.missiles.modular.system.service.IAlarmThresholdService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -47,7 +48,8 @@ @PostMapping(value = "/update") @ResponseBody public Object update(@RequestBody AlarmThreshold threshold) { - thresholdService.checkAndUpdate(threshold); + threshold.setUpdateTime(TimeUtil.getCurrentTime()); + thresholdService.save(threshold); return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java index 1bb8a74..799141b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.model.AlarmThreshold; import com.casic.missiles.modular.system.service.IAlarmService; import com.casic.missiles.modular.system.service.IAlarmThresholdService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -47,7 +48,8 @@ @PostMapping(value = "/update") @ResponseBody public Object update(@RequestBody AlarmThreshold threshold) { - thresholdService.checkAndUpdate(threshold); + threshold.setUpdateTime(TimeUtil.getCurrentTime()); + thresholdService.save(threshold); return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java index d6badef..11b724a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java @@ -3,12 +3,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AlarmThreshold; +import com.casic.missiles.modular.system.model.Task; +import org.apache.ibatis.annotations.Param; /** - * 报警数据信息 Mapper 接口 + * 报警阈值信息 Mapper 接口 * * @author a203 */ public interface AlarmThresholdMapper extends BaseMapper { - + /** + * 根据阈值创建时间排序,查询最新的阈值 + * + * @return {@link AlarmThreshold} + */ + AlarmThreshold selectLastOne(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java index 1bb8a74..799141b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.model.AlarmThreshold; import com.casic.missiles.modular.system.service.IAlarmService; import com.casic.missiles.modular.system.service.IAlarmThresholdService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -47,7 +48,8 @@ @PostMapping(value = "/update") @ResponseBody public Object update(@RequestBody AlarmThreshold threshold) { - thresholdService.checkAndUpdate(threshold); + threshold.setUpdateTime(TimeUtil.getCurrentTime()); + thresholdService.save(threshold); return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java index d6badef..11b724a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java @@ -3,12 +3,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AlarmThreshold; +import com.casic.missiles.modular.system.model.Task; +import org.apache.ibatis.annotations.Param; /** - * 报警数据信息 Mapper 接口 + * 报警阈值信息 Mapper 接口 * * @author a203 */ public interface AlarmThresholdMapper extends BaseMapper { - + /** + * 根据阈值创建时间排序,查询最新的阈值 + * + * @return {@link AlarmThreshold} + */ + AlarmThreshold selectLastOne(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml index 76c6d2b..cab6f35 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml @@ -2,4 +2,24 @@ + + + ID AS id, + UPDATE_TIME AS updateTime, + TYPHOON_DIS AS typhoonDistance, + TYPHOON_SPEED AS typhoonSpeed, + SHIP_DIS AS shipDistance, + ROBOT_BATTERY AS robotBattery, + ROBOT_DIS AS robotDistance, + SATELLITE_SIGNAL AS satelliteSignal + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java index 1bb8a74..799141b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.model.AlarmThreshold; import com.casic.missiles.modular.system.service.IAlarmService; import com.casic.missiles.modular.system.service.IAlarmThresholdService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -47,7 +48,8 @@ @PostMapping(value = "/update") @ResponseBody public Object update(@RequestBody AlarmThreshold threshold) { - thresholdService.checkAndUpdate(threshold); + threshold.setUpdateTime(TimeUtil.getCurrentTime()); + thresholdService.save(threshold); return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java index d6badef..11b724a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java @@ -3,12 +3,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AlarmThreshold; +import com.casic.missiles.modular.system.model.Task; +import org.apache.ibatis.annotations.Param; /** - * 报警数据信息 Mapper 接口 + * 报警阈值信息 Mapper 接口 * * @author a203 */ public interface AlarmThresholdMapper extends BaseMapper { - + /** + * 根据阈值创建时间排序,查询最新的阈值 + * + * @return {@link AlarmThreshold} + */ + AlarmThreshold selectLastOne(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml index 76c6d2b..cab6f35 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml @@ -2,4 +2,24 @@ + + + ID AS id, + UPDATE_TIME AS updateTime, + TYPHOON_DIS AS typhoonDistance, + TYPHOON_SPEED AS typhoonSpeed, + SHIP_DIS AS shipDistance, + ROBOT_BATTERY AS robotBattery, + ROBOT_DIS AS robotDistance, + SATELLITE_SIGNAL AS satelliteSignal + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java index 9ccfe85..49b7dff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java @@ -14,11 +14,4 @@ * @return {@link AlarmThresholdDTO} */ AlarmThresholdDTO recentValue(); - - /** - * 修改报警阈值 - * - * @param threshold 报警阈值对象 - */ - void checkAndUpdate(AlarmThreshold threshold); } \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java index 1bb8a74..799141b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.model.AlarmThreshold; import com.casic.missiles.modular.system.service.IAlarmService; import com.casic.missiles.modular.system.service.IAlarmThresholdService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -47,7 +48,8 @@ @PostMapping(value = "/update") @ResponseBody public Object update(@RequestBody AlarmThreshold threshold) { - thresholdService.checkAndUpdate(threshold); + threshold.setUpdateTime(TimeUtil.getCurrentTime()); + thresholdService.save(threshold); return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java index d6badef..11b724a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java @@ -3,12 +3,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AlarmThreshold; +import com.casic.missiles.modular.system.model.Task; +import org.apache.ibatis.annotations.Param; /** - * 报警数据信息 Mapper 接口 + * 报警阈值信息 Mapper 接口 * * @author a203 */ public interface AlarmThresholdMapper extends BaseMapper { - + /** + * 根据阈值创建时间排序,查询最新的阈值 + * + * @return {@link AlarmThreshold} + */ + AlarmThreshold selectLastOne(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml index 76c6d2b..cab6f35 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml @@ -2,4 +2,24 @@ + + + ID AS id, + UPDATE_TIME AS updateTime, + TYPHOON_DIS AS typhoonDistance, + TYPHOON_SPEED AS typhoonSpeed, + SHIP_DIS AS shipDistance, + ROBOT_BATTERY AS robotBattery, + ROBOT_DIS AS robotDistance, + SATELLITE_SIGNAL AS satelliteSignal + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java index 9ccfe85..49b7dff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java @@ -14,11 +14,4 @@ * @return {@link AlarmThresholdDTO} */ AlarmThresholdDTO recentValue(); - - /** - * 修改报警阈值 - * - * @param threshold 报警阈值对象 - */ - void checkAndUpdate(AlarmThreshold threshold); } \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java index 9ea96d1..092ad88 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.AlarmThresholdMapper; import com.casic.missiles.modular.system.dto.AlarmThresholdDTO; @@ -20,17 +19,10 @@ @Override public AlarmThresholdDTO recentValue() { - AlarmThresholdDTO thresholdDTO = null; - for (AlarmThreshold alarm : list()) { - thresholdDTO = new AlarmThresholdDTO(alarm); + AlarmThreshold threshold = this.baseMapper.selectLastOne(); + if (threshold == null) { + return null; } - return thresholdDTO; - } - - @Override - public void checkAndUpdate(AlarmThreshold threshold) { - QueryWrapper query = new QueryWrapper<>(); - this.baseMapper.delete(query); - save(threshold); + return new AlarmThresholdDTO(threshold); } } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java index 1bb8a74..799141b 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmController.java @@ -9,6 +9,7 @@ import com.casic.missiles.modular.system.model.AlarmThreshold; import com.casic.missiles.modular.system.service.IAlarmService; import com.casic.missiles.modular.system.service.IAlarmThresholdService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; @@ -47,7 +48,8 @@ @PostMapping(value = "/update") @ResponseBody public Object update(@RequestBody AlarmThreshold threshold) { - thresholdService.checkAndUpdate(threshold); + threshold.setUpdateTime(TimeUtil.getCurrentTime()); + thresholdService.save(threshold); return ResponseData.success(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java index d6badef..11b724a 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmThresholdMapper.java @@ -3,12 +3,19 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.casic.missiles.modular.system.model.AlarmThreshold; +import com.casic.missiles.modular.system.model.Task; +import org.apache.ibatis.annotations.Param; /** - * 报警数据信息 Mapper 接口 + * 报警阈值信息 Mapper 接口 * * @author a203 */ public interface AlarmThresholdMapper extends BaseMapper { - + /** + * 根据阈值创建时间排序,查询最新的阈值 + * + * @return {@link AlarmThreshold} + */ + AlarmThreshold selectLastOne(); } diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml index 76c6d2b..cab6f35 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmThresholdMapper.xml @@ -2,4 +2,24 @@ + + + ID AS id, + UPDATE_TIME AS updateTime, + TYPHOON_DIS AS typhoonDistance, + TYPHOON_SPEED AS typhoonSpeed, + SHIP_DIS AS shipDistance, + ROBOT_BATTERY AS robotBattery, + ROBOT_DIS AS robotDistance, + SATELLITE_SIGNAL AS satelliteSignal + + + + \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java index 9ccfe85..49b7dff 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmThresholdService.java @@ -14,11 +14,4 @@ * @return {@link AlarmThresholdDTO} */ AlarmThresholdDTO recentValue(); - - /** - * 修改报警阈值 - * - * @param threshold 报警阈值对象 - */ - void checkAndUpdate(AlarmThreshold threshold); } \ No newline at end of file diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java index 9ea96d1..092ad88 100644 --- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java +++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmThresholdServiceImpl.java @@ -1,6 +1,5 @@ package com.casic.missiles.modular.system.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.AlarmThresholdMapper; import com.casic.missiles.modular.system.dto.AlarmThresholdDTO; @@ -20,17 +19,10 @@ @Override public AlarmThresholdDTO recentValue() { - AlarmThresholdDTO thresholdDTO = null; - for (AlarmThreshold alarm : list()) { - thresholdDTO = new AlarmThresholdDTO(alarm); + AlarmThreshold threshold = this.baseMapper.selectLastOne(); + if (threshold == null) { + return null; } - return thresholdDTO; - } - - @Override - public void checkAndUpdate(AlarmThreshold threshold) { - QueryWrapper query = new QueryWrapper<>(); - this.baseMapper.delete(query); - save(threshold); + return new AlarmThresholdDTO(threshold); } } diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmThreshold.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmThreshold.java index 49b01fd..d43d55d 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmThreshold.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/AlarmThreshold.java @@ -19,11 +19,15 @@ /** * 数据库主键 - *

- * type = IdType.AUTO 是数据库自增 */ - @TableId(value = "ID", type = IdType.AUTO) - private Integer id; + @TableId(value = "ID", type = IdType.ASSIGN_ID) + private Long id; + + /** + * 阈值更新的时间 + */ + @TableField("UPDATE_TIME") + private String updateTime; /** * 台风与方舱和机器人的距离