From 9fb00ee422c7e1b6bf3712d1fe192af9cdba5975 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 19 十一月 2020 15:22:02 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MonitorController.java | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 76 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MonitorController.java b/src/main/java/com/zy/asrs/controller/MonitorController.java
index f077b4d..0cdb798 100644
--- a/src/main/java/com/zy/asrs/controller/MonitorController.java
+++ b/src/main/java/com/zy/asrs/controller/MonitorController.java
@@ -3,6 +3,8 @@
import com.core.common.Arith;
import com.core.common.Cools;
import com.core.common.R;
+import com.zy.asrs.domain.dto.AxisBean;
+import com.zy.asrs.domain.dto.WorkChartAxis;
import com.zy.asrs.domain.vo.LocChartPie;
import com.zy.asrs.mapper.ReportQueryMapper;
import com.zy.common.service.CommonService;
@@ -11,11 +13,9 @@
import com.zy.core.enums.SlaveType;
import com.zy.core.model.protocol.CrnProtocol;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import java.text.SimpleDateFormat;
import java.util.*;
/**
@@ -56,6 +56,8 @@
public R monitorOther(@RequestParam("crnId") Integer crnId) {
Double xSpeed = 0.0D;
Double ySpeed = 0.0D;
+ Double zSpeed = 0.0D;
+ Short forkPos = 1;
Double xDistance = 0.0D;
Double yDistance = 0.0D;
Double xDuration = 0.0D;
@@ -68,6 +70,21 @@
if (crnProtocol != null) {
xSpeed = Double.valueOf(crnProtocol.getXSpeed());
ySpeed = Double.valueOf(crnProtocol.getYSpeed());
+ zSpeed = Double.valueOf(crnProtocol.getZSpeed());
+ switch (crnProtocol.getForkPos()) {
+ case 0:
+ forkPos = 1;
+ break;
+ case 1:
+ forkPos = 0;
+ break;
+ case 2:
+ forkPos = 2;
+ break;
+ default:
+ forkPos = 1;
+ break;
+ }
xDistance = Double.valueOf(crnProtocol.getXDistance());
yDistance = Double.valueOf(crnProtocol.getYDistance());
xDuration = Double.valueOf(crnProtocol.getXDuration());
@@ -85,6 +102,8 @@
return R.ok(
Cools.add("xSpeed", xSpeed) // 琛岃蛋閫熷害
.add("ySpeed", ySpeed) // 鍗囬檷閫熷害
+ .add("zSpeed", zSpeed) // 鍙夌墮閫熷害
+ .add("forkPos", forkPos) // 鍙夌墮閫熷害
// .add("totalLoc", totalLoc) // 鎬诲簱浣嶆暟
// .add("totalWrk", totalWrk) // 鎬讳换鍔℃暟
.add("xDistance", xDistance) // 绱璧拌璺濈km
@@ -99,15 +118,65 @@
*/
@GetMapping("/pakin/rep")
public R monitorPakinRep(){
- List<Map<String, Object>> report = reportQueryMapper.queryPakinRep();
- for (Map<String, Object> map : report) {
+ // 鍏ュ簱
+ List<Map<String, Object>> pakinRep = reportQueryMapper.queryPakinRep();
+ for (Map<String, Object> map : pakinRep) {
if (map.get("node")!=null) {
map.put("node", String.valueOf(map.get("node")).substring(5, 10));
}
}
- return R.ok(report);
+ // 鍑哄簱
+ List<Map<String, Object>> pakoutRep = reportQueryMapper.queryPakinRep();
+ return R.ok(pakinRep);
}
+ @GetMapping("/line/charts")
+ public R locIoLineCharts(){
+ Map<String,Object> map=new HashMap<String, Object>();
+ List<AxisBean> list = new ArrayList<AxisBean>();
+
+ List<WorkChartAxis> listChart = reportQueryMapper.getChartAxis();
+
+ if(listChart!=null) {
+ ArrayList<Integer> data1 = new ArrayList<Integer>();
+ ArrayList<Integer> data2 = new ArrayList<Integer>();
+
+ SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar calendar = Calendar.getInstance();
+ calendar.add(Calendar.DATE, -12);
+ for(int i=0;i<12;i++) {
+ boolean flag = true;
+ calendar.add(Calendar.DATE, 1);
+ String str = sf.format(calendar.getTime());
+ for(WorkChartAxis workChart : listChart) {
+ if(str.equals(workChart.getYmd())) {
+ data1.add(workChart.getInqty());
+ data2.add(workChart.getOutqty());
+ flag = false;
+ break;
+ }
+ }
+ if(flag) {
+ data1.add(0);
+ data2.add(0);
+ }
+ }
+ AxisBean inqty = new AxisBean();
+ inqty.setName("鍏ュ簱鏁伴噺");
+ Integer[] array1 = new Integer[data1.size()];
+ inqty.setData(data1.toArray(array1));
+ list.add(inqty);
+ AxisBean outqty = new AxisBean();
+ outqty.setName("鍑哄簱鏁伴噺");
+ Integer[] array2 = new Integer[data2.size()];
+ outqty.setData(data2.toArray(array2));
+ list.add(outqty);
+ }
+ map.put("rows",list);
+ return R.ok(map);
+ }
+
+
/**
* 搴撲綅浣跨敤鎯呭喌缁熻
*/
--
Gitblit v1.9.1