Browse Source

http://192.168.0.21/index.php?m=bug&f=view&bugID=32241
修改复制逻辑

tianboguang 2 years ago
parent
commit
881790ff59

+ 81 - 0
src/main/java/com/fdkankan/ucenter/entity/Surveillance.java

@@ -0,0 +1,81 @@
+package com.fdkankan.ucenter.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 监控推拉流信息
+ * </p>
+ *
+ * @author 
+ * @since 2022-09-16
+ */
+@Getter
+@Setter
+@TableName("t_surveillance")
+public class Surveillance implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 监控名称
+     */
+    @TableField("name")
+    private String name;
+
+    /**
+     * 监控唯一标识
+     */
+    @TableField("sid")
+    private String sid;
+
+    /**
+     * panoId
+     */
+    @TableField("pano_id")
+    private String panoId;
+
+    /**
+     * 摄像头设置信息
+     */
+    @TableField("data")
+    private String data;
+
+    /**
+     * 播放地址
+     */
+    @TableField("play_url")
+    private String playUrl;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+
+}

+ 18 - 0
src/main/java/com/fdkankan/ucenter/mapper/ISurveillanceMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.ucenter.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.ucenter.entity.Surveillance;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 监控推拉流信息 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2022-09-16
+ */
+@Mapper
+public interface ISurveillanceMapper extends BaseMapper<Surveillance> {
+
+}

+ 16 - 0
src/main/java/com/fdkankan/ucenter/service/ISurveillanceService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.ucenter.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.ucenter.entity.Surveillance;
+
+/**
+ * <p>
+ * 监控推拉流信息 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2022-09-16
+ */
+public interface ISurveillanceService extends IService<Surveillance> {
+
+}

+ 14 - 16
src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -14,26 +14,15 @@ import com.fdkankan.ucenter.common.constants.UploadFilePath;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.bean.SceneJsonBean;
-import com.fdkankan.ucenter.entity.CameraDetail;
-import com.fdkankan.ucenter.entity.SceneEditControls;
-import com.fdkankan.ucenter.entity.SceneEditInfo;
-import com.fdkankan.ucenter.entity.SceneEditInfoExt;
-import com.fdkankan.ucenter.entity.ScenePlus;
-import com.fdkankan.ucenter.entity.ScenePlusExt;
+import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.mapper.IScenePlusMapper;
-import com.fdkankan.ucenter.service.ICameraDetailService;
-import com.fdkankan.ucenter.service.ISceneCopyLogService;
-import com.fdkankan.ucenter.service.ISceneEditControlsService;
-import com.fdkankan.ucenter.service.ISceneEditInfoExtService;
-import com.fdkankan.ucenter.service.ISceneEditInfoService;
-import com.fdkankan.ucenter.service.IScenePlusExtService;
-import com.fdkankan.ucenter.service.IScenePlusService;
-import com.fdkankan.ucenter.service.ISceneProService;
+import com.fdkankan.ucenter.service.*;
 
 import java.io.File;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.CompletableFuture;
 
 import com.fdkankan.ucenter.vo.SceneEditControlsVO;
@@ -67,7 +56,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     @Autowired
     private ICameraDetailService cameraDetailService;
     @Autowired
-    private ISceneCopyLogService sceneCopyLogService;
+    private ISurveillanceService surveillanceService;
     @Autowired
     private ISceneProService sceneProService;
     @Resource
@@ -233,6 +222,15 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 sceneEditControls.setEditInfoId(sceneEditInfo.getId());
                 sceneEditControlsService.save(sceneEditControls);
 
+                List<Surveillance> list = surveillanceService.list(new LambdaQueryWrapper<Surveillance>().eq(Surveillance::getNum, num));
+                if (!Objects.isNull(list)) {
+                    list.stream().forEach(item -> {
+                        item.setNum(newNum);
+                        item.setId(null);
+                        surveillanceService.save(item);
+                    });
+                }
+
                 // 生成scene.json
                 SceneJsonBean sceneJson = new SceneJsonBean();
                 BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
@@ -261,7 +259,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 redisUtil.del(String.format(RedisKey.SCENE_JSON, num));
 
                 // 生成二维码
-                String sceneUrl = mainUrl + "/" + sceneProNewUrl;
+                String sceneUrl = mainUrl + sceneProNewUrl;
                 String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + newNum + ".png";
                 String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/" + newNum + "_en.png";
                 MatrixToImageWriterUtil.createQRCode(sceneUrl + newNum, outPathZh, false,null);

+ 1 - 1
src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -102,7 +102,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     private ISceneUpgradeMapper sceneUpgradeMapper;
 
     @Autowired
-    private ICameraService cameraService;
+    private ISurveillanceService surveillanceService;
 
     @Value("${main.url}")
     private String mainUrl;

+ 20 - 0
src/main/java/com/fdkankan/ucenter/service/impl/SurveillanceServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.ucenter.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.ucenter.entity.Surveillance;
+import com.fdkankan.ucenter.mapper.ISurveillanceMapper;
+import com.fdkankan.ucenter.service.ISurveillanceService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 监控推拉流信息 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2022-09-16
+ */
+@Service
+public class SurveillanceServiceImpl extends ServiceImpl<ISurveillanceMapper, Surveillance> implements ISurveillanceService {
+
+}