2021与蓝度共同重构项目,服务端
liuhaonan
2022-04-24 bef458cd14d2e0f2b09d76b609291f47be3cd525
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/MonitorController.java
@@ -37,26 +37,10 @@
     */
    @PostMapping("/listMonitor")
    public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
//        //查询数据库的摄像头信息列表
//        if (monitorParam == null) {
//            list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
//        } else {
//            list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
//        }
        if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<String> list;
        list = monitorMapper.listMonitorDeviceSerial();
        MonitorParam monitorParam1;
        for (String devices_serial : list) {
            monitorParam1 = new MonitorParam();
            monitorParam1.setAccessToken(monitorService.getAccessToken());
            monitorParam1.setDeviceSerial(devices_serial);
            getYSYMonitorInfoAndaddMonitorToTable(monitorParam1);
        }
        //返回查询的摄像头信息列表
        List<MonitorBo> listresult;
        if (monitorParam == null) {
@@ -189,25 +173,8 @@
     */
    @PostMapping("/getYSYMonitorInfoAndaddMonitorToTable")
    public boolean getYSYMonitorInfoAndaddMonitorToTable(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorService.getAccessToken(), monitorParam.getDeviceSerial());
        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
            if (monitorParam.getValidateCode() != null) {
                monitor.setDevicesCode(monitorParam.getValidateCode());
            }
            monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
            monitor.setDeviceType(getMonitorDto.getData().getModel());
            monitor.setEquipmentState(getMonitorDto.getData().getStatus());
            monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
            monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
            monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
            return monitorService.addMonitorInfoToTable(monitor);
        } else {
            throw new BusinessException(getMonitorDto.getMsg());
        }
        Monitor monitor = monitorService.getYSYMonitorInfoAndaddMonitorToTable(monitorParam);
        return monitorService.addMonitorInfoToTable(monitor);
    }
    /**