From e6ea65d3ba8e7eac8cfb7afb3d37c73246fa6730 Mon Sep 17 00:00:00 2001 From: wuweida <2918581207@qq.com> Date: Fri, 1 Jul 2022 15:47:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B67=E6=9C=884?= =?UTF-8?q?=E5=8F=B7=E6=97=A9=E4=B8=8A=E4=B8=80=E7=82=B9=E8=B7=91=E4=B8=80?= =?UTF-8?q?=E9=81=8D=E6=91=84=E5=83=8F=E5=A4=B4=E5=92=8C=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E8=A1=A8=20=E9=87=8D=E7=82=B9=E5=8C=BA=E5=9F=9F=E5=AE=9E?= =?UTF-8?q?=E4=BD=93=E7=B1=BB=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/QidiController.java | 3 ++- .../monitormanage/entity/CameraChannel.java | 2 +- .../entity/CameraOrganization.java | 2 +- .../hisense/monitormanage/entity/KeyArea.java | 19 +++++++++++++++++++ .../monitormanage/mapper/KeyAreaMapper.java | 12 ++++++++++++ .../monitormanage/service/MonitorService.java | 1 + src/main/resources/mapper/KeyAreaMapper.xml | 5 +++++ 7 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/hisense/monitormanage/entity/KeyArea.java create mode 100644 src/main/java/com/hisense/monitormanage/mapper/KeyAreaMapper.java create mode 100644 src/main/resources/mapper/KeyAreaMapper.xml diff --git a/src/main/java/com/hisense/monitormanage/controller/QidiController.java b/src/main/java/com/hisense/monitormanage/controller/QidiController.java index 501eb30..64d080c 100644 --- a/src/main/java/com/hisense/monitormanage/controller/QidiController.java +++ b/src/main/java/com/hisense/monitormanage/controller/QidiController.java @@ -314,7 +314,8 @@ public class QidiController { @ApiOperation("查询工地信息，根据经纬度和半径从表中查询") @ApiImplicitParams({ @ApiImplicitParam(name="longitude",value = "经度",paramType = "query",required = true,dataType = "double"), - @ApiImplicitParam(name="longitude",value = "经度",paramType = "query",required = true,dataType = "double") + @ApiImplicitParam(name="longitude",value = "经度",paramType = "query",required = true,dataType = "double"), + @ApiImplicitParam(name = "radius",value = "半径",paramType = "query",required = true,dataType = "Integer") }) public Result listBuildingSiteByPoints(double longitude,double latitude,Integer radius){ List list = new ArrayList<>(); diff --git a/src/main/java/com/hisense/monitormanage/entity/CameraChannel.java b/src/main/java/com/hisense/monitormanage/entity/CameraChannel.java index 1ffa86b..0bfac94 100644 --- a/src/main/java/com/hisense/monitormanage/entity/CameraChannel.java +++ b/src/main/java/com/hisense/monitormanage/entity/CameraChannel.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data -@TableName("t_camera_channel") +@TableName("t_camera_channel_copy") public class CameraChannel { @TableId diff --git a/src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java b/src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java index 5a85729..be8dea1 100644 --- a/src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java +++ b/src/main/java/com/hisense/monitormanage/entity/CameraOrganization.java @@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @Data -@TableName("t_camera_organization") +@TableName("t_camera_organization_copy") public class CameraOrganization { @TableId private String id; diff --git a/src/main/java/com/hisense/monitormanage/entity/KeyArea.java b/src/main/java/com/hisense/monitormanage/entity/KeyArea.java new file mode 100644 index 0000000..f36bdc6 --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/entity/KeyArea.java @@ -0,0 +1,19 @@ +package com.hisense.monitormanage.entity; + +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +@Data +@TableName("t_key_area") +public class KeyArea { + @TableId + private Integer id; + private String type;//类型 + private String name;//名称 + private String location;//位置 + private String serviceTime;//投用时间 + private String management;//管理单位 + private String scenicLevel;//景区级别 + private String about;//简介 +} diff --git a/src/main/java/com/hisense/monitormanage/mapper/KeyAreaMapper.java b/src/main/java/com/hisense/monitormanage/mapper/KeyAreaMapper.java new file mode 100644 index 0000000..098092d --- /dev/null +++ b/src/main/java/com/hisense/monitormanage/mapper/KeyAreaMapper.java @@ -0,0 +1,12 @@ +package com.hisense.monitormanage.mapper; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.hisense.monitormanage.entity.KeyArea; + +import java.util.List; + +public interface KeyAreaMapper extends BaseMapper { + + List seelctKeyAreaList(String timeId); +} diff --git a/src/main/java/com/hisense/monitormanage/service/MonitorService.java b/src/main/java/com/hisense/monitormanage/service/MonitorService.java index 9a6c466..c520222 100644 --- a/src/main/java/com/hisense/monitormanage/service/MonitorService.java +++ b/src/main/java/com/hisense/monitormanage/service/MonitorService.java @@ -527,6 +527,7 @@ public class MonitorService { * @throws IOException * @throws InterruptedException */ + @Scheduled(cron = "* * 1 4 7 ? *") public void videoService(String parentId, String path) throws IOException, InterruptedException { String url = monitorDomain + "/videoService/devicesManager/deviceTree?nodeType=1&typeCode=01;0;ALL;ALL&id=" + parentId; diff --git a/src/main/resources/mapper/KeyAreaMapper.xml b/src/main/resources/mapper/KeyAreaMapper.xml new file mode 100644 index 0000000..cb20770 --- /dev/null +++ b/src/main/resources/mapper/KeyAreaMapper.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file