Pārlūkot izejas kodu

增加计步保存数据库功能,增加获取小孩接口返回计步数据

tea.yu 1 mēnesi atpakaļ
vecāks
revīzija
40ec8654a5

+ 0 - 3
business-application/src/main/java/com/sikey/wa04/business/application/service/user/ChildService.java

@@ -396,13 +396,10 @@ public class ChildService extends BaseService {
                 resultDevice.setDid(device.getId().getId())
                         .setVideoCallChannel(device.getVideoCallChannel().getChannel())
                         .setTicket(device.getTicket())
-
                         .setBattery(battery)
                         .setSignal(signal)
                         .setMaxSignal(maxSignal)
-
                         .setStartup(startup)
-
                         .setVersion(device.getVersion())
                         .setModel(device.getModel());
                 result.setDevice(resultDevice);

+ 4 - 4
business-infrastructure/src/main/java/com/sikey/wa04/business/infrastructure/adapter/dao/DeviceConfigAdapterImpl.java

@@ -87,7 +87,7 @@ public class DeviceConfigAdapterImpl implements DeviceConfigAdapter {
         String battery = genericManufacturerHeader.getBattery();
         String signal = genericManufacturerHeader.getSignal();
         String maxSignal = genericManufacturerHeader.getMaxSignal();
-        //  String step = genericManufacturerHeader.getStep();
+        String step = genericManufacturerHeader.getStep();
 
         // 设备配置-电量
         DeviceConfigReqVO dc = new DeviceConfigReqVO();
@@ -116,12 +116,12 @@ public class DeviceConfigAdapterImpl implements DeviceConfigAdapter {
             deviceConfig(deviceId, deviceConfigReqVO, cId, childName);
 
             // 设备配置-步数
-            /*deviceConfigReqVO = new DeviceConfigReqVO();
+            deviceConfigReqVO = new DeviceConfigReqVO();
             deviceConfigReqVO.setCId(cId);
             deviceConfigReqVO.setKey(SignalStepBatteryStepEnum.STEP.getDescription());
             deviceConfigReqVO.setValue(step);
             deviceConfigReqVO.setBeforeValue(step);
-            deviceConfig(deviceId, deviceConfigReqVO, cId, childName);*/
+            deviceConfig(deviceId, deviceConfigReqVO, cId, childName);
         });
 
     }
@@ -198,7 +198,7 @@ public class DeviceConfigAdapterImpl implements DeviceConfigAdapter {
                 if (!StringUtils.isEmpty(lastBatteryValue) && !StringUtils.isEmpty(paramValue)) {
                     int lbValue = Integer.parseInt(lastBatteryValue);
                     int pValue = Integer.parseInt(paramValue);
-                    if (pValue < 25 && lbValue > pValue && pValue % 5 == 0) { // 当前电量<25,上次电量大于当前上报的电量
+                    if ((lbValue > 20 && pValue <= 20)  || (lbValue > 10 && pValue <= 10)){ // 上次电量大于20 并且 当前电量<=20 或者  上次电量大于10 并且 当前电量<=10
                         // 加入消息到消息中心
                         MessageCenter messageCenter = new MessageCenter();
                         messageCenter.setCid(cId);