From 0ea162c9bbd4e2ac337aae567005369fbc911032 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 01 Jul 2022 18:19:35 +0800
Subject: [PATCH] 新增查询溯源详情接口，采收新增修改
---
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 57 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java b/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
index cdc6902..8a5da5e 100644
--- a/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
+++ b/src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java
@@ -5,14 +5,28 @@
import com.google.zxing.WriterException;
import org.springblade.common.config.TraceabilityCodeConfig;
import org.springblade.common.utils.QRCodeUtil;
+import org.springblade.modules.farm.entity.Farm;
+import org.springblade.modules.farm.entity.FarmPaper;
+import org.springblade.modules.farm.entity.FarmingRecord;
+import org.springblade.modules.farm.service.FarmPaperService;
+import org.springblade.modules.farm.service.FarmService;
+import org.springblade.modules.farm.service.FarmingRecordService;
+import org.springblade.modules.farm.vo.FarmPaperVO;
+import org.springblade.modules.farm.vo.FarmVO;
+import org.springblade.modules.farm.vo.FarmingRecordVO;
+import org.springblade.modules.recovery.service.RecoveryService;
+import org.springblade.modules.recovery.vo.RecoveryVO;
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.mapper.TraceabilityMapper;
import org.springblade.modules.traceability.service.TraceabilityService;
import org.springblade.modules.traceability.vo.TraceabilityVO;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import sun.misc.BASE64Encoder;
+import javax.sound.midi.Receiver;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -25,6 +39,18 @@
*/
@Service
public class TraceabilityServiceImpl extends ServiceImpl<TraceabilityMapper, Traceability> implements TraceabilityService {
+
+ @Autowired
+ private RecoveryService recoveryService;
+
+ @Autowired
+ private FarmingRecordService farmingRecordService;
+
+ @Autowired
+ private FarmService farmService;
+
+ @Autowired
+ private FarmPaperService farmPaperService;
/**
* 自定义分页
@@ -74,4 +100,35 @@
//返回
return simpleInfo;
}
+
+ /**
+ * 获取溯源详情信息（包含农产品信息，认证检测信息，产地（地块信息），农事记录，企业信息）
+ * @param traceability
+ * @return
+ */
+ @Override
+ public TraceabilityDetailDTO getTraceabilityDetailInfo(Traceability traceability) {
+ TraceabilityDetailDTO dto = new TraceabilityDetailDTO();
+ //根据溯源码编号查询溯源信息
+ Traceability traceability1 = baseMapper.selectOne(new QueryWrapper<>(traceability));
+ //1. 查询农产品采收记录信息
+ RecoveryVO recoveryVO = recoveryService.getRecoveryDetail(traceability1.getRecoveryId());
+ //2. 查询相关检测信息
+ List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(traceability1.getDeptId());
+ //3. 查询产地（地块）信息
+
+ //4. 查询农事记录信息(种植开始起)
+ List<FarmingRecordVO> farmingRecordVOList = farmingRecordService.getFarmingRecordByFarmPlantId(recoveryVO);
+ //5. 查询企业信息
+ Farm farm = new Farm();
+ farm.setDeptId(traceability1.getDeptId());
+ Farm farmVO = farmService.getOne(new QueryWrapper<>(farm));
+ //6. 数据封装
+ dto.setRecoveryVO(recoveryVO);
+ dto.setFarm(farmVO);
+ dto.setRecordVOList(farmingRecordVOList);
+ dto.setPaperVOList(farmPaperList);
+ //返回数据
+ return dto;
+ }
}
--
Gitblit v1.9.3