~zhangleilei/supipe.git

			@@ -553,132 +553,202 @@
			order by sm_time desc
			</select>

			<insert id="smockInsert" >
			<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 test="time != null">
			time,
			</if>
			<if test="fans != null">
			FanS,
			<if test="i00 != null">
			I00,
			</if>
			<if test="v1run != null">
			V1Run,
			<if test="i01 != null">
			I01,
			</if>
			<if test="uv1run != null">
			UV1Run,
			<if test="i02 != null">
			I02,
			</if>
			<if test="fanrun != null">
			FanRun,
			<if test="i03 != null">
			I03,
			</if>
			<if test="uv2run != null">
			UV2Run,
			<if test="i04 != null">
			I04,
			</if>
			<if test="ssvrun != null">
			SSVRun,
			<if test="i05 != null">
			I05,
			</if>
			<if test="dp != null">
			DP,
			<if test="i06 != null">
			I06,
			</if>
			<if test="t != null">
			T,
			<if test="i07 != null">
			I07,
			</if>
			<if test="oc != null">
			OC,
			<if test="i10 != null">
			I10,
			</if>
			<if test="gatew != null">
			gatew,
			<if test="i11 != null">
			I11,
			</if>
			<if test="nxrun != null">
			NXRun,
			<if test="q00 != null">
			Q00,
			</if>
			<if test="alarm != null">
			Alarm,
			<if test="q01 != null">
			Q01,
			</if>
			<if test="times != null">
			times,
			<if test="q02 != null">
			Q02,
			</if>
			<if test="rtcVolt != null">
			RTC_VOLT,
			<if test="q03 != null">
			Q03,
			</if>
			<if test="v2run != null">
			V2Run,
			<if test="q04 != null">
			Q04,
			</if>
			<if test="dxqvrun != null">
			DXQVRun,
			<if test="q05 != null">
			Q05,
			</if>
			<if test="press != null">
			Press,
			<if test="vb0 != null">
			VB0,
			</if>
			<if test="dc != null">
			Dc,
			<if test="vb10 != null">
			VB10,
			</if>
			<if test="vb11 != null">
			VB11,
			</if>
			<if test="vb12 != null">
			VB12,
			</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="smokeId != null">
			#{smokeId,jdbcType=INTEGER},
			</if>
			<if test="gatewayCyc != null">
			#{gatewayCyc,jdbcType=VARCHAR},
			<if test="time != null">
			#{time,jdbcType=VARCHAR},
			</if>
			<if test="fans != null">
			#{fans,jdbcType=VARCHAR},
			<if test="i00 != null">
			#{i00,jdbcType=VARCHAR},
			</if>
			<if test="v1run != null">
			#{v1run,jdbcType=VARCHAR},
			<if test="i01 != null">
			#{i01,jdbcType=VARCHAR},
			</if>
			<if test="uv1run != null">
			#{uv1run,jdbcType=VARCHAR},
			<if test="i02 != null">
			#{i02,jdbcType=VARCHAR},
			</if>
			<if test="fanrun != null">
			#{fanrun,jdbcType=VARCHAR},
			<if test="i03 != null">
			#{i03,jdbcType=VARCHAR},
			</if>
			<if test="uv2run != null">
			#{uv2run,jdbcType=VARCHAR},
			<if test="i04 != null">
			#{i04,jdbcType=VARCHAR},
			</if>
			<if test="ssvrun != null">
			#{ssvrun,jdbcType=VARCHAR},
			<if test="i05 != null">
			#{i05,jdbcType=VARCHAR},
			</if>
			<if test="dp != null">
			#{dp,jdbcType=VARCHAR},
			<if test="i06 != null">
			#{i06,jdbcType=VARCHAR},
			</if>
			<if test="t != null">
			#{t,jdbcType=VARCHAR},
			<if test="i07 != null">
			#{i07,jdbcType=VARCHAR},
			</if>
			<if test="oc != null">
			#{oc,jdbcType=VARCHAR},
			<if test="i10 != null">
			#{i10,jdbcType=VARCHAR},
			</if>
			<if test="gatew != null">
			#{gatew,jdbcType=VARCHAR},
			<if test="i11 != null">
			#{i11,jdbcType=VARCHAR},
			</if>
			<if test="nxrun != null">
			#{nxrun,jdbcType=VARCHAR},
			<if test="q00 != null">
			#{q00,jdbcType=VARCHAR},
			</if>
			<if test="alarm != null">
			#{alarm,jdbcType=VARCHAR},
			<if test="q01 != null">
			#{q01,jdbcType=VARCHAR},
			</if>
			<if test="times != null">
			#{times,jdbcType=VARCHAR},
			<if test="q02 != null">
			#{q02,jdbcType=VARCHAR},
			</if>
			<if test="rtcVolt != null">
			#{rtcVolt,jdbcType=VARCHAR},
			<if test="q03 != null">
			#{q03,jdbcType=VARCHAR},
			</if>
			<if test="v2run != null">
			#{v2run,jdbcType=VARCHAR},
			<if test="q04 != null">
			#{q04,jdbcType=VARCHAR},
			</if>
			<if test="dxqvrun != null">
			#{dxqvrun,jdbcType=VARCHAR},
			<if test="q05 != null">
			#{q05,jdbcType=VARCHAR},
			</if>
			<if test="press != null">
			#{press,jdbcType=VARCHAR},
			<if test="vb0 != null">
			#{vb0,jdbcType=VARCHAR},
			</if>
			<if test="dc != null">
			#{dc,jdbcType=VARCHAR},
			<if test="vb10 != null">
			#{vb10,jdbcType=VARCHAR},
			</if>
			<if test="vb11 != null">
			#{vb11,jdbcType=VARCHAR},
			</if>
			<if test="vb12 != null">
			#{vb12,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>