From 3d2fa662713c66d718ccbc6963ef1623d04c39d9 Mon Sep 17 00:00:00 2001
From: wangh <123456>
Date: Mon, 21 Nov 2022 15:25:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E4=B8=8D=E8=89=AF?=
 =?UTF-8?q?=E7=8E=87=E5=86=99=E6=AD=BB=E5=92=8C=E4=B8=80=E5=A4=84=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E7=9A=84=E5=9C=B0=E6=96=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/scada/FoamerMesController.java |  2 +-
 .../ruoyi/system/domain/scada/OrderInfo.java  |  1 +
 .../service/impl/ImosPrPlanServiceImpl.java   | 31 ++-----------------
 .../mapper/system/ImosPrPlanMapper.xml        |  1 +
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scada/FoamerMesController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scada/FoamerMesController.java
index 16ebe22..55e0894 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scada/FoamerMesController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/scada/FoamerMesController.java
@@ -92,7 +92,7 @@ public class FoamerMesController {
   @ResponseBody
   public String getPlanHourInfo() throws Exception {
     String jsonInfo = iImosPrPlanService.getFoamerPlanHourInfo();
-    System.out.println("小时数据：" + jsonInfo);
+//    System.out.println("小时数据：" + jsonInfo);
     return jsonInfo;
   }
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java
index 411aafb..c83a934 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/scada/OrderInfo.java
@@ -24,6 +24,7 @@ public class OrderInfo {
     private long plannedProduction;
 
     private long actualProduction;
+    private long target;
 
     private long recordTime;
 
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
index 080ccb0..a467ea2 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/ImosPrPlanServiceImpl.java
@@ -182,7 +182,7 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
     public String getFoamerPlanHourInfo() {
         List<OrderInfo> orderInfo = imosPrPlanMapper.getFoamerPlanHourInfo(in_id);
 
-        List<String> orderTypeList = new ArrayList<>();
+      /*  List<String> orderTypeList = new ArrayList<>();
         List<Long> planQtyList = new ArrayList<>();
         List<Long> recordTimeList = new ArrayList<>();
         orderInfo.forEach(x->orderTypeList.add(x.getOrderType()));
@@ -278,35 +278,10 @@ public class ImosPrPlanServiceImpl implements IImosPrPlanService
             }
         }
 
-        /*if(9-list1.size() > 0){
-            for(int i = 0;i<9-list1.size();i++){
-                Map<String,Object> map2 = new HashMap<>();
-                map2.put("0","C"+(list1.size()));
-                map2.put("1","");
-                map2.put("2","");
-                map2.put("3","");
-                map2.put("4","");
-                map2.put("5","");
-                map2.put("6","");
-                map2.put("7","");
-                map2.put("8","");
-                map2.put("9","");
-                map2.put("10","");
-                map2.put("11","");
-                map2.put("12","");
-                map2.put("13","");
-                map2.put("14","");
-                map2.put("15","");
-                map2.put("16","");
-                map2.put("17","");
-                map2.put("18","");
-                map2.entrySet().stream().sorted(Map.Entry.comparingByKey());
-                list1.add(map2);
-            }
-        }*/
 
 
-        String info = JSONArray.toJSONString(list1);
+*/
+        String info = JSONArray.toJSONString(orderInfo);
         return info;
     }
 
diff --git a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
index 6076aed..76d2e16 100644
--- a/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/ImosPrPlanMapper.xml
@@ -12,6 +12,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="recordTime" column="record_Time" />
         <result property="endTime" column="end_time" />
         <result property="planDate" column="plan_date"/>
+        <result property="target" column="target"/>
     </resultMap>
     
     <resultMap type="ImosPrPlan" id="ImosPrPlanResult">