diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java new file mode 100644 index 0000000..da767b9 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/CollectorDataJob.java @@ -0,0 +1,23 @@ +package com.nu.modules.tq.common.job; + +import com.nu.modules.tq.common.service.ITqDeviceInfoService; +import lombok.extern.slf4j.Slf4j; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 表设备状态信息同步 + */ +@Slf4j +public class CollectorDataJob implements Job { + + @Autowired + ITqDeviceInfoService service; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + service.getAllCollector(); + } +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java new file mode 100644 index 0000000..6fe7cb1 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/common/job/MeterStatusJob.java @@ -0,0 +1,23 @@ +package com.nu.modules.tq.common.job; + +import com.nu.modules.tq.common.service.ITqDeviceInfoService; +import lombok.extern.slf4j.Slf4j; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 表设备状态信息同步 + */ +@Slf4j +public class MeterStatusJob implements Job { + + @Autowired + ITqDeviceInfoService service; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + service.getAllMeter(); + } +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java new file mode 100644 index 0000000..26758d1 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/job/ElectricityReadJob.java @@ -0,0 +1,34 @@ +package com.nu.modules.tq.electricity.job; + +import com.nu.modules.tq.electricity.entity.ElectricityMeter; +import com.nu.modules.tq.electricity.service.IElectricityMeterService; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.DateUtils; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +/** + * 电表设备抄表信息同步 + */ +@Slf4j +public class ElectricityReadJob implements Job { + + @Autowired + IElectricityMeterService service; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + List electricityList = service.findAllList(); + if(electricityList!=null&&electricityList.size()>0){ + for(int i=0;i< electricityList.size();i++){ + ElectricityMeter electricityMeter = electricityList.get(i); + Result result = service.eleRead(electricityMeter); + log.error("ElectricityReadJob:{}-{}", DateUtils.now(),result.getResult()); + } + } + } +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java index 18cf663..9164e53 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/ElectricityMeterMapper.java @@ -5,9 +5,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import org.apache.ibatis.annotations.Param; +import java.util.List; public interface ElectricityMeterMapper extends BaseMapper { IPage findPage(Page page, @Param("params") ElectricityMeter electricityMeter); + List findAllList(); ElectricityMeter getElectricityMeter(ElectricityMeter electricityMeter); int insert(ElectricityMeter electricityMeter); int update(ElectricityMeter electricityMeter); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml index c431477..853338c 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/mapper/xml/ElectricityMeterMapper.xml @@ -52,6 +52,29 @@ + + - + insert into nu_iot_tq_water_meter( cid, address, @@ -81,7 +104,7 @@ #{remark}, now() ) - + update nu_iot_tq_electricity_meter diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java index 05210ed..9be9315 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/IElectricityMeterService.java @@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.tq.electricity.entity.ElectricityMeter; import org.jeecg.common.api.vo.Result; +import java.util.List; + public interface IElectricityMeterService extends IService { IPage findPage(Page page, ElectricityMeter electricityMeter); + List findAllList(); Result eleReset(ElectricityMeter electricityMeter); Result eleControl(ElectricityMeter electricityMeter); Result eleRead(ElectricityMeter electricityMeter); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java index 98787f8..d15b1a9 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/electricity/service/impl/ElectricityMeterServiceImpl.java @@ -44,10 +44,16 @@ public class ElectricityMeterServiceImpl extends ServiceImpl findPage(Page page, ElectricityMeter electricityMeter){ return baseMapper.findPage(page,electricityMeter); } + @Override + public List findAllList(){ + return baseMapper.findAllList(); + } + /** * 清零 */ diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java new file mode 100644 index 0000000..c821cd7 --- /dev/null +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/job/WaterReadJob.java @@ -0,0 +1,35 @@ +package com.nu.modules.tq.water.job; + +import com.nu.modules.tq.water.entity.WaterMeter; +import com.nu.modules.tq.water.service.IWaterMeterService; +import lombok.extern.slf4j.Slf4j; +import org.jeecg.common.api.vo.Result; +import org.jeecg.common.util.DateUtils; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +/** + * 水表设备抄表信息同步 + */ +@Slf4j +public class WaterReadJob implements Job { + + @Autowired + IWaterMeterService service; + + @Override + public void execute(JobExecutionContext jobExecutionContext) throws JobExecutionException { + List waterList = service.findAllList(); + if(waterList!=null&&waterList.size()>0){ + for(int i=0;i< waterList.size();i++){ + WaterMeter waterMeter = waterList.get(i); + Result result = service.waterRead(waterMeter); + log.error("WaterReadJob:{}-{}", DateUtils.now(),result.getResult()); + } + } + } +} diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java index d360554..ae33632 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/WaterMeterMapper.java @@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.nu.modules.tq.water.entity.WaterMeter; import org.apache.ibatis.annotations.Param; +import java.util.List; + public interface WaterMeterMapper extends BaseMapper { IPage findPage(Page page, @Param("params") WaterMeter waterMeter); + List findAllList(); WaterMeter getWaterMeter(WaterMeter waterMeter); int insert(WaterMeter waterMeter); int update(WaterMeter waterMeter); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml index 8606440..394ba3f 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/mapper/xml/WaterMeterMapper.xml @@ -50,6 +50,19 @@ + + - + insert into nu_iot_tq_water_meter( cid, address, @@ -82,7 +95,7 @@ #{remark}, now() ) - + update nu_iot_tq_water_meter diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java index 38dfabd..0661cd3 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/IWaterMeterService.java @@ -6,8 +6,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.nu.modules.tq.water.entity.WaterMeter; import org.jeecg.common.api.vo.Result; +import java.util.List; + public interface IWaterMeterService extends IService { IPage findPage(Page page, WaterMeter waterMeter); + List findAllList(); Result waterReset(WaterMeter waterMeter); Result waterControl(WaterMeter waterMeter); Result waterRead(WaterMeter waterMeter); diff --git a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java index 193afb1..427b2dc 100644 --- a/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java +++ b/nursing-unit-iot/nu-iot-biz/src/main/java/com/nu/modules/tq/water/service/impl/WaterMeterServiceImpl.java @@ -31,10 +31,16 @@ public class WaterMeterServiceImpl extends ServiceImpl findPage(Page page, WaterMeter waterMeter){ return baseMapper.findPage(page,waterMeter); } + @Override + public List findAllList(){ + return baseMapper.findAllList(); + } + /** * 清零 */