ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/amqp/processor/c3ChargingProcessor.java
@@ -67,6 +67,9 @@ if (netRequestFrame.isValidate()) { //保存充电桩硬件信息 boolean b = SpringContextHolder.getBean(C3ChargingService.class).saveReporEquipment(deviceName, netRequestFrame.getMcuUdid(), netRequestFrame.getDestinationAddress()); //检查是否有正在进行的订单 //TODO if (!b) { return; } ximon-admin/src/main/java/com/sandu/ximon/admin/service/C3ChargingService.java
@@ -59,17 +59,11 @@ * @return 是否成功 */ public boolean updateReportState(String deviceName, String c3Mac, String statusBit, String deviceTemperature) { C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getMcuUdid, deviceName)); C3mCharging one = getOne(Wrappers.lambdaQuery(C3mCharging.class).eq(C3mCharging::getC3Mac, c3Mac)); if (one != null) { // one.setStatusBit(Integer.valueOf(statusBit)); one.setDeviceTemperature(deviceTemperature); one.setPoleDevicesCode(deviceName); one.setC3Mac(c3Mac); // List<C3mChargingCharge> list = c3mChargingChargeService.list(Wrappers.lambdaQuery(C3mChargingCharge.class).eq(C3mChargingCharge::getC3Id, one.getC3Id())); // if (list.size() == 0) {//费率表中没有此充电桩数据时 添加默认费率 // c3mChargingChargeService.initCharge((one.getC3Id()).intValue()); // } return updateById(one); } else { return false; ximon-admin/src/main/resources/application-dev.yml
@@ -14,7 +14,7 @@ database: 0 # Redis数据库索引（默认为0） port: 6379 # Redis服务器连接端口 password: uIEFHmj4bC0wJCyM # Redis服务器连接密码（默认为空） timeout: 300ms # 连接超时时间（毫秒） timeout: 10000ms # 连接超时时间（毫秒） server: port: 20017 sandu: ximon-admin/src/main/resources/application-local.yml
@@ -14,7 +14,7 @@ database: 0 # Redis数据库索引（默认为0） port: 6379 # Redis服务器连接端口 password: uIEFHmj4bC0wJCyM # Redis服务器连接密码（默认为空） timeout: 300ms # 连接超时时间（毫秒） timeout: 10000ms # 连接超时时间（毫秒） server: port: 20017 sandu:
