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;
    /**
     * 根据参数获取粮情数据信息
@@ -810,15 +803,19 @@
        GrainData grainData;
        Building building;
        String height;
        Double length;
        //直径
        Double diameter;
        Double bulkWeight;
        Double storage = 0.0;
        Double volume = 0.0;
        Double deVolume;
        for (Depot depot : depotList) {
            //获取仓房信息,设置建筑高度
            height = null;
            //获取仓房直径
            length = 0.0;
            diameter = 0.0;
            deVolume = 0.0;
            //容重
            bulkWeight = depot.getBulkWeight();
            grainData = coreGrainService.listLiquidHeight(companyId, depot.getId());
@@ -833,7 +830,10 @@
                        height = building.getHeight() + "";
                    }
                    if (null != building.getLength()) {
                        length = building.getLength();
                        diameter = building.getLength();
                    }
                    if (null != building.getDeVolume()) {
                        deVolume = building.getDeVolume();
                    }
                }
            }
@@ -842,7 +842,13 @@
            grainData.setDepotHeight(height);
            if (null != bulkWeight && StringUtils.isNotEmpty(grainData.getOilHeight())) {
                Double oilHeight = Double.valueOf(grainData.getOilHeight());
                storage = 3.14 * Math.pow(length / 2, 2) * oilHeight * bulkWeight;
                //计算体积
                volume = 3.14159 * Math.pow(diameter / 2, 2) * oilHeight;
                if(volume > 0){
                    volume = volume - deVolume;
                }
                storage = volume * bulkWeight;
            }
            grainData.setStorage(storage);