From ce15656efc12043dd465a41af716a6bf2af091cf Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 22:54:22 +0800
Subject: [PATCH] 电视机数据对接
---
src/main/java/com/zy/asrs/controller/OpenController.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index 8364138..22818dc 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -698,8 +698,8 @@
List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
if(listChart!=null) {
- ArrayList<Integer> data1 = new ArrayList<Integer>();
- ArrayList<Integer> data2 = new ArrayList<Integer>();
+ ArrayList<Number> data1 = new ArrayList<Number>();
+ ArrayList<Number> data2 = new ArrayList<Number>();
SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
@@ -723,25 +723,58 @@
}
AxisBean inqty = new AxisBean();
inqty.setName("鍏ュ簱鎵樼洏鏁�");
- Integer[] array1 = new Integer[data1.size()];
+ Number[] array1 = new Number[data1.size()];
inqty.setData(data1.toArray(array1));
list.add(inqty);
AxisBean outqty = new AxisBean();
outqty.setName("鍑哄簱鎵樼洏鏁�");
- Integer[] array2 = new Integer[data2.size()];
+ Number[] array2 = new Number[data2.size()];
outqty.setData(data2.toArray(array2));
list.add(outqty);
AxisBean teu= new AxisBean();
teu.setName("TEU");
List<WorkTeuTotalAxis> workTeuTotalAxes = reportQueryMapper.getteuTotal();
- ArrayList<Integer> data3 = new ArrayList<>();
+ ArrayList<Number> data3 = new ArrayList<Number>();
for (WorkTeuTotalAxis w : workTeuTotalAxes) {
data3.add(w.getTeu_total());
}
- Integer[] array3 = new Integer[data3.size()];
+ Number[] array3 = new Number[data3.size()];
teu.setData(data3.toArray(array3));
list.add(teu);
+
+ AxisBean cube5 = new AxisBean();
+ cube5.setName("鍏ュ簱浣撶Н");
+ AxisBean cube15 = new AxisBean();
+ cube15.setName("鍑哄簱浣撶Н");
+ List<WorkCubeTotalAxis> workCubeTotalAxes = reportQueryMapper.getCubeTotal();
+ Map<String, WorkCubeTotalAxis> cubeMap = new HashMap<String, WorkCubeTotalAxis>();
+ if (workCubeTotalAxes != null) {
+ for (WorkCubeTotalAxis w : workCubeTotalAxes) {
+ if (w.getYmd() != null) {
+ cubeMap.put(w.getYmd(), w);
+ }
+ }
+ }
+ ArrayList<Number> data4 = new ArrayList<Number>();
+ ArrayList<Number> data5 = new ArrayList<Number>();
+ SimpleDateFormat sfCube = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendarCube = Calendar.getInstance();
+ calendarCube.add(Calendar.DATE, -12);
+ for (int i = 0; i < 12; i++) {
+ calendarCube.add(Calendar.DATE, 1);
+ String str = sfCube.format(calendarCube.getTime());
+ WorkCubeTotalAxis cubeAxis = cubeMap.get(str);
+ data4.add(cubeAxis == null || cubeAxis.getCube5Total() == null ? 0 : cubeAxis.getCube5Total());
+ data5.add(cubeAxis == null || cubeAxis.getCube15Total() == null ? 0 : cubeAxis.getCube15Total());
+ }
+ Number[] array4 = new Number[data4.size()];
+ cube5.setData(data4.toArray(array4));
+ list.add(cube5);
+ Number[] array5 = new Number[data5.size()];
+ cube15.setData(data5.toArray(array5));
+ list.add(cube15);
+
}
map.put("rows",list);
return R.ok(map);
--
Gitblit v1.9.1