获取设备使用数据

fys-admin/src/main/java/com/fuyuanshen/web/controller/device/HomePageController.java

@@ -61,13 +61,15 @@ public class HomePageController {
     /**
      * 获取设备使用数据
      *
-     * @param deviceId 设备ID
+     * @param deviceTypeId 设备ID (可选)
      * @param range    时间范围 1:半年 2:一年
      * @return 每月使用数据列表
      */
-    @GetMapping("/getEquipmentUsageData/{deviceId}/{range}")
-    public R<List<Map<String, Object>>> getEquipmentUsageData(@PathVariable Long deviceId, @PathVariable Integer range) {
-        return R.ok(deviceService.getEquipmentUsageData(deviceId, range));
+    @GetMapping("/getEquipmentUsageData/{range}")
+    public R<List<Map<String, Object>>> getEquipmentUsageData(@PathVariable Integer range,
+                                                              @RequestParam(required = false) Long deviceTypeId) {
+        return R.ok(deviceService.getEquipmentUsageData(deviceTypeId, range));
     }
 
+
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/mapper/DeviceMapper.java

@@ -99,11 +99,11 @@ public interface DeviceMapper extends BaseMapper<Device> {
     /**
      * 获取设备使用数据
      *
-     * @param deviceId 设备ID
+     * @param deviceTypeId 设备ID
      * @param range    时间范围 1:半年 2:一年
      * @return 每月使用数据列表
      */
-    List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range);
+    List<Map<String, Object>> getEquipmentUsageData(@Param("deviceTypeId") Long deviceTypeId, @Param("range") Integer range);
 
     // 在DeviceMapper.java中添加方法
     int getUsageDataForMonth(@Param("deviceId") Long deviceId,

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java

@@ -139,9 +139,9 @@ public interface DeviceService extends IService<Device> {
     /**
      * 获取设备使用数据
      *
-     * @param deviceId
+     * @param deviceTypeId
      * @param range
      * @return
      */
-    List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range);
+    List<Map<String, Object>> getEquipmentUsageData(Long deviceTypeId, Integer range);
 }

fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/impl/DeviceServiceImpl.java

@@ -654,8 +654,8 @@ public class DeviceServiceImpl extends ServiceImpl<DeviceMapper, Device> impleme
      * @return 每月使用数据列表
      */
     @Override
-    public List<Map<String, Object>> getEquipmentUsageData(Long deviceId, Integer range) {
-        List<Map<String, Object>> equipmentUsageData = deviceMapper.getEquipmentUsageData(deviceId, range);
+    public List<Map<String, Object>> getEquipmentUsageData(Long deviceTypeId, Integer range) {
+        List<Map<String, Object>> equipmentUsageData = deviceMapper.getEquipmentUsageData(deviceTypeId, range);
         return equipmentUsageData;
 
     }

fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml

@@ -322,7 +322,7 @@
     <select id="getDataOverview" resultType="com.fuyuanshen.equipment.domain.vo.DataOverviewVo">
         SELECT (SELECT COUNT(1) FROM device)                         AS devicesNumber,
                (SELECT COUNT(1) FROM device WHERE online_status = 1) AS equipmentOnline,
-               (SELECT COUNT(1) FROM device WHERE DATE (create_time) = CURDATE()) AS bindingNew, (
+               (SELECT COUNT(1) FROM device WHERE DATE (create_time) = CURDATE() AND binding_status = 1 ) AS bindingNew, (
         SELECT COUNT (1)
         FROM device
         WHERE online_status = 2) AS equipmentAbnormal
@@ -376,26 +376,30 @@
 
     <!-- 获取设备使用数据 -->
     <select id="getEquipmentUsageData" resultType="map">
-        SELECT COUNT(CASE WHEN MONTH (dl.create_time) = 1 THEN 1 END)  AS m1,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 2 THEN 1 END)  AS m2,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 3 THEN 1 END)  AS m3,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 4 THEN 1 END)  AS m4,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 5 THEN 1 END)  AS m5,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 6 THEN 1 END)  AS m6,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 7 THEN 1 END)  AS m7,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 8 THEN 1 END)  AS m8,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 9 THEN 1 END)  AS m9,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 10 THEN 1 END) AS m10,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 11 THEN 1 END) AS m11,
-               COUNT(CASE WHEN MONTH (dl.create_time) = 12 THEN 1 END) AS m12
+        SELECT COUNT(CASE WHEN MONTH (dl.create_time) = 1 THEN 1 END) AS m1,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 2 THEN 1 END) AS m2,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 3 THEN 1 END) AS m3,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 4 THEN 1 END) AS m4,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 5 THEN 1 END) AS m5,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 6 THEN 1 END) AS m6,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 7 THEN 1 END) AS m7,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 8 THEN 1 END) AS m8,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 9 THEN 1 END) AS m9,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 10 THEN 1 END) AS m10,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 11 THEN 1 END) AS m11,
+        COUNT(CASE WHEN MONTH (dl.create_time) = 12 THEN 1 END) AS m12
         FROM device_log dl
-                 LEFT JOIN device d ON dl.device_id = d.id
-                 LEFT JOIN device_type dt ON d.device_type = dt.id
-        WHERE dt.id = #{deviceId}
-          AND (
+        LEFT JOIN device d ON dl.device_id = d.id
+        LEFT JOIN device_type dt ON d.device_type = dt.id
+        <where>
+            <if test="deviceTypeId != null">
+                dt.id = #{deviceTypeId}
+            </if>
+            AND (
             (#{range} = 1 AND dl.create_time >= DATE_SUB(NOW(), INTERVAL 6 MONTH)) OR
             (#{range} = 2 AND dl.create_time >= DATE_SUB(NOW(), INTERVAL 12 MONTH))
             )
+        </where>
     </select>
 
     <select id="getUsageDataForMonth" resultType="java.lang.Integer">