From ccb678ce114796c3cb949fb734c0e3b3af304ad5 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 21 Mar 2019 13:51:47 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E5=BF=83=E8=B7=B3=E6=8E=A5=E5=8F=A3=E8=BF=94=E5=9B=9E=E5=80=BC?= =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/WxDeviceScreenAdController.java | 8 +++++++- .../com/iformall/service/impl/WxDeviceServiceImpl.java | 8 ++++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java index a8bdb8e52..9421bc17a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java @@ -21,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.Date; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -95,7 +96,12 @@ public class WxDeviceScreenAdController extends BaseController { wxDevice.setLastHbTime(new Date()); wxDevice.setVersion(paramMap.get("version")); wxDeviceService.saveOrUpdate(wxDevice); - return new ResultData(wxDevice.getConfig()); + + Map result = new HashMap<>(); + result.put("config",wxDevice.getConfig()); + result.put("name", wxDevice.getName()); + result.put("location", wxDevice.getLocation()); + return new ResultData(result); } @ApiOperation("基础信息") 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 4a2794b97..efca8b262 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxDeviceServiceImpl.java @@ -29,8 +29,8 @@ public class WxDeviceServiceImpl implements WxDeviceService { WxDeviceMapper wxDeviceMapper; final String DEVICE_DEFAULT_CONFIG_SCREEN_AD = "{" + - "\"heartBeatIntervel\":300000," + //5MIN - "\"dataRefreshIntervel\":3600000," + //1HOUR + "\"heartbeatInterval\":300000," + //5MIN + "\"dataRefreshInterval\":3600000," + //1HOUR "\"pageChangeInterval\":10000," + //10SEC "\"animationTheme\":0" + "}"; @@ -64,8 +64,8 @@ public class WxDeviceServiceImpl implements WxDeviceService { } if (type == EnumDeviceType.SCREEN.getCode()) { - Integer heartBeatIntervel = jConfig.getInteger("heartBeatIntervel"); - Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshIntervel"); + Integer heartBeatIntervel = jConfig.getInteger("heartbeatInterval"); + Integer dataRefreshIntervel = jConfig.getInteger("dataRefreshInterval"); Integer pageChangeInterval = jConfig.getInteger("pageChangeInterval"); Integer animationTheme = jConfig.getInteger("animationTheme"); if (heartBeatIntervel == null ||