优化充电桩厂家

java110-bean/src/main/java/com/java110/dto/chargeMachine/ChargeMachineDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.chargeMachine;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,66 +16,85 @@ import java.util.Date;
 public class ChargeMachineDto extends PageDto implements Serializable {
 
     private String heartbeatTime;
-private String implBean;
-private String machineId;
-private String machineCode;
-private String energyPrice;
-private String durationPrice;
-private String communityId;
-private String machineName;
+    private String implBean;
+    private String machineId;
+    private String machineCode;
+    private String energyPrice;
+    private String durationPrice;
+    private String communityId;
+    private String machineName;
 
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private String portCount;
+
+    private String factoryName;
+
 
     public String getHeartbeatTime() {
         return heartbeatTime;
     }
-public void setHeartbeatTime(String heartbeatTime) {
+
+    public void setHeartbeatTime(String heartbeatTime) {
         this.heartbeatTime = heartbeatTime;
     }
-public String getImplBean() {
+
+    public String getImplBean() {
         return implBean;
     }
-public void setImplBean(String implBean) {
+
+    public void setImplBean(String implBean) {
         this.implBean = implBean;
     }
-public String getMachineId() {
+
+    public String getMachineId() {
         return machineId;
     }
-public void setMachineId(String machineId) {
+
+    public void setMachineId(String machineId) {
         this.machineId = machineId;
     }
-public String getMachineCode() {
+
+    public String getMachineCode() {
         return machineCode;
     }
-public void setMachineCode(String machineCode) {
+
+    public void setMachineCode(String machineCode) {
         this.machineCode = machineCode;
     }
-public String getEnergyPrice() {
+
+    public String getEnergyPrice() {
         return energyPrice;
     }
-public void setEnergyPrice(String energyPrice) {
+
+    public void setEnergyPrice(String energyPrice) {
         this.energyPrice = energyPrice;
     }
-public String getDurationPrice() {
+
+    public String getDurationPrice() {
         return durationPrice;
     }
-public void setDurationPrice(String durationPrice) {
+
+    public void setDurationPrice(String durationPrice) {
         this.durationPrice = durationPrice;
     }
-public String getCommunityId() {
+
+    public String getCommunityId() {
         return communityId;
     }
-public void setCommunityId(String communityId) {
+
+    public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-public String getMachineName() {
+
+    public String getMachineName() {
         return machineName;
     }
-public void setMachineName(String machineName) {
+
+    public void setMachineName(String machineName) {
         this.machineName = machineName;
     }
 
@@ -94,4 +114,20 @@ public void setMachineName(String machineName) {
     public void setStatusCd(String statusCd) {
         this.statusCd = statusCd;
     }
+
+    public String getPortCount() {
+        return portCount;
+    }
+
+    public void setPortCount(String portCount) {
+        this.portCount = portCount;
+    }
+
+    public String getFactoryName() {
+        return factoryName;
+    }
+
+    public void setFactoryName(String factoryName) {
+        this.factoryName = factoryName;
+    }
 }

java110-db/src/main/resources/mapper/common/ChargeMachineV1ServiceDaoImplMapper.xml

@@ -5,129 +5,132 @@
 <mapper namespace="chargeMachineV1ServiceDaoImpl">
 
 
-
-
-
     <!-- 保存充电桩信息 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
-) values (
-#{heartbeatTime},#{implBean},#{machineId},#{machineCode},#{energyPrice},#{durationPrice},#{communityId},#{machineName}
-)
+        heartbeat_time,impl_bean,machine_id,machine_code,energy_price,duration_price,community_id,machine_name
+        ) values (
+        #{heartbeatTime},#{implBean},#{machineId},#{machineCode},#{energyPrice},#{durationPrice},#{communityId},#{machineName}
+        )
     </insert>
 
 
-
     <!-- 查询充电桩信息 add by wuxw 2018-07-03 -->
     <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.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.machine_name,t.machine_name machineName 
-from charge_machine t 
-where 1 =1 
-<if test="heartbeatTime !=null and heartbeatTime != ''">
-   and t.heartbeat_time= #{heartbeatTime}
-</if> 
-<if test="implBean !=null and implBean != ''">
-   and t.impl_bean= #{implBean}
-</if> 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="machineCode !=null and machineCode != ''">
-   and t.machine_code= #{machineCode}
-</if> 
-<if test="energyPrice !=null and energyPrice != ''">
-   and t.energy_price= #{energyPrice}
-</if> 
-<if test="durationPrice !=null and durationPrice != ''">
-   and t.duration_price= #{durationPrice}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="machineName !=null and machineName != ''">
-   and t.machine_name= #{machineName}
-</if> 
-order by t.create_time desc
-<if test="page != -1 and page != null ">
-   limit #{page}, #{row}
-</if> 
+        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
+        communityId,t.machine_name,t.machine_name machineName,cmf.factory_name factoryName,t.create_time createTime,
+        count(1) portCount
+        from charge_machine t
+        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
+        <if test="heartbeatTime !=null and heartbeatTime != ''">
+            and t.heartbeat_time= #{heartbeatTime}
+        </if>
+        <if test="implBean !=null and implBean != ''">
+            and t.impl_bean= #{implBean}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            and t.machine_code= #{machineCode}
+        </if>
+        <if test="energyPrice !=null and energyPrice != ''">
+            and t.energy_price= #{energyPrice}
+        </if>
+        <if test="durationPrice !=null and durationPrice != ''">
+            and t.duration_price= #{durationPrice}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <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
+        order by t.create_time desc
+        <if test="page != -1 and page != null ">
+            limit #{page}, #{row}
+        </if>
 
     </select>
 
 
-
-
     <!-- 修改充电桩信息 add by wuxw 2018-07-03 -->
     <update id="updateChargeMachineInfo" parameterType="Map">
-        update  charge_machine t set t.status_cd = #{statusCd}
-<if test="newBId != null and newBId != ''">
-,t.b_id = #{newBId}
-</if> 
-<if test="heartbeatTime !=null and heartbeatTime != ''">
-, t.heartbeat_time= #{heartbeatTime}
-</if> 
-<if test="implBean !=null and implBean != ''">
-, t.impl_bean= #{implBean}
-</if> 
-<if test="machineCode !=null and machineCode != ''">
-, t.machine_code= #{machineCode}
-</if> 
-<if test="energyPrice !=null and energyPrice != ''">
-, t.energy_price= #{energyPrice}
-</if> 
-<if test="durationPrice !=null and durationPrice != ''">
-, t.duration_price= #{durationPrice}
-</if> 
-<if test="communityId !=null and communityId != ''">
-, t.community_id= #{communityId}
-</if> 
-<if test="machineName !=null and machineName != ''">
-, t.machine_name= #{machineName}
-</if> 
- where 1=1 <if test="machineId !=null and machineId != ''">
-and t.machine_id= #{machineId}
-</if> 
+        update charge_machine t set t.status_cd = #{statusCd}
+        <if test="newBId != null and newBId != ''">
+            ,t.b_id = #{newBId}
+        </if>
+        <if test="heartbeatTime !=null and heartbeatTime != ''">
+            , t.heartbeat_time= #{heartbeatTime}
+        </if>
+        <if test="implBean !=null and implBean != ''">
+            , t.impl_bean= #{implBean}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            , t.machine_code= #{machineCode}
+        </if>
+        <if test="energyPrice !=null and energyPrice != ''">
+            , t.energy_price= #{energyPrice}
+        </if>
+        <if test="durationPrice !=null and durationPrice != ''">
+            , t.duration_price= #{durationPrice}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            , t.community_id= #{communityId}
+        </if>
+        <if test="machineName !=null and machineName != ''">
+            , t.machine_name= #{machineName}
+        </if>
+        where 1=1
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
 
     </update>
 
     <!-- 查询充电桩数量 add by wuxw 2018-07-03 -->
-     <select id="queryChargeMachinesCount" parameterType="Map" resultType="Map">
-        select  count(1) count 
-from charge_machine t 
-where 1 =1 
-<if test="heartbeatTime !=null and heartbeatTime != ''">
-   and t.heartbeat_time= #{heartbeatTime}
-</if> 
-<if test="implBean !=null and implBean != ''">
-   and t.impl_bean= #{implBean}
-</if> 
-<if test="machineId !=null and machineId != ''">
-   and t.machine_id= #{machineId}
-</if> 
-<if test="machineCode !=null and machineCode != ''">
-   and t.machine_code= #{machineCode}
-</if> 
-<if test="energyPrice !=null and energyPrice != ''">
-   and t.energy_price= #{energyPrice}
-</if> 
-<if test="durationPrice !=null and durationPrice != ''">
-   and t.duration_price= #{durationPrice}
-</if> 
-<if test="statusCd !=null and statusCd != ''">
-   and t.status_cd= #{statusCd}
-</if> 
-<if test="communityId !=null and communityId != ''">
-   and t.community_id= #{communityId}
-</if> 
-<if test="machineName !=null and machineName != ''">
-   and t.machine_name= #{machineName}
-</if> 
+    <select id="queryChargeMachinesCount" parameterType="Map" resultType="Map">
+        select count(1) count
+        from charge_machine t
+        where 1 =1
+        <if test="heartbeatTime !=null and heartbeatTime != ''">
+            and t.heartbeat_time= #{heartbeatTime}
+        </if>
+        <if test="implBean !=null and implBean != ''">
+            and t.impl_bean= #{implBean}
+        </if>
+        <if test="machineId !=null and machineId != ''">
+            and t.machine_id= #{machineId}
+        </if>
+        <if test="machineCode !=null and machineCode != ''">
+            and t.machine_code= #{machineCode}
+        </if>
+        <if test="energyPrice !=null and energyPrice != ''">
+            and t.energy_price= #{energyPrice}
+        </if>
+        <if test="durationPrice !=null and durationPrice != ''">
+            and t.duration_price= #{durationPrice}
+        </if>
+        <if test="statusCd !=null and statusCd != ''">
+            and t.status_cd= #{statusCd}
+        </if>
+        <if test="communityId !=null and communityId != ''">
+            and t.community_id= #{communityId}
+        </if>
+        <if test="machineName !=null and machineName != ''">
+            and t.machine_name= #{machineName}
+        </if>
 
 
-     </select>
+    </select>
 
 </mapper>