| @@ -76,16 +76,16 @@ public class WxDeviceScreenAdController extends BaseController { | |||||
| Object target = null; | Object target = null; | ||||
| if (s.getType().equals(EnumScreenAdType.COUPON.getCode())) | if (s.getType().equals(EnumScreenAdType.COUPON.getCode())) | ||||
| target = wxCouponChannelService.findDetailVo(s.getTargetId()); | target = wxCouponChannelService.findDetailVo(s.getTargetId()); | ||||
| if (s.getType().equals(EnumScreenAdType.COUPON.getCode())) | |||||
| else if (s.getType().equals(EnumScreenAdType.CAMPAIGN.getCode())) | |||||
| target = wxCampaignService.getById(s.getTargetId()); | target = wxCampaignService.getById(s.getTargetId()); | ||||
| s.setTarget(target); | s.setTarget(target); | ||||
| }); | }); | ||||
| return new ResultData(); | |||||
| return new ResultData(page); | |||||
| } | } | ||||
| @ApiOperation("心跳") | @ApiOperation("心跳") | ||||
| @PostMapping("heartbeat") | @PostMapping("heartbeat") | ||||
| public Result heartbeat(@RequestParam String deviceId,@RequestBody String version) { | |||||
| public Result heartbeat(@RequestParam String deviceId,@ModelAttribute String version) { | |||||
| WxDevice wxDevice = findDevice(deviceId); | WxDevice wxDevice = findDevice(deviceId); | ||||
| if (wxDevice == null) | if (wxDevice == null) | ||||
| return new ResultData(ErrorCode.DEVICE_NOT_FOUND); | return new ResultData(ErrorCode.DEVICE_NOT_FOUND); | ||||
| @@ -40,7 +40,7 @@ public class WxScreenAdController extends BaseController { | |||||
| private WxCouponChannelService wxCouponChannelService; | private WxCouponChannelService wxCouponChannelService; | ||||
| @ApiOperation("添加广告") | |||||
| @ApiOperation("广告列表") | |||||
| @GetMapping("list") | @GetMapping("list") | ||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @@ -90,7 +90,7 @@ public class WxDevice implements Serializable { | |||||
| /**需要执行的命令**/ | /**需要执行的命令**/ | ||||
| @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd") | @io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd") | ||||
| private Date hbCmd; | |||||
| private Integer hbCmd; | |||||
| public String getTenantId() { | public String getTenantId() { | ||||
| return tenantId; | return tenantId; | ||||
| @@ -187,11 +187,11 @@ public class WxDevice implements Serializable { | |||||
| this.lastHbTime = lastHbTime; | this.lastHbTime = lastHbTime; | ||||
| } | } | ||||
| public Date getHbCmd() { | |||||
| public Integer getHbCmd() { | |||||
| return hbCmd; | return hbCmd; | ||||
| } | } | ||||
| public void setHbCmd(Date hbCmd) { | |||||
| public void setHbCmd(Integer hbCmd) { | |||||
| this.hbCmd = hbCmd; | this.hbCmd = hbCmd; | ||||
| } | } | ||||
| @@ -58,10 +58,6 @@ | |||||
| and `status` = #{status} | and `status` = #{status} | ||||
| </if> | </if> | ||||
| <if test=" null != version "> | |||||
| and `version` = #{version} | |||||
| </if> | |||||
| <if test=" null != createDate "> | <if test=" null != createDate "> | ||||
| and `create_date` = #{createDate} | and `create_date` = #{createDate} | ||||
| </if> | </if> | ||||
| @@ -53,9 +53,6 @@ | |||||
| and `target_id` = #{targetId} | and `target_id` = #{targetId} | ||||
| </if> | </if> | ||||
| <if test=" null != hbCmd "> | |||||
| and `hb_cmd` = #{hbCmd} | |||||
| </if> | |||||
| <if test=" null != ids "> | <if test=" null != ids "> | ||||