From bf1a1999cc8e1608e43bd07bec9ddd59544e0ccf Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 23 Sep 2022 16:29:39 +0800
Subject: [PATCH] ·
---
src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 002d236..09966c9 100644
--- a/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
+++ b/src/main/java/org/springblade/modules/traceability/controller/TraceabilityController.java
@@ -1,5 +1,4 @@
package org.springblade.modules.traceability.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
import io.swagger.annotations.ApiOperation;
@@ -10,17 +9,14 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
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;
-import org.springframework.retry.annotation.Recover;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
-
import javax.validation.Valid;
import java.text.DecimalFormat;
import java.text.SimpleDateFormat;
@@ -71,6 +67,20 @@
@ApiOperation(value = "分页", notes = "传入traceability")
public R<IPage<TraceabilityVO>> page(TraceabilityVO traceability, Query query) {
IPage<TraceabilityVO> pages = traceabilityService.selectTraceabilityPage(Condition.getPage(query), traceability);
+ return R.data(pages);
+ }
+
+ /**
+ * 小程序列表分页
+ * @param traceability
+ * @param query
+ * @return
+ */
+ @GetMapping("/xcxpage")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "分页", notes = "传入traceability")
+ public R<IPage<TraceabilityVO>> xcxpage(TraceabilityVO traceability, Query query) {
+ IPage<TraceabilityVO> pages = traceabilityService.selectTraceabilityXcxPage(Condition.getPage(query), traceability);
return R.data(pages);
}
@@ -176,4 +186,15 @@
return R.data(traceabilityDTO);
}
+ /**
+ * 获取溯源详情信息（包含农产品信息，认证检测信息，产地（地块信息），农事记录，企业信息）扫码
+ * @param traceability
+ * @return
+ */
+ @GetMapping("/getTraceabilityDetailInfos")
+ public R<TraceabilityDetailDTO> getTraceabilityDetailInfos(Traceability traceability) {
+ TraceabilityDetailDTO traceabilityDTO = traceabilityService.getTraceabilityDetailInfos(traceability);
+ return R.data(traceabilityDTO);
+ }
+
}
--
Gitblit v1.9.3