2021与蓝度共同重构项目,服务端
liuhaonan
2022-08-24 b2030052dda62a44875f751ff9fe061736988270
changes
已修改2个文件
7 ■■■■ 文件已修改
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/BaseInvokeSyncService.java
@@ -14,7 +14,6 @@
import com.sandu.ximon.admin.manager.iot.rrpc.topic.IBaseTopic;
import com.sandu.ximon.admin.manager.iot.rrpc.topic.ICustomizeTopic;
import com.sandu.ximon.admin.manager.iot.rrpc.util.FrameUtils;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.BeanUtils;
@@ -202,7 +201,7 @@
                    return response.getData();
                }
            } catch (Exception e) {
                throw new BusinessException("错误信息:" + e.getMessage());
                throw new BusinessException(e.getMessage());
            }
        } else {
            throw new BusinessException("硬件请求失败,请检查硬件设备!");
ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -213,6 +213,8 @@
        int faultNumber = 0;
        //等待接入数量
        int waitConnectNumber = 0;
        //充电中数量
        int chargingNumber = 0;
        for (C3ChargingBo one : c3ChargingBoList) {
            String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
@@ -227,6 +229,7 @@
                            break;
                        //2.充电中
                        case 2:
                            chargingNumber++;
                            onlineNumber = onlineNumber + 1;
                            break;
                        //3.充电中断,等待服务器确认
@@ -268,6 +271,7 @@
        map.put("offlineNumber", offlineNumber);
        map.put("faultNumber", faultNumber);
        map.put("waitConnectNumber", waitConnectNumber);
        map.put("chargingNumber", chargingNumber);
        return map;
    }