功能完善

liuhaonan

2022-02-14 930f0e76c430a3450144aedac9628b3e9af2ed9d

功能完善

 dao/src/main/java/com/sandu/ximon/dao/domain/BroadcastV2TaskTerminal.java

@@ -8,14 +8,12 @@
import lombok.Data;

/**
 * 
 * 音柱任务与设备关联表
 * @TableName broadcast_v2_task_terminal
 */
@TableName(value ="broadcast_v2_task_terminal")
@Data
public class BroadcastV2TaskTerminal implements Serializable {



    /**
     * 

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

@@ -16,10 +16,11 @@
@Mapper
public interface BroadcastV2TaskTerminalMapper extends BaseMapper<BroadcastV2TaskTerminal> {


    boolean deleteByTaskId(Integer taskId);

   // boolean insertTaskTerminal(@Param("list") List<BroadcastV2TaskTerminal> list);
   boolean insertTask(Integer taskId,Integer terminalId);
    // boolean insertTaskTerminal(@Param("list") List<BroadcastV2TaskTerminal> list);
    boolean insertTask(Integer taskId,Integer terminalId);

    List<BroadcastTerminalV2Entity> listAll(@Param("terminalName") String name);

@@ -27,6 +28,7 @@
    void insert(BroadcastTerminalV2Entity b);

    List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(String keyword, Long clientId, int bindingState);

}



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

@@ -5,13 +5,16 @@
<mapper namespace="com.sandu.ximon.dao.mapper.BroadcastV2TaskTerminalMapper">

    <resultMap id="BaseResultMap" type="com.sandu.ximon.dao.domain.BroadcastV2TaskTerminal">
        <result property="taskId" column="task_id" jdbcType="INTEGER"/>
        <result property="terminalId" column="terminal_id" jdbcType="INTEGER"/>
            <result property="taskId" column="task_id" jdbcType="INTEGER"/>
            <result property="terminalId" column="terminal_id" jdbcType="INTEGER"/>
    </resultMap>

    <sql id="Base_Column_List">
        task_id,terminal_id
        id,task_id,terminal_id
    </sql>



    <insert id="insertTask">
        INSERT INTO
            broadcast_v2_task_terminal ( task_id, terminal_id )
@@ -34,13 +37,13 @@

    <delete id="deleteByTaskId" parameterType="java.lang.Integer">
        delete
          from
               broadcast_v2_task_terminal
    <!-- <if test="_parameter !=null" >
          and task_id=#{taskId,jdbcType=INTEGER}
     </if >-->
        from
        broadcast_v2_task_terminal
        <!-- <if test="_parameter !=null" >
              and task_id=#{taskId,jdbcType=INTEGER}
         </if >-->
        where
              task_id=#{taskId}
        task_id=#{taskId}
    </delete>


@@ -81,4 +84,5 @@
            </if>
        </where>
    </select>

</mapper>

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java

@@ -32,6 +32,12 @@
        return ResponseUtil.success(ledProgramService.updateProgram(pid,ledProgramParam));
    }

    @GetMapping("/getbypid/{pid}")
    public ResponseVO<Object> getByPid(@PathVariable Long pid) {
        return ResponseUtil.success(ledProgramService.getByPid(pid));
    }


    @PostMapping("/delete/{pid}")
    public ResponseVO<Object> deleteLEDProgram(@PathVariable Long pid) {
        return ResponseUtil.success(ledProgramService.deleteProgram(pid));

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

@@ -113,7 +113,7 @@
        System.out.println("---------------------------");
        //  向IP音柱服务器添加任务
        Integer taskId = TaskAPIUtils.addTask(missionparam);
       // Integer taskId = 1111;
//        Integer taskId = 1111;

        if (null != taskId && taskId != 0) {
            IpVolumeMission byId = getById(taskId);
@@ -157,8 +157,8 @@
                mission.setMissionVolume(missionparam.getMissionVolume());
                mission.setMissionFileUrl(missionparam.getFiles().toString());
                mission.setNumberInPlay(missionparam.getTerminals().length);
                System.out.println(updateById(mission));
                System.out.println("----------------------------------------------------------");
             /*   System.out.println(updateById(mission));
                System.out.println("----------------------------------------------------------");*/
            }
            broadcastV2TaskFileService.deleteByTaskId(taskId);
            broadcastV2TaskTerminalService.deleteByTaskId(taskId);

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

@@ -12,6 +12,8 @@
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;

import java.util.List;

@Service
@AllArgsConstructor
public class LEDProgramService extends BaseServiceImpl<LEDProgramMapper, LEDProgram> {
@@ -63,6 +65,21 @@

    }

    public LEDProgramParam getByPid(Long id) {
        LEDProgram byId = getById(id);
        if (byId == null) {
            throw new BusinessException("未找到该节目");
        }
        LEDProgramParam param=new LEDProgramParam();
        param.setId(byId.getId());
        param.setHeight(byId.getHeight());
        param.setWidth(byId.getWidth());
        param.setName(byId.getName());
        param.setPreviewUrl(byId.getPreview());
        param.setPages(JSON.parseObject(byId.getPages(), List.class));
        return param;
    }


    public LambdaQueryWrapper<LEDProgram> listProgram() {
        if (SecurityUtils.getClientId() != null) {