Commit 887d8ccd 孙克

界面展示的服务器异常消息手动清除功能

工单监控日志去除,将错误工单文件移到error文件夹
1 个父辈 bf230fa3
...@@ -181,7 +181,9 @@ public class OrderFileWatch { ...@@ -181,7 +181,9 @@ public class OrderFileWatch {
if(resultFile != null){ if(resultFile != null){
resultFile.getParentFile().mkdirs(); resultFile.getParentFile().mkdirs();
//log.info("转移文件到:"+resultFile.getPath());
file.renameTo(resultFile); file.renameTo(resultFile);
//log.info("转移文件到:"+resultFile.getPath()+"完成");
} }
} }
} }
...@@ -277,9 +279,10 @@ public class OrderFileWatch { ...@@ -277,9 +279,10 @@ public class OrderFileWatch {
* @return * @return
*/ */
private LiteOrder readCsv(File csvFile){ private LiteOrder readCsv(File csvFile){
CsvReader csvRead = null;
List<LiteOrderItem> items = Lists.newArrayList(); List<LiteOrderItem> items = Lists.newArrayList();
try { try {
CsvReader csvRead = new CsvReader(csvFile.getAbsolutePath()); csvRead = new CsvReader(csvFile.getAbsolutePath());
csvRead.setSkipEmptyRecords(true);//忽略空行 csvRead.setSkipEmptyRecords(true);//忽略空行
csvRead.setTrimWhitespace(true);//去除空格 csvRead.setTrimWhitespace(true);//去除空格
csvRead.readHeaders(); csvRead.readHeaders();
...@@ -369,6 +372,10 @@ public class OrderFileWatch { ...@@ -369,6 +372,10 @@ public class OrderFileWatch {
return new LiteOrder(fileName, items); return new LiteOrder(fileName, items);
} catch (Exception e) { } catch (Exception e) {
log.error("读取订单 CSV文件["+csvFile.getAbsolutePath()+"]出错",e); log.error("读取订单 CSV文件["+csvFile.getAbsolutePath()+"]出错",e);
}finally {
if(csvRead != null){
csvRead.close();
}
} }
return null; return null;
} }
......
...@@ -691,7 +691,7 @@ ...@@ -691,7 +691,7 @@
$(".boxtemperature").html("${temperature_label}:"+boxStatusBean.temperature+"℃"); $(".boxtemperature").html("${temperature_label}:"+boxStatusBean.temperature+"℃");
$(".boxhumidity").html("${humidity_label}:"+boxStatusBean.humidity+"%"); $(".boxhumidity").html("${humidity_label}:"+boxStatusBean.humidity+"%");
$("#smdstatus").html("${boxStatus_label}: ["+statusTxt+"]"); $("#smdstatus").html("${boxStatus_label}: ["+statusTxt+"]");
$("#clientMsg").html(statusBean.msg); $("#clientMsg").html(statusBean.msg+"<a href='#' onclick='clearMsg();'> x </a>");
//$("#doorStatus").html("${doorStatus_label}:" + clientDataMap.doorStatus); //$("#doorStatus").html("${doorStatus_label}:" + clientDataMap.doorStatus);
}else{ }else{
var statusTxt = statusMsg["999"]; var statusTxt = statusMsg["999"];
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!