电量查询

appapi/src/main/java/tech/glinfo/enbao/modules/sh/service/impl/OtherShDevicePowerServiceImpl.java

@@ -28,10 +28,14 @@ public class OtherShDevicePowerServiceImpl extends ServiceImpl<OtherShDevicePowe
         ShDevicePowerEntity entity1 = this.baseMapper.startPower(Integer.parseInt(deviceId), startTime, entTime);
 
         ShDevicePowerEntity entity2 = this.baseMapper.entPower(Integer.parseInt(deviceId), startTime, entTime);
-        if (entity1 == null || entity2 == null) {
-            return R.ok().put("totalDuration", 0).put("totalPower", 0);
+        if (entity1 != null && entity2 != null) {
+            return R.ok().put("totalPower", entity2.getTotalPower() - entity1.getTotalPower());
+        }else if (entity1 == null && entity2 == null) {
+            return R.ok().put("totalPower", 0);
+        }else if (entity1 != null){
+            return R.ok().put("totalPower", entity1.getTotalPower());
         }else {
-            return R.ok().put("totalDuration", entity2.getTotalDuration() - entity1.getTotalDuration()).put("totalPower", entity2.getTotalPower() - entity1.getTotalPower());
+            return R.ok().put("totalPower", entity2.getTotalPower());
         }
     }