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 621333093..cb96c9c32 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java @@ -5,14 +5,10 @@ import com.iformall.common.ErrorCode; 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.domain.po.KwMeter; import com.iformall.domain.vo.KwMerchantMeterVo; import com.iformall.enums.EnumMerchantMeterStatus; -import com.iformall.enums.EnumMerchantStatus; import com.iformall.service.kw.KwMerchantMeterService; import com.iformall.service.kw.KwMeterDataService; import io.swagger.annotations.Api; @@ -24,8 +20,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - @RestController @RequestMapping("kwMerchantMeter") @@ -107,4 +101,12 @@ public class KwMerchantMeterController extends BaseController { return new ResultData(); } + + @ApiOperation("商户电表列表") + @GetMapping("getMechantMeter") + @SystemControllerLog(description = "商户列表") + public ResultData getMechantMeter() { + return new ResultData(kwMerchantMeterService.getMerchantMeter()); + } + } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/MerchantMeterVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantMeterVo.java new file mode 100644 index 000000000..49661bb5c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/MerchantMeterVo.java @@ -0,0 +1,20 @@ +package com.iformall.domain.vo; + +import lombok.Data; + +/** + * @author gongbiao + */ +@Data +public class MerchantMeterVo { + + @io.swagger.annotations.ApiModelProperty(value = "商户ID", name = "merchantId") + private Long merchantId; + + @io.swagger.annotations.ApiModelProperty(value = "商户名", name = "merchantName") + private String merchantName; + + @io.swagger.annotations.ApiModelProperty(value = "存在电表", name = "has") + private Integer has; + +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java index d7f888310..910cf1038 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java @@ -6,6 +6,7 @@ import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterVo; +import com.iformall.domain.vo.MerchantMeterVo; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -19,4 +20,7 @@ public interface KwMerchantMeterMapper extends CommonMapper getMerchantMeter(); + } 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 a7858d6a2..c068f6d64 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java @@ -2,14 +2,12 @@ package com.iformall.service.kw; import com.github.pagehelper.PageInfo; -import com.iformall.common.ResultData; import com.iformall.domain.dto.KwMerchantMeterDataDto; import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterVo; - - +import com.iformall.domain.vo.MerchantMeterVo; import java.util.List; @@ -55,4 +53,8 @@ public interface KwMerchantMeterService { int selectCount(KwMerchantMeter record); int unbind(Long meterId); int unbindBatch(Long merchantId); + + List getMerchantMeter(); + + } \ No newline at end of file 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 b7e9089ae..7683d6882 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 @@ -2,18 +2,13 @@ package com.iformall.service.kw.impl; import com.github.pagehelper.PageHelper; 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.KwMerchantMeterDataDto; import com.iformall.domain.dto.KwMerchantMeterDto; -import com.iformall.domain.dto.KwMeterDataDto; import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterVo; -import com.iformall.domain.vo.KwMeterDataVo; -import com.iformall.enums.EnumMerchantMeterStatus; -import com.iformall.exception.MallinkException; +import com.iformall.domain.vo.MerchantMeterVo; import com.iformall.mapper.KwMerchantMeterMapper; import com.iformall.mapper.KwMeterDataMapper; import com.iformall.service.kw.KwMerchantMeterService; @@ -22,7 +17,6 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -92,4 +86,9 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService { return kwMerchantMeterMapper.unbindBatch(merchantId); } + @Override + public List getMerchantMeter() { + return kwMerchantMeterMapper.getMerchantMeter(); + } + } diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index b66e6e213..7c1b7d2ba 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -267,6 +267,17 @@ where status = 0 and `meter_id` = #{meterId} - + + + + + + + + +