From f1966f919b07981cd7f25cf5bd34537ad8840e34 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 6 Aug 2019 13:16:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E5=AF=BC=E5=85=A5=E4=B8=8D=E8=83=BD=E7=BB=91?= =?UTF-8?q?=E5=AE=9A=E9=87=87=E9=9B=86=E5=99=A8=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwMeterController.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) 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 899364496..f89da10f7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -177,6 +177,17 @@ public class KwMeterController extends BaseController { 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 kwMeters = kwMeterService.findList(record); + if (kwMeters.size() > 0) + kwMeter.setId(kwMeters.get(0).getId()); + kwMeterService.saveOrUpdate(kwMeter); + } + @ApiOperation("导入设备") @PostMapping(value = "import", consumes = "multipart/*") @SystemControllerLog(description = "电表管理-导入数据") @@ -190,6 +201,8 @@ public class KwMeterController extends BaseController { XSSFSheet sheet = workbook.getSheetAt(0); for (int i = 1; i < sheet.getPhysicalNumberOfRows(); i++) { XSSFRow row = sheet.getRow(i); + if (row == null) + continue; KwMeter kwMeter = new KwMeter(); Cell c = row.getCell(0,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); if (c != null) { @@ -226,7 +239,7 @@ public class KwMeterController extends BaseController { kwMeter.setBoxId(kwBox.getId()); } - add(kwMeter); + addOrUpdate(kwMeter); c = row.getCell(7,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); if (c != null) {