Sfoglia il codice sorgente

设备状态和设备状态列表首页开发

gao.qiang 7 mesi fa
parent
commit
6eb3f7379c

+ 2 - 0
business-service/src/main/java/com/ozs/service/service/BaseCameraManagementService.java

@@ -51,4 +51,6 @@ public interface BaseCameraManagementService extends IService<BaseCameraManageme
     AjaxResult cameraStateTotal();
 
     AjaxResult cameraStateList();
+
+    AjaxResult updateStateAll(Integer state);
 }

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

@@ -358,8 +358,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
         List<BaseCameraManagement> list = this.list();
         //异常的相机
         List<BaseDeviceDynamicManagement> alarmList = baseDeviceDynamicManagementMapper.selectList(new LambdaQueryWrapper<BaseDeviceDynamicManagement>()
-                .eq(BaseDeviceDynamicManagement::getIsDisable, 2)
-                .or().le(BaseDeviceDynamicManagement::getElectricity,10));
+                .eq(BaseDeviceDynamicManagement::getIsDisable, 2));
         HashMap<String, Integer> map = new HashMap<>();
         if (!ObjectUtils.isEmpty(list)) {
             //找出所有相机数据
@@ -380,7 +379,7 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
             //找出所有异常的相机 1=高铁的数量
             unresolvedCount = (int) alarmList.stream()
                     .map(base -> baseCameraManagementMapper.selectOne(new LambdaQueryWrapper<BaseCameraManagement>()
-                            .eq(BaseCameraManagement::getCameraCode, base)))
+                            .eq(BaseCameraManagement::getCameraCode, base.getCameraCode())))
                     .filter(Objects::nonNull)
                     .map(management -> baseRailwayManagementMapper.selectOne(new LambdaQueryWrapper<BaseRailwayManagement>()
                             .eq(BaseRailwayManagement::getRailwayCode, management.getRailwayCode()))) // 确保管理信息不是空的
@@ -399,4 +398,16 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     public AjaxResult cameraStateList() {
         return AjaxResult.success(baseRailwayManagementMapper.cameraStateList());
     }
+
+    @Override
+    public AjaxResult updateStateAll(Integer state) {
+        BaseDeviceDynamicManagement baseDeviceDynamicManagement = new BaseDeviceDynamicManagement();
+        if (state==1){
+            baseDeviceDynamicManagement.setFacilityState(1);
+        }else {
+            baseDeviceDynamicManagement.setElectricityState(1);
+        }
+        baseDeviceDynamicManagementMapper.update(baseDeviceDynamicManagement,null);
+        return AjaxResult.success();
+    }
 }

+ 1 - 1
business-service/src/main/resources/mapper/service/BaseRailwayManagementMapper.xml

@@ -18,7 +18,7 @@
     s.dept_name AS deptName,
     COUNT(c.dept_id) AS totalCameraCount,
     COUNT(CASE
-    WHEN b.is_disable = 2 OR b.electricity &lt;= 10 THEN 1
+    WHEN b.is_disable = 2  THEN 1
     END) AS filteredCameraCount
     FROM
     base_camera_management c

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

@@ -1158,5 +1158,15 @@ public class BaseCameraManagementController extends BaseController {
     public AjaxResult cameraStateList() {
         return baseCameraManagementService.cameraStateList();
     }
+
+
+    /**
+     * 批量修改相机已读未读状态
+     * @return
+     */
+    @GetMapping("updateStateAll/{state}")
+    public AjaxResult updateStateAll(@PathVariable Integer state) {
+        return baseCameraManagementService.updateStateAll(state);
+    }
 }