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-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointSituationReportController.java | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointSituationReportController.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointSituationReportController.java
index 23cae47..d5a0b3d 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointSituationReportController.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/controller/XpPointSituationReportController.java
@@ -3,7 +3,10 @@
import cn.afterturn.easypoi.excel.ExcelExportUtil;
import cn.afterturn.easypoi.excel.entity.ExportParams;
+import cn.hutool.core.util.StrUtil;
+import com.xiaopeng.api.feignClient.account.XpOperationUserClient;
import com.xiaopeng.api.model.account.SysUser;
+import com.xiaopeng.api.model.account.XpOperationsUser;
import com.xiaopeng.api.model.operation.XpPasswordFreePolicy;
import com.xiaopeng.api.model.operation.XpPointSituationReport;
import com.xiaopeng.api.query.operation.XpPointSituationReportQuery;
@@ -12,6 +15,9 @@
import com.xiaopeng.common.core.domain.R;
import com.xiaopeng.common.core.utils.WebUtils;
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.operation.exportExcle.XpPointSituationReportExportExcel;
import com.xiaopeng.operation.service.IXpPointSituationReportService;
@@ -19,6 +25,7 @@
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -30,6 +37,7 @@
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.List;
+import java.util.stream.Collectors;
@RestController
@RequestMapping("")
@@ -41,6 +49,8 @@
@Resource
private TokenService tokenService;
+ @Resource
+ private XpOperationUserClient xpOperationUserClient;
@@ -50,19 +60,23 @@
@ApiOperation(value = "现场情况上报分页列表", tags = {"管理后台-运维-现场情况上报"}, response = XpPasswordFreePolicy.class)
@PostMapping("/api/v1/pointSituationReport/pageList")
public R<PageInfo<XpPointSituationReportVo>> pageList(@RequestBody XpPointSituationReportQuery query) {
+
+
+
+
PageInfo<XpPointSituationReportVo> pageInfo = xpPointSituationReportService.pageList(query);
return R.ok(pageInfo);
}
/**
- * 删除路线规划配置
+ * 详情现场情况上报
*/
@ApiOperation(value = "详情现场情况上报", tags = {"管理后台-运维-现场情况上报"})
@GetMapping("/api/v1/pointSituationReport/getdetail/{id}")
public R<?> getdetail(@PathVariable Long id) {
- xpPointSituationReportService.getdetail(id);
- return R.ok();
+ XpPointSituationReportVo detail = xpPointSituationReportService.getdetail(id);
+ return R.ok(detail);
}
@@ -71,14 +85,40 @@
*/
@ApiOperation(value = "删除现场情况上报", tags = {"管理后台-运维-现场情况上报"})
@DeleteMapping("/api/v1/pointSituationReport/deleteById/{id}")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.POINT_SITUATION_REPORT,
+ operationType = AdminOperationType.DELETE,
+ contentExpression = "'删除现场情况上报,id=' + #p0",
+ appendRequestData = false
+ )
public R<?> deleteById(@PathVariable Long id) {
- xpPointSituationReportService.deleteById(id);
- return R.ok();
+
+ try {
+ boolean b = xpPointSituationReportService.deleteById(id);
+ if(b){
+ return R.ok();
+ }
+ return R.fail("删除失败");
+ } catch (Exception e) {
+ e.printStackTrace();
+ throw new RuntimeException(e);
+ }
+
+
}
@ApiOperation(value = "导出现场情况上报", tags = {"管理后台-运维-现场情况上报"})
@PostMapping(value = "/api/v1/pointSituationReport/exportExcels")
+ @AdminOperationLog(
+ businessType = AdminBusinessType.POINT_SITUATION_REPORT,
+ operationType = AdminOperationType.EXPORT,
+ content = "导出现场情况上报",
+ appendRequestData = true
+ )
public void exportExcels(@RequestBody XpPointSituationReportQuery query) {
+ if(query.getIds().isEmpty()){
+ return;
+ }
List<XpPointSituationReportVo> exportList = xpPointSituationReportService.exportList(query);
List<XpPointSituationReportExportExcel> exportExcels = new ArrayList<>();
long sequence = 1L;
@@ -115,7 +155,7 @@
}
- @ApiOperation(value = "现场情况上报", tags = {"运维APP-站点管理"}, response = XpPointSituationReport.class)
+ @ApiOperation(value = "现场情况上报", tags = {"运维APP-现场情况上报"}, response = XpPointSituationReport.class)
@PostMapping("/maintenance-app/api/v1/pointSituationReport/addPointSituationReport")
public R<?> addPointSituationReport(@RequestBody XpPointSituationReport xpPointSituationReport){
LoginOperationUser loginOperationUser = tokenService.getLoginOperationUser();
--
Gitblit v1.7.1