优化液位计算

CZT

2023-10-11 f169fcb00f7bf8c15bb1d461cd3710ebaf8106e8

 igds-basic/src/main/java/com/ld/igds/grain/manager/GrainManager.java

@@ -22,18 +22,13 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.util.DateUtil;
import com.ld.igds.util.DecimalUtil;
import com.ld.igds.util.FilesUtil;
import com.ld.igds.view.service.BuildingService;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.text.Collator;
import java.util.*;
import java.util.concurrent.ExecutorService;
@@ -67,8 +62,6 @@
    private BuildingService buildingService;
    @Autowired
    private GrainExportBuilder grainExportBuilder;
    @Resource
    private FilesUtil filesUtil;

    /**
     * 根据参数获取粮情数据信息
@@ -850,7 +843,11 @@
            if (null != bulkWeight && StringUtils.isNotEmpty(grainData.getOilHeight())) {
                Double oilHeight = Double.valueOf(grainData.getOilHeight());
                //计算体积
                volume = 3.14 * Math.pow(diameter / 2, 2) * oilHeight  - deVolume;
                volume = 3.14159 * Math.pow(diameter / 2, 2) * oilHeight;
                if(volume > 0){
                    volume = volume - deVolume;
                }

                storage = volume * bulkWeight;
            }