From 930f0e76c430a3450144aedac9628b3e9af2ed9d Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期一, 14 二月 2022 09:48:00 +0800
Subject: [PATCH] 功能完善
---
ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java | 17 ++++++++
dao/src/main/java/com/sandu/ximon/dao/domain/BroadcastV2TaskTerminal.java | 4 -
dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml | 22 ++++++----
ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java | 6 +++
ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java | 6 +-
dao/src/main/java/com/sandu/ximon/dao/mapper/BroadcastV2TaskTerminalMapper.java | 6 ++-
6 files changed, 44 insertions(+), 17 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/BroadcastV2TaskTerminal.java b/dao/src/main/java/com/sandu/ximon/dao/domain/BroadcastV2TaskTerminal.java
index 5496341..9f29c99 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/BroadcastV2TaskTerminal.java
+++ b/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 {
-
-
/**
*
diff --git a/dao/src/main/java/com/sandu/ximon/dao/mapper/BroadcastV2TaskTerminalMapper.java b/dao/src/main/java/com/sandu/ximon/dao/mapper/BroadcastV2TaskTerminalMapper.java
index 35bb340..d68a631 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/mapper/BroadcastV2TaskTerminalMapper.java
+++ b/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);
+
}
diff --git a/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml b/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
index 624579f..9444fcd 100644
--- a/dao/src/main/resources/mapper/BroadcastV2TaskTerminalMapper.xml
+++ b/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>
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
index eba60c3..1b94ea3 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/controller/LEDProgramController.java
+++ b/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));
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
index 299dc9c..eed0810 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/IpVolumeMissionService.java
@@ -113,7 +113,7 @@
System.out.println("---------------------------");
// 鍚慖P闊虫煴鏈嶅姟鍣ㄦ坊鍔犱换鍔�
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);
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
index 028fdfa..a03e5d8 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/service/LEDProgramService.java
+++ b/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) {
--
Gitblit v1.9.3