版本升级 日志

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

@@ -9,10 +9,12 @@ 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.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.service.BaseCameraVersionService;
 import com.ozs.service.utils.PublishClient;
@@ -38,6 +40,8 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
     private BaseCameraVersionMapper baseCameraVersionMapper;
     @Autowired
     private CameraUpdateLogMapper cameraUpdateLogMapper;
+    @Autowired
+    private CameraLogDetailMapper cameraLogDetailMapper;
     @Resource
     private BaseCameraManagementMapper baseCameraManagementMapper;
 
@@ -98,7 +102,7 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
         cameraUpdateLog.setUpgradeType(baseCameraVersion.getUpgradeType());
         cameraUpdateLog.setCreateBy(userId);
         cameraUpdateLog.setCreateTime(new Date());
-//        int id = cameraUpdateLogMapper.insertCameraUpdateLog(cameraUpdateLog);
+        int id = cameraUpdateLogMapper.insert(cameraUpdateLog);
         for (String cameraCode : baseCameraVersionVo.getCameraCodeList()) {
             LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
             if (!StringUtils.isEmptySunhh(cameraCode)) {
@@ -108,13 +112,19 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             if (StringUtils.isEmptySunhh(baseCameraManagement)) {
                 return AjaxResult.error("相机编码：" + cameraCode + "不存在！");
             }
-            String lastVersionNum = baseCameraManagement.getLastVersionNum();
+            String lastVersionNum = baseCameraManagement.getVersionNum();
             baseCameraManagement.setVersionId(baseCameraVersion.getId());
             baseCameraManagement.setVersionNum(baseCameraVersion.getVersionNum());
             baseCameraManagement.setVersionName(baseCameraVersion.getVersionName());
             baseCameraManagement.setLastVersionNum(lastVersionNum);
             baseCameraManagementMapper.updateById(baseCameraManagement);
 
+            CameraLogDetail cameraLogDetail = new CameraLogDetail();
+            cameraLogDetail.setLogId(cameraUpdateLog.getId());
+            cameraLogDetail.setCameraCode(cameraCode);
+            cameraLogDetail.setStatus(2);
+            cameraLogDetail.setUpdateTime(new Date());
+            int insert = cameraLogDetailMapper.insert(cameraLogDetail);
         }
         PublishClient.updateDeviceSn(baseCameraVersionVo);
         new SubscribeClient("update", "update").start();

business-service/src/main/resources/mapper/service/CameraUpdateLogMapper.xml

@@ -46,4 +46,54 @@
             </if>
         </where>
     </select>
+
+    <insert id="insertCameraUpdateLog" parameterType="com.ozs.service.entity.CameraUpdateLog">
+        insert into camera_update_log
+        <trim prefix="(" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                id,
+            </if>
+            <if test="versionId != null" >
+                version_id,
+            </if>
+            <if test="versionNum != null" >
+                version_num,
+            </if>
+            <if test="versionName != null" >
+                version_name,
+            </if>
+            <if test="upgradeType != null" >
+                upgrade_type,
+            </if>
+            <if test="createBy != null" >
+                create_by,
+            </if>
+            <if test="createTime != null" >
+                create_time,
+            </if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides="," >
+            <if test="id != null" >
+                #{id},
+            </if>
+            <if test="versionId != null" >
+                #{versionId},
+            </if>
+            <if test="versionNum != null" >
+                #{versionNum},
+            </if>
+            <if test="versionName != null" >
+                #{versionName},
+            </if>
+            <if test="upgradeType != null" >
+                #{upgradeType},
+            </if>
+            <if test="createBy != null" >
+                #{createBy},
+            </if>
+            <if test="createTime != null" >
+                #{createTime},
+            </if>
+        </trim>
+    </insert>
 </mapper>