diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java new file mode 100644 index 0000000..66dcf70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -0,0 +1,119 @@ +package com.casic.missiles.modular.robot.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 告警记录对象 alarm_record + * + * @author lwh + * @date 2023-10-28 + */ +@Data +@TableName("alarm_record") +public class AlarmRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + @TableField("robot_id") + private Long robotId; + + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + @TableField("task_type") + private Integer taskType; + + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + @TableField("discern_type") + private Integer discernType; + + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + @TableField("monitor_val") + private BigDecimal monitorVal; + + /** + * 监测坐标x + */ + @ApiModelProperty(value = "监测坐标x", dataType = "BigDecimal") + @TableField("x") + private BigDecimal x; + + /** + * 监测坐标y + */ + @ApiModelProperty(value = "监测坐标y", dataType = "BigDecimal") + @TableField("y") + private BigDecimal y; + + /** + * 告警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "告警时间", dataType = "Date") + @TableField("alarm_time") + private Date alarmTime; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + @TableField("task_id") + private Long taskId; + + + @Override + public String toString() { + return "AlarmRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "robotId=" + robotId + + "taskType=" + taskType + + "discernType=" + discernType + + "monitorVal=" + monitorVal + + "x=" + x + + "y=" + y + + "alarmTime=" + alarmTime + + "taskId=" + taskId + + "}"; + } +} \ No newline at end of file diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java new file mode 100644 index 0000000..66dcf70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -0,0 +1,119 @@ +package com.casic.missiles.modular.robot.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 告警记录对象 alarm_record + * + * @author lwh + * @date 2023-10-28 + */ +@Data +@TableName("alarm_record") +public class AlarmRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + @TableField("robot_id") + private Long robotId; + + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + @TableField("task_type") + private Integer taskType; + + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + @TableField("discern_type") + private Integer discernType; + + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + @TableField("monitor_val") + private BigDecimal monitorVal; + + /** + * 监测坐标x + */ + @ApiModelProperty(value = "监测坐标x", dataType = "BigDecimal") + @TableField("x") + private BigDecimal x; + + /** + * 监测坐标y + */ + @ApiModelProperty(value = "监测坐标y", dataType = "BigDecimal") + @TableField("y") + private BigDecimal y; + + /** + * 告警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "告警时间", dataType = "Date") + @TableField("alarm_time") + private Date alarmTime; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + @TableField("task_id") + private Long taskId; + + + @Override + public String toString() { + return "AlarmRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "robotId=" + robotId + + "taskType=" + taskType + + "discernType=" + discernType + + "monitorVal=" + monitorVal + + "x=" + x + + "y=" + y + + "alarmTime=" + alarmTime + + "taskId=" + taskId + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java new file mode 100644 index 0000000..e029be4 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.robot.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.robot.model.AlarmRecord; + +import java.util.List; + + +/** + *

+ * 告警记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface IAlarmRecordService extends IService { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage(Page page, QueryWrapper query); +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java new file mode 100644 index 0000000..66dcf70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -0,0 +1,119 @@ +package com.casic.missiles.modular.robot.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 告警记录对象 alarm_record + * + * @author lwh + * @date 2023-10-28 + */ +@Data +@TableName("alarm_record") +public class AlarmRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + @TableField("robot_id") + private Long robotId; + + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + @TableField("task_type") + private Integer taskType; + + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + @TableField("discern_type") + private Integer discernType; + + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + @TableField("monitor_val") + private BigDecimal monitorVal; + + /** + * 监测坐标x + */ + @ApiModelProperty(value = "监测坐标x", dataType = "BigDecimal") + @TableField("x") + private BigDecimal x; + + /** + * 监测坐标y + */ + @ApiModelProperty(value = "监测坐标y", dataType = "BigDecimal") + @TableField("y") + private BigDecimal y; + + /** + * 告警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "告警时间", dataType = "Date") + @TableField("alarm_time") + private Date alarmTime; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + @TableField("task_id") + private Long taskId; + + + @Override + public String toString() { + return "AlarmRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "robotId=" + robotId + + "taskType=" + taskType + + "discernType=" + discernType + + "monitorVal=" + monitorVal + + "x=" + x + + "y=" + y + + "alarmTime=" + alarmTime + + "taskId=" + taskId + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java new file mode 100644 index 0000000..e029be4 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.robot.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.robot.model.AlarmRecord; + +import java.util.List; + + +/** + *

+ * 告警记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface IAlarmRecordService extends IService { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java new file mode 100644 index 0000000..71c030f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.robot.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.robot.dao.AlarmRecordMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 告警记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +@Service +public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { + + @Override + public List selectAlarmRecordPage(Page page, QueryWrapper query) { + return this.baseMapper.selectAlarmRecordPage(page, query); + } + +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java new file mode 100644 index 0000000..66dcf70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -0,0 +1,119 @@ +package com.casic.missiles.modular.robot.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 告警记录对象 alarm_record + * + * @author lwh + * @date 2023-10-28 + */ +@Data +@TableName("alarm_record") +public class AlarmRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + @TableField("robot_id") + private Long robotId; + + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + @TableField("task_type") + private Integer taskType; + + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + @TableField("discern_type") + private Integer discernType; + + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + @TableField("monitor_val") + private BigDecimal monitorVal; + + /** + * 监测坐标x + */ + @ApiModelProperty(value = "监测坐标x", dataType = "BigDecimal") + @TableField("x") + private BigDecimal x; + + /** + * 监测坐标y + */ + @ApiModelProperty(value = "监测坐标y", dataType = "BigDecimal") + @TableField("y") + private BigDecimal y; + + /** + * 告警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "告警时间", dataType = "Date") + @TableField("alarm_time") + private Date alarmTime; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + @TableField("task_id") + private Long taskId; + + + @Override + public String toString() { + return "AlarmRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "robotId=" + robotId + + "taskType=" + taskType + + "discernType=" + discernType + + "monitorVal=" + monitorVal + + "x=" + x + + "y=" + y + + "alarmTime=" + alarmTime + + "taskId=" + taskId + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java new file mode 100644 index 0000000..e029be4 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.robot.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.robot.model.AlarmRecord; + +import java.util.List; + + +/** + *

+ * 告警记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface IAlarmRecordService extends IService { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java new file mode 100644 index 0000000..71c030f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.robot.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.robot.dao.AlarmRecordMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 告警记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +@Service +public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { + + @Override + public List selectAlarmRecordPage(Page page, QueryWrapper query) { + return this.baseMapper.selectAlarmRecordPage(page, query); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java new file mode 100644 index 0000000..2f55ae2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java @@ -0,0 +1,63 @@ +package com.casic.missiles.modular.robot.vo; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 告警记录对象VO + * + * @author lwh + * @date 2023-10-28 + */ +@Data +public class AlarmRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + private Long robotId; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + private Integer taskType; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + private Integer discernType; + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + private BigDecimal monitorVal; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + private Long taskId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (robotId != null) { + query.eq("robot_id", robotId); + } + if (taskType != null) { + query.eq("task_type", taskType); + } + if (discernType != null) { + query.eq("discern_type", discernType); + } + if (taskId != null) { + query.eq("task_id", taskId); + } + return query; + } +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java new file mode 100644 index 0000000..66dcf70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -0,0 +1,119 @@ +package com.casic.missiles.modular.robot.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 告警记录对象 alarm_record + * + * @author lwh + * @date 2023-10-28 + */ +@Data +@TableName("alarm_record") +public class AlarmRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + @TableField("robot_id") + private Long robotId; + + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + @TableField("task_type") + private Integer taskType; + + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + @TableField("discern_type") + private Integer discernType; + + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + @TableField("monitor_val") + private BigDecimal monitorVal; + + /** + * 监测坐标x + */ + @ApiModelProperty(value = "监测坐标x", dataType = "BigDecimal") + @TableField("x") + private BigDecimal x; + + /** + * 监测坐标y + */ + @ApiModelProperty(value = "监测坐标y", dataType = "BigDecimal") + @TableField("y") + private BigDecimal y; + + /** + * 告警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "告警时间", dataType = "Date") + @TableField("alarm_time") + private Date alarmTime; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + @TableField("task_id") + private Long taskId; + + + @Override + public String toString() { + return "AlarmRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "robotId=" + robotId + + "taskType=" + taskType + + "discernType=" + discernType + + "monitorVal=" + monitorVal + + "x=" + x + + "y=" + y + + "alarmTime=" + alarmTime + + "taskId=" + taskId + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java new file mode 100644 index 0000000..e029be4 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.robot.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.robot.model.AlarmRecord; + +import java.util.List; + + +/** + *

+ * 告警记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface IAlarmRecordService extends IService { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java new file mode 100644 index 0000000..71c030f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.robot.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.robot.dao.AlarmRecordMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 告警记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +@Service +public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { + + @Override + public List selectAlarmRecordPage(Page page, QueryWrapper query) { + return this.baseMapper.selectAlarmRecordPage(page, query); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java new file mode 100644 index 0000000..2f55ae2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java @@ -0,0 +1,63 @@ +package com.casic.missiles.modular.robot.vo; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 告警记录对象VO + * + * @author lwh + * @date 2023-10-28 + */ +@Data +public class AlarmRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + private Long robotId; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + private Integer taskType; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + private Integer discernType; + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + private BigDecimal monitorVal; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + private Long taskId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (robotId != null) { + query.eq("robot_id", robotId); + } + if (taskType != null) { + query.eq("task_type", taskType); + } + if (discernType != null) { + query.eq("discern_type", discernType); + } + if (taskId != null) { + query.eq("task_id", taskId); + } + return query; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java new file mode 100644 index 0000000..66dcf70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -0,0 +1,119 @@ +package com.casic.missiles.modular.robot.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 告警记录对象 alarm_record + * + * @author lwh + * @date 2023-10-28 + */ +@Data +@TableName("alarm_record") +public class AlarmRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + @TableField("robot_id") + private Long robotId; + + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + @TableField("task_type") + private Integer taskType; + + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + @TableField("discern_type") + private Integer discernType; + + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + @TableField("monitor_val") + private BigDecimal monitorVal; + + /** + * 监测坐标x + */ + @ApiModelProperty(value = "监测坐标x", dataType = "BigDecimal") + @TableField("x") + private BigDecimal x; + + /** + * 监测坐标y + */ + @ApiModelProperty(value = "监测坐标y", dataType = "BigDecimal") + @TableField("y") + private BigDecimal y; + + /** + * 告警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "告警时间", dataType = "Date") + @TableField("alarm_time") + private Date alarmTime; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + @TableField("task_id") + private Long taskId; + + + @Override + public String toString() { + return "AlarmRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "robotId=" + robotId + + "taskType=" + taskType + + "discernType=" + discernType + + "monitorVal=" + monitorVal + + "x=" + x + + "y=" + y + + "alarmTime=" + alarmTime + + "taskId=" + taskId + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java new file mode 100644 index 0000000..e029be4 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.robot.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.robot.model.AlarmRecord; + +import java.util.List; + + +/** + *

+ * 告警记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface IAlarmRecordService extends IService { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java new file mode 100644 index 0000000..71c030f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.robot.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.robot.dao.AlarmRecordMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 告警记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +@Service +public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { + + @Override + public List selectAlarmRecordPage(Page page, QueryWrapper query) { + return this.baseMapper.selectAlarmRecordPage(page, query); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java new file mode 100644 index 0000000..2f55ae2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java @@ -0,0 +1,63 @@ +package com.casic.missiles.modular.robot.vo; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 告警记录对象VO + * + * @author lwh + * @date 2023-10-28 + */ +@Data +public class AlarmRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + private Long robotId; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + private Integer taskType; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + private Integer discernType; + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + private BigDecimal monitorVal; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + private Long taskId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (robotId != null) { + query.eq("robot_id", robotId); + } + if (taskType != null) { + query.eq("task_type", taskType); + } + if (discernType != null) { + query.eq("discern_type", discernType); + } + if (taskId != null) { + query.eq("task_id", taskId); + } + return query; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/src/main/java/com/casic/missiles/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/robot/IBaseRobotService.java deleted file mode 100644 index 2574ae0..0000000 --- a/casic-server/src/main/java/com/casic/missiles/robot/IBaseRobotService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBaseRobotService { - /** - * 机器人状态读取 - * - * @param id 机器人主键 - */ - void getRobotStatus(Long id); - - /** - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); -} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-ptz/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/pom.xml b/casic-server/pom.xml index 8c25977..8284409 100644 --- a/casic-server/pom.xml +++ b/casic-server/pom.xml @@ -40,7 +40,11 @@ ${boot.version} provided - + + com.casic + casic-knife4j-boot-starter + ${extension.version} + org.springframework.boot diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java new file mode 100644 index 0000000..0b13313 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBasePtzService.java @@ -0,0 +1,18 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBasePtzService { + + /** + * 云台控制 + * + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); + +// void data_record +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java new file mode 100644 index 0000000..cb272d2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/IBaseRobotService.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.robot; + +/** + * 机器人操作类 + */ +public interface IBaseRobotService { + /** + * 机器人状态读取 + * + * @param id 机器人主键 + */ + void getRobotStatus(Long id); + + /** + * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 + * @param vSpeed 线速度，单位m/s，正数为前进 + * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 + */ + void travel(float priority, float vSpeed, float wSpeed); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java new file mode 100644 index 0000000..60e32bb --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/AlarmRecordController.java @@ -0,0 +1,95 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.core.base.controller.BaseController; +import com.casic.missiles.core.page.PageFactory; +import com.casic.missiles.core.page.PageInfoBT; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import com.casic.missiles.modular.robot.vo.AlarmRecordVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * 告警记录Controller + * + * @author lwh + * @date 2023-10-28 + */ +@Api(tags = "告警记录") +@RestController +@RequestMapping("/robot/record") +public class AlarmRecordController extends BaseController { + + private final IAlarmRecordService alarmRecordService; + + public AlarmRecordController(IAlarmRecordService alarmRecordService) { + this.alarmRecordService = alarmRecordService; + } + + /** + * 告警记录列表 + */ + @ApiOperation("列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(AlarmRecordVO alarmRecordVO) { + QueryWrapper query = alarmRecordVO.genQuery(); + return ResponseDataDTO.success(alarmRecordService.list(query)); + } + + /** + * 告警记录分页列表 + */ + @ApiOperation("分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(AlarmRecordVO alarmRecordVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = alarmRecordVO.genQuery(); + page = alarmRecordService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + /** + * 新增告警记录 + */ + @ApiOperation("新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.save(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 修改告警记录 + */ + @ApiOperation("修改接口") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody AlarmRecord alarmRecord) { + alarmRecordService.updateById(alarmRecord); + return ResponseDataDTO.success(); + } + + /** + * 删除告警记录 + */ + @ApiOperation("删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + alarmRecordService.removeById(id); + return ResponseDataDTO.success(); + } + + /** + * 告警记录详情 + */ + @ApiOperation("详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(alarmRecordService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java new file mode 100644 index 0000000..3d50b86 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/AlarmRecordMapper.java @@ -0,0 +1,23 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import org.apache.ibatis.annotations.Param; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import java.util.List; +/** + *

+ * 告警记录 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface AlarmRecordMapper extends BaseMapper { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage( @Param("page") Page page,@Param("ew" ) QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml new file mode 100644 index 0000000..9de434a --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/AlarmRecordMapper.xml @@ -0,0 +1,56 @@ + + + + + + + + + + + + + + + + + + + + + + id + , + create_time as createTime , + update_time as updateTime , + robot_id as robotId , + task_type as taskType , + discern_type as discernType , + monitor_val as monitorVal , + x , + y , + alarm_time as alarmTime , + task_id as taskId + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java new file mode 100644 index 0000000..66dcf70 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/AlarmRecord.java @@ -0,0 +1,119 @@ +package com.casic.missiles.modular.robot.model; + +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * 告警记录对象 alarm_record + * + * @author lwh + * @date 2023-10-28 + */ +@Data +@TableName("alarm_record") +public class AlarmRecord extends Model { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + + /** + * 创建时间 + */ + @ApiModelProperty(value = "创建时间", dataType = "Date") + @TableField("create_time") + private Date createTime; + + /** + * 修改时间 + */ + @ApiModelProperty(value = "修改时间", dataType = "Date") + @TableField("update_time") + private Date updateTime; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + @TableField("robot_id") + private Long robotId; + + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + @TableField("task_type") + private Integer taskType; + + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + @TableField("discern_type") + private Integer discernType; + + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + @TableField("monitor_val") + private BigDecimal monitorVal; + + /** + * 监测坐标x + */ + @ApiModelProperty(value = "监测坐标x", dataType = "BigDecimal") + @TableField("x") + private BigDecimal x; + + /** + * 监测坐标y + */ + @ApiModelProperty(value = "监测坐标y", dataType = "BigDecimal") + @TableField("y") + private BigDecimal y; + + /** + * 告警时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @ApiModelProperty(value = "告警时间", dataType = "Date") + @TableField("alarm_time") + private Date alarmTime; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + @TableField("task_id") + private Long taskId; + + + @Override + public String toString() { + return "AlarmRecord{" + + "id=" + id + + "createTime=" + createTime + + "updateTime=" + updateTime + + "robotId=" + robotId + + "taskType=" + taskType + + "discernType=" + discernType + + "monitorVal=" + monitorVal + + "x=" + x + + "y=" + y + + "alarmTime=" + alarmTime + + "taskId=" + taskId + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java new file mode 100644 index 0000000..e029be4 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IAlarmRecordService.java @@ -0,0 +1,24 @@ +package com.casic.missiles.modular.robot.service; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.robot.model.AlarmRecord; + +import java.util.List; + + +/** + *

+ * 告警记录 服务类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +public interface IAlarmRecordService extends IService { + /** + * 告警记录 分页检索 + */ + List selectAlarmRecordPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java new file mode 100644 index 0000000..71c030f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/AlarmRecordServiceImpl.java @@ -0,0 +1,30 @@ +package com.casic.missiles.modular.robot.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.robot.dao.AlarmRecordMapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import com.casic.missiles.modular.robot.service.IAlarmRecordService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 告警记录 服务实现类 + *

+ * + * @author lwh + * @date 2023-10-28 + */ +@Service +public class AlarmRecordServiceImpl extends ServiceImpl implements IAlarmRecordService { + + @Override + public List selectAlarmRecordPage(Page page, QueryWrapper query) { + return this.baseMapper.selectAlarmRecordPage(page, query); + } + +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java new file mode 100644 index 0000000..2f55ae2 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/AlarmRecordVO.java @@ -0,0 +1,63 @@ +package com.casic.missiles.modular.robot.vo; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.robot.model.AlarmRecord; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 告警记录对象VO + * + * @author lwh + * @date 2023-10-28 + */ +@Data +public class AlarmRecordVO { + private static final long serialVersionUID = 1L; + + /** + * 机器人主键 + */ + @ApiModelProperty(value = "机器人主键", dataType = "Long") + private Long robotId; + /** + * 任务类型(1巡检任务) + */ + @ApiModelProperty(value = "任务类型(1巡检任务)", dataType = "Integer") + private Integer taskType; + /** + * 识别类型(1中子源识别) + */ + @ApiModelProperty(value = "识别类型(1中子源识别)", dataType = "Integer") + private Integer discernType; + /** + * 监测值 + */ + @ApiModelProperty(value = "监测值", dataType = "BigDecimal") + private BigDecimal monitorVal; + + /** + * 机器人任务ID + */ + @ApiModelProperty(value = "机器人任务ID", dataType = "Long") + private Long taskId; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (robotId != null) { + query.eq("robot_id", robotId); + } + if (taskType != null) { + query.eq("task_type", taskType); + } + if (discernType != null) { + query.eq("discern_type", discernType); + } + if (taskId != null) { + query.eq("task_id", taskId); + } + return query; + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java b/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java deleted file mode 100644 index 8a055a1..0000000 --- a/casic-server/src/main/java/com/casic/missiles/robot/IBasePtzService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBasePtzService { - - /** - * 云台控制 - * - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); - -// void data_record -} diff --git a/casic-server/src/main/java/com/casic/missiles/robot/IBaseRobotService.java b/casic-server/src/main/java/com/casic/missiles/robot/IBaseRobotService.java deleted file mode 100644 index 2574ae0..0000000 --- a/casic-server/src/main/java/com/casic/missiles/robot/IBaseRobotService.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.casic.missiles.robot; - -/** - * 机器人操作类 - */ -public interface IBaseRobotService { - /** - * 机器人状态读取 - * - * @param id 机器人主键 - */ - void getRobotStatus(Long id); - - /** - * @param priority 优先级0-5 遥操作:0 跟随:1 自主导航:2 其它:3 - * @param vSpeed 线速度，单位m/s，正数为前进 - * @param wSpeed 角速度，单位rad/s，正数为逆时针旋转 - */ - void travel(float priority, float vSpeed, float wSpeed); -} diff --git a/pom.xml b/pom.xml index 88e0329..ad33231 100644 --- a/pom.xml +++ b/pom.xml @@ -34,12 +34,18 @@ 3.6 2.6.11 1.0.3 + 2.0.0.alpha 3.4.5 + com.casic + casic-knife4j-boot-starter + ${extension.version} + + org.springframework.boot spring-boot-starter-web ${boot.version}