需求修改

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

@@ -660,7 +660,7 @@ public class BaseCameraManagementController extends BaseController {
             msgAlarmResp.setAlarmMile(baseCameraManagement.getInstallMile().toString());
             return AjaxResult.success(msgAlarmResp);
         } else {
-            return error("该相机没有报警消息");
+            return AjaxResult.success(new  MsgAlarmResp());
         }
     }
 }

hazard-admin/src/main/java/com/ozs/web/controller/common/CaptchaController.java

@@ -46,12 +46,12 @@ public class CaptchaController
     public AjaxResult getCode(HttpServletResponse response) throws IOException
     {
         AjaxResult ajax = AjaxResult.success();
-//        boolean captchaEnabled = configService.selectCaptchaEnabled();
-//        ajax.put("captchaEnabled", captchaEnabled);
-//        if (!captchaEnabled)
-//        {
-//            return ajax;
-//        }
+        boolean captchaEnabled = configService.selectCaptchaEnabled();
+        ajax.put("captchaEnabled", captchaEnabled);
+        if (!captchaEnabled)
+        {
+            return ajax;
+        }
 
         // 保存验证码信息
         String uuid = IdUtils.simpleUUID();