|
|
@@ -22,6 +22,7 @@ import com.huimv.admin.entity.vo.TreeBasePigpen;
|
|
|
import com.huimv.admin.mapper.*;
|
|
|
import com.huimv.admin.service.IBasePigpenService;
|
|
|
import com.huimv.admin.service.IEnvWarningService;
|
|
|
+import org.apache.commons.lang.time.DateUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
@@ -184,9 +185,11 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
|
|
|
jsonObject.put("status", envDevice.getStageType());
|
|
|
jsonObject.put("unitId", envDevice.getUnitId());
|
|
|
jsonObject.put("type", true);
|
|
|
+
|
|
|
+ Date date = new Date();
|
|
|
QueryWrapper<EnvWarning> warningQueryWrapper = new QueryWrapper<>();
|
|
|
- warningQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpenId)
|
|
|
- .eq("warning_type", 8).orderByDesc("update_time").last(" limit 1");
|
|
|
+ warningQueryWrapper.eq("farm_id", farmId).eq("unit_id", basePigpenId).ge("update_time", date)
|
|
|
+ .eq("warning_type", 8)/*.orderByDesc("update_time").last(" limit 1")*/;
|
|
|
EnvWarning envWarning = envWarningMapper.selectOne(warningQueryWrapper);
|
|
|
if (ObjectUtil.isEmpty(envWarning)) {
|
|
|
jsonObject.put("warning", null);
|
