修改接口

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/entity/MonitorFanIndicator.java

@@ -42,9 +42,9 @@ public class MonitorFanIndicator extends BaseEntity {
     @TableField("index_address")
     private String indexAddress;//  指标地址
     @TableField("address_gateway")
-    private String addressGateway;//  指标地址
+    private String addressGateway;//地址加网管
     @TableField("equipment_number")
-    private String equipmentNumber;
+    private String equipmentNumber; //设备编号
 
 
 

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/java/com/yeejoin/amos/boot/module/jxiop/api/mapper/MonitorFanIndicatorMapper.java

@@ -28,7 +28,7 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
                                           @Param("gateway") String gateway,
                                           @Param("frontModule") String frontModule,
                                           @Param("offset") int offset);
-   Object getIndicatoralueAvage(String gateway,String indicator);
+    Object getIndicatoralueAvage(String gateway,String indicator);
 
     List<RunRecord> queryRunRecord(@Param("size")    long size,
                                    @Param("list") String[] list,
@@ -36,7 +36,6 @@ public interface MonitorFanIndicatorMapper extends BaseMapper<MonitorFanIndicato
 
     int queryRunRecordTotal( @Param("list") String[] list);
 
+    Object getIndicatoralueTotal(String gateway,String indicator);
 
-
-   Object getIndicatoralueTotal(String gateway,String indicator);
 }

amos-boot-system-jxiop/amos-boot-module-jxiop-api/src/main/resources/mapper/MonitorFanIndicatorMapper.xml

@@ -73,14 +73,7 @@
         indicator like concat('%',#{indicator},'%')
     </select>
 
-
-
-
-
-
     <select id="queryRunRecord" resultType="com.yeejoin.amos.boot.module.jxiop.api.dto.RunRecord">
-
-
         SELECT
         t.equipment_number AS FanName,
         (SELECT indicator_value FROM monitor_fan_indicator WHERE equipment_number=t.equipment_number AND gateway=t.gateway and  indicator="有功功率") AS 'power',
@@ -94,21 +87,18 @@
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
-
          ORDER BY  a.equipment_number ) AS t
         limit #{offset}, #{size}
     </select>
 
 
     <select id="queryRunRecordTotal" resultType="java.lang.Integer">
-
         select
         count(DISTINCT a.equipment_number) num
         from  monitor_fan_indicator a  where  a.equipment_number is not null and a.gateway in
         <foreach collection="list" index="index" item="item" separator="," open="(" close=")">
             #{item}
         </foreach>
-
     </select>