Browse Source

首页地图优化

gao.qiang 1 month ago
parent
commit
ff6e751815

+ 0 - 4
business-service/src/main/java/com/ozs/service/service/impl/BaseCameraManagementServiceImpl.java

@@ -186,10 +186,6 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
 //        List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectList(lw);
 //        List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.selectList(lw);
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.cameraManagementList(baseCameraManagementVo);
         List<BaseCameraManagement> baseCameraManagementList = baseCameraManagementMapper.cameraManagementList(baseCameraManagementVo);
         List<BaseCameraManagementHomeVo> allListVo = BeanUtils.entityListToVOList(baseCameraManagementList, BaseCameraManagementHomeVo.class);
         List<BaseCameraManagementHomeVo> allListVo = BeanUtils.entityListToVOList(baseCameraManagementList, BaseCameraManagementHomeVo.class);
-        for (BaseCameraManagementHomeVo baseCameraManagementHomeVo : allListVo) {
-            Integer isLock = msgAlarmMapper.selectCameraCode(baseCameraManagementHomeVo.getCameraCode());
-            baseCameraManagementHomeVo.setIsLock(isLock != null ? isLock : 1);
-        }
         return allListVo;
         return allListVo;
     }
     }
 
 

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

@@ -253,7 +253,8 @@
         a.measure_point_name AS measurePointName,
         a.measure_point_name AS measurePointName,
         a.camera_sn AS cameraSn,
         a.camera_sn AS cameraSn,
         r.railway_type AS railwayType,
         r.railway_type AS railwayType,
-        man.is_disable AS isDisable
+        man.is_disable AS isDisable,
+        IF(msg.is_lock IS NULL OR msg.is_lock = '', 1, msg.is_lock) AS isLock
         FROM
         FROM
         base_camera_management a join base_railway_management r
         base_camera_management a join base_railway_management r
         on a.railway_code=r.railway_code
         on a.railway_code=r.railway_code