添加了查询一个月中每一天的火情数量

src/main/java/com/xkrs/dao/EquipmentDao.java

@@ -43,6 +43,28 @@ public interface EquipmentDao extends JpaRepository<Equipment,Long> {
      */
     @Query(value = "select equipment_code equipmentcode,equipment_name equipmentname,equipment_type equipmenttype," +
             "equipment_status equipmentstatus,equipment_longitude equipmentlongitude," +
-            "equipment_latitude equipmentlatitude,installation_time installationtime from equipment",nativeQuery = true)
+            "equipment_latitude equipmentlatitude,installation_time installationtime,street from equipment",nativeQuery = true)
     List<Map<String,String>> findEquipment();
+
+    /**
+     * 根据时间段查询各个街道火情数量
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @Query(value = "select e.street street,count(f.id) AS firenumber from equipment e,fire f where f.alarm_date " +
+            "BETWEEN ?1 AND ?2 AND e.equipment_code = f.device_code " +
+            "GROUP BY e.street",nativeQuery = true)
+    List<Map<String,Object>> selectCountFire(String beginTime, String endTime);
+
+    /**
+     * 查询一个月中每一天各个街道的火情数量
+     * @param beginTime
+     * @param endTime
+     * @return
+     */
+    @Query(value = "select LEFT(f.alarm_date,10) AS data,e.street as street,count(f.id) AS firenumber " +
+            "from equipment e,fire f where f.alarm_date BETWEEN ?1 AND ?2 " +
+            "AND e.equipment_code = f.device_code GROUP BY LEFT(f.alarm_date,10),e.street",nativeQuery = true)
+    List<Map<String,Object>> selectEveryDayCount(String beginTime, String endTime);
 }