Parcourir la source

开放摄像头查询

Newspaper il y a 1 an
Parent
commit
52113286d4

+ 12 - 0
huimv-admin/pom.xml

@@ -174,6 +174,18 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>com.fhs-opensource</groupId>
+            <artifactId>easy-trans-spring-boot-starter</artifactId>
+            <version>2.1.7</version>
+        </dependency>
+
+        <!-- easy-trans-mybatis-plus-extend -->
+        <dependency>
+            <groupId>com.fhs-opensource</groupId>
+            <artifactId>easy-trans-mybatis-plus-extend</artifactId>
+            <version>2.1.7</version>
+        </dependency>
 
         <dependency>
             <groupId>fr.opensagres.xdocreport</groupId>

+ 11 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/LoginController.java

@@ -8,14 +8,19 @@ import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.common.utils.VerifyUtil;
 import com.huimv.guowei.admin.entity.SysAccountMultilevel;
+import com.huimv.guowei.admin.entity.SysCamera;
+import com.huimv.guowei.admin.mapper.SysCameraMapper;
 import com.huimv.guowei.admin.service.ILoginService;
 import com.huimv.guowei.admin.service.IRawDataService;
+import com.huimv.guowei.admin.service.ISysCameraService;
 import com.huimv.guowei.admin.session.AccessToken;
+import com.huimv.guowei.admin.utils.IpUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -26,6 +31,8 @@ public class LoginController {
 
     @Autowired
     ILoginService iLoginService;
+    @Autowired
+    private SysCameraMapper sysCameraMapper;
 
     @RequestMapping("/test")
     public String logout() {
@@ -124,5 +131,9 @@ public class LoginController {
         return rawDataService.listWeightByDevicCodeAndTime(paramsMap);
     }
 
+    @GetMapping("/listCameraIp")
+    public Result getIpAddr(){
+        return new Result(ResultCode.SUCCESS,sysCameraMapper.listCameraIp());
+    }
 
 }

+ 9 - 1
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/SysCamera.java

@@ -1,9 +1,14 @@
 package com.huimv.guowei.admin.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fhs.core.trans.anno.Trans;
+import com.fhs.core.trans.constant.TransType;
+import com.fhs.core.trans.vo.TransPojo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,7 +25,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_camera")
-public class SysCamera implements Serializable {
+public class SysCamera implements Serializable, TransPojo {
 
     private static final long serialVersionUID = 1L;
 
@@ -52,6 +57,9 @@ public class SysCamera implements Serializable {
      */
     private Integer areaId;
 
+    @TableField(exist = false)
+    private String publicUrl;
+
     /**
      * 摄像头ip
      */

+ 3 - 3
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/SysCameraArea.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.io.Serializable;
+
+import com.fhs.core.trans.vo.TransPojo;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -20,9 +22,7 @@ import lombok.experimental.Accessors;
 @EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
 @TableName("sys_camera_area")
-public class SysCameraArea implements Serializable {
-
-    private static final long serialVersionUID = 1L;
+public class SysCameraArea implements TransPojo {
 
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;

+ 9 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/vo/CarmeraIpResult.java

@@ -0,0 +1,9 @@
+package com.huimv.guowei.admin.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class CarmeraIpResult {
+    private Integer id,runStatus;
+    private String cameraName,account,password,areaName,cameraIp,publicUrl;
+}

+ 4 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/mapper/SysCameraMapper.java

@@ -7,8 +7,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.guowei.admin.entity.SysCamera;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huimv.guowei.admin.entity.vo.CameraBaseVo;
+import com.huimv.guowei.admin.entity.vo.CarmeraIpResult;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *  Mapper 接口
@@ -21,4 +24,5 @@ public interface SysCameraMapper extends BaseMapper<SysCamera> {
 
     IPage<CameraBaseVo> listPage(Page<SysCamera> page, @Param(Constants.WRAPPER) QueryWrapper<SysCamera> wrapper);
 
+    List<CarmeraIpResult> listCameraIp();
 }

+ 3 - 0
huimv-admin/src/main/resources/com/huimv/guowei/admin/mapper/SysCameraMapper.xml

@@ -27,4 +27,7 @@
         select cb.*,ca.public_url as ip from sys_camera cb left join sys_camera_area ca on cb.region_uuid =ca.region_uuid
         ${ew.customSqlSegment}
     </select>
+    <select id="listCameraIp" resultType="com.huimv.guowei.admin.entity.vo.CarmeraIpResult">
+        SELECT c.id,c.camera_name,c.account,c.password,c.area_name,c.camera_ip,c.run_status,a.public_url AS 'publicUrl' FROM `sys_camera` c LEFT JOIN `sys_camera_area` a ON c.area_id = a.id
+    </select>
 </mapper>