修改

king-boot-module-ad/src/main/java/org/king/modules/ad/controller/AdDeviceController.java

@@ -129,7 +129,6 @@ public class AdDeviceController extends KingController<AdDevice, IAdDeviceServic
         }
         return Result.ok(adDevice);
 	}
-
     /**
      * 导出excel
      *

king-boot-module-ad/src/main/java/org/king/modules/ad/entity/AdDevice.java

@@ -206,4 +206,6 @@ public class AdDevice implements Serializable {
     @ApiModelProperty(value = "设备当前电量，并非实时电量，更新于每次充电时")
     private java.math.BigDecimal currentConsumption;
 
+    private Integer count;
+
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/AdChargingRecordMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Param;
 import org.king.modules.ad.entity.AdChargingRecord;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.king.modules.ad.entity.ChargeCount;
 import org.king.modules.ad.entity.ComChargingDevice;
 import org.king.modules.ad.entity.ComChargingMonth;
 
@@ -19,4 +20,8 @@ public interface AdChargingRecordMapper extends BaseMapper<AdChargingRecord> {
     List<ComChargingMonth> listMonth(@Param("comNos") List<Object> comNos, @Param("comNo") String comNo, @Param("month") String month);
 
     List<ComChargingDevice> listDevice(@Param("comNos") List<Object> comNos, @Param("type") String type, @Param("status") String status);
+
+    List<ChargeCount> getChargeByFive();
+
+    ChargeCount getChargeData();
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/AdDeviceMapper.java

@@ -14,4 +14,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  */
 public interface AdDeviceMapper extends BaseMapper<AdDevice> {
 
+     List<AdDevice> getDeviceCount();
+
 }

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/xml/AdChargingRecordMapper.xml

@@ -60,4 +60,35 @@
         </where>
 
     </select>
+
+    <select id ="getChargeData">
+        SELECT
+        count( consumption ) count,
+        sum( consumption ) sum,
+        sum( TIMESTAMPDIFF( SECOND, real_start_time, real_end_time )/ 3600 ) timeTotal
+        FROM
+        ad_charging_record
+    </select>
+
+    <select id="getChargeByFive">
+        SELECT
+        DATE_FORMAT( ad.real_start_time, '%Y-%m-%d' ) startTime,
+        Sum(
+        TIMESTAMPDIFF( SECOND, ad.real_start_time, ad.real_end_time ))/3600 timeTotal,
+        sum( consumption ) sum,
+        count( 1 ) count
+        FROM
+        (
+        SELECT
+        *
+        FROM
+        ad_charging_record
+        WHERE
+        DATE_FORMAT( real_start_time, '%Y-%m-%d' )> DATE_FORMAT( date_sub( now(), INTERVAL 5 DAY ), '%Y-%m-%d' )) ad
+        GROUP BY
+        DATE_FORMAT(
+        ad.real_start_time,
+        '%Y-%m-%d'
+        )
+    </select>
 </mapper>

king-boot-module-ad/src/main/java/org/king/modules/ad/mapper/xml/AdDeviceMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.king.modules.ad.mapper.AdDeviceMapper">
 
+    <select id="getDeviceCount" resultType="org.king.modules.ad.entity.AdDevice">
+        SELECT
+        type,
+        COUNT( 1 ) count
+        FROM
+        ad_device
+        where is_del=0
+        GROUP BY
+        type;
+    </select>
+
 </mapper>

king-boot-module-ad/target/classes/org/king/modules/ad/mapper/xml/AdChargingRecordMapper.xml

@@ -60,4 +60,35 @@
         </where>
 
     </select>
+
+    <select id ="getChargeData">
+        SELECT
+        count( consumption ) count,
+        sum( consumption ) sum,
+        sum( TIMESTAMPDIFF( SECOND, real_start_time, real_end_time )/ 3600 ) timeTotal
+        FROM
+        ad_charging_record
+    </select>
+
+    <select id="getChargeByFive">
+        SELECT
+        DATE_FORMAT( ad.real_start_time, '%Y-%m-%d' ) startTime,
+        Sum(
+        TIMESTAMPDIFF( SECOND, ad.real_start_time, ad.real_end_time ))/3600 timeTotal,
+        sum( consumption ) sum,
+        count( 1 ) count
+        FROM
+        (
+        SELECT
+        *
+        FROM
+        ad_charging_record
+        WHERE
+        DATE_FORMAT( real_start_time, '%Y-%m-%d' )> DATE_FORMAT( date_sub( now(), INTERVAL 5 DAY ), '%Y-%m-%d' )) ad
+        GROUP BY
+        DATE_FORMAT(
+        ad.real_start_time,
+        '%Y-%m-%d'
+        )
+    </select>
 </mapper>

king-boot-module-ad/target/classes/org/king/modules/ad/mapper/xml/AdDeviceMapper.xml

@@ -2,4 +2,15 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="org.king.modules.ad.mapper.AdDeviceMapper">
 
+    <select id="getDeviceCount" resultType="org.king.modules.ad.entity.AdDevice">
+        SELECT
+        type,
+        COUNT( 1 ) count
+        FROM
+        ad_device
+        where is_del=0
+        GROUP BY
+        type;
+    </select>
+
 </mapper>