diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java new file mode 100644 index 0000000..e8e638b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 机器人系统配置信息 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface RobotSystemConfigMapper extends BaseMapper { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(@Param("page") Page page, @Param("ew") QueryWrapper query); +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java new file mode 100644 index 0000000..e8e638b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 机器人系统配置信息 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface RobotSystemConfigMapper extends BaseMapper { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(@Param("page") Page page, @Param("ew") QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml new file mode 100644 index 0000000..5e115ee --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + id + ,config_key as configKey, config_value as configValue + + + a + . + id + , + a.config_key + as configKey , + a.config_value + as configValue + + + + + + and id = #{request.id} + + + and config_key = #{request.configKey} + + + + diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java new file mode 100644 index 0000000..e8e638b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 机器人系统配置信息 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface RobotSystemConfigMapper extends BaseMapper { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(@Param("page") Page page, @Param("ew") QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml new file mode 100644 index 0000000..5e115ee --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + id + ,config_key as configKey, config_value as configValue + + + a + . + id + , + a.config_key + as configKey , + a.config_value + as configValue + + + + + + and id = #{request.id} + + + and config_key = #{request.configKey} + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java new file mode 100644 index 0000000..c439728 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java @@ -0,0 +1,45 @@ +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; + + +/** + * 机器人系统配置信息对象 robot_system_config + * + * @author lwh + * @date 2023-11-22 + */ +@Data +@TableName("robot_system_config") +public class RobotSystemConfig extends Model { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + @NotEmpty(message = "配置项Key不能为空") + @Length(max = 64,message = "配置项Key最大长度为64") + @ApiModelProperty(value = "配置项Key", dataType = "String") + @TableField("config_key") + private String configKey; + + @ApiModelProperty(value = "配置值", dataType = "String") + @TableField("config_value") + private String configValue; + + @Override + public String toString() { + return "RobotSystemConfig{" + + "id=" + id + + "configKey=" + configKey + + "configValue=" + configValue + + "}"; + } +} \ No newline at end of file diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java new file mode 100644 index 0000000..e8e638b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 机器人系统配置信息 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface RobotSystemConfigMapper extends BaseMapper { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(@Param("page") Page page, @Param("ew") QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml new file mode 100644 index 0000000..5e115ee --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + id + ,config_key as configKey, config_value as configValue + + + a + . + id + , + a.config_key + as configKey , + a.config_value + as configValue + + + + + + and id = #{request.id} + + + and config_key = #{request.configKey} + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java new file mode 100644 index 0000000..c439728 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java @@ -0,0 +1,45 @@ +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; + + +/** + * 机器人系统配置信息对象 robot_system_config + * + * @author lwh + * @date 2023-11-22 + */ +@Data +@TableName("robot_system_config") +public class RobotSystemConfig extends Model { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + @NotEmpty(message = "配置项Key不能为空") + @Length(max = 64,message = "配置项Key最大长度为64") + @ApiModelProperty(value = "配置项Key", dataType = "String") + @TableField("config_key") + private String configKey; + + @ApiModelProperty(value = "配置值", dataType = "String") + @TableField("config_value") + private String configValue; + + @Override + public String toString() { + return "RobotSystemConfig{" + + "id=" + id + + "configKey=" + configKey + + "configValue=" + configValue + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java new file mode 100644 index 0000000..ad0b908 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.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.RobotSystemConfig; + +import java.util.List; + + +/** + *

+ * 机器人系统配置信息 服务类 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface IRobotSystemConfigService extends IService { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(Page page, QueryWrapper query); +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java new file mode 100644 index 0000000..e8e638b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 机器人系统配置信息 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface RobotSystemConfigMapper extends BaseMapper { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(@Param("page") Page page, @Param("ew") QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml new file mode 100644 index 0000000..5e115ee --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + id + ,config_key as configKey, config_value as configValue + + + a + . + id + , + a.config_key + as configKey , + a.config_value + as configValue + + + + + + and id = #{request.id} + + + and config_key = #{request.configKey} + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java new file mode 100644 index 0000000..c439728 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java @@ -0,0 +1,45 @@ +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; + + +/** + * 机器人系统配置信息对象 robot_system_config + * + * @author lwh + * @date 2023-11-22 + */ +@Data +@TableName("robot_system_config") +public class RobotSystemConfig extends Model { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + @NotEmpty(message = "配置项Key不能为空") + @Length(max = 64,message = "配置项Key最大长度为64") + @ApiModelProperty(value = "配置项Key", dataType = "String") + @TableField("config_key") + private String configKey; + + @ApiModelProperty(value = "配置值", dataType = "String") + @TableField("config_value") + private String configValue; + + @Override + public String toString() { + return "RobotSystemConfig{" + + "id=" + id + + "configKey=" + configKey + + "configValue=" + configValue + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java new file mode 100644 index 0000000..ad0b908 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.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.RobotSystemConfig; + +import java.util.List; + + +/** + *

+ * 机器人系统配置信息 服务类 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface IRobotSystemConfigService extends IService { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java new file mode 100644 index 0000000..a94f6ad --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java @@ -0,0 +1,28 @@ +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.RobotSystemConfigMapper; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 机器人系统配置信息 服务实现类 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +@Service +public class RobotSystemConfigServiceImpl extends ServiceImpl implements IRobotSystemConfigService { + @Override + public List selectRobotSystemConfigPage(Page page, QueryWrapper query) { + return this.baseMapper.selectRobotSystemConfigPage(page, query); + } +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java new file mode 100644 index 0000000..e8e638b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 机器人系统配置信息 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface RobotSystemConfigMapper extends BaseMapper { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(@Param("page") Page page, @Param("ew") QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml new file mode 100644 index 0000000..5e115ee --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + id + ,config_key as configKey, config_value as configValue + + + a + . + id + , + a.config_key + as configKey , + a.config_value + as configValue + + + + + + and id = #{request.id} + + + and config_key = #{request.configKey} + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java new file mode 100644 index 0000000..c439728 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java @@ -0,0 +1,45 @@ +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; + + +/** + * 机器人系统配置信息对象 robot_system_config + * + * @author lwh + * @date 2023-11-22 + */ +@Data +@TableName("robot_system_config") +public class RobotSystemConfig extends Model { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + @NotEmpty(message = "配置项Key不能为空") + @Length(max = 64,message = "配置项Key最大长度为64") + @ApiModelProperty(value = "配置项Key", dataType = "String") + @TableField("config_key") + private String configKey; + + @ApiModelProperty(value = "配置值", dataType = "String") + @TableField("config_value") + private String configValue; + + @Override + public String toString() { + return "RobotSystemConfig{" + + "id=" + id + + "configKey=" + configKey + + "configValue=" + configValue + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java new file mode 100644 index 0000000..ad0b908 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.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.RobotSystemConfig; + +import java.util.List; + + +/** + *

+ * 机器人系统配置信息 服务类 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface IRobotSystemConfigService extends IService { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java new file mode 100644 index 0000000..a94f6ad --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java @@ -0,0 +1,28 @@ +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.RobotSystemConfigMapper; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 机器人系统配置信息 服务实现类 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +@Service +public class RobotSystemConfigServiceImpl extends ServiceImpl implements IRobotSystemConfigService { + @Override + public List selectRobotSystemConfigPage(Page page, QueryWrapper query) { + return this.baseMapper.selectRobotSystemConfigPage(page, query); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/IdsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/IdsDTO.java new file mode 100644 index 0000000..bed105f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/IdsDTO.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.robot.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * @Description: for batch use + * @Author: wangpeng + * @Date: 2022/11/26 9:51 + */ +@Data +public class IdsDTO { + @NotEmpty(message = "主键id不能为空") + @ApiModelProperty(value = "主键id列表", dataType = "List", required = true) + private List ids; +} diff --git a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java index 6c9c24a..70e6a4c 100644 --- a/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java +++ b/casic-ptz/src/main/java/com/casic/missiles/modular/ptz/service/HCNetSDK.java @@ -35,8 +35,7 @@ String path = dllPath.substring(1).replace("/", File.separator)+"config"+File.separator+"hiklib"+File.separator+"HCNetSDK.dll"; //String path = "D:\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\CH-HCNetSDKV6.1.6.3_build20200925_Win64\\Demo示例\\4- Java 开发示例\\1-ClientDemo\\ClientDemo-NetBeansPro\\lib\\HCNetSDK.dll"; - HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path, - HCNetSDK.class); + HCNetSDK INSTANCE = (HCNetSDK) Native.loadLibrary(path,HCNetSDK.class); /***宏定义***/ //常量 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 index f7ca84c..7e3c399 100644 --- 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 @@ -5,6 +5,7 @@ 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.form.IdForms; import com.casic.missiles.model.response.dto.ResponseDataDTO; import com.casic.missiles.modular.robot.model.AlarmRecord; import com.casic.missiles.modular.robot.service.IAlarmRecordService; @@ -78,13 +79,20 @@ /** * 删除告警记录 */ - @ApiOperation(value = "删除接口", hidden = true) + @ApiOperation(value = "删除接口") @GetMapping(value = "/delete") public ResponseDataDTO delete(String id) { alarmRecordService.removeById(id); return ResponseDataDTO.success(); } + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms idForms) { + alarmRecordService.removeByIds(idForms.getIds()); + return ResponseDataDTO.success(); + } + /** * 告警记录详情 */ @@ -93,4 +101,4 @@ public ResponseDataDTO detail(String id) { return ResponseDataDTO.success(alarmRecordService.getById(id)); } -} +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java new file mode 100644 index 0000000..3026e28 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/controller/RobotSystemConfigController.java @@ -0,0 +1,88 @@ +package com.casic.missiles.modular.robot.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +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.form.IdForms; +import com.casic.missiles.model.response.dto.ResponseDataDTO; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import com.casic.missiles.modular.robot.vo.RobotSystemConfigVO; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.web.bind.annotation.*; + +import javax.validation.Valid; +import java.util.List; + +/** + * 机器人系统配置信息Controller + * + * @author lwh + * @date 2023-11-22 + */ +@Api(tags = "机器人系统配置信息") +@RestController +@RequestMapping("/robot/config") +public class RobotSystemConfigController extends BaseController { + + private final IRobotSystemConfigService robotSystemConfigService; + + public RobotSystemConfigController(IRobotSystemConfigService robotSystemConfigService) { + this.robotSystemConfigService = robotSystemConfigService; + } + + @ApiOperation(value = "列表查询") + @GetMapping(value = "/list") + public ResponseDataDTO> list(RobotSystemConfigVO robotSystemConfigVO) { + QueryWrapper query = robotSystemConfigVO.genQuery(); + return ResponseDataDTO.success(robotSystemConfigService.list(query)); + } + + @ApiOperation(value = "分页查询") + @GetMapping(value = "/listPage") + public ResponseDataDTO> listPage(RobotSystemConfigVO robotSystemConfigVO) { + Page page = PageFactory.defaultPage(); + QueryWrapper query = robotSystemConfigVO.genQuery(); + page = robotSystemConfigService.page(page, query); + return ResponseDataDTO.success(super.packForBT(page)); + } + + + @ApiOperation(value = "新增接口") + @PostMapping(value = "/add") + public ResponseDataDTO add(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.save(robotSystemConfig); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "根据配置键进行修改") + @PostMapping(value = "/update") + public ResponseDataDTO update(@RequestBody @Valid RobotSystemConfig robotSystemConfig) { + robotSystemConfigService.update(robotSystemConfig, new LambdaQueryWrapper().eq(RobotSystemConfig::getConfigKey, robotSystemConfig)); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "删除接口") + @GetMapping(value = "/delete") + public ResponseDataDTO delete(String id) { + robotSystemConfigService.removeById(id); + return ResponseDataDTO.success(); + } + + @ApiOperation("批量删除") + @PostMapping("/batchDelete") + public ResponseDataDTO batchDelete(@RequestBody IdForms ids) { + robotSystemConfigService.removeByIds(ids.getIds()); + return ResponseDataDTO.success(); + } + + @ApiOperation(value = "详情查询") + @GetMapping(value = "/detail") + public ResponseDataDTO detail(String id) { + return ResponseDataDTO.success(robotSystemConfigService.getById(id)); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java new file mode 100644 index 0000000..e8e638b --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/RobotSystemConfigMapper.java @@ -0,0 +1,25 @@ +package com.casic.missiles.modular.robot.dao; + + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + *

+ * 机器人系统配置信息 Mapper 接口 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface RobotSystemConfigMapper extends BaseMapper { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(@Param("page") Page page, @Param("ew") QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml new file mode 100644 index 0000000..5e115ee --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/dao/mapping/RobotSystemConfigMapper.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + id + ,config_key as configKey, config_value as configValue + + + a + . + id + , + a.config_key + as configKey , + a.config_value + as configValue + + + + + + and id = #{request.id} + + + and config_key = #{request.configKey} + + + + diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java new file mode 100644 index 0000000..c439728 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/model/RobotSystemConfig.java @@ -0,0 +1,45 @@ +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 io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import org.hibernate.validator.constraints.Length; + +import javax.validation.constraints.NotEmpty; + + +/** + * 机器人系统配置信息对象 robot_system_config + * + * @author lwh + * @date 2023-11-22 + */ +@Data +@TableName("robot_system_config") +public class RobotSystemConfig extends Model { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "主键", dataType = "Long") + @TableField("id") + private Long id; + @NotEmpty(message = "配置项Key不能为空") + @Length(max = 64,message = "配置项Key最大长度为64") + @ApiModelProperty(value = "配置项Key", dataType = "String") + @TableField("config_key") + private String configKey; + + @ApiModelProperty(value = "配置值", dataType = "String") + @TableField("config_value") + private String configValue; + + @Override + public String toString() { + return "RobotSystemConfig{" + + "id=" + id + + "configKey=" + configKey + + "configValue=" + configValue + + "}"; + } +} \ No newline at end of file diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.java new file mode 100644 index 0000000..ad0b908 --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/IRobotSystemConfigService.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.RobotSystemConfig; + +import java.util.List; + + +/** + *

+ * 机器人系统配置信息 服务类 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +public interface IRobotSystemConfigService extends IService { + /** + * 机器人系统配置信息 分页检索 + */ + List selectRobotSystemConfigPage(Page page, QueryWrapper query); +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java new file mode 100644 index 0000000..a94f6ad --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/service/impl/RobotSystemConfigServiceImpl.java @@ -0,0 +1,28 @@ +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.RobotSystemConfigMapper; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import com.casic.missiles.modular.robot.service.IRobotSystemConfigService; +import org.springframework.stereotype.Service; + +import java.util.List; + + +/** + *

+ * 机器人系统配置信息 服务实现类 + *

+ * + * @author lwh + * @date 2023-11-22 + */ +@Service +public class RobotSystemConfigServiceImpl extends ServiceImpl implements IRobotSystemConfigService { + @Override + public List selectRobotSystemConfigPage(Page page, QueryWrapper query) { + return this.baseMapper.selectRobotSystemConfigPage(page, query); + } +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/IdsDTO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/IdsDTO.java new file mode 100644 index 0000000..bed105f --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/IdsDTO.java @@ -0,0 +1,19 @@ +package com.casic.missiles.modular.robot.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotEmpty; +import java.util.List; + +/** + * @Description: for batch use + * @Author: wangpeng + * @Date: 2022/11/26 9:51 + */ +@Data +public class IdsDTO { + @NotEmpty(message = "主键id不能为空") + @ApiModelProperty(value = "主键id列表", dataType = "List", required = true) + private List ids; +} diff --git a/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/RobotSystemConfigVO.java b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/RobotSystemConfigVO.java new file mode 100644 index 0000000..08e275e --- /dev/null +++ b/casic-server/src/main/java/com/casic/missiles/modular/robot/vo/RobotSystemConfigVO.java @@ -0,0 +1,37 @@ +package com.casic.missiles.modular.robot.vo; + +import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.casic.missiles.modular.robot.model.RobotSystemConfig; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + + +/** + * 机器人系统配置信息对象VO + * + * @author lwh + * @date 2023-11-22 + */ +@Data +public class RobotSystemConfigVO { + private static final long serialVersionUID = 1L; + + + @ApiModelProperty(value = "主键", dataType = "Long") + private Long id; + + @ApiModelProperty(value = "系统配置主键", dataType = "String") + private String configKey; + + public QueryWrapper genQuery() { + QueryWrapper query = new QueryWrapper<>(); + if (id != null) { + query.eq("id", id); + } + if (StrUtil.isNotEmpty(configKey)) { + query.eq("config_key", configKey); + } + return query; + } +}