Merge remote-tracking branch 'origin/master'

sgj

2025-12-25 0d1b8d5609a0dfe7defd79dd6cf6db151413f1d3

Merge remote-tracking branch 'origin/master'

 fzzy-igdss-core/src/main/java/com/fzzy/igds/constant/FoodVariety.java

@@ -40,7 +40,7 @@
     * @return
     */
    public static String getMsg(String code) {
        if (null == code) return "未配置";
        if (null == code) return "其他";

        return mapFoodVariety.get(code);
    }

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupDeptData.java

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
package com.fzzy.igds.data;

import lombok.Data;
import java.io.Serializable;

/**
 * @Description ç›‘管信息总览-库区信息封装
 * @Author CZT
 * @Date 2025/12/25 15:36
 */
@Data
public class GroupDeptData implements Serializable {

    /**
     * ç›‘管库区信息
     */
    private String code;        //行政区划编码
    private String county;      //行政区名称
    private String deptName;    //库区名称
    private Integer inNum = 0;  //日入库车数
    private Integer outNum = 0; //日出库车数
    private Integer depotNumber = 0; //仓库数
    private Integer depotBankNumber = 0; //质押仓数
    private Double storageNum = 0.0; //库存数

    /**
     * ç›‘管数量
     */
    private Double jd; //经度
    private Double wd; //维度

}

 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupGisData.java

ÎļþÃû´Ó fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GisData.java ÐÞ¸Ä
@@ -10,7 +10,7 @@
 * @Date 2025/12/25 9:35
 */
@Data
public class GisData {
public class GroupGisData {

    private List<ChartPie> deptList = new ArrayList<>();//区县库区数


 fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupIndexData.java

ÎļþÃû´Ó fzzy-igdss-core/src/main/java/com/fzzy/igds/data/GroupData.java ÐÞ¸Ä
@@ -8,10 +8,10 @@
/**
 * @Description ç›‘管信息总览--数量信息封装
 * @Author CZT
 * @Date 2025/11/29 10:56
 * @Date 2025/12/25 10:56
 */
@Data
public class GroupData implements Serializable {
public class GroupIndexData implements Serializable {

    /**
     * ç›‘管库区信息
@@ -19,7 +19,7 @@
    private Integer companyNum = 0;  //企业个数
    private Integer deptNum = 0;     //库点个数
    private Integer depotNum = 0;    //仓库个数
    private Integer depotCirNum = 0; //筒仓个数
    private Integer depotBankNum = 0;//质押仓库数

    /**
     * ç›‘管数量

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreCompanyService.java

@@ -47,6 +47,22 @@
    }

    /**
     * æŸ¥è¯¢å…¬å¸æ•°é‡
     * @param companyId
     * @return
     */
    public Integer getCompanyNum(String companyId) {

        QueryWrapper<Company> queryWrapper = new QueryWrapper<>();

        if(StringUtils.isNotBlank(companyId)){
            queryWrapper.eq("company_id", companyId);
        }

        return coreCompanyMapper.selectCount(queryWrapper);
    }

    /**
     * æ›´æ–°æˆ–保存公司信息
     * @param sysDept
     * @param isAdd

 fzzy-igdss-web/src/main/java/com/fzzy/group/GroupController.java

@@ -2,7 +2,7 @@

import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.GisData;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
@@ -12,7 +12,10 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import java.util.List;

@@ -121,10 +124,38 @@
        view.put("deptList", deptList);

        //统计信息
        GisData gisData = groupManager.getGisData();
        view.put("gisData", gisData);
        GroupGisData groupGisData = groupManager.getGisData();
        view.put("gisData", groupGisData);

        return prefix + "/gis";
    }


    /**
     * é¦–页--获取数量信息(储量统计、分品种库存、监管数量等)
     *
     * @param param
     * @return
     */
    @RequestMapping("/index-num")
    @ResponseBody
    public PageResponse<GroupIndexData> indexNum(@RequestBody IgdsBaseParam param) {

        return groupManager.getGroupIndexData(param);
    }


    /**
     * é¦–页--库区信息统计
     *
     * @param param
     * @return
     */
    @RequestMapping("/index-dept-list")
    @ResponseBody
    public PageResponse<List<GroupDeptData>> indexDeptList(@RequestBody IgdsBaseParam param) {

        return groupManager.indexDeptList(param);
    }

}

 fzzy-igdss-web/src/main/java/com/fzzy/group/manager/GroupManager.java

@@ -1,15 +1,17 @@
package com.fzzy.group.manager;

import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.ChartPie;
import com.fzzy.igds.data.GisData;
import com.fzzy.igds.constant.FoodVariety;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.Depot;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.service.CoreDeptService;
import com.fzzy.igds.service.DepotService;
import com.fzzy.igds.service.DicAreaService;
import com.fzzy.igds.domain.InoutRecord;
import com.fzzy.igds.service.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.utils.DateUtil;
import com.fzzy.igds.utils.NumberUtil;
import com.ruoyi.common.utils.StringUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
@@ -33,6 +35,10 @@
    private CoreDeptService deptService;
    @Resource
    private DepotService depotService;
    @Resource
    private CoreCompanyService coreCompanyService;
    @Resource
    private InoutRecordService inoutRecordService;

    /**
     * èŽ·å–省及下属市州集合
@@ -114,13 +120,144 @@
        return deptService.listDept(null, companyId, null);
    }


    /**
     * ç»Ÿè®¡gis数据，只统计登录人下属的数据统计
     * å¤§å±é¦–页统计信息：企业数、库区数、仓库数、质押仓数、散粮及成品粮数、分品种库存数
     *
     * @param param
     * @return
     */
    public GisData getGisData() {
    public PageResponse<GroupIndexData> getGroupIndexData(IgdsBaseParam param) {

        GisData gisData = new GisData();
        GroupIndexData indexData = new GroupIndexData();

        //企业数
        Integer companyNum = coreCompanyService.getCompanyNum(param.getCompanyId());
        indexData.setCompanyNum(companyNum);

        //库区数
        List<Dept> deptList = deptService.listDept(null, param.getCompanyId(), null);
        if (null != deptList) {
            indexData.setDeptNum(deptList.size());
        }

        ///仓库数及质押仓库数
        List<Depot> depotList = depotService.getCacheDepotList(param.getCompanyId());
        if (null != depotList) {
            Double foodSum = 0.0;
            Double packFoodSum = 0.0;
            indexData.setDepotNum(depotList.size());

            //用于统计分品种库存
            LinkedHashMap<String, Double> varietyMap = new LinkedHashMap<>();
            for (Depot depot : depotList) {
                if(StringUtils.isNotBlank(depot.getPledgeBank())){
                    indexData.setDepotBankNum(indexData.getDepotBankNum() + 1);
                }
                if(null == depot.getStorageReal()){
                    depot.setStorageReal(0.0);
                }
                if(StringUtils.isNotBlank(depot.getStoreType()) && "2".equals(depot.getStoreType())){
                    packFoodSum += depot.getStorageReal()/1000;
                }else {
                    foodSum += depot.getStorageReal()/1000;
                }

                if(depot.getStorageReal() > 0){
                    if(StringUtils.isBlank(depot.getFoodVariety())){
                        //设置为其他品类
                        depot.setFoodVariety("9999000");
                    }

                    varietyMap.putIfAbsent(depot.getFoodVariety(), 0.000);
                    varietyMap.put(depot.getFoodVariety(), varietyMap.get(depot.getFoodVariety()) + NumberUtil.keepPrecision(depot.getStorageReal()/1000, 3));
                }
            }

            for (String mapKey : varietyMap.keySet()) {
                if (varietyMap.get(mapKey) <= 0) {
                    continue;
                }
                indexData.getXaxis().add(FoodVariety.getMsg(mapKey));
                indexData.getSeriesData().add(new DecimalFormat("0.000").format(varietyMap.get(mapKey)));
            }
            indexData.setFoodSum(new DecimalFormat("0.000").format(foodSum));
            indexData.setPackFoodSum(new DecimalFormat("0.000").format(packFoodSum));
        }

        return new PageResponse<>(RespCodeEnum.CODE_0000, indexData);
    }

    /**
     * å¤§å±é¦–页-库区信息统计
     * @param param
     * @return
     */
    public PageResponse<List<GroupDeptData>> indexDeptList(IgdsBaseParam param) {

        List<GroupDeptData> list = new ArrayList<>();
        GroupDeptData deptData;
        List<Dept> deptList = deptService.getDeptData();
        if (null != deptList && !deptList.isEmpty()) {
            List<Depot> depotList;
            for (Dept dept : deptList) {
                deptData = new GroupDeptData();
                deptData.setDeptName(dept.getKqmc());
                deptData.setCode(dept.getXzqhdm());
                deptData.setCounty(dept.getXzqhmc());
                deptData.setJd(dept.getJd());
                deptData.setWd(dept.getWd());

                //统计仓库数
                depotList = depotService.getCacheDepotList(dept.getCompanyId(), dept.getId());
                if (null != depotList && !depotList.isEmpty()) {
                    for (Depot depot : depotList) {
                        deptData.setDepotNumber(deptData.getDepotNumber() + 1);

                        if(StringUtils.isNotBlank(depot.getPledgeBank())){
                            deptData.setDepotBankNumber(deptData.getDepotBankNumber() + 1);
                        }

                        if(null == depot.getStorageReal()){
                            depot.setStorageReal(0.0);
                        }
                        deptData.setStorageNum(deptData.getStorageNum() + depot.getStorageReal()/1000);
                    }
                }

                //统计出入库数量
                InoutParam inoutParam = new InoutParam();
                inoutParam.setDeptId(dept.getId());
                inoutParam.setCompanyId(param.getCompanyId());
                inoutParam.setStart(DateUtil.getCurZero(new Date()));
                inoutParam.setEnd(DateUtil.getNextZero(new Date()));
                List<InoutRecord> inoutRecords = inoutRecordService.listInout(inoutParam);
                if (null != inoutRecords && !inoutRecords.isEmpty()) {
                    for (InoutRecord inoutRecord : inoutRecords) {
                        if (Constant.TYPE_IN.equals(inoutRecord.getType())) {
                            deptData.setInNum(deptData.getInNum() + 1);
                        }
                        if (Constant.TYPE_OUT.equals(inoutRecord.getType())){
                            deptData.setOutNum(deptData.getOutNum() + 1);

                        }
                    }
                }
                list.add(deptData);
            }
        }

        return new PageResponse<>(RespCodeEnum.CODE_0000, list);
    }

    /**
     * ç»Ÿè®¡gis数据，只统计登录人下属的数据统计
     *
     * @return
     */
    public GroupGisData getGisData() {

        GroupGisData groupGisData = new GroupGisData();

        //查询伊犁下属区县
        //区县
@@ -138,7 +275,7 @@
        List<Dept> deptList = deptService.getDeptData();
        if (null != deptList && !deptList.isEmpty()) {
            //库区总数
            gisData.setDeptNum(deptList.size());
            groupGisData.setDeptNum(deptList.size());
            for (Dept dept : deptList) {
                if (StringUtils.isBlank(dept.getXzqhdm()) || null == valuePieChart.get(dept.getXzqhdm())) {
                    if(null == valuePieChart.get("999999")){
@@ -151,33 +288,33 @@
            }
        }

        if(gisData.getDeptNum() > 0){
        if(groupGisData.getDeptNum() > 0){
            for (String mapKey : valuePieChart.keySet()) {
                gisData.getDeptList().add(new ChartPie(valuePieChart.get(mapKey) + "", namePieChart.get(mapKey), new DecimalFormat("0.0").format((double)valuePieChart.get(mapKey) / gisData.getDeptNum() * 100)));
                groupGisData.getDeptList().add(new ChartPie(valuePieChart.get(mapKey) + "", namePieChart.get(mapKey), new DecimalFormat("0.0").format((double)valuePieChart.get(mapKey) / groupGisData.getDeptNum() * 100)));
            }
        }

        //统计重量
        List<Depot> depotLisst = depotService.getData(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), false);
        if (null != depotLisst && !depotLisst.isEmpty()) {
            for (Depot depot : depotLisst) {
        List<Depot> depotList = depotService.getData(ContextUtil.getCompanyId(), ContextUtil.subDeptId(null), false);
        if (null != depotList && !depotList.isEmpty()) {
            for (Depot depot : depotList) {
                if(null == depot.getStorageReal()){
                    depot.setStorageReal(0.0);
                }
                gisData.setSum(gisData.getSum() + depot.getStorageReal());
                groupGisData.setSum(groupGisData.getSum() + depot.getStorageReal());
                if(StringUtils.isNotBlank(depot.getPledgeBank())){
                    gisData.setBankSum(gisData.getBankSum() + depot.getStorageReal());
                    groupGisData.setBankSum(groupGisData.getBankSum() + depot.getStorageReal());
                }else{
                    gisData.setNormalSum(gisData.getNormalSum() + depot.getStorageReal());
                    groupGisData.setNormalSum(groupGisData.getNormalSum() + depot.getStorageReal());
                }
            }
        }
        if(gisData.getSum() > 0){
            gisData.setSumPer(new DecimalFormat("0.00").format(gisData.getSum() / gisData.getSum() * 100L));
            gisData.setBankSumPer(new DecimalFormat("0.00").format(gisData.getBankSum() / gisData.getSum() * 100L));
            gisData.setNormalSumPer(new DecimalFormat("0.00").format(gisData.getNormalSum() / gisData.getSum() * 100L));
        if(groupGisData.getSum() > 0){
            groupGisData.setSumPer(new DecimalFormat("0.00").format(groupGisData.getSum() / groupGisData.getSum() * 100L));
            groupGisData.setBankSumPer(new DecimalFormat("0.00").format(groupGisData.getBankSum() / groupGisData.getSum() * 100L));
            groupGisData.setNormalSumPer(new DecimalFormat("0.00").format(groupGisData.getNormalSum() / groupGisData.getSum() * 100L));
        }

        return gisData;
        return groupGisData;
    }
}

 fzzy-igdss-web/src/main/resources/static/group/gis-chart.js

@@ -17,7 +17,7 @@
                return params.name + ': ' + params.value;
            }
        },
        color: ['#FF6B6B','#4ECDC4','#45B7D1','#96CEB4','#FECA57','#FF9FF3','#54A0FF','#5F27CD','#00D2D3','#FF7675','#208620'],
        color: ['#96CEB4','#4ECDC4','#45B7D1','#FF6B6B','#FECA57','#FF9FF3','#54A0FF','#5F27CD','#00D2D3','#FF7675','#208620'],
        series: [
            {
                name: '',

 fzzy-igdss-web/src/main/resources/static/group/index.js

@@ -1,55 +1,57 @@
var nowClientWidth = document.documentElement.clientWidth; // å½“前视口宽度
var hisVarietyChart = null;   // å“ç§æŸ±çŠ¶å›¾
var deptAreaAllList = null;   // æ‰€æœ‰åº“区列表信息
var deptAreaList = null;      // å­˜æ”¾åˆ‡æ¢åº“区列表信息
var companyList = null;       // å…¬å¸ä¿¡æ¯
var deptList = null;   // æ‰€æœ‰åº“区列表信息
var deptCode = null;          // å½“前闪烁地区的编码
var timer1;     // åº“区定时
var index1 = 0; // åº“区切换下标
var timer2;     // ç²®é£Ÿæ•°é‡å®šæ—¶
var index2 = 0; // ç²®é£Ÿæ•°é‡åˆ‡æ¢ä¸‹æ ‡
var number2 = 2;// ç²®é£Ÿæ•°é‡åˆ‡æ¢æ€»æ•°é‡
var timer3;     // å‚¨é‡é¥¼å›¾å®šæ—¶
var index3 = 0; // å‚¨é‡é¥¼å›¾åˆ‡æ¢ä¸‹æ ‡
var number3 = 2;// å‚¨é‡é¥¼å›¾åˆ‡æ¢æ€»æ•°é‡

var timer;     // åº“区定时
var deptNum = 0;  //库区切换下标
var mapChart = null;
var geoMap = [{name: '伊犁哈萨克自治州', value: [81.317946, 43.92186]}]; //默认点位
var map = chinaMapOutline; //默认加载全国地图

$(function () {
    // åˆå§‹åŒ–页面
    init();

    // åˆå§‹åŒ–WebSocket
    initWS(companyId,bizType, bizTag, userId);
    // initWS(companyId,bizType, bizTag, userId);
});

// åˆå§‹åŒ–页面
function init() {
    // é€‚应屏幕大小
    initScrollbar();
    // æ—¶é—´
    initTime();

    // åˆå§‹åŒ–图表
    initChart();
    //初始化标语
    initDicSlogan();

    //初始化地图
    initMap();

    // æ—¶é—´
    initTime();

    //初始化标语
    initDicSlogan();

    //加载指定地区地图
    renderMapPoints("乌鲁木齐市,克拉玛依市,吐鲁番市,哈密市,昌吉回族自治州,博尔塔拉蒙古自治州,巴音郭楞蒙古自治州,阿克苏地区,克孜勒苏柯尔克孜自治州,喀什地区,和田地区,伊犁哈萨克自治州,塔城地区,阿勒泰地区");

    //TODO ç»Ÿè®¡ç›¸å…³æ•°é‡ä¿¡æ¯ï¼ŒåŒ…含库点及粮食数量
    // ajaxFoodNum();
    //统计相关数量信息，包含库点及粮食数量
    ajaxFoodNum();

    //TODO è¯·æ±‚监管库区信息
    // ajaxDeptArea();
    //请求监管库区信息
    ajaxDeptList();

    clearInterval(timer);
    timing();

    //TODO è¯·æ±‚AI事件信息
    // ajaxMsg();

    //TODO è¯·æ±‚抓拍跟踪信息
    // ajaxFoodNum();



    //抓拍跟踪滚动
    jQuery(".block2").slide({ mainCell: ".bd ul", autoPage: true, effect: "topLoop", autoPlay: true, vis: 4 });
@@ -63,6 +65,20 @@
        dicSlogan = data;
        initDicSlogan();
    }
}

/**
 * åº“区定时切换
 */
function timing() {
    timer = setInterval(function() {
        if(deptNum === deptList.length){
            deptNum = 0;
        }

        renderDeptInfo();
        deptNum += 1;
    }, 5000);
}

//加载库区地图位置
@@ -96,15 +112,15 @@
    geoMap = [];
    for (var j = 0; j < names.length; j++) {
        for (var i = 0; i < all.length; i++) {
            if(all[i].properties.name == names[j]){
            if(all[i].properties.name === names[j]){
                map.features.push(all[i]);
                if(all[i].properties.name == "伊犁哈萨克自治州"){
                // if(all[i].properties.name === "伊犁哈萨克自治州"){
                    geoMap.push({
                        name: all[i].properties.centerName,
                        value: [all[i].properties.center[0], all[i].properties.center[1], 12]
                    });
                }
                renderMap();
                // }
                // renderMap();
                break;
            }
        }
@@ -273,26 +289,6 @@
}

/**
 * èŽ·å–公司信息
 */
function ajaxCompany() {
    $.ajax({
        type: "POST",
        url: "../../visual/index-company",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify({
            "companyId": companyId
        }),
        success: function (result) {
            if (result.code == "0000") {
                companyList = result.data;
            }
        }
    });
}

/**
 * è¯·æ±‚获取动态信息
 */
function ajaxMsg() {
@@ -393,25 +389,43 @@
/**
 * è¯·æ±‚获取库区相关信息
 */
function ajaxDeptArea() {
    // $.ajax({
    //     type: "POST",
    //     url: "../../visual/index-dept-area",
    //     dataType: "json",
    //     contentType: "application/json;charset=UTF-8",
    //     data: JSON.stringify({
    //         "companyId": companyId
    //     }),
    //     success: function (result) {
    //         if (result.code == "0000") {
    //             deptAreaAllList = result.data;
    //             getChangeDeptArea(null);
    //         }
    //     },
    //     error: function (error) {
    //
    //     }
    // });
function ajaxDeptList() {
    deptList = null;
    $.ajax({
        type: "POST",
        url: "/group/index-dept-list",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify({
            "companyId": companyId
        }),
        success: function (result) {
            if (result.code == "0000") {
                deptList = result.data;
                renderDeptInfo();
            }
        },
        error: function (error) {

        }
    });
}

/**
 * æ¸²æŸ“库区信息
 */
function renderDeptInfo() {
    if (deptList == null || deptList.length <= 0) {
        return;
    }

    $("#county").html(deptList[deptNum].county);
    $("#deptName").html(deptList[deptNum].deptName);
    $("#inNum").html(deptList[deptNum].inNum);
    $("#outNum").html(deptList[deptNum].outNum);
    $("#depotNumber").html(deptList[deptNum].depotNumber);
    $("#depotBankNumber").html(deptList[deptNum].depotBankNumber);
    $("#storageNum").html(deptList[deptNum].storageNum);

    //加载库区地图
    geoMap = updateDeptMap();
@@ -423,12 +437,12 @@
    $.each(deptList, function(index, item) {
        var val = [];
        var name = '';
        // if(index == deptNum){
        //     name = item.name;
        //     val = [item.lon, item.lat, 17];
        // }else {
        if(index === deptNum){
            name = item.deptName;
            val = [item.jd, item.wd, 17];
        }else {
            val = [item.jd, item.wd, 8];
        // }
        }
        points.push({
            name: name,
            value: val
@@ -520,19 +534,19 @@
}

/**
 * è¯·æ±‚获取相关数量信息
 * è¯·æ±‚获取统计数量信息
 */
function ajaxFoodNum() {
    $.ajax({
        type: "POST",
        url: "../../visual/index-food-number",
        url: "/group/index-num",
        dataType: "json",
        contentType: "application/json;charset=UTF-8",
        data: JSON.stringify({
            "companyId": companyId
        }),
        success: function (result) {
            if (result.code == "0000") {
            if (result.code === "0000") {
                var data = result.data;
                renderFoodNum(data);
            }
@@ -543,7 +557,10 @@
    });
}

// æ›´æ–°åº“区信息
/**
 * æ¸²æŸ“统计数量信息
 * @param data
 */
function renderFoodNum(data) {

    if (!data) {
@@ -552,24 +569,17 @@

    /*----- ç›‘管库点信息 -----*/
    $("#companyNum").html(data.companyNum);
    $("#deptAreaNum").html(data.deptAreaNum);
    $("#depotSum").html(data.depotNum);
    $("#deptNum").html(data.deptNum);
    $("#depotNum").html(data.depotNum);
    $("#depotBankNum").html(data.depotBankNum);

    /*----- ç›‘管数量信息 -----*/
    if (data.foodSum.length > 8 || data.oilSum.length > 8) {
    if (data.foodSum.length > 8 || data.packFoodSum.length > 8) {
        $("#foodSum").css("font-size", "32px");
        $("#oilSum").css("font-size", "32px");
        $("#packFoodSum").css("font-size", "32px");
    }
    $("#foodSum").html(data.foodSum);
    $("#oilSum").html(data.oilSum);

    if (data.goodsFoodSum.length > 8 || data.goodsOilSum.length > 8) {
        $("#goodsFoodSum").css("font-size", "32px");
        $("#goodsOilSum").css("font-size", "32px");
    }
    $("#goodsFoodSum").html(data.goodsFoodSum);
    $("#goodsOilSum").html(data.goodsOilSum);

    $("#packFoodSum").html(data.packFoodSum);

    /*----- åˆ†å“ç§æŸ±çŠ¶å›¾ -----*/
    if (data.xaxis.length > 0 && data.seriesData.length > 0) {
@@ -579,125 +589,6 @@
        hisFoodVariety.chart.setOption(hisFoodVariety.option, true);
        hisVarietyChart = hisFoodVariety;
    }

    // ç²®é£Ÿç›‘管数量切换
    foodNumSwitch();
    // ç²®é£Ÿé¥¼å›¾åˆ‡æ¢
    pieChartSwitch();
}

/* ---------- ç²®é£Ÿæ•°é‡ç›‘管切换 ---------- */
function foodNumSwitch() {
    $(".lb-body .right-topInfo-jg").eq(0).show().siblings().hide();
    StartLunbo();

    $(".lb-tab").hover(function () {
        clearInterval(timer2);
        index2 = $(this).index();
        ShowPicTab();
    }, function () {
        StartLunbo();
    });

    $(".lb-btn1").click(function () {
        clearInterval(timer2);
        index2--;
        if (index2 == -1) {
            index2 = number2 - 1;
        }

        ShowPicTab();
        StartLunbo();
    });

    $(".lb-btn2").click(function () {
        clearInterval(timer2);
        index2++;
        if (index2 == number2) {
            index2 = 0;
        }
        ShowPicTab();
        StartLunbo();
    });
}

function ShowPicTab() {
    if (index2 === 0) {
        $("#foodNumTitle").html("储备粮油");
    } else if (index2 === 1) {
        $("#foodNumTitle").html("商品粮油");
    }
    // else if (index2 === 2) {
    //     $("#foodNumTitle").html("小包装粮油");
    // }
    $(".lb-body .right-topInfo-jg").eq(index2).fadeIn(300).siblings().fadeOut(300);
    $(".lb-tab").eq(index2).addClass("bg").siblings().removeClass("bg");
}

function StartLunbo() {
    timer2 = setInterval(function () {
        index2++;
        if (index2 >= number2) {
            index2 = 0;
        }
        ShowPicTab();
    }, 3000);
}

/* ---------- ç²®é£Ÿé¥¼å›¾åˆ‡æ¢ ---------- */
function pieChartSwitch() {
    $(".tubiao-Carousel .stats-chart-box").eq(0).show().siblings().hide();
    StartCarousel();

    $(".carousel-tab").hover(function () {
        clearInterval(timer3);
        index3 = $(this).index();
        ShowTubiao();

    }, function () {
        StartCarousel();
    });

    $(".carousel-btn1").click(function () {
        clearInterval(timer3);
        index3--;
        if (index3 == -1) {
            index3 = number3 - 1;
        }

        ShowTubiao();
        StartCarousel();
    });

    $(".carousel-btn2").click(function () {
        clearInterval(timer3);
        index3++;
        if (index3 == number3) {
            index3 = 0;
        }
        ShowTubiao();
        StartCarousel();
    });
}

function ShowTubiao() {
    if (index3 === 0) {
        $("#pieCharTitle").html("粮食数量统计(吨)");
    } else if (index3 === 1) {
        $("#pieCharTitle").html("油脂数量统计(吨)");
    }
    $(".tubiao-Carousel .stats-chart-box").eq(index3).fadeIn(300).siblings().fadeOut(300);
    $(".carousel-tab").eq(index3).addClass("bg").siblings().removeClass("bg");
}

function StartCarousel() {
    timer3 = setInterval(function () {
        index3++;
        if (index3 >= number3) {
            index3 = 0;
        }
        ShowTubiao();
    }, 3000);
}

// åˆ·æ–°æ—¶é—´
@@ -740,9 +631,10 @@
    return document.getElementById('inventoryInfo').clientHeight > document.getElementById('inventoryInfoBox').clientHeight;
}

// åˆå§‹åŒ–图表
/**
 * åˆå§‹åŒ–图表
 */
function initChart() {

    /* åº“存图表加载 */
    allInventoryChartLoad(
        ['小麦', '玉米', '稻谷', '成品粮',  '成品油', '其他'],

 fzzy-igdss-web/src/main/resources/templates/group/index.html

@@ -140,15 +140,15 @@
                        </li>
                        <li>
                            <h3>库点（个）</h3>
                            <p id="deptAreaNum">0</p>
                            <p id="deptNum">0</p>
                        </li>
                        <li>
                            <h3>仓库（个）</h3>
                            <p id="depotSum">0</p>
                            <p id="depotNum">0</p>
                        </li>
                        <li>
                            <h3>筒仓（个）</h3>
                            <p id="depotOilSum">0</p>
                            <h3>质押仓（个）</h3>
                            <p id="depotBankNum">0</p>
                        </li>
                    </ul>

@@ -156,7 +156,7 @@
            </div><!-- i-m1 end -->

            <div class="left-m2">
                <div class="panel-title" id="panel-title">监管动态信息</div>
                <div class="panel-title" id="panel-title">AI事件动态</div>

                <div class="panel-content">
                    <div class="panel-content-head">
@@ -168,52 +168,62 @@
                    <div class="panel-content-body" id="inventoryInfoBox">
                        <div id="inventoryInfo">
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区1</span>
                                <span class="body-item sp">伊宁县康达农业发展有限公司</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区2</span>
                                <span class="body-item sp">伊宁县恒达农业发展有限公司</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区3</span>
                                <span class="body-item sp">伊宁县艾西热普烘干厂</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区4</span>
                                <span class="body-item sp">尼勒克县木斯乡潘刚烘干厂</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区5</span>
                                <span class="body-item sp">新疆伊宁保健饲料有限公司库区</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区6</span>
                                <span class="body-item sp">伊宁县凯源玉米种植农民专业合作社</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区7</span>
                                <span class="body-item sp">伊宁县玉源农副产品购销专业合作社</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区8</span>
                                <span class="body-item sp">新疆牟氏谷金农业科技有限责任公司库区</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区9</span>
                                <span class="body-item sp">新疆广泰隆农业发展有限公司</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item">库区10</span>
                                <span class="body-item sp">伊宁县广粮商贸有限公司库区</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item sp">昭苏75团</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
                            <div class="panel-content-body-tr">
                                <span class="body-item sp">昭苏77团</span>
                                <span class="body-item">当日分析一切正常</span>
                                <span class="body-item" style="flex: 0.3;">04/22</span>
                            </div>
@@ -254,7 +264,7 @@
                                            <h3>散粮 (吨)</h3>
                                        </li>
                                        <li>
                                            <p id="oilSum">0</p>
                                            <p id="packFoodSum">0</p>
                                            <h3>成品 (吨)</h3>
                                        </li>
                                    </ul>
@@ -267,33 +277,33 @@
                        <div class="panel-title">库点信息</div>
                        <div class="right-topInfo-address">
                            <i class="i-icon32"><img th:src="@{/img/web/group/icon-address.png}" alt=""></i>
                            <span id="cityAndCounty">乌鲁木齐市</span>
                            <span id="county">乌鲁木齐市</span>
                        </div>
                        <div class="panel-content">

                            <h2 class="right-topInfo-kd-h" id="deptAreaName">库区1</h2>
                            <h2 class="right-topInfo-kd-h" id="deptName">库区1</h2>
                            <div class="right-topInfo-kd">
                                <div class="right-topInfo-kd-item">
                                    <h3>当日入库数（个）</h3>
                                    <p id="depotNum">0</p>
                                    <h3>当日入库单数（个）</h3>
                                    <p id="inNum">0</p>
                                </div>
                                <div class="right-topInfo-kd-item">
                                    <h3>当日出库数（个）</h3>
                                    <p id="depotOilNum">0</p>
                                    <h3>当日出库单数（个）</h3>
                                    <p id="outNum">0</p>
                                </div>
                            </div>
                            <ul class="right-topInfo-kd-list right-topInfo-jg">
                                <li>
                                    <p id="foodNum">0</p>
                                    <p id="depotNumber">0</p>
                                    <h3>仓库数（个）</h3>
                                </li>
                                <li>
                                    <p id="oilNum">0</p>
                                    <h3>储粮数（吨）</h3>
                                    <p id="depotBankNumber">0</p>
                                    <h3>质押仓数（个）</h3>
                                </li>
                                <li>
                                    <p id="area">0</p>
                                    <h3>占地面积（m²）</h3>
                                    <p id="storageNum">0</p>
                                    <h3>库存数（吨）</h3>
                                </li>
                            </ul>
                        </div>