bug修复

liuhaonan

2022-04-25 12b3967ebefcfc31e8e2eeb4fea6c699f5bd04f4

bug修复

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

@@ -20,6 +20,13 @@
     * @return 路灯列表
     */
    List<LightBo> listLight(Long clientId, String keyword);

    /**
     * 获取用户所拥有的灯杆上的路灯code
     * @param userId
     * @return
     */
    List<String> listCode(/*int start, int end,*/ Long userId);
}



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

@@ -46,4 +46,16 @@
            </if>
        </where>
    </select>
    <select id="listCode" resultType="java.lang.String">
        SELECT
        t1.device_code
        FROM
        light t1
        LEFT JOIN pole t2 USING ( device_code )
        <where>
            <if test="clientId != null">
                AND (t2.user_id = #{clientId} OR t2.client_id = #{clientId})
            </if>
        </where>
    </select>
</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/ReceiveParam.java

@@ -16,10 +16,6 @@

   private String keyWord;

   private Integer lampPostType;

   private Integer lampPostState;

   private Integer bindState;

   private String groupName;

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

@@ -467,4 +467,11 @@
        return lightList;
    }

    /**
     * 获取用户所有的设备码
     */
    public List<String> listDeviceCode(/*int start, int end*/) {
        return baseMapper.listCode(/*start,end,*/SecurityUtils.getClientId());
    }

}