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}