From d466b1394fd97ec0a51ca0e9f56d5087ec2c52d6 Mon Sep 17 00:00:00 2001 From: yq183 <645046984@qq.com> Date: Sun, 30 Mar 2025 10:57:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dromara/business/api/RemoteBusinessAlertService.java | 2 +- .../business/controller/BusinessTaskController.java | 4 ++++ .../java/org/dromara/business/domain/BusinessAlert.java | 2 +- .../org/dromara/business/domain/vo/BusinessTaskVo.java | 3 ++- .../business/dubbo/RemoteBusinessAlertServiceImpl.java | 4 ++-- .../dromara/business/service/IBusinessAlertService.java | 5 +++-- .../org/dromara/business/service/IBusinessTaskService.java | 2 ++ .../business/service/impl/BusinessAlertServiceImpl.java | 7 ++++--- .../business/service/impl/BusinessTaskServiceImpl.java | 3 ++- .../sample/wayline/service/impl/AiCompareServiceImpl.java | 7 ++----- 10 files changed, 23 insertions(+), 16 deletions(-) diff --git a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java b/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java index eb14684..9597fd3 100644 --- a/dk-api/api-business/src/main/java/org/dromara/business/api/RemoteBusinessAlertService.java +++ b/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 alertVoList); /** * 更新此条预警审批时候的状态 * @param businessId 业务id(预警、工单) diff --git a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java b/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java index f16fb86..080b3c4 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/controller/BusinessTaskController.java +++ b/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)); } + + + + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java b/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java index 54ea506..9c5d103 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/BusinessAlert.java +++ b/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; /** diff --git a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java b/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java index f8f2965..0617d2e 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/domain/vo/BusinessTaskVo.java +++ b/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 { + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java index 18b80c3..bd8b33f 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/dubbo/RemoteBusinessAlertServiceImpl.java +++ b/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 alertVoList) { + return businessAlertService.batchAddBusinessAlert(alertVoList); } /** diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java index b7329bc..da4eada 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessAlertService.java +++ b/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 alertList); + Boolean batchAddBusinessAlert(List alertVoList); /** * 修改预警任务 diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java index 8fa0321..2d93025 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java +++ b/dk-modules/business/src/main/java/org/dromara/business/service/IBusinessTaskService.java @@ -70,4 +70,6 @@ public interface IBusinessTaskService { Boolean deleteWithValidByIds(Collection ids, Boolean isValid); BusinessTaskVo queryBusinessTask(String waylineId); + + } diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java index 7a1942f..9aeab15 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessAlertServiceImpl.java +++ b/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 alertList) { - return this.baseMapper.insertBatch(alertList); + public Boolean batchAddBusinessAlert(List alertVoList) { + List businessAlerts = MapstructUtils.convert(alertVoList, BusinessAlert.class); + return this.baseMapper.insertBatch(businessAlerts); } /** diff --git a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java b/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java index fa8fd63..bc36d80 100644 --- a/dk-modules/business/src/main/java/org/dromara/business/service/impl/BusinessTaskServiceImpl.java +++ b/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 ; } /** diff --git a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java b/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java index 18f6f60..a5f6fe8 100644 --- a/dk-modules/sample/src/main/java/org/dromara/sample/wayline/service/impl/AiCompareServiceImpl.java +++ b/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(Mapmap) { - - System.out.println(map); AiCompareAlertDTO compareAlertDTO = Convert.convert(AiCompareAlertDTO.class,map); - RemoteBusinessAlertBo businessAlertBo=new RemoteBusinessAlertBo(); - businessAlertService.saveBusinessAlert(businessAlertBo); - return null; + List handleList = compareAlertDTO.getHandleList(); + return businessAlertService.saveBusinessAlert(handleList); } @Override