change - 数据源修改

ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/ScadaUkHourData.java

@@ -33,6 +33,6 @@ public class ScadaUkHourData {
 //    @Column(name = "DEVICESTATE")
 //    public int DEVICESTATE;
 
-    @Column(name = "recordTime")
+    @Column(name = "RECORDTIME")
     public Date recordTime;
 }

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

@@ -231,6 +231,7 @@ public interface ImosPrPlanMapper
      */
     List<OrderInfo> getAluminumClassPlanInfo(int in_id);
 
+    @DataSource(value = DataSourceType.MASTER)
     List<ScadaUkHourData> findByRecordTimeBetweenNew(int in_id);
 
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java

@@ -488,7 +488,7 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
                 map.put("0",orderTypeItem);
                 Long planQtyItem = orderInfo.stream().filter(x->x.getOrderType().equals(orderTypeItem)).collect(Collectors.toList()).stream().mapToLong(OrderInfo ::getPlannedProduction).sum()/orderInfo.stream().filter(x->x.getOrderType().equals(orderTypeItem)).collect(Collectors.toList()).size();
                 map.put("1",planQtyItem);
-                map.put("2","10");
+                map.put("2",planQtyItem/10);
 
                 for(int i = 7;i < 19;i++){
                     Long recordTimeitem = Convert.toLong(i);
@@ -768,9 +768,9 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
     }
 
     @Override
-    @DataSource(value = DataSourceType.MASTER)
     public List<ScadaUkHourData> findByRecordTimeBetweenNew() {
-        return imosPrPlanMapper.findByRecordTimeBetweenNew(in_id);
+        List<ScadaUkHourData> byRecordTimeBetweenNew = imosPrPlanMapper.findByRecordTimeBetweenNew(in_id);
+        return byRecordTimeBetweenNew;
     }
 
     @Override