Merge branch 'master' of http://124.70.58.209:3000/ytrd-project-management/GeoHazardMonitor

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

@@ -20,7 +20,11 @@
         a.start_recording AS startRecording,
         a.task_id AS taskId,
         a.create_time AS createTime,
-        a.remark AS remark
+        a.remark AS remark,
+        a.version_id AS versionId,
+        a.version_num AS versionNum,
+        a.version_name AS versionName,
+        a.last_version_num AS lastVersionNum
         FROM
         base_camera_management a
         <where>

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

@@ -1,5 +1,6 @@
 package com.ozs.web.controller.accountmanagment;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.ozs.common.annotation.Log;
 import com.ozs.common.core.controller.BaseController;
@@ -51,9 +52,11 @@ public class BaseCameraVersionController extends BaseController {
     @PostMapping("/cameraVersionUpgrade")
     @Log(title = "相机版本管理", businessType = BusinessType.INSERT)
     public AjaxResult cameraVersionUpgrade(@RequestBody BaseCameraVersionVo baseCameraVersion) {
-        if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getId())
-                || StringUtils.isEmptySunhh(baseCameraVersion.getCameraCodeList())) {
-            return AjaxResult.error("相机版本id, 相机编码列表 不能为空！");
+        if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getId())) {
+            return AjaxResult.error("相机版本id不能为空！");
+        }
+        if (StringUtils.isEmptySunhh(baseCameraVersion) || StringUtils.isEmptySunhh(baseCameraVersion.getCameraCodeList())) {
+            return AjaxResult.error("相机编码列表 不能为空！");
         }
         return baseCameraVersionService.cameraVersionUpgrade(baseCameraVersion, getUserId());
     }
@@ -133,11 +136,18 @@ public class BaseCameraVersionController extends BaseController {
         if (StringUtils.isEmptySunhh(ids)) {
             return AjaxResult.error("删除ID不能为空！");
         }
-        boolean delete = baseCameraVersionService.removeByIds(ids);
-        if (delete) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error();
+        for (Long id : ids) {
+            LambdaQueryWrapper<BaseCameraManagement> wrapper = new LambdaQueryWrapper<>();
+            if (!StringUtils.isEmptySunhh(id)) {
+                wrapper.eq(BaseCameraManagement::getVersionId, id);
+            }
+            List<BaseCameraManagement> list = baseCameraManagementService.list(wrapper);
+            if (!StringUtils.isEmptySunhh(list) && list.size() > 0) {
+                return AjaxResult.error("删除ID: " + id + "，已经升级了相机，不能删除！");
+            }
+            boolean delete = baseCameraVersionService.removeById(id);
         }
+        // boolean delete = baseCameraVersionService.removeByIds(ids);
+        return AjaxResult.success();
     }
 }