相机树开发

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

@@ -75,13 +75,4 @@ public class BaseDeviceDynamicManagement extends BaseEntity implements Serializa
      */
     private Integer isDisable;
 
-    /**
-     *设备状态信息(1已读2未读)
-     */
-    private  Integer facilityState;
-
-    /**
-     *设备电量信息(1已读2未读)
-     */
-    private  Integer electricityState;
 }

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

@@ -56,5 +56,5 @@ public class BaseCameraManagementDto extends BaseEntity implements Serializable
 
 
     private String lineNumber;
-    
+
 }

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

@@ -56,5 +56,4 @@ public class BaseCameraVO implements Serializable{
      * 状态
      */
     private String status;
-
 }

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

@@ -47,17 +47,5 @@ public class DeviceStateResp extends PageVo implements Serializable {
     private Integer railwayType;
     private String railwayCode;
     private String deptId;
-    /**
-     * 设备状态信息(1已读2未读)
-     */
-    private  Integer facilityState;
 
-    /**
-     *设备电量信息(1已读2未读)
-     */
-    private  Integer electricityState;
-    /**
-     * 1电量2设备状态
-     */
-    private Integer category;
 }

business-service/src/main/java/com/ozs/service/mapper/BaseCameraManagementMapper.java

@@ -26,7 +26,6 @@ public interface BaseCameraManagementMapper extends BaseMapper<BaseCameraManagem
 
     Integer countCamera(MsgAlarmVo msgAlarmVo);
 
-
     Map<String, Object> getCameraChannelByAlarmId(@Param("alarmId") String alarmId);
 
     List<DeviceStateResp> deviceStatePage(DeviceStateResp deviceStateResp);

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

@@ -408,11 +408,6 @@ public class BaseCameraManagementServiceImpl extends ServiceImpl<BaseCameraManag
     @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();
     }

business-service/src/main/java/com/ozs/service/service/impl/BaseDeviceDynamicManagementServiceImpl.java

@@ -55,9 +55,8 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 }
 
                 // 线路
-                CameraTree.CameraTreeBuilder builder  = CameraTree.builder()
+                CameraTree.CameraTreeBuilder builder = CameraTree.builder()
                         .code(o.getRailwayCode())
-                        .name(o.getLineNumber()+o.getRailwayName())
                         .railwayName(o.getRailwayName())
                         .flay(true)
                         .publicWorksSection(o.getPublicWorksSection())
@@ -68,7 +67,6 @@ public class BaseDeviceDynamicManagementServiceImpl extends ServiceImpl<BaseDevi
                 }else {
                     builder.name(o.getRailwayName());
                 }
-
                 CameraTree build = builder.build();
                 if (!cameraTree.getChildren().stream()
                         .map(CameraTree::getCode)

business-service/src/main/java/com/ozs/service/service/impl/CameraCaptureService.java

@@ -86,7 +86,7 @@ public class CameraCaptureService {
 //                if (log.isDebugEnabled()) {
 //                    log.debug("生成至服务器本地结束，路径为: " + uploadUrl);
 //                }
-               //byteArrayInputStream.reset();
+                //byteArrayInputStream.reset();
 //                if (log.isDebugEnabled()) {
 //                    log.debug("getCapture======" + fileName);
 //                }

business-service/src/main/resources/mapper/service/BaseCameraManagementMapper.xml

@@ -147,9 +147,7 @@
         man.electricity,
         ca.camera_code AS cameraCode,
         ca.camera_sn AS cameraSn,
-        man.update_time AS updateTime,
-        man.facility_state AS facilityState,
-        man.electricity_state AS electricityState
+        man.update_time AS updateTime
         FROM
         base_camera_management AS ca
         LEFT JOIN base_railway_management AS ra ON ca.railway_code = ra.railway_code
@@ -165,17 +163,11 @@
             <if test="electricity != null and electricity != ''">
                 and man.electricity &lt;=#{electricity}
             </if>
-            <if test="facilityState != null and facilityState != 0">
-                and man.facility_state =#{facilityState}
-            </if>
-            <if test="electricityState != null and electricityState != 0">
-                and man.electricity_state =#{electricityState}
-            </if>
             <if test="lineDir != null and lineDir != 0">
                 and ca.line_dir =#{lineDir}
             </if>
             <if test="railwayType != null and railwayType != 0">
-                and ca.railway_type =#{railwayType}
+                and ra.railway_type =#{railwayType}
             </if>
             <if test="deptId != null and deptId != 0">
                 and ca.dept_id =#{deptId}
@@ -199,7 +191,7 @@
             </if>
         </where>
         ORDER BY man.is_disable DESC,
-        man.electricity
+        man.update_time DESC
     </select>
     <select id="alarmCountSort" resultType="com.ozs.service.entity.vo.AlarmCountSortVo">
         SELECT COUNT(m.camera_code) AS cameraCount,c.camera_code AS cameraCode,c.measure_point_name AS measurePointName

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

@@ -1118,65 +1118,51 @@ public class BaseCameraManagementController extends BaseController {
     @GetMapping("/getMalfunctionAndLowCameraManagement")
     public AjaxResult getMalfunctionAndLowCameraManagement() {
         HashMap<String, Integer> map = new HashMap<>();
-        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(BaseDeviceDynamicManagement::getIsDisable, 2);
-        List<BaseDeviceDynamicManagement> isDisable = baseDeviceDynamicManagementService.list(wrapper);
-        List<BaseDeviceDynamicManagement> collect = isDisable.stream().filter(f -> f.getFacilityState() == 2).collect(Collectors.toList());
-        map.put("isDisable", collect.size());
+        DeviceStateResp deviceStateResp1 = new DeviceStateResp();
+        DeviceStateResp deviceStateResp = (DeviceStateResp) dataScoreUtil.setDataScore(getUserId(),deviceStateResp1);
+        List<DeviceStateResp> deviceStateRespList = baseCameraManagementService.deviceStateRespList(deviceStateResp);
+        List<DeviceStateResp> isDisable = deviceStateRespList.stream().filter(f -> f.getIsDisable().equals("2")).collect(Collectors.toList());
+        map.put("isDisable", isDisable.size());
         LambdaQueryWrapper<BaseDeviceDynamicManagement> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.le(BaseDeviceDynamicManagement::getElectricity, 10);
-        List<BaseDeviceDynamicManagement> electricity = baseDeviceDynamicManagementService.list(queryWrapper);
-
-        List<BaseDeviceDynamicManagement> collect1 = electricity.stream().filter(f -> f.getElectricityState() == 2).collect(Collectors.toList());
-
-
-        map.put("electricity", collect1.size());
+        List<DeviceStateResp> electricity = deviceStateRespList.stream().filter(f -> f.getElectricity()==10).collect(Collectors.toList());
+        map.put("electricity", electricity.size());
         map.put("count", isDisable.size() + electricity.size());
-        map.put("readCount", collect.size() + collect1.size());
+        map.put("readCount", isDisable.size()+electricity.size());
         return AjaxResult.success(map);
     }
 
     /**
      * 修改设备状态信息(1已读2未读)
+     * 废弃
      */
-    @PostMapping("/updateState")
-    public AjaxResult updateState(@RequestBody List<DeviceStateResp> deviceStateRespList) {
-        List<String> list = deviceStateRespList.stream().map(DeviceStateResp::getCameraCode).collect(Collectors.toList());
-        BaseDeviceDynamicManagement dynamicManagement = new BaseDeviceDynamicManagement();
-        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
-        wrapper.in(BaseDeviceDynamicManagement::getCameraCode, list);
-        if (deviceStateRespList.get(0).getCategory() == 1) {
-            dynamicManagement.setElectricityState(1);
-        } else {
-            dynamicManagement.setFacilityState(1);
-        }
-        boolean update = baseDeviceDynamicManagementService.update(dynamicManagement, wrapper);
-        if (update) {
-            return AjaxResult.success();
-        } else {
-            return AjaxResult.error();
-        }
-    }
+//    @PostMapping("/updateState")
+//    public AjaxResult updateState(@RequestBody List<DeviceStateResp> deviceStateRespList) {
+//        List<String> list = deviceStateRespList.stream().map(DeviceStateResp::getCameraCode).collect(Collectors.toList());
+//        BaseDeviceDynamicManagement dynamicManagement = new BaseDeviceDynamicManagement();
+//        LambdaQueryWrapper<BaseDeviceDynamicManagement> wrapper = new LambdaQueryWrapper<BaseDeviceDynamicManagement>();
+//        wrapper.in(BaseDeviceDynamicManagement::getCameraCode, list);
+//        boolean update = baseDeviceDynamicManagementService.update(dynamicManagement, wrapper);
+//        if (update) {
+//            return AjaxResult.success();
+//        } else {
+//            return AjaxResult.error();
+//        }
+//    }
+
 
-    @GetMapping("getDuration")
-    public void getDuration() {
-        cameraUtil.getDuration("1");
-    }
 
 
     /**
      * 首页设备状态
-     *
      * @return
      */
     @GetMapping("cameraStateTotal")
     public AjaxResult cameraStateTotal() {
-        return baseCameraManagementService.cameraStateTotal();
+     return baseCameraManagementService.cameraStateTotal();
     }
 
     /**
      * 首页设备状态列表
-     *
      * @return
      */
     @GetMapping("cameraStateList")
@@ -1187,12 +1173,12 @@ public class BaseCameraManagementController extends BaseController {
 
     /**
      * 批量修改相机已读未读状态
-     *
+     * 废弃
      * @return
      */
-    @GetMapping("updateStateAll/{state}")
-    public AjaxResult updateStateAll(@PathVariable Integer state) {
-        return baseCameraManagementService.updateStateAll(state);
-    }
+//    @GetMapping("updateStateAll/{state}")
+//    public AjaxResult updateStateAll(@PathVariable Integer state) {
+//        return baseCameraManagementService.updateStateAll(state);
+//    }
 }