From 1400ab5fe5b5919a147538934d95d93b8a1379dc Mon Sep 17 00:00:00 2001 From: 于紫祥_1901 <email@yuzixiang_1910> Date: Thu, 13 Aug 2020 09:04:52 +0800 Subject: [PATCH] 风场图update --- src/main/java/com/moral/controller/ScreenController.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java index a4d4a42..cbdb6e6 100644 --- a/src/main/java/com/moral/controller/ScreenController.java +++ b/src/main/java/com/moral/controller/ScreenController.java @@ -17,7 +17,6 @@ import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; -import com.google.gson.Gson; import com.googlecode.aviator.AviatorEvaluator; import com.googlecode.aviator.Expression; import com.moral.common.bean.Constants; @@ -1976,7 +1975,8 @@ @GetMapping("/windAndDeviceData") @ResponseBody - public List windAndDeviceData(HttpServletRequest request, String monitorPointId) { + public List windAndDeviceData() { + String monitorPointId="539"; Calendar c = Calendar.getInstance();//������������������������������������ ������������������������������ int year = c.get(Calendar.YEAR); int month = c.get(Calendar.MONTH); -- Gitblit v1.8.0