Merge remote-tracking branch 'origin/master'

sgj

2025-12-25 0d1b8d5609a0dfe7defd79dd6cf6db151413f1d3

 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);
    }

}