能耗设备

huimv-admin/src/main/java/com/huimv/admin/service/impl/EnvDeviceServiceImpl.java

@@ -181,7 +181,7 @@ public class EnvDeviceServiceImpl extends ServiceImpl<EnvDeviceMapper, EnvDevice
         }
         JSONArray jsonArray = new JSONArray();
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("farm_id", farmId).eq("other3", 1);
+        queryWrapper.eq("farm_id", farmId).eq("other3", 0);
         if (id == null || id == "") {
             queryWrapper.eq("parent_id", 3);
         } else {

huimv-admin/src/main/resources/com/huimv/admin/mapper/EnergyDataMapper.xml

@@ -310,12 +310,12 @@ FROM `energy_data` WHERE unit_id = ${unitId} AND farm_id =${farmId}
             calendar.date
     </select>
     <select id="getTodayElectricity" resultType="java.lang.Double">
-        SELECT COALESCE(SUM(electricity_value),0) AS 'value'
+        SELECT ROUND(COALESCE(SUM(electricity_value),0),2) AS 'value'
         FROM `energy_data`
         WHERE unit_id = #{unitId} AND display_type = #{displayType} and Date(create_date) = CURDATE()
     </select>
     <select id="getTodayWater" resultType="java.lang.Double">
-        SELECT COALESCE(SUM(water_value),0) AS 'value'
+        SELECT ROUND(COALESCE(SUM(water_value),0),2) AS 'value'
         FROM `energy_data`
         WHERE unit_id = #{unitId} AND display_type = #{displayType} and Date(create_date) = CURDATE()
     </select>