From 471f693ac87a6ed6a2b00e93472b025266c0271f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 09:27:19 +0800
Subject: [PATCH] Merge branch 'wb' of http://blit.7drlb.com:8888/r/moral into qa
---
screen-api/src/main/java/com/moral/api/controller/ChartController.java | 7 ++++---
1 files changed, 4 insertions(+), 3 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 8afedd2..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());
}
@@ -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");
//���������
--
Gitblit v1.8.0