fix

zhanzhiqin

2022-04-20 f78a9e03ae3f455a85dfd4d8a258dc0fbbb9e694

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

@@ -6,9 +6,12 @@
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.dto.YSY_MonitorDto;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.security.PermissionConfig;
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.enums.MenuEnum;
import com.sandu.ximon.dao.mapper.MonitorMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -23,6 +26,10 @@
public class MonitorController {
    private final MonitorService monitorService;

    private final MonitorMapper monitorMapper;
    private PermissionConfig permissionConfig;


    /**
     * 模糊查询
     *
@@ -30,13 +37,35 @@
     */
    @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);
//        }
        if (!permissionConfig.check(MenuEnum.MONITOR_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        return ResponseUtil.successPage(list);

        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) {
            listresult = monitorService.listMonitorByKeyword(baseConditionVO, new MonitorParam());
        } else {
            listresult = monitorService.listMonitorByKeyword(baseConditionVO, monitorParam);
        }

        return ResponseUtil.successPage(listresult);
    }


@@ -67,6 +96,17 @@
    }

    /**
     * 获取萤石云摄像头信息
     *
     * @param
     * @return
     */
    @GetMapping("/getYSYInfo/{deviceSerial}")
    public ResponseVO<Object> getMonitorInfo(@PathVariable String deviceSerial) {
        return ResponseUtil.success(monitorService.getMonitorInfo(deviceSerial));
    }

    /**
     * 添加萤石云摄像头
     *
     * @param monitorParam 添加摄像头结果
@@ -74,7 +114,11 @@
     */
    @PostMapping("/addYSYMonitor")
    public ResponseVO<Object> addYSYMonitor(@RequestBody MonitorParam monitorParam) {
        if (monitorParam == null || monitorParam.getAccessToken() == null || monitorParam.getDeviceSerial() == null) {
            throw new BusinessException("参数不正确！");
        }
        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial(), monitorParam.getValidateCode());
//        YSY_MonitorDto addMonitorDto = monitorService.addYSYMonitor(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(addMonitorDto.getCode())) {
            return ResponseUtil.success(addMonitorDto);
@@ -113,11 +157,22 @@
    /**
     * 获取单个设备信息   getYSYMonitorInfo
     */
    @GetMapping("/getYSYMonitorInfo")
    @PostMapping("/getYSYMonitorInfo")
    public ResponseVO<Object> getYSYMonitorInfo(@RequestBody MonitorParam monitorParam) {
        YSY_MonitorDto getMonitorDto = monitorService.getYSYMonitorInfo(monitorParam.getAccessToken(), monitorParam.getDeviceSerial());

        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
//            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());
            monitorService.addMonitorInfoToTable(monitor);

            return ResponseUtil.success(getMonitorDto.getData());
        } else {
            return ResponseUtil.fail(getMonitorDto.getMsg());
@@ -138,10 +193,12 @@
        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = new Monitor();
            monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
            monitor.setDevicesCode(monitorParam.getValidateCode());
            if (monitorParam.getValidateCode() != null) {
                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());
@@ -184,4 +241,21 @@
        return ResponseUtil.success(URL);
    }


    /**
     * 修改备注
     *
     * @param monitorParam
     * @return
     */
    @PostMapping("/updateNotes")
    public ResponseVO<Object> updateNotes(@RequestBody MonitorParam monitorParam) {
        boolean flag = monitorService.updateNotes(monitorParam.getDeviceSerial(), monitorParam.getNotes());
        if (flag) {
            return ResponseUtil.success("修改备注成功！");
        } else {
            return ResponseUtil.fail("修改备注失败！");
        }
    }

}