From 9380afbc5e143e5c9a41fabf10d826085000a324 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 7 Mar 2019 16:31:20 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=A4=A7=E5=B1=8F][=E4=BF=AE=E6=94=B9]:?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BF=83=E8=B7=B3=E9=99=84=E5=8A=A0=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E7=9A=84=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/controller/WxDeviceScreenAdController.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java index 096a250dc..afc554af7 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java @@ -22,6 +22,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Date; import java.util.List; +import java.util.Map; @RestController @RequestMapping("wxDeviceScreenAd") @@ -85,14 +86,14 @@ public class WxDeviceScreenAdController extends BaseController { @ApiOperation("心跳") @PostMapping("heartbeat") - public Result heartbeat(@RequestParam String deviceId,@RequestBody String version) { + public Result heartbeat(@RequestParam String deviceId,@RequestBody Map paramMap) { WxDevice wxDevice = findDevice(deviceId); if (wxDevice == null) return new ResultData(ErrorCode.DEVICE_NOT_FOUND); if (wxDevice.getFirstHbTime() == null) wxDevice.setFirstHbTime(new Date()); wxDevice.setLastHbTime(new Date()); - wxDevice.setVersion(version); + wxDevice.setVersion(paramMap.get("version")); wxDeviceService.saveOrUpdate(wxDevice); return new ResultData(wxDevice); }