fix

zhanzhiqin

2021-12-28 7abc2e222ce399ffc724c485142e5c42ff3da3b2

fix

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java

@@ -173,7 +173,7 @@
    }

    /**
     * 编辑摄像头设备信息
     * 获取摄像头URL播放地址
     */
    @GetMapping("/getMonitorVideoUrl")
    public ResponseVO<Object> getMonitorVideoUrl(@RequestBody MonitorParam monitorParam) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/WaterQualityEquipmentController.java

@@ -22,7 +22,7 @@
    @GetMapping
    public ResponseVO<Object> listWaterQualityEquipment() {
        List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipment();
        return ResponseUtil.successPage(list);
        return ResponseUtil.success(list);
    }

    /**
@@ -33,9 +33,14 @@
    @GetMapping("/listWaterQualityEquipmentByKeyword/{keyword}")
    public ResponseVO<Object> listWaterQualityEquipmentByKeyword(@PathVariable String keyword) {
        List<WaterQualityEquipment> list = waterQualityEquipmentService.listWaterQualityEquipmentByKeyword(keyword);
        return ResponseUtil.successPage(list);
        return ResponseUtil.success(list);
    }

    /**
     * 删除水质设备
     * @param id
     * @return
     */
    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteWaterQualityEquipment(@PathVariable Long id) {
        boolean result = waterQualityEquipmentService.deleteWaterQualityEquipment(id);

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/MonitorService.java

@@ -41,6 +41,9 @@
    //获取萤石云摄像头播放地址URL
    private static final String GET_VEDIO_URL = "/v2/live/address/get";


    private final PoleBindingService poleBindingService;

    /**
     * 查询全部摄像头
     */
@@ -95,6 +98,9 @@
        if (monitor == null) {
            throw new BusinessException("找不到摄像头");
        }

        //删除摄像头设备前需要先解绑
        poleBindingService.unBindPole(monitor.getDeviceSerial());
        return removeById(Id);
    }


 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleBindingService.java

@@ -20,6 +20,13 @@

    private final LightReportDataService lightReportDataService;

    /**
     * 灯杆绑定设备
     *
     * @param poleId
     * @param param
     * @return
     */
    public boolean bindPole(Long poleId, PoleBindingParam param) {
        Integer deviceType = param.getDeviceType();
//        if (PoleBindingEnums.LIGHT.getCode().equals(deviceType)) {
@@ -36,9 +43,20 @@
        } else {
            throw new BusinessException("该设备已绑定过");
        }
    }

    /**
     * 灯杆解绑设备，删除设备前需要解绑
     *
     * @param deviceCode
     */
    public void unBindPole(String deviceCode) {
        if (deviceCode == null)
            throw new BusinessException("设备编号不能为空");

//        return false;

        PoleBinding one = getOne(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getDeviceCode, deviceCode));
        if (one != null) {
            removeById(one.getId());
        }
    }
}

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/WaterQualityEquipmentService.java

@@ -19,6 +19,7 @@
@AllArgsConstructor
public class WaterQualityEquipmentService extends BaseServiceImpl<WaterQualityEquipmentMapper, WaterQualityEquipment> {
    private WaterQualityEquipmentMapper waterQualityEquipmentMapper;
    private final PoleBindingService poleBindingService;
    /**
     * 查询全部水质设备
     */
@@ -59,6 +60,9 @@
        if (waterQualityEquipment == null) {
            throw new BusinessException("找不到水质设备");
        }
        //删除摄水质设备前需要先解绑
        poleBindingService.unBindPole(waterQualityEquipment.getWaterQualityEquipmentCode());

        return removeById(Id);
    }