From c23b188d869ad5c1db8444b3ebb83af25329c288 Mon Sep 17 00:00:00 2001
From: nicole <nicole@qq.com>
Date: Mon, 20 Nov 2023 22:07:18 +0800
Subject: [PATCH] =?UTF-8?q?control=20channel=20=E6=94=AF=E6=8C=81=E5=A4=8D?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zjyr/beidouservice/pojo/dataobject/AlarmTaskDO.java  | 8 ++++++++
 .../beidouservice/pojo/dto/task/AlarmTaskReqDTO.java     | 3 ++-
 .../beidouservice/service/impl/AlarmTaskServiceImpl.java | 9 +++++----
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/AlarmTaskDO.java b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/AlarmTaskDO.java
index 1e0b0f5..0ac92ee 100644
--- a/src/main/java/com/zjyr/beidouservice/pojo/dataobject/AlarmTaskDO.java
+++ b/src/main/java/com/zjyr/beidouservice/pojo/dataobject/AlarmTaskDO.java
@@ -1,11 +1,14 @@
 package com.zjyr.beidouservice.pojo.dataobject;
 
+import com.zjyr.beidouservice.common.impl.SensorControlTunnelName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @Builder
@@ -65,4 +68,9 @@ public class AlarmTaskDO {
      */
     private Integer approvalStatus;
 
+    public void setControlChannel(List<Integer> controlChannel) {
+        this.controlChannel = ObjectUtils.isEmpty(controlChannel) ?
+                SensorControlTunnelName.TUNNEL_ALL.getValue() :
+                controlChannel.stream().mapToInt(Integer::intValue).sum();
+    }
 }
diff --git a/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java b/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java
index 917f86c..63e627d 100644
--- a/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java
+++ b/src/main/java/com/zjyr/beidouservice/pojo/dto/task/AlarmTaskReqDTO.java
@@ -8,6 +8,7 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 @Builder
@@ -62,7 +63,7 @@ public class AlarmTaskReqDTO {
      * 更新: 1:无线 2:北斗 4:电话 8:NB 15:all
      */
     @Schema(title = "控制通道", example = "2",description = "1:无线 2:北斗 4:电话 8:NB 15:all，默认北斗")
-    private Integer controlChannel;
+    private List<Integer> controlChannel;
 
     /**
      * 发放时间
diff --git a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java
index 35be67d..db4aed2 100644
--- a/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java
+++ b/src/main/java/com/zjyr/beidouservice/service/impl/AlarmTaskServiceImpl.java
@@ -44,6 +44,7 @@ import java.text.DecimalFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -90,8 +91,8 @@ public class AlarmTaskServiceImpl implements AlarmTaskService {
     public MyResp alarmTaskExec(AlarmTaskReqDTO alarmTaskReqDTO) {
         //根据选择的省份、地市、区域或指定设备信息，获取执行任务的deviceId，provinceCode默认为null
         DeviceInfoDTO deviceInfo = getExecDeviceInfo(alarmTaskReqDTO);
-        int ctrlChannel = Optional.ofNullable(alarmTaskReqDTO.getControlChannel())
-                                  .orElse(SensorControlTunnelName.TUNNEL_ALL.getValue());
+        List<Integer> ctrlChannel = Optional.ofNullable(alarmTaskReqDTO.getControlChannel())
+                                  .orElse(Collections.singletonList(SensorControlTunnelName.TUNNEL_ALL.getValue()));
 
         //生成规则为"JL"+"当前年月日"+"4位自增ID"
         String taskId = generateRecordNumber();
@@ -103,10 +104,10 @@ public class AlarmTaskServiceImpl implements AlarmTaskService {
                 .alarmCounty(deviceInfo.getCountyCodes() == null ? " " : ListToString(deviceInfo.getCountyCodes()))
                 .deviceIds(ListToString(deviceInfo.getDeviceIds()))
                 .alarmMode(alarmTaskReqDTO.getAlarmMode())
-                .controlChannel(ctrlChannel)
                 .sender(alarmTaskReqDTO.getSender())
                 .sendTime(alarmTaskReqDTO.getSendTime())
                 .approvalStatus(ApprovalStatusEnum.APPROVAL_SUCCESS.getCode()).build();
+        alarmTaskDO.setControlChannel(ctrlChannel);
 
         //入库
         alarmTaskMapper.addAlarmTask(alarmTaskDO);
@@ -123,7 +124,7 @@ public class AlarmTaskServiceImpl implements AlarmTaskService {
                 CommonEnumHandler.codeOf(AlarmModeName.class, alarmTaskReqDTO.getAlarmMode()),
                 CommonEnumHandler.codeOf(AlarmControlTypeName.class, alarmTaskReqDTO.getAlarmType()),
                 CommonEnumHandler.codeOf(AlarmTypeName.class, alarmTaskReqDTO.getAlarmKind()),
-                ctrlChannel,
+                alarmTaskDO.getControlChannel(),
                 alarmTaskReqDTO.getSendTime(),
                 0, null,
                 deviceInfo.getCityCodes(),