fix

zhanzhiqin

2022-04-13 874e9b0384e53f1a6b0bc24a10878753fc144411

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

@@ -67,7 +67,7 @@
            monitorParam.setEquipmentState(2);
        }

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

        return monitorList;
    }
@@ -109,13 +109,15 @@
     * @param deviceSerial 设备序列号,存在英文字母的设备序列号，字母需为大写
     *                     //     * @param validateCode 设备验证码，设备机身上的六位大写字母
     */
//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {
    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial, String validateCode) {
//    public YSY_MonitorDto addYSYMonitor(String accessToken, String deviceSerial) {

        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
//        paramMap.put("validateCode", validateCode);
        if (validateCode != null) {
            paramMap.put("validateCode", validateCode);
        }
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);
        System.out.println(s);
        YSY_MonitorDto monitorDto = JSON.parseObject(s, YSY_MonitorDto.class);