合并pr 优化sql

648540858

2023-10-27 b7ad0a907f59a2bc0455565e76c12bf152016469

 src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java

old mode 100644
new mode 100755
@@ -36,6 +36,7 @@
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.InvalidArgumentException;
import javax.sip.SipException;
@@ -466,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);
      }