完成预警已读设置。

huimv-farm-produce/src/main/java/com/huimv/produce/warning/controller/BaseWarningInfoController.java

@@ -51,6 +51,11 @@ public class BaseWarningInfoController {
         return warningInfoService.listAllWarning(map);
     }
 
+    @PostMapping("/setWarningStatus")
+    public Result setWarningStatus(@RequestBody Map<String, String> map ) {
+        return warningInfoService.setWarningStatus(map);
+    }
+
 
 
 }

huimv-farm-produce/src/main/java/com/huimv/produce/warning/entity/BaseWarningInfo.java

@@ -45,4 +45,6 @@ public class BaseWarningInfo extends Model {
     private Date uploadTime;
 
     private Integer alarmType;
+
+    private Integer readStatus;
 }

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/IBaseWarningInfoService.java

@@ -26,4 +26,6 @@ public interface IBaseWarningInfoService extends IService<BaseWarningInfo> {
     Result listWarningInfoScreen(Map<String, String> map);
 
     Result listAllWarning(Map<String, String> map);
+
+    Result setWarningStatus(Map<String, String> map);
 }

huimv-farm-produce/src/main/java/com/huimv/produce/warning/service/impl/BaseWarningInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.warning.entity.BaseWarningInfo;
 import com.huimv.produce.warning.mapper.BaseWarningInfoMapper;
 import com.huimv.produce.warning.service.IBaseWarningInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Date;
@@ -18,7 +19,7 @@ import java.util.Map;
 
 /**
  * <p>
- *  服务实现类
+ * 服务实现类
  * </p>
  *
  * @author astupidcoder
@@ -26,6 +27,8 @@ import java.util.Map;
  */
 @Service
 public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMapper, BaseWarningInfo> implements IBaseWarningInfoService {
+    @Autowired
+    private BaseWarningInfoMapper baseWarningInfoMapper;
 
     @Override
     public Result listWarningInfoZoology(Map<String, String> map) {
@@ -40,28 +43,28 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
         Date now = new Date();
 
         QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("farm_id",farmId);
+        wrapper.eq("farm_id", farmId);
         wrapper.orderByDesc("warning_time");
 
-        if (StringUtils.isBlank(alarmType)){
-            wrapper.in("alarm_type",7,8,9,10);
-        }else {
-            wrapper.eq("alarm_type",alarmType);
+        if (StringUtils.isBlank(alarmType)) {
+            wrapper.in("alarm_type", 7, 8, 9, 10);
+        } else {
+            wrapper.eq("alarm_type", alarmType);
         }
 
         //自定义
-        if ("4".equals(type)){
-            endDate = endDate+" 23:59:59";
-            startDate = startDate+" 00:00:00";
-            wrapper.between("warning_time",startDate,endDate);
+        if ("4".equals(type)) {
+            endDate = endDate + " 23:59:59";
+            startDate = startDate + " 00:00:00";
+            wrapper.between("warning_time", startDate, endDate);
 
         }
         //本月
-        else if ("3".equals(type)){
+        else if ("3".equals(type)) {
             wrapper.ge("warning_time", DateUtil.beginOfMonth(now));
         }
         //本周
-        else if ("2".equals(type)){
+        else if ("2".equals(type)) {
             wrapper.ge("warning_time", DateUtil.beginOfWeek(now));
         }
         //今日
@@ -69,15 +72,15 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
             wrapper.ge("warning_time", DateUtil.beginOfDay(now));
         }
 
-        if (StringUtils.isBlank(current)){
+        if (StringUtils.isBlank(current)) {
             current = "1";
         }
-        if (StringUtils.isBlank(size)){
+        if (StringUtils.isBlank(size)) {
             size = "20";
         }
-        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
+        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)), wrapper);
 
-        return new Result(ResultCode.SUCCESS,page);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
@@ -93,28 +96,28 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
         Date now = new Date();
 
         QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("farm_id",farmId);
+        wrapper.eq("farm_id", farmId);
 
         wrapper.orderByDesc("warning_time");
-        if (StringUtils.isBlank(alarmType)){
-            wrapper.in("alarm_type",15,16,17,18);
-        }else {
-            wrapper.eq("alarm_type",alarmType);
+        if (StringUtils.isBlank(alarmType)) {
+            wrapper.in("alarm_type", 15, 16, 17, 18);
+        } else {
+            wrapper.eq("alarm_type", alarmType);
         }
 
         //自定义
-        if ("4".equals(type)){
-            endDate = endDate+" 23:59:59";
-            startDate = startDate+" 00:00:00";
-            wrapper.between("warning_time",startDate,endDate);
+        if ("4".equals(type)) {
+            endDate = endDate + " 23:59:59";
+            startDate = startDate + " 00:00:00";
+            wrapper.between("warning_time", startDate, endDate);
 
         }
         //本月
-        else if ("3".equals(type)){
+        else if ("3".equals(type)) {
             wrapper.ge("warning_time", DateUtil.beginOfMonth(now));
         }
         //本周
-        else if ("2".equals(type)){
+        else if ("2".equals(type)) {
             wrapper.ge("warning_time", DateUtil.beginOfWeek(now));
         }
         //今日
@@ -122,15 +125,15 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
             wrapper.ge("warning_time", DateUtil.beginOfDay(now));
         }
 
-        if (StringUtils.isBlank(current)){
+        if (StringUtils.isBlank(current)) {
             current = "1";
         }
-        if (StringUtils.isBlank(size)){
+        if (StringUtils.isBlank(size)) {
             size = "20";
         }
-        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
+        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)), wrapper);
 
-        return new Result(ResultCode.SUCCESS,page);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
@@ -145,24 +148,24 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
         Date now = new Date();
 
         QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
-        wrapper.eq("farm_id",farmId);
+        wrapper.eq("farm_id", farmId);
 
         wrapper.orderByDesc("warning_time");
 
 
         //自定义
-        if ("4".equals(type)){
-            endDate = endDate+" 23:59:59";
-            startDate = startDate+" 00:00:00";
-            wrapper.between("warning_time",startDate,endDate);
+        if ("4".equals(type)) {
+            endDate = endDate + " 23:59:59";
+            startDate = startDate + " 00:00:00";
+            wrapper.between("warning_time", startDate, endDate);
 
         }
         //本月
-        else if ("3".equals(type)){
+        else if ("3".equals(type)) {
             wrapper.ge("warning_time", DateUtil.beginOfMonth(now));
         }
         //本周
-        else if ("2".equals(type)){
+        else if ("2".equals(type)) {
             wrapper.ge("warning_time", DateUtil.beginOfWeek(now));
         }
         //今日
@@ -170,15 +173,15 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
             wrapper.ge("warning_time", DateUtil.beginOfDay(now));
         }
 
-        if (StringUtils.isBlank(current)){
+        if (StringUtils.isBlank(current)) {
             current = "1";
         }
-        if (StringUtils.isBlank(size)){
+        if (StringUtils.isBlank(size)) {
             size = "20";
         }
-        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
+        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)), wrapper);
 
-        return new Result(ResultCode.SUCCESS,page);
+        return new Result(ResultCode.SUCCESS, page);
     }
 
     @Override
@@ -188,52 +191,52 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
         String current = map.get("current");
         String size = map.get("size");
 
-        if (StringUtils.isBlank(current)){
+        if (StringUtils.isBlank(current)) {
             current = "1";
         }
-        if (StringUtils.isBlank(size)){
+        if (StringUtils.isBlank(size)) {
             size = "20";
         }
 
         QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
         wrapper.orderByDesc("warning_time");
-        wrapper.ge("warning_time",DateUtil.beginOfDay(new Date()));
-        wrapper.eq("farm_id",farmId);
+        wrapper.ge("warning_time", DateUtil.beginOfDay(new Date()));
+        wrapper.eq("farm_id", farmId);
         //生态监测
-        if ("1".equals(type)){
-            wrapper.ne("warning_name","环境监测");
+        if ("1".equals(type)) {
+            wrapper.ne("warning_name", "环境监测");
         }
         //环境监测
-        if ("2".equals(type)){
-            wrapper.eq("warning_name","环境监测");
+        if ("2".equals(type)) {
+            wrapper.eq("warning_name", "环境监测");
         }
 
 
         //一级报警
-        if ("3".equals(type)){
+        if ("3".equals(type)) {
             wrapper.clear();
-            wrapper.ge("warning_time",DateUtil.offsetWeek(new Date(),-1));
-            wrapper.eq("farm_id",farmId);
-            wrapper.eq("level",1);
+            wrapper.ge("warning_time", DateUtil.offsetWeek(new Date(), -1));
+            wrapper.eq("farm_id", farmId);
+            wrapper.eq("level", 1);
         }
         //二级报警
-        if ("4".equals(type)){
+        if ("4".equals(type)) {
             wrapper.clear();
-            wrapper.ge("warning_time",DateUtil.offsetWeek(new Date(),-1));
-            wrapper.eq("farm_id",farmId);
-            wrapper.eq("level",2);
+            wrapper.ge("warning_time", DateUtil.offsetWeek(new Date(), -1));
+            wrapper.eq("farm_id", farmId);
+            wrapper.eq("level", 2);
         }
         //三级报警
-        if ("5".equals(type)){
+        if ("5".equals(type)) {
             wrapper.clear();
-            wrapper.ge("warning_time",DateUtil.offsetWeek(new Date(),-1));
-            wrapper.eq("farm_id",farmId);
-            wrapper.eq("level",3);
+            wrapper.ge("warning_time", DateUtil.offsetWeek(new Date(), -1));
+            wrapper.eq("farm_id", farmId);
+            wrapper.eq("level", 3);
         }
 //        演示版
 //        Page<BaseWarningInfo> page = page(new Page<>(Integer.parseInt(current), Integer.parseInt(size)),wrapper);
         wrapper.last("limit 0,9");
-        return new Result(ResultCode.SUCCESS,this.list(wrapper));
+        return new Result(ResultCode.SUCCESS, this.list(wrapper));
     }
 
     @Override
@@ -242,5 +245,20 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
         return null;
     }
 
+    @Override
+    public Result setWarningStatus(Map<String, String> map) {
+        String id = map.get("id");
+        String status = map.get("status");
+        BaseWarningInfo baseWarningInfo = new BaseWarningInfo();
+        baseWarningInfo.setId(Integer.parseInt(id));
+        baseWarningInfo.setReadStatus(Integer.parseInt(status));
+        int rows = baseWarningInfoMapper.updateById(baseWarningInfo);
+        if (rows == 0) {
+            return new Result(ResultCode.FAIL);
+        } else {
+            return new Result(ResultCode.SUCCESS);
+        }
+    }
+
 
 }