统计处理

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/gatherData/entity/FpgGatherData.java

@@ -68,7 +68,7 @@ public class FpgGatherData implements Serializable {
 	/**运行电流*/
 	@Excel(name = "运行电流", width = 15)
     @ApiModelProperty(value = "运行电流")
-    private BigDecimal current;
+    private BigDecimal runCurrent;
 	/**有功功率*/
 	@Excel(name = "有功功率", width = 15)
     @ApiModelProperty(value = "有功功率")

zgztBus/jeecg-module-lesm/src/main/java/org/jeecg/modules/gatherData/mapper/xml/FpgGatherDataMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="org.jeecg.modules.gatherData.mapper.FpgGatherDataMapper">
     <select id="getFpgTheLeftSideOneData" parameterType="java.lang.String" resultType="map">
         SELECT
-            SUM(current) as currents, SUM(active_power) as active_power
+            SUM(run_current) as currents, SUM(active_power) as active_power
         FROM
             fpg_gather_data
         WHERE
@@ -11,7 +11,7 @@
             create_time BETWEEN #{startTime} AND #{endTime}
     </select>
     <select id="getFpgMiddleTwoData" parameterType="java.lang.String" resultType="org.jeecg.modules.gatherData.entity.FpgMiddleTwoData">
-        SELECT SUM(active_power) as active_power, SUM(current) as currents,formatted_date FROM (SELECT
+        SELECT SUM(active_power) as active_power, SUM(run_current) as currents,formatted_date FROM (SELECT
                 current, active_power, DATE_FORMAT(create_time, '%H:00') AS formatted_date
             FROM
                 fpg_gather_data