From 1feb8ab8bc186ab59d6fa084550e20a813415e2d Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 1 Apr 2024 19:02:08 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=9B=91=E6=8E=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/screen/vo/DtreeVo.java | 31 ++++++++++++++ .../resources/mapper/HumanManageMapper.xml | 2 +- .../main/resources/mapper/TbAreaMapper.xml | 2 +- .../screen/controller/VideoController.java | 32 ++++++++++++++ .../screen/mapper/IVideoMapper.java | 26 ++++++++++++ .../screen/service/IVideoService.java | 22 ++++++++++ .../screen/service/impl/VideoServiceImpl.java | 42 +++++++++++++++++++ .../src/main/resources/mapper/VideoMapper.xml | 29 +++++++++++++ 8 files changed, 184 insertions(+), 2 deletions(-) create mode 100644 securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DtreeVo.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/controller/VideoController.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/mapper/IVideoMapper.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/IVideoService.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/java/com/securitycontrol/screen/service/impl/VideoServiceImpl.java create mode 100644 securitycontrol-model/securitycontrol-screen/src/main/resources/mapper/VideoMapper.xml diff --git a/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DtreeVo.java b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DtreeVo.java new file mode 100644 index 0000000..acc02ee --- /dev/null +++ b/securitycontrol-commons/securitycontrol-commons-entity/src/main/java/com/securitycontrol/entity/screen/vo/DtreeVo.java @@ -0,0 +1,31 @@ +package com.securitycontrol.entity.screen.vo; + +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @author:cwchen + * @date:2024-04-01-10:09 + * @version:1.0 + * @description:Dtree实体类 + */ +@Data +public class DtreeVo { + + @ApiModelProperty("id") + private String id; + + @ApiModelProperty("名称") + private String title; + + @ApiModelProperty("父ID") + private String parentId; + + @ApiModelProperty("设备是否在线") + private String onLine; + + @ApiModelProperty("层级") + private String level; + + private boolean spread = true; +} diff --git a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml index 00ea681..1df08c1 100644 --- a/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml +++ b/securitycontrol-model/securitycontrol-background/src/main/resources/mapper/HumanManageMapper.xml @@ -138,7 +138,7 @@ + (SELECT '0' AS id,'球机' AS title, '-1' AS parentId,'0' AS onLine,'1' AS level) + UNION ALL + ( + SELECT CONCAT('QJ',td.device_code) AS id, + td.device_name AS title, + '0' AS parentId, + on_line AS onLine, + '2' AS level + FROM tb_device td + INNER JOIN t_class_metting tcm on td.device_code = tcm.puid AND tcm.work_day = CURRENT_DATE + WHERE td.del_flag = 0 + + AND INSTR(td.device_name,#{param}) > 0 + + + AND INSTR(tcm.bid_code,#{bidCode}) > 0 + + + AND tcm.bid_code = '-1' + + ) + + \ No newline at end of file