v4.3.0监控接口优化

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

@@ -1,12 +1,11 @@
 package com.fdkankan.scene.service;
 
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.scene.bean.SurveillanceBean;
+import com.fdkankan.scene.vo.SurveillanceVO;
 import com.fdkankan.scene.entity.Surveillance;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.scene.vo.BaseSidParamVO;
 import com.fdkankan.scene.vo.SurveillanceParamVO;
-import com.fdkankan.scene.vo.BaseIdParamVO;
 import java.util.List;
 
 /**
@@ -23,7 +22,7 @@ public interface ISurveillanceService extends IService<Surveillance> {
 
     ResultData deleteSurveillance(BaseSidParamVO param);
 
-    List<SurveillanceBean> listSurveillance(String num);
+    List<SurveillanceVO> listSurveillance(String num);
 
     Surveillance getBySid(String sid);
 

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

@@ -7,7 +7,6 @@ import cn.hutool.core.util.ZipUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.SerializerFeature;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
@@ -35,13 +34,12 @@ import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.api.dto.SceneInfoDTO;
 import com.fdkankan.scene.bean.BoxPhotoBean;
-import com.fdkankan.scene.bean.IconBean;
 import com.fdkankan.scene.bean.PointBean;
 import com.fdkankan.scene.bean.RequestSceneProV4;
 import com.fdkankan.scene.bean.SceneJsonBean;
 import com.fdkankan.scene.bean.SegmentBean;
 import com.fdkankan.scene.bean.StyleBean;
-import com.fdkankan.scene.bean.SurveillanceBean;
+import com.fdkankan.scene.vo.SurveillanceVO;
 import com.fdkankan.scene.bean.TagBean;
 import com.fdkankan.scene.bean.VertexBean;
 import com.fdkankan.scene.bean.WallBean;
@@ -55,7 +53,6 @@ import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.ScenePlusExt;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.entity.SceneProV3;
-import com.fdkankan.scene.entity.Surveillance;
 import com.fdkankan.scene.factory.FloorLogoHandlerFactory;
 import com.fdkankan.scene.factory.MusicHandlerFactory;
 import com.fdkankan.scene.factory.ScreenshotHandlerFactory;
@@ -92,7 +89,6 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
@@ -102,7 +98,6 @@ import java.io.IOException;
 import java.util.Calendar;
 import java.util.Objects;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
@@ -354,7 +349,7 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<ISceneEditInfoMapper,
             uploadToOssUtil.delete(surveillanceJsonPath);
             return;
         }
-        List<SurveillanceBean> surveillanceList = surveillanceService.listSurveillance(num);
+        List<SurveillanceVO> surveillanceList = surveillanceService.listSurveillance(num);
         uploadToOssUtil.upload(JSON.toJSONString(surveillanceList).getBytes(StandardCharsets.UTF_8), surveillanceJsonPath);
     }
 

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

@@ -2,15 +2,13 @@ package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.scene.bean.SurveillanceBean;
+import com.fdkankan.scene.vo.SurveillanceVO;
 import com.fdkankan.scene.entity.SceneEditInfoExt;
 import com.fdkankan.scene.entity.ScenePlus;
 import com.fdkankan.scene.entity.Surveillance;
@@ -20,7 +18,6 @@ import com.fdkankan.scene.service.IScenePlusService;
 import com.fdkankan.scene.service.ISurveillanceService;
 import com.fdkankan.scene.vo.BaseSidParamVO;
 import com.fdkankan.scene.vo.SurveillanceParamVO;
-import com.fdkankan.scene.vo.BaseIdParamVO;
 import java.util.List;
 import java.util.Objects;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -89,9 +86,9 @@ public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Su
     }
 
     @Override
-    public List<SurveillanceBean> listSurveillance(String num) {
+    public List<SurveillanceVO> listSurveillance(String num) {
         List<Surveillance> list = this.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
-        return BeanUtil.copyToList(list, SurveillanceBean.class);
+        return BeanUtil.copyToList(list, SurveillanceVO.class);
     }
 
     @Override

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

@@ -1,4 +1,4 @@
-package com.fdkankan.scene.bean;
+package com.fdkankan.scene.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -20,7 +20,7 @@ import lombok.Setter;
  * @since 2022-09-16
  */
 @Data
-public class SurveillanceBean implements Serializable {
+public class SurveillanceVO implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
@@ -29,19 +29,18 @@ public class SurveillanceBean implements Serializable {
     /**
      * 监控名称
      */
-    @TableField("name")
     private String name;
 
     /**
      * 摄像头设置信息
      */
-    @TableField("data")
     private String data;
 
     /**
      * 播放地址
      */
-    @TableField("play_url")
     private String playUrl;
 
+    private String sid;
+
 }