diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanLog.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanLog.java index 3d42473..dbf1b56 100644 --- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanLog.java +++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/AutoCleanLog.java @@ -19,7 +19,7 @@ public class AutoCleanLog { public void run() throws Exception { System.out.println("111"); - // 0 0/1 0,1 * * ? 每天0-1点执行间隔10分钟一次 + // 0 0/10 0,1 * * ? 每天0-1点执行间隔10分钟一次 //sys_log //delete from sys_log where DATE(create_time) <= DATE(DATE_SUB(NOW(),INTERVAL 30 day)) limit 10; WQLObject logTab = WQLObject.getWQLObject("sys_log"); diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NjyfQueryMagicAgvDeviceStatus.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NjyfQueryMagicAgvDeviceStatus.java new file mode 100644 index 0000000..c19d5a4 --- /dev/null +++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/NjyfQueryMagicAgvDeviceStatus.java @@ -0,0 +1,37 @@ +package org.nl.modules.quartz.task; + +import cn.hutool.http.HttpResponse; +import lombok.extern.slf4j.Slf4j; +import net.sf.json.JSONArray; +import net.sf.json.JSONObject; +import org.nl.acs.agv.server.AgvService; +import org.nl.acs.device_driver.electric_fence.ElectricFenceDeviceDriver; +import org.nl.acs.device_driver.feedback_agv_status_site.FeedbackAGVStatusSiteDeviceDriver; +import org.nl.acs.instruction.service.InstructionService; +import org.nl.acs.opc.Device; +import org.nl.acs.opc.DeviceAppService; +import org.nl.acs.opc.DeviceAppServiceImpl; +import org.nl.utils.SpringContextHolder; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; + +/** + * 查询AGV设备状态 + */ +@Slf4j +@Component +public class NjyfQueryMagicAgvDeviceStatus { + + @Autowired + InstructionService instructionService; + + @Autowired + AgvService agvService; + + + public void run() throws Exception { + HttpResponse response = agvService.queryMagicAgvDeviceStatus(); + System.out.println(response.body()); + } + +} diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java index 70a0d0b..94d200f 100644 --- a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java +++ b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/ToAgvDevice.java @@ -46,7 +46,7 @@ public class ToAgvDevice { row.put("positionAngle", agvDto.getPositionAngle()); agv_rows.add(row); } - json.put("agv_rows", agv_rows); +// json.put("agv_rows", agv_rows); acsToWmsService.feedbackAgv(agv_rows); } diff --git a/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/wql/sys.xls b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/wql/sys.xls new file mode 100644 index 0000000..84c5125 Binary files /dev/null and b/hd/nladmin-system/src/main/java/org/nl/modules/quartz/task/wql/sys.xls differ