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 = imosPrPlanMapper.getFoamerPlanHourInfo(in_id); - List orderTypeList = new ArrayList<>(); + /* List orderTypeList = new ArrayList<>(); List planQtyList = new ArrayList<>(); List 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 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" +