From 8fb7dde57b835463a6786a2e038f0ecd3dba827b Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 11 三月 2026 16:21:54 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskRuleController.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskRuleController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskRuleController.java
index 69e1cd2..791d46d 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskRuleController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskRuleController.java
@@ -4,13 +4,12 @@
import com.xiaopeng.api.model.maintenance.XpTaskRule;
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.maintenance.dto.TaskRuleDetailDto;
-import com.xiaopeng.maintenance.vo.TaskRuleDetailVO;
+import com.xiaopeng.api.vo.maintenance.TaskRuleDetailVO;
import com.xiaopeng.maintenance.service.IXpTaskRuleRoleService;
import com.xiaopeng.maintenance.service.IXpTaskRuleService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -34,7 +33,6 @@
private IXpTaskRuleRoleService xpTaskRuleRoleService;
@ApiOperation(value = "任务规则详情")
@GetMapping("/api/v1/taskRule/taskRuleDetail")
- @Transactional
public R<TaskRuleDetailVO> taskRuleDetail() {
return xpTaskRuleService.taskRuleDetail();
}
@@ -48,6 +46,17 @@
return R.ok(taskRule);
}
+
+ /**
+ * 查询任务规则详情
+ * @return
+ */
+ @GetMapping("/inner/v1/taskRule/taskRuleAndRoleDetail")
+ public R<TaskRuleDetailVO> taskRuleAndRoleDetail() {
+ return xpTaskRuleService.taskRuleDetail();
+ }
+
+
@ApiOperation(value = "保存或修改任务规则")
@PostMapping("/api/v1/taskRule/saveOrUpdateTaskRule")
public R saveOrUpdateTaskRule(@RequestBody TaskRuleDetailDto dto) {
--
Gitblit v1.7.1