Просмотр исходного кода

[电表][导入]:修复电表导入接口

release_toaliyun_real
hupeng 6 лет назад
Родитель
Сommit
e1ac9d7876
3 измененных файлов: 11 добавлений и 8 удалений
  1. +8
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/utils/UrlCheck.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java

+ 8
- 5
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) {


+ 1
- 1
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");
}

}

+ 2
- 2
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")


Загрузка…
Отмена
Сохранить