| @@ -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) { | ||||