Merge remote-tracking branch 'origin/master'

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAbsorbMapper.java
#	ruoyi-system/src/main/resources/mapper/system/ScadaAbsorbMapper.xml

ruoyi-system/src/main/java/com/ruoyi/system/mapper/ScadaAdsorbDeviceinfoMapper.java

@@ -74,7 +74,7 @@ public interface ScadaAdsorbDeviceinfoMapper
 
     ScadaAdsorbDeviceinfo getEnergyProductionThisMonth();
 
-    List<ScadaAdsorbDeviceinfo> getEnergyProduction();
+    List<ScadaAdsorbDeviceinfo> getEnergyProduction(int in_id);
 
     @DataSource(value = DataSourceType.MASTER)
     List<AbsorbDeviceUtilOee> getUtilOee(int in_id);

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

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<ScadaAdsorbDeviceinfo> getEnergyProduction() {
-        return scadaAdsorbDeviceinfoMapper.getEnergyProduction();
+        return scadaAdsorbDeviceinfoMapper.getEnergyProduction(this.in_id);
     }
 
     @Override

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>
 
-    <select id="getEnergyProduction" resultMap="ScadaAdsorbDeviceinfoResult">
+    <select id="getEnergyProduction" parameterType="integer"  resultMap="ScadaAdsorbDeviceinfoResult">
-        SELECT * FROM TABLE( scada_absorb_device_ep_q() )
+        SELECT * FROM TABLE( scada_absorb_device_ep_q2(#{in_id}) )
     </select>
 
     <select id="getUtilOee" parameterType="integer" resultMap="ScadaAbsorbUtilOee">