From b7ad0a907f59a2bc0455565e76c12bf152016469 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 27 十月 2023 18:06:46 +0800
Subject: [PATCH] 合并pr 优化sql
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 90 ++++++++++++++++++++++++++++-----------------
1 files changed, 56 insertions(+), 34 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
old mode 100644
new mode 100755
index 37fb98e..1986b65
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -1,11 +1,10 @@
package com.genersoft.iot.vmp.vmanager.gb28181.device;
-import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson2.JSONObject;
import com.genersoft.iot.vmp.conf.DynamicTask;
import com.genersoft.iot.vmp.conf.exception.ControllerException;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.gb28181.bean.SubscribeHolder;
import com.genersoft.iot.vmp.gb28181.bean.SyncStatus;
import com.genersoft.iot.vmp.gb28181.task.ISubscribeTask;
import com.genersoft.iot.vmp.gb28181.task.impl.CatalogSubscribeTask;
@@ -15,6 +14,7 @@
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.service.IDeviceChannelService;
import com.genersoft.iot.vmp.service.IDeviceService;
+import com.genersoft.iot.vmp.service.IInviteStreamService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.genersoft.iot.vmp.vmanager.bean.BaseTree;
@@ -25,7 +25,7 @@
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.commons.compress.utils.IOUtils;
-import org.apache.http.HttpResponse;
+import org.apache.ibatis.annotations.Options;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -33,22 +33,23 @@
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.util.ObjectUtils;
-import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
-import javax.sip.DialogState;
import javax.sip.InvalidArgumentException;
import javax.sip.SipException;
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.nio.file.Files;
import java.text.ParseException;
import java.util.*;
@Tag(name = "鍥芥爣璁惧鏌ヨ", description = "鍥芥爣璁惧鏌ヨ")
@SuppressWarnings("rawtypes")
-@CrossOrigin
+
@RestController
@RequestMapping("/api/device/query")
public class DeviceQuery {
@@ -63,6 +64,9 @@
@Autowired
private IRedisCatchStorage redisCatchStorage;
+
+ @Autowired
+ private IInviteStreamService inviteStreamService;
@Autowired
private SIPCommander cmder;
@@ -75,9 +79,6 @@
@Autowired
private DynamicTask dynamicTask;
-
- @Autowired
- private SubscribeHolder subscribeHolder;
/**
* 浣跨敤ID鏌ヨ鍥芥爣璁惧
@@ -102,9 +103,11 @@
@Parameter(name = "page", description = "褰撳墠椤�", required = true)
@Parameter(name = "count", description = "姣忛〉鏌ヨ鏁伴噺", required = true)
@GetMapping("/devices")
+ @Options()
public PageInfo<Device> devices(int page, int count){
-
- return storager.queryVideoDeviceList(page, count);
+// if (page == null) page = 0;
+// if (count == null) count = 20;
+ return storager.queryVideoDeviceList(page, count,null);
}
/**
@@ -128,7 +131,7 @@
@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
@Parameter(name = "catalogUnderDevice", description = "鏄惁鐩村睘涓庤澶囩殑鐩綍")
- public PageInfo channels(@PathVariable String deviceId,
+ public PageInfo<DeviceChannel> channels(@PathVariable String deviceId,
int page, int count,
@RequestParam(required = false) String query,
@RequestParam(required = false) Boolean online,
@@ -148,7 +151,7 @@
*/
@Operation(summary = "鍚屾璁惧閫氶亾")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
- @PostMapping("/devices/{deviceId}/sync")
+ @GetMapping("/devices/{deviceId}/sync")
public WVPResult<SyncStatus> devicesSync(@PathVariable String deviceId){
if (logger.isDebugEnabled()) {
@@ -184,9 +187,9 @@
}
// 娓呴櫎redis璁板綍
- boolean isSuccess = storager.delete(deviceId);
+ boolean isSuccess = deviceService.delete(deviceId);
if (isSuccess) {
- redisCatchStorage.clearCatchByDeviceId(deviceId);
+ inviteStreamService.clearInviteInfo(deviceId);
// 鍋滄姝よ澶囩殑璁㈤槄鏇存柊
Set<String> allKeys = dynamicTask.getAllKeys();
for (String key : allKeys) {
@@ -228,7 +231,7 @@
@Parameter(name = "online", description = "鏄惁鍦ㄧ嚎")
@Parameter(name = "channelType", description = "璁惧/瀛愮洰褰�-> false/true")
@GetMapping("/sub_channels/{deviceId}/{channelId}/channels")
- public ResponseEntity<PageInfo> subChannels(@PathVariable String deviceId,
+ public PageInfo<DeviceChannel> subChannels(@PathVariable String deviceId,
@PathVariable String channelId,
int page,
int count,
@@ -239,11 +242,10 @@
DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
if (deviceChannel == null) {
PageInfo<DeviceChannel> deviceChannelPageResult = new PageInfo<>();
- return new ResponseEntity<>(deviceChannelPageResult,HttpStatus.OK);
+ return deviceChannelPageResult;
}
- PageInfo pageResult = storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
- return new ResponseEntity<>(pageResult,HttpStatus.OK);
+ return storager.querySubChannels(deviceId, channelId, query, channelType, online, page, count);
}
/**
@@ -256,9 +258,8 @@
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channel", description = "閫氶亾淇℃伅", required = true)
@PostMapping("/channel/update/{deviceId}")
- public ResponseEntity updateChannel(@PathVariable String deviceId,DeviceChannel channel){
+ public void updateChannel(@PathVariable String deviceId,DeviceChannel channel){
deviceChannelService.updateChannel(deviceId, channel);
- return new ResponseEntity<>(null,HttpStatus.OK);
}
/**
@@ -272,11 +273,32 @@
@Parameter(name = "streamMode", description = "鏁版嵁娴佷紶杈撴ā寮�, 鍙栧�硷細" +
"UDP锛坲dp浼犺緭锛夛紝TCP-ACTIVE锛坱cp涓诲姩妯″紡,鏆備笉鏀寔锛夛紝TCP-PASSIVE锛坱cp琚姩妯″紡锛�", required = true)
@PostMapping("/transport/{deviceId}/{streamMode}")
- public ResponseEntity updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
- Device device = storager.queryVideoDevice(deviceId);
+ public void updateTransport(@PathVariable String deviceId, @PathVariable String streamMode){
+ Device device = deviceService.getDevice(deviceId);
device.setStreamMode(streamMode);
- deviceService.updateDevice(device);
- return new ResponseEntity<>(null,HttpStatus.OK);
+ deviceService.updateCustomDevice(device);
+ }
+
+ /**
+ * 娣诲姞璁惧淇℃伅
+ * @param device 璁惧淇℃伅
+ * @return
+ */
+ @Operation(summary = "娣诲姞璁惧淇℃伅")
+ @Parameter(name = "device", description = "璁惧", required = true)
+ @PostMapping("/device/add/")
+ public void addDevice(Device device){
+
+ if (device == null || device.getDeviceId() == null) {
+ throw new ControllerException(ErrorCode.ERROR400);
+ }
+
+ // 鏌ョ湅deviceId鏄惁瀛樺湪
+ boolean exist = deviceService.isExist(device.getDeviceId());
+ if (exist) {
+ throw new ControllerException(ErrorCode.ERROR100.getCode(), "璁惧缂栧彿宸插瓨鍦�");
+ }
+ deviceService.addDevice(device);
}
/**
@@ -287,15 +309,11 @@
@Operation(summary = "鏇存柊璁惧淇℃伅")
@Parameter(name = "device", description = "璁惧", required = true)
@PostMapping("/device/update/")
- public ResponseEntity<WVPResult<String>> updateDevice(Device device){
+ public void updateDevice(Device device){
if (device != null && device.getDeviceId() != null) {
- deviceService.updateDevice(device);
+ deviceService.updateCustomDevice(device);
}
- WVPResult<String> result = new WVPResult<>();
- result.setCode(0);
- result.setMsg("success");
- return new ResponseEntity<>(result,HttpStatus.OK);
}
/**
@@ -449,12 +467,16 @@
@Operation(summary = "璇锋眰鎴浘")
@Parameter(name = "deviceId", description = "璁惧鍥芥爣缂栧彿", required = true)
@Parameter(name = "channelId", description = "閫氶亾鍥芥爣缂栧彿", required = true)
- public void getSnap(HttpServletResponse resp, @PathVariable String deviceId, @PathVariable String channelId) {
+ @Parameter(name = "mark", description = "鏍囪瘑", required = false)
+ public void getSnap(HttpServletResponse resp, @PathVariable String deviceId, @PathVariable String channelId, @RequestParam(required = false) String mark) {
try {
- final InputStream in = Files.newInputStream(new File("snap" + File.separator + deviceId + "_" + channelId + ".jpg").toPath());
+ final InputStream in = Files.newInputStream(new File("snap" + File.separator + deviceId + "_" + channelId + (mark == null? ".jpg": ("_" + mark + ".jpg"))).toPath());
resp.setContentType(MediaType.IMAGE_PNG_VALUE);
+ ServletOutputStream outputStream = resp.getOutputStream();
IOUtils.copy(in, resp.getOutputStream());
+ in.close();
+ outputStream.close();
} catch (IOException e) {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND);
}
--
Gitblit v1.8.0