Przeglądaj źródła

[电费自动配置][修改][查询商户电表]

release_toaliyun_real
gongbiao 6 lat temu
rodzic
commit
7d514f17d3
6 zmienionych plików z 55 dodań i 17 usunięć
  1. +8
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java
  2. +20
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/MerchantMeterVo.java
  3. +4
    -0
      mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java
  4. +5
    -3
      mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java
  5. +6
    -7
      mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java
  6. +12
    -1
      mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml

+ 8
- 6
mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java Wyświetl plik

@@ -5,14 +5,10 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.Result; 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.dto.KwMerchantMeterDto; import com.iformall.domain.dto.KwMerchantMeterDto;
import com.iformall.domain.dto.KwMeterDataDto;
import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.po.KwMerchantMeter;
import com.iformall.domain.po.KwMeter;
import com.iformall.domain.vo.KwMerchantMeterVo; import com.iformall.domain.vo.KwMerchantMeterVo;
import com.iformall.enums.EnumMerchantMeterStatus; import com.iformall.enums.EnumMerchantMeterStatus;
import com.iformall.enums.EnumMerchantStatus;
import com.iformall.service.kw.KwMerchantMeterService; import com.iformall.service.kw.KwMerchantMeterService;
import com.iformall.service.kw.KwMeterDataService; import com.iformall.service.kw.KwMeterDataService;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -24,8 +20,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;


import java.util.List;



@RestController @RestController
@RequestMapping("kwMerchantMeter") @RequestMapping("kwMerchantMeter")
@@ -107,4 +101,12 @@ public class KwMerchantMeterController extends BaseController {
return new ResultData(); return new ResultData();
} }



@ApiOperation("商户电表列表")
@GetMapping("getMechantMeter")
@SystemControllerLog(description = "商户列表")
public ResultData getMechantMeter() {
return new ResultData(kwMerchantMeterService.getMerchantMeter());
}

} }

+ 20
- 0
mallinkService/src/main/java/com/iformall/domain/vo/MerchantMeterVo.java Wyświetl plik

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

}

+ 4
- 0
mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java Wyświetl plik

@@ -6,6 +6,7 @@ import com.iformall.domain.dto.KwMerchantMeterDto;
import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.po.KwMerchantMeter;
import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterDataVo;
import com.iformall.domain.vo.KwMerchantMeterVo; import com.iformall.domain.vo.KwMerchantMeterVo;
import com.iformall.domain.vo.MerchantMeterVo;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;


import java.util.List; import java.util.List;
@@ -19,4 +20,7 @@ public interface KwMerchantMeterMapper extends CommonMapper<KwMerchantMeter, Lon


int unbindBatch(@Param("merchantId")Long merchantId); int unbindBatch(@Param("merchantId")Long merchantId);
int unbind(@Param("meterId")Long meterId); int unbind(@Param("meterId")Long meterId);

List<MerchantMeterVo> getMerchantMeter();

} }

+ 5
- 3
mallinkService/src/main/java/com/iformall/service/kw/KwMerchantMeterService.java Wyświetl plik

@@ -2,14 +2,12 @@ package com.iformall.service.kw;




import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.KwMerchantMeterDataDto; import com.iformall.domain.dto.KwMerchantMeterDataDto;
import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.dto.KwMerchantMeterDto;
import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.po.KwMerchantMeter;
import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterDataVo;
import com.iformall.domain.vo.KwMerchantMeterVo; import com.iformall.domain.vo.KwMerchantMeterVo;


import com.iformall.domain.vo.MerchantMeterVo;


import java.util.List; import java.util.List;


@@ -55,4 +53,8 @@ public interface KwMerchantMeterService {
int selectCount(KwMerchantMeter record); int selectCount(KwMerchantMeter record);
int unbind(Long meterId); int unbind(Long meterId);
int unbindBatch(Long merchantId); int unbindBatch(Long merchantId);

List<MerchantMeterVo> getMerchantMeter();


} }

+ 6
- 7
mallinkService/src/main/java/com/iformall/service/kw/impl/KwMerchantMeterServiceImpl.java Wyświetl plik

@@ -2,18 +2,13 @@ package com.iformall.service.kw.impl;


import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode;
import com.iformall.common.IdWorker; import com.iformall.common.IdWorker;
import com.iformall.common.ResultData;
import com.iformall.domain.dto.KwMerchantMeterDataDto; import com.iformall.domain.dto.KwMerchantMeterDataDto;
import com.iformall.domain.dto.KwMerchantMeterDto; import com.iformall.domain.dto.KwMerchantMeterDto;
import com.iformall.domain.dto.KwMeterDataDto;
import com.iformall.domain.po.KwMerchantMeter; import com.iformall.domain.po.KwMerchantMeter;
import com.iformall.domain.vo.KwMerchantMeterDataVo; import com.iformall.domain.vo.KwMerchantMeterDataVo;
import com.iformall.domain.vo.KwMerchantMeterVo; 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.KwMerchantMeterMapper;
import com.iformall.mapper.KwMeterDataMapper; import com.iformall.mapper.KwMeterDataMapper;
import com.iformall.service.kw.KwMerchantMeterService; import com.iformall.service.kw.KwMerchantMeterService;
@@ -22,7 +17,6 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;


import java.util.ArrayList;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;


@@ -92,4 +86,9 @@ public class KwMerchantMeterServiceImpl implements KwMerchantMeterService {
return kwMerchantMeterMapper.unbindBatch(merchantId); return kwMerchantMeterMapper.unbindBatch(merchantId);
} }


@Override
public List<MerchantMeterVo> getMerchantMeter() {
return kwMerchantMeterMapper.getMerchantMeter();
}

} }

+ 12
- 1
mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml Wyświetl plik

@@ -267,6 +267,17 @@
where status = 0 where status = 0
and `meter_id` = #{meterId} and `meter_id` = #{meterId}
</update> </update>

<resultMap id="MerchantMeterMap" type="com.iformall.domain.vo.MerchantMeterVo">
<result column="merchant_id" property="merchantId"/>
<result column="merchant_name" property="merchantName"/>
<result column="has" property="has"/>
</resultMap>
<select id="getMerchantMeter" resultMap="MerchantMeterMap">
select m.id as merchant_id,m.name as merchant_name,ifnull(mm.status,0) has from wx_merchant m
left join (select merchant_id,1 as status from kw_merchant_meter where status=0) mm on m.id=mm.merchant_id
</select>


</mapper> </mapper>

Ładowanie…
Anuluj
Zapisz