From 9eadd5c6ad5733ab9879468a3b5d07a696623a8a Mon Sep 17 00:00:00 2001 From: hupeng Date: Wed, 24 Jul 2019 19:27:58 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=95=86=E6=88=B7=E7=94=B5=E8=A1=A8=E7=9A=84?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../device/KwMerchantMeterController.java | 3 - .../domain/dto/KwMerchantMeterDto.java | 4 +- .../java/com/iformall/domain/po/KwMeter.java | 3 +- .../mapper/KwMerchantMeterMapper.java | 1 - .../src/main/resources/mapper/KwBoxMapper.xml | 2 +- .../mapper/KwMerchantMeterMapper.xml | 99 ++++++++++++++----- .../main/resources/mapper/KwMeterMapper.xml | 2 +- 7 files changed, 79 insertions(+), 35 deletions(-) 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 a05d63b40..621333093 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMerchantMeterController.java @@ -60,9 +60,6 @@ public class KwMerchantMeterController extends BaseController { KwMerchantMeterVo kwMerchantMeterVo = kwMerchantMeterService.getById(id); if (kwMerchantMeterVo == null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); - kwMerchantMeterVo.getMeterList().stream().forEach(m->{ - m.setLatestRecord(kwMeterDataService.findLastRecord(m.getId())); - }); return new ResultData(kwMerchantMeterVo); } 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 c33d6e5ee..03f6151cb 100644 --- a/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java +++ b/mallinkService/src/main/java/com/iformall/domain/dto/KwMerchantMeterDto.java @@ -21,10 +21,10 @@ public class KwMerchantMeterDto extends BaseEntity { private String merchantName; @io.swagger.annotations.ApiModelProperty(value="联系人",name="linkPerson") - private String linkPerson; + private String merchantLinkPerson; @io.swagger.annotations.ApiModelProperty(value="联系方式",name="linkPhone") - private String linkPhone; + private String merchantLinkPhone; @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") private Integer businessId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index 98c48f0a4..f15027bf4 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -1,6 +1,7 @@ package com.iformall.domain.po; import cn.afterturn.easypoi.excel.annotation.Excel; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; @@ -17,7 +18,7 @@ import java.util.List; */ @Table(name = "kw_meter") @Data -@ToString(callSuper = true) +@JsonIgnoreProperties(value = {"handler"}) @EqualsAndHashCode(callSuper = true) public class KwMeter extends BaseEntity { @Id diff --git a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java index 810b13aac..d7f888310 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/KwMerchantMeterMapper.java @@ -13,7 +13,6 @@ import java.util.List; public interface KwMerchantMeterMapper extends CommonMapper { List findVoList(KwMerchantMeterDto param); - List findDataVoList(KwMerchantMeterDataDto param); KwMerchantMeterVo getById(@Param("merchantId")Long merchantId); diff --git a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml index 9788737d5..9d4fb1e3b 100644 --- a/mallinkService/src/main/resources/mapper/KwBoxMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwBoxMapper.xml @@ -38,7 +38,7 @@ - and `imei` = #{imei} + and `imei` like concat('%', #{imei},'%') diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index f85c7e7b0..53afcb73c 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -10,7 +10,6 @@ - @@ -73,10 +72,22 @@ + + + + - + select m.id from kw_merchant_meter mm left join kw_meter m on mm.`meter_id` = m.id where mm.`status` = 0 @@ -84,8 +95,16 @@ + - + @@ -93,25 +112,22 @@ - - + + + select="com.iformall.mapper.KwMerchantMeterMapper.findSimpleMeterList"> - `id`, `tenant_id`, `merchant_id`, `status`, `name`, `link_phone` - select from ( select merchant_id from kw_merchant_meter @@ -133,8 +149,8 @@ and `name` like concat('%', #{merchantName},'%') - - and `link_phone` like concat('%', #{linkPhone},'%') + + and `link_phone` like concat('%', #{merchantLinkPhone},'%') @@ -147,6 +163,49 @@ + + + + + + + + + + + + + + + + + + + + where 1 = 1 @@ -240,18 +299,6 @@ - - update kw_merchant_meter set status = 1 where status = 0 diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index 0864102f4..44b78745b 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -36,7 +36,7 @@ - and `address` = #{address} + and `address` like concat('%', #{address},'%') From 6385d6cf7cc9bdc940a18576ccd223ba2bd5ea7b Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 25 Jul 2019 15:22:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=9B=92=E5=AD=90=E9=85=8D=E7=BD=AE=E4=BD=BF=E7=94=A8JSON?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/iformall/controller/device/KwBoxV1Controller.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 82fcd81c0..5fce872ac 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -96,7 +96,7 @@ public class KwBoxV1Controller extends BaseController { data.put(KwBoxService.PREFIX_SYS_STATUS,record.getRegisterStatus()); data.put(KwBoxService.PREFIX_COM_KEY,record.getComKey()); if (kwBox.getConfig() != null) - data.put(KwBoxService.PREFIX_CONFIG,kwBox.getConfig()); + data.put(KwBoxService.PREFIX_CONFIG,JSONObject.parseObject(kwBox.getConfig())); List meters = kwBoxService.findMetersAddress(kwBox); if (!meters.isEmpty()) data.put(KwBoxService.PREFIX_METERS,meters);