diff --git a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java index 738b14a8..b6504da0 100644 --- a/src/main/java/com/xujie/sys/common/utils/TaskUtils.java +++ b/src/main/java/com/xujie/sys/common/utils/TaskUtils.java @@ -3,6 +3,7 @@ package com.xujie.sys.common.utils; import com.xujie.sys.modules.pms.service.EamService; import com.xujie.sys.modules.reader.service.GetInformationForExcelService; +import com.xujie.sys.modules.reader.service.ModbusCommunicateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.scheduling.annotation.EnableScheduling; @@ -20,6 +21,9 @@ public class TaskUtils { @Autowired private GetInformationForExcelService getInformationForExcelService; + @Autowired + private ModbusCommunicateService modbusCommunicateService; + // 添加定时任务 @Scheduled(cron = "${task.data.eamWorkPlanTime}") // 每天0点执行 public void doTask() { @@ -27,8 +31,14 @@ public class TaskUtils { } //添加定時任務 - @Scheduled(cron = "${task.data.getExcelInformation}" ) //每五秒执行 + @Scheduled(cron = "${task.data.getExcelInformation}" ) //每五秒执行 读取文件数据 public void getExcel(){ getInformationForExcelService.saveByExcel(); } + + //添加定時任務 + @Scheduled(cron = "${task.data.modbusCommunicate}" ) //每五秒执行 读取文件数据 + public void getModbus(){ + modbusCommunicateService.getInfoByModbus(); + } } diff --git a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java index 582dd35e..175ad95d 100644 --- a/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java +++ b/src/main/java/com/xujie/sys/modules/reader/service/impl/ModbusCommunicateServiceImpl.java @@ -26,12 +26,18 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl()); + if (one==null){ + log.info("设备信息未填"); + return; + } String modbusIp = one.getModbusIp(); int modbusPort = one.getModbusPort(); int registerAddress = one.getRegisterAddress(); int registerNum = one.getRegisterNum(); int unitId = one.getUnitId(); + log.info("获取modbus设备ip:"+modbusIp,"端口:"+modbusPort,"地址值"+registerAddress,"数量:"+unitId); try { InetAddress ipAddress = InetAddress.getByName(modbusIp); // 连接到Modbus设备 @@ -59,7 +65,6 @@ public class ModbusCommunicateServiceImpl extends ServiceImpl