diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java index 61a6adb64..bbec16d34 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java @@ -6,6 +6,7 @@ import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.dto.KwMeterDataDto; import com.iformall.domain.po.KwMerchantMeter; import com.iformall.enums.EnumMerchantMeterStatus; @@ -40,11 +41,11 @@ public class KwMerchantMeterController extends BaseController { @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) @SystemControllerLog(description = "电表设备-设备列表") - public Result list(@ModelAttribute KwMerchantMeter kwMerchantMeter, Integer pageNum, Integer pageSize) { - if (kwMerchantMeter == null) kwMerchantMeter = new KwMerchantMeter(); - kwMerchantMeter.setTenantId(getTenantId()); - kwMerchantMeter.setStatus(EnumMerchantMeterStatus.VALID.getCode()); - return new ResultData(kwMerchantMeterService.listAsPage(kwMerchantMeter, pageNum, pageSize)); + public Result list(@ModelAttribute KwMerchantMeterDto kwMerchantMeterDto, Integer pageNum, Integer pageSize) { + if (kwMerchantMeterDto == null) kwMerchantMeterDto = new KwMerchantMeterDto(); + kwMerchantMeterDto.setTenantId(getTenantId()); + kwMerchantMeterDto.setStatus(EnumMerchantMeterStatus.VALID.getCode()); + return new ResultData(kwMerchantMeterService.listVoAsPage(kwMerchantMeterDto, pageNum, pageSize)); } @ApiOperation("绑定设备") diff --git a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java index 6cd37b385..28d2be354 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java @@ -13,6 +13,7 @@ import java.util.List; @Data public class KwMerchantMeterDto extends BaseEntity { + private String tenantId; @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; @@ -23,9 +24,6 @@ public class KwMerchantMeterDto extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value="联系方式",name="linkPhone") private String linkPhone; - @io.swagger.annotations.ApiModelProperty(value="状态0使用1作废",name="status") - private Integer status; - @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") private Integer businessId; @@ -33,6 +31,10 @@ public class KwMerchantMeterDto extends BaseEntity { private Integer subBusinessId; + @io.swagger.annotations.ApiModelProperty(value="状态0使用1作废",name="status") + private Integer status; + + protected String sortColumns; @Override diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java index 92f52db20..0a1946557 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/KwMerchantMeterVo.java @@ -10,14 +10,27 @@ import java.util.List; * @author gongbiao */ @Data -public class KwMerchantMeterVo extends KwMeter { +public class KwMerchantMeterVo { @io.swagger.annotations.ApiModelProperty(value="商户名",name="name") private String merchantName; + @io.swagger.annotations.ApiModelProperty(value="商户联系方式",name="linkPhone") private String merchantLinkPhone; - @io.swagger.annotations.ApiModelProperty(value = "店铺列表", name = "shopVoList") private List shopVoList; + + @io.swagger.annotations.ApiModelProperty(value = "电表列表", name = "meterList") + private Integer meterCount; + + @io.swagger.annotations.ApiModelProperty(value = "电表列表", name = "meterList") + private List meterList; + + public Integer getMeterCount() { + if (meterList.isEmpty()) + return 0; + else + return meterList.size(); + } } diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java index db6462879..6c933b2ad 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java @@ -1,6 +1,7 @@ package com.iformall.mapper; import com.iformall.common.CommonMapper; +import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.vo.KwMerchantMeterVo; @@ -8,8 +9,7 @@ import java.util.List; public interface KwMerchantMeterMapper extends CommonMapper { - List findList(KwMerchantMeter param); - List findListVo(KwMerchantMeter param); + List findListVo(KwMerchantMeterDto param); int unbindBatch(KwMerchantMeter param); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java index 387b35814..e00c519d7 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java @@ -3,6 +3,7 @@ package com.iformall.service.kw; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; +import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.vo.KwMerchantMeterVo; @@ -20,7 +21,7 @@ public interface KwMerchantMeterService { * @param pageSize * @return */ - PageInfo listAsPage(KwMerchantMeter record, Integer pageIndex, Integer pageSize); + PageInfo listVoAsPage(KwMerchantMeterDto record, Integer pageIndex, Integer pageSize); /** @@ -45,8 +46,7 @@ public interface KwMerchantMeterService { * @param record * @return */ - List findList(KwMerchantMeter record); - List findListVo(KwMerchantMeter record); + List findListVo(KwMerchantMeterDto record); int selectCount(KwMerchantMeter record); int unbindBatch(KwMerchantMeter record); diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java index 7b9857240..d650a4d90 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java @@ -5,6 +5,7 @@ import com.github.pagehelper.PageInfo; import com.iformall.common.ErrorCode; import com.iformall.common.IdWorker; import com.iformall.common.ResultData; +import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.dto.KwMeterDataDto; import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.vo.KwMerchantMeterVo; @@ -35,7 +36,7 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { KwMeterDataMapper kwMeterDataMapper; @Override - public PageInfo listAsPage(KwMerchantMeter record, Integer pageIndex, Integer pageSize) { + public PageInfo listVoAsPage(KwMerchantMeterDto record, Integer pageIndex, Integer pageSize) { return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> kwMerchantMeterMapper.findListVo(record)); } @@ -59,14 +60,8 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { } } - - @Override - public List findList(KwMerchantMeter record) { - return kwMerchantMeterMapper.findList(record); - } - @Override - public List findListVo(KwMerchantMeter record) { + public List findListVo(KwMerchantMeterDto record) { return kwMerchantMeterMapper.findListVo(record); } diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 643a8d544..997fd19f5 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -74,17 +74,56 @@ javaType="java.util.List" select="com.iformall.mapper.WxShopMapper.findShopVoList"> + + + + `id`,`tenant_id`,`meter_id`,`merchant_id`,`status`,`create_time`,`update_time`, `name`, `link_phone` - select from kw_merchant_meter, wx_merchant - + diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index 947a4f79b..d1392ab08 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -89,10 +89,10 @@ #{idItem} - + and `online_status` = 0 - + and `online_status` = 1