diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java
index e1901ee3e..9213a6e7b 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxDeviceScreenAdController.java
+++ b/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);
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java
index 39b6f7ede..682eb1240 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/WxScreenAdController.java
+++ b/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),
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java b/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java
index fc0ed339d..b62f16b2a 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxDevice.java
+++ b/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;
}
diff --git a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml
index 9ffd1ab24..0050312eb 100644
--- a/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxDeviceMapper.xml
@@ -58,10 +58,6 @@
and `status` = #{status}
-
- and `version` = #{version}
-
-
and `create_date` = #{createDate}
diff --git a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml
index 0ac273f23..78a85ed1a 100644
--- a/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxScreenAdMapper.xml
@@ -53,9 +53,6 @@
and `target_id` = #{targetId}
-
- and `hb_cmd` = #{hbCmd}
-