摄像头系统参数

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

@@ -2,6 +2,7 @@ package com.ozs.service.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.ozs.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -10,6 +11,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @Author : sunhh
@@ -21,6 +23,10 @@ import java.util.Date;
 @Builder
 @ApiModel("相机版本管理表")
 public class BaseCameraVersion {
+    /**
+     * 摄像头系统参数
+     */
+    private List<BaseVersionCameraParam> baseVersionCameraParamList;
 
     /**
      * 主键ID
@@ -56,6 +62,7 @@ public class BaseCameraVersion {
     /**
      * 创建时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
 
     /**
@@ -66,6 +73,7 @@ public class BaseCameraVersion {
     /**
      * 修改时间
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
     /**

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

@@ -0,0 +1,51 @@
+package com.ozs.service.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @Author : sunhh
+ * @create 2023/4/26 14:43
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@ApiModel("摄像头系统参数")
+public class BaseVersionCameraParam {
+
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 版本ID
+     */
+    private Long versionId;
+    /**
+     * key
+     */
+    private String key;
+    /**
+     * value
+     */
+    private String value;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+}

business-service/src/main/java/com/ozs/service/mapper/BaseVersionCameraParamMapper.java

@@ -0,0 +1,14 @@
+package com.ozs.service.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ozs.service.entity.BaseCameraVersion;
+import com.ozs.service.entity.BaseVersionCameraParam;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author : sunhh
+ * @create 2023/4/26 14:50
+ */
+@Mapper
+public interface BaseVersionCameraParamMapper extends BaseMapper<BaseVersionCameraParam> {
+}

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

@@ -7,15 +7,9 @@ import com.github.pagehelper.PageHelper;
 import com.ozs.common.core.domain.AjaxResult;
 import com.ozs.common.utils.StringUtils;
 import com.ozs.common.utils.bean.BeanUtils;
-import com.ozs.service.entity.BaseCameraManagement;
-import com.ozs.service.entity.BaseCameraVersion;
-import com.ozs.service.entity.CameraLogDetail;
-import com.ozs.service.entity.CameraUpdateLog;
+import com.ozs.service.entity.*;
 import com.ozs.service.entity.vo.BaseCameraVersionVo;
-import com.ozs.service.mapper.BaseCameraManagementMapper;
-import com.ozs.service.mapper.BaseCameraVersionMapper;
-import com.ozs.service.mapper.CameraLogDetailMapper;
-import com.ozs.service.mapper.CameraUpdateLogMapper;
+import com.ozs.service.mapper.*;
 import com.ozs.service.service.BaseCameraVersionService;
 import com.ozs.service.utils.PublishClient;
 import com.ozs.service.utils.SubscribeClient;
@@ -44,6 +38,8 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
     private CameraLogDetailMapper cameraLogDetailMapper;
     @Resource
     private BaseCameraManagementMapper baseCameraManagementMapper;
+    @Autowired
+    private BaseVersionCameraParamMapper baseVersionCameraParamMapper;
 
     @Override
     public AjaxResult cameraVersionAdd(BaseCameraVersion baseCameraVersion, String userId) {
@@ -62,6 +58,15 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             baseCameraVersion.setCreateTime(date);
             baseCameraVersion.setUpdateTime(date);
             baseCameraVersionMapper.insert(baseCameraVersion);
+            // 升级类型 0.固件 1.算法 2:算法及硬件升级 3:摄像头系统参数
+            if ("3".equals(baseCameraVersion.getUpgradeType()) && baseCameraVersion.getBaseVersionCameraParamList().size() > 0) {
+                for (BaseVersionCameraParam baseVersionCameraParam : baseCameraVersion.getBaseVersionCameraParamList()) {
+                    baseVersionCameraParam.setVersionId(baseCameraVersion.getId());
+                    baseVersionCameraParam.setCreateBy(userId);
+                    baseVersionCameraParam.setCreateTime(new Date());
+                    baseVersionCameraParamMapper.insert(baseVersionCameraParam);
+                }
+            }
         } else {
             return AjaxResult.error("当前版本号或版本名称已存在，请核对后在添加！");
         }