根据视频ID获取详细信息修改

business-service/src/main/java/com/ozs/service/entity/BaseDeviceDynamicManagement.java

@@ -73,7 +73,7 @@ public class BaseDeviceDynamicManagement extends BaseEntity implements Serializa
     private String remark;
 
     /**
-     * 是否开启录像(1开启2不开启)
+     * 相机状态(1在线2离线)
      */
     private Integer isDisable;
 }

business-service/src/main/java/com/ozs/service/entity/vo/MsgAlarmResp.java

@@ -157,4 +157,8 @@ public class MsgAlarmResp implements Serializable {
      */
     private String measurePointName;
 
+    private String cardNum;
+
+    private String cameraSn;
+
 }

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

@@ -912,6 +912,8 @@ public class BaseCameraManagementController extends BaseController {
             msgAlarmResp.setLineDir(baseCameraManagement.getLineDir());
             SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
             msgAlarmResp.setDeptName(sysDept.getDeptName());
+            msgAlarmResp.setCardNum(baseCameraManagement.getCardNum());
+            msgAlarmResp.setCameraSn(baseCameraManagement.getCameraSn());
             return AjaxResult.success(msgAlarmResp);
         } else {
             return error("该相机编码在相机台账表中不存在");

hazard-admin/src/main/java/com/ozs/web/controller/system/SysDeptController.java

@@ -175,10 +175,14 @@ public class SysDeptController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:role:export')")
     @PostMapping("/export")
     @ApiOperation("部门导出")
-    public void export(HttpServletResponse response, SysDept dept) {
-        List<SysDept> list = forDeptList(dept);
+    public void export(HttpServletResponse response, @RequestBody SysDept dept) {
+        List<SysDept> depts = deptService.selectDeptListAll(dept);
+        for (SysDept sysDept : depts) {
+            SysDept current= deptService.selectDeptById(sysDept.getParentId());
+            sysDept.setParentName(current.getDeptName());
+        }
         ExcelUtil<SysDept> util = new ExcelUtil<SysDept>(SysDept.class);
-        util.exportExcel(response, list, "部门数据");
+        util.exportExcel(response, depts, "部门数据");
     }
 
     /**

hazard-admin/src/main/java/com/ozs/web/controller/system/SysMenuController.java

@@ -141,7 +141,7 @@ public class SysMenuController extends BaseController {
     @PreAuthorize("@ss.hasPermi('system:menu:export')")
     @PostMapping("/export")
     @ApiOperation("菜单导出")
-    public void export(HttpServletResponse response, SysMenu menu) {
+    public void export(HttpServletResponse response, @RequestBody SysMenu menu) {
         LoginUser loginUser = getLoginUser();
         List<SysMenu> list = menuService.selectMenuList(menu, loginUser.getId());
         for (SysMenu menuA : list) {