版本升级 条件判断

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

@@ -91,6 +91,14 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             return AjaxResult.error("当前版本ID不存在！");
         }
         BeanUtils.copyProperties(baseCameraVersion, baseCameraVersionVo);
+        CameraUpdateLog cameraUpdateLog = new CameraUpdateLog();
+        cameraUpdateLog.setVersionId(baseCameraVersion.getId());
+        cameraUpdateLog.setVersionNum(baseCameraVersion.getVersionNum());
+        cameraUpdateLog.setVersionName(baseCameraVersion.getVersionName());
+        cameraUpdateLog.setUpgradeType(baseCameraVersion.getUpgradeType());
+        cameraUpdateLog.setCreateBy(userId);
+        cameraUpdateLog.setCreateTime(new Date());
+//        int id = cameraUpdateLogMapper.insertCameraUpdateLog(cameraUpdateLog);
         for (String cameraCode : baseCameraVersionVo.getCameraCodeList()) {
             LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
             if (!StringUtils.isEmptySunhh(cameraCode)) {
@@ -107,15 +115,6 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             baseCameraManagement.setLastVersionNum(lastVersionNum);
             baseCameraManagementMapper.updateById(baseCameraManagement);
 
-            CameraUpdateLog cameraUpdateLog = new CameraUpdateLog();
-            cameraUpdateLog.setCameraCode(cameraCode);
-            cameraUpdateLog.setVersionNum(baseCameraVersion.getVersionNum());
-            cameraUpdateLog.setVersionName(baseCameraVersion.getVersionName());
-            cameraUpdateLog.setUpgradeType(baseCameraVersion.getUpgradeType());
-            cameraUpdateLog.setStatus(2);
-            cameraUpdateLog.setCreateBy(userId);
-            cameraUpdateLog.setCreateTime(new Date());
-            int insert = cameraUpdateLogMapper.insert(cameraUpdateLog);
         }
         PublishClient.updateDeviceSn(baseCameraVersionVo);
         new SubscribeClient("update", "update").start();

hazard-admin/src/main/java/com/ozs/web/controller/accountmanagment/BaseCameraVersionController.java

@@ -55,7 +55,7 @@ public class BaseCameraVersionController extends BaseController {
         if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getId())) {
             return AjaxResult.error("相机版本id不能为空！");
         }
-        if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getCameraCodeList())) {
+        if (StringUtils.isEmptySunhh(baseCameraVersion) || baseCameraVersion.getCameraCodeList().size() == 0) {
             return AjaxResult.error("相机编码列表 不能为空！");
         }
         return baseCameraVersionService.cameraVersionUpgrade(baseCameraVersion, getUserId());