提交：预警

dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java

@@ -16,7 +16,7 @@ public interface RemoteBusinessAlertService {
     /**
      * 生成预警，待验证状态
      */
-    void saveBusinessAlert(RemoteBusinessAlertBo businessAlertBo);
+    Boolean saveBusinessAlert(List<RemoteBusinessAlertVo> alertVoList);
     /**
      * 更新此条预警审批时候的状态
      * @param businessId 业务id(预警、工单)

dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java

@@ -106,4 +106,8 @@ public class BusinessTaskController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(businessTaskService.deleteWithValidByIds(List.of(ids), true));
     }
+
+
+
+
 }

dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java

@@ -29,7 +29,7 @@ public class BusinessAlert extends BaseEntity {
     /**
      *
      */
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(type = IdType.AUTO)
     private Long id;
 
     /**

dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java

@@ -70,7 +70,7 @@ public class BusinessTaskVo implements Serializable {
      * 工单状态（0预约中  1 等待中，2执行中  3 未完成 4已完结 ）
      */
     @ExcelProperty(value = "工单状态", converter = ExcelDictConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=预约中,1=,等=待中，2执行中,3=,未=完成,4=已完结")
+    @ExcelDictFormat(readConverterExp = "0:预约中,1:等待中，2:执行中,3:未完成,4:已完结")
     private String status;
 
     @ExcelProperty(value = "完成时间")
@@ -94,4 +94,5 @@ public class BusinessTaskVo implements Serializable {
 
 
 
+
 }

dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java

@@ -27,8 +27,8 @@ public class RemoteBusinessAlertServiceImpl implements RemoteBusinessAlertServic
 
 
     @Override
-    public void saveBusinessAlert(RemoteBusinessAlertBo businessAlertBo) {
+    public Boolean saveBusinessAlert(List<RemoteBusinessAlertVo> alertVoList) {
-
+        return businessAlertService.batchAddBusinessAlert(alertVoList);
     }
 
     /**

dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java

@@ -1,6 +1,7 @@
 package org.dromara.business.service;
 
 import org.dromara.business.api.domain.bo.RemoteBusinessAlertBo;
+import org.dromara.business.api.domain.vo.RemoteBusinessAlertVo;
 import org.dromara.business.domain.BusinessAlert;
 import org.dromara.business.domain.bo.BusinessAlertBo;
 import org.dromara.business.domain.vo.BusinessAlertVo;
@@ -38,10 +39,10 @@ public interface IBusinessAlertService {
     /**
      * 批量新增预警任务
      *
-     * @param alertList 预警任务
+     * @param alertVoList 预警任务
      * @return 是否新增成功
      */
-    Boolean batchAddBusinessAlert(List<BusinessAlert> alertList);
+    Boolean batchAddBusinessAlert(List<RemoteBusinessAlertVo> alertVoList);
 
     /**
      * 修改预警任务

dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java

@@ -70,4 +70,6 @@ public interface IBusinessTaskService {
     Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
 
     BusinessTaskVo queryBusinessTask(String waylineId);
+
+
 }

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java

@@ -70,12 +70,13 @@ public class BusinessAlertServiceImpl implements IBusinessAlertService {
 
     /**
      * 批量添加
-     * @param alertList 预警任务
+     * @param alertVoList 预警任务
      * @return
      */
     @Override
-    public Boolean batchAddBusinessAlert(List<BusinessAlert> alertList) {
+    public Boolean batchAddBusinessAlert(List<RemoteBusinessAlertVo> alertVoList) {
-        return this.baseMapper.insertBatch(alertList);
+        List<BusinessAlert> businessAlerts = MapstructUtils.convert(alertVoList, BusinessAlert.class);
+        return this.baseMapper.insertBatch(businessAlerts);
     }
 
     /**

dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java

@@ -47,7 +47,8 @@ public class BusinessTaskServiceImpl implements IBusinessTaskService {
      */
     @Override
     public BusinessTaskVo queryById(Long id){
-        return baseMapper.selectVoById(id);
+        BusinessTaskVo businessTaskVo = baseMapper.selectVoById(id);
+        return ;
     }
 
     /**

dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java

@@ -221,12 +221,9 @@ public class AiCompareServiceImpl implements IAiCompareService {
 
     @Override
     public Boolean alert(Map<String,Object>map) {
-
-        System.out.println(map);
         AiCompareAlertDTO compareAlertDTO = Convert.convert(AiCompareAlertDTO.class,map);
-        RemoteBusinessAlertBo businessAlertBo=new RemoteBusinessAlertBo();
+        List<RemoteBusinessAlertVo> handleList = compareAlertDTO.getHandleList();
-        businessAlertService.saveBusinessAlert(businessAlertBo);
+        return businessAlertService.saveBusinessAlert(handleList);
-        return null;
     }
 
     @Override