From 98301ed28f65ad34fc8958e3cdf339ee89110c8e Mon Sep 17 00:00:00 2001
From: lxw <810412026@qq.com>
Date: 星期五, 04 十一月 2022 15:33:35 +0800
Subject: [PATCH] 解析时时间处理
---
src/main/java/com/whyc/dto/XmlFileOpreate.java | 78 ++++++++++++++++++++------------------
1 files changed, 41 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/whyc/dto/XmlFileOpreate.java b/src/main/java/com/whyc/dto/XmlFileOpreate.java
index e58dd67..23a367a 100644
--- a/src/main/java/com/whyc/dto/XmlFileOpreate.java
+++ b/src/main/java/com/whyc/dto/XmlFileOpreate.java
@@ -104,22 +104,24 @@
Iterator nodes = rootnode.elementIterator("node_batt_num");
BattgroupInfo battInfo=new BattgroupInfo();
List<BattgroupData> battDataList=new ArrayList();
-
- while (nodes.hasNext()){
- node= (Element) nodes.next();
- BattgroupData battData=new BattgroupData();
- battData.setMonNum(Integer.parseInt(node.attributeValue("batt_num")));
- file_node=node.element("bv_1");
- battData.setBv(file_node.getTextTrim());
- file_node=node.element("br_1");
- battData.setBr(file_node.getTextTrim());
- file_node=node.element("bs_1");
- battData.setBs(file_node.getTextTrim());
- file_node=node.element("cr_1");
- battData.setCr(file_node.getTextTrim());
- battDataList.add(battData);
+ if(nodes!=null){
+ while (nodes.hasNext()){
+ node= (Element) nodes.next();
+ BattgroupData battData=new BattgroupData();
+ battData.setMonNum(Integer.parseInt(node.attributeValue("batt_num")));
+ file_node=node.element("bv_1");
+ battData.setBv(file_node.getTextTrim());
+ file_node=node.element("br_1");
+ battData.setBr(file_node.getTextTrim());
+ file_node=node.element("bs_1");
+ battData.setBs(file_node.getTextTrim());
+ file_node=node.element("cr_1");
+ battData.setCr(file_node.getTextTrim());
+ battDataList.add(battData);
+ }
}
battInfo.setBattDataList(battDataList);
+ battInfo.setTestTime(ActionUtil.sdfwithALL.parse(testTime));
fileInfo.getBattInfoList().add(battInfo);
fileInfo.setFileParam(fparam);
fiso.close();
@@ -224,30 +226,32 @@
//-----鏍规嵁groupNum鐨勫�艰鍙栨祴璇曟暟鎹�---------------------------//
Iterator nodes = rootnode.elementIterator("node_group_num");
- while (nodes.hasNext()){
- node= (Element) nodes.next();
- Iterator iterator1 = node.elementIterator();
- BattgroupInfo battInfo=new BattgroupInfo();
- List<BattgroupData> battDataList=new ArrayList();
- while (iterator1.hasNext()){
- file_node= (Element) iterator1.next();
- BattgroupData battData=new BattgroupData();
- battData.setMonNum(Integer.parseInt(file_node.attributeValue("batt_num")));
- batt_node=file_node.element("bv_1");
- battData.setBv(batt_node.getTextTrim());
- batt_node=file_node.element("br_1");
- battData.setBr(batt_node.getTextTrim());
- batt_node=file_node.element("bs_1");
- battData.setBs(batt_node.getTextTrim());
- batt_node=file_node.element("cr_1");
- battData.setCr(batt_node.getTextTrim());
- batt_node=file_node.element("er_1");
- battData.setEr(Integer.parseInt(batt_node.getTextTrim()));
- battDataList.add(battData);
+ if(nodes!=null){
+ while (nodes.hasNext()){
+ node= (Element) nodes.next();
+ Iterator iterator1 = node.elementIterator();
+ BattgroupInfo battInfo=new BattgroupInfo();
+ List<BattgroupData> battDataList=new ArrayList();
+ while (iterator1.hasNext()){
+ file_node= (Element) iterator1.next();
+ BattgroupData battData=new BattgroupData();
+ battData.setMonNum(Integer.parseInt(file_node.attributeValue("batt_num")));
+ batt_node=file_node.element("bv_1");
+ battData.setBv(batt_node.getTextTrim());
+ batt_node=file_node.element("br_1");
+ battData.setBr(batt_node.getTextTrim());
+ batt_node=file_node.element("bs_1");
+ battData.setBs(batt_node.getTextTrim());
+ batt_node=file_node.element("cr_1");
+ battData.setCr(batt_node.getTextTrim());
+ batt_node=file_node.element("er_1");
+ battData.setEr(Integer.parseInt(batt_node.getTextTrim()));
+ battDataList.add(battData);
+ }
+ battInfo.setTestTime(ActionUtil.sdfwithALL.parse(testTime));
+ battInfo.setBattDataList(battDataList);
+ fileInfo.getBattInfoList().add(battInfo);
}
- battInfo.setTestTime(ActionUtil.sdfwithALL.parse(testTime));
- battInfo.setBattDataList(battDataList);
- fileInfo.getBattInfoList().add(battInfo);
}
fileInfo.setFileParam(fparam);
fiso.close();
--
Gitblit v1.9.1