~zhangleilei/supipe.git

			@@ -559,124 +559,136 @@
			<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>
			@@ -684,31 +696,33 @@
			<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
			`time` as `time`,
			I00 as i00,
			I01 as i01,
			I02 as i02,
			I03 as i03,
			I04 as i04,
			I05 as i05,
			I06 as i06,
			I07 as i07,
			I10 as i10,
			I11 as i11,
			Q00 as q00,
			Q01 as q01,
			Q02 as q02,
			Q03 as q03,
			Q04 as q04,
			Q05 as q05,
			VB0 as vb0,
			VB10 as vb10,
			VB11 as vb11,
			VB12 as vb12
			from t_data_smock
			where 1=1
			<if test="strTime!=null and endTime!=null and strTime!='' and endTime!='' ">
			and times between #{strTime} and #{endTime}
			and `time` between #{strTime} and #{endTime}
			</if>
			order by times desc
			order by `time` desc
			</select>
			<select id="dataValuesList" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataValue">
			select
			@@ -738,5 +752,383 @@
			</if>
			order by upload_time desc
			</select>

			<insert id="dataBox" >
			insert into t_data_ai
			<trim prefix="(" suffix=")" suffixOverrides=",">
			<if test="aiId != null">
			ai_id,
			</if>
			<if test="rtspUrl != null">
			rtsp_url,
			</if>
			<if test="boxId != null">
			box_id,
			</if>
			<if test="type != null">
			type,
			</if>
			<if test="typeName != null">
			type_name,
			</if>
			<if test="boxName != null">
			box_name,
			</if>
			<if test="deviceName != null">
			device_name,
			</if>
			<if test="deviceId != null">
			device_id,
			</if>
			<if test="channelNo != null">
			channel_no,
			</if>
			<if test="enterCode != null">
			enter_code,
			</if>
			<if test="enterName != null">
			enter_name,
			</if>
			<if test="signTime != null">
			sign_time,
			</if>
			<if test="x != null">
			x,
			</if>
			<if test="y != null">
			y,
			</if>
			<if test="w != null">
			w,
			</if>
			<if test="h != null">
			h,
			</if>
			<if test="messagerType != null">
			messager_type,
			</if>
			<if test="eBike != null">
			e_bike,
			</if>
			<if test="smoke != null">
			smoke,
			</if>
			<if test="fire != null">
			fire,
			</if>
			<if test="isExist != null">
			is_exist,
			</if>
			<if test="ext != null">
			ext,
			</if>
			<if test="tanker != null">
			tanker,
			</if>
			<if test="sudire != null">
			sudire,
			</if>
			<if test="fireControl != null">
			fire_control,
			</if>
			<if test="cover != null">
			cover,
			</if>
			<if test="licensePlateNumber != null">
			license_plate_number,
			</if>
			<if test="illegalParking != null">
			illegal_parking,
			</if>
			<if test="age != null">
			age,
			</if>
			<if test="gender != null">
			gender,
			</if>
			<if test="glasses != null">
			glasses,
			</if>
			<if test="mask != null">
			mask,
			</if>
			<if test="certifiedAvatarUrl != null">
			certified_avatar_url,
			</if>
			<if test="faceId != null">
			face_id,
			</if>
			<if test="personType != null">
			person_type,
			</if>
			<if test="passStatus != null">
			pass_status,
			</if>
			<if test="faceMaxSorce != null">
			face_max_sorce,
			</if>
			<if test="personName != null">
			person_name,
			</if>
			<if test="trackId != null">
			track_id,
			</if>
			<if test="score != null">
			score,
			</if>
			<if test="count != null">
			count,
			</if>
			<if test="smoking != null">
			smoking,
			</if>
			<if test="isInQuadrangle != null">
			is_in_quadrangle,
			</if>
			<if test="climbFence != null">
			climb_fence,
			</if>
			<if test="safetyHat != null">
			safety_hat,
			</if>
			<if test="reflective != null">
			reflective,
			</if>
			<if test="calling != null">
			calling,
			</if>
			<if test="assemble != null">
			assemble,
			</if>
			<if test="isTooling != null">
			is_tooling,
			</if>
			<if test="tumble != null">
			tumble,
			</if>
			<if test="sleeping != null">
			sleeping,
			</if>
			<if test="humanCountSum != null">
			human_count_sum,
			</if>
			<if test="businessDurationTime != null">
			business_duration_time,
			</if>
			<if test="pinCountSum != null">
			pin_count_sum,
			</if>
			<if test="poutCountSum != null">
			pout_count_sum,
			</if>
			<if test="pinSingle != null">
			pin_single,
			</if>
			<if test="poutSingle != null">
			pout_single,
			</if>
			<if test="signBigAvatar != null">
			sign_big_avatar,
			</if>
			<if test="signAvatar != null">
			sign_avatar,
			</if>
			<if test="videoBase64 != null">
			video_base64,
			</if>
			<if test="humanCoor != null">
			human_coor,
			</if>
			<if test="faceAttrSum != null">
			face_attr_sum,
			</if>
			</trim>
			<trim prefix="values (" suffix=")" suffixOverrides=",">
			<if test="aiId != null">
			#{aiId,jdbcType=INTEGER},
			</if>
			<if test="rtspUrl != null">
			#{rtspUrl,jdbcType=VARCHAR},
			</if>
			<if test="boxId != null">
			#{boxId,jdbcType=INTEGER},
			</if>
			<if test="type != null">
			#{type,jdbcType=INTEGER},
			</if>
			<if test="typeName != null">
			#{typeName,jdbcType=VARCHAR},
			</if>
			<if test="boxName != null">
			#{boxName,jdbcType=VARCHAR},
			</if>
			<if test="deviceName != null">
			#{deviceName,jdbcType=VARCHAR},
			</if>
			<if test="deviceId != null">
			#{deviceId,jdbcType=VARCHAR},
			</if>
			<if test="channelNo != null">
			#{channelNo,jdbcType=VARCHAR},
			</if>
			<if test="enterCode != null">
			#{enterCode,jdbcType=VARCHAR},
			</if>
			<if test="enterName != null">
			#{enterName,jdbcType=VARCHAR},
			</if>
			<if test="signTime != null">
			#{signTime,jdbcType=VARCHAR},
			</if>
			<if test="x != null">
			#{x,jdbcType=INTEGER},
			</if>
			<if test="y != null">
			#{y,jdbcType=INTEGER},
			</if>
			<if test="w != null">
			#{w,jdbcType=INTEGER},
			</if>
			<if test="h != null">
			#{h,jdbcType=INTEGER},
			</if>
			<if test="messagerType != null">
			#{messagerType,jdbcType=VARCHAR},
			</if>
			<if test="eBike != null">
			#{eBike,jdbcType=INTEGER},
			</if>
			<if test="smoke != null">
			#{smoke,jdbcType=INTEGER},
			</if>
			<if test="fire != null">
			#{fire,jdbcType=INTEGER},
			</if>
			<if test="isExist != null">
			#{isExist,jdbcType=INTEGER},
			</if>
			<if test="ext != null">
			#{ext,jdbcType=INTEGER},
			</if>
			<if test="tanker != null">
			#{tanker,jdbcType=INTEGER},
			</if>
			<if test="sudire != null">
			#{sudire,jdbcType=INTEGER},
			</if>
			<if test="fireControl != null">
			#{fireControl,jdbcType=INTEGER},
			</if>
			<if test="cover != null">
			#{cover,jdbcType=INTEGER},
			</if>
			<if test="licensePlateNumber != null">
			#{licensePlateNumber,jdbcType=VARCHAR},
			</if>
			<if test="illegalParking != null">
			#{illegalParking,jdbcType=INTEGER},
			</if>
			<if test="age != null">
			#{age,jdbcType=INTEGER},
			</if>
			<if test="gender != null">
			#{gender,jdbcType=INTEGER},
			</if>
			<if test="glasses != null">
			#{glasses,jdbcType=INTEGER},
			</if>
			<if test="mask != null">
			#{mask,jdbcType=INTEGER},
			</if>
			<if test="certifiedAvatarUrl != null">
			#{certifiedAvatarUrl,jdbcType=VARCHAR},
			</if>
			<if test="faceId != null">
			#{faceId,jdbcType=INTEGER},
			</if>
			<if test="personType != null">
			#{personType,jdbcType=INTEGER},
			</if>
			<if test="passStatus != null">
			#{passStatus,jdbcType=VARCHAR},
			</if>
			<if test="faceMaxSorce != null">
			#{faceMaxSorce,jdbcType=VARCHAR},
			</if>
			<if test="personName != null">
			#{personName,jdbcType=VARCHAR},
			</if>
			<if test="trackId != null">
			#{trackId,jdbcType=INTEGER},
			</if>
			<if test="score != null">
			#{score,jdbcType=VARCHAR},
			</if>
			<if test="count != null">
			#{count,jdbcType=INTEGER},
			</if>
			<if test="smoking != null">
			#{smoking,jdbcType=INTEGER},
			</if>
			<if test="isInQuadrangle != null">
			#{isInQuadrangle,jdbcType=INTEGER},
			</if>
			<if test="climbFence != null">
			#{climbFence,jdbcType=INTEGER},
			</if>
			<if test="safetyHat != null">
			#{safetyHat,jdbcType=INTEGER},
			</if>
			<if test="reflective != null">
			#{reflective,jdbcType=INTEGER},
			</if>
			<if test="calling != null">
			#{calling,jdbcType=INTEGER},
			</if>
			<if test="assemble != null">
			#{assemble,jdbcType=INTEGER},
			</if>
			<if test="isTooling != null">
			#{isTooling,jdbcType=INTEGER},
			</if>
			<if test="tumble != null">
			#{tumble,jdbcType=INTEGER},
			</if>
			<if test="sleeping != null">
			#{sleeping,jdbcType=INTEGER},
			</if>
			<if test="humanCountSum != null">
			#{humanCountSum,jdbcType=INTEGER},
			</if>
			<if test="businessDurationTime != null">
			#{businessDurationTime,jdbcType=VARCHAR},
			</if>
			<if test="pinCountSum != null">
			#{pinCountSum,jdbcType=INTEGER},
			</if>
			<if test="poutCountSum != null">
			#{poutCountSum,jdbcType=INTEGER},
			</if>
			<if test="pinSingle != null">
			#{pinSingle,jdbcType=INTEGER},
			</if>
			<if test="poutSingle != null">
			#{poutSingle,jdbcType=INTEGER},
			</if>
			<if test="signBigAvatar != null">
			#{signBigAvatar,jdbcType=LONGVARCHAR},
			</if>
			<if test="signAvatar != null">
			#{signAvatar,jdbcType=LONGVARCHAR},
			</if>
			<if test="videoBase64 != null">
			#{videoBase64,jdbcType=LONGVARCHAR},
			</if>
			<if test="humanCoor != null">
			#{humanCoor,jdbcType=LONGVARCHAR},
			</if>
			<if test="faceAttrSum != null">
			#{faceAttrSum,jdbcType=LONGVARCHAR},
			</if>
			</trim>
			</insert>
			</mapper>