From 2bd9debe1829fdce93c62028aa97716a1cb2defe Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期二, 19 九月 2023 10:34:22 +0800
Subject: [PATCH] 一帕拉功能（一边想四月里大哥一边写的）
---
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionInspectionApi.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionInspectionApi.java b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionInspectionApi.java
index 068f6d0..2778ad9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionInspectionApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionInspectionApi.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.equipment.UnionInspectionDto;
import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
+import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.service_equipment.annotation.CurrentUser;
import com.panzhihua.service_equipment.model.dos.UnionReport;
import com.panzhihua.service_equipment.service.UnionInspectionService;
import com.panzhihua.service_equipment.service.UnionReportService;
@@ -25,7 +27,6 @@
private UnionInspectionService unionInspectionService;
-
/**
* 新增户外劳工站巡查
*
@@ -33,8 +34,19 @@
* @return 新增结果
*/
@PostMapping("/add")
- public R add(@RequestBody UnionInspectionDto unionInspectionDto) {
- return unionInspectionService.add(unionInspectionDto);
+ public R add(@RequestBody UnionInspectionDto unionInspectionDto, @CurrentUser UnionUserDto unionUserDto) {
+ if (unionInspectionDto.getIsApplets().equals(1)) {
+ log.info("小程序进入无需验证");
+ return unionInspectionService.add(unionInspectionDto);
+ } else {
+ log.info("h5或者后台进入");
+ if (unionUserDto != null) {
+ unionInspectionDto.setCreateUnionUserId(unionUserDto.getId());
+ return unionInspectionService.add(unionInspectionDto);
+ } else {
+ return R.fail("请重新登录");
+ }
+ }
}
@@ -45,7 +57,18 @@
* @return 动态结果
*/
@PostMapping("/query")
- public R<IPage<UnionReport>> query(@RequestBody UnionInspectionDto unionInspectionDto) {
- return unionInspectionService.query(unionInspectionDto);
+ public R<IPage<UnionReport>> query(@RequestBody UnionInspectionDto unionInspectionDto, @CurrentUser UnionUserDto unionUserDto) {
+ if (unionInspectionDto.getIsApplets().equals(1)) {
+ log.info("小程序进入无需验证");
+ return unionInspectionService.query(unionInspectionDto);
+ } else {
+ log.info("h5或者后台进入");
+ if (unionUserDto != null) {
+ unionInspectionDto.setCreateUnionUserId(unionUserDto.getId());
+ return unionInspectionService.query(unionInspectionDto);
+ } else {
+ return R.fail("请重新登录");
+ }
+ }
}
}
--
Gitblit v1.7.1