Newspaper пре 1 година
родитељ
комит
71692c91bb

+ 14 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/controller/EnvWarningInfoController.java

@@ -1,10 +1,17 @@
 package com.huimv.guowei.admin.controller;
 
 
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.service.IEnvWarningInfoService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import org.springframework.web.bind.annotation.RestController;
 
+import javax.annotation.Resource;
+import java.util.Map;
+
 /**
  * <p>
  *  前端控制器
@@ -16,5 +23,12 @@ import org.springframework.web.bind.annotation.RestController;
 @RestController
 @RequestMapping("/env-warning-info")
 public class EnvWarningInfoController {
+    @Resource
+    private IEnvWarningInfoService envWarningInfoService;
+
+    @PostMapping("/listWarning")
+    public Result listWarning(@RequestBody Map<String ,String> paramsMap){
+        return envWarningInfoService.listWarning(paramsMap);
+    }
 
 }

+ 3 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/entity/EnvWarningInfo.java

@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import  java.util.Date;
 import java.io.Serializable;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -61,6 +63,7 @@ public class EnvWarningInfo implements Serializable {
     /**
      * 日期
      */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
     private Date date;
 
     private Integer farmId;

+ 4 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/IEnvWarningInfoService.java

@@ -1,8 +1,11 @@
 package com.huimv.guowei.admin.service;
 
+import com.huimv.guowei.admin.common.utils.Result;
 import com.huimv.guowei.admin.entity.EnvWarningInfo;
 import com.baomidou.mybatisplus.extension.service.IService;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务类
@@ -13,4 +16,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IEnvWarningInfoService extends IService<EnvWarningInfo> {
 
+    Result listWarning(Map<String, String> paramsMap);
 }

+ 28 - 0
huimv-admin/src/main/java/com/huimv/guowei/admin/service/impl/EnvWarningInfoServiceImpl.java

@@ -1,11 +1,17 @@
 package com.huimv.guowei.admin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huimv.guowei.admin.common.utils.Result;
+import com.huimv.guowei.admin.common.utils.ResultCode;
 import com.huimv.guowei.admin.entity.EnvWarningInfo;
 import com.huimv.guowei.admin.mapper.EnvWarningInfoMapper;
 import com.huimv.guowei.admin.service.IEnvWarningInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -17,4 +23,26 @@ import org.springframework.stereotype.Service;
 @Service
 public class EnvWarningInfoServiceImpl extends ServiceImpl<EnvWarningInfoMapper, EnvWarningInfo> implements IEnvWarningInfoService {
 
+
+    @Override
+    public Result listWarning(Map<String, String> paramsMap) {
+        String type = paramsMap.get("type");
+        String farmId = paramsMap.get("farmId");
+        String pageNo = paramsMap.get("pageNo");
+        String pageSize = paramsMap.get("pageSize");
+        Page<EnvWarningInfo> page = new Page(Integer.parseInt(pageNo),Integer.valueOf(pageSize));
+        //温湿度
+        if ("0".equals(type)){
+            page = this.page(page, new QueryWrapper<EnvWarningInfo>().in("warning_type", 1, 2).eq("farm_id",farmId).orderByDesc("date"));
+        }
+        //水
+        else if ("1".equals(type)){
+            page = this.page(page, new QueryWrapper<EnvWarningInfo>().eq("warning_type", 3).eq("farm_id",farmId).orderByDesc("date"));
+        }
+        //电
+        else if ("2".equals(type)){
+            page = this.page(page, new QueryWrapper<EnvWarningInfo>().eq("warning_type", 4).eq("farm_id",farmId).orderByDesc("date"));
+        }
+        return new Result(ResultCode.SUCCESS,page);
+    }
 }