queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("ALARM_CODE",alarmRecordRequest.getAlarmCode());
+ return ReturnUtil.success(iAlarmRecordService.list(queryWrapper));
+ }
}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
index 6648e88..d97a113 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/BusHoleController.java
@@ -1,9 +1,23 @@
package com.casic.missiles.modular.system.controller;
+import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.core.page.PageFactory;
+import com.casic.missiles.modular.system.dto.ReturnDTO;
+import com.casic.missiles.modular.system.entity.BusHole;
+import com.casic.missiles.modular.system.enums.BusinessExceptionEnum;
+import com.casic.missiles.modular.system.exception.BusinessException;
+import com.casic.missiles.modular.system.service.IBusHoleService;
+import com.casic.missiles.modular.system.util.ReturnUtil;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Objects;
/**
*
@@ -16,7 +30,33 @@
@Api(tags = "地下空洞基本信息接口")
@RestController
@RequestMapping("/system/busHole")
-public class BusHoleController {
+public class BusHoleController extends ExportController {
+ @Autowired
+ private IBusHoleService iBusHoleService;
+ @ApiOperation("地下空洞基本信息列表")
+ @PostMapping("/listPage")
+ public ReturnDTO listPage() {
+ QueryWrapper queryWrapper = new QueryWrapper<>();
+ Page page = PageFactory.defaultPage();
+ return ReturnUtil.success(super.packForBT(iBusHoleService.page(page, queryWrapper)));
+ }
+
+ @ApiOperation("新建地下空洞基本信息")
+ @PostMapping("/add")
+ @ResponseBody
+ public Object add(@RequestBody BusHole busHole) {
+ return ReturnUtil.success(iBusHoleService.save(busHole));
+ }
+
+ @ApiOperation("编辑地下空洞基本信息")
+ @PostMapping("/edit")
+ @ResponseBody
+ public Object edit(@RequestBody BusHole busHole) {
+ Assert.isFalse(Objects.isNull(busHole.getId()), () -> {
+ throw new BusinessException(BusinessExceptionEnum.ID_NULL);
+ });
+ return ReturnUtil.success(iBusHoleService.updateById(busHole));
+ }
}
diff --git a/casic-server/pom.xml b/casic-server/pom.xml
index d461e7b..d45d73d 100644
--- a/casic-server/pom.xml
+++ b/casic-server/pom.xml
@@ -77,6 +77,12 @@
1.1.3
+
+ net.bramp.ffmpeg
+ ffmpeg
+ 0.7.0
+
+
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/config/ThreadConfig.java b/casic-server/src/main/java/com/casic/missiles/modular/system/config/ThreadConfig.java
new file mode 100644
index 0000000..84fad15
--- /dev/null
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/config/ThreadConfig.java
@@ -0,0 +1,26 @@
+package com.casic.missiles.modular.system.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+@Configuration
+public class ThreadConfig {
+ @Bean
+ public ThreadPoolTaskExecutor executor(){
+ ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+ //配置核心线程数
+ executor.setCorePoolSize(15);
+ //配置最大线程数
+ executor.setMaxPoolSize(30);
+ //配置队列大小
+ executor.setQueueCapacity(1000);
+ //线程的名称前缀
+ executor.setThreadNamePrefix("Executor-");
+ //等待所有任务结束后再关闭线程池
+ executor.setWaitForTasksToCompleteOnShutdown(true);
+ //执行初始化
+ executor.initialize();
+ return executor;
+ }
+}
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
index c5a81a1..bdc929a 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/AlarmRecordController.java
@@ -2,6 +2,7 @@
import cn.hutool.core.lang.Assert;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.casic.missiles.core.base.controller.ExportController;
import com.casic.missiles.core.page.PageFactory;
@@ -50,9 +51,12 @@
private IAlarmRecordService iAlarmRecordService;
@Value("${casic.file.uploadPath}")
private String uploadPath;
+ @Value("${casic.ffmpeg.path}")
+ private String ffmpegPath;
@ApiOperation("算法接口")
@PostMapping("/getrecognitionRecords")
+ @ResponseBody
public ReturnDTO> getrecognitionRecords(@RequestBody RecognitionRequest recognitionRequest) throws ExecutionException, InterruptedException {
return ReturnUtil.success(iAnalysisRecognitionService.saveRecognition(recognitionRequest));
@@ -60,10 +64,11 @@
@ApiOperation("保存图片")
@PostMapping("/savePictures")
+ @ResponseBody
public ReturnDTO