diff --git a/agri-quartz/src/main/java/com/agri/quartz/task/RollerAutoTask.java b/agri-quartz/src/main/java/com/agri/quartz/task/RollerAutoTask.java index 97a4050..d2661f4 100644 --- a/agri-quartz/src/main/java/com/agri/quartz/task/RollerAutoTask.java +++ b/agri-quartz/src/main/java/com/agri/quartz/task/RollerAutoTask.java @@ -40,6 +40,11 @@ import java.util.stream.Collectors; @Component("rollerAutoTask") public class RollerAutoTask { + /** + * 优化:统一使用SLF4J日志(JDK 8兼容) + */ + private static final Logger log = LoggerFactory.getLogger(RollerAutoTask.class); + @Autowired private ISysAgriInfoService agriInfoService; @@ -64,21 +69,26 @@ public class RollerAutoTask { @Resource private StringRedisTemplate stringRedisTemplate; - /** - * 优化:统一使用SLF4J日志(JDK 8兼容) - */ - private static final Logger log = LoggerFactory.getLogger(RollerAutoTask.class); - @Value("${spring.mqtt.dtu-ctl-lock-ttl}") private int dtuCtlLockTTL; + + // ========== 常量定义(新增) ========== + private static final int WORK_MODE_AUTO = 1; // 自动模式 + private static final int NOT_DELETED = 0; // 未删除 + private static final String LOCK_PREFIX = "lock:"; + private static final String AUTO_MODE = "auto_mode"; + private static final String CREATE_BY = "条件控制"; + private static final int OP_SOURCE = 3; // 操作来源:条件控制 + private static final int LOCK_ACQUIRED = 1; // 是否获取锁 + public void checkAutoTerm() { // 查询自动模式的大棚 List agriInfos = agriInfoService.lambdaQuery() .select(SysAgriInfo::getImei, SysAgriInfo::getAgriName) - .eq(SysAgriInfo::getWorkMode, 1) - .eq(SysAgriInfo::getIsDeleted, 0) + .eq(SysAgriInfo::getWorkMode, WORK_MODE_AUTO) + .eq(SysAgriInfo::getIsDeleted, NOT_DELETED) .list(); if (CollectionUtils.isEmpty(agriInfos)) return; // 取imei集合 @@ -188,14 +198,6 @@ public class RollerAutoTask { } } - /** - * 公共常量(可抽取到常量类) - */ - private static final String LOCK_PREFIX = "lock:"; - private static final String AUTO_MODE = "auto_mode"; - private static final String CREATE_BY = "条件控制"; - private static final int OP_SOURCE = 3; // 操作来源:条件控制 - private static final int LOCK_ACQUIRED = 1; // 是否获取锁 /** * 发送开指令