版本升级 摄像头系统参数

business-service/src/main/java/com/ozs/service/entity/BaseCameraVersion.java

@@ -1,6 +1,7 @@
 package com.ozs.service.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
@@ -26,6 +27,7 @@ public class BaseCameraVersion {
     /**
      * 摄像头系统参数
      */
+    @TableField(exist = false)
     private List<BaseVersionCameraParam> baseVersionCameraParamList;
 
     /**

business-service/src/main/java/com/ozs/service/entity/vo/BaseCameraVersionVo.java

@@ -1,10 +1,12 @@
 package com.ozs.service.entity.vo;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.annotation.Excel;
 import com.ozs.common.vo.PageVo;
+import com.ozs.service.entity.BaseVersionCameraParam;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -22,6 +24,11 @@ public class BaseCameraVersionVo {
     @ApiModelProperty("页大小")
     private Long pageSize;
 
+    /**
+     * 摄像头系统参数
+     */
+    private List<BaseVersionCameraParam> baseVersionCameraParamList;
+
     /**
      * 相机编码
      */

business-service/src/main/java/com/ozs/service/service/impl/BaseCameraVersionServiceImpl.java

@@ -100,6 +100,13 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             return AjaxResult.error("当前版本ID不存在！");
         }
         BeanUtils.copyProperties(baseCameraVersion, baseCameraVersionVo);
+        LambdaQueryWrapper<BaseVersionCameraParam> wrapperBaseVersionCameraParam = new LambdaQueryWrapper<>();
+        if (!StringUtils.isEmptySunhh(baseCameraVersionVo) && !StringUtils.isEmptySunhh(baseCameraVersionVo.getId())) {
+            wrapperBaseVersionCameraParam.eq(BaseVersionCameraParam::getVersionId, baseCameraVersionVo.getId());
+        }
+        List<BaseVersionCameraParam> baseVersionCameraParams = baseVersionCameraParamMapper.selectList(wrapperBaseVersionCameraParam);
+        baseCameraVersionVo.setBaseVersionCameraParamList(baseVersionCameraParams);
+
         CameraUpdateLog cameraUpdateLog = new CameraUpdateLog();
         cameraUpdateLog.setVersionId(baseCameraVersion.getId());
         cameraUpdateLog.setVersionNum(baseCameraVersion.getVersionNum());