能耗设备

huimv-admin/src/main/java/com/huimv/admin/mapper/EnergyEnvDeviceMapper.java

@@ -16,5 +16,7 @@ import java.util.List;
  */
 public interface EnergyEnvDeviceMapper extends BaseMapper<EnergyEnvDevice> {
 
-    List<UnitEnergyVo> listPigpen(String farmId);
+    List<UnitEnergyVo> listElePigpen(String farmId);
+
+    List<UnitEnergyVo> listWaterPigpen(String farmId);
 }

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

@@ -149,7 +149,7 @@ public class EnergyElectricityServiceImpl extends ServiceImpl<EnergyElectricityM
         String farmId = paramsMap.get("farmId");
         String displayType = paramsMap.get("displayType");
 
-        List<UnitEnergyVo> unitEnergyVoList = energyEnvDeviceMapper.listPigpen(farmId);
+        List<UnitEnergyVo> unitEnergyVoList = energyEnvDeviceMapper.listElePigpen(farmId);
         for (UnitEnergyVo unitEnergyVo : unitEnergyVoList) {
             unitEnergyVo.setValue(dataMapper.getTodayElectricity(unitEnergyVo.getId(),displayType));
         }

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

@@ -147,7 +147,7 @@ public class EnergyWaterServiceImpl extends ServiceImpl<EnergyWaterMapper, Energ
         String farmId = paramsMap.get("farmId");
         String displayType = paramsMap.get("displayType");
 
-        List<UnitEnergyVo> unitEnergyVoList = energyEnvDeviceMapper.listPigpen(farmId);
+        List<UnitEnergyVo> unitEnergyVoList = energyEnvDeviceMapper.listWaterPigpen(farmId);
         for (UnitEnergyVo unitEnergyVo : unitEnergyVoList) {
             unitEnergyVo.setValue(dataMapper.getTodayWater(unitEnergyVo.getId(),displayType));
         }

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

@@ -18,11 +18,17 @@
         <result column="ohter3" property="ohter3" />
         <result column="remark" property="remark" />
     </resultMap>
-    <select id="listPigpen" resultType="com.huimv.admin.entity.vo.UnitEnergyVo">
+    <select id="listElePigpen" resultType="com.huimv.admin.entity.vo.UnitEnergyVo">
         SELECT d.unit_id AS 'id',d.unit_name AS 'buildName'
         FROM `energy_env_device` d
         WHERE d.farm_id = #{farmId} AND d.remark = 0
         ORDER BY buildName
     </select>
+    <select id="listWaterPigpen" resultType="com.huimv.admin.entity.vo.UnitEnergyVo">
+        SELECT d.unit_id AS 'id',d.unit_name AS 'buildName'
+        FROM `energy_env_device` d
+        WHERE d.farm_id = #{farmId} AND d.remark = 1
+        ORDER BY buildName
+    </select>
 
 </mapper>