From 86c395555f2c090b9302424684cc5dd278bbcb7e Mon Sep 17 00:00:00 2001 From: hupeng Date: Fri, 26 Jul 2019 16:09:44 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BC=98=E5=8C=96]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E5=AD=97=E6=AE=B5=E5=86=97=E4=BD=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwMeterController.java | 1 - .../java/com/iformall/domain/po/KwMeter.java | 3 -- .../mapper/KwMerchantMeterMapper.xml | 28 ++----------------- .../main/resources/mapper/KwMeterMapper.xml | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java index fa50afdf7..899364496 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -129,7 +129,6 @@ public class KwMeterController extends BaseController { KwMeter kwMeter = kwMeterService.getById(id); if (kwMeter == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); - kwMeter.setLatestRecord(kwMeterDataService.findLastRecord(id)); return new ResultData(kwMeter); } 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 10a6a89e1..d2685f06e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -93,7 +93,4 @@ public class KwMeter extends BaseEntity { @Transient private Integer merchantMeterStatus; - @Transient - protected KwMeterData latestRecord; - } diff --git a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml index 8fae94be6..297574baa 100644 --- a/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMerchantMeterMapper.xml @@ -55,32 +55,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - select m.* from kw_merchant_meter mm left join kw_meter m on mm.`meter_id` = m.id where mm.`status` = 0 diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index 22f2e8fe2..82bb9ffef 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -20,7 +20,7 @@ - `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`last_total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status` + `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status`