张晓波
2023-12-11 7d3a240b958fa1c834049a45131999f39071bfc9
广播区域详情
已修改7个文件
30 ■■■■ 文件已修改
hd/pipe/filectrl/src/main/resources/fastdfs.properties 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/controller/AudioController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/entity/AudioFile.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/service/AudioService.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/service/impl/AudioServiceImpl.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/mapper/BigScreenMapper.java 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
hd/pipe/filectrl/src/main/resources/fastdfs.properties
@@ -14,5 +14,5 @@
fastdfs.connection_pool.max_count_per_entry = 500
fastdfs.connection_pool.max_idle_time = 3600
fastdfs.connection_pool.max_wait_time_in_ms = 1000
#fastdfs.tracker_servers=60.205.226.79:22122
fastdfs.tracker_servers=192.168.0.248:22122
fastdfs.tracker_servers=60.205.226.79:22122
#fastdfs.tracker_servers=192.168.0.248:22122
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/controller/AudioController.java
@@ -20,8 +20,8 @@
    private AudioService audioService;
    @RequestMapping("groups")
    public BasicResult groups(){
        List<AudioGroup> groupList = audioService.queryGroups();
    public BasicResult groups(@RequestBody AudioDto audioDto){
        List<AudioGroup> groupList = audioService.queryGroups(audioDto);
        return BasicResult.success(groupList);
    }
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/entity/AudioFile.java
@@ -16,4 +16,6 @@
    private String audioFile;
    private Integer defaults;
    private String name;
}
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/service/AudioService.java
@@ -8,7 +8,7 @@
public interface AudioService {
    List<AudioGroup> queryGroups();
    List<AudioGroup> queryGroups(AudioDto audioDto);
    void playMusic(AudioDto audioDto);
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/audio/service/impl/AudioServiceImpl.java
@@ -20,8 +20,8 @@
    private BigScreenMapper screenMapper;
    @Override
    public List<AudioGroup> queryGroups() {
        return screenMapper.queryGroups();
    public List<AudioGroup> queryGroups(AudioDto audioDto) {
        return screenMapper.queryGroups(audioDto);
    }
    @Override
hd/pipe/screen/src/main/java/com/thhy/screen/modules/biz/bigscreen/mapper/BigScreenMapper.java
@@ -1,5 +1,6 @@
package com.thhy.screen.modules.biz.bigscreen.mapper;
import com.thhy.screen.modules.biz.audio.entity.AudioDto;
import com.thhy.screen.modules.biz.audio.entity.AudioFile;
import com.thhy.screen.modules.biz.audio.entity.AudioGroup;
import com.thhy.screen.modules.biz.audio.entity.GroupInfoVo;
@@ -35,7 +36,7 @@
    void insertAudioGroup(AudioGroup audioGroup);
    List<AudioGroup> queryGroups();
    List<AudioGroup> queryGroups(AudioDto audioDto);
    List<HashMap<String,Object>> querySteelMake();
hd/pipe/screen/src/main/resources/mapping/BigScreenMapper.xml
@@ -235,6 +235,11 @@
    <select id="queryGroups" resultType="com.thhy.screen.modules.biz.audio.entity.AudioGroup">
        select id,group_id as groupId,group_name as groupName from t_audio_group
        <where>
            <if test="groupId != null and groupId !=''">
                id = #{groupId}
            </if>
        </where>
    </select>
    <!--钢筋总消耗,周消耗,月消耗-->
@@ -278,6 +283,9 @@
            <if test="id !=null and id !=''">
                id,
            </if>
            <if test="name !=null and name !=''">
                name,
            </if>
            <if test="groupId !=null and groupId !=''">
                group_id,
            </if>
@@ -292,6 +300,9 @@
            <if test="id !=null and id !=''">
                #{id},
            </if>
            <if test="name !=null and name !=''">
                #{name},
            </if>
            <if test="groupId !=null and groupId !=''">
                #{groupId},
            </if>