diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index 3b6dac8d1..03d121456 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -27,6 +27,9 @@ import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.poifs.filesystem.POIFSFileSystem; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.xssf.usermodel.XSSFRow; +import org.apache.poi.xssf.usermodel.XSSFSheet; +import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -177,16 +180,16 @@ public class KwMeterController extends BaseController { @ApiOperation("导入设备") @PostMapping(value = "import", consumes = "multipart/*") @SystemControllerLog(description = "电表管理-导入数据") - public Result importData(@RequestParam("file") MultipartFile mFile) { + public Result importMeters(@RequestParam("file") MultipartFile mFile) { if (mFile == null) { return new ResultData(ErrorCode.EXCEL_IMPORT_ERROR); } try { - HSSFWorkbook workbook = new HSSFWorkbook(new POIFSFileSystem(mFile.getInputStream())); - HSSFSheet sheet = workbook.getSheetAt(0); - for (int i = 0; i < sheet.getPhysicalNumberOfRows(); i++) { - HSSFRow row = sheet.getRow(i); + XSSFWorkbook workbook = new XSSFWorkbook(mFile.getInputStream()); + XSSFSheet sheet = workbook.getSheetAt(0); + for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) { + XSSFRow row = sheet.getRow(i); KwMeter kwMeter = new KwMeter(); Cell c = row.getCell(0,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); if (c != null) { diff --git a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java index ffaf2116b..cb3821ba1 100644 --- a/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java +++ b/mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java @@ -19,7 +19,7 @@ public class UrlCheck { || url.contains("notify") || url.contains("pvlog") || url.contains("/wxBillDaily/importTemplate") - || url.contains("/wxImportTemplate/importTemplate"); + || url.contains("/kwMeter/import"); } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index b70ec69bc..29b6847ef 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -53,12 +53,12 @@ public class KwMeter extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "型号", name = "model") private String model; - @Excel(name = "协议(0,1-97协议,07协议)", width =30, orderNum = "5") + @Excel(name = "协议(0,1,2-AUTO,97,07协议)", width =30, orderNum = "5") @io.swagger.annotations.ApiModelProperty(value = "协议(0,1,2-AUTO,97,07协议)", name = "protocol") private Integer protocol; @Excel(name = "波特率(1200,2400,9600)", width = 30, orderNum = "6") - @io.swagger.annotations.ApiModelProperty(value = "波特率1200,2400,9600", name = "bandrate") + @io.swagger.annotations.ApiModelProperty(value = "波特率(1200,2400,9600)", name = "bandrate") private Integer bandrate; @io.swagger.annotations.ApiModelProperty(value = "在线状态1在线0离线", name = "onlineStatus")