Merge branch 'master_dev' into 20220913

@@ -48,6 +48,9 @@ import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.page.PageData;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
+import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.BatchAckAlarmDTO;
 import org.thingsboard.server.dao.yunteng.service.TkDeviceService;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.security.permission.Operation;
@@ -193,6 +196,29 @@ public class AlarmController extends BaseController {
     @RequestMapping(value = "/alarm/{alarmId}/ack", method = RequestMethod.POST)
     @ResponseStatus(value = HttpStatus.OK)
     public void ackAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @PathVariable(ALARM_ID) String strAlarmId) throws ThingsboardException {
+        //thingsKit function
+        processAlarm(strAlarmId);
+    }
+
+    @ApiOperation(value = "批量处理确认")
+    @PreAuthorize("hasAnyAuthority('TENANT_ADMIN', 'CUSTOMER_USER')")
+    @RequestMapping(value = "/alarm/batch/ack", method = RequestMethod.POST)
+    @ResponseStatus(value = HttpStatus.OK)
+    public void batchAckAlarm(@ApiParam(value = ALARM_ID_PARAM_DESCRIPTION) @RequestBody BatchAckAlarmDTO alarmDTO) throws ThingsboardException {
+        List<String> strAlarmIds = alarmDTO.getAlarmIds();
+        if(null == strAlarmIds || strAlarmIds.isEmpty()){
+            throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+        }
+        for (String strAlarmId:strAlarmIds){
+            if(StringUtils.isEmpty(strAlarmId)){
+                throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
+            }
+            //thingsKit function
+            processAlarm(strAlarmId);
+        }
+    }
+    //thingsKit function
+    private void processAlarm(String strAlarmId) throws ThingsboardException {
         checkParameter(ALARM_ID, strAlarmId);
         try {
             AlarmId alarmId = new AlarmId(toUUID(strAlarmId));

+package org.thingsboard.server.common.data.yunteng.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class BatchAckAlarmDTO {
+    @ApiModelProperty(value = "批量删除告警IDS")
+    private List<String> alarmIds;
+}