Merge remote-tracking branch 'origin/master'

ruoyi-admin/src/main/resources/application-dev.yml

@@ -102,13 +102,13 @@ spring:
 spring:
   redis:
     # 地址
-    host: localhost
+    host: 60.204.209.152
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 0
     # 密码(如没有密码请注释掉)
-    # password:
+    password: 123456
     # 连接超时时间
     timeout: 10s
     # 是否开启ssl

ruoyi-system/src/main/java/com/ruoyi/data/controller/TblVideoDetailController.java

@@ -29,7 +29,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 摄像机详情
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-01
  */
 @Validated
 @RequiredArgsConstructor

ruoyi-system/src/main/java/com/ruoyi/data/domain/TblVideoDetail.java

@@ -15,7 +15,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 摄像机详情对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-01
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -89,5 +89,9 @@ public class TblVideoDetail extends BaseEntity {
      * 备注
      */
     private String remark;
+    /**
+     * 主设备id
+     */
+    private Long videoId;
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoDetailBo.java

@@ -16,7 +16,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
  * 摄像机详情业务对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-01
  */
 
 @Data
@@ -119,5 +119,11 @@ public class TblVideoDetailBo extends BaseEntity {
     @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
+    /**
+     * 主设备id
+     */
+    @NotNull(message = "主设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Long videoId;
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/domain/vo/TblVideoDetailVo.java

@@ -15,7 +15,7 @@ import java.io.Serializable;
  * 摄像机详情视图对象 tbl_video_detail
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-01
  */
 @Data
 @ExcelIgnoreUnannotated
@@ -119,5 +119,11 @@ public class TblVideoDetailVo implements Serializable {
     @ExcelProperty(value = "备注")
     private String remark;
 
+    /**
+     * 主设备id
+     */
+    @ExcelProperty(value = "主设备id")
+    private Long videoId;
+
 
 }

ruoyi-system/src/main/java/com/ruoyi/data/mapper/TblVideoDetailMapper.java

@@ -8,7 +8,7 @@ import com.ruoyi.common.core.mapper.BaseMapperPlus;
  * 摄像机详情Mapper接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-01
  */
 public interface TblVideoDetailMapper extends BaseMapperPlus<TblVideoDetailMapper, TblVideoDetail, TblVideoDetailVo> {
 

ruoyi-system/src/main/java/com/ruoyi/data/service/ITblVideoDetailService.java

@@ -13,7 +13,7 @@ import java.util.List;
  * 摄像机详情Service接口
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-01
  */
 public interface ITblVideoDetailService {
 

ruoyi-system/src/main/java/com/ruoyi/data/service/impl/TblVideoDetailServiceImpl.java

@@ -23,7 +23,7 @@ import java.util.Collection;
  * 摄像机详情Service业务层处理
  *
  * @author ruoyi
- * @date 2023-11-28
+ * @date 2023-12-01
  */
 @RequiredArgsConstructor
 @Service
@@ -75,6 +75,7 @@ public class TblVideoDetailServiceImpl implements ITblVideoDetailService {
         lqw.eq(bo.getCtime() != null, TblVideoDetail::getCtime, bo.getCtime());
         lqw.eq(StringUtils.isNotBlank(bo.getModifier()), TblVideoDetail::getModifier, bo.getModifier());
         lqw.eq(bo.getUtime() != null, TblVideoDetail::getUtime, bo.getUtime());
+        lqw.eq(bo.getVideoId() != null, TblVideoDetail::getVideoId, bo.getVideoId());
         return lqw;
     }
 

ruoyi-system/src/main/resources/mapper/data/TblVideoDetailMapper.xml

@@ -25,6 +25,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime" column="create_time"/>
         <result property="updateBy" column="update_by"/>
         <result property="updateTime" column="update_time"/>
+        <result property="videoId" column="video_id"/>
     </resultMap>