预警状态查询修改

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

@@ -2,7 +2,9 @@ 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.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huimv.produce.warning.entity.BaseWarningInfo;
 import com.huimv.produce.warning.entity.BaseWarningInfoDto;
 import org.apache.ibatis.annotations.Param;
@@ -30,4 +32,6 @@ public interface BaseWarningInfoMapper extends BaseMapper<BaseWarningInfo> {
     List<BaseWarningInfoDto> listWeekBaseWarn(@Param("farmId") String farmId);
 
     List<BaseWarningInfoDto> listMonthBaseWarn(@Param("farmId") String farmId);
+
+    Page listData(Page<BaseWarningInfoDto> page, @Param(Constants.WRAPPER)QueryWrapper<BaseWarningInfo> wrapper);
 }

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

@@ -1,11 +1,13 @@
 package com.huimv.produce.warning.service.impl;
 
+import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huimv.common.utils.DataUill;
 import com.huimv.common.utils.Result;
 import com.huimv.common.utils.ResultCode;
 import com.huimv.produce.warning.entity.BaseWarningInfo;
@@ -267,33 +269,53 @@ public class BaseWarningInfoServiceImpl extends ServiceImpl<BaseWarningInfoMappe
         }
 
         List<BaseWarningInfoDto> baseWarningInfoDtos = null;
+        QueryWrapper<BaseWarningInfo> wrapper = new QueryWrapper<>();
+        Date now = new Date();
+        DateTime dateTime = DateUtil.beginOfDay(now);
+
+
+        Page<BaseWarningInfoDto> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
+        wrapper.orderByDesc("upload_time");
+        wrapper.eq("farm_id",farmId);
         //默认显示
+        IPage page1 = null;
         if (type == null) {
-            baseWarningInfoDtos = baseWarningInfoMapper.listDayBaseWarn(farmId);
-        } else {
+            wrapper.ge("upload_time",dateTime);
 
+            page1 =  baseWarningInfoMapper.listData(page,wrapper);
+//            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);
+               endDate = endDate + " 23:59:59";
+               wrapper.between("upload_time",startDate,endDate);
+                page1 = baseWarningInfoMapper.listData(page, wrapper);
+             //  baseWarningInfoDtos =baseWarningInfoMapper.listBaseWarn(farmId, startDate, endDate);
             }
             //本月
             else if ("3".equals(type)) {
-                baseWarningInfoDtos = baseWarningInfoMapper.listMonthBaseWarn(farmId);
+                Date timesMonthmorning = DataUill.getTimesMonthmorning();
+                wrapper.ge("upload_time",timesMonthmorning );
+                page1 = baseWarningInfoMapper.listData(page, wrapper);
+            //  baseWarningInfoDtos = baseWarningInfoMapper.listMonthBaseWarn(farmId);
             }
             //本周
             else if ("2".equals(type)) {
-                baseWarningInfoDtos = baseWarningInfoMapper.listWeekBaseWarn(farmId);
+                Date timesWeekmorning = DateUtil.beginOfWeek(new Date());
+                wrapper.ge("upload_time",timesWeekmorning );
+                page1 =  baseWarningInfoMapper.listData(page,wrapper);
+            //    baseWarningInfoDtos = baseWarningInfoMapper.listWeekBaseWarn(farmId);
             }
             //今日
             else if ("1".equals(type)) {
-                baseWarningInfoDtos = baseWarningInfoMapper.listDayBaseWarn(farmId);
-            }
+                Date timesmorning = DataUill.getTimesmorning();
+                wrapper.ge("upload_time",dateTime);
+                page1 =baseWarningInfoMapper.listData(page,wrapper);
+              //  baseWarningInfoDtos = baseWarningInfoMapper.listDayBaseWarn(farmId);
+           }
         }
 
-        Page<BaseWarningInfoDto> page = new Page<>(Integer.parseInt(pageNo), Integer.parseInt(pageSize));
-        Page<BaseWarningInfoDto> page1 = page.setRecords(baseWarningInfoDtos);
         return new Result(ResultCode.SUCCESS, page1);
     }
 

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

@@ -41,4 +41,9 @@ WHERE YEARWEEK(date_format(upload_time,'%Y-%m-%d')) = YEARWEEK(now()) and farm_i
     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>
+
+    <select id="listData" resultType="com.huimv.produce.warning.entity.BaseWarningInfoDto">
+    SELECT msg,warning_name,warning_time FROM  `base_warning_info`
+        ${ew.customSqlSegment}
+    </select>
 </mapper>