diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java index 253239a70..3cf53f5c2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwBoxController.java @@ -90,7 +90,11 @@ public class KwBoxController extends BaseController { if (kwBox == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - kwBox.setMeters(kwBoxService.findMeters(kwBox)); + KwMeter kwMeter = new KwMeter(); + kwMeter.setBoxId(kwBox.getId()); + kwMeter.setBindStatus(EnumMeterBindStatus.BIND.getCode()); + kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); + kwBox.setMeters(kwMeterService.findVoList(kwMeter)); return new ResultData(kwBox); } diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java index c6a7bf9e7..6bcc44290 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMeterMapper.java @@ -10,6 +10,7 @@ import java.util.List; public interface KwMeterMapper extends CommonMapper { List findList(KwMeter param); + List findVoList(KwMeter param); //with merchant info int onlineBatch(@Param("list")List list); int offlineBatch(KwMeter param); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java index a97af8e07..cc12b9e4f 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMeterService.java @@ -54,6 +54,8 @@ public interface KwMeterService { */ List findList(KwMeter record); + List findVoList(KwMeter record); + int selectCount(KwMeter record); int bind(Long boxId, Long meterId); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java index 222a20829..890d8a038 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -26,7 +26,7 @@ public class KwMeterServiceImpl implements KwMeterService { @Override public PageInfo listAsPage(KwMeter record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterMapper.findList(record)); + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMeterMapper.findVoList(record)); } @Override @@ -69,6 +69,11 @@ public class KwMeterServiceImpl implements KwMeterService { return kwMeterMapper.findList(record); } + @Override + public List findVoList(KwMeter record) { + return kwMeterMapper.findVoList(record); + } + @Override public int selectCount(KwMeter record) { return kwMeterMapper.selectCount(record); diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index bf64b939b..aaca8f973 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -86,17 +86,25 @@ order by ${sortColumns} - + + + + update kw_meter set