From 8405120779a8f22574198acf0c322287bd6e8f9a Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 11 Jul 2019 10:46:35 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E7=94=B5=E8=A1=A8=E7=94=B5=E9=87=8F=E6=8A=A5=E8=A1=A8=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/KwMeterController.java | 1 + .../service/kw/impl/KwMeterServiceImpl.java | 4 +++ .../resources/mapper/KwMeterDataMapper.xml | 29 +++++++++---------- 3 files changed, 19 insertions(+), 15 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 73bd17425..6b05e395b 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/device/KwMeterController.java @@ -67,6 +67,7 @@ public class KwMeterController extends BaseController { return new ResultData(ErrorCode.DEVICE_ALREADY_EXIST); kwMeter.setTenantId(getTenantId()); kwMeter.setBoxId(0L); + kwMeter.setStatus(EnumMeterStatus.VALID.getCode()); kwMeter.setBindStatus(EnumMeterBindStatus.UNBIND.getCode()); return kwMeterService.saveOrUpdate(kwMeter); } diff --git a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java index e0e46ca22..94a2bc165 100644 --- a/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/kw/impl/KwMeterServiceImpl.java @@ -12,6 +12,7 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; @@ -38,8 +39,11 @@ public class KwMeterServiceImpl implements KwMeterService { if (record.getId() == null) { final IdWorker idWorker = IdWorker.get(); record.setId(idWorker.nextId()); + record.setCreateTime(new Date()); + record.setUpdateTime(new Date()); kwMeterMapper.insertSelective(record); } else { + record.setUpdateTime(new Date()); kwMeterMapper.updateByPrimaryKeySelective(record); } return new ResultData(); diff --git a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml index 775d5ed50..50d96a68b 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterDataMapper.xml @@ -101,8 +101,8 @@