版本升级 前端 传惨 添加版本ID字段

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

@@ -320,6 +320,9 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getCameraCode())) {
             wrapper.eq(BaseCameraManagement::getCameraCode, baseCameraManagement.getCameraCode());
         }
+        if (!StringUtils.isEmptySunhh(baseCameraManagement) && !StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
+            wrapper.ne(BaseCameraManagement::getVersionId, baseCameraManagement.getVersionId());
+        }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementMapper.selectList(wrapper);
         return baseCameraManagements;
     }

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

@@ -140,14 +140,14 @@ public class BaseCameraVersionServiceImpl extends ServiceImpl<BaseCameraVersionM
             cameraLogDetail.setUpdateTime(new Date());
             int insert = cameraLogDetailMapper.insert(cameraLogDetail);
         }
-        if ("3".equals(baseCameraVersionVo.getUpgradeType())){
+        if ("3".equals(baseCameraVersionVo.getUpgradeType())) {
             List<BaseVersionCameraParam> baseVersionCameraParamList = baseCameraVersionVo.getBaseVersionCameraParamList();
             for (BaseVersionCameraParam baseVersionCameraParam : baseVersionCameraParamList) {
-                if ("threshold".equals(baseVersionCameraParam.getParamKey())){
-                    PublishClient.confidenceCoefficient(baseCameraVersionVo,baseVersionCameraParam.getParamValue());
+                if ("threshold".equals(baseVersionCameraParam.getParamKey())) {
+                    PublishClient.confidenceCoefficient(baseCameraVersionVo, baseVersionCameraParam.getParamValue());
                     new SubscribeClient("config", "config").start();
-                }else if("fps".equals(baseVersionCameraParam.getParamKey())){
-                    PublishClient.configFrameRate(baseCameraVersionVo,baseVersionCameraParam.getParamValue());
+                } else if ("fps".equals(baseVersionCameraParam.getParamKey())) {
+                    PublishClient.configFrameRate(baseCameraVersionVo, baseVersionCameraParam.getParamValue());
                     new SubscribeClient("config", "config").start();
                 }
             }

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

@@ -75,6 +75,9 @@ public class BaseCameraVersionController extends BaseController {
     @PostMapping("/cameraAllList")
     @Log(title = "相机版本管理", businessType = BusinessType.SELECT)
     public AjaxResult cameraAllList(@RequestBody BaseCameraManagement baseCameraManagement) {
+        if (StringUtils.isEmptySunhh(baseCameraManagement) || StringUtils.isEmptySunhh(baseCameraManagement.getVersionId())) {
+            return AjaxResult.error("相机版本id不能为空！");
+        }
         List<BaseCameraManagement> baseCameraManagements = baseCameraManagementService.cameraAllList(baseCameraManagement);
         return AjaxResult.success(baseCameraManagements);
     }