From ec63fb17c5ba3e5b2a5a4106c25b4e249a2f980f Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期二, 22 十一月 2022 18:44:51 +0800
Subject: [PATCH] changes
---
ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java
index 9e6b69c..d8b0bb6 100644
--- a/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java
+++ b/ximon-admin/src/main/java/com/sandu/ximon/admin/vo/TaskVO.java
@@ -1,11 +1,13 @@
package com.sandu.ximon.admin.vo;
+import com.fasterxml.jackson.annotation.JsonIgnore;
import com.sandu.ximon.admin.dto.BroadcastTaskType;
-import com.sandu.ximon.admin.param.IPTaskParam;
import com.sandu.ximon.admin.param.IpVolumeMissionParam;
import lombok.Data;
import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.List;
@Data
public class TaskVO {
@@ -27,13 +29,17 @@
taskVO.setMode(0); // 浠诲姟骞挎挱鏂瑰紡锛堝崟鎾负 0锛岀粍鎾负 1锛�
taskVO.setDur(systemReservation); // 绯荤粺淇濈暀
taskVO.setPower(1); // 棰勫紑鍔熸斁鏃堕棿锛堢锛�
- taskVO.setPn(99); // 鎸囧畾鎾斁娆℃暟锛堥粯璁や负 1 娆★級
+ taskVO.setPn(9999); // 鎸囧畾鎾斁娆℃暟锛堥粯璁や负 1 娆★級
taskVO.setLv(10); // 浠诲姟浼樺厛绾у埆(11-100)锛屾暟鍊艰秺灏忥紝浼樺厛绾у埆 瓒� 澶с��
taskVO.setBtime(systemReservation); // 绯荤粺淇濈暀
- taskVO.setRule(1); // 浠诲姟鎵ц瑙勫垯锛堟瘡澶╀负 0锛屾瘡鍛ㄤ负 1锛屾墜鍔ㄤ负 2)
+ if (param.getRule() == null) {
+ taskVO.setRule(1);
+ } else {
+ taskVO.setRule(param.getRule()); // 浠诲姟鎵ц瑙勫垯锛堟瘡澶╀负 0锛屾瘡鍛ㄤ负 1锛屾墜鍔ㄤ负 2)
+ }
taskVO.setBdate(param.getOnDate()); // 浠诲姟寮�濮嬫棩鏈燂紝涓�鑸负浠诲姟鍒涘缓鏃ユ湡
taskVO.setEdate(param.getOffDate()); // 浠诲姟缁撴潫鏃ユ湡锛屼竴鐩存湁鏁堜负-1
- taskVO.setWeek(0); // 姣忓懆鎵ц瑙勫垯锛宺ule 涓� 1 鏃讹紝鏈夋晥
+ taskVO.setWeek(Integer.parseInt(param.getWeek(), 2)); // 姣忓懆鎵ц瑙勫垯锛宺ule 涓� 1 鏃讹紝鏈夋晥
taskVO.setType(BroadcastTaskType.TIMED_TASK.getType()); //浠诲姟绫诲瀷锛屽畾鏃朵换鍔′负 1锛岄噰闆嗕换鍔′负 2锛屽疄鏃堕煶 棰戜换鍔′负 26锛屽疄鏃跺枈璇濅换鍔′负 27
taskVO.setSchemeID(1); // 浠诲姟鏂规 ID
taskVO.setEi(0); //
@@ -76,6 +82,7 @@
// 绯荤粺淇濈暀
private BigInteger btime;
// 浠诲姟鎵ц瑙勫垯锛堟瘡澶╀负 0锛屾瘡鍛ㄤ负 1锛屾墜鍔ㄤ负 2)
+ @JsonIgnore
private Integer rule;
// 浠诲姟寮�濮嬫棩鏈燂紝涓�鑸负浠诲姟鍒涘缓鏃ユ湡
private BigInteger bdate;
@@ -113,7 +120,13 @@
private TaskMediaFileVO[] files;
// 鎾斁缁堢 ID 鍒楄〃
private TaskTerminalVO[] terminals;
-
+ @JsonIgnore
private String userName;
+ private String weeks;
+
+ private List<Integer> fileIds = new ArrayList<>();
+
+ private List<Integer> TerminalIds = new ArrayList<>();
+
}
--
Gitblit v1.9.3