From a97ef406a5dcefa48cf64206c1d6acaf623b5f54 Mon Sep 17 00:00:00 2001 From: zhumeixiao <3313492479@qq.com> Date: Thu, 14 Nov 2024 12:54:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=97=E6=83=85=E8=AE=BE=E5=A4=87=E5=AE=9E?= =?UTF-8?q?=E6=97=B6=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/DevLinkMoistureService.java | 3 +- .../domain/DeviceRealtimedataMeteorology.java | 102 ++++++ .../domain/DeviceRealtimedataMiaoqing.java | 147 ++++++++ .../domain/DeviceRealtimedataMoisture.java | 319 +++++++----------- .../domain/DeviceRealtimedataWorms.java | 12 +- .../DeviceRealtimedataMeteorologyMapper.java | 63 ++++ .../DeviceRealtimedataMiaoqingMapper.java | 63 ++++ .../DeviceRealtimedataMoistureMapper.java | 28 +- .../DeviceRealtimedataPhotovoltaicMapper.java | 2 + .../mapper/DeviceRealtimedataWormsMapper.java | 6 +- ...IDeviceRealtimedataMeteorologyService.java | 61 ++++ .../IDeviceRealtimedataMiaoqingService.java | 61 ++++ .../IDeviceRealtimedataMoistureService.java | 30 +- .../IDeviceRealtimedataWormsService.java | 2 +- ...iceRealtimedataMeteorologyServiceImpl.java | 96 ++++++ ...DeviceRealtimedataMiaoqingServiceImpl.java | 95 ++++++ ...DeviceRealtimedataMoistureServiceImpl.java | 32 +- ...> DeviceRealtimedataWormsServiceImpl.java} | 12 +- .../DeviceRealtimedataMeteorologyMapper.xml | 141 ++++++++ .../DeviceRealtimedataMiaoqingMapper.xml | 170 ++++++++++ .../DeviceRealtimedataMoistureMapper.xml | 191 ++++------- .../com/fastbee/iot/timer/DeviceDateTask.java | 1 - 22 files changed, 1255 insertions(+), 382 deletions(-) create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMiaoqing.java create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMiaoqingMapper.java create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMeteorologyService.java create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMiaoqingService.java create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java create mode 100644 fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMiaoqingServiceImpl.java rename fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/{DeviceRealtimeDataWormsServiceImpl.java => DeviceRealtimedataWormsServiceImpl.java} (92%) create mode 100644 fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml create mode 100644 fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMiaoqingMapper.xml diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java index 748f1c8..f367711 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureService.java @@ -4,6 +4,7 @@ import cn.hutool.http.HttpUtil; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; +import com.fastbee.deviceData.mapper.DeviceRealtimedataPhotovoltaicMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -58,7 +59,7 @@ public class DevLinkMoistureService { //TODO 属性值历史数据，是否需要 Object list = JSONUtil.parseObj(p).get("list"); //TODO 封装所需数据 - deviceRealtimedataPhotovoltaicMapper.insertDeviceRealtimedataMeteorology(null); + deviceRealtimedataPhotovoltaicMapper.insertDeviceRealtimedataPhotovoltaic(null); }); 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..8c05d7b --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMeteorology.java @@ -0,0 +1,102 @@ +package com.fastbee.deviceData.domain; + +import java.math.BigDecimal; +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-14 + */ +@ApiModel(value = "DeviceRealtimedataMeteorology",description = "气象设备实时数据 iot_device_realtimedata_meteorology") +@Data +@EqualsAndHashCode(callSuper = true) +public class DeviceRealtimedataMeteorology extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** 主键 */ + private Long id; + + /** 设备id */ + @Excel(name = "设备id") + @ApiModelProperty("设备id") + private Long deviceId; + + /** 空气温度 */ + @Excel(name = "空气温度") + @ApiModelProperty("空气温度") + private BigDecimal airTemp; + + /** 空气湿度 */ + @Excel(name = "空气湿度") + @ApiModelProperty("空气湿度") + private BigDecimal airHumi; + + /** 风速 */ + @Excel(name = "风速") + @ApiModelProperty("风速") + private BigDecimal windSpeed; + + /** 风向 */ + @Excel(name = "风向") + @ApiModelProperty("风向") + private Long windDir; + + /** 大气压力 */ + @Excel(name = "大气压力") + @ApiModelProperty("大气压力") + private BigDecimal airPre; + + /** 光照度 */ + @Excel(name = "光照度") + @ApiModelProperty("光照度") + private Long guangzhao; + + /** 光合有效辐射 */ + @Excel(name = "光合有效辐射") + @ApiModelProperty("光合有效辐射") + private BigDecimal fushe; + + /** 累积雨量 */ + @Excel(name = "累积雨量") + @ApiModelProperty("累积雨量") + private BigDecimal sumRain; + + /** 瞬时雨量 */ + @Excel(name = "瞬时雨量") + @ApiModelProperty("瞬时雨量") + private BigDecimal insRain; + + /** 日雨量 */ + @Excel(name = "日雨量") + @ApiModelProperty("日雨量") + private BigDecimal dayRain; + + /** 蒸发量 */ + @Excel(name = "蒸发量") + @ApiModelProperty("蒸发量") + private BigDecimal zhengfa; + + /** 土壤温度 */ + @Excel(name = "土壤温度") + @ApiModelProperty("土壤温度") + private BigDecimal soilTemp; + + /** 土壤湿度 */ + @Excel(name = "土壤湿度") + @ApiModelProperty("土壤湿度") + private BigDecimal soilHumi; + + /** 删除标志（0代表存在，2代表删除） */ + private Integer delFlag; + +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMiaoqing.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMiaoqing.java new file mode 100644 index 0000000..a30f04d --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMiaoqing.java @@ -0,0 +1,147 @@ +package com.fastbee.deviceData.domain; + +import java.math.BigDecimal; +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +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_miaoQing + * + * @author kerwincui + * @date 2024-11-14 + */ +@ApiModel(value = "DeviceRealtimedataMiaoqing",description = "苗青设备实时数据 iot_device_realtimedata_miaoQing") +@Data +@EqualsAndHashCode(callSuper = true) +public class DeviceRealtimedataMiaoqing extends BaseEntity + { +private static final long serialVersionUID = 1L; + + /** */ + private Long id; + + /** 环境温度 */ + @Excel(name = "环境温度") + @ApiModelProperty("环境温度") + private BigDecimal airTemp; + + /** 设备温度 */ + @Excel(name = "设备温度") + @ApiModelProperty("设备温度") + private BigDecimal mppTemp; + + /** 电池电量 */ + @Excel(name = "电池电量") + @ApiModelProperty("电池电量") + private Long batteryCap; + + /** 电池电压 */ + @Excel(name = "电池电压") + @ApiModelProperty("电池电压") + private BigDecimal batteryVolt; + + /** 电池电流 */ + @Excel(name = "电池电流") + @ApiModelProperty("电池电流") + private BigDecimal batteryCur; + + /** 电池功率 */ + @Excel(name = "电池功率") + @ApiModelProperty("电池功率") + private BigDecimal batteryPower; + + /** 负载电压 */ + @Excel(name = "负载电压") + @ApiModelProperty("负载电压") + private BigDecimal loadVolt; + + /** 负载电流 */ + @Excel(name = "负载电流") + @ApiModelProperty("负载电流") + private BigDecimal loadCur; + + /** 负载功率 */ + @Excel(name = "负载功率") + @ApiModelProperty("负载功率") + private BigDecimal loadPower; + + /** 光伏电压 */ + @Excel(name = "光伏电压") + @ApiModelProperty("光伏电压") + private BigDecimal photVolt; + + /** 光伏电流 */ + @Excel(name = "光伏电流") + @ApiModelProperty("光伏电流") + private BigDecimal photCur; + + /** 光伏功率 */ + @Excel(name = "光伏功率") + @ApiModelProperty("光伏功率") + private BigDecimal photPower; + + /** 当日累计充电量 */ + @Excel(name = "当日累计充电量") + @ApiModelProperty("当日累计充电量") + private BigDecimal cumChargeDay; + + /** 当月累计充电量 */ + @Excel(name = "当月累计充电量") + @ApiModelProperty("当月累计充电量") + private BigDecimal cumChargeMon; + + /** 当年累积充电量 */ + @Excel(name = "当年累积充电量") + @ApiModelProperty("当年累积充电量") + private BigDecimal cumChargeYear; + + /** 总累计充电量 */ + @Excel(name = "总累计充电量") + @ApiModelProperty("总累计充电量") + private BigDecimal cumChargeAll; + + /** 当日累计用电量 */ + @Excel(name = "当日累计用电量") + @ApiModelProperty("当日累计用电量") + private BigDecimal cumEleDay; + + /** 当月累积用电量 */ + @Excel(name = "当月累积用电量") + @ApiModelProperty("当月累积用电量") + private BigDecimal cumEleMon; + + /** 当年累计用电量 */ + @Excel(name = "当年累计用电量") + @ApiModelProperty("当年累计用电量") + private BigDecimal cumEleYear; + + /** 总累积用电量 */ + @Excel(name = "总累积用电量") + @ApiModelProperty("总累积用电量") + private BigDecimal cumEleAll; + + /** 手动控制模式 */ + @Excel(name = "手动控制模式") + @ApiModelProperty("手动控制模式") + private Long shoudong; + + /** 远程通断电 */ + @Excel(name = "远程通断电") + @ApiModelProperty("远程通断电") + private Long control; + + /** 实时时间 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd") + @ApiModelProperty("实时时间") + private Date realTime; + +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java index 19b9362..d0880c7 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataMoisture.java @@ -1,24 +1,21 @@ package com.fastbee.deviceData.domain; import java.math.BigDecimal; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; 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_moisture + * 墒情实时数据对象 iot_device_realtimedata_moisture * * @author kerwincui * @date 2024-11-14 */ -@ApiModel(value = "DeviceRealtimedataMoisture",description = "墒情设备实时数据 iot_device_realtimedata_moisture") +@ApiModel(value = "DeviceRealtimedataMoisture",description = "墒情实时数据 iot_device_realtimedata_moisture") @Data @EqualsAndHashCode(callSuper = true) public class DeviceRealtimedataMoisture extends BaseEntity @@ -31,232 +28,176 @@ private static final long serialVersionUID = 1L; /** 设备id */ @Excel(name = "设备id") @ApiModelProperty("设备id") - private Long deviceId; + private Long idDevice; - /** 1#环境温度 */ - @Excel(name = "1#环境温度") - @ApiModelProperty("1#环境温度") + /** 土壤温度 */ + @Excel(name = "土壤温度") + @ApiModelProperty("土壤温度") + private BigDecimal soilTemp; + + /** 土壤湿度 */ + @Excel(name = "土壤湿度") + @ApiModelProperty("土壤湿度") + private BigDecimal soilHumi; + + /** 土壤EC */ + @Excel(name = "土壤EC") + @ApiModelProperty("土壤EC") + private BigDecimal soilEc; + + /** 土壤Ph */ + @Excel(name = "土壤Ph") + @ApiModelProperty("土壤Ph") + private BigDecimal soilPh; + + /** 一层土壤温度 */ + @Excel(name = "一层土壤温度") + @ApiModelProperty("一层土壤温度") + private BigDecimal soilTemp1; + + /** 一层土壤湿度 */ + @Excel(name = "一层土壤湿度") + @ApiModelProperty("一层土壤湿度") + private BigDecimal soilHumi1; + + /** 二层土壤温度 */ + @Excel(name = "二层土壤温度") + @ApiModelProperty("二层土壤温度") + private BigDecimal soilTemp2; + + /** 二层土壤湿度 */ + @Excel(name = "二层土壤湿度") + @ApiModelProperty("二层土壤湿度") + private BigDecimal soilHumi2; + + /** 三层土壤温度 */ + @Excel(name = "三层土壤温度") + @ApiModelProperty("三层土壤温度") + private BigDecimal soilTemp3; + + /** 三层土壤湿度 */ + @Excel(name = "三层土壤湿度") + @ApiModelProperty("三层土壤湿度") + private BigDecimal soilHumi3; + + /** 四层土壤温度 */ + @Excel(name = "四层土壤温度") + @ApiModelProperty("四层土壤温度") + private BigDecimal soilTemp4; + + /** 四层土壤湿度 */ + @Excel(name = "四层土壤湿度") + @ApiModelProperty("四层土壤湿度") + private BigDecimal soilHumi4; + + /** 环境温度 */ + @Excel(name = "环境温度") + @ApiModelProperty("环境温度") private BigDecimal airTemp; - /** 1#设备温度 */ - @Excel(name = "1#设备温度") - @ApiModelProperty("1#设备温度") + /** 设备温度 */ + @Excel(name = "设备温度") + @ApiModelProperty("设备温度") private BigDecimal mppTemp; - /** 1#电池电量 */ - @Excel(name = "1#电池电量") - @ApiModelProperty("1#电池电量") - private Long batteryCap; + /** 电池电量 */ + @Excel(name = "电池电量") + @ApiModelProperty("电池电量") + private BigDecimal batteryCap; - /** 1#电池电压 */ - @Excel(name = "1#电池电压") - @ApiModelProperty("1#电池电压") + /** 电池电压 */ + @Excel(name = "电池电压") + @ApiModelProperty("电池电压") private BigDecimal batteryVolt; - /** 1#电池电流 */ - @Excel(name = "1#电池电流") - @ApiModelProperty("1#电池电流") + /** 电池电流 */ + @Excel(name = "电池电流") + @ApiModelProperty("电池电流") private BigDecimal batteryCur; - /** 1#电池功率 */ - @Excel(name = "1#电池功率") - @ApiModelProperty("1#电池功率") + /** 电池功率 */ + @Excel(name = "电池功率") + @ApiModelProperty("电池功率") private BigDecimal batteryPower; - /** 1#负载电压 */ - @Excel(name = "1#负载电压") - @ApiModelProperty("1#负载电压") + /** 负载电压 */ + @Excel(name = "负载电压") + @ApiModelProperty("负载电压") private BigDecimal loadVolt; - /** 1#负载电流 */ - @Excel(name = "1#负载电流") - @ApiModelProperty("1#负载电流") + /** 负载电流 */ + @Excel(name = "负载电流") + @ApiModelProperty("负载电流") private BigDecimal loadCur; - /** 1#负载功率 */ - @Excel(name = "1#负载功率") - @ApiModelProperty("1#负载功率") + /** 负载功率 */ + @Excel(name = "负载功率") + @ApiModelProperty("负载功率") private BigDecimal loadPower; - /** 1#光伏电压 */ - @Excel(name = "1#光伏电压") - @ApiModelProperty("1#光伏电压") + /** 光伏电压 */ + @Excel(name = "光伏电压") + @ApiModelProperty("光伏电压") private BigDecimal photVolt; - /** 1#光伏电流 */ - @Excel(name = "1#光伏电流") - @ApiModelProperty("1#光伏电流") + /** 光伏电流 */ + @Excel(name = "光伏电流") + @ApiModelProperty("光伏电流") private BigDecimal photCur; - /** 1#光伏功率 */ - @Excel(name = "1#光伏功率") - @ApiModelProperty("1#光伏功率") + /** 光伏功率 */ + @Excel(name = "光伏功率") + @ApiModelProperty("光伏功率") private BigDecimal photPower; - /** 1#当日累计充电量 */ - @Excel(name = "1#当日累计充电量") - @ApiModelProperty("1#当日累计充电量") + /** 当日累计充电量 */ + @Excel(name = "当日累计充电量") + @ApiModelProperty("当日累计充电量") private BigDecimal cumChargeDay; - /** 1#当月累计充电量 */ - @Excel(name = "1#当月累计充电量") - @ApiModelProperty("1#当月累计充电量") + /** 当月累计充电量 */ + @Excel(name = "当月累计充电量") + @ApiModelProperty("当月累计充电量") private BigDecimal cumChargeMon; - /** 1#当年累积充电量 */ - @Excel(name = "1#当年累积充电量") - @ApiModelProperty("1#当年累积充电量") + /** 当年累积充电量 */ + @Excel(name = "当年累积充电量") + @ApiModelProperty("当年累积充电量") private BigDecimal cumChargeYear; - /** 1#总累计充电量 */ - @Excel(name = "1#总累计充电量") - @ApiModelProperty("1#总累计充电量") + /** 总累计充电量 */ + @Excel(name = "总累计充电量") + @ApiModelProperty("总累计充电量") private BigDecimal cumChargeAll; - /** 1#当日累计用电量 */ - @Excel(name = "1#当日累计用电量") - @ApiModelProperty("1#当日累计用电量") + /** 当日累计用电量 */ + @Excel(name = "当日累计用电量") + @ApiModelProperty("当日累计用电量") private BigDecimal cumEleDay; - /** 1#当月累积用电量 */ - @Excel(name = "1#当月累积用电量") - @ApiModelProperty("1#当月累积用电量") + /** 当月累积用电量 */ + @Excel(name = "当月累积用电量") + @ApiModelProperty("当月累积用电量") private BigDecimal cumEleMon; - /** 1#当年累计用电量 */ - @Excel(name = "1#当年累计用电量") - @ApiModelProperty("1#当年累计用电量") + /** 当年累计用电量 */ + @Excel(name = "当年累计用电量") + @ApiModelProperty("当年累计用电量") private BigDecimal cumEleYear; - /** 1#总累积用电量 */ - @Excel(name = "1#总累积用电量") - @ApiModelProperty("1#总累积用电量") + /** 总累积用电量 */ + @Excel(name = "总累积用电量") + @ApiModelProperty("总累积用电量") private BigDecimal cumEleAll; - /** 1#手动控制模式 */ - @Excel(name = "1#手动控制模式") - @ApiModelProperty("1#手动控制模式") + /** 手动控制模式 */ + @Excel(name = "手动控制模式") + @ApiModelProperty("手动控制模式") private Long shoudong; - /** 1#远程通断电 */ - @Excel(name = "1#远程通断电") - @ApiModelProperty("1#远程通断电") + /** 远程通断电 */ + @Excel(name = "远程通断电") + @ApiModelProperty("远程通断电") private Long control; - /** 2#环境温度 */ - @Excel(name = "2#环境温度") - @ApiModelProperty("2#环境温度") - private BigDecimal airTemp2; - - /** 2#设备温度 */ - @Excel(name = "2#设备温度") - @ApiModelProperty("2#设备温度") - private BigDecimal mppTemp2; - - /** 2#电池电量 */ - @Excel(name = "2#电池电量") - @ApiModelProperty("2#电池电量") - private Long batteryCap2; - - /** 2#电池电压 */ - @Excel(name = "2#电池电压") - @ApiModelProperty("2#电池电压") - private BigDecimal batteryVolt2; - - /** 2#电池电流 */ - @Excel(name = "2#电池电流") - @ApiModelProperty("2#电池电流") - private BigDecimal batteryCur2; - - /** 2#电池功率 */ - @Excel(name = "2#电池功率") - @ApiModelProperty("2#电池功率") - private BigDecimal batteryPower2; - - /** 2#负载电压 */ - @Excel(name = "2#负载电压") - @ApiModelProperty("2#负载电压") - private BigDecimal loadVolt2; - - /** 2#负载电流 */ - @Excel(name = "2#负载电流") - @ApiModelProperty("2#负载电流") - private BigDecimal loadCur2; - - /** 2#负载功率 */ - @Excel(name = "2#负载功率") - @ApiModelProperty("2#负载功率") - private BigDecimal loadPower2; - - /** 2#光伏电压 */ - @Excel(name = "2#光伏电压") - @ApiModelProperty("2#光伏电压") - private BigDecimal photVolt2; - - /** 2#光伏电流 */ - @Excel(name = "2#光伏电流") - @ApiModelProperty("2#光伏电流") - private BigDecimal photCur2; - - /** 2#光伏功率 */ - @Excel(name = "2#光伏功率") - @ApiModelProperty("2#光伏功率") - private BigDecimal photPower2; - - /** 2#当日累计充电量 */ - @Excel(name = "2#当日累计充电量") - @ApiModelProperty("2#当日累计充电量") - private BigDecimal cumChargeDay2; - - /** 2#当月累计充电量 */ - @Excel(name = "2#当月累计充电量") - @ApiModelProperty("2#当月累计充电量") - private BigDecimal cumChargeMon2; - - /** 2#当年累积充电量 */ - @Excel(name = "2#当年累积充电量") - @ApiModelProperty("2#当年累积充电量") - private BigDecimal cumChargeYear2; - - /** 2#总累计充电量 */ - @Excel(name = "2#总累计充电量") - @ApiModelProperty("2#总累计充电量") - private BigDecimal cumChargeAll2; - - /** 2#当日累计用电量 */ - @Excel(name = "2#当日累计用电量") - @ApiModelProperty("2#当日累计用电量") - private BigDecimal cumEleDay2; - - /** 2#当年累计用电量 */ - @Excel(name = "2#当年累计用电量") - @ApiModelProperty("2#当年累计用电量") - private BigDecimal cumEleYear2; - - /** 2#总累积用电量 */ - @Excel(name = "2#总累积用电量") - @ApiModelProperty("2#总累积用电量") - private BigDecimal cumEleAll2; - - /** 2#手动控制模式 */ - @Excel(name = "2#手动控制模式") - @ApiModelProperty("2#手动控制模式") - private Long shoudong2; - - /** 2#远程通断电 */ - @Excel(name = "2#远程通断电") - @ApiModelProperty("2#远程通断电") - private Long control2; - - /** 2#当月累计用电量 */ - @Excel(name = "2#当月累计用电量") - @ApiModelProperty("2#当月累计用电量") - private BigDecimal cumEleMon2; - - /** 实时时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd") - @ApiModelProperty("实时时间") - private Date realTime; - } diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java index c829884..c981ec7 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/domain/DeviceRealtimedataWorms.java @@ -1,11 +1,11 @@ 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; 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; @@ -13,12 +13,11 @@ import com.fastbee.common.core.domain.BaseEntity; * 虫情设备实时数据对象 iot_device_realtimedata_worms * * @author kerwincui - * @date 2024-11-07 + * @date 2024-11-14 */ @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; @@ -115,8 +114,5 @@ 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..e558cca --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMeteorologyMapper.java @@ -0,0 +1,63 @@ +package com.fastbee.deviceData.mapper; + +import java.util.List; +import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology; +import org.apache.ibatis.annotations.Mapper; + +/** + * 气象设备实时数据Mapper接口 + * + * @author kerwincui + * @date 2024-11-14 + */ +@Mapper +public interface DeviceRealtimedataMeteorologyMapper +{ + /** + * 查询气象设备实时数据 + * + * @param id 气象设备实时数据主键 + * @return 气象设备实时数据 + */ + public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyById(Long id); + + /** + * 查询气象设备实时数据列表 + * + * @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 id 气象设备实时数据主键 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyById(Long id); + + /** + * 批量删除气象设备实时数据 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyByIds(Long[] ids); +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMiaoqingMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMiaoqingMapper.java new file mode 100644 index 0000000..bb77ea3 --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMiaoqingMapper.java @@ -0,0 +1,63 @@ +package com.fastbee.deviceData.mapper; + +import java.util.List; +import com.fastbee.deviceData.domain.DeviceRealtimedataMiaoqing; +import org.apache.ibatis.annotations.Mapper; + +/** + * 苗青设备实时数据Mapper接口 + * + * @author kerwincui + * @date 2024-11-14 + */ +@Mapper +public interface DeviceRealtimedataMiaoqingMapper +{ + /** + * 查询苗青设备实时数据 + * + * @param id 苗青设备实时数据主键 + * @return 苗青设备实时数据 + */ + public DeviceRealtimedataMiaoqing selectDeviceRealtimedataMiaoqingById(Long id); + + /** + * 查询苗青设备实时数据列表 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 苗青设备实时数据集合 + */ + public List selectDeviceRealtimedataMiaoqingList(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing); + + /** + * 新增苗青设备实时数据 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 结果 + */ + public int insertDeviceRealtimedataMiaoqing(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing); + + /** + * 修改苗青设备实时数据 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 结果 + */ + public int updateDeviceRealtimedataMiaoqing(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing); + + /** + * 删除苗青设备实时数据 + * + * @param id 苗青设备实时数据主键 + * @return 结果 + */ + public int deleteDeviceRealtimedataMiaoqingById(Long id); + + /** + * 批量删除苗青设备实时数据 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteDeviceRealtimedataMiaoqingByIds(Long[] ids); +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMoistureMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMoistureMapper.java index b68fcb4..94ad674 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMoistureMapper.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataMoistureMapper.java @@ -5,7 +5,7 @@ import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture; import org.apache.ibatis.annotations.Mapper; /** - * 墒情设备实时数据Mapper接口 + * 墒情实时数据Mapper接口 * * @author kerwincui * @date 2024-11-14 @@ -14,47 +14,47 @@ import org.apache.ibatis.annotations.Mapper; public interface DeviceRealtimedataMoistureMapper { /** - * 查询墒情设备实时数据 + * 查询墒情实时数据 * - * @param id 墒情设备实时数据主键 - * @return 墒情设备实时数据 + * @param id 墒情实时数据主键 + * @return 墒情实时数据 */ public DeviceRealtimedataMoisture selectDeviceRealtimedataMoistureById(Long id); /** - * 查询墒情设备实时数据列表 + * 查询墒情实时数据列表 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 - * @return 墒情设备实时数据集合 + * @param deviceRealtimedataMoisture 墒情实时数据 + * @return 墒情实时数据集合 */ public List selectDeviceRealtimedataMoistureList(DeviceRealtimedataMoisture deviceRealtimedataMoisture); /** - * 新增墒情设备实时数据 + * 新增墒情实时数据 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 + * @param deviceRealtimedataMoisture 墒情实时数据 * @return 结果 */ public int insertDeviceRealtimedataMoisture(DeviceRealtimedataMoisture deviceRealtimedataMoisture); /** - * 修改墒情设备实时数据 + * 修改墒情实时数据 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 + * @param deviceRealtimedataMoisture 墒情实时数据 * @return 结果 */ public int updateDeviceRealtimedataMoisture(DeviceRealtimedataMoisture deviceRealtimedataMoisture); /** - * 删除墒情设备实时数据 + * 删除墒情实时数据 * - * @param id 墒情设备实时数据主键 + * @param id 墒情实时数据主键 * @return 结果 */ public int deleteDeviceRealtimedataMoistureById(Long id); /** - * 批量删除墒情设备实时数据 + * 批量删除墒情实时数据 * * @param ids 需要删除的数据主键集合 * @return 结果 diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataPhotovoltaicMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataPhotovoltaicMapper.java index 4d92b84..2ffae9e 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataPhotovoltaicMapper.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataPhotovoltaicMapper.java @@ -2,6 +2,7 @@ package com.fastbee.deviceData.mapper; import java.util.List; import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic; +import org.apache.ibatis.annotations.Mapper; /** * 光伏设备实时数据Mapper接口 @@ -9,6 +10,7 @@ import com.fastbee.deviceData.domain.DeviceRealtimedataPhotovoltaic; * @author kerwincui * @date 2024-11-14 */ +@Mapper public interface DeviceRealtimedataPhotovoltaicMapper { /** diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataWormsMapper.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataWormsMapper.java index ea8ec27..4a17e39 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataWormsMapper.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/mapper/DeviceRealtimedataWormsMapper.java @@ -1,8 +1,6 @@ package com.fastbee.deviceData.mapper; import java.util.List; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; import org.apache.ibatis.annotations.Mapper; @@ -10,10 +8,10 @@ import org.apache.ibatis.annotations.Mapper; * 虫情设备实时数据Mapper接口 * * @author kerwincui - * @date 2024-11-07 + * @date 2024-11-14 */ @Mapper -public interface DeviceRealtimedataWormsMapper extends BaseMapper +public interface DeviceRealtimedataWormsMapper { /** * 查询虫情设备实时数据 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..0c44fd9 --- /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-14 + */ +public interface IDeviceRealtimedataMeteorologyService +{ + /** + * 查询气象设备实时数据 + * + * @param id 气象设备实时数据主键 + * @return 气象设备实时数据 + */ + public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyById(Long id); + + /** + * 查询气象设备实时数据列表 + * + * @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 ids 需要删除的气象设备实时数据主键集合 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyByIds(Long[] ids); + + /** + * 删除气象设备实时数据信息 + * + * @param id 气象设备实时数据主键 + * @return 结果 + */ + public int deleteDeviceRealtimedataMeteorologyById(Long id); +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMiaoqingService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMiaoqingService.java new file mode 100644 index 0000000..b7d58b8 --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMiaoqingService.java @@ -0,0 +1,61 @@ +package com.fastbee.deviceData.service; + +import java.util.List; +import com.fastbee.deviceData.domain.DeviceRealtimedataMiaoqing; + +/** + * 苗青设备实时数据Service接口 + * + * @author kerwincui + * @date 2024-11-14 + */ +public interface IDeviceRealtimedataMiaoqingService +{ + /** + * 查询苗青设备实时数据 + * + * @param id 苗青设备实时数据主键 + * @return 苗青设备实时数据 + */ + public DeviceRealtimedataMiaoqing selectDeviceRealtimedataMiaoqingById(Long id); + + /** + * 查询苗青设备实时数据列表 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 苗青设备实时数据集合 + */ + public List selectDeviceRealtimedataMiaoqingList(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing); + + /** + * 新增苗青设备实时数据 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 结果 + */ + public int insertDeviceRealtimedataMiaoqing(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing); + + /** + * 修改苗青设备实时数据 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 结果 + */ + public int updateDeviceRealtimedataMiaoqing(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing); + + /** + * 批量删除苗青设备实时数据 + * + * @param ids 需要删除的苗青设备实时数据主键集合 + * @return 结果 + */ + public int deleteDeviceRealtimedataMiaoqingByIds(Long[] ids); + + /** + * 删除苗青设备实时数据信息 + * + * @param id 苗青设备实时数据主键 + * @return 结果 + */ + public int deleteDeviceRealtimedataMiaoqingById(Long id); +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java index 2c94c9c..45ded44 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataMoistureService.java @@ -4,7 +4,7 @@ import java.util.List; import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture; /** - * 墒情设备实时数据Service接口 + * 墒情实时数据Service接口 * * @author kerwincui * @date 2024-11-14 @@ -12,49 +12,49 @@ import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture; public interface IDeviceRealtimedataMoistureService { /** - * 查询墒情设备实时数据 + * 查询墒情实时数据 * - * @param id 墒情设备实时数据主键 - * @return 墒情设备实时数据 + * @param id 墒情实时数据主键 + * @return 墒情实时数据 */ public DeviceRealtimedataMoisture selectDeviceRealtimedataMoistureById(Long id); /** - * 查询墒情设备实时数据列表 + * 查询墒情实时数据列表 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 - * @return 墒情设备实时数据集合 + * @param deviceRealtimedataMoisture 墒情实时数据 + * @return 墒情实时数据集合 */ public List selectDeviceRealtimedataMoistureList(DeviceRealtimedataMoisture deviceRealtimedataMoisture); /** - * 新增墒情设备实时数据 + * 新增墒情实时数据 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 + * @param deviceRealtimedataMoisture 墒情实时数据 * @return 结果 */ public int insertDeviceRealtimedataMoisture(DeviceRealtimedataMoisture deviceRealtimedataMoisture); /** - * 修改墒情设备实时数据 + * 修改墒情实时数据 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 + * @param deviceRealtimedataMoisture 墒情实时数据 * @return 结果 */ public int updateDeviceRealtimedataMoisture(DeviceRealtimedataMoisture deviceRealtimedataMoisture); /** - * 批量删除墒情设备实时数据 + * 批量删除墒情实时数据 * - * @param ids 需要删除的墒情设备实时数据主键集合 + * @param ids 需要删除的墒情实时数据主键集合 * @return 结果 */ public int deleteDeviceRealtimedataMoistureByIds(Long[] ids); /** - * 删除墒情设备实时数据信息 + * 删除墒情实时数据信息 * - * @param id 墒情设备实时数据主键 + * @param id 墒情实时数据主键 * @return 结果 */ public int deleteDeviceRealtimedataMoistureById(Long id); diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataWormsService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataWormsService.java index a9c4b8f..b10c809 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataWormsService.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/IDeviceRealtimedataWormsService.java @@ -8,7 +8,7 @@ import org.apache.ibatis.annotations.Mapper; * 虫情设备实时数据Service接口 * * @author kerwincui - * @date 2024-11-07 + * @date 2024-11-14 */ @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..af86bb4 --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMeteorologyServiceImpl.java @@ -0,0 +1,96 @@ +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-14 + */ +@Service +public class DeviceRealtimedataMeteorologyServiceImpl implements IDeviceRealtimedataMeteorologyService +{ + @Autowired + private DeviceRealtimedataMeteorologyMapper deviceRealtimedataMeteorologyMapper; + + /** + * 查询气象设备实时数据 + * + * @param id 气象设备实时数据主键 + * @return 气象设备实时数据 + */ + @Override + public DeviceRealtimedataMeteorology selectDeviceRealtimedataMeteorologyById(Long id) + { + return deviceRealtimedataMeteorologyMapper.selectDeviceRealtimedataMeteorologyById(id); + } + + /** + * 查询气象设备实时数据列表 + * + * @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.insertDeviceRealtimedataMeteorology(deviceRealtimedataMeteorology); + } + + /** + * 修改气象设备实时数据 + * + * @param deviceRealtimedataMeteorology 气象设备实时数据 + * @return 结果 + */ + @Override + public int updateDeviceRealtimedataMeteorology(DeviceRealtimedataMeteorology deviceRealtimedataMeteorology) + { + deviceRealtimedataMeteorology.setUpdateTime(DateUtils.getNowDate()); + return deviceRealtimedataMeteorologyMapper.updateDeviceRealtimedataMeteorology(deviceRealtimedataMeteorology); + } + + /** + * 批量删除气象设备实时数据 + * + * @param ids 需要删除的气象设备实时数据主键 + * @return 结果 + */ + @Override + public int deleteDeviceRealtimedataMeteorologyByIds(Long[] ids) + { + return deviceRealtimedataMeteorologyMapper.deleteDeviceRealtimedataMeteorologyByIds(ids); + } + + /** + * 删除气象设备实时数据信息 + * + * @param id 气象设备实时数据主键 + * @return 结果 + */ + @Override + public int deleteDeviceRealtimedataMeteorologyById(Long id) + { + return deviceRealtimedataMeteorologyMapper.deleteDeviceRealtimedataMeteorologyById(id); + } +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMiaoqingServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMiaoqingServiceImpl.java new file mode 100644 index 0000000..3f62a9e --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMiaoqingServiceImpl.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.DeviceRealtimedataMiaoqingMapper; +import com.fastbee.deviceData.domain.DeviceRealtimedataMiaoqing; +import com.fastbee.deviceData.service.IDeviceRealtimedataMiaoqingService; + +/** + * 苗青设备实时数据Service业务层处理 + * + * @author kerwincui + * @date 2024-11-14 + */ +@Service +public class DeviceRealtimedataMiaoqingServiceImpl implements IDeviceRealtimedataMiaoqingService +{ + @Autowired + private DeviceRealtimedataMiaoqingMapper deviceRealtimedataMiaoqingMapper; + + /** + * 查询苗青设备实时数据 + * + * @param id 苗青设备实时数据主键 + * @return 苗青设备实时数据 + */ + @Override + public DeviceRealtimedataMiaoqing selectDeviceRealtimedataMiaoqingById(Long id) + { + return deviceRealtimedataMiaoqingMapper.selectDeviceRealtimedataMiaoqingById(id); + } + + /** + * 查询苗青设备实时数据列表 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 苗青设备实时数据 + */ + @Override + public List selectDeviceRealtimedataMiaoqingList(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing) + { + return deviceRealtimedataMiaoqingMapper.selectDeviceRealtimedataMiaoqingList(deviceRealtimedataMiaoqing); + } + + /** + * 新增苗青设备实时数据 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 结果 + */ + @Override + public int insertDeviceRealtimedataMiaoqing(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing) + { + deviceRealtimedataMiaoqing.setCreateTime(DateUtils.getNowDate()); + return deviceRealtimedataMiaoqingMapper.insertDeviceRealtimedataMiaoqing(deviceRealtimedataMiaoqing); + } + + /** + * 修改苗青设备实时数据 + * + * @param deviceRealtimedataMiaoqing 苗青设备实时数据 + * @return 结果 + */ + @Override + public int updateDeviceRealtimedataMiaoqing(DeviceRealtimedataMiaoqing deviceRealtimedataMiaoqing) + { + return deviceRealtimedataMiaoqingMapper.updateDeviceRealtimedataMiaoqing(deviceRealtimedataMiaoqing); + } + + /** + * 批量删除苗青设备实时数据 + * + * @param ids 需要删除的苗青设备实时数据主键 + * @return 结果 + */ + @Override + public int deleteDeviceRealtimedataMiaoqingByIds(Long[] ids) + { + return deviceRealtimedataMiaoqingMapper.deleteDeviceRealtimedataMiaoqingByIds(ids); + } + + /** + * 删除苗青设备实时数据信息 + * + * @param id 苗青设备实时数据主键 + * @return 结果 + */ + @Override + public int deleteDeviceRealtimedataMiaoqingById(Long id) + { + return deviceRealtimedataMiaoqingMapper.deleteDeviceRealtimedataMiaoqingById(id); + } +} diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java index f293e9d..9691226 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataMoistureServiceImpl.java @@ -1,7 +1,6 @@ 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.DeviceRealtimedataMoistureMapper; @@ -9,7 +8,7 @@ import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture; import com.fastbee.deviceData.service.IDeviceRealtimedataMoistureService; /** - * 墒情设备实时数据Service业务层处理 + * 墒情实时数据Service业务层处理 * * @author kerwincui * @date 2024-11-14 @@ -21,10 +20,10 @@ public class DeviceRealtimedataMoistureServiceImpl implements IDeviceRealtimedat private DeviceRealtimedataMoistureMapper deviceRealtimedataMoistureMapper; /** - * 查询墒情设备实时数据 + * 查询墒情实时数据 * - * @param id 墒情设备实时数据主键 - * @return 墒情设备实时数据 + * @param id 墒情实时数据主键 + * @return 墒情实时数据 */ @Override public DeviceRealtimedataMoisture selectDeviceRealtimedataMoistureById(Long id) @@ -33,10 +32,10 @@ public class DeviceRealtimedataMoistureServiceImpl implements IDeviceRealtimedat } /** - * 查询墒情设备实时数据列表 + * 查询墒情实时数据列表 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 - * @return 墒情设备实时数据 + * @param deviceRealtimedataMoisture 墒情实时数据 + * @return 墒情实时数据 */ @Override public List selectDeviceRealtimedataMoistureList(DeviceRealtimedataMoisture deviceRealtimedataMoisture) @@ -45,22 +44,21 @@ public class DeviceRealtimedataMoistureServiceImpl implements IDeviceRealtimedat } /** - * 新增墒情设备实时数据 + * 新增墒情实时数据 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 + * @param deviceRealtimedataMoisture 墒情实时数据 * @return 结果 */ @Override public int insertDeviceRealtimedataMoisture(DeviceRealtimedataMoisture deviceRealtimedataMoisture) { - deviceRealtimedataMoisture.setCreateTime(DateUtils.getNowDate()); return deviceRealtimedataMoistureMapper.insertDeviceRealtimedataMoisture(deviceRealtimedataMoisture); } /** - * 修改墒情设备实时数据 + * 修改墒情实时数据 * - * @param deviceRealtimedataMoisture 墒情设备实时数据 + * @param deviceRealtimedataMoisture 墒情实时数据 * @return 结果 */ @Override @@ -70,9 +68,9 @@ public class DeviceRealtimedataMoistureServiceImpl implements IDeviceRealtimedat } /** - * 批量删除墒情设备实时数据 + * 批量删除墒情实时数据 * - * @param ids 需要删除的墒情设备实时数据主键 + * @param ids 需要删除的墒情实时数据主键 * @return 结果 */ @Override @@ -82,9 +80,9 @@ public class DeviceRealtimedataMoistureServiceImpl implements IDeviceRealtimedat } /** - * 删除墒情设备实时数据信息 + * 删除墒情实时数据信息 * - * @param id 墒情设备实时数据主键 + * @param id 墒情实时数据主键 * @return 结果 */ @Override diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimeDataWormsServiceImpl.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataWormsServiceImpl.java similarity index 92% rename from fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimeDataWormsServiceImpl.java rename to fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataWormsServiceImpl.java index 01ceaba..02111f8 100644 --- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimeDataWormsServiceImpl.java +++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/service/impl/DeviceRealtimedataWormsServiceImpl.java @@ -1,29 +1,27 @@ package com.fastbee.deviceData.service.impl; import java.util.List; - -import com.fastbee.deviceData.service.IDeviceRealtimedataWormsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.fastbee.deviceData.mapper.DeviceRealtimedataWormsMapper; import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; - +import com.fastbee.deviceData.service.IDeviceRealtimedataWormsService; /** * 虫情设备实时数据Service业务层处理 * * @author kerwincui - * @date 2024-11-07 + * @date 2024-11-14 */ @Service -public class DeviceRealtimeDataWormsServiceImpl implements IDeviceRealtimedataWormsService +public class DeviceRealtimedataWormsServiceImpl implements IDeviceRealtimedataWormsService { @Autowired private DeviceRealtimedataWormsMapper deviceRealtimedataWormsMapper; /** * 查询虫情设备实时数据 - * + * * @param id 虫情设备实时数据主键 * @return 虫情设备实时数据 */ @@ -54,7 +52,7 @@ public class DeviceRealtimeDataWormsServiceImpl implements IDeviceRealtimedataWo @Override public int insertDeviceRealtimedataWorms(DeviceRealtimedataWorms deviceRealtimedataWorms) { - return deviceRealtimedataWormsMapper.insert(deviceRealtimedataWorms); + return deviceRealtimedataWormsMapper.insertDeviceRealtimedataWorms(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..250e8bb --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMeteorologyMapper.xml @@ -0,0 +1,141 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, device_id, air_temp, air_humi, wind_speed, wind_dir, air_pre, guangzhao, fushe, sum_rain, ins_rain, day_rain, zhengfa, soil_temp, soil_humi, del_flag, create_time, create_by, update_time, update_by from iot_device_realtimedata_meteorology + + + + + + + + insert into iot_device_realtimedata_meteorology + + device_id, + air_temp, + air_humi, + wind_speed, + wind_dir, + air_pre, + guangzhao, + fushe, + sum_rain, + ins_rain, + day_rain, + zhengfa, + soil_temp, + soil_humi, + del_flag, + create_time, + create_by, + update_time, + update_by, + + + #{deviceId}, + #{airTemp}, + #{airHumi}, + #{windSpeed}, + #{windDir}, + #{airPre}, + #{guangzhao}, + #{fushe}, + #{sumRain}, + #{insRain}, + #{dayRain}, + #{zhengfa}, + #{soilTemp}, + #{soilHumi}, + #{delFlag}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + + + + + update iot_device_realtimedata_meteorology + + device_id = #{deviceId}, + air_temp = #{airTemp}, + air_humi = #{airHumi}, + wind_speed = #{windSpeed}, + wind_dir = #{windDir}, + air_pre = #{airPre}, + guangzhao = #{guangzhao}, + fushe = #{fushe}, + sum_rain = #{sumRain}, + ins_rain = #{insRain}, + day_rain = #{dayRain}, + zhengfa = #{zhengfa}, + soil_temp = #{soilTemp}, + soil_humi = #{soilHumi}, + del_flag = #{delFlag}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + + where id = #{id} + + + + delete from iot_device_realtimedata_meteorology where id = #{id} + + + + delete from iot_device_realtimedata_meteorology where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMiaoqingMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMiaoqingMapper.xml new file mode 100644 index 0000000..54a16a8 --- /dev/null +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMiaoqingMapper.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select id, air_temp, mpp_temp, battery_cap, battery_volt, battery_cur, battery_power, load_volt, load_cur, load_power, phot_volt, phot_cur, phot_power, cum_charge_day, cum_charge_mon, cum_charge_year, cum_charge_all, cum_ele_day, cum_ele_mon, cum_ele_year, cum_ele_all, shoudong, control, create_time, real_time from iot_device_realtimedata_miaoQing + + + + + + + + insert into iot_device_realtimedata_miaoQing + + air_temp, + mpp_temp, + battery_cap, + battery_volt, + battery_cur, + battery_power, + load_volt, + load_cur, + load_power, + phot_volt, + phot_cur, + phot_power, + cum_charge_day, + cum_charge_mon, + cum_charge_year, + cum_charge_all, + cum_ele_day, + cum_ele_mon, + cum_ele_year, + cum_ele_all, + shoudong, + control, + create_time, + real_time, + + + #{airTemp}, + #{mppTemp}, + #{batteryCap}, + #{batteryVolt}, + #{batteryCur}, + #{batteryPower}, + #{loadVolt}, + #{loadCur}, + #{loadPower}, + #{photVolt}, + #{photCur}, + #{photPower}, + #{cumChargeDay}, + #{cumChargeMon}, + #{cumChargeYear}, + #{cumChargeAll}, + #{cumEleDay}, + #{cumEleMon}, + #{cumEleYear}, + #{cumEleAll}, + #{shoudong}, + #{control}, + #{createTime}, + #{realTime}, + + + + + update iot_device_realtimedata_miaoQing + + air_temp = #{airTemp}, + mpp_temp = #{mppTemp}, + battery_cap = #{batteryCap}, + battery_volt = #{batteryVolt}, + battery_cur = #{batteryCur}, + battery_power = #{batteryPower}, + load_volt = #{loadVolt}, + load_cur = #{loadCur}, + load_power = #{loadPower}, + phot_volt = #{photVolt}, + phot_cur = #{photCur}, + phot_power = #{photPower}, + cum_charge_day = #{cumChargeDay}, + cum_charge_mon = #{cumChargeMon}, + cum_charge_year = #{cumChargeYear}, + cum_charge_all = #{cumChargeAll}, + cum_ele_day = #{cumEleDay}, + cum_ele_mon = #{cumEleMon}, + cum_ele_year = #{cumEleYear}, + cum_ele_all = #{cumEleAll}, + shoudong = #{shoudong}, + control = #{control}, + create_time = #{createTime}, + real_time = #{realTime}, + + where id = #{id} + + + + delete from iot_device_realtimedata_miaoQing where id = #{id} + + + + delete from iot_device_realtimedata_miaoQing where id in + + #{id} + + + \ No newline at end of file diff --git a/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMoistureMapper.xml b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMoistureMapper.xml index ea95dbf..9e70baf 100644 --- a/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMoistureMapper.xml +++ b/fastbee-service/fastbee-device-service/src/main/resources/mapper.deviceData/DeviceRealtimedataMoistureMapper.xml @@ -6,7 +6,19 @@ - + + + + + + + + + + + + + @@ -29,40 +41,28 @@ - - - - - - - - - - - - - - - - - - - - - - - - - select id, device_id, air_temp, mpp_temp, battery_cap, battery_volt, battery_cur, battery_power, load_volt, load_cur, load_power, phot_volt, phot_cur, phot_power, cum_charge_day, cum_charge_mon, cum_charge_year, cum_charge_all, cum_ele_day, cum_ele_mon, cum_ele_year, cum_ele_all, shoudong, control, air_temp_2, mpp_temp_2, battery_cap_2, battery_volt_2, battery_cur_2, battery_power_2, load_volt_2, load_cur_2, load_power_2, phot_volt_2, phot_cur_2, phot_power_2, cum_charge_day_2, cum_charge_mon_2, cum_charge_year_2, cum_charge_all_2, cum_ele_day_2, cum_ele_year_2, cum_ele_all_2, shoudong_2, control_2, cum_ele_mon_2, create_time, real_time from iot_device_realtimedata_moisture + select id, id_device, soil_temp, soil_humi, soil_ec, soil_ph, soil_temp_1, soil_humi_1, soil_temp_2, soil_humi_2, soil_temp_3, soil_humi_3, soil_temp_4, soil_humi_4, air_temp, mpp_temp, battery_cap, battery_volt, battery_cur, battery_power, load_volt, load_cur, load_power, phot_volt, phot_cur, phot_power, cum_charge_day, cum_charge_mon, cum_charge_year, cum_charge_all, cum_ele_day, cum_ele_mon, cum_ele_year, cum_ele_all, shoudong, control from iot_device_realtimedata_moisture @@ -119,7 +96,19 @@ insert into iot_device_realtimedata_moisture - device_id, + id_device, + soil_temp, + soil_humi, + soil_ec, + soil_ph, + soil_temp_1, + soil_humi_1, + soil_temp_2, + soil_humi_2, + soil_temp_3, + soil_humi_3, + soil_temp_4, + soil_humi_4, air_temp, mpp_temp, battery_cap, @@ -142,33 +131,21 @@ cum_ele_all, shoudong, control, - air_temp_2, - mpp_temp_2, - battery_cap_2, - battery_volt_2, - battery_cur_2, - battery_power_2, - load_volt_2, - load_cur_2, - load_power_2, - phot_volt_2, - phot_cur_2, - phot_power_2, - cum_charge_day_2, - cum_charge_mon_2, - cum_charge_year_2, - cum_charge_all_2, - cum_ele_day_2, - cum_ele_year_2, - cum_ele_all_2, - shoudong_2, - control_2, - cum_ele_mon_2, - create_time, - real_time, - #{deviceId}, + #{idDevice}, + #{soilTemp}, + #{soilHumi}, + #{soilEc}, + #{soilPh}, + #{soilTemp1}, + #{soilHumi1}, + #{soilTemp2}, + #{soilHumi2}, + #{soilTemp3}, + #{soilHumi3}, + #{soilTemp4}, + #{soilHumi4}, #{airTemp}, #{mppTemp}, #{batteryCap}, @@ -191,37 +168,25 @@ #{cumEleAll}, #{shoudong}, #{control}, - #{airTemp2}, - #{mppTemp2}, - #{batteryCap2}, - #{batteryVolt2}, - #{batteryCur2}, - #{batteryPower2}, - #{loadVolt2}, - #{loadCur2}, - #{loadPower2}, - #{photVolt2}, - #{photCur2}, - #{photPower2}, - #{cumChargeDay2}, - #{cumChargeMon2}, - #{cumChargeYear2}, - #{cumChargeAll2}, - #{cumEleDay2}, - #{cumEleYear2}, - #{cumEleAll2}, - #{shoudong2}, - #{control2}, - #{cumEleMon2}, - #{createTime}, - #{realTime}, update iot_device_realtimedata_moisture - device_id = #{deviceId}, + id_device = #{idDevice}, + soil_temp = #{soilTemp}, + soil_humi = #{soilHumi}, + soil_ec = #{soilEc}, + soil_ph = #{soilPh}, + soil_temp_1 = #{soilTemp1}, + soil_humi_1 = #{soilHumi1}, + soil_temp_2 = #{soilTemp2}, + soil_humi_2 = #{soilHumi2}, + soil_temp_3 = #{soilTemp3}, + soil_humi_3 = #{soilHumi3}, + soil_temp_4 = #{soilTemp4}, + soil_humi_4 = #{soilHumi4}, air_temp = #{airTemp}, mpp_temp = #{mppTemp}, battery_cap = #{batteryCap}, @@ -244,30 +209,6 @@ cum_ele_all = #{cumEleAll}, shoudong = #{shoudong}, control = #{control}, - air_temp_2 = #{airTemp2}, - mpp_temp_2 = #{mppTemp2}, - battery_cap_2 = #{batteryCap2}, - battery_volt_2 = #{batteryVolt2}, - battery_cur_2 = #{batteryCur2}, - battery_power_2 = #{batteryPower2}, - load_volt_2 = #{loadVolt2}, - load_cur_2 = #{loadCur2}, - load_power_2 = #{loadPower2}, - phot_volt_2 = #{photVolt2}, - phot_cur_2 = #{photCur2}, - phot_power_2 = #{photPower2}, - cum_charge_day_2 = #{cumChargeDay2}, - cum_charge_mon_2 = #{cumChargeMon2}, - cum_charge_year_2 = #{cumChargeYear2}, - cum_charge_all_2 = #{cumChargeAll2}, - cum_ele_day_2 = #{cumEleDay2}, - cum_ele_year_2 = #{cumEleYear2}, - cum_ele_all_2 = #{cumEleAll2}, - shoudong_2 = #{shoudong2}, - control_2 = #{control2}, - cum_ele_mon_2 = #{cumEleMon2}, - create_time = #{createTime}, - real_time = #{realTime}, where id = #{id} 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 62acaaa..915efb9 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 @@ -9,7 +9,6 @@ import cn.hutool.json.JSONObject; import cn.hutool.json.JSONUtil; import com.fastbee.deviceData.api.renke.constant.RenKeDeviceTypeConstant; import com.fastbee.deviceData.api.renke.service.RenKeAuthorizationService; -import com.fastbee.deviceData.domain.DeviceRealtimedataWorms; import com.fastbee.deviceData.service.impl.DeviceRealtimeDataWormsServiceImpl; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired;