From d95f6551e8214d69cd0fd511ec693641eb61ba16 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 01 Aug 2022 10:36:26 +0800
Subject: [PATCH] 1、大屏首页接口修复，解决double类型相加精度问题
---
src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java | 118 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 101 insertions(+), 17 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
index 2e620d9..8944df3 100644
--- a/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
+++ b/src/main/java/org/springblade/modules/farmplant/service/impl/FarmPlantServiceImpl.java
@@ -1,4 +1,5 @@
package org.springblade.modules.farmplant.service.impl;
+
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.modules.farm.entity.Farm;
@@ -12,11 +13,13 @@
import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
/**
* 农场养殖记录表服务实现类
- * @since 2022-05-12
+ *
* @author zhongrj
+ * @since 2022-05-12
*/
@Service
public class FarmPlantServiceImpl extends ServiceImpl<FarmPlantMapper, FarmPlant> implements FarmPlantService {
@@ -33,11 +36,29 @@
List<FarmPlantVO> farmPlantVOS = baseMapper.selectFarmPlantPage(page, farm);
//遍历
farmPlantVOS.forEach(farmPlantVO -> {
- if (farmPlantVO.getLandUnit().equals("1")){
- farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea())*0.1));
+ if (farmPlantVO.getLandUnit().equals("0")) {
+ farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 1));
}
- if (farmPlantVO.getLandUnit().equals("2")){
- farmPlantVO.setArea(String.format("%.2f",Double.parseDouble(farmPlantVO.getArea())*0.0015));
+ if (farmPlantVO.getLandUnit().equals("1")) {
+ farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.1));
+ }
+ if (farmPlantVO.getLandUnit().equals("2")) {
+ farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.0015));
+ }
+ });
+ return page.setRecords(farmPlantVOS);
+ }
+
+ @Override
+ public IPage<FarmPlantVO> getFarmPlantStatisticsCountz(IPage<FarmPlantVO> page, FarmPlantVO farm) {
+ List<FarmPlantVO> farmPlantVOS = baseMapper.getFarmPlantStatisticsCountz(page, farm);
+ //遍历
+ farmPlantVOS.forEach(farmPlantVO -> {
+ if (farmPlantVO.getLandUnit().equals("1")) {
+ farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.1));
+ }
+ if (farmPlantVO.getLandUnit().equals("2")) {
+ farmPlantVO.setArea(String.format("%.2f", Double.parseDouble(farmPlantVO.getArea()) * 0.0015));
}
});
return page.setRecords(farmPlantVOS);
@@ -45,6 +66,7 @@
/**
* 农产品种养统计
+ *
* @param farm 农产品种植对象
* @param page 分页查询对象
* @return
@@ -54,12 +76,12 @@
List<FarmPlantVO> farmPlantVOS = baseMapper.getFarmPlantStatistics(page, farm);
//遍历
farmPlantVOS.forEach(farmPlantVO -> {
- if (farmPlantVO.getLandUnit().equals("1")){
- BigDecimal bg = new BigDecimal(farmPlantVO.getAreas()*0.1);
+ if (farmPlantVO.getLandUnit().equals("1")) {
+ BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.1);
farmPlantVO.setAreas(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
}
- if (farmPlantVO.getLandUnit().equals("2")){
- BigDecimal bg = new BigDecimal(farmPlantVO.getAreas()*0.0015);
+ if (farmPlantVO.getLandUnit().equals("2")) {
+ BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.0015);
farmPlantVO.setAreas(bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue());
}
});
@@ -69,6 +91,7 @@
/**
* 农产品列表
+ *
* @param farm 农产品对象
* @return
*/
@@ -79,6 +102,7 @@
/**
* 农产品种养统计(累计和)
+ *
* @param farm 农产品种植对象
* @return
*/
@@ -86,30 +110,90 @@
public FarmPlantVO getFarmPlantStatisticsCount(FarmPlantVO farm) {
List<FarmPlantVO> farmPlantVOS = baseMapper.getFarmPlantStatisticsCount(farm);
FarmPlantVO plantVO = new FarmPlantVO();
- if (farmPlantVOS.size()>0){
+ if (farmPlantVOS.size() > 0) {
BigDecimal decimal = new BigDecimal(0.0);
//遍历
for (FarmPlantVO farmPlantVO : farmPlantVOS) {
- if (farmPlantVO.getLandUnit().equals("0")){
- BigDecimal bg = new BigDecimal(farmPlantVO.getAreas()*1);
+ if (farmPlantVO.getLandUnit().equals("0")) {
+ BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 1);
decimal = decimal.add(bg.setScale(2, BigDecimal.ROUND_HALF_UP));
}
- if (farmPlantVO.getLandUnit().equals("1")){
- BigDecimal bg = new BigDecimal(farmPlantVO.getAreas()*0.1);
+ if (farmPlantVO.getLandUnit().equals("1")) {
+ BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.1);
decimal = decimal.add(bg.setScale(2, BigDecimal.ROUND_HALF_UP));
}
- if (farmPlantVO.getLandUnit().equals("2")){
- BigDecimal bg = new BigDecimal(farmPlantVO.getAreas()*0.0015);
+ if (farmPlantVO.getLandUnit().equals("2")) {
+ BigDecimal bg = new BigDecimal(farmPlantVO.getAreas() * 0.0015);
decimal = decimal.add(bg.setScale(2, BigDecimal.ROUND_HALF_UP));
}
}
//求和
plantVO.setArea(decimal.toString());
- }else {
+ } else {
//求和
plantVO.setArea("0");
}
//返回
return plantVO;
}
+
+ @Override
+ public int selectCount(FarmPlantVO farm) {
+ return baseMapper.selectCount(farm);
+ }
+
+ @Override
+ public Map selectPlant(String code, String time) {
+ return baseMapper.selectPlant(code, time);
+ }
+
+ @Override
+ public Map selectPlantl(String code, String time) {
+ return baseMapper.selectPlantl(code, time);
+ }
+
+ @Override
+ public Map selectPlantw(String code, String time) {
+ return baseMapper.selectPlantw(code, time);
+ }
+
+ @Override
+ public Map selectPlantp(String code, String time) {
+ return baseMapper.selectPlantp(code, time);
+ }
+
+ @Override
+ public Map selectProduct(String code, String time) {
+ return baseMapper.selectProduct(code, time);
+ }
+
+ @Override
+ public Map selectProducty(String code, String time) {
+ return baseMapper.selectProducty(code, time);
+ }
+
+ @Override
+ public Map selectProductr(String code, String time) {
+ return baseMapper.selectProductr(code, time);
+ }
+
+ @Override
+ public Map selectProducts(String code, String time) {
+ return baseMapper.selectProducts(code, time);
+ }
+
+ @Override
+ public Map selectProductf(String code, String time) {
+ return baseMapper.selectProductf(code, time);
+ }
+
+ /**
+ * 查询种养记录列表（不分页）
+ * @param farmPlant
+ * @return
+ */
+ @Override
+ public List<FarmPlantVO> getFarmPlantList(FarmPlantVO farmPlant) {
+ return baseMapper.getFarmPlantList(farmPlant);
+ }
}
--
Gitblit v1.9.3