| @@ -7,10 +7,7 @@ import com.iformall.common.Result; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.controller.base.BaseController; | import com.iformall.controller.base.BaseController; | ||||
| import com.iformall.domain.po.*; | 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.exception.MallinkException; | ||||
| import com.iformall.service.ExcelService; | import com.iformall.service.ExcelService; | ||||
| import com.iformall.service.WxMerchantService; | import com.iformall.service.WxMerchantService; | ||||
| @@ -237,8 +234,12 @@ public class KwMeterController extends BaseController { | |||||
| kwBox = addOrBind(kwBox); | kwBox = addOrBind(kwBox); | ||||
| kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); | kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); | ||||
| kwMeter.setBoxId(kwBox.getId()); | 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); | addOrUpdate(kwMeter); | ||||
| c = row.getCell(7,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); | c = row.getCell(7,Row.MissingCellPolicy.RETURN_BLANK_AS_NULL); | ||||