@@ -9,6 +9,7 @@ import com.huimv.admin.entity.vo.WarningTopVo;
import com.huimv.admin.entity.vo.WarningVo;
import org.apache.ibatis.annotations.Param;
+import java.util.Date;
import java.util.List;
/**
@@ -25,7 +26,7 @@ public interface EnvWarningMapper extends BaseMapper<EnvWarning> {
List<WarningCountVo> getMonthCount(@Param(Constants.WRAPPER) QueryWrapper<EnvWarning> queryWrapper);
- List<WarningVo> listWarning(String farmId);
+ List<WarningVo> listWarning(String farmId, Date timeMorning);
List<WarningTopVo> listTop(String farmId);
}
@@ -85,7 +85,8 @@ public class EnvWarningServiceImpl extends ServiceImpl<EnvWarningMapper, EnvWarn
@Override
public Result listWarning(Map<String, String> paramsMap) {
String farmId = paramsMap.get("farmId");
- List<WarningVo> warningVos = envWarningMapper.listWarning(farmId);
+ Date timesmorning = DataUill.getTimesmorning();
+ List<WarningVo> warningVos = envWarningMapper.listWarning(farmId,timesmorning);
return new Result(ResultCode.SUCCESS,warningVos);
@@ -17,7 +17,7 @@
SELECT CONCAT(b.build_name,a.build_name) AS 'location',w.warning_content as warningContent,w.update_time AS DATE
FROM `base_pigpen` a INNER JOIN `base_pigpen` b ON a.parent_id =b.id AND b.parent_id != 0
LEFT JOIN `env_warning` w ON w.unit_id = a.id
- WHERE w.farm_id = #{farmId}
+ WHERE w.farm_id = #{farmId} and w.update_time >= #{timeMorning}
ORDER BY w.update_time DESC
</select>