diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java index 80ee948..660952b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java @@ -11,6 +11,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmAIDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmStatisticsDTO; @@ -159,4 +160,17 @@ return ResponseData.success(alarmRecordService.dateStatistics(alarmStatisticsDTO)); } + /** + * 接收Ai算法报警记录 + */ + @RequestMapping(value = "/getAIRecords") + @ResponseBody + public Object getAIRecords(@RequestBody @Valid AlarmAIDTO alarmAIDTO, BindingResult bindingResult) { + System.out.println(alarmAIDTO.getAlarmTime()+"---->"+alarmAIDTO.getAlarmType()+"---->"+alarmAIDTO.getMonitorId()); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(alarmRecordService.getAIRecords(alarmAIDTO)); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java index 80ee948..660952b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java @@ -11,6 +11,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmAIDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmStatisticsDTO; @@ -159,4 +160,17 @@ return ResponseData.success(alarmRecordService.dateStatistics(alarmStatisticsDTO)); } + /** + * 接收Ai算法报警记录 + */ + @RequestMapping(value = "/getAIRecords") + @ResponseBody + public Object getAIRecords(@RequestBody @Valid AlarmAIDTO alarmAIDTO, BindingResult bindingResult) { + System.out.println(alarmAIDTO.getAlarmTime()+"---->"+alarmAIDTO.getAlarmType()+"---->"+alarmAIDTO.getMonitorId()); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(alarmRecordService.getAIRecords(alarmAIDTO)); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java new file mode 100644 index 0000000..8de0642 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author ZT + * @date 2023-04-21 + */ +@Data +public class AlarmAIDTO { + + @NotNull + private String monitorId; + @NotNull + private String alarmType; + @NotNull + private String alarmTime; +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java index 80ee948..660952b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java @@ -11,6 +11,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmAIDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmStatisticsDTO; @@ -159,4 +160,17 @@ return ResponseData.success(alarmRecordService.dateStatistics(alarmStatisticsDTO)); } + /** + * 接收Ai算法报警记录 + */ + @RequestMapping(value = "/getAIRecords") + @ResponseBody + public Object getAIRecords(@RequestBody @Valid AlarmAIDTO alarmAIDTO, BindingResult bindingResult) { + System.out.println(alarmAIDTO.getAlarmTime()+"---->"+alarmAIDTO.getAlarmType()+"---->"+alarmAIDTO.getMonitorId()); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(alarmRecordService.getAIRecords(alarmAIDTO)); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java new file mode 100644 index 0000000..8de0642 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author ZT + * @date 2023-04-21 + */ +@Data +public class AlarmAIDTO { + + @NotNull + private String monitorId; + @NotNull + private String alarmType; + @NotNull + private String alarmTime; +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 8e473ed..e91d017 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -35,4 +35,6 @@ List dateStatistics(AlarmStatisticsDTO alarmStatisticsDTO); + boolean getAIRecords(AlarmAIDTO alarmAIDTO); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java index 80ee948..660952b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java @@ -11,6 +11,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmAIDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmStatisticsDTO; @@ -159,4 +160,17 @@ return ResponseData.success(alarmRecordService.dateStatistics(alarmStatisticsDTO)); } + /** + * 接收Ai算法报警记录 + */ + @RequestMapping(value = "/getAIRecords") + @ResponseBody + public Object getAIRecords(@RequestBody @Valid AlarmAIDTO alarmAIDTO, BindingResult bindingResult) { + System.out.println(alarmAIDTO.getAlarmTime()+"---->"+alarmAIDTO.getAlarmType()+"---->"+alarmAIDTO.getMonitorId()); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(alarmRecordService.getAIRecords(alarmAIDTO)); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java new file mode 100644 index 0000000..8de0642 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author ZT + * @date 2023-04-21 + */ +@Data +public class AlarmAIDTO { + + @NotNull + private String monitorId; + @NotNull + private String alarmType; + @NotNull + private String alarmTime; +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 8e473ed..e91d017 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -35,4 +35,6 @@ List dateStatistics(AlarmStatisticsDTO alarmStatisticsDTO); + boolean getAIRecords(AlarmAIDTO alarmAIDTO); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index 248eb7b..29be7f3 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.enums.StatusEnum; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.AlarmRecord; import com.casic.missiles.modular.system.dao.AlarmRecordMapper; @@ -144,6 +145,17 @@ return this.doAlarmTrendStatisticsByDay(dateStatisticMaps, alarmStatisticsDTO); } + @Override + public boolean getAIRecords(AlarmAIDTO alarmAIDTO) { + AlarmRecord alarmRecord = new AlarmRecord(); + //toDo:摄像头与云台绑定关系 + alarmRecord.setMonitorId(Long.valueOf(alarmAIDTO.getMonitorId())); + alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON); + alarmRecord.setAlarmType(alarmAIDTO.getAlarmType()); + alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime())); + return this.save(alarmRecord); + } + /** * 日期趋势的报警统计 * 1、转换dateStatisticMaps为map集合作为日期遍历做准备 diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java index 80ee948..660952b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java @@ -11,6 +11,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmAIDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmStatisticsDTO; @@ -159,4 +160,17 @@ return ResponseData.success(alarmRecordService.dateStatistics(alarmStatisticsDTO)); } + /** + * 接收Ai算法报警记录 + */ + @RequestMapping(value = "/getAIRecords") + @ResponseBody + public Object getAIRecords(@RequestBody @Valid AlarmAIDTO alarmAIDTO, BindingResult bindingResult) { + System.out.println(alarmAIDTO.getAlarmTime()+"---->"+alarmAIDTO.getAlarmType()+"---->"+alarmAIDTO.getMonitorId()); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(alarmRecordService.getAIRecords(alarmAIDTO)); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java new file mode 100644 index 0000000..8de0642 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author ZT + * @date 2023-04-21 + */ +@Data +public class AlarmAIDTO { + + @NotNull + private String monitorId; + @NotNull + private String alarmType; + @NotNull + private String alarmTime; +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 8e473ed..e91d017 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -35,4 +35,6 @@ List dateStatistics(AlarmStatisticsDTO alarmStatisticsDTO); + boolean getAIRecords(AlarmAIDTO alarmAIDTO); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index 248eb7b..29be7f3 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.enums.StatusEnum; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.AlarmRecord; import com.casic.missiles.modular.system.dao.AlarmRecordMapper; @@ -144,6 +145,17 @@ return this.doAlarmTrendStatisticsByDay(dateStatisticMaps, alarmStatisticsDTO); } + @Override + public boolean getAIRecords(AlarmAIDTO alarmAIDTO) { + AlarmRecord alarmRecord = new AlarmRecord(); + //toDo:摄像头与云台绑定关系 + alarmRecord.setMonitorId(Long.valueOf(alarmAIDTO.getMonitorId())); + alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON); + alarmRecord.setAlarmType(alarmAIDTO.getAlarmType()); + alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime())); + return this.save(alarmRecord); + } + /** * 日期趋势的报警统计 * 1、转换dateStatisticMaps为map集合作为日期遍历做准备 diff --git a/casic-web/pom.xml b/casic-web/pom.xml index ae40a12..eb2bd80 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web 2.0.0 - jar + war casic-web casic web启动入口 diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java index 80ee948..660952b 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java @@ -11,6 +11,7 @@ import com.casic.missiles.exception.BusinessException; import com.casic.missiles.model.exception.enums.CoreExceptionEnum; import com.casic.missiles.model.response.ResponseData; +import com.casic.missiles.modular.system.dto.AlarmAIDTO; import com.casic.missiles.modular.system.dto.AlarmCancelRequest; import com.casic.missiles.modular.system.dto.AlarmRecordRequest; import com.casic.missiles.modular.system.dto.AlarmStatisticsDTO; @@ -159,4 +160,17 @@ return ResponseData.success(alarmRecordService.dateStatistics(alarmStatisticsDTO)); } + /** + * 接收Ai算法报警记录 + */ + @RequestMapping(value = "/getAIRecords") + @ResponseBody + public Object getAIRecords(@RequestBody @Valid AlarmAIDTO alarmAIDTO, BindingResult bindingResult) { + System.out.println(alarmAIDTO.getAlarmTime()+"---->"+alarmAIDTO.getAlarmType()+"---->"+alarmAIDTO.getMonitorId()); + Assert.isFalse(bindingResult.hasErrors(), () -> { + throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage()); + }); + return ResponseData.success(alarmRecordService.getAIRecords(alarmAIDTO)); + } + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java new file mode 100644 index 0000000..8de0642 --- /dev/null +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/dto/AlarmAIDTO.java @@ -0,0 +1,20 @@ +package com.casic.missiles.modular.system.dto; + +import lombok.Data; + +import javax.validation.constraints.NotNull; + +/** + * @author ZT + * @date 2023-04-21 + */ +@Data +public class AlarmAIDTO { + + @NotNull + private String monitorId; + @NotNull + private String alarmType; + @NotNull + private String alarmTime; +} diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java index 8e473ed..e91d017 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/IAlarmRecordService.java @@ -35,4 +35,6 @@ List dateStatistics(AlarmStatisticsDTO alarmStatisticsDTO); + boolean getAIRecords(AlarmAIDTO alarmAIDTO); + } diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java index 248eb7b..29be7f3 100644 --- a/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java +++ b/casic-data/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmRecordServiceImpl.java @@ -8,6 +8,7 @@ import com.casic.missiles.core.application.service.AbstractDictService; import com.casic.missiles.core.datascope.DataScope; import com.casic.missiles.core.model.auth.AuthUser; +import com.casic.missiles.enums.StatusEnum; import com.casic.missiles.modular.system.dto.*; import com.casic.missiles.modular.system.model.AlarmRecord; import com.casic.missiles.modular.system.dao.AlarmRecordMapper; @@ -144,6 +145,17 @@ return this.doAlarmTrendStatisticsByDay(dateStatisticMaps, alarmStatisticsDTO); } + @Override + public boolean getAIRecords(AlarmAIDTO alarmAIDTO) { + AlarmRecord alarmRecord = new AlarmRecord(); + //toDo:摄像头与云台绑定关系 + alarmRecord.setMonitorId(Long.valueOf(alarmAIDTO.getMonitorId())); + alarmRecord.setAlarmStatus(StatusEnum.ALARM_ON); + alarmRecord.setAlarmType(alarmAIDTO.getAlarmType()); + alarmRecord.setAlarmTime(DateUtil.parseDateTime(alarmAIDTO.getAlarmTime())); + return this.save(alarmRecord); + } + /** * 日期趋势的报警统计 * 1、转换dateStatisticMaps为map集合作为日期遍历做准备 diff --git a/casic-web/pom.xml b/casic-web/pom.xml index ae40a12..eb2bd80 100644 --- a/casic-web/pom.xml +++ b/casic-web/pom.xml @@ -10,7 +10,7 @@ casic-web 2.0.0 - jar + war casic-web casic web启动入口 diff --git a/casic-web/src/main/resources/config/application-dev.yml b/casic-web/src/main/resources/config/application-dev.yml index e46b460..7afb0f6 100644 --- a/casic-web/src/main/resources/config/application-dev.yml +++ b/casic-web/src/main/resources/config/application-dev.yml @@ -21,7 +21,7 @@ # redisValueSerializer: org.springframework.data.redis.serializer.JdkSerializationRedisSerializer casic: #kaptcha-open: false #是否开启登录时验证码 (true/false) - no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken + no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/alarm/getAIRecords #flowable数据源和多数据源配置 db: init: