预计记录查询

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

@@ -51,11 +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/BaseWarningInfoDto.java

@@ -0,0 +1,21 @@
+package com.huimv.produce.warning.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class BaseWarningInfoDto {
+
+    @JsonFormat(pattern = "YYYY-MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date warningTime;
+/*
+    @JsonFormat(pattern = "MM-dd HH:mm:ss" ,timezone = "GMT+8")
+    private Date uploadTime;*/
+    private String msg;
+
+    private String warningName;
+}

huimv-farm-produce/src/main/java/com/huimv/produce/warning/mapper/BaseWarningInfoMapper.java

@@ -1,7 +1,14 @@
 package com.huimv.produce.warning.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.huimv.produce.warning.entity.BaseWarningInfo;
+import com.huimv.produce.warning.entity.BaseWarningInfoDto;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
 
 /**
  * <p>
@@ -11,6 +18,16 @@ import com.huimv.produce.warning.entity.BaseWarningInfo;
  * @author astupidcoder
  * @since 2021-12-02
  */
+@Repository
 public interface BaseWarningInfoMapper extends BaseMapper<BaseWarningInfo> {
 
+    List<BaseWarningInfoDto> listBaseWarn(@Param("farmId") String farmId,
+                                          @Param("startDate") String startDate,
+                                          @Param("endDate") String endDate);
+
+    List<BaseWarningInfoDto> listDayBaseWarn(@Param("farmId") String farmId);
+
+    List<BaseWarningInfoDto> listWeekBaseWarn(@Param("farmId") String farmId);
+
+    List<BaseWarningInfoDto> listMonthBaseWarn(@Param("farmId") String farmId);
 }

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

@@ -9,12 +9,15 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.warning.entity.BaseWarningInfo;
+import com.huimv.produce.warning.entity.BaseWarningInfoDto;
 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;
+import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -241,8 +244,55 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
 
     @Override
     public Result listAllWarning(Map<String, String> map) {
+        String farmId = map.get("farmId");
+        String startDate = map.get("startDate");
+        String endDate = map.get("endDate");
+        String type = map.get("type");
+
+        //判空
+        if (farmId == null) {
+            farmId = "331023001";
+        }
+        //pageNo
+        String pageNo = map.get("pageNo");
+        if (org.apache.commons.lang3.StringUtils.isBlank(pageNo)) {
+            pageNo = "1";
+        }
+        //pageSize
+        String pageSize = map.get("pageSize");
+        if (org.apache.commons.lang3.StringUtils.isBlank(pageSize)) {
+            pageSize = "20";
+        }
+
+        List<BaseWarningInfoDto> baseWarningInfoDtos = null;
+        //默认显示
+        if (type == null) {
+            baseWarningInfoDtos = baseWarningInfoMapper.listDayBaseWarn(farmId);
+        } else {
+
+            //自定义查询
+            if ("4".equals(type)) {
+                startDate = startDate + " 00:00:00";
+                endDate = endDate + " 23:59:59";
+                baseWarningInfoDtos =baseWarningInfoMapper.listBaseWarn(farmId, startDate, endDate);
+            }
+            //本月
+            else if ("3".equals(type)) {
+                baseWarningInfoDtos = baseWarningInfoMapper.listMonthBaseWarn(farmId);
+            }
+            //本周
+            else if ("2".equals(type)) {
+                baseWarningInfoDtos = baseWarningInfoMapper.listWeekBaseWarn(farmId);
+            }
+            //今日
+            else if ("1".equals(type)) {
+                baseWarningInfoDtos = baseWarningInfoMapper.listDayBaseWarn(farmId);
+            }
+        }
 
-        return null;
+        Page<BaseWarningInfoDto> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        Page<BaseWarningInfoDto> page1 = page.setRecords(baseWarningInfoDtos);
+        return new Result(ResultCode.SUCCESS, page1);
     }
 
     @Override

huimv-farm-produce/src/main/resources/com/huimv/produce/warning/mapper/BaseWarningInfoMapper.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.produce.warning.mapper.BaseWarningInfoMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.produce.warning.entity.BaseWarningInfo">
+        <id column="id" property="id" />
+        <result column="farm_id" property="farmId" />
+        <result column="level" property="level" />
+        <result column="msg" property="msg" />
+        <result column="level_name" property="levelName" />
+        <result column="warning_name" property="warningName" />
+        <result column="warning_time" property="warningTime" />
+        <result column="upload_time" property="uploadTime" />
+        <result column="alarm_type" property="alarmType" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, farm_id,level,msg,level_name,warning_name,upload_time,alarm_type
+    </sql>
+
+    <!--自定义查询-->
+    <select id="listBaseWarn" resultType="com.huimv.produce.warning.entity.BaseWarningInfoDto">
+     SELECT msg,warning_name,warning_time  FROM  `base_warning_info`
+     where upload_time BETWEEN '${startDate}' AND '${endDate}' and farm_id = ${farmId} ORDER BY upload_time DESC;
+    </select>
+
+    <!--今日查询-->
+    <select id="listDayBaseWarn" resultType="com.huimv.produce.warning.entity.BaseWarningInfoDto">
+   SELECT msg,warning_name,warning_time FROM  `base_warning_info`
+WHERE TO_DAYS(upload_time) = TO_DAYS(NOW()) and farm_id = ${farmId} ORDER BY upload_time DESC;
+    </select>
+    <!--本周查询-->
+    <select id="listWeekBaseWarn" resultType="com.huimv.produce.warning.entity.BaseWarningInfoDto">
+   SELECT msg,warning_name,warning_time  FROM  `base_warning_info`
+WHERE YEARWEEK(date_format(upload_time,'%Y-%m-%d')) = YEARWEEK(now()) and farm_id = ${farmId} ORDER BY upload_time DESC;
+    </select>
+    <!--本月查询-->
+    <select id="listMonthBaseWarn" resultType="com.huimv.produce.warning.entity.BaseWarningInfoDto">
+    SELECT msg,warning_name,warning_time FROM  `base_warning_info`
+WHERE DATE_FORMAT( upload_time, '%Y%m' ) = DATE_FORMAT( CURDATE( ) , '%Y%m' ) AND farm_id = ${farmId} ORDER BY upload_time DESC
+    </select>
+</mapper>