diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java index d96f0cd..3b698ad 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWindService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWindData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java index d96f0cd..3b698ad 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWindService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWindData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java new file mode 100644 index 0000000..053bc20 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java @@ -0,0 +1,62 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.RainMapper; +import com.casic.missiles.modular.system.model.Rain; +import com.casic.missiles.modular.system.service.IRainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 气象站-风数据信息 服务实现类 + * + * @author a203 + */ + +@Slf4j +@Service +public class RainServiceImpl extends ServiceImpl implements IRainService { + + public RainServiceImpl() { + + } + + @Override + public void saveRainData(String[] splitData) { + /** + * 降雨数据 + * + * $WIXDR,V,0.00,M,0,Z,0,s,0,R,0.0,M,0,V,0.0,M,1,Z,0,s,1,R,0.0,M,1,R,0.0,M,2,R,0.0,M,3*60 + * */ + Rain rain = new Rain(); + //降雨 + rain.setRProbeId(Integer.parseInt(splitData[4])); + rain.setSumRain(Double.parseDouble(splitData[2])); + rain.setSumRainUnit(splitData[3]); + rain.setSumRainTime(Integer.parseInt(splitData[6])); + rain.setSumRainTimeUnit(splitData[7]); + rain.setRainStrength(Float.parseFloat(splitData[10])); + rain.setRainStrengthUnit(splitData[11]); + + //冰雹 + rain.setHProbeId(Integer.parseInt(splitData[16])); + rain.setSumHail(Double.parseDouble(splitData[14])); + rain.setSumHailUnit(splitData[15]); + rain.setSumHailTime(Integer.parseInt(splitData[18])); + rain.setSumHailTimeUnit(splitData[19]); + rain.setHailStrength(Float.parseFloat(splitData[22])); + rain.setHailStrengthUnit(splitData[23]); + + //降雨峰值 + rain.setRPeakProbeId(Integer.parseInt(splitData[28])); + rain.setRainPeak(Float.parseFloat(splitData[26])); + rain.setRainPeakUnit(splitData[25]); + + //冰雹峰值 + rain.setHPeakProbeId(Integer.parseInt(splitData[32])); + rain.setHailPeak(Float.parseFloat(splitData[30])); + rain.setHailPeakUnit(splitData[31]); + + this.baseMapper.insert(rain); + } +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java index d96f0cd..3b698ad 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWindService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWindData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java new file mode 100644 index 0000000..053bc20 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java @@ -0,0 +1,62 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.RainMapper; +import com.casic.missiles.modular.system.model.Rain; +import com.casic.missiles.modular.system.service.IRainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 气象站-风数据信息 服务实现类 + * + * @author a203 + */ + +@Slf4j +@Service +public class RainServiceImpl extends ServiceImpl implements IRainService { + + public RainServiceImpl() { + + } + + @Override + public void saveRainData(String[] splitData) { + /** + * 降雨数据 + * + * $WIXDR,V,0.00,M,0,Z,0,s,0,R,0.0,M,0,V,0.0,M,1,Z,0,s,1,R,0.0,M,1,R,0.0,M,2,R,0.0,M,3*60 + * */ + Rain rain = new Rain(); + //降雨 + rain.setRProbeId(Integer.parseInt(splitData[4])); + rain.setSumRain(Double.parseDouble(splitData[2])); + rain.setSumRainUnit(splitData[3]); + rain.setSumRainTime(Integer.parseInt(splitData[6])); + rain.setSumRainTimeUnit(splitData[7]); + rain.setRainStrength(Float.parseFloat(splitData[10])); + rain.setRainStrengthUnit(splitData[11]); + + //冰雹 + rain.setHProbeId(Integer.parseInt(splitData[16])); + rain.setSumHail(Double.parseDouble(splitData[14])); + rain.setSumHailUnit(splitData[15]); + rain.setSumHailTime(Integer.parseInt(splitData[18])); + rain.setSumHailTimeUnit(splitData[19]); + rain.setHailStrength(Float.parseFloat(splitData[22])); + rain.setHailStrengthUnit(splitData[23]); + + //降雨峰值 + rain.setRPeakProbeId(Integer.parseInt(splitData[28])); + rain.setRainPeak(Float.parseFloat(splitData[26])); + rain.setRainPeakUnit(splitData[25]); + + //冰雹峰值 + rain.setHPeakProbeId(Integer.parseInt(splitData[32])); + rain.setHailPeak(Float.parseFloat(splitData[30])); + rain.setHailPeakUnit(splitData[31]); + + this.baseMapper.insert(rain); + } +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java index 97c1c0f..47f253b 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.dao.WeatherMapper; import com.casic.missiles.modular.system.model.Weather; import com.casic.missiles.modular.system.service.IWeatherService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -18,4 +19,33 @@ public WeatherServiceImpl() { } + + @Override + public void saveWeatherData(String[] splitData) { + /** + * 气压、温度、湿度 + * + * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 + * */ + Weather weather = new Weather(); + weather.setTProbeId(Integer.parseInt(splitData[4])); + weather.setTemperature(Float.parseFloat(splitData[2])); + weather.setTempUnit(splitData[3]); + + weather.setHProbeId(Integer.parseInt(splitData[8])); + weather.setHumidity(Float.parseFloat(splitData[6])); + weather.setHumidUnit(splitData[7]); + + String datum = splitData[12]; + /** + * 0*75 + * */ + weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); + weather.setPressure(Float.parseFloat(splitData[10])); + weather.setPressureUnit(splitData[11]); + + weather.setCreateTime(TimeUtil.getCurrentTime()); + + this.baseMapper.insert(weather); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java index d96f0cd..3b698ad 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWindService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWindData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java new file mode 100644 index 0000000..053bc20 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java @@ -0,0 +1,62 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.RainMapper; +import com.casic.missiles.modular.system.model.Rain; +import com.casic.missiles.modular.system.service.IRainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 气象站-风数据信息 服务实现类 + * + * @author a203 + */ + +@Slf4j +@Service +public class RainServiceImpl extends ServiceImpl implements IRainService { + + public RainServiceImpl() { + + } + + @Override + public void saveRainData(String[] splitData) { + /** + * 降雨数据 + * + * $WIXDR,V,0.00,M,0,Z,0,s,0,R,0.0,M,0,V,0.0,M,1,Z,0,s,1,R,0.0,M,1,R,0.0,M,2,R,0.0,M,3*60 + * */ + Rain rain = new Rain(); + //降雨 + rain.setRProbeId(Integer.parseInt(splitData[4])); + rain.setSumRain(Double.parseDouble(splitData[2])); + rain.setSumRainUnit(splitData[3]); + rain.setSumRainTime(Integer.parseInt(splitData[6])); + rain.setSumRainTimeUnit(splitData[7]); + rain.setRainStrength(Float.parseFloat(splitData[10])); + rain.setRainStrengthUnit(splitData[11]); + + //冰雹 + rain.setHProbeId(Integer.parseInt(splitData[16])); + rain.setSumHail(Double.parseDouble(splitData[14])); + rain.setSumHailUnit(splitData[15]); + rain.setSumHailTime(Integer.parseInt(splitData[18])); + rain.setSumHailTimeUnit(splitData[19]); + rain.setHailStrength(Float.parseFloat(splitData[22])); + rain.setHailStrengthUnit(splitData[23]); + + //降雨峰值 + rain.setRPeakProbeId(Integer.parseInt(splitData[28])); + rain.setRainPeak(Float.parseFloat(splitData[26])); + rain.setRainPeakUnit(splitData[25]); + + //冰雹峰值 + rain.setHPeakProbeId(Integer.parseInt(splitData[32])); + rain.setHailPeak(Float.parseFloat(splitData[30])); + rain.setHailPeakUnit(splitData[31]); + + this.baseMapper.insert(rain); + } +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java index 97c1c0f..47f253b 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.dao.WeatherMapper; import com.casic.missiles.modular.system.model.Weather; import com.casic.missiles.modular.system.service.IWeatherService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -18,4 +19,33 @@ public WeatherServiceImpl() { } + + @Override + public void saveWeatherData(String[] splitData) { + /** + * 气压、温度、湿度 + * + * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 + * */ + Weather weather = new Weather(); + weather.setTProbeId(Integer.parseInt(splitData[4])); + weather.setTemperature(Float.parseFloat(splitData[2])); + weather.setTempUnit(splitData[3]); + + weather.setHProbeId(Integer.parseInt(splitData[8])); + weather.setHumidity(Float.parseFloat(splitData[6])); + weather.setHumidUnit(splitData[7]); + + String datum = splitData[12]; + /** + * 0*75 + * */ + weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); + weather.setPressure(Float.parseFloat(splitData[10])); + weather.setPressureUnit(splitData[11]); + + weather.setCreateTime(TimeUtil.getCurrentTime()); + + this.baseMapper.insert(weather); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java index bcbcfb9..b181af4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.WindMapper; import com.casic.missiles.modular.system.model.Wind; import com.casic.missiles.modular.system.service.IWindService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** @@ -12,10 +15,30 @@ * @author a203 */ +@Slf4j @Service public class WindServiceImpl extends ServiceImpl implements IWindService { public WindServiceImpl() { } + + @Override + public void saveWindData(String[] splitData) { + /** + * 风向和风速 + * + * $WIMWV,,R,,M,V*37 + * */ + Wind wind = new Wind(); + wind.setDegree(splitData[1].isEmpty() ? 0 : Integer.parseInt(splitData[1])); + wind.setSpeed(splitData[3].isEmpty() ? 0 : Double.parseDouble(splitData[3])); + wind.setDataUnit(splitData[4]); + /** + * V*37 + * */ + wind.setDataState(splitData[5].split("\\*")[0]); + wind.setCreateTime(TimeUtil.getCurrentTime()); + this.baseMapper.insert(wind); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java index d96f0cd..3b698ad 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWindService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWindData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java new file mode 100644 index 0000000..053bc20 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java @@ -0,0 +1,62 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.RainMapper; +import com.casic.missiles.modular.system.model.Rain; +import com.casic.missiles.modular.system.service.IRainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 气象站-风数据信息 服务实现类 + * + * @author a203 + */ + +@Slf4j +@Service +public class RainServiceImpl extends ServiceImpl implements IRainService { + + public RainServiceImpl() { + + } + + @Override + public void saveRainData(String[] splitData) { + /** + * 降雨数据 + * + * $WIXDR,V,0.00,M,0,Z,0,s,0,R,0.0,M,0,V,0.0,M,1,Z,0,s,1,R,0.0,M,1,R,0.0,M,2,R,0.0,M,3*60 + * */ + Rain rain = new Rain(); + //降雨 + rain.setRProbeId(Integer.parseInt(splitData[4])); + rain.setSumRain(Double.parseDouble(splitData[2])); + rain.setSumRainUnit(splitData[3]); + rain.setSumRainTime(Integer.parseInt(splitData[6])); + rain.setSumRainTimeUnit(splitData[7]); + rain.setRainStrength(Float.parseFloat(splitData[10])); + rain.setRainStrengthUnit(splitData[11]); + + //冰雹 + rain.setHProbeId(Integer.parseInt(splitData[16])); + rain.setSumHail(Double.parseDouble(splitData[14])); + rain.setSumHailUnit(splitData[15]); + rain.setSumHailTime(Integer.parseInt(splitData[18])); + rain.setSumHailTimeUnit(splitData[19]); + rain.setHailStrength(Float.parseFloat(splitData[22])); + rain.setHailStrengthUnit(splitData[23]); + + //降雨峰值 + rain.setRPeakProbeId(Integer.parseInt(splitData[28])); + rain.setRainPeak(Float.parseFloat(splitData[26])); + rain.setRainPeakUnit(splitData[25]); + + //冰雹峰值 + rain.setHPeakProbeId(Integer.parseInt(splitData[32])); + rain.setHailPeak(Float.parseFloat(splitData[30])); + rain.setHailPeakUnit(splitData[31]); + + this.baseMapper.insert(rain); + } +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java index 97c1c0f..47f253b 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.dao.WeatherMapper; import com.casic.missiles.modular.system.model.Weather; import com.casic.missiles.modular.system.service.IWeatherService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -18,4 +19,33 @@ public WeatherServiceImpl() { } + + @Override + public void saveWeatherData(String[] splitData) { + /** + * 气压、温度、湿度 + * + * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 + * */ + Weather weather = new Weather(); + weather.setTProbeId(Integer.parseInt(splitData[4])); + weather.setTemperature(Float.parseFloat(splitData[2])); + weather.setTempUnit(splitData[3]); + + weather.setHProbeId(Integer.parseInt(splitData[8])); + weather.setHumidity(Float.parseFloat(splitData[6])); + weather.setHumidUnit(splitData[7]); + + String datum = splitData[12]; + /** + * 0*75 + * */ + weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); + weather.setPressure(Float.parseFloat(splitData[10])); + weather.setPressureUnit(splitData[11]); + + weather.setCreateTime(TimeUtil.getCurrentTime()); + + this.baseMapper.insert(weather); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java index bcbcfb9..b181af4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.WindMapper; import com.casic.missiles.modular.system.model.Wind; import com.casic.missiles.modular.system.service.IWindService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** @@ -12,10 +15,30 @@ * @author a203 */ +@Slf4j @Service public class WindServiceImpl extends ServiceImpl implements IWindService { public WindServiceImpl() { } + + @Override + public void saveWindData(String[] splitData) { + /** + * 风向和风速 + * + * $WIMWV,,R,,M,V*37 + * */ + Wind wind = new Wind(); + wind.setDegree(splitData[1].isEmpty() ? 0 : Integer.parseInt(splitData[1])); + wind.setSpeed(splitData[3].isEmpty() ? 0 : Double.parseDouble(splitData[3])); + wind.setDataUnit(splitData[4]); + /** + * V*37 + * */ + wind.setDataState(splitData[5].split("\\*")[0]); + wind.setCreateTime(TimeUtil.getCurrentTime()); + this.baseMapper.insert(wind); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java index 79ae34c..99bb9f4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java +++ b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java @@ -1,11 +1,9 @@ package com.casic.missiles.serialport; import com.alibaba.fastjson.JSON; -import com.casic.missiles.modular.system.model.Weather; -import com.casic.missiles.modular.system.model.Wind; +import com.casic.missiles.modular.system.service.IRainService; import com.casic.missiles.modular.system.service.IWeatherService; import com.casic.missiles.modular.system.service.IWindService; -import com.casic.missiles.modular.system.utils.TimeUtil; import gnu.io.NRSerialPort; import gnu.io.SerialPortEvent; import lombok.extern.slf4j.Slf4j; @@ -38,10 +36,14 @@ private NRSerialPort serialPort; private final IWindService windService; private final IWeatherService weatherService; + private final IRainService rainService; - public SerialPortInit(IWindService windService, IWeatherService weatherService) { + public SerialPortInit(IWindService windService, + IWeatherService weatherService, + IRainService rainService) { this.windService = windService; this.weatherService = weatherService; + this.rainService = rainService; } /** @@ -65,7 +67,29 @@ e.printStackTrace(); } if (serialPortEvent.getEventType() == SerialPortEvent.DATA_AVAILABLE) { - analyzeData(SerialPortManager.readFromPort(serialPort)); + byte[] bytes = SerialPortManager.readFromPort(serialPort); + String data = asciiToString(bytes); + String[] splitData = data.split(","); + + if (data.startsWith("$WIMWV")) { + windService.saveWindData(splitData); + } else if (data.startsWith("$WIXDR")) { + if (data.contains("#")) { + /** + * 监控数据-设备电压、温度监控数据，暂时不需要 + * + * $WIXDR,C,21.2,C,2,U,0.0,#,0,U,12.7,V,1,U,3.614,V,2*22 + * */ + } else { + if (data.contains("$WIXDR,C")) { + weatherService.saveWeatherData(splitData); + } else { + rainService.saveRainData(splitData); + } + } + } else { + log.info("数据格式错误 ===> " + data); + } } else { log.info("The serial port status is abnormal"); serialPort.removeEventListener(); @@ -84,61 +108,6 @@ } } - private void analyzeData(byte[] bytes) { - String data = asciiToString(bytes); - log.info("串口收到数据 <=== " + data); - String[] splitData = data.split(","); - if (data.startsWith("$WIMWV")) { - /** - * 风向和风速 - * - * $WIMWV,,R,,M,V*37 - * */ - Wind wind = new Wind(); - wind.setDegree(splitData[1].isEmpty() ? 0 : Integer.parseInt(splitData[1])); - wind.setSpeed(splitData[3].isEmpty() ? 0 : Double.parseDouble(splitData[3])); - wind.setDataUnit(splitData[4]); - wind.setCreateTime(TimeUtil.getCurrentTime()); - -// windService.save(wind); - } else if (data.startsWith("$WIXDR")) { - /** - * $WIXDR,C,21.2,C,2,U,0.0,#,0,U,12.7,V,1,U,3.614,V,2*22 - * */ - if (data.contains("#")) { - - } else { - /** - * 气压、温度、湿度 - * - * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 - * */ - Weather weather = new Weather(); - weather.setTProbeId(Integer.parseInt(splitData[4])); - weather.setTemperature(Float.parseFloat(splitData[2])); - weather.setTempUnit(splitData[3]); - - weather.setHProbeId(Integer.parseInt(splitData[8])); - weather.setHumidity(Float.parseFloat(splitData[6])); - weather.setHumidUnit(splitData[7]); - - String datum = splitData[12]; - /** - * 0*75 - * */ - weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); - weather.setPressure(Float.parseFloat(splitData[10])); - weather.setPressureUnit(splitData[11]); - - weather.setCreateTime(TimeUtil.getCurrentTime()); - -// weatherService.save(weather); - } - } else { - log.info("数据格式错误 ===> " + data); - } - } - public String asciiToString(byte[] bytes) { StringBuilder builder = new StringBuilder(); for (byte aByte : bytes) { diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java index d96f0cd..3b698ad 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWindService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWindData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java new file mode 100644 index 0000000..053bc20 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java @@ -0,0 +1,62 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.RainMapper; +import com.casic.missiles.modular.system.model.Rain; +import com.casic.missiles.modular.system.service.IRainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 气象站-风数据信息 服务实现类 + * + * @author a203 + */ + +@Slf4j +@Service +public class RainServiceImpl extends ServiceImpl implements IRainService { + + public RainServiceImpl() { + + } + + @Override + public void saveRainData(String[] splitData) { + /** + * 降雨数据 + * + * $WIXDR,V,0.00,M,0,Z,0,s,0,R,0.0,M,0,V,0.0,M,1,Z,0,s,1,R,0.0,M,1,R,0.0,M,2,R,0.0,M,3*60 + * */ + Rain rain = new Rain(); + //降雨 + rain.setRProbeId(Integer.parseInt(splitData[4])); + rain.setSumRain(Double.parseDouble(splitData[2])); + rain.setSumRainUnit(splitData[3]); + rain.setSumRainTime(Integer.parseInt(splitData[6])); + rain.setSumRainTimeUnit(splitData[7]); + rain.setRainStrength(Float.parseFloat(splitData[10])); + rain.setRainStrengthUnit(splitData[11]); + + //冰雹 + rain.setHProbeId(Integer.parseInt(splitData[16])); + rain.setSumHail(Double.parseDouble(splitData[14])); + rain.setSumHailUnit(splitData[15]); + rain.setSumHailTime(Integer.parseInt(splitData[18])); + rain.setSumHailTimeUnit(splitData[19]); + rain.setHailStrength(Float.parseFloat(splitData[22])); + rain.setHailStrengthUnit(splitData[23]); + + //降雨峰值 + rain.setRPeakProbeId(Integer.parseInt(splitData[28])); + rain.setRainPeak(Float.parseFloat(splitData[26])); + rain.setRainPeakUnit(splitData[25]); + + //冰雹峰值 + rain.setHPeakProbeId(Integer.parseInt(splitData[32])); + rain.setHailPeak(Float.parseFloat(splitData[30])); + rain.setHailPeakUnit(splitData[31]); + + this.baseMapper.insert(rain); + } +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java index 97c1c0f..47f253b 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.dao.WeatherMapper; import com.casic.missiles.modular.system.model.Weather; import com.casic.missiles.modular.system.service.IWeatherService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -18,4 +19,33 @@ public WeatherServiceImpl() { } + + @Override + public void saveWeatherData(String[] splitData) { + /** + * 气压、温度、湿度 + * + * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 + * */ + Weather weather = new Weather(); + weather.setTProbeId(Integer.parseInt(splitData[4])); + weather.setTemperature(Float.parseFloat(splitData[2])); + weather.setTempUnit(splitData[3]); + + weather.setHProbeId(Integer.parseInt(splitData[8])); + weather.setHumidity(Float.parseFloat(splitData[6])); + weather.setHumidUnit(splitData[7]); + + String datum = splitData[12]; + /** + * 0*75 + * */ + weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); + weather.setPressure(Float.parseFloat(splitData[10])); + weather.setPressureUnit(splitData[11]); + + weather.setCreateTime(TimeUtil.getCurrentTime()); + + this.baseMapper.insert(weather); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java index bcbcfb9..b181af4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.WindMapper; import com.casic.missiles.modular.system.model.Wind; import com.casic.missiles.modular.system.service.IWindService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** @@ -12,10 +15,30 @@ * @author a203 */ +@Slf4j @Service public class WindServiceImpl extends ServiceImpl implements IWindService { public WindServiceImpl() { } + + @Override + public void saveWindData(String[] splitData) { + /** + * 风向和风速 + * + * $WIMWV,,R,,M,V*37 + * */ + Wind wind = new Wind(); + wind.setDegree(splitData[1].isEmpty() ? 0 : Integer.parseInt(splitData[1])); + wind.setSpeed(splitData[3].isEmpty() ? 0 : Double.parseDouble(splitData[3])); + wind.setDataUnit(splitData[4]); + /** + * V*37 + * */ + wind.setDataState(splitData[5].split("\\*")[0]); + wind.setCreateTime(TimeUtil.getCurrentTime()); + this.baseMapper.insert(wind); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java index 79ae34c..99bb9f4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java +++ b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java @@ -1,11 +1,9 @@ package com.casic.missiles.serialport; import com.alibaba.fastjson.JSON; -import com.casic.missiles.modular.system.model.Weather; -import com.casic.missiles.modular.system.model.Wind; +import com.casic.missiles.modular.system.service.IRainService; import com.casic.missiles.modular.system.service.IWeatherService; import com.casic.missiles.modular.system.service.IWindService; -import com.casic.missiles.modular.system.utils.TimeUtil; import gnu.io.NRSerialPort; import gnu.io.SerialPortEvent; import lombok.extern.slf4j.Slf4j; @@ -38,10 +36,14 @@ private NRSerialPort serialPort; private final IWindService windService; private final IWeatherService weatherService; + private final IRainService rainService; - public SerialPortInit(IWindService windService, IWeatherService weatherService) { + public SerialPortInit(IWindService windService, + IWeatherService weatherService, + IRainService rainService) { this.windService = windService; this.weatherService = weatherService; + this.rainService = rainService; } /** @@ -65,7 +67,29 @@ e.printStackTrace(); } if (serialPortEvent.getEventType() == SerialPortEvent.DATA_AVAILABLE) { - analyzeData(SerialPortManager.readFromPort(serialPort)); + byte[] bytes = SerialPortManager.readFromPort(serialPort); + String data = asciiToString(bytes); + String[] splitData = data.split(","); + + if (data.startsWith("$WIMWV")) { + windService.saveWindData(splitData); + } else if (data.startsWith("$WIXDR")) { + if (data.contains("#")) { + /** + * 监控数据-设备电压、温度监控数据，暂时不需要 + * + * $WIXDR,C,21.2,C,2,U,0.0,#,0,U,12.7,V,1,U,3.614,V,2*22 + * */ + } else { + if (data.contains("$WIXDR,C")) { + weatherService.saveWeatherData(splitData); + } else { + rainService.saveRainData(splitData); + } + } + } else { + log.info("数据格式错误 ===> " + data); + } } else { log.info("The serial port status is abnormal"); serialPort.removeEventListener(); @@ -84,61 +108,6 @@ } } - private void analyzeData(byte[] bytes) { - String data = asciiToString(bytes); - log.info("串口收到数据 <=== " + data); - String[] splitData = data.split(","); - if (data.startsWith("$WIMWV")) { - /** - * 风向和风速 - * - * $WIMWV,,R,,M,V*37 - * */ - Wind wind = new Wind(); - wind.setDegree(splitData[1].isEmpty() ? 0 : Integer.parseInt(splitData[1])); - wind.setSpeed(splitData[3].isEmpty() ? 0 : Double.parseDouble(splitData[3])); - wind.setDataUnit(splitData[4]); - wind.setCreateTime(TimeUtil.getCurrentTime()); - -// windService.save(wind); - } else if (data.startsWith("$WIXDR")) { - /** - * $WIXDR,C,21.2,C,2,U,0.0,#,0,U,12.7,V,1,U,3.614,V,2*22 - * */ - if (data.contains("#")) { - - } else { - /** - * 气压、温度、湿度 - * - * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 - * */ - Weather weather = new Weather(); - weather.setTProbeId(Integer.parseInt(splitData[4])); - weather.setTemperature(Float.parseFloat(splitData[2])); - weather.setTempUnit(splitData[3]); - - weather.setHProbeId(Integer.parseInt(splitData[8])); - weather.setHumidity(Float.parseFloat(splitData[6])); - weather.setHumidUnit(splitData[7]); - - String datum = splitData[12]; - /** - * 0*75 - * */ - weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); - weather.setPressure(Float.parseFloat(splitData[10])); - weather.setPressureUnit(splitData[11]); - - weather.setCreateTime(TimeUtil.getCurrentTime()); - -// weatherService.save(weather); - } - } else { - log.info("数据格式错误 ===> " + data); - } - } - public String asciiToString(byte[] bytes) { StringBuilder builder = new StringBuilder(); for (byte aByte : bytes) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Rain.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Rain.java new file mode 100644 index 0000000..4938cec --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Rain.java @@ -0,0 +1,150 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author a203 + */ +@Data +@TableName("bus_env_rain") +public class Rain extends Model { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID", type = IdType.ASSIGN_ID) + private Long id; + + /***降雨*****************************************************************/ + /** + * 降雨探头ID：0 + */ + @TableField(value = "R_PROBE_ID") + private Integer rProbeId; + + /** + * 累计降雨数据 + */ + @TableField(value = "SUM_RAIN") + private Double sumRain; + + /** + * 累计降雨单位，M-毫米，I-英寸，H-撞击数 + */ + @TableField(value = "SUM_RAIN_UNIT") + private String sumRainUnit; + + /** + * 持续降雨时间 + */ + @TableField(value = "SUM_RAIN_TIME") + private Integer sumRainTime; + + /** + * 持续降雨时间单位，s-秒 + */ + @TableField(value = "SUM_RAIN_TIME_UNIT") + private String sumRainTimeUnit; + + /** + * 降雨强度 + */ + @TableField(value = "RAIN_STRENGTH") + private Float rainStrength; + + /** + * 降雨强度单位，M-毫米/时，I英寸/时，H-撞击数/时 + */ + @TableField(value = "RAIN_STRENGTH") + private String rainStrengthUnit; + + /***冰雹*****************************************************************/ + /** + * 冰雹探头ID：0 + */ + @TableField(value = "H_PROBE_ID") + private Integer hProbeId; + + /** + * 累计冰雹数据 + */ + @TableField(value = "SUM_HAIL") + private Double sumHail; + + /** + * 累计冰雹单位，M-毫米，I-英寸，H-撞击数 + */ + @TableField(value = "SUM_HAIL_UNIT") + private String sumHailUnit; + + /** + * 持续冰雹时间 + */ + @TableField(value = "SUM_HAIL_TIME") + private Integer sumHailTime; + + /** + * 持续冰雹时间单位，s-秒 + */ + @TableField(value = "SUM_HAIL_TIME_UNIT") + private String sumHailTimeUnit; + + /** + * 冰雹强度 + */ + @TableField(value = "HAIL_STRENGTH") + private Float hailStrength; + + /** + * 冰雹强度单位，M-撞击数/平方厘米小时，I-撞击数/平方英寸小时，H-撞击数/小时 + */ + @TableField(value = "HAIL_STRENGTH") + private String hailStrengthUnit; + + /***降雨峰值*****************************************************************/ + /** + * 降雨峰值探头ID：0 + */ + @TableField(value = "R_PEAK_PROBE_ID") + private Integer rPeakProbeId; + + /** + * 降雨峰值数据 + */ + @TableField(value = "RAIN_PEAK") + private Float rainPeak; + + /** + * 降雨峰值数据单位，M-毫米/时，I英寸/时，H-撞击数/时 + */ + @TableField(value = "RAIN_PEAK_UNIT") + private String rainPeakUnit; + + /***冰雹峰值*****************************************************************/ + /** + * 冰雹峰值探头ID：0 + */ + @TableField(value = "H_PEAK_PROBE_ID") + private Integer hPeakProbeId; + + /** + * 冰雹峰值数据 + */ + @TableField(value = "HAIL_PEAK") + private Float hailPeak; + + /** + * 冰雹峰值数据单位，M-撞击数/平方厘米小时，I-撞击数/平方英寸小时，H-撞击数/小时 + */ + @TableField(value = "HAIL_PEAK_UNIT") + private String hailPeakUnit; + + /** + * 收到数据的时间 + */ + @TableField(value = "CREATE_TIME") + private String createTime; +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java new file mode 100644 index 0000000..5a16580 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/dao/RainMapper.java @@ -0,0 +1,11 @@ +package com.casic.missiles.modular.system.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface RainMapper extends BaseMapper { + +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java new file mode 100644 index 0000000..9d33166 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IRainService.java @@ -0,0 +1,16 @@ +package com.casic.missiles.modular.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.casic.missiles.modular.system.model.Rain; + +/** + * @author a203 + */ +public interface IRainService extends IService { + /** + * 保存串口过来的降雨数据 + * + * @param splitData 分割好了的风数据 + */ + void saveRainData(String[] splitData); +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java index 118359d..3e3a444 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWeatherService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWeatherService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWeatherData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java index d96f0cd..3b698ad 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/IWindService.java @@ -7,5 +7,10 @@ * @author a203 */ public interface IWindService extends IService { - + /** + * 保存串口过来的风数据 + * + * @param splitData 分割好了的风数据 + */ + void saveWindData(String[] splitData); } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java new file mode 100644 index 0000000..053bc20 --- /dev/null +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/RainServiceImpl.java @@ -0,0 +1,62 @@ +package com.casic.missiles.modular.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.casic.missiles.modular.system.dao.RainMapper; +import com.casic.missiles.modular.system.model.Rain; +import com.casic.missiles.modular.system.service.IRainService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * 气象站-风数据信息 服务实现类 + * + * @author a203 + */ + +@Slf4j +@Service +public class RainServiceImpl extends ServiceImpl implements IRainService { + + public RainServiceImpl() { + + } + + @Override + public void saveRainData(String[] splitData) { + /** + * 降雨数据 + * + * $WIXDR,V,0.00,M,0,Z,0,s,0,R,0.0,M,0,V,0.0,M,1,Z,0,s,1,R,0.0,M,1,R,0.0,M,2,R,0.0,M,3*60 + * */ + Rain rain = new Rain(); + //降雨 + rain.setRProbeId(Integer.parseInt(splitData[4])); + rain.setSumRain(Double.parseDouble(splitData[2])); + rain.setSumRainUnit(splitData[3]); + rain.setSumRainTime(Integer.parseInt(splitData[6])); + rain.setSumRainTimeUnit(splitData[7]); + rain.setRainStrength(Float.parseFloat(splitData[10])); + rain.setRainStrengthUnit(splitData[11]); + + //冰雹 + rain.setHProbeId(Integer.parseInt(splitData[16])); + rain.setSumHail(Double.parseDouble(splitData[14])); + rain.setSumHailUnit(splitData[15]); + rain.setSumHailTime(Integer.parseInt(splitData[18])); + rain.setSumHailTimeUnit(splitData[19]); + rain.setHailStrength(Float.parseFloat(splitData[22])); + rain.setHailStrengthUnit(splitData[23]); + + //降雨峰值 + rain.setRPeakProbeId(Integer.parseInt(splitData[28])); + rain.setRainPeak(Float.parseFloat(splitData[26])); + rain.setRainPeakUnit(splitData[25]); + + //冰雹峰值 + rain.setHPeakProbeId(Integer.parseInt(splitData[32])); + rain.setHailPeak(Float.parseFloat(splitData[30])); + rain.setHailPeakUnit(splitData[31]); + + this.baseMapper.insert(rain); + } +} diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java index 97c1c0f..47f253b 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WeatherServiceImpl.java @@ -4,6 +4,7 @@ import com.casic.missiles.modular.system.dao.WeatherMapper; import com.casic.missiles.modular.system.model.Weather; import com.casic.missiles.modular.system.service.IWeatherService; +import com.casic.missiles.modular.system.utils.TimeUtil; import org.springframework.stereotype.Service; /** @@ -18,4 +19,33 @@ public WeatherServiceImpl() { } + + @Override + public void saveWeatherData(String[] splitData) { + /** + * 气压、温度、湿度 + * + * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 + * */ + Weather weather = new Weather(); + weather.setTProbeId(Integer.parseInt(splitData[4])); + weather.setTemperature(Float.parseFloat(splitData[2])); + weather.setTempUnit(splitData[3]); + + weather.setHProbeId(Integer.parseInt(splitData[8])); + weather.setHumidity(Float.parseFloat(splitData[6])); + weather.setHumidUnit(splitData[7]); + + String datum = splitData[12]; + /** + * 0*75 + * */ + weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); + weather.setPressure(Float.parseFloat(splitData[10])); + weather.setPressureUnit(splitData[11]); + + weather.setCreateTime(TimeUtil.getCurrentTime()); + + this.baseMapper.insert(weather); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java index bcbcfb9..b181af4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java +++ b/casic-environment/src/main/java/com/casic/missiles/modular/system/service/impl/WindServiceImpl.java @@ -1,9 +1,12 @@ package com.casic.missiles.modular.system.service.impl; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.casic.missiles.modular.system.dao.WindMapper; import com.casic.missiles.modular.system.model.Wind; import com.casic.missiles.modular.system.service.IWindService; +import com.casic.missiles.modular.system.utils.TimeUtil; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; /** @@ -12,10 +15,30 @@ * @author a203 */ +@Slf4j @Service public class WindServiceImpl extends ServiceImpl implements IWindService { public WindServiceImpl() { } + + @Override + public void saveWindData(String[] splitData) { + /** + * 风向和风速 + * + * $WIMWV,,R,,M,V*37 + * */ + Wind wind = new Wind(); + wind.setDegree(splitData[1].isEmpty() ? 0 : Integer.parseInt(splitData[1])); + wind.setSpeed(splitData[3].isEmpty() ? 0 : Double.parseDouble(splitData[3])); + wind.setDataUnit(splitData[4]); + /** + * V*37 + * */ + wind.setDataState(splitData[5].split("\\*")[0]); + wind.setCreateTime(TimeUtil.getCurrentTime()); + this.baseMapper.insert(wind); + } } diff --git a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java index 79ae34c..99bb9f4 100644 --- a/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java +++ b/casic-environment/src/main/java/com/casic/missiles/serialport/SerialPortInit.java @@ -1,11 +1,9 @@ package com.casic.missiles.serialport; import com.alibaba.fastjson.JSON; -import com.casic.missiles.modular.system.model.Weather; -import com.casic.missiles.modular.system.model.Wind; +import com.casic.missiles.modular.system.service.IRainService; import com.casic.missiles.modular.system.service.IWeatherService; import com.casic.missiles.modular.system.service.IWindService; -import com.casic.missiles.modular.system.utils.TimeUtil; import gnu.io.NRSerialPort; import gnu.io.SerialPortEvent; import lombok.extern.slf4j.Slf4j; @@ -38,10 +36,14 @@ private NRSerialPort serialPort; private final IWindService windService; private final IWeatherService weatherService; + private final IRainService rainService; - public SerialPortInit(IWindService windService, IWeatherService weatherService) { + public SerialPortInit(IWindService windService, + IWeatherService weatherService, + IRainService rainService) { this.windService = windService; this.weatherService = weatherService; + this.rainService = rainService; } /** @@ -65,7 +67,29 @@ e.printStackTrace(); } if (serialPortEvent.getEventType() == SerialPortEvent.DATA_AVAILABLE) { - analyzeData(SerialPortManager.readFromPort(serialPort)); + byte[] bytes = SerialPortManager.readFromPort(serialPort); + String data = asciiToString(bytes); + String[] splitData = data.split(","); + + if (data.startsWith("$WIMWV")) { + windService.saveWindData(splitData); + } else if (data.startsWith("$WIXDR")) { + if (data.contains("#")) { + /** + * 监控数据-设备电压、温度监控数据，暂时不需要 + * + * $WIXDR,C,21.2,C,2,U,0.0,#,0,U,12.7,V,1,U,3.614,V,2*22 + * */ + } else { + if (data.contains("$WIXDR,C")) { + weatherService.saveWeatherData(splitData); + } else { + rainService.saveRainData(splitData); + } + } + } else { + log.info("数据格式错误 ===> " + data); + } } else { log.info("The serial port status is abnormal"); serialPort.removeEventListener(); @@ -84,61 +108,6 @@ } } - private void analyzeData(byte[] bytes) { - String data = asciiToString(bytes); - log.info("串口收到数据 <=== " + data); - String[] splitData = data.split(","); - if (data.startsWith("$WIMWV")) { - /** - * 风向和风速 - * - * $WIMWV,,R,,M,V*37 - * */ - Wind wind = new Wind(); - wind.setDegree(splitData[1].isEmpty() ? 0 : Integer.parseInt(splitData[1])); - wind.setSpeed(splitData[3].isEmpty() ? 0 : Double.parseDouble(splitData[3])); - wind.setDataUnit(splitData[4]); - wind.setCreateTime(TimeUtil.getCurrentTime()); - -// windService.save(wind); - } else if (data.startsWith("$WIXDR")) { - /** - * $WIXDR,C,21.2,C,2,U,0.0,#,0,U,12.7,V,1,U,3.614,V,2*22 - * */ - if (data.contains("#")) { - - } else { - /** - * 气压、温度、湿度 - * - * $WIXDR,C,21.1,C,0,H,15.9,P,0,P,1020.4,H,0*76 - * */ - Weather weather = new Weather(); - weather.setTProbeId(Integer.parseInt(splitData[4])); - weather.setTemperature(Float.parseFloat(splitData[2])); - weather.setTempUnit(splitData[3]); - - weather.setHProbeId(Integer.parseInt(splitData[8])); - weather.setHumidity(Float.parseFloat(splitData[6])); - weather.setHumidUnit(splitData[7]); - - String datum = splitData[12]; - /** - * 0*75 - * */ - weather.setPProbeId(Integer.parseInt(datum.split("\\*")[0])); - weather.setPressure(Float.parseFloat(splitData[10])); - weather.setPressureUnit(splitData[11]); - - weather.setCreateTime(TimeUtil.getCurrentTime()); - -// weatherService.save(weather); - } - } else { - log.info("数据格式错误 ===> " + data); - } - } - public String asciiToString(byte[] bytes) { StringBuilder builder = new StringBuilder(); for (byte aByte : bytes) { diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Rain.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Rain.java new file mode 100644 index 0000000..4938cec --- /dev/null +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Rain.java @@ -0,0 +1,150 @@ +package com.casic.missiles.modular.system.model; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; +import lombok.Data; + +/** + * @author a203 + */ +@Data +@TableName("bus_env_rain") +public class Rain extends Model { + private static final long serialVersionUID = 1L; + + @TableId(value = "ID", type = IdType.ASSIGN_ID) + private Long id; + + /***降雨*****************************************************************/ + /** + * 降雨探头ID：0 + */ + @TableField(value = "R_PROBE_ID") + private Integer rProbeId; + + /** + * 累计降雨数据 + */ + @TableField(value = "SUM_RAIN") + private Double sumRain; + + /** + * 累计降雨单位，M-毫米，I-英寸，H-撞击数 + */ + @TableField(value = "SUM_RAIN_UNIT") + private String sumRainUnit; + + /** + * 持续降雨时间 + */ + @TableField(value = "SUM_RAIN_TIME") + private Integer sumRainTime; + + /** + * 持续降雨时间单位，s-秒 + */ + @TableField(value = "SUM_RAIN_TIME_UNIT") + private String sumRainTimeUnit; + + /** + * 降雨强度 + */ + @TableField(value = "RAIN_STRENGTH") + private Float rainStrength; + + /** + * 降雨强度单位，M-毫米/时，I英寸/时，H-撞击数/时 + */ + @TableField(value = "RAIN_STRENGTH") + private String rainStrengthUnit; + + /***冰雹*****************************************************************/ + /** + * 冰雹探头ID：0 + */ + @TableField(value = "H_PROBE_ID") + private Integer hProbeId; + + /** + * 累计冰雹数据 + */ + @TableField(value = "SUM_HAIL") + private Double sumHail; + + /** + * 累计冰雹单位，M-毫米，I-英寸，H-撞击数 + */ + @TableField(value = "SUM_HAIL_UNIT") + private String sumHailUnit; + + /** + * 持续冰雹时间 + */ + @TableField(value = "SUM_HAIL_TIME") + private Integer sumHailTime; + + /** + * 持续冰雹时间单位，s-秒 + */ + @TableField(value = "SUM_HAIL_TIME_UNIT") + private String sumHailTimeUnit; + + /** + * 冰雹强度 + */ + @TableField(value = "HAIL_STRENGTH") + private Float hailStrength; + + /** + * 冰雹强度单位，M-撞击数/平方厘米小时，I-撞击数/平方英寸小时，H-撞击数/小时 + */ + @TableField(value = "HAIL_STRENGTH") + private String hailStrengthUnit; + + /***降雨峰值*****************************************************************/ + /** + * 降雨峰值探头ID：0 + */ + @TableField(value = "R_PEAK_PROBE_ID") + private Integer rPeakProbeId; + + /** + * 降雨峰值数据 + */ + @TableField(value = "RAIN_PEAK") + private Float rainPeak; + + /** + * 降雨峰值数据单位，M-毫米/时，I英寸/时，H-撞击数/时 + */ + @TableField(value = "RAIN_PEAK_UNIT") + private String rainPeakUnit; + + /***冰雹峰值*****************************************************************/ + /** + * 冰雹峰值探头ID：0 + */ + @TableField(value = "H_PEAK_PROBE_ID") + private Integer hPeakProbeId; + + /** + * 冰雹峰值数据 + */ + @TableField(value = "HAIL_PEAK") + private Float hailPeak; + + /** + * 冰雹峰值数据单位，M-撞击数/平方厘米小时，I-撞击数/平方英寸小时，H-撞击数/小时 + */ + @TableField(value = "HAIL_PEAK_UNIT") + private String hailPeakUnit; + + /** + * 收到数据的时间 + */ + @TableField(value = "CREATE_TIME") + private String createTime; +} diff --git a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Wind.java b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Wind.java index c374f96..fdc43b3 100644 --- a/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Wind.java +++ b/casic-server-support/src/main/java/com/casic/missiles/modular/system/model/Wind.java @@ -37,6 +37,12 @@ private String dataUnit; /** + * 数据状态，A-有效，V-无效 + */ + @TableField(value = "DATA_STATE") + private String dataState; + + /** * 收到数据的时间 */ @TableField(value = "CREATE_TIME")