Browse Source

[电表][修复]:电表导入报错问题

release_toaliyun_real
hupeng 6 years ago
parent
commit
492840e92b
1 changed files with 6 additions and 5 deletions
  1. +6
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java

+ 6
- 5
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java View File

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


Loading…
Cancel
Save