Просмотр исходного кода

[需求][更改]:调通所有广告屏相关接口

release_toaliyun_real
hupeng 7 лет назад
committed by Stormeye Wu
Родитель
Сommit
ccaf428420
5 измененных файлов: 7 добавлений и 14 удалений
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java
  2. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java
  3. +3
    -3
      mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java
  4. +0
    -4
      mallinkService/src/main/resources/mapper/WxDeviceMapper.xml
  5. +0
    -3
      mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java Просмотреть файл

@@ -76,16 +76,16 @@ public class WxDeviceScreenAdController extends BaseController {
Object target = null;
if (s.getType().equals(EnumScreenAdType.COUPON.getCode()))
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());
s.setTarget(target);
});
return new ResultData();
return new ResultData(page);
}

@ApiOperation("心跳")
@PostMapping("heartbeat")
public Result heartbeat(@RequestParam String deviceId,@RequestBody String version) {
public Result heartbeat(@RequestParam String deviceId,@ModelAttribute String version) {
WxDevice wxDevice = findDevice(deviceId);
if (wxDevice == null)
return new ResultData(ErrorCode.DEVICE_NOT_FOUND);


+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java Просмотреть файл

@@ -40,7 +40,7 @@ public class WxScreenAdController extends BaseController {
private WxCouponChannelService wxCouponChannelService;


@ApiOperation("添加广告")
@ApiOperation("广告列表")
@GetMapping("list")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),


+ 3
- 3
mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java Просмотреть файл

@@ -90,7 +90,7 @@ public class WxDevice implements Serializable {

/**需要执行的命令**/
@io.swagger.annotations.ApiModelProperty(value="最后一次在线时间",name="hbCmd")
private Date hbCmd;
private Integer hbCmd;

public String getTenantId() {
return tenantId;
@@ -187,11 +187,11 @@ public class WxDevice implements Serializable {
this.lastHbTime = lastHbTime;
}

public Date getHbCmd() {
public Integer getHbCmd() {
return hbCmd;
}

public void setHbCmd(Date hbCmd) {
public void setHbCmd(Integer hbCmd) {
this.hbCmd = hbCmd;
}



+ 0
- 4
mallinkService/src/main/resources/mapper/WxDeviceMapper.xml Просмотреть файл

@@ -58,10 +58,6 @@
and `status` = #{status}
</if>

<if test=" null != version ">
and `version` = #{version}
</if>

<if test=" null != createDate ">
and `create_date` = #{createDate}
</if>


+ 0
- 3
mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml Просмотреть файл

@@ -53,9 +53,6 @@
and `target_id` = #{targetId}
</if>

<if test=" null != hbCmd ">
and `hb_cmd` = #{hbCmd}
</if>


<if test=" null != ids ">


Загрузка…
Отмена
Сохранить