From 3e70048a2aae588bbd376b0d093ea4564b04120f Mon Sep 17 00:00:00 2001
From: wuweida <2918581207@qq.com>
Date: Thu, 19 May 2022 11:19:09 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../monitormanage/controller/Controller.java       | 14 +++++++-------
 .../monitormanage/controller/EventController.java  |  3 ++-
 .../monitormanage/mapper/CameraChannelMapper.java  |  3 +--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/hisense/monitormanage/controller/Controller.java b/src/main/java/com/hisense/monitormanage/controller/Controller.java
index 29bdc66..7bbeb89 100644
--- a/src/main/java/com/hisense/monitormanage/controller/Controller.java
+++ b/src/main/java/com/hisense/monitormanage/controller/Controller.java
@@ -1,6 +1,5 @@
 package com.hisense.monitormanage.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.hisense.monitormanage.dto.*;
 import com.hisense.monitormanage.entity.*;
 import com.hisense.monitormanage.mapper.*;
@@ -134,7 +133,7 @@ public class Controller {
      * @return
      */
     @GetMapping("selectByChannelCode")
-    @ApiOperation("根据channelCode查询摄像头详细信息")
+    @ApiOperation("根据摄像头编号查询摄像头详细信息")
     @ApiImplicitParam(name = "channelCode",value = "摄像头标识",required = true,dataType = "String")
     public Result selectByChannelCode(String channelCode){
 
@@ -170,7 +169,7 @@ public class Controller {
      * @return
      */
     @GetMapping("selectByParentId")
-    @ApiOperation("根据parentId和checkStatus查询摄像头")
+    @ApiOperation("根据摄像头的组织Id和异常状态查询摄像头")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "parentId",value = "摄像头的组织Id",required = true,dataType = "String"),
             @ApiImplicitParam(name = "checkStatus",value = "异常状态 1正常,0异常",required = true,dataType = "String")
@@ -231,14 +230,13 @@ public class Controller {
 
     /**
      * 查询所有标签
-     * @param label
      * @return
      */
     @GetMapping("selectAllLabel")
     @ApiOperation("查询所有标签")
-    public Result selectAllLabel(Label label ){
+    public Result selectAllLabel(){
 
-        List<Label> labels = cameraChannelMapper.selectAllLabel(label);
+        List<Label> labels = cameraChannelMapper.selectAllLabel();
 
         Result success = Result.success(labels);
 
@@ -250,6 +248,8 @@ public class Controller {
      * @return
      */
     @GetMapping("selectByLabelName")
+    @ApiOperation("根据标签名字模糊查询标签")
+    @ApiImplicitParam(name = "labelName",value = "标签名称",required = true,dataType = "String")
     public Result selectByLabelName(String labelName){
 
         List<Label> labels = cameraChannelMapper.selectByLabelName(labelName);
@@ -265,7 +265,7 @@ public class Controller {
      * @return
      */
     @GetMapping("selectSubOrgan")
-    @ApiOperation("根据parentId查询组织")
+    @ApiOperation("根据上级组织id查询组织")
     @ApiImplicitParam(name = "parentId",value = "上级组织id",required = true,dataType = "String")
     public Result selectSubOrganization(String parentId){
         if (parentId == null){
diff --git a/src/main/java/com/hisense/monitormanage/controller/EventController.java b/src/main/java/com/hisense/monitormanage/controller/EventController.java
index e4867f4..96cb522 100644
--- a/src/main/java/com/hisense/monitormanage/controller/EventController.java
+++ b/src/main/java/com/hisense/monitormanage/controller/EventController.java
@@ -4,9 +4,9 @@ import com.alibaba.fastjson.JSONObject;
 import com.hisense.monitormanage.entity.Event;
 import com.hisense.monitormanage.entity.Result;
 import com.hisense.monitormanage.mapper.EventMapper;
-import com.hisense.monitormanage.mapper.SedimentTrailMapper;
 import com.hisense.monitormanage.service.EventService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -170,6 +170,7 @@ public class EventController {
      */
     @GetMapping("selectByName")
     @ApiOperation("根据事件名称查询事件")
+    @ApiImplicitParam(name = "eventCnName",value = "事件名称",required = true,dataType = "String")
     public Result selectByName(String eventCnName){
         List<Event> byName = eventMapper.selectByName(eventCnName);
 
diff --git a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java
index 52d0dfc..c9e3e74 100644
--- a/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java
+++ b/src/main/java/com/hisense/monitormanage/mapper/CameraChannelMapper.java
@@ -10,7 +10,6 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
-import java.util.Map;
 
 public interface CameraChannelMapper extends BaseMapper<CameraChannel> {
 
@@ -32,7 +31,7 @@ public interface CameraChannelMapper extends BaseMapper<CameraChannel> {
     void updateState(@Param("list") List list);
 
     @Select("select * from t_label")
-    List<Label> selectAllLabel(Label label);
+    List<Label> selectAllLabel();
 
     @Select("select * from t_label where label_name like concat('%',#{labelName},'%')")
     List<Label> selectByLabelName(String labelName);

From 7d7ccce242cb674bbc79af4e94ba48627006bbc5 Mon Sep 17 00:00:00 2001
From: wuweida <2918581207@qq.com>
Date: Thu, 19 May 2022 14:46:06 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=AD=98=E5=8F=96=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hisense/monitormanage/controller/EventController.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/hisense/monitormanage/controller/EventController.java b/src/main/java/com/hisense/monitormanage/controller/EventController.java
index 96cb522..71610ed 100644
--- a/src/main/java/com/hisense/monitormanage/controller/EventController.java
+++ b/src/main/java/com/hisense/monitormanage/controller/EventController.java
@@ -106,7 +106,9 @@ public class EventController {
         event.setLatitude(camera.getBigDecimal("latitude"));
         event.setLongitude(camera.getBigDecimal("longitude"));
         JSONObject image = jsonObject.getJSONObject("image");
-        event.setImageUrl(image.getString("imageUrl"));
+        String  images = image.getString("imageUrl");
+        String all = images.replaceAll(images.substring(19, 26), "7:8070");
+        event.setImageUrl(all);
         event.setTaskId(jsonObject.getString("taskId"));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//要转换的时间格式
         Date date;

From a863c372fc1ebf773e24a6cd584947cb9b115d1f Mon Sep 17 00:00:00 2001
From: wuweida <2918581207@qq.com>
Date: Thu, 19 May 2022 18:17:00 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E8=BD=AC=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EventController.java           |  2 +
 .../controller/FordController.java            | 53 +++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 src/main/java/com/hisense/monitormanage/controller/FordController.java

diff --git a/src/main/java/com/hisense/monitormanage/controller/EventController.java b/src/main/java/com/hisense/monitormanage/controller/EventController.java
index 71610ed..b5b0bf9 100644
--- a/src/main/java/com/hisense/monitormanage/controller/EventController.java
+++ b/src/main/java/com/hisense/monitormanage/controller/EventController.java
@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.ServletInputStream;
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -143,6 +144,7 @@ public class EventController {
     @GetMapping("selectEvent")
     @ApiOperation("查询所有事件")
     public Result selectEvent(){
+
         List<Event> events = eventMapper.selectEvent();
 
         Result success = Result.success(events);
diff --git a/src/main/java/com/hisense/monitormanage/controller/FordController.java b/src/main/java/com/hisense/monitormanage/controller/FordController.java
new file mode 100644
index 0000000..ca3824f
--- /dev/null
+++ b/src/main/java/com/hisense/monitormanage/controller/FordController.java
@@ -0,0 +1,53 @@
+package com.hisense.monitormanage.controller;
+
+import io.swagger.annotations.ApiOperation;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+
+@Controller
+public class FordController {
+
+    @GetMapping("components/**")
+    @ApiOperation("查询所有事件")
+    public void ford(HttpServletRequest request, HttpServletResponse response)throws Exception{
+
+        String imageDomain = "http://10.132.191.48:30080";
+
+        String uri = request.getRequestURI();
+        String fordUrl = imageDomain + uri;
+
+        URLConnection con = null;
+
+        try {
+            URL url = new URL(fordUrl);
+            con = url.openConnection();
+
+            //允许写出
+            con.setDoOutput(true);
+            //允许读入
+            con.setDoInput(true);
+            //不使用缓存
+            con.setUseCaches(false);
+            //得到响应流
+            InputStream inputStream = con.getInputStream();
+
+            ServletOutputStream outputStream = response.getOutputStream();
+            byte[] buffer = new byte[1024];
+            int len = inputStream.read(buffer);
+            while (len != -1) {
+                outputStream.write(buffer, 0, len);
+                len = inputStream.read(buffer);
+            }
+
+        }catch(Exception e) {
+            e.printStackTrace();
+        }
+    }
+}

From bd84986e440eb43de40d5978115e1e2805295000 Mon Sep 17 00:00:00 2001
From: wuweida <2918581207@qq.com>
Date: Fri, 20 May 2022 10:15:37 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=9B=BE=E7=89=87=E8=B7=AF=E5=BE=84?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/hisense/monitormanage/controller/EventController.java | 4 +---
 .../com/hisense/monitormanage/controller/FordController.java  | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/hisense/monitormanage/controller/EventController.java b/src/main/java/com/hisense/monitormanage/controller/EventController.java
index b5b0bf9..6b1d48f 100644
--- a/src/main/java/com/hisense/monitormanage/controller/EventController.java
+++ b/src/main/java/com/hisense/monitormanage/controller/EventController.java
@@ -107,9 +107,7 @@ public class EventController {
         event.setLatitude(camera.getBigDecimal("latitude"));
         event.setLongitude(camera.getBigDecimal("longitude"));
         JSONObject image = jsonObject.getJSONObject("image");
-        String  images = image.getString("imageUrl");
-        String all = images.replaceAll(images.substring(19, 26), "7:8070");
-        event.setImageUrl(all);
+        event.setImageUrl(image.getString("imageUrl"));
         event.setTaskId(jsonObject.getString("taskId"));
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//要转换的时间格式
         Date date;
diff --git a/src/main/java/com/hisense/monitormanage/controller/FordController.java b/src/main/java/com/hisense/monitormanage/controller/FordController.java
index ca3824f..c1ab9dd 100644
--- a/src/main/java/com/hisense/monitormanage/controller/FordController.java
+++ b/src/main/java/com/hisense/monitormanage/controller/FordController.java
@@ -15,7 +15,6 @@ import java.net.URLConnection;
 public class FordController {
 
     @GetMapping("components/**")
-    @ApiOperation("查询所有事件")
     public void ford(HttpServletRequest request, HttpServletResponse response)throws Exception{
 
         String imageDomain = "http://10.132.191.48:30080";
@@ -45,7 +44,7 @@ public class FordController {
                 outputStream.write(buffer, 0, len);
                 len = inputStream.read(buffer);
             }
-
+            inputStream.close();
         }catch(Exception e) {
             e.printStackTrace();
         }