From 36932edefdbd9c48db4b99256c94c28f5f3f8a92 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期三, 18 十月 2023 17:15:49 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml | 131 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 130 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..9690b58 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 )
@@ -549,4 +549,133 @@
user_id=#{userId}
order by sm_time desc
</select>
+
+ <insert id="smockInsert" >
+ 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>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3