Procházet zdrojové kódy

[电表][修复]:电表导入不能绑定采集器问题

release_toaliyun_real
hupeng před 6 roky
rodič
revize
f1966f919b
1 změnil soubory, kde provedl 14 přidání a 1 odebrání
  1. +14
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java

+ 14
- 1
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java Zobrazit soubor

@@ -177,6 +177,17 @@ public class KwMeterController extends BaseController {
kwMerchantMeterService.saveOrUpdate(kwMerchantMeter); kwMerchantMeterService.saveOrUpdate(kwMerchantMeter);
} }


private void addOrUpdate(KwMeter kwMeter) {
KwMeter record = new KwMeter();
record.setTenantId(getTenantId());
record.setAddress(kwMeter.getAddress());
record.setStatus(EnumMeterStatus.VALID.getCode());
List<KwMeter> kwMeters = kwMeterService.findList(record);
if (kwMeters.size() > 0)
kwMeter.setId(kwMeters.get(0).getId());
kwMeterService.saveOrUpdate(kwMeter);
}

@ApiOperation("导入设备") @ApiOperation("导入设备")
@PostMapping(value = "import", consumes = "multipart/*") @PostMapping(value = "import", consumes = "multipart/*")
@SystemControllerLog(description = "电表管理-导入数据") @SystemControllerLog(description = "电表管理-导入数据")
@@ -190,6 +201,8 @@ public class KwMeterController extends BaseController {
XSSFSheet sheet = workbook.getSheetAt(0); XSSFSheet sheet = workbook.getSheetAt(0);
for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) { for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) {
XSSFRow row = sheet.getRow(i); XSSFRow row = sheet.getRow(i);
if (row == null)
continue;
KwMeter kwMeter = new KwMeter(); KwMeter kwMeter = new KwMeter();
Cell c = row.getCell(0,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); Cell c = row.getCell(0,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);
if (c != null) { if (c != null) {
@@ -226,7 +239,7 @@ public class KwMeterController extends BaseController {
kwMeter.setBoxId(kwBox.getId()); kwMeter.setBoxId(kwBox.getId());
} }


add(kwMeter);
addOrUpdate(kwMeter);


c = row.getCell(7,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); c = row.getCell(7,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);
if (c != null) { if (c != null) {


Načítá se…
Zrušit
Uložit