v4.3.0 监控摄像头功能

4dkankan-center-scene/src/main/java/com/fdkankan/scene/bean/SurveillanceBean.java

@@ -24,6 +24,8 @@ public class SurveillanceBean implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    private Long id;
+
     /**
      * 监控名称
      */

4dkankan-center-scene/src/main/java/com/fdkankan/scene/entity/Surveillance.java

@@ -65,7 +65,7 @@ public class Surveillance implements Serializable {
     private Date updateTime;
 
     @TableField("rec_status")
-    @TableLogic("A")
+    @TableLogic(value = "A", delval = "I")
     private String recStatus;
 
 

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISurveillanceService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.scene.service;
 
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.scene.bean.SurveillanceBean;
 import com.fdkankan.scene.entity.Surveillance;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.scene.vo.AddSurveillanceParamVO;
@@ -27,7 +28,7 @@ public interface ISurveillanceService extends IService<Surveillance> {
 
     ResultData deleteSurveillance(BaseIdParamVO param);
 
-    List<Surveillance> listSurveillance(String num);
+    List<SurveillanceBean> listSurveillance(String num);
 
 
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -354,9 +354,8 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             uploadToOssUtil.delete(surveillanceJsonPath);
             return;
         }
-        List<Surveillance> surveillanceList = surveillanceService.listSurveillance(num);
-        List<SurveillanceBean> surveillanceBeanList = BeanUtil.copyToList(surveillanceList, SurveillanceBean.class);
-        uploadToOssUtil.upload(JSON.toJSONString(surveillanceBeanList).getBytes(StandardCharsets.UTF_8), surveillanceJsonPath);
+        List<SurveillanceBean> surveillanceList = surveillanceService.listSurveillance(num);
+        uploadToOssUtil.upload(JSON.toJSONString(surveillanceList).getBytes(StandardCharsets.UTF_8), surveillanceJsonPath);
     }
 
     public void publicLinkSceneData(String num) throws IOException {

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SurveillanceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.scene.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -9,6 +10,7 @@ import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.constant.ServerCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
+import com.fdkankan.scene.bean.SurveillanceBean;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.Surveillance;
@@ -96,7 +98,8 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
     }
 
     @Override
-    public List<Surveillance> listSurveillance(String num) {
-        return this.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
+    public List<SurveillanceBean> listSurveillance(String num) {
+        List<Surveillance> list = this.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
+        return BeanUtil.copyToList(list, SurveillanceBean.class);
     }
 }