Merge remote-tracking branch 'origin/master'

liuhaonan

2022-02-28 161ec503806c8b71f5caa2d42c2fa9c03ca062d6

Merge remote-tracking branch 'origin/master'

 dao/src/main/java/com/sandu/ximon/dao/bo/MonitorBo.java

@@ -11,4 +11,8 @@
public class MonitorBo extends Monitor {
    private String poleId;
    private String PoleName;
    private String province;
    private String city;
    private String region;
    private String address;
}

 dao/src/main/java/com/sandu/ximon/dao/domain/Monitor.java

@@ -44,7 +44,7 @@
    /**
     * 在线状态：0-不在线，1-在线
     */
    private Integer equipmentStatus;
    private Integer equipmentState;

    /**
     * 是否加密：0-不加密，1-加密

 dao/src/main/java/com/sandu/ximon/dao/mapper/MonitorMapper.java

@@ -15,7 +15,9 @@
    List<Monitor> listMonitorByKeyword1(String keyword, int bindingState1, int bindingState2);


    List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState);
    List<MonitorBo> listMonitorByIds(String keyword, Long clientId, int bindingState, int equipmentState);

    List<String> listMonitorDeviceSerial();
}



 dao/src/main/resources/mapper/MonitorMapper.xml

@@ -49,7 +49,7 @@
    <select id="listMonitorByIds" resultType="com.sandu.ximon.dao.bo.MonitorBo">
        SELECT
        t1.*, t2.pole_id,
        t3.pole_name
        t3.pole_name, t3.province,t3.city,t3.region,t3.address
        FROM
        monitor t1
        LEFT JOIN pole_binding t2 ON t1.device_serial = t2.device_code
@@ -68,7 +68,13 @@
            <if test="bindingState != 2">
                AND t1.binding_state = #{bindingState}
            </if>
            <if test="equipmentState != 2">
                AND t1.equipment_state = #{equipmentState}
            </if>
        </where>
    </select>
    <select id="listMonitorDeviceSerial" resultType="java.lang.String">
        SELECT device_serial FROM monitor;
    </select>

</mapper>

 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);
    }


@@ -118,6 +141,17 @@
        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());
@@ -141,7 +175,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());

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

@@ -58,59 +58,19 @@
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<MonitorBo> monitorList;
        //绑定状态：已绑定/未绑定/全部
        if (monitorParam.getBindingState() == null || 2 == monitorParam.getBindingState()) {
        if (monitorParam.getBindingState() == null) {
            //全部
            int bindingState = 2;
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, bindingState);
        } else {
            monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState());
            monitorParam.setBindingState(2);
        }
        if (monitorParam.getEquipmentState() == null) {
            //全部
            monitorParam.setEquipmentState(2);
        }

        monitorList = monitorMapper.listMonitorByIds(monitorParam.getKeyword(), clientId, monitorParam.getBindingState(), monitorParam.getEquipmentState());

        return monitorList;
    }


//    /**
//     * 查询全部摄像头
//     */
//    public List<Monitor> listMonitor() {
//        LambdaQueryWrapper<Monitor> wrapper = Wrappers.lambdaQuery(Monitor.class);
//        List<Monitor> list = list(wrapper);
//
//        return list;
//    }
//
//    /**
//     * 模糊查询
//     */
//    public List<Monitor> listMonitorByKeyword(MonitorParam monitorParam) {
//        //设备状态:在线/离线/全部
//        int equipmentState1;
//        int equipmentState2;
//        if (2 == monitorParam.getEquipmentState()) {
//            //在线
//            equipmentState1 = 1;
//            //离线
//            equipmentState2 = 0;
//        } else {
//            equipmentState1 = monitorParam.getEquipmentState();
//            equipmentState2 = monitorParam.getEquipmentState();
//        }
//
//        //绑定状态：已绑定/未绑定/全部
//        int bindingState1;
//        int bindingState2;
//        if (2 == monitorParam.getBindingState()) {
//            //已绑定
//            bindingState1 = 1;
//            //未绑定
//            bindingState2 = 0;
//        } else {
//            bindingState1 = monitorParam.getBindingState();
//            bindingState2 = monitorParam.getBindingState();
//        }
////        return monitorMapper.listMonitorByKeyword(monitorParam.getKeyword(), equipmentState1, equipmentState2, bindingState1, bindingState2);
//        return monitorMapper.listMonitorByKeyword1(baseConditionVO, monitorParam.getKeyword(), bindingState1, bindingState2);
//    }

    /**
     * 删除摄像头