diff --git a/fastbee-open-api/src/main/java/com/fastbee/data/controller/media/YingshiyunVideoController.java b/fastbee-open-api/src/main/java/com/fastbee/data/controller/media/YingshiyunVideoController.java index ecbabe8..029d161 100644 --- a/fastbee-open-api/src/main/java/com/fastbee/data/controller/media/YingshiyunVideoController.java +++ b/fastbee-open-api/src/main/java/com/fastbee/data/controller/media/YingshiyunVideoController.java @@ -2,7 +2,7 @@ package com.fastbee.data.controller.media; import com.fastbee.common.core.controller.BaseController; import com.fastbee.common.core.domain.AjaxResult; -import com.fastbee.device.api.yingshiyun.service.YingshiyunService; +import com.fastbee.deviceData.api.yingshiyun.service.YingshiyunService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/fastbee-service/fastbee-device-service/pom.xml b/fastbee-service/fastbee-device-service/pom.xml index ec0c389..5f85a33 100644 --- a/fastbee-service/fastbee-device-service/pom.xml +++ b/fastbee-service/fastbee-device-service/pom.xml @@ -32,6 +32,10 @@ com.fastbee fastbee-common + + org.springframework + spring-context + \ No newline at end of file diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/constant/RenKeDeviceTypeConstant.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/constant/RenKeDeviceTypeConstant.java similarity index 80% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/constant/RenKeDeviceTypeConstant.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/constant/RenKeDeviceTypeConstant.java index c0ada73..008bb2f 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/constant/RenKeDeviceTypeConstant.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/constant/RenKeDeviceTypeConstant.java @@ -1,4 +1,4 @@ -package com.fastbee.device.api.renke.constant; +package com.fastbee.deviceData.api.renke.constant; /** * 建大仁科设备类型常量 diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeDeviceDataService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeDeviceDataService.java similarity index 98% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeDeviceDataService.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeDeviceDataService.java index 1065c9c..e7bfe75 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeDeviceDataService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeDeviceDataService.java @@ -1,4 +1,4 @@ -package com.fastbee.device.api.renke.service; +package com.fastbee.deviceData.api.renke.service; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeMetDeviceService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeMetDeviceService.java similarity index 73% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeMetDeviceService.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeMetDeviceService.java index 441ac87..5242ee9 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeMetDeviceService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeMetDeviceService.java @@ -1,4 +1,4 @@ -package com.fastbee.device.api.renke.service; +package com.fastbee.deviceData.api.renke.service; import org.springframework.stereotype.Service; diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeWormSituationDeviceService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeWormSituationDeviceService.java similarity index 75% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeWormSituationDeviceService.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeWormSituationDeviceService.java index f0edf7a..585b9db 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/renke/service/RenkeWormSituationDeviceService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/renke/service/RenkeWormSituationDeviceService.java @@ -1,4 +1,4 @@ -package com.fastbee.device.api.renke.service; +package com.fastbee.deviceData.api.renke.service; import org.springframework.stereotype.Service; diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/yingshiyun/service/YingshiyunService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/yingshiyun/service/YingshiyunService.java similarity index 98% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/yingshiyun/service/YingshiyunService.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/yingshiyun/service/YingshiyunService.java index f412472..26dc473 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/api/yingshiyun/service/YingshiyunService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/yingshiyun/service/YingshiyunService.java @@ -1,4 +1,4 @@ -package com.fastbee.device.api.yingshiyun.service; +package com.fastbee.deviceData.api.yingshiyun.service; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpRequest; diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java new file mode 100644 index 0000000..2824249 --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java @@ -0,0 +1,90 @@ +package com.fastbee.deviceData.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import com.fastbee.common.annotation.Excel; +import com.fastbee.common.core.domain.BaseEntity; + +/** + * 气象设备实时数据对象 iot_device_realtimedata_meteorology + * + * @author kerwincui + * @date 2024-11-08 + */ +@ApiModel(value = "DeviceRealtimedataMeteorology",description = "气象设备实时数据 iot_device_realtimedata_meteorology") +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("iot_device_realtimedata_meteorology") +public class DeviceRealtimedataMeteorology extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** 节点编号 */ + private Long nodeId; + + /** 节点名称 */ + @Excel(name = "节点名称") + @ApiModelProperty("节点名称") + private String nodeName; + + /** 节点类型 -- 节点类型 --1:模拟量1使能模拟量2使能 --2:模拟量1使能模拟量2禁用 --3:模拟量1禁用模拟量2使能 --4:浮点型设备--5:开关量型设备 --6:32位有符号整形 --7:32位无符号整形--8:遥调设备 */ + @Excel(name = "节点类型 -- 节点类型 --1:模拟量1使能模拟量2使能 --2:模拟量1使能模拟量2禁用 --3:模拟量1禁用模拟量2使能 --4:浮点型设备--5:开关量型设备 --6:32位有符号整形 --7:32位无符号整形--8:遥调设备") + @ApiModelProperty("节点类型 -- 节点类型 --1:模拟量1使能模拟量2使能 --2:模拟量1使能模拟量2禁用 --3:模拟量1禁用模拟量2使能 --4:浮点型设备--5:开关量型设备 --6:32位有符号整形 --7:32位无符号整形--8:遥调设备") + private Long nodeType; + + /** 模拟量1名称 */ + @Excel(name = "模拟量1名称") + @ApiModelProperty("模拟量1名称") + private String temName; + + /** 模拟量1单位 */ + @Excel(name = "模拟量1单位") + @ApiModelProperty("模拟量1单位") + private String temUnit; + + /** 模拟量1原值 */ + @Excel(name = "模拟量1原值") + @ApiModelProperty("模拟量1原值") + private Long temValue; + + /** 模拟量1显示值 */ + @Excel(name = "模拟量1显示值") + @ApiModelProperty("模拟量1显示值") + private String temValueStr; + + /** 报警等级, -- 报警等级 --0:正常--1:超上限报警 --2:超下限报警 --3:开关闭合报警 --4:开关断开报警 --5:遥调报警 */ + @Excel(name = "报警等级, -- 报警等级 --0:正常--1:超上限报警 --2:超下限报警 --3:开关闭合报警 --4:开关断开报警 --5:遥调报警") + @ApiModelProperty("报警等级, -- 报警等级 --0:正常--1:超上限报警 --2:超下限报警 --3:开关闭合报警 --4:开关断开报警 --5:遥调报警") + private Long temAlarmStatus; + + /** 模拟量2名称 */ + @Excel(name = "模拟量2名称") + @ApiModelProperty("模拟量2名称") + private String humName; + + /** 模拟量2单位 */ + @Excel(name = "模拟量2单位") + @ApiModelProperty("模拟量2单位") + private String humUnit; + + /** 模拟量2原值 */ + @Excel(name = "模拟量2原值") + @ApiModelProperty("模拟量2原值") + private Long humValue; + + /** 模拟量2显示值 */ + @Excel(name = "模拟量2显示值") + @ApiModelProperty("模拟量2显示值") + private String humValueStr; + + /** 报警等级 , --0:正常 --1:超上限报警 --2:超下限报警 */ + @Excel(name = "报警等级 , --0:正常 --1:超上限报警 --2:超下限报警") + @ApiModelProperty("报警等级 , --0:正常 --1:超上限报警 --2:超下限报警") + private Long humAlarmStatus; + +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/domain/DeviceRealtimedataWorms.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java similarity index 91% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/domain/DeviceRealtimedataWorms.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java index 3530f08..c829884 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/domain/DeviceRealtimedataWorms.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java @@ -1,5 +1,7 @@ -package com.fastbee.device.domain; +package com.fastbee.deviceData.domain; +import cn.hutool.core.date.DateTime; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -16,6 +18,7 @@ import com.fastbee.common.core.domain.BaseEntity; @ApiModel(value = "DeviceRealtimedataWorms",description = "虫情设备实时数据 iot_device_realtimedata_worms") @Data @EqualsAndHashCode(callSuper = true) +@TableName("iot_device_realtimedata_worms") public class DeviceRealtimedataWorms extends BaseEntity { private static final long serialVersionUID = 1L; @@ -112,5 +115,8 @@ private static final long serialVersionUID = 1L; @Excel(name = "设备状态", readConverterExp = "o=nline/offline") @ApiModelProperty("设备状态") private String status; - + /** 创建时间（online/offline） */ + @Excel(name = "创建时间") + @ApiModelProperty("设备状态") + private DateTime createTime; } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java new file mode 100644 index 0000000..3d9f932 --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java @@ -0,0 +1,65 @@ +package com.fastbee.deviceData.mapper; + +import java.util.List; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology; +import org.apache.ibatis.annotations.Mapper; + +/** + * 气象设备实时数据Mapper接口 + * + * @author kerwincui + * @date 2024-11-08 + */ +@Mapper +public interface DeviceRealtimedataMeteorologyMapper extends BaseMapper +{ + /** + * 查询气象设备实时数据 + * + * @param nodeId 气象设备实时数据主键 + * @return 气象设备实时数据 + */ + public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyByNodeId(Long nodeId); + + /** + * 查询气象设备实时数据列表 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 气象设备实时数据集合 + */ + public List selectDeviceRealtimedataMeteorologyList(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology); + + /** + * 新增气象设备实时数据 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 结果 + */ + public int insertDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology); + + /** + * 修改气象设备实时数据 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 结果 + */ + public int updateDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology); + + /** + * 删除气象设备实时数据 + * + * @param nodeId 气象设备实时数据主键 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyByNodeId(Long nodeId); + + /** + * 批量删除气象设备实时数据 + * + * @param nodeIds 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyByNodeIds(Long[] nodeIds); +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/mapper/DeviceRealtimedataWormsMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataWormsMapper.java similarity index 83% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/mapper/DeviceRealtimedataWormsMapper.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataWormsMapper.java index 7fb1d99..ea8ec27 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/mapper/DeviceRealtimedataWormsMapper.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataWormsMapper.java @@ -1,7 +1,10 @@ -package com.fastbee.device.mapper; +package com.fastbee.deviceData.mapper; import java.util.List; -import com.fastbee.device.domain.DeviceRealtimedataWorms; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; +import org.apache.ibatis.annotations.Mapper; /** * 虫情设备实时数据Mapper接口 @@ -9,7 +12,8 @@ import com.fastbee.device.domain.DeviceRealtimedataWorms; * @author kerwincui * @date 2024-11-07 */ -public interface DeviceRealtimedataWormsMapper +@Mapper +public interface DeviceRealtimedataWormsMapper extends BaseMapper { /** * 查询虫情设备实时数据 diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMeteorologyService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMeteorologyService.java new file mode 100644 index 0000000..30f5e4f --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMeteorologyService.java @@ -0,0 +1,61 @@ +package com.fastbee.deviceData.service; + +import java.util.List; +import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology; + +/** + * 气象设备实时数据Service接口 + * + * @author kerwincui + * @date 2024-11-08 + */ +public interface IDeviceRealtimedataMeteorologyService +{ + /** + * 查询气象设备实时数据 + * + * @param nodeId 气象设备实时数据主键 + * @return 气象设备实时数据 + */ + public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyByNodeId(Long nodeId); + + /** + * 查询气象设备实时数据列表 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 气象设备实时数据集合 + */ + public List selectDeviceRealtimedataMeteorologyList(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology); + + /** + * 新增气象设备实时数据 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 结果 + */ + public int insertDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology); + + /** + * 修改气象设备实时数据 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 结果 + */ + public int updateDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology); + + /** + * 批量删除气象设备实时数据 + * + * @param nodeIds 需要删除的气象设备实时数据主键集合 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyByNodeIds(Long[] nodeIds); + + /** + * 删除气象设备实时数据信息 + * + * @param nodeId 气象设备实时数据主键 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyByNodeId(Long nodeId); +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/service/IDeviceRealtimedataWormsService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataWormsService.java similarity index 91% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/service/IDeviceRealtimedataWormsService.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataWormsService.java index 1fe0e1f..a9c4b8f 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/service/IDeviceRealtimedataWormsService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataWormsService.java @@ -1,7 +1,8 @@ -package com.fastbee.device.service; +package com.fastbee.deviceData.service; import java.util.List; -import com.fastbee.device.domain.DeviceRealtimedataWorms; +import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; +import org.apache.ibatis.annotations.Mapper; /** * 虫情设备实时数据Service接口 @@ -9,6 +10,7 @@ import com.fastbee.device.domain.DeviceRealtimedataWorms; * @author kerwincui * @date 2024-11-07 */ +@Mapper public interface IDeviceRealtimedataWormsService { /** diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java new file mode 100644 index 0000000..f5c81d1 --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java @@ -0,0 +1,95 @@ +package com.fastbee.deviceData.service.impl; + +import java.util.List; +import com.fastbee.common.utils.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.fastbee.deviceData.mapper.DeviceRealtimedataMeteorologyMapper; +import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology; +import com.fastbee.deviceData.service.IDeviceRealtimedataMeteorologyService; + +/** + * 气象设备实时数据Service业务层处理 + * + * @author kerwincui + * @date 2024-11-08 + */ +@Service +public class DeviceRealtimedataMeteorologyServiceImpl implements IDeviceRealtimedataMeteorologyService +{ + @Autowired + private DeviceRealtimedataMeteorologyMapper deviceRealtimedataMeteorologyMapper; + + /** + * 查询气象设备实时数据 + * + * @param nodeId 气象设备实时数据主键 + * @return 气象设备实时数据 + */ + @Override + public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyByNodeId(Long nodeId) + { + return deviceRealtimedataMeteorologyMapper.selectDeviceRealtimedataMeteorologyByNodeId(nodeId); + } + + /** + * 查询气象设备实时数据列表 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 气象设备实时数据 + */ + @Override + public List selectDeviceRealtimedataMeteorologyList(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology) + { + return deviceRealtimedataMeteorologyMapper.selectDeviceRealtimedataMeteorologyList(deviceRealtimedataMeteorology); + } + + /** + * 新增气象设备实时数据 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 结果 + */ + @Override + public int insertDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology) + { + deviceRealtimedataMeteorology.setCreateTime(DateUtils.getNowDate()); + return deviceRealtimedataMeteorologyMapper.insert(deviceRealtimedataMeteorology); + } + + /** + * 修改气象设备实时数据 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 结果 + */ + @Override + public int updateDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology) + { + return deviceRealtimedataMeteorologyMapper.updateDeviceRealtimedataMeteorology(deviceRealtimedataMeteorology); + } + + /** + * 批量删除气象设备实时数据 + * + * @param nodeIds 需要删除的气象设备实时数据主键 + * @return 结果 + */ + @Override + public int deleteDeviceRealtimedataMeteorologyByNodeIds(Long[] nodeIds) + { + return deviceRealtimedataMeteorologyMapper.deleteDeviceRealtimedataMeteorologyByNodeIds(nodeIds); + } + + /** + * 删除气象设备实时数据信息 + * + * @param nodeId 气象设备实时数据主键 + * @return 结果 + */ + @Override + public int deleteDeviceRealtimedataMeteorologyByNodeId(Long nodeId) + { + return deviceRealtimedataMeteorologyMapper.deleteDeviceRealtimedataMeteorologyByNodeId(nodeId); + } +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/service/impl/DeviceRealtimedataWormsServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataWormsServiceImpl.java similarity index 88% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/service/impl/DeviceRealtimedataWormsServiceImpl.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataWormsServiceImpl.java index 7790999..9374ec5 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/device/service/impl/DeviceRealtimedataWormsServiceImpl.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataWormsServiceImpl.java @@ -1,11 +1,11 @@ -package com.fastbee.device.service.impl; +package com.fastbee.deviceData.service.impl; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.fastbee.device.mapper.DeviceRealtimedataWormsMapper; -import com.fastbee.device.domain.DeviceRealtimedataWorms; -import com.fastbee.device.service.IDeviceRealtimedataWormsService; +import com.fastbee.deviceData.mapper.DeviceRealtimedataWormsMapper; +import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; +import com.fastbee.deviceData.service.IDeviceRealtimedataWormsService; /** * 虫情设备实时数据Service业务层处理 @@ -52,7 +52,7 @@ public class DeviceRealtimedataWormsServiceImpl implements IDeviceRealtimedataWo @Override public int insertDeviceRealtimedataWorms(DeviceRealtimedataWorms deviceRealtimedataWorms) { - return deviceRealtimedataWormsMapper.insertDeviceRealtimedataWorms(deviceRealtimedataWorms); + return deviceRealtimedataWormsMapper.insert(deviceRealtimedataWorms); } /** diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml new file mode 100644 index 0000000..d1c087e --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml @@ -0,0 +1,117 @@ + + + + + + + + + + + + + + + + + + + + + + + select node_id, node_name, node_type, tem_name, tem_unit, tem_value, tem_value_str, tem_alarm_status, hum_name, hum_unit, hum_value, hum_value_str, hum_alarm_status, create_time from iot_device_realtimedata_meteorology + + + + + + + + insert into iot_device_realtimedata_meteorology + + node_id, + node_name, + node_type, + tem_name, + tem_unit, + tem_value, + tem_value_str, + tem_alarm_status, + hum_name, + hum_unit, + hum_value, + hum_value_str, + hum_alarm_status, + create_time, + + + #{nodeId}, + #{nodeName}, + #{nodeType}, + #{temName}, + #{temUnit}, + #{temValue}, + #{temValueStr}, + #{temAlarmStatus}, + #{humName}, + #{humUnit}, + #{humValue}, + #{humValueStr}, + #{humAlarmStatus}, + #{createTime}, + + + + + update iot_device_realtimedata_meteorology + + node_name = #{nodeName}, + node_type = #{nodeType}, + tem_name = #{temName}, + tem_unit = #{temUnit}, + tem_value = #{temValue}, + tem_value_str = #{temValueStr}, + tem_alarm_status = #{temAlarmStatus}, + hum_name = #{humName}, + hum_unit = #{humUnit}, + hum_value = #{humValue}, + hum_value_str = #{humValueStr}, + hum_alarm_status = #{humAlarmStatus}, + create_time = #{createTime}, + + where node_id = #{nodeId} + + + + delete from iot_device_realtimedata_meteorology where node_id = #{nodeId} + + + + delete from iot_device_realtimedata_meteorology where node_id in + + #{nodeId} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-iot-service/pom.xml b/fastbee-service/fastbee-iot-service/pom.xml index bf4ffed..f4e4828 100644 --- a/fastbee-service/fastbee-iot-service/pom.xml +++ b/fastbee-service/fastbee-iot-service/pom.xml @@ -160,6 +160,12 @@ com.fastbee fastbee-waterele-service + + com.fastbee + fastbee-device-service + 3.8.5 + compile + diff --git a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/DeviceDateTask.java b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/DeviceDateTask.java index 8507ae7..376d136 100644 --- a/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/DeviceDateTask.java +++ b/fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/timer/DeviceDateTask.java @@ -1,18 +1,20 @@ package com.fastbee.iot.timer; -import cn.hutool.http.HttpConfig; +import cn.hutool.core.date.DateTime; import cn.hutool.http.HttpRequest; import cn.hutool.http.HttpResponse; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; -import com.fastbee.common.core.redis.RedisCache; +import com.fastbee.deviceData.api.renke.constant.RenKeDeviceTypeConstant; +import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology; +import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; +import com.fastbee.deviceData.service.impl.DeviceRealtimedataMeteorologyServiceImpl; +import com.fastbee.deviceData.service.impl.DeviceRealtimedataWormsServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import java.util.HashMap; @@ -29,6 +31,11 @@ public class DeviceDateTask { @Autowired private StringRedisTemplate stringRedisTemplate; + @Autowired + private DeviceRealtimedataWormsServiceImpl deviceRealtimedataWormsServiceImpl; + @Autowired + private DeviceRealtimedataMeteorologyServiceImpl deviceRealtimedataMeteorologyServiceImpl; + /** * 在执行定时任务中出现了异常会终止调度，所以需要捕获异常以便于下一轮 * 执行，不会影响下一次执行 @@ -49,8 +56,28 @@ public class DeviceDateTask { JSONArray realtimeList = JSONUtil.parseArray(respBody.get("data")); System.err.println("设备实时数据："+realtimeList); //TODO 解析实时数据保存到数据库 + for (Object jsonObject : realtimeList){ + JSONObject josnConversion = (JSONObject) jsonObject; + if (RenKeDeviceTypeConstant.WORM.equals(josnConversion.get("deviceType"))){ + JSONObject josnArray = JSONUtil.parseObj(josnConversion.get("data")); + DeviceRealtimedataWorms deviceRealtimedataWorms = JSONUtil.toBean(josnArray, DeviceRealtimedataWorms.class); + deviceRealtimedataWorms.setCreateTime(DateTime.now()); + if(deviceRealtimedataWormsServiceImpl.insertDeviceRealtimedataWorms(deviceRealtimedataWorms)==1){ + System.out.println("插入成功"); + }; + }else if (RenKeDeviceTypeConstant.MET.equals(josnConversion.get("deviceType"))){ + JSONArray josnArray = JSONUtil.parseArray(josnConversion.get("data")); + for (Object json : josnArray){ + DeviceRealtimedataMeteorology deviceRealtimedataMeteorology = JSONUtil.toBean((JSONObject) json, DeviceRealtimedataMeteorology.class); + deviceRealtimedataMeteorology.setCreateTime(DateTime.now()); + if(deviceRealtimedataMeteorologyServiceImpl.insertDeviceRealtimedataMeteorology(deviceRealtimedataMeteorology)==1){ + System.out.println("插入成功"); + }; + } + } } + } private String getAuth(){ @@ -83,5 +110,7 @@ public class DeviceDateTask { System.err.println("请求获取到token:"+tokenObject.get("token").toString()); return stringRedisTemplate.opsForValue().get("rkckth:user:token").toString(); } + + }