部门名称添加

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

@@ -92,5 +92,8 @@ public class MsgAlarmResp implements Serializable {
     /** 报警图片地址 */
     private List<String> imageUrls;
 
-
+    /**
+     * 所属工务段编码(单位名称)
+     */
+    private String deptName;
 }

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

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

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

@@ -19,6 +19,7 @@ import com.ozs.service.entity.vo.*;
 import com.ozs.service.mapper.MsgAlarmMapper;
 import com.ozs.service.service.*;
 import com.ozs.system.service.DataScoreUtil;
+import com.ozs.system.service.ISysDeptService;
 import com.ozs.system.service.ISysDictDataService;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -85,6 +86,8 @@ public class MsgAlarmController extends BaseController {
     private DataScoreUtil dataScoreUtil;
     @Resource
     private BaseUserService baseUserService;
+    @Autowired
+    private ISysDeptService deptService;
 
     /**
      * web更多消息-总数，已读数
@@ -205,7 +208,11 @@ public class MsgAlarmController extends BaseController {
                 o.setEndMile(end);
                 String begin = AppendUtils.stringAppend(cameraManagement.getBeginMile());
                 o.setBeginMile(begin);
-                o.setAlarmCount((int) msgAlarmFrequencyService.count());
+                LambdaQueryWrapper<MsgAlarmFrequency> wrapper = new LambdaQueryWrapper<MsgAlarmFrequency>();
+                if (!ObjectUtils.isEmpty(o.getAlarmId())) {
+                    wrapper.eq(MsgAlarmFrequency::getAlarmId, o.getAlarmId());
+                }
+                o.setAlarmCount((int) msgAlarmFrequencyService.count(wrapper));
                 return o;
             }).collect(Collectors.toList());
             page.setRecords(dto1);
@@ -279,6 +286,8 @@ public class MsgAlarmController extends BaseController {
             String mile = AppendUtils.stringAppend(baseCameraManagement.getInstallMile());
             msgAlarmResp.setAlarmMile(mile);
             msgAlarmResp.setInstallLongitude(baseCameraManagement.getInstallLongitude() + "," + baseCameraManagement.getInstallLatitude());
+            SysDept sysDept = deptService.selectDeptById(baseCameraManagement.getDeptId());
+            msgAlarmResp.setDeptName(sysDept.getDeptName());
             return AjaxResult.success(msgAlarmResp);
         } else {
             return success("无报警信息数据");