From bb4366cecb8ae522ab09251f29e4387fecfe5572 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=93=E7=84=B1?= Date: Sat, 28 Mar 2020 21:23:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A0=E7=89=A9=E7=AC=BC=E6=9D=80=E8=8F=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/ifish/action/UserAction.java | 5 +++-- src/main/java/com/ifish/entity/PushRemind.java | 11 +++++++++++ src/main/java/com/ifish/service/BaseService.java | 2 +- .../java/com/ifish/serviceImpl/BaseServiceImpl.java | 5 ++++- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ifish/action/UserAction.java b/src/main/java/com/ifish/action/UserAction.java index 76adbbe..5821893 100644 --- a/src/main/java/com/ifish/action/UserAction.java +++ b/src/main/java/com/ifish/action/UserAction.java @@ -453,9 +453,10 @@ public class UserAction { * @return */ @RequestMapping("/setRemindWaterInf.do") - public Object setRemindWaterInf(Device device) { + public Object setRemindWaterInf(Device device, Integer type) { try { - return this.baseService.setRemindWaterInf(device); + type = type == null ? 0 : type.intValue(); + return this.baseService.setRemindWaterInf(device, type); } catch (Exception e) { log.error("setRemindWaterInf:deviceId:{},error message:{}", device.getDeviceId(), e.toString()); } diff --git a/src/main/java/com/ifish/entity/PushRemind.java b/src/main/java/com/ifish/entity/PushRemind.java index 4dcf1d9..f8ee940 100644 --- a/src/main/java/com/ifish/entity/PushRemind.java +++ b/src/main/java/com/ifish/entity/PushRemind.java @@ -38,6 +38,9 @@ public class PushRemind implements Serializable{ @Column(name = "is_push") private String isPush; + @Column(name = "notify_type") + private int notifyType; + public PushRemindId getId() { return id; } @@ -101,4 +104,12 @@ public class PushRemind implements Serializable{ public void setIsPush(String isPush) { this.isPush = isPush; } + + public int getNotifyType() { + return notifyType; + } + + public void setNotifyType(int notifyType) { + this.notifyType = notifyType; + } } diff --git a/src/main/java/com/ifish/service/BaseService.java b/src/main/java/com/ifish/service/BaseService.java index 5f8850c..e6ed76f 100644 --- a/src/main/java/com/ifish/service/BaseService.java +++ b/src/main/java/com/ifish/service/BaseService.java @@ -105,7 +105,7 @@ public interface BaseService { public Object getRemindWaterInf(Integer deviceId); //设置换水提醒 - public Object setRemindWaterInf(Device device); + public Object setRemindWaterInf(Device device, int type); //保存商家信息 public Object saveShopsInfo(ShopsInfo shopsInfo,MultipartFile file1,MultipartFile file2,MultipartFile file3); diff --git a/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java b/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java index 31163a4..d04702c 100644 --- a/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java +++ b/src/main/java/com/ifish/serviceImpl/BaseServiceImpl.java @@ -1160,7 +1160,7 @@ public class BaseServiceImpl implements BaseService { } @Override - public Object setRemindWaterInf(Device device) { + public Object setRemindWaterInf(Device device, int type) { log.info("setRemindWaterInf begin"); Device tmpDevice = this.deviceDao.get(device.getDeviceId()); if (tmpDevice != null) { @@ -1192,6 +1192,7 @@ public class BaseServiceImpl implements BaseService { pushRemind.setRemindCycle(tmpDevice.getRemindCycle()); pushRemind.setRemindDate(tmpDevice.getRemindDate()); pushRemind.setIsPush("0"); + pushRemind.setNotifyType(type); this.pushRemindDao.update(pushRemind); } } else { @@ -1204,6 +1205,7 @@ public class BaseServiceImpl implements BaseService { if (pr != null) { pr.setRemindCycle(tmpDevice.getRemindCycle()); pr.setRemindDate(tmpDevice.getRemindDate()); + pr.setNotifyType(type); this.pushRemindDao.update(pr); } else { //推送表ID @@ -1223,6 +1225,7 @@ public class BaseServiceImpl implements BaseService { pushRemind.setShowName(deviceUser.getShowName()); pushRemind.setLoginType(user.getLoginType()); pushRemind.setIsPush("0"); + pushRemind.setNotifyType(type); this.pushRemindDao.save(pushRemind); } }