From 2c6be7c10cd246676de42ab8d2ec3447789b456d Mon Sep 17 00:00:00 2001 From: chenjinsong Date: Fri, 12 Oct 2018 18:36:24 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E8=A7=A3=E6=9E=90=E8=BF=87?= =?UTF-8?q?=E7=9A=84=E6=96=87=E4=BB=B6=E7=A7=BB=E5=8A=A8=E5=A4=B1=E8=B4=A5?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=202.=E5=88=A0=E6=8E=89=E6=97=A0?= =?UTF-8?q?=E7=94=A8=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gloam/WebRoot/config/016config.html | 352 ------------------ gloam/WebRoot/config/102config.html | 324 ---------------- .../nis/gloam/task/DetectDataParseThread.java | 8 +- 3 files changed, 6 insertions(+), 678 deletions(-) delete mode 100644 gloam/WebRoot/config/016config.html delete mode 100644 gloam/WebRoot/config/102config.html diff --git a/gloam/WebRoot/config/016config.html b/gloam/WebRoot/config/016config.html deleted file mode 100644 index d9b4d16..0000000 --- a/gloam/WebRoot/config/016config.html +++ /dev/null @@ -1,352 +0,0 @@ - - - - - -#(_res.get("system.config")) - - - - -#include("/common/header.html") - - #if(session.successMessage!=null&&session.successMessage!="") - - #else - - #end - - #if(session.errorMessage!=null&&session.errorMessage!="") - - #else - - #end -
-
-
- -
-
- - -
- - #for(deviceData:deviceInfos) - - #if(session.tabTag) - #if(session.tabTag==deviceData.key) -
-
- #else -
-
- #end - #else - #if(for.index==0) -
-
- #else -
-
- #end - #end - - -
- #for(deviceInfo:deviceData.value) - - - - - - - #if(deviceInfo.manageName.contains(':')) - - - - - - - - - - #else - - - - - - - - - - #end - -
#(deviceInfo.manageName) -
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
-
-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
-
-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
-
- #end -
- - -
-
-
-
- #end -
- -
-
- - -
- - - - diff --git a/gloam/WebRoot/config/102config.html b/gloam/WebRoot/config/102config.html deleted file mode 100644 index 5781b6d..0000000 --- a/gloam/WebRoot/config/102config.html +++ /dev/null @@ -1,324 +0,0 @@ - - - - - -#(_res.get("system.config")) - - - - -#include("/common/header.html") - - #if(session.successMessage!=null&&session.successMessage!="") - #else - #end - - #if(session.errorMessage!=null&&session.errorMessage!="") - #else - #end -
-
-
-

- #(_res.get("system.config")) -

-
-
- -
- #for(deviceData:deviceInfos) - #for(deviceInfo:deviceData.value) - - - - - - #if(deviceInfo.manageName.contains(':')) - - - - - - - - - - #else - - - - - - - - - - #end - #end - -
#(deviceInfo.manageName) -
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
-
-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
-
-
- -
- -
-
- 		-
- -
- -
-
- 		-
- -
- -
-
-
- #end - #if(deviceInfos) -
- - -
- #else -

暂无数据信息

- #end -
-
-
- -
- - - - diff --git a/gloam/src/com/nis/gloam/task/DetectDataParseThread.java b/gloam/src/com/nis/gloam/task/DetectDataParseThread.java index e2796c2..1ba365e 100644 --- a/gloam/src/com/nis/gloam/task/DetectDataParseThread.java +++ b/gloam/src/com/nis/gloam/task/DetectDataParseThread.java @@ -54,8 +54,12 @@ public class DetectDataParseThread implements Callable { public String call() { Thread.currentThread().setName(threadName); - String normalPath = root + "/nc_data/done/" + type + "/" + ip + "/" + now + ".csv"; - String abnormalPath = root + "/nc_data/error/" + type + "/" + ip + "/" + now + ".csv"; + String normalPathRoot = root + "/nc_data/done/" + type + "/" + ip + "/"; + String normalPath = normalPathRoot + now + ".csv"; + String abnormalPathRoot = root + "/nc_data/error/" + type + "/" + ip + "/"; + String abnormalPath = abnormalPathRoot + now + ".csv"; + mkdir(normalPathRoot); + mkdir(abnormalPathRoot); try { List allLineList = CSVUtils.csvFileParser(file, "UTF-8");