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/XpCruiseCheckInRuleController.java | 74 ++++++++++++++++++++++++++++++++++---
1 files changed, 68 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java
index 7c72d01..0b2444c 100644
--- a/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java
+++ b/xp-robotaxi-maintenance-boot/src/main/java/com/xiaopeng/maintenance/controller/XpCruiseCheckInRuleController.java
@@ -1,14 +1,16 @@
package com.xiaopeng.maintenance.controller;
+import cn.afterturn.easypoi.excel.ExcelExportUtil;
+import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.xiaopeng.api.model.maintenance.XpCruiseCheckInRecord;
-import com.xiaopeng.api.model.maintenance.XpCruiseCheckInRule;
-import com.xiaopeng.api.model.operation.SysOperLog;
import com.xiaopeng.api.vo.account.LoginOperationUser;
import com.xiaopeng.common.core.domain.R;
-import com.xiaopeng.common.core.utils.poi.ExcelUtil;
import com.xiaopeng.common.core.web.page.PageInfo;
+import com.xiaopeng.common.log.annotation.AdminOperationLog;
+import com.xiaopeng.common.log.enums.AdminBusinessType;
+import com.xiaopeng.common.log.enums.AdminOperationType;
import com.xiaopeng.common.security.service.TokenService;
import com.xiaopeng.maintenance.dto.XpCruiseCheckInRuleDto;
import com.xiaopeng.maintenance.dto.XpCruiseCheckInRuleListPageDto;
@@ -22,10 +24,15 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.ServletOutputStream;
import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.List;
/**
@@ -33,6 +40,7 @@
*/
@RestController
@RequestMapping("")
+@Slf4j
public class XpCruiseCheckInRuleController {
@Resource
@@ -114,13 +122,40 @@
@ApiOperation(value = "添加巡游打卡规则", tags = {"管理后台-巡游打卡规则管理"})
@PostMapping("/maintenance-admin/api/v1/cruiseCheckInRecord/addXpCruiseCheckInRule")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.CRUISE_CHECK_IN_RULE_MANAGEMENT,
+ operationType = AdminOperationType.ADD,
+ content = "添加巡游打卡规则",
+ appendRequestData = true
+ )
public R<?> addXpCruiseCheckInRule(@RequestBody XpCruiseCheckInRuleDto dto){
xpCruiseCheckInRuleService.addXpCruiseCheckInRule(dto);
return R.ok();
}
+
+
+ @ApiOperation(value = "编辑巡游打卡规则", tags = {"管理后台-巡游打卡规则管理"})
+ @PostMapping("/maintenance-admin/api/v1/cruiseCheckInRecord/updateXpCruiseCheckInRule")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.CRUISE_CHECK_IN_RULE_MANAGEMENT,
+ operationType = AdminOperationType.EDIT,
+ content = "编辑巡游打卡规则",
+ appendRequestData = true
+ )
+ public R<?> updateXpCruiseCheckInRule(@RequestBody XpCruiseCheckInRuleDto dto){
+ xpCruiseCheckInRuleService.updateXpCruiseCheckInRule(dto);
+ return R.ok();
+ }
+
@ApiOperation(value = "删除巡游打卡规则", tags = {"管理后台-巡游打卡规则管理"})
@PostMapping("/maintenance-admin/api/v1/cruiseCheckInRecord/delXpCruiseCheckInRule/{id}")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.CRUISE_CHECK_IN_RULE_MANAGEMENT,
+ operationType = AdminOperationType.DELETE,
+ contentExpression = "'删除巡游打卡规则,id=' + #p0",
+ appendRequestData = false
+ )
public R<?> delXpCruiseCheckInRule(@PathVariable("id") Integer id){
xpCruiseCheckInRuleService.removeById(id);
return R.ok();
@@ -154,16 +189,43 @@
@ApiOperation(value = "巡游打卡统计", tags = {"管理后台-巡游打卡管理"})
@PostMapping("/maintenance-admin/api/v1/cruiseCheckInRecord/statistic")
public R<List<XpCruiseCheckInStatisticsVO>> pageList(@RequestBody XpCruiseCheckInStatisticsQuery query) {
-
return R.ok(xpCruiseCheckInRecordService.statistics(query));
}
@ApiOperation(value = "查询巡游打卡记录列表导出", tags = {"管理后台-巡游打卡管理"})
@PostMapping("/maintenance-admin/api/v1/cruiseCheckInRecord/export")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.CRUISE_CHECK_IN_RULE_MANAGEMENT,
+ operationType = AdminOperationType.EXPORT,
+ content = "导出巡游打卡记录",
+ appendRequestData = true
+ )
public R<PageInfo<XpCruiseCheckInRecordVO>> pageListExport(@RequestBody XpCruiseCheckInRecordQuery query, HttpServletResponse response) {
List<XpCruiseCheckInRecordVO> list = xpCruiseCheckInRecordService.all(query);
- ExcelUtil<XpCruiseCheckInRecordVO> util = new ExcelUtil<>(XpCruiseCheckInRecordVO.class);
- util.exportExcel(response, list, "巡游打卡记录");
+ Workbook workbook = ExcelExportUtil.exportExcel(new ExportParams(), XpCruiseCheckInRecordVO.class, list);
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ ServletOutputStream outputStream = null;
+ try {
+ String fileName = URLEncoder.encode("巡游打卡记录.xls", "utf-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName);
+ outputStream = response.getOutputStream();
+ workbook.write(outputStream);
+ outputStream.flush();
+ } catch (IOException e) {
+ log.error("导出巡游打卡记录失败", e);
+ } finally {
+ try {
+ if (outputStream != null) {
+ outputStream.close();
+ }
+ if (workbook != null) {
+ workbook.close();
+ }
+ } catch (IOException e) {
+ log.error("关闭输出流失败", e);
+ }
+ }
return R.ok();
}
--
Gitblit v1.7.1