fix

zhanzhiqin

2022-04-14 f5645a609fef92b068b5d8fd61535fe78760fba3

fix

 dao/src/main/java/com/sandu/ximon/dao/mapper/LightPoleHeelingEquipmentMapper.java

@@ -1,8 +1,11 @@
package com.sandu.ximon.dao.mapper;

import com.sandu.ximon.dao.bo.LightPoleHeelingEquipmentBo;
import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;

import java.util.List;

/**
 * @Entity com.sandu.ximon.dao.domain.LightPoleHeelingEquipment
@@ -10,6 +13,8 @@
@Mapper
public interface LightPoleHeelingEquipmentMapper extends BaseMapper<LightPoleHeelingEquipment> {

    List<LightPoleHeelingEquipmentBo> LightPoleHeelingEquipmentList(Long userId);

}



 dao/src/main/resources/mapper/LightPoleHeelingEquipmentMapper.xml

@@ -5,12 +5,27 @@
<mapper namespace="com.sandu.ximon.dao.mapper.LightPoleHeelingEquipmentMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.LightPoleHeelingEquipment">
            <id property="id" column="id" jdbcType="BIGINT"/>
            <result property="mac" column="mac" jdbcType="VARCHAR"/>
            <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
        <id property="id" column="id" jdbcType="BIGINT"/>
        <result property="mac" column="mac" jdbcType="VARCHAR"/>
        <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
    </resultMap>

    <sql id="Base_Column_List">
        id,mac,create_time
    </sql>
    <select id="LightPoleHeelingEquipmentList" resultType="com.sandu.ximon.dao.bo.LightPoleHeelingEquipmentBo">
        SELECT
        t1.*, t2.pole_id,
        t3.pole_name
        FROM
        light_pole_heeling_equipment t1
        LEFT JOIN pole_binding t2 ON t1.mac = t2.device_code
        AND t2.device_type = 8
        LEFT JOIN pole t3 ON t3.id = t2.pole_id
        <where>
            <if test="clientId != null">
                AND (t3.user_id = #{userId} OR t3.client_id = #{userId})
            </if>
        </where>
    </select>
</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LightPoleHeelingEquipmentService.java

@@ -2,9 +2,12 @@

import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.LightPoleHeelingEnum;
import com.sandu.ximon.admin.security.SecurityUtils;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.dao.bo.LightPoleHeelingEquipmentBo;
import com.sandu.ximon.dao.domain.LightPoleHeelingEquipment;
import com.sandu.ximon.dao.mapper.LightPoleHeelingEquipmentMapper;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;
@@ -14,7 +17,10 @@
 * @date 2022/4/13 16:52
 */
@Service
@AllArgsConstructor
public class LightPoleHeelingEquipmentService extends BaseServiceImpl<LightPoleHeelingEquipmentMapper, LightPoleHeelingEquipment> {
    private LightPoleHeelingEquipmentMapper lightPoleHeelingEquipmentMapper;

    /**
     * 添加灯杆倾斜到设备表
     *
@@ -33,7 +39,14 @@
     *
     * @return
     */
    public List<LightPoleHeelingEquipment> LightPoleHeelingEquipmentList() {
        return list();
    public List<LightPoleHeelingEquipmentBo> LightPoleHeelingEquipmentList() {
        //为空是超管
        List<LightPoleHeelingEquipmentBo> lightPoleHeelingEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            lightPoleHeelingEquipmentBos = lightPoleHeelingEquipmentMapper.LightPoleHeelingEquipmentList(null);
        } else {
            lightPoleHeelingEquipmentBos = lightPoleHeelingEquipmentMapper.LightPoleHeelingEquipmentList(SecurityUtils.getUserId());
        }
        return lightPoleHeelingEquipmentBos;
    }
}