From 492840e92baa9484a0a2f486bf48571916f18565 Mon Sep 17 00:00:00 2001 From: hupeng Date: Tue, 6 Aug 2019 17:33:27 +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=E6=8A=A5=E9=94=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/device/KwMeterController.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) 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 f89da10f7..0d0b9aba7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -7,10 +7,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; -import com.iformall.enums.EnumBoxStatus; -import com.iformall.enums.EnumMerchantMeterStatus; -import com.iformall.enums.EnumMeterBindStatus; -import com.iformall.enums.EnumMeterStatus; +import com.iformall.enums.*; import com.iformall.exception.MallinkException; import com.iformall.service.ExcelService; import com.iformall.service.WxMerchantService; @@ -237,8 +234,12 @@ public class KwMeterController extends BaseController { kwBox = addOrBind(kwBox); kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); kwMeter.setBoxId(kwBox.getId()); + } else { + kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); + kwMeter.setBoxId(0L); } - + kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); + kwMeter.setOnlineStatus(EnumMeterOnlineStatus.OFFLINE.getCode()+); addOrUpdate(kwMeter); c = row.getCell(7,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL);