From 77fb7786036fd4c7dd16b9b15c6569cdf2d8ba19 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 01 Nov 2023 16:20:56 +0800
Subject: [PATCH] chore:补充提交
---
screen-api/src/main/java/com/moral/api/controller/ChartController.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/ChartController.java b/screen-api/src/main/java/com/moral/api/controller/ChartController.java
index bbbc70a..9bf1855 100644
--- a/screen-api/src/main/java/com/moral/api/controller/ChartController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/ChartController.java
@@ -174,7 +174,8 @@
return ResultMessage.ok(resultMap);
}
if (type.equals("daily")){
- Object time = parameters.get("time");
+ Object time = parameters.get("startTime");
+ parameters.put("time",time);
if (ObjectUtils.isEmpty(time)){
return ResultMessage.fail(ResponseCodeEnum.PARAMETERS_IS_MISSING.getCode(), ResponseCodeEnum.PARAMETERS_IS_MISSING.getMsg());
}
@@ -259,9 +260,9 @@
String path = applicationHome.getSource().getParentFile().toString() + "/static/tsv";
//File file = File.createTempFile("test",".tsv");
- if (!new File(path).exists()){
+ /*if (!new File(path).exists()){
new File(path).mkdir();
- }
+ }*/
File file = null;
File dir = new File(path);
file = File.createTempFile("honeycombDiagram",".tsv",dir);
@@ -270,11 +271,11 @@
OutputStreamWriter ow = new OutputStreamWriter(new FileOutputStream(file),"UTF-8");
//tsv������������������������������������������������������������������������������������������������
- ow.write("lon");
+ ow.write("lng");
ow.write(" ");
ow.write("lat");
ow.write(" ");
- ow.write("value");
+ ow.write("count");
//���������������������
ow.write("\r\n");
//���������
@@ -290,11 +291,11 @@
ow.flush();
ow.close();
- String localAddr = httpServletRequest.getLocalAddr();
- int serverPort = httpServletRequest.getServerPort();
+ /*String localAddr = httpServletRequest.getLocalAddr();
+ int serverPort = httpServletRequest.getServerPort();*/
Map<String,Object> res = new HashMap<>();
- res.put("path","http://"+localAddr +":"+ serverPort+"/static/tsv/"+file.getName());
+ res.put("path","http://47.99.64.149:8081"+"/static/tsv/"+file.getName());
return ResultMessage.ok(res);
}
--
Gitblit v1.8.0