From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpTaskRuleController.java | 40 ++++++++++++++++++++++++++++++++++------
1 files changed, 34 insertions(+), 6 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 7f87a86..2ae7bc4 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
@@ -1,15 +1,18 @@
package com.xiaopeng.maintenance.controller;
+import com.xiaopeng.api.model.maintenance.XpTaskRule;
import com.xiaopeng.common.core.domain.R;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
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;
@@ -25,21 +28,46 @@
@RestController
@Slf4j
@Api(tags = "管理后台-任务规则设置")
-@RequestMapping("/api/v1/taskRule")
+@RequestMapping("")
public class XpTaskRuleController {
@Resource
private IXpTaskRuleService xpTaskRuleService;
@Resource
private IXpTaskRuleRoleService xpTaskRuleRoleService;
@ApiOperation(value = "任务规则详情")
- @GetMapping("/taskRuleDetail")
- @Transactional
+ @GetMapping("/api/v1/taskRule/taskRuleDetail")
public R<TaskRuleDetailVO> taskRuleDetail() {
return xpTaskRuleService.taskRuleDetail();
}
+ /**
+ * 查询运维规则
+ */
+ @GetMapping("/logan/inner/xpTaskRule/queryDetail")
+ public R<XpTaskRule> queryDetail(){
+ XpTaskRule taskRule = xpTaskRuleService.getOne(null);
+ return R.ok(taskRule);
+ }
+
+
+ /**
+ * 查询任务规则详情
+ * @return
+ */
+ @GetMapping("/logan/inner/v1/taskRule/taskRuleAndRoleDetail")
+ public R<TaskRuleDetailVO> taskRuleAndRoleDetail() {
+ return xpTaskRuleService.taskRuleDetail();
+ }
+
+
@ApiOperation(value = "保存或修改任务规则")
- @PostMapping("/saveOrUpdateTaskRule")
+ @PostMapping("/api/v1/taskRule/saveOrUpdateTaskRule")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.TASK_RULE_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "保存或修改任务规则",
+ appendRequestData = true
+ )
public R saveOrUpdateTaskRule(@RequestBody TaskRuleDetailDto dto) {
xpTaskRuleService.saveOrUpdateTaskRule(dto);
return R.ok();
--
Gitblit v1.7.1