From 54d271cb931f95976993eb69b1b71b91c65ebcc8 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 26 Aug 2022 10:09:30 +0800
Subject: [PATCH] 增加秧苗方式，修正今年农资使用量为0的问题
---
src/main/java/org/springblade/modules/traceability/service/impl/TraceabilityServiceImpl.java | 111 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 105 insertions(+), 6 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 8a5da5e..8959d12 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
@@ -14,22 +14,29 @@
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.lang.entity.Land;
+import org.springblade.modules.lang.service.ILandService;
+import org.springblade.modules.lang.vo.LandVO;
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.SweepRecord;
import org.springblade.modules.traceability.entity.Traceability;
import org.springblade.modules.traceability.mapper.TraceabilityMapper;
+import org.springblade.modules.traceability.service.SweepRecordService;
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 org.springframework.transaction.annotation.Transactional;
import sun.misc.BASE64Encoder;
import javax.sound.midi.Receiver;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
+import java.util.Date;
import java.util.List;
/**
@@ -52,6 +59,12 @@
@Autowired
private FarmPaperService farmPaperService;
+ @Autowired
+ private ILandService landService;
+
+ @Autowired
+ private SweepRecordService sweepRecordService;
+
/**
* 自定义分页
*
@@ -62,6 +75,11 @@
@Override
public IPage<TraceabilityVO> selectTraceabilityPage(IPage<TraceabilityVO> page, TraceabilityVO traceability) {
return page.setRecords(baseMapper.selectTraceabilityPage(page, traceability));
+ }
+
+ @Override
+ public IPage<TraceabilityVO> selectTraceabilityXcxPage(IPage<TraceabilityVO> page, TraceabilityVO traceability) {
+ return page.setRecords(baseMapper.selectTraceabilityXcxPage(page, traceability));
}
@Override
@@ -108,27 +126,108 @@
*/
@Override
public TraceabilityDetailDTO getTraceabilityDetailInfo(Traceability traceability) {
+
TraceabilityDetailDTO dto = new TraceabilityDetailDTO();
+ int count = 0;
//根据溯源码编号查询溯源信息
Traceability traceability1 = baseMapper.selectOne(new QueryWrapper<>(traceability));
+ //记录扫描记录
+ if (null!=traceability.getBind() && traceability.equals("0")){
+ //插入扫描记录
+ SweepRecord sweepRecord = new SweepRecord();
+ sweepRecord.setCreateTime(new Date());
+ sweepRecord.setCode(traceability1.getId().toString());
+ sweepRecord.setDeptId(traceability1.getDeptId());
+ //新增
+ sweepRecordService.save(sweepRecord);
+ }
//1. 查询农产品采收记录信息
RecoveryVO recoveryVO = recoveryService.getRecoveryDetail(traceability1.getRecoveryId());
//2. 查询相关检测信息
- List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(traceability1.getDeptId());
+ List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(recoveryVO.getFarmId(),recoveryVO.getFarmPlantId());
//3. 查询产地（地块）信息
+ LandVO land = new LandVO();
+ land.setId(Long.parseLong(recoveryVO.getLandId()));
+ LandVO landInfo = (LandVO)landService.getLandInfo(land);
+ //4. 查询农事记录信息(种植开始起)
+ List<FarmingRecordVO> farmingRecordVOList = farmingRecordService.getFarmingRecordByFarmPlantId(recoveryVO);
+ //5. 查询农场信息
+ Farm farm = farmService.getById(recoveryVO.getFarmId());
+ //6. 数据封装
+ dto.setRecoveryVO(recoveryVO);
+ dto.setFarm(farm);
+ dto.setRecordVOList(farmingRecordVOList);
+ dto.setPaperVOList(farmPaperList);
+ dto.setLandVO(landInfo);
+ //计算百分比
+ if (null!=recoveryVO){
+ count = count + 20;
+ }
+ if (null!=farm){
+ count = count + 20;
+ }
+ if (null==landInfo){
+ count = count + 20;
+ }
+ if (farmingRecordVOList.size()>0){
+ count = count + 20;
+ }
+ if (farmPaperList.size()>0){
+ count = count + 20;
+ }
+ dto.setNum(count);
+ //返回数据
+ return dto;
+ }
+ /**
+ * 自定义查询，不分页
+ * @param traceability
+ * @return
+ */
+ @Override
+ public List<TraceabilityVO> getTraceabilityList(TraceabilityVO traceability) {
+ return baseMapper.getTraceabilityList(traceability);
+ }
+
+ /**
+ * 获取溯源详情信息（包含农产品信息，认证检测信息，产地（地块信息），农事记录，企业信息）扫码
+ * @param traceability
+ * @return
+ */
+ @Override
+ @Transactional
+ public TraceabilityDetailDTO getTraceabilityDetailInfos(Traceability traceability) {
+ TraceabilityDetailDTO dto = new TraceabilityDetailDTO();
+ int count = 0;
+ //根据溯源码编号查询溯源信息
+ Traceability traceability1 = baseMapper.selectOne(new QueryWrapper<>(traceability));
+ //记录扫描记录
+ SweepRecord sweepRecord = new SweepRecord();
+ sweepRecord.setCreateTime(new Date());
+ sweepRecord.setCode(traceability1.getId().toString());
+ sweepRecord.setDeptId(traceability1.getDeptId());
+ //新增
+ sweepRecordService.save(sweepRecord);
+ //1. 查询农产品采收记录信息
+ RecoveryVO recoveryVO = recoveryService.getRecoveryDetail(traceability1.getRecoveryId());
+ //2. 查询相关检测信息
+ List<FarmPaperVO> farmPaperList = farmPaperService.getFarmPaperList(recoveryVO.getFarmId(),recoveryVO.getFarmPlantId());
+ //3. 查询产地（地块）信息
+ LandVO land = new LandVO();
+ land.setId(Long.parseLong(recoveryVO.getLandId()));
+ LandVO landInfo = (LandVO)landService.getLandInfo(land);
//4. 查询农事记录信息(种植开始起)
List<FarmingRecordVO> farmingRecordVOList = farmingRecordService.getFarmingRecordByFarmPlantId(recoveryVO);
//5. 查询企业信息
- Farm farm = new Farm();
- farm.setDeptId(traceability1.getDeptId());
- Farm farmVO = farmService.getOne(new QueryWrapper<>(farm));
+ Farm farm = farmService.getById(recoveryVO.getFarmId());
//6. 数据封装
dto.setRecoveryVO(recoveryVO);
- dto.setFarm(farmVO);
+ dto.setFarm(farm);
dto.setRecordVOList(farmingRecordVOList);
dto.setPaperVOList(farmPaperList);
- //返回数据
+ dto.setLandVO(landInfo);
+ //返回
return dto;
}
}
--
Gitblit v1.9.3