fix

zhanzhiqin

2022-02-28 ae455820d8b96accda128907abe47fcd359ad4af

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

@@ -9,6 +9,7 @@
import com.sandu.ximon.admin.service.MonitorService;
import com.sandu.ximon.dao.bo.MonitorBo;
import com.sandu.ximon.dao.domain.Monitor;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -23,6 +24,9 @@
public class MonitorController {
    private final MonitorService monitorService;

    private final MonitorMapper monitorMapper;


    /**
     * 模糊查询
     *
@@ -30,13 +34,32 @@
     */
    @PostMapping("/listMonitor")
    public ResponseVO<Object> listMonitorByKeyword(BaseConditionVO baseConditionVO, @RequestBody(required = false) MonitorParam monitorParam) {
        List<MonitorBo> list;
        if (monitorParam == null) {
            list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
        } else {
            list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
//        //查询数据库的摄像头信息列表
//        if (monitorParam == null) {
//            list = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
//        } else {
//            list = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
//        }

        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);
        }
        return ResponseUtil.successPage(list);
        //返回查询的摄像头信息列表
        List<MonitorBo> listresult;
        if (monitorParam == null) {
            listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
        } else {
            listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
        }

        return ResponseUtil.successPage(listresult);
    }


@@ -141,7 +164,7 @@
            monitor.setDevicesCode(monitorParam.getValidateCode());
            monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
            monitor.setDeviceType(getMonitorDto.getData().getModel());
            monitor.setEquipmentStatus(getMonitorDto.getData().getStatus());
            monitor.setEquipmentState(getMonitorDto.getData().getStatus());
            monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
            monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
            monitor.setNetAddress(getMonitorDto.getData().getNetAddress());