From 134bbe8b44d91e7c6298ce2a63fd5b6fdc8c7a41 Mon Sep 17 00:00:00 2001
From: 张磊磊 <201175954@qq.com>
Date: 星期一, 30 十月 2023 09:33:10 +0800
Subject: [PATCH] 修改接口名字
---
hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml | 192 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 191 insertions(+), 1 deletions(-)
diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
index c8897d0..de77fb4 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
@@ -532,7 +532,7 @@
WHERE
user_id = #{userId}
<if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
- and sm_time between #{strTime} and #{endTime}
+ and DATE(sm_time) between #{strTime} and #{endTime}
</if>
GROUP BY
DATE( sm_time )
@@ -547,6 +547,196 @@
sm_time as smTime
from t_helmet_report where
user_id=#{userId}
+ <if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
+ and sm_time between #{strTime} and #{endTime}
+ </if>
order by sm_time desc
</select>
+
+ <insert id="smockIn" >
+ insert into t_data_smock
+ <trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="smokeId != null">
+ smoke_id,
+ </if>
+ <if test="gatewayCyc != null">
+ gateway_cyc,
+ </if>
+ <if test="fans != null">
+ FanS,
+ </if>
+ <if test="v1run != null">
+ V1Run,
+ </if>
+ <if test="uv1run != null">
+ UV1Run,
+ </if>
+ <if test="fanrun != null">
+ FanRun,
+ </if>
+ <if test="uv2run != null">
+ UV2Run,
+ </if>
+ <if test="ssvrun != null">
+ SSVRun,
+ </if>
+ <if test="dp != null">
+ DP,
+ </if>
+ <if test="t != null">
+ T,
+ </if>
+ <if test="oc != null">
+ OC,
+ </if>
+ <if test="gatew != null">
+ gatew,
+ </if>
+ <if test="nxrun != null">
+ NXRun,
+ </if>
+ <if test="alarm != null">
+ Alarm,
+ </if>
+ <if test="times != null">
+ times,
+ </if>
+ <if test="rtcVolt != null">
+ RTC_VOLT,
+ </if>
+ <if test="v2run != null">
+ V2Run,
+ </if>
+ <if test="dxqvrun != null">
+ DXQVRun,
+ </if>
+ <if test="press != null">
+ Press,
+ </if>
+ <if test="dc != null">
+ Dc,
+ </if>
+ </trim>
+ <trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="smokeId != null">
+ #{smokeId,jdbcType=INTEGER},
+ </if>
+ <if test="gatewayCyc != null">
+ #{gatewayCyc,jdbcType=VARCHAR},
+ </if>
+ <if test="fans != null">
+ #{fans,jdbcType=VARCHAR},
+ </if>
+ <if test="v1run != null">
+ #{v1run,jdbcType=VARCHAR},
+ </if>
+ <if test="uv1run != null">
+ #{uv1run,jdbcType=VARCHAR},
+ </if>
+ <if test="fanrun != null">
+ #{fanrun,jdbcType=VARCHAR},
+ </if>
+ <if test="uv2run != null">
+ #{uv2run,jdbcType=VARCHAR},
+ </if>
+ <if test="ssvrun != null">
+ #{ssvrun,jdbcType=VARCHAR},
+ </if>
+ <if test="dp != null">
+ #{dp,jdbcType=VARCHAR},
+ </if>
+ <if test="t != null">
+ #{t,jdbcType=VARCHAR},
+ </if>
+ <if test="oc != null">
+ #{oc,jdbcType=VARCHAR},
+ </if>
+ <if test="gatew != null">
+ #{gatew,jdbcType=VARCHAR},
+ </if>
+ <if test="nxrun != null">
+ #{nxrun,jdbcType=VARCHAR},
+ </if>
+ <if test="alarm != null">
+ #{alarm,jdbcType=VARCHAR},
+ </if>
+ <if test="times != null">
+ #{times,jdbcType=VARCHAR},
+ </if>
+ <if test="rtcVolt != null">
+ #{rtcVolt,jdbcType=VARCHAR},
+ </if>
+ <if test="v2run != null">
+ #{v2run,jdbcType=VARCHAR},
+ </if>
+ <if test="dxqvrun != null">
+ #{dxqvrun,jdbcType=VARCHAR},
+ </if>
+ <if test="press != null">
+ #{press,jdbcType=VARCHAR},
+ </if>
+ <if test="dc != null">
+ #{dc,jdbcType=VARCHAR},
+ </if>
+ </trim>
+ </insert>
+
+ <select id="dataSmockList" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataSmock">
+ select
+ smoke_id as smokeId,
+ gateway_cyc as gatewayCyc,
+ FanS as fans,
+ V1Run as v1run,
+ UV1Run as uv1run,
+ FanRun as fanrun,
+ UV2Run as uv2run,
+ SSVRun as ssvrun,
+ DP as dp,
+ T as t,
+ OC as oc,
+ gatew as gatew,
+ NXRun as nxrun,
+ Alarm as alarm,
+ times as times,
+ RTC_VOLT as rtcVolt,
+ V2Run as v2run,
+ DXQVRun as dxqvrun,
+ Press as press,
+ Dc as dc
+ from t_data_smock
+ where 1=1
+ <if test="strTime!=null and endTime!=null and strTime!='' and endTime!='' ">
+ and times between #{strTime} and #{endTime}
+ </if>
+ order by times desc
+ </select>
+ <select id="dataValuesList" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataValue">
+ select
+ data_id as dataId,
+ device_id as deviceId,
+ device_name as deviceName,
+ account_number as accountNumber,
+ upload_time as uploadTime,
+ pm25 as pm25,
+ pm10 as pm10,
+ tsp as tsp,
+ temperature as temperature,
+ humidity as humidity,
+ data6 as data6,
+ wind_speed as windSpeed,
+ wind_direction as windDirection,
+ tvoc as tvoc,
+ no2 as no2,
+ co as co,
+ so2 as so2,
+ o3 as o3,
+ noise as noise
+ from t_data_value
+ where 1=1
+ <if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
+ and upload_time between #{strTime} and #{endTime}
+ </if>
+ order by upload_time desc
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3