From e09fea0d76e449d28e6543524ecf87f8b7365641 Mon Sep 17 00:00:00 2001 From: gaojie Date: Wed, 16 Jan 2019 17:19:17 +0800 Subject: [PATCH] fix --- test/src/main/java/ExcelUtils.java | 25 +++++++++++-------- .../network/client/NettyTCPClientHandler.java | 3 --- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/test/src/main/java/ExcelUtils.java b/test/src/main/java/ExcelUtils.java index 5d5a78961..afb70c898 100644 --- a/test/src/main/java/ExcelUtils.java +++ b/test/src/main/java/ExcelUtils.java @@ -63,7 +63,7 @@ public class ExcelUtils { // } if (row != null) { StringBuilder info = new StringBuilder(); - int colnum = row.getLastCellNum(); + int colnum = row2.getLastCellNum(); for (int j = 1; j < colnum; j++) { int cellFormatValue = (int) getCellFormatValue(row1.getCell(j)); if (cellFormatValue == 3){ @@ -87,16 +87,20 @@ public class ExcelUtils { info.append("\t").append(cellData); } } - } - if (getCellFormatValue(row1.getCell(j)).toString().isEmpty()){ - continue; - } - //文件名 - cellData = getCellFormatValue(cell); - if (info.length() == 0){ - info = info.append(cellData); }else{ - info.append("\t").append(cellData); + if (getCellFormatValue(row1.getCell(j)).toString().isEmpty()){ + continue; + } + //文件名 + cellData = getCellFormatValue(cell); + if ("".equals(cellData.toString())){ + cellData = getIn(row2.getCell(j).toString()); + } + if (info.length() == 0){ + info = info.append(cellData); + }else{ + info.append("\t").append(cellData); + } } } out.write(info.toString()); @@ -114,6 +118,7 @@ public class ExcelUtils { str = "false"; break; case "int": + case "float": str = "0"; break; case "string": diff --git a/test/src/main/java/network/client/NettyTCPClientHandler.java b/test/src/main/java/network/client/NettyTCPClientHandler.java index e84185793..3499e1199 100644 --- a/test/src/main/java/network/client/NettyTCPClientHandler.java +++ b/test/src/main/java/network/client/NettyTCPClientHandler.java @@ -1,8 +1,5 @@ package network.client; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.google.protobuf.GeneratedMessage; -import com.google.protobuf.GeneratedMessageLite; import com.google.protobuf.MessageLite; import com.ljsd.jieling.netty.cocdex.PacketNetData; import com.ljsd.jieling.netty.cocdex.Tea;