fix

zhanzhiqin

2022-05-09 e1c8946bb62af329a06d87b09b5abd7a4c617ee8

fix

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

@@ -14,7 +14,7 @@
 */
@Mapper
public interface IPBroadcastMapper extends BaseMapper<BroadcastTerminalV2Entity> {
    List<BroadcastTerminalV2Entity> listAll(@Param("terminalName") String name);
    List<BroadcastTerminalV2Entity> listAll(Long clientId);
//
//    @Insert("insert into broadcast_v2_terminal (id,terminal_name,streetlight_id,exist) values (#{id},#{terminalName},#{streetlightId},#{exist})")
//    int insert(BroadcastTerminalV2Entity b);

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

@@ -19,15 +19,18 @@
    </sql>
    <select id="listAll" resultType="com.sandu.ximon.dao.domain.BroadcastTerminalV2Entity">
        SELECT
        a.*, b.pole_name
        t1.*, t3.pole_name
        FROM
        broadcast_v2_terminal a
        LEFT JOIN pole b ON a.streetlight_id = b.id
        WHERE
        1 = 1
        <if test="terminalName != null and terminalName != ''">
            AND a.terminal_name like '%${terminalName}%'
        </if>
        broadcast_v2_terminal t1
        LEFT JOIN pole_binding t2 ON t1.id = t2.device_code
        AND t2.device_type = 5
        LEFT JOIN pole t3 ON t3.id = t2.pole_id

        <where>
            <if test="clientId != null">
                AND (t3.user_id = #{clientId} OR t3.client_id = #{clientId})
            </if>
        </where>
    </select>

    <select id="getBroadcastTerminalList" resultType="com.sandu.ximon.dao.bo.BroadcastTerminalV2EntityBo">

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

@@ -34,7 +34,14 @@
     * 同步终端
     */
    public void synchTerminal() {
        List<BroadcastTerminalV2Entity> server = broadcastTerminalV2EntityMapper.listAll("");
        List<BroadcastTerminalV2Entity> server;
        //为空是超管
        if (SecurityUtils.getClientId() == null) {
            server = broadcastTerminalV2EntityMapper.listAll(null);
        } else {
            server = broadcastTerminalV2EntityMapper.listAll(SecurityUtils.getUserId());
        }

        List<TerminalVO> list = TerminalAPIUtils.getTerminalList();
        System.out.println(list);
        list.stream().forEach(item -> {