From a499ea6169b4f7ce5d2fcc30611d2dd3d6dd5d06 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 20 Jun 2019 14:33:43 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0=E5=8D=95=E4=BD=8D,?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E6=9B=B4=E6=96=B0=E8=AF=AD=E5=8F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/device/WxDeviceScreenAdController.java | 10 ++++++---- .../com/iformall/service/impl/WxDeviceServiceImpl.java | 6 +++--- .../src/main/resources/mapper/WxDeviceMapper.xml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java b/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java index a7587b32f..b17f3276c 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/WxDeviceScreenAdController.java @@ -92,11 +92,13 @@ public class WxDeviceScreenAdController extends BaseController { WxDevice wxDevice = findDevice(deviceId); if (wxDevice == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); + WxDevice record = new WxDevice(); + record.setId(wxDevice.getId()); if (wxDevice.getFirstHbTime() == null) - wxDevice.setFirstHbTime(new Date()); - wxDevice.setLastHbTime(new Date()); - wxDevice.setVersion(paramMap.get("version")); - wxDeviceService.saveOrUpdate(wxDevice); + record.setFirstHbTime(new Date()); + record.setLastHbTime(new Date()); + record.setVersion(paramMap.get("version")); + wxDeviceService.saveOrUpdate(record); Map result = new HashMap<>(); result.put("config",wxDevice.getConfig()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java index e1e57c510..e345ec635 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -29,9 +29,9 @@ public class WxDeviceServiceImpl implements WxDeviceService { WxDeviceMapper wxDeviceMapper; final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" + - "\"heartbeatInterval\":300000," + //5MIN - "\"dataRefreshInterval\":3600000," + //1HOUR - "\"pageChangeInterval\":10000," + //10SEC + "\"heartbeatInterval\":300," + //5MIN + "\"dataRefreshInterval\":3600," + //1HOUR + "\"pageChangeInterval\":10," + //10SEC "\"animationTheme\":0" + "}"; diff --git a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml index c33a30a69..4c0e3e447 100644 --- a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml @@ -35,7 +35,7 @@ - and `device_id` like concat('%', #{deviceId},'%') + and `device_id` = #{deviceId}