Merge remote-tracking branch 'origin/master'

liuhaonan

2022-04-15 5e48a47112f36ae5f6b3f4fc0271d0649a31372a

Merge remote-tracking branch 'origin/master'

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

@@ -105,6 +105,7 @@

    /**
     * 获取萤石云摄像头信息  无需验证accessToken
     *
     * @return
     */
    public YSY_MonitorDto.MonitorDto getMonitorInfo(String deviceSerial) {
@@ -130,7 +131,7 @@
        Map<String, Object> paramMap = new HashMap<>();
        paramMap.put("accessToken", accessToken);
        paramMap.put("deviceSerial", deviceSerial);
        if (validateCode != null) {
        if (validateCode != null && validateCode.trim().length() != 0) {
            paramMap.put("validateCode", validateCode);
        }
        String s = HttpUtil.post(YSY_URL + ADD_DEVICE_URL, paramMap);

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

@@ -122,7 +122,10 @@
        if (SecurityUtils.getClientId() == null) {
            wrapper = Wrappers.lambdaQuery(Pole.class);
        } else {
            wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId());
            wrapper = Wrappers.lambdaQuery(Pole.class).eq(Pole::getClientId, SecurityUtils.getUserId()).or(
                    w -> {
                        w.eq(Pole::getUserId, SecurityUtils.getUserId());
                    });
        }
        if (!param.getKeyword().isEmpty()) {
            wrapper.like(Pole::getPoleCode, param.getKeyword()).or(