换水提醒接口修改

src/main/java/com/ifish/controller/Device.java

@@ -149,8 +149,8 @@ public class Device {
      * @return
      */
     @RequestMapping(value = {"/updateDeviceOffLive"}, method = RequestMethod.POST)
-    public Object updateDeviceOffLive(String macAddress, String offLive) {
+    public Object updateDeviceOffLive(Integer deviceId, String offLive) {
-        return deviceHelperI.updateDeviceOffLive(macAddress, offLive);
+        return deviceHelperI.updateDeviceOffLive(deviceId, offLive);
     }
 
     /**
@@ -164,7 +164,18 @@ public class Device {
      * @return
      */
     @RequestMapping(value = {"/updateDeviceRemind"}, method = RequestMethod.POST)
-    public Object updateDeviceRemind(String macAddress, String todayRemind, String waterRemind, Date remindDate, Integer remindCycle) {
+    public Object updateDeviceRemind(Integer deviceId, String waterRemind, Integer remindCycle) {
-        return deviceHelperI.updateDeviceRemind(macAddress, todayRemind, waterRemind, remindDate, remindCycle);
+        return deviceHelperI.updateDeviceRemind(deviceId, waterRemind, remindCycle);
+    }
+
+    /**
+     * 根据设备ID获取设备换水提醒
+     *
+     * @param deviceId
+     * @return
+     */
+    @RequestMapping(value = {"/getDeviceRemind"}, method = RequestMethod.GET)
+    public Object getDeviceRemind(Integer deviceId) {
+        return deviceHelperI.getDeviceRemind(deviceId);
     }
 }

src/main/java/com/ifish/helper/DeviceHelper.java

@@ -16,6 +16,7 @@ import com.ifish.enums.PushTypeEnum;
 import com.ifish.enums.ResultEnum;
 import com.ifish.mapper.Tbl_Device_Mapper;
 import com.ifish.util.IfishUtil;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -677,9 +678,9 @@ public class DeviceHelper implements DeviceHelperI {
      * @return
      */
     @Override
-    public Object updateDeviceOffLive(String macAddress, String offLive) {
+    public Object updateDeviceOffLive(Integer deviceId, String offLive) {
         try {
-            Tbl_Device device = getDeviceByMacAddress(macAddress);
+            Tbl_Device device = getDeviceById(deviceId);
             if (device != null) {
                 Tbl_Device tbl_Device = new Tbl_Device();
                 tbl_Device.setDeviceId(device.getDeviceId());
@@ -706,32 +707,60 @@ public class DeviceHelper implements DeviceHelperI {
      * @return
      */
     @Override
-    public Object updateDeviceRemind(String macAddress, String todayRemind, String waterRemind, Date remindDate, Integer remindCycle) {
+    public Object updateDeviceRemind(Integer deviceId, String waterRemind, Integer remindCycle) {
         try {
-            Tbl_Device device = getDeviceByMacAddress(macAddress);
+            Tbl_Device device = getDeviceById(deviceId);
             if (device != null) {
                 Tbl_Device tbl_Device = new Tbl_Device();
                 tbl_Device.setDeviceId(device.getDeviceId());
-                if (StringUtils.isNotBlank(todayRemind)) {
+                if (remindCycle > 0) {
-                    tbl_Device.setTodayRemind(todayRemind);
+                    tbl_Device.setRemindCycle(remindCycle);
                 }
                 if (StringUtils.isNotBlank(waterRemind)) {
                     tbl_Device.setWaterRemind(waterRemind);
                 }
-                if (remindDate != null) {
+                tbl_Device.setTodayRemind("0");
-                    tbl_Device.setRemindDate(remindDate);
+                //下一次提醒日期
-                }
+                Calendar calendar = Calendar.getInstance();
-                if (remindCycle > 0) {
+                calendar.add(Calendar.DATE, device.getRemindCycle());
-                    tbl_Device.setRemindCycle(remindCycle);
+                tbl_Device.setRemindDate(calendar.getTime());
-                }
+
                 int i = tbl_Device_Mapper.updateTbl_Device(tbl_Device);
                 if (i > 0) {
                     redisKeyHelperI.deleteRedisByTbl_Device(device);
-                    return IfishUtil.toJson(ResultEnum.success.getKey(), "");
+                    Map<String, Object> map = new HashMap<String, Object>();
+                    map.put("todayRemind", tbl_Device.getTodayRemind());
+                    map.put("waterRemind", tbl_Device.getWaterRemind());
+                    map.put("remindDate", IfishUtil.format1(tbl_Device.getRemindDate()));
+                    map.put("remindCycle", tbl_Device.getRemindCycle());
+                    return IfishUtil.returnJson(ResultEnum.success.getKey(), map);
                 }
             }
         } catch (Exception e) {
         }
         return IfishUtil.toJson(ResultEnum.fail101.getKey(), "");
     }
+
+    /**
+     * 获取换水提醒
+     *
+     * @param deviceId
+     * @return
+     */
+    @Override
+    public Object getDeviceRemind(Integer deviceId) {
+        try {
+            Tbl_Device tbl_Device = getDeviceById(deviceId);
+            if (tbl_Device != null) {
+                Map<String, Object> map = new HashMap<String, Object>();
+                map.put("todayRemind", tbl_Device.getTodayRemind());
+                map.put("waterRemind", tbl_Device.getWaterRemind());
+                map.put("remindDate", IfishUtil.format1(tbl_Device.getRemindDate()));
+                map.put("remindCycle", tbl_Device.getRemindCycle());
+                return IfishUtil.returnJson(ResultEnum.success.getKey(), map);
+            }
+        } catch (Exception e) {
+        }
+        return IfishUtil.toJson(ResultEnum.fail101.getKey(), "");
+    }
 }

src/main/java/com/ifish/helper/DeviceHelperI.java

@@ -148,7 +148,7 @@ public interface DeviceHelperI {
      * @param offLive
      * @return
      */
-    public Object updateDeviceOffLive(String macAddress, String offLive);
+    public Object updateDeviceOffLive(Integer deviceId, String offLive);
 
     /**
      * 设置换水提醒
@@ -160,5 +160,13 @@ public interface DeviceHelperI {
      * @param remindCycle
      * @return
      */
-    public Object updateDeviceRemind(String macAddress, String todayRemind, String waterRemind, Date remindDate, Integer remindCycle);
+    public Object updateDeviceRemind(Integer deviceId, String waterRemind, Integer remindCycle);
+
+    /**
+     * 获取换水提醒
+     *
+     * @param deviceId
+     * @return
+     */
+    public Object getDeviceRemind(Integer deviceId);
 }

src/main/java/com/ifish/mapper/Tbl_Device_MapperSql.java

@@ -243,6 +243,9 @@ public class Tbl_Device_MapperSql {
         if (StringUtils.isNotBlank(device.getWaterRemind())) {
             sb.append("water_remind = #{device.waterRemind}, ");
         }
+        if (device.getRemindDate() != null) {
+            sb.append("remind_date = #{device.remindDate}, ");
+        }
         if (device.getRemindCycle() != null && device.getRemindCycle() > 0) {
             sb.append("remind_cycle = #{device.remindCycle}, ");
         }