1

src/main/java/com/fdkankan/manage_jp/controller/LaserController.java

@@ -75,12 +75,11 @@ public class LaserController extends BaseController{
         if(sceneUser == null || sceneUser.getCompanyId() == null){
             return Result.success(false);
         }
-        if( sceneUser.getId().equals(userId)){
+        if( sceneUser.getId().equals(user.getId())){
             return Result.success(true);
         }
 
-        Company company = companyService.getById(sceneUser.getCompanyId());
-        if(company != null && company.getId().equals(user.getCompanyId())){
+        if(sceneUser.getCompanyId().equals(user.getCompanyId())){
             return Result.success(true);
         }
 
@@ -126,4 +125,9 @@ public class LaserController extends BaseController{
         jsonObject.put("list",numList);
         return Result.success(jsonObject);
     }
+
+    public static void main(String[] args) {
+        String username = JwtUtil.getUsername("eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiIxMzU5MjQxODE4QHFxLmNvbSIsImxvZ2luVHlwZSI6InVzZXIiLCJ1c2VyTmFtZSI6IjEzNTkyNDE4MThAcXEuY29tIiwiaWF0IjoxNzExNDQ3OTI2LCJqdGkiOiJjYTcyNTlkMC00ZDExLTRlYTQtYWU4Yi04YmQwZTZhNjRlOGEifQ.kLUx9XZdyBXCVENuMZWOU-Ge4-gg1mED7bZ8DnH8g1E");
+        System.out.println(username);
+    }
 }

src/main/java/com/fdkankan/manage_jp/entity/SceneMoveLog.java

@@ -0,0 +1,67 @@
+package com.fdkankan.manage_jp.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-26
+ */
+@Getter
+@Setter
+@TableName("t_scene_move_log")
+public class SceneMoveLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 相机迁移日志表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 场景码
+     */
+    @TableField("num")
+    private String num;
+
+    /**
+     * 旧相机sn
+     */
+    @TableField("old_sn_code")
+    private String oldSnCode;
+
+    /**
+     * 新相机sn
+     */
+    @TableField("new_sn_code")
+    private String newSnCode;
+
+    @TableField("old_data_source")
+    private String oldDataSource;
+
+    @TableField("new_data_source")
+    private String newDataSource;
+
+    @TableField("create_time")
+    private Date createTime;
+
+    @TableField("update_time")
+    private Date updateTime;
+
+    @TableField("data_source_bak")
+    private String dataSourceBak;
+
+
+}

src/main/java/com/fdkankan/manage_jp/generate/AutoGenerate.java

@@ -18,7 +18,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"manage_jp", getTables(new String[]{
-              "tm_contractor_num",
+              "t_scene_move_log",
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/manage_jp/mapper/ISceneMoveLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.manage_jp.mapper;
+
+import com.fdkankan.manage_jp.entity.SceneMoveLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-26
+ */
+@Mapper
+public interface ISceneMoveLogMapper extends BaseMapper<SceneMoveLog> {
+
+}

src/main/java/com/fdkankan/manage_jp/service/ISceneMoveLogService.java

@@ -0,0 +1,19 @@
+package com.fdkankan.manage_jp.service;
+
+import com.fdkankan.manage_jp.entity.SceneMoveLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.manage_jp.entity.ScenePlus;
+import com.fdkankan.manage_jp.entity.ScenePro;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-26
+ */
+public interface ISceneMoveLogService extends IService<SceneMoveLog> {
+
+    void saveLog(ScenePro scenePro, ScenePlus scenePlus, String oldSnCode, String newSnCode, String dataSource, String newDataSource, String fdagebak);
+}

src/main/java/com/fdkankan/manage_jp/service/impl/SceneMoveLogServiceImpl.java

@@ -0,0 +1,34 @@
+package com.fdkankan.manage_jp.service.impl;
+
+import com.fdkankan.manage_jp.entity.SceneMoveLog;
+import com.fdkankan.manage_jp.entity.ScenePlus;
+import com.fdkankan.manage_jp.entity.ScenePro;
+import com.fdkankan.manage_jp.mapper.ISceneMoveLogMapper;
+import com.fdkankan.manage_jp.service.ISceneMoveLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2024-03-26
+ */
+@Service
+public class SceneMoveLogServiceImpl extends ServiceImpl<ISceneMoveLogMapper, SceneMoveLog> implements ISceneMoveLogService {
+
+    @Override
+    public void saveLog(ScenePro scenePro, ScenePlus scenePlus, String oldSnCode, String newSnCode, String dataSource, String newDataSource, String fdagebak) {
+        String num = scenePro == null ? scenePlus.getNum() : scenePro.getNum();
+        SceneMoveLog moveLog = new SceneMoveLog();
+        moveLog.setNum(num);
+        moveLog.setOldSnCode(oldSnCode);
+        moveLog.setNewSnCode(newSnCode);
+        moveLog.setOldDataSource(dataSource);
+        moveLog.setNewDataSource(newDataSource);
+        moveLog.setDataSourceBak(fdagebak);
+        this.save(moveLog);
+    }
+}

src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -98,7 +98,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     ICameraService cameraService;
     @Autowired
     IUserService userService;
-
+    @Autowired
+    ISceneMoveLogService sceneMoveLogService;
 
     @Override
     public Long getCountByUserIds(List<Long> userIds) {
@@ -150,7 +151,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(param.getType() == 2){
             ssSceneMap = laserService.list(sceneNumList);
         }
-        //HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
+        HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
 
         for (SceneVo record : page.getRecords()) {
             if(param.getType() == 2){
@@ -173,14 +174,16 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             record.setIsDel(param.getIsDel());
             record.setIsMain(param.getIsMain());
             record.setIsDownload(param.getIsDownload());
+            record.setIsMigrate(param.getIsMigrate());
             if(numList != null && numList.contains(record.getNum())){
                 record.setIsMain(false);
                 record.setIsDel(false);
                 record.setIsDownload(false);
+                record.setIsMigrate(false);
+            }
+            if(coldMap.get(record.getNum())!=null){
+                record.setIsMigrate(false);
             }
-//            if(coldMap.get(record.getNum())!=null){
-//                record.setColdStorage(coldMap.get(record.getNum()));
-//            }
         }
         return PageInfo.PageInfo(page);
     }
@@ -440,12 +443,17 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             if(!oldCameraDetail.getType().equals(cameraDetail.getType())){
                 throw new BusinessException(ResultCode.CAMERA_TYPE_NOT_ERROR);
             }
+            String dataSource = scenePro == null ? null :scenePro.getDataSource();
+            if(scenePlus !=null){
+                ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
+                dataSource = scenePlusExt.getDataSource();
+            }
             scenePlusService.updatePayStatus(num,scenePro == null ?"v4":"v3",scenePro == null?scenePlus.getSceneSource():scenePro.getSceneSource(),1,cameraDetail,user);
             scenePlusService.move(num,scenePro == null ?"v4":"v3",cameraDetail,user);
             if(sceneSource == 4 || sceneSource == 5){
-                String dataSource = scenePro == null ? scenePlusExtService.getByPlusId(scenePlus.getId()).getDataSource() : scenePro.getDataSource();
                 laserService.move(num, oldCamera.getSnCode(), camera.getSnCode(), user.getId(), dataSource);
             }
+            sceneMoveLogService.saveLog(scenePro,scenePlus,camera.getSnCode(),oldCamera.getSnCode(),dataSource,dataSource, null);
         }
     }
 }

src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -37,6 +37,7 @@ public class SceneVo {
     private Boolean isMain = true;
     private Boolean isDel = true;
     private Boolean isDownload = true;
+    private Boolean isMigrate = true;
 
     private Boolean coldStorage = false;
 

src/main/resources/mapper/manage_jp/SceneMoveLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.manage_jp.mapper.ISceneMoveLogMapper">
+
+</mapper>