From ad589793b49fbf37b81a3f46f5c7142ea5346fab Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Sat, 09 Jul 2022 09:55:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java | 34 ++++++++++++++++++++++++++++++++++
1 files changed, 34 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
index fc2d017..002d236 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -12,6 +12,8 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.modules.recovery.entity.Recovery;
import org.springblade.modules.recovery.service.RecoveryService;
+import org.springblade.modules.traceability.dto.TraceabilityDTO;
+import org.springblade.modules.traceability.dto.TraceabilityDetailDTO;
import org.springblade.modules.traceability.entity.Traceability;
import org.springblade.modules.traceability.service.TraceabilityService;
import org.springblade.modules.traceability.vo.TraceabilityVO;
@@ -70,6 +72,16 @@
public R<IPage<TraceabilityVO>> page(TraceabilityVO traceability, Query query) {
IPage<TraceabilityVO> pages = traceabilityService.selectTraceabilityPage(Condition.getPage(query), traceability);
return R.data(pages);
+ }
+
+ /**
+ * 自定义查询，不分页
+ * @param traceability
+ * @return
+ */
+ @GetMapping("/getTraceabilityList")
+ public R getTraceabilityList(TraceabilityVO traceability) {
+ return R.data(traceabilityService.getTraceabilityList(traceability));
}
/**
@@ -142,4 +154,26 @@
return R.status(traceabilityService.removeByIds(Func.toLongList(ids)));
}
+ /**
+ * 获取溯源简介信息
+ * @param traceability
+ * @return
+ */
+ @GetMapping("/getSimpleInfo")
+ public R<TraceabilityDTO> getSimpleInfo(Traceability traceability) {
+ TraceabilityDTO traceabilityDTO = traceabilityService.getSimpleInfo(traceability);
+ return R.data(traceabilityDTO);
+ }
+
+ /**
+ * 获取溯源详情信息（包含农产品信息，认证检测信息，产地（地块信息），农事记录，企业信息）
+ * @param traceability
+ * @return
+ */
+ @GetMapping("/getTraceabilityDetailInfo")
+ public R<TraceabilityDetailDTO> getTraceabilityDetailInfo(Traceability traceability) {
+ TraceabilityDetailDTO traceabilityDTO = traceabilityService.getTraceabilityDetailInfo(traceability);
+ return R.data(traceabilityDTO);
+ }
+
}
--
Gitblit v1.9.3