From 34f072555c7dc6ff63f8586150d73c6379b7a16c Mon Sep 17 00:00:00 2001 From: Administrator <Administrator@Admin> Date: 星期五, 23 十一月 2018 16:57:20 +0800 Subject: [PATCH] 用户未输入最高价格时 最高价格限制99999 --- fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java | 43 ++++++++++++++++++++++++++++++++----------- 1 files changed, 32 insertions(+), 11 deletions(-) diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java index 11fcc72..19004ba 100644 --- a/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java +++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/PushController.java @@ -7,16 +7,18 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMethod; +import org.yeshi.utils.JsonUtil; import com.yeshi.fanli.entity.accept.AcceptData; +import com.yeshi.fanli.entity.push.DeviceActive; import com.yeshi.fanli.entity.push.DeviceTokenIOS; import com.yeshi.fanli.entity.system.System; import com.yeshi.fanli.service.inter.config.SystemService; +import com.yeshi.fanli.service.inter.push.DeviceActiveService; import com.yeshi.fanli.service.inter.push.DeviceTokenHWService; import com.yeshi.fanli.service.inter.push.IOSPushService; import com.yeshi.fanli.service.inter.push.PushRecordService; import com.yeshi.fanli.util.StringUtil; -import org.yeshi.utils.JsonUtil; @Controller @RequestMapping(value = "api/v1/push") @@ -33,6 +35,9 @@ @Resource private DeviceTokenHWService deviceTokenHWService; + + @Resource + private DeviceActiveService deviceActiveService; @RequestMapping(value = "callback", method = RequestMethod.POST) public void callback(AcceptData acceptData, String pushId, PrintWriter out) { @@ -60,11 +65,19 @@ @RequestMapping(value = "/insertDeviceToken", method = RequestMethod.POST) public void insertIOSDeviceToken(AcceptData acceptData, String deviceToken, PrintWriter out) { if (!StringUtil.isNullOrEmpty(acceptData.getDevice()) && !StringUtil.isNullOrEmpty(deviceToken)) { - DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDevice(acceptData.getDevice()); + // 娣诲姞璁惧娲昏穬璁板綍 + DeviceActive da = new DeviceActive(); + da.setDeviceToken(deviceToken); + da.setPlatform(DeviceActive.PLATFORM_IOS); + da.setVersionCode(Integer.parseInt(acceptData.getVersion())); + deviceActiveService.addDeviceActive(da); + + DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken); if (deviceTokenIOS == null) - iosPushService.addDeviceToken(null, deviceToken, acceptData.getDevice()); + iosPushService.addDeviceToken(null, Integer.parseInt(acceptData.getVersion()), deviceToken, + acceptData.getDevice()); else { - deviceTokenIOS.setDeviceToken(deviceToken); + deviceTokenIOS.setDevice(acceptData.getDevice()); iosPushService.updateDeviceToken(deviceTokenIOS); } out.print(JsonUtil.loadTrue(0, null, "鎴愬姛")); @@ -79,19 +92,27 @@ * @param deviceToken */ - // 浼犱竴涓猟evice 濡傛灉瀛樺湪device 鏍规嵁device鎵цupdate鎿嶄綔 锛� 濡傛灉涓嶅瓨鍦� 閮芥墽琛宨nsert鎿嶄綔涓変釜鍙傛暟 @RequestMapping(value = "/uidBindDeviceToken", method = RequestMethod.POST) public void uidBindIOSDeviceToken(AcceptData acceptData, Long uid, String deviceToken, PrintWriter out) { if (uid != null && uid != 0 && !StringUtil.isNullOrEmpty(deviceToken)) { - DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDevice(acceptData.getDevice()); + // 娣诲姞璁惧娲昏穬璁板綍 + DeviceActive da = new DeviceActive(); + da.setDeviceToken(deviceToken); + da.setPlatform(DeviceActive.PLATFORM_IOS); + da.setVersionCode(Integer.parseInt(acceptData.getVersion())); + deviceActiveService.addDeviceActive(da); + // 娣诲姞token + DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(acceptData.getDevice()); if (deviceTokenIOS != null) { - if (!StringUtil.isNullOrEmpty(deviceToken)) - deviceTokenIOS.setDeviceToken(deviceToken); deviceTokenIOS.setUid(uid); + deviceTokenIOS.setDevice(acceptData.getDevice()); + deviceTokenIOS.setVersion(Integer.parseInt(acceptData.getVersion())); iosPushService.updateDeviceToken(deviceTokenIOS); } else { - iosPushService.addDeviceToken(uid, deviceToken, acceptData.getDevice()); + iosPushService.addDeviceToken(uid, Integer.parseInt(acceptData.getVersion()), deviceToken, + acceptData.getDevice()); } + out.print(JsonUtil.loadTrueResult("")); } } @@ -103,8 +124,8 @@ */ @RequestMapping(value = "/unBind", method = RequestMethod.POST) public void unBind(AcceptData acceptData, String deviceToken, PrintWriter out) { - if (deviceToken != null && !"".equals(deviceToken)) { - DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDevice(acceptData.getDevice()); + if (!StringUtil.isNullOrEmpty(deviceToken)) { + DeviceTokenIOS deviceTokenIOS = iosPushService.getDeviceTokenByDeviceToken(deviceToken); if (deviceTokenIOS != null) { deviceTokenIOS.setUid(null); iosPushService.updateDeviceToken(deviceTokenIOS); -- Gitblit v1.8.0