Lianxun_Java.git

			@@ -8,9 +8,9 @@
			<!-- 保存充电桩信息 add by wuxw 2018-07-03 -->
			<insert id="saveChargeMachineInfo" parameterType="Map">
			insert into charge_machine(
			heartbeat_time,impl_bean,machine_id,machine_code,energy_price,duration_price,community_id,machine_name
			heartbeat_time,impl_bean,machine_id,machine_code,energy_price,rule_id,community_id,machine_name
			) values (
			#{heartbeatTime},#{implBean},#{machineId},#{machineCode},#{energyPrice},#{durationPrice},#{communityId},#{machineName}
			#{heartbeatTime},#{implBean},#{machineId},#{machineCode},#{energyPrice},#{ruleId},#{communityId},#{machineName}
			)
			</insert>

			@@ -19,11 +19,13 @@
			<select id="getChargeMachineInfo" parameterType="Map" resultType="Map">
			select t.heartbeat_time,t.heartbeat_time heartbeatTime,t.impl_bean,t.impl_bean
			implBean,t.machine_id,t.machine_id machineId,t.machine_code,t.machine_code
			machineCode,t.energy_price,t.energy_price energyPrice,t.duration_price,t.duration_price
			durationPrice,t.community_id,t.community_id
			machineCode,t.energy_price,t.energy_price energyPrice,t.rule_id,t.rule_id
			ruleId,t.community_id,t.community_id
			communityId,t.machine_name,t.machine_name machineName,cmf.factory_name factoryName,t.create_time createTime,
			cr.rule_name ruleName,
			count(1) portCount
			from charge_machine t
			left join charge_rule cr on t.rule_id = cr.rule_id and cr.status_cd = '0'
			left join charge_machine_factory cmf on t.impl_bean = cmf.factory_id and cmf.status_cd = '0'
			left join charge_machine_port cmp on t.machine_id = cmp.machine_id and cmp.status_cd = '0'
			where 1 =1
			@@ -42,8 +44,8 @@
			<if test="energyPrice !=null and energyPrice != ''">
			and t.energy_price= #{energyPrice}
			</if>
			<if test="durationPrice !=null and durationPrice != ''">
			and t.duration_price= #{durationPrice}
			<if test="ruleId !=null and ruleId != ''">
			and t.rule_id= #{ruleId}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}
			@@ -54,7 +56,8 @@
			<if test="machineName !=null and machineName != ''">
			and t.machine_name= #{machineName}
			</if>
			group by t.heartbeat_time,t.impl_bean,t.machine_id,t.machine_code,t.energy_price,t.duration_price,t.community_id,t.machine_name,cmf.factory_name ,t.create_time
			group by t.heartbeat_time,t.impl_bean,t.machine_id,t.machine_code,t.energy_price,t.rule_id,t.community_id,t.machine_name,
			cmf.factory_name ,t.create_time,cr.rule_name
			order by t.create_time desc
			<if test="page != -1 and page != null ">
			limit #{page}, #{row}
			@@ -81,8 +84,8 @@
			<if test="energyPrice !=null and energyPrice != ''">
			, t.energy_price= #{energyPrice}
			</if>
			<if test="durationPrice !=null and durationPrice != ''">
			, t.duration_price= #{durationPrice}
			<if test="ruleId !=null and ruleId != ''">
			, t.rule_id= #{ruleId}
			</if>
			<if test="communityId !=null and communityId != ''">
			, t.community_id= #{communityId}
			@@ -117,8 +120,8 @@
			<if test="energyPrice !=null and energyPrice != ''">
			and t.energy_price= #{energyPrice}
			</if>
			<if test="durationPrice !=null and durationPrice != ''">
			and t.duration_price= #{durationPrice}
			<if test="ruleId !=null and ruleId != ''">
			and t.rule_id= #{ruleId}
			</if>
			<if test="statusCd !=null and statusCd != ''">
			and t.status_cd= #{statusCd}