From 1d917357cb69bc66ac9e7ac9353db7b9ab3076c5 Mon Sep 17 00:00:00 2001
From: mi9688 <dqwzam0@163.com>
Date: Thu, 14 Nov 2024 17:23:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=92=E6=83=85=E5=AE=9E=E6=97=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=B0=81=E8=A3=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/DevLinkMoistureDataService.java   |  4 +++
 .../domain/DeviceRealtimedataMeteorology.java | 12 ++++++++
 .../domain/DeviceRealtimedataMoisture.java    | 17 +++++++++--
 .../DeviceRealtimedataMeteorologyMapper.xml   | 30 ++++++++-----------
 .../DeviceRealtimedataMoistureMapper.xml      | 22 ++++++++++----
 5 files changed, 58 insertions(+), 27 deletions(-)

diff --git a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureDataService.java b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureDataService.java
index 8210cbc..bdd9480 100644
--- a/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureDataService.java
+++ b/fastbee-service/fastbee-device-service/src/main/java/com/fastbee/deviceData/api/devlink/service/DevLinkMoistureDataService.java
@@ -1,5 +1,6 @@
 package com.fastbee.deviceData.api.devlink.service;
 
+import com.fastbee.common.utils.DateUtils;
 import com.fastbee.deviceData.domain.DeviceRealtimedataMeteorology;
 import com.fastbee.deviceData.domain.DeviceRealtimedataMoisture;
 import com.fastbee.deviceData.mapper.DeviceRealtimedataMeteorologyMapper;
@@ -22,6 +23,7 @@ public class DevLinkMoistureDataService extends DevLinkRealTimeDataService{
     //封装数据
     public DeviceRealtimedataMoisture setData(Map<String, String> propertiesMap){
         DeviceRealtimedataMoisture build = DeviceRealtimedataMoisture.builder()
+                .deviceId(propertiesMap.get("deviceId"))
                 .soilTemp(toBigDecimalValue(propertiesMap.get("soilTemp")))
                 .soilHumi(toBigDecimalValue(propertiesMap.get("soilHumi")))
                 .soilEc(toBigDecimalValue(propertiesMap.get("soilEc")))
@@ -56,6 +58,8 @@ public class DevLinkMoistureDataService extends DevLinkRealTimeDataService{
                 .cumEleAll(toBigDecimalValue(propertiesMap.get("cum_ele_all")))
                 .shoudong(toLongValue(propertiesMap.get("shoudong")))
                 .control(toLongValue(propertiesMap.get("control")))
+                //TODO set实时时间
+                .saveTime(DateUtils.getNowDate())
                 .build();
         System.err.println(build);
         return build;
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
index 047ea43..e46926b 100644
--- 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
@@ -1,6 +1,7 @@
 package com.fastbee.deviceData.domain;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import io.swagger.annotations.ApiModel;
@@ -105,4 +106,15 @@ private static final long serialVersionUID = 1L;
     /** 删除标志（0代表存在，2代表删除） */
     private Integer delFlag;
 
+    /** 保存时间 */
+
+    @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("保存时间")
+    private Date saveTime;
+
+    /** 数据实时时间 */
+    @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 695ab4f..e05979d 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
@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
+import java.util.Date;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.fastbee.common.annotation.Excel;
@@ -29,9 +30,9 @@ private static final long serialVersionUID = 1L;
     private Long id;
 
     /** 设备id */
-            @Excel(name = "设备id")
-            @ApiModelProperty("设备id")
-    private Long idDevice;
+    @Excel(name = "设备id")
+    @ApiModelProperty("设备id")
+    private String deviceId;
 
     /** 土壤温度 */
             @Excel(name = "土壤温度")
@@ -203,4 +204,14 @@ private static final long serialVersionUID = 1L;
             @ApiModelProperty("远程通断电")
     private Long control;
 
+    /** 保存时间 */
+    @Excel(name = "保存时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("保存时间")
+    private Date saveTime;
+
+    /** 实时时间 */
+    @Excel(name = "实时时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty("实时时间")
+    private Date realTime;
+
 }
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
index 250e8bb..36637c8 100644
--- 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
@@ -21,20 +21,18 @@
         <result property="soilTemp"    column="soil_temp"    />
         <result property="soilHumi"    column="soil_humi"    />
         <result property="delFlag"    column="del_flag"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
+        <result property="saveTime"    column="save_time"    />
+        <result property="realTime"    column="real_time"    />
     </resultMap>
 
     <sql id="selectDeviceRealtimedataMeteorologyVo">
-        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
+        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, save_time, real_time from iot_device_realtimedata_meteorology
     </sql>
 
     <select id="selectDeviceRealtimedataMeteorologyList" parameterType="DeviceRealtimedataMeteorology" resultMap="DeviceRealtimedataMeteorologyResult">
         <include refid="selectDeviceRealtimedataMeteorologyVo"/>
         <where>
-            <if test="deviceId != null "> and device_id = #{deviceId}</if>
+            <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
             <if test="airTemp != null "> and air_temp = #{airTemp}</if>
             <if test="airHumi != null "> and air_humi = #{airHumi}</if>
             <if test="windSpeed != null "> and wind_speed = #{windSpeed}</if>
@@ -48,6 +46,8 @@
             <if test="zhengfa != null "> and zhengfa = #{zhengfa}</if>
             <if test="soilTemp != null "> and soil_temp = #{soilTemp}</if>
             <if test="soilHumi != null "> and soil_humi = #{soilHumi}</if>
+            <if test="saveTime != null "> and save_time = #{saveTime}</if>
+            <if test="realTime != null "> and real_time = #{realTime}</if>
         </where>
     </select>
 
@@ -74,10 +74,8 @@
             <if test="soilTemp != null">soil_temp,</if>
             <if test="soilHumi != null">soil_humi,</if>
             <if test="delFlag != null">del_flag,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="updateBy != null">update_by,</if>
+            <if test="saveTime != null">save_time,</if>
+            <if test="realTime != null">real_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="deviceId != null">#{deviceId},</if>
@@ -95,10 +93,8 @@
             <if test="soilTemp != null">#{soilTemp},</if>
             <if test="soilHumi != null">#{soilHumi},</if>
             <if test="delFlag != null">#{delFlag},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
+            <if test="saveTime != null">#{saveTime},</if>
+            <if test="realTime != null">#{realTime},</if>
         </trim>
     </insert>
 
@@ -120,10 +116,8 @@
             <if test="soilTemp != null">soil_temp = #{soilTemp},</if>
             <if test="soilHumi != null">soil_humi = #{soilHumi},</if>
             <if test="delFlag != null">del_flag = #{delFlag},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="saveTime != null">save_time = #{saveTime},</if>
+            <if test="realTime != null">real_time = #{realTime},</if>
         </trim>
         where id = #{id}
     </update>
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 9e70baf..7c2a378 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,7 @@
 
     <resultMap type="DeviceRealtimedataMoisture" id="DeviceRealtimedataMoistureResult">
         <result property="id"    column="id"    />
-        <result property="idDevice"    column="id_device"    />
+        <result property="deviceId"    column="device_id"    />
         <result property="soilTemp"    column="soil_temp"    />
         <result property="soilHumi"    column="soil_humi"    />
         <result property="soilEc"    column="soil_ec"    />
@@ -41,16 +41,18 @@
         <result property="cumEleAll"    column="cum_ele_all"    />
         <result property="shoudong"    column="shoudong"    />
         <result property="control"    column="control"    />
+        <result property="saveTime"    column="save_time"    />
+        <result property="realTime"    column="real_time"    />
     </resultMap>
 
     <sql id="selectDeviceRealtimedataMoistureVo">
-        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
+        select id, device_id, 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, save_time, real_time from iot_device_realtimedata_moisture
     </sql>
 
     <select id="selectDeviceRealtimedataMoistureList" parameterType="DeviceRealtimedataMoisture" resultMap="DeviceRealtimedataMoistureResult">
         <include refid="selectDeviceRealtimedataMoistureVo"/>
         <where>
-            <if test="idDevice != null "> and id_device = #{idDevice}</if>
+            <if test="deviceId != null  and deviceId != ''"> and device_id = #{deviceId}</if>
             <if test="soilTemp != null "> and soil_temp = #{soilTemp}</if>
             <if test="soilHumi != null "> and soil_humi = #{soilHumi}</if>
             <if test="soilEc != null "> and soil_ec = #{soilEc}</if>
@@ -85,6 +87,8 @@
             <if test="cumEleAll != null "> and cum_ele_all = #{cumEleAll}</if>
             <if test="shoudong != null "> and shoudong = #{shoudong}</if>
             <if test="control != null "> and control = #{control}</if>
+            <if test="saveTime != null "> and save_time = #{saveTime}</if>
+            <if test="realTime != null "> and real_time = #{realTime}</if>
         </where>
     </select>
 
@@ -96,7 +100,7 @@
     <insert id="insertDeviceRealtimedataMoisture" parameterType="DeviceRealtimedataMoisture" useGeneratedKeys="true" keyProperty="id">
         insert into iot_device_realtimedata_moisture
         <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="idDevice != null">id_device,</if>
+            <if test="deviceId != null">device_id,</if>
             <if test="soilTemp != null">soil_temp,</if>
             <if test="soilHumi != null">soil_humi,</if>
             <if test="soilEc != null">soil_ec,</if>
@@ -131,9 +135,11 @@
             <if test="cumEleAll != null">cum_ele_all,</if>
             <if test="shoudong != null">shoudong,</if>
             <if test="control != null">control,</if>
+            <if test="saveTime != null">save_time,</if>
+            <if test="realTime != null">real_time,</if>
         </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="idDevice != null">#{idDevice},</if>
+            <if test="deviceId != null">#{deviceId},</if>
             <if test="soilTemp != null">#{soilTemp},</if>
             <if test="soilHumi != null">#{soilHumi},</if>
             <if test="soilEc != null">#{soilEc},</if>
@@ -168,13 +174,15 @@
             <if test="cumEleAll != null">#{cumEleAll},</if>
             <if test="shoudong != null">#{shoudong},</if>
             <if test="control != null">#{control},</if>
+            <if test="saveTime != null">#{saveTime},</if>
+            <if test="realTime != null">#{realTime},</if>
         </trim>
     </insert>
 
     <update id="updateDeviceRealtimedataMoisture" parameterType="DeviceRealtimedataMoisture">
         update iot_device_realtimedata_moisture
         <trim prefix="SET" suffixOverrides=",">
-            <if test="idDevice != null">id_device = #{idDevice},</if>
+            <if test="deviceId != null">device_id = #{deviceId},</if>
             <if test="soilTemp != null">soil_temp = #{soilTemp},</if>
             <if test="soilHumi != null">soil_humi = #{soilHumi},</if>
             <if test="soilEc != null">soil_ec = #{soilEc},</if>
@@ -209,6 +217,8 @@
             <if test="cumEleAll != null">cum_ele_all = #{cumEleAll},</if>
             <if test="shoudong != null">shoudong = #{shoudong},</if>
             <if test="control != null">control = #{control},</if>
+            <if test="saveTime != null">save_time = #{saveTime},</if>
+            <if test="realTime != null">real_time = #{realTime},</if>
         </trim>
         where id = #{id}
     </update>