diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAdsorbDeviceinfoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAdsorbDeviceinfoMapper.java index af88ab2..a91db01 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAdsorbDeviceinfoMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAdsorbDeviceinfoMapper.java @@ -74,7 +74,7 @@ public interface ScadaAdsorbDeviceinfoMapper ScadaAdsorbDeviceinfo getEnergyProductionThisMonth(); - List getEnergyProduction(); + List getEnergyProduction(int in_id); @DataSource(value = DataSourceType.MASTER) List getUtilOee(int in_id); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java index 36e8d6f..56c6ee2 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/KBAdsorbDeviceinfoServiceImpl.java @@ -52,7 +52,7 @@ public class KBAdsorbDeviceinfoServiceImpl implements IKBAdsorbDeviceinfoService @Override public String getAdsorbDeviceOEE(){ - return ScadaAbsorbMapper.selectScadaAdsorbDeviceOEE(); + return ScadaAbsorbMapper.selectScadaAdsorbDeviceOEE(this.in_id); } @Override diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScadaAdsorbDeviceinfoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScadaAdsorbDeviceinfoServiceImpl.java index 5eb759e..19fd371 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScadaAdsorbDeviceinfoServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ScadaAdsorbDeviceinfoServiceImpl.java @@ -126,7 +126,7 @@ public class ScadaAdsorbDeviceinfoServiceImpl implements IScadaAdsorbDeviceinfoS @Override @DataSource(value = DataSourceType.MASTER) public List getEnergyProduction() { - return scadaAdsorbDeviceinfoMapper.getEnergyProduction(); + return scadaAdsorbDeviceinfoMapper.getEnergyProduction(this.in_id); } @Override diff --git a/ruoyi-system/src/main/resources/mapper/system/ScadaAdsorbDeviceinfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ScadaAdsorbDeviceinfoMapper.xml index de1cb8b..4d30226 100644 --- a/ruoyi-system/src/main/resources/mapper/system/ScadaAdsorbDeviceinfoMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/ScadaAdsorbDeviceinfoMapper.xml @@ -125,8 +125,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" SELECT * FROM TABLE( scada_absorb_device_eptm_q() ) - + SELECT * FROM TABLE( scada_absorb_device_ep_q2(#{in_id}) )