'左下、右上经纬度'

src/main/java/com/taauav/admin/entity/TauvInspectPhoto.java

@@ -31,13 +31,21 @@ public class TauvInspectPhoto extends Entity {
      */
     private String photoUrl;
     /**
-     * 纬度
+     * 左下纬度
      */
-    private String latitude;
+    private String leftLatitude;
     /**
-     * 经度
+     * 左下经度
      */
-    private String longitude;
+    private String leftLongitude;
+    /**
+     * 右上纬度
+     */
+    private String rightLatitude;
+    /**
+     * 右上经度
+     */
+    private String rightLongitude;
     /**
      * 上传人id
      */

src/main/java/com/taauav/admin/entity/TauvWaterSpectrum.java

@@ -78,11 +78,19 @@ public class TauvWaterSpectrum extends Entity {
      */
     private String tubPic;
     /**
-     * 纬度
+     * 左下纬度
      */
-    private String latitude;
+    private String leftLatitude;
     /**
-     * 经度
+     * 左下经度
      */
-    private String longitude;
+    private String leftLongitude;
+    /**
+     * 右上纬度
+     */
+    private String rightLatitude;
+    /**
+     * 右上经度
+     */
+    private String rightLongitude;
 }

src/main/java/com/taauav/front/controller/IndexInspectController.java

@@ -0,0 +1,41 @@
+package com.taauav.front.controller;
+
+import com.taauav.common.bean.Response;
+import com.taauav.front.service.IUserInspectDriverService;
+import io.swagger.models.auth.In;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 指挥大屏 - 任务管理 控制器
+ *
+ * @author daixiantong
+ * @date 2020-05-21
+ */
+@RestController
+@RequestMapping("/index/inspect")
+public class IndexInspectController {
+    @Autowired
+    private IUserInspectDriverService inspectDriverService;
+
+    /**
+     * 统计任务数量
+     * @return
+     */
+    @GetMapping("/count")
+    public Response countInspect() {
+        return inspectDriverService.countInspectNum();
+    }
+
+    /**
+     * 任务管理列表
+     * @return
+     */
+    @GetMapping("/list")
+    public Response list(@RequestParam("type") Integer type) {
+        return inspectDriverService.getInspectList(type);
+    }
+}

src/main/java/com/taauav/front/controller/IndexQuestionController.java

@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
  */
 @RestController
 @RequestMapping("/index/question")
-public class IndexQuestionController extends FrontBaseController {
+public class IndexQuestionController {
 
     @Autowired
     private IUserInspectQuestionService questionService;
@@ -28,7 +28,7 @@ public class IndexQuestionController extends FrontBaseController {
      * @param query
      * @return
      */
-    @GetMapping("/index")
+    @GetMapping("/list")
     public Response questionList(IndexQuestionDto indexQuestionDto, BaseQuery query) {
         return questionService.selectIndexPage(indexQuestionDto, query);
     }

src/main/java/com/taauav/front/service/IUserInspectDriverService.java

@@ -43,4 +43,18 @@ public interface IUserInspectDriverService extends IBaseService<TauvInspectDrive
      */
     Response detail(Integer id);
 
+    /**
+     * 统计指挥大屏任务数量
+     * @return
+     */
+    Response countInspectNum();
+
+    /**
+     * 指挥大屏-任务管理列表
+     * @param type：1已完成 2执行中
+     * @return
+     */
+    Response getInspectList(Integer type);
+
+
 }

src/main/java/com/taauav/front/service/impl/UserInspectDriverServiceImpl.java

@@ -299,4 +299,37 @@ public class UserInspectDriverServiceImpl extends BaseServiceImpl<TauvInspectDri
         inspectDriverInfoVo.setInspectFileList(inspectFileList);
         return response.success(inspectDriverInfoVo);
     }
+
+    /**
+     * 统计指挥大屏任务数量
+     * @return
+     */
+    @Override
+    public Response countInspectNum() {
+        // 执行中
+        QueryWrapper wrapper = new QueryWrapper();
+        wrapper.eq("mark", 1);
+        wrapper.eq("status", 3);
+        Integer inExecution = count(wrapper);
+        // 已完成
+        QueryWrapper wrapper1 = new QueryWrapper();
+        wrapper1.eq("mark", 1);
+        wrapper1.eq("status", 4);
+        Integer finished = count(wrapper1);
+
+        Map<String, Integer> map = new HashMap<>();
+        map.put("inExecution", inExecution);
+        map.put("finished", finished);
+        return response.success(map);
+    }
+
+    /**
+     * 指挥大屏-任务管理列表
+     * @param type：1已完成 2执行中
+     * @return
+     */
+    @Override
+    public Response getInspectList(Integer type) {
+        return null;
+    }
 }

src/main/java/com/taauav/front/vo/IndexInspectListVo.java

@@ -0,0 +1,63 @@
+package com.taauav.front.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.taauav.admin.entity.TauvDriverPoint;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 指挥大屏-任务管理列表返回结果实体类
+ *
+ * @author daixiantong
+ * @date 2020-05-21
+ */
+@Data
+public class IndexInspectListVo {
+
+    /**
+     * 任务id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+    /**
+     * 河湖id
+     */
+    private Integer driverId;
+    /**
+     * 河湖名称
+     */
+    private String driverName;
+    /**
+     * 区属名称
+     */
+    private String areaName;
+    /**
+     * 巡检日期
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date inspectTime;
+    /**
+     * 起点
+     */
+    private String startPoint;
+    /**
+     * 终点
+     */
+    private String endPoint;
+    /**
+     * 状态描述
+     */
+    private String statusText;
+    /**
+     * 河道坐标
+     */
+    private List<TauvDriverPoint> pointList;
+    /**
+     * 直播地址
+     */
+    private String liveUrl;
+}

src/main/java/com/taauav/front/vo/userwaterspectrum/UserWaterSpectrumListVo.java

@@ -74,12 +74,22 @@ public class UserWaterSpectrumListVo {
     private String tubPic;
 
     /**
-     * 纬度
+     * 左下纬度
      */
-    private String latitude;
+    private String leftLatitude;
 
     /**
-     * 经度
+     * 左下经度
      */
-    private String longitude;
+    private String leftLongitude;
+
+    /**
+     * 右上纬度
+     */
+    private String rightLatitude;
+
+    /**
+     * 右上经度
+     */
+    private String rightLongitude;
 }