java110
2021-09-04 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8
java110-db/src/main/resources/mapper/common/MachineServiceDaoImplMapper.xml
old mode 100644 new mode 100755
@@ -8,11 +8,11 @@
    <insert id="saveBusinessMachineInfo" parameterType="Map">
        insert into business_machine(
        machine_mac,machine_id,machine_code,auth_code,operate,machine_version,community_id,b_id,
        machine_name,machine_type_cd,machine_ip,location_type_cd,location_obj_id,state,direction
        machine_name,machine_type_cd,machine_ip,location_type_cd,location_obj_id,state,direction,heartbeat_time
        ) values (
        #{machineMac},#{machineId},#{machineCode},#{authCode},#{operate},#{machineVersion},
        #{communityId},#{bId},#{machineName},#{machineTypeCd},#{machineIp},
        #{locationTypeCd},#{locationObjId},#{state},#{direction}
        #{locationTypeCd},#{locationObjId},#{state},#{direction},#{heartbeatTime}
        )
    </insert>
@@ -24,7 +24,7 @@
        machineVersion,t.community_id,t.community_id communityId,t.b_id,t.b_id bId,t.machine_name,t.machine_name
        machineName,t.machine_type_cd,t.machine_type_cd machineTypeCd,t.machine_ip,t.machine_ip machineIp,
        t.location_type_cd,t.location_obj_id,t.state,t.location_type_cd,t.location_obj_id,t.location_type_cd
        locationTypeCd,t.location_obj_id locationObjId,t.direction
        locationTypeCd,t.location_obj_id locationObjId,t.direction,t.heartbeat_time,t.heartbeat_time heartbeatTime
        from business_machine t
        where 1 =1
        <if test="machineMac !=null and machineMac != ''">
@@ -83,11 +83,11 @@
        insert into machine(
        machine_mac,machine_id,machine_code,auth_code,machine_version,status_cd,
        community_id,b_id,machine_name,machine_type_cd,machine_ip,
        location_type_cd,location_obj_id,state,direction
        location_type_cd,location_obj_id,state,direction,heartbeat_time
        ) select
        t.machine_mac,t.machine_id,t.machine_code,t.auth_code,t.machine_version,'0',t.community_id,t.b_id,
        t.machine_name,t.machine_type_cd,t.machine_ip,
        t.location_type_cd,t.location_obj_id,t.state,t.direction
        t.location_type_cd,t.location_obj_id,t.state,t.direction,t.heartbeat_time
        from business_machine t where 1=1
        <if test="machineMac !=null and machineMac != ''">
            and t.machine_mac= #{machineMac}
@@ -144,21 +144,15 @@
        machineVersion,t.status_cd,t.status_cd statusCd,t.community_id,t.community_id communityId,t.b_id,t.b_id
        bId,t.machine_name,t.machine_name machineName,t.machine_type_cd,t.machine_type_cd
        machineTypeCd,t.machine_ip,t.machine_ip machineIp,td.name machineTypeCdName,
        t.state,c.location_type locationTypeCd, c.location_name locationTypeName, t.location_obj_id locationObjId,
        t.location_type_cd,t.location_obj_id,
        t.state,c.location_id locationTypeCd, c.location_name locationTypeName, t.location_obj_id locationObjId,
        t.location_type_cd,t.location_obj_id,t.heartbeat_time,t.heartbeat_time heartbeatTime,
        td1.name stateName,t.create_time createTime,t.direction,td3.name directionName
        from machine t,t_dict td,t_dict td1,t_dict td3, community_location c
        from machine t
        left join t_dict td on t.machine_type_cd=td.status_cd and td.table_name='machine' and td.table_columns='machine_type_cd'
        left join t_dict td1 on t.state = td1.status_cd and td1.table_name='machine' and td1.table_columns='state'
        left join t_dict td3 on t.direction = td3.status_cd and td3.table_name='machine' and td3.table_columns='direction'
        left join community_location c on t.location_type_cd = c.location_id and t.status_cd = '0'
        where 1 =1
        and t.machine_type_cd=td.status_cd
        and td.table_name='machine'
        and td.table_columns='machine_type_cd'
        and t.state = td1.status_cd
        and td1.table_name='machine'
        and td1.table_columns='state'
        and t.direction = td3.status_cd
        and td3.table_name='machine'
        and td3.table_columns='direction'
        and t.location_type_cd = c.location_id
        <if test="machineMac !=null and machineMac != ''">
            and t.machine_mac= #{machineMac}
        </if>
@@ -260,6 +254,9 @@
        <if test="direction !=null and direction != ''">
            , t.direction = #{direction}
        </if>
        <if test="heartbeatTime !=null ">
            , t.heartbeat_time = #{heartbeatTime}
        </if>
        where 1=1
        <if test="machineId !=null and machineId != ''">
            and t.machine_id= #{machineId}
@@ -273,17 +270,12 @@
    <!-- 查询设备数量 add by wuxw 2018-07-03 -->
    <select id="queryMachinesCount" parameterType="Map" resultType="Map">
        select count(1) count
        from machine t,t_dict td,t_dict td1,t_dict td3
        from machine t
        left join t_dict td on t.machine_type_cd=td.status_cd and td.table_name='machine' and td.table_columns='machine_type_cd'
        left join t_dict td1 on t.state = td1.status_cd and td1.table_name='machine' and td1.table_columns='state'
        left join t_dict td3 on t.direction = td3.status_cd and td3.table_name='machine' and td3.table_columns='direction'
        left join community_location c on t.location_type_cd = c.location_id and t.status_cd = '0'
        where 1 =1
        and t.machine_type_cd=td.status_cd
        and td.table_name='machine'
        and td.table_columns='machine_type_cd'
        and t.state = td1.status_cd
        and td1.table_name='machine'
        and td1.table_columns='state'
        and t.direction = td3.status_cd
        and td3.table_name='machine'
        and td3.table_columns='direction'
        <if test="machineMac !=null and machineMac != ''">
            and t.machine_mac= #{machineMac}
        </if>