获取出入库id，逻辑优化调整

sgj

2026-03-27 878b6958363308a7d07b7b8197dc19662f3e1198

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

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

import com.fzzy.common.manager.CommonManager;
import com.fzzy.group.manager.GroupManager;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.domain.Dept;
import com.fzzy.igds.domain.DicArea;
import com.fzzy.igds.domain.Slogan;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.utils.ContextUtil;
import com.fzzy.igds.websocket.WebSocketPacket;
import com.fzzy.common.manager.CommonManager;
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;

@@ -53,8 +55,8 @@
        view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);

        //查询库区信息
        List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
        view.put("deptList", deptList);
        List<Dept> deptList = groupManager.getDeptList();
        view.put("deptAllList", deptList);

        return prefix + "/index";
    }
@@ -80,7 +82,7 @@
        view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);

        //查询库区信息
        List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
        List<Dept> deptList = groupManager.getDeptList();
        view.put("deptList", deptList);

        return prefix + "/video";
@@ -116,10 +118,119 @@
        view.put("allArea", allArea);

        //获取所有库区
        List<Dept> deptList = groupManager.getAllDept(user.getCompanyId());
        List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
        view.put("deptList", deptList);

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

        return prefix + "/gis";
    }


    /**
     * 总览大屏页面
     * @return
     */
    @RequestMapping("/gis_modeling")
    public String gisModeling(ModelMap view) {
        SysUser user = ContextUtil.getLoginUser();
        view.put(Constant.MODEL_KEY_LOGIN_USER, user);

        view.put("deptId", user.getDeptId());

        view.put("sysName", "智慧粮库质押监管大屏");
        // 标语
        Slogan dicSlogan = commonManager.getDicSlogan();
        view.put("dicSlogan", dicSlogan);

        view.put("bizType", "screen");
        view.put("bizTag", WebSocketPacket.BIZ_TAG_COMMON);


        //获取新疆区划信息
        List<DicArea> areaList = groupManager.getBankAndChildDept("650000");
        view.put("areaList", areaList);

        //获取所有库区
        List<GroupDeptData> deptList = groupManager.getDeptData(user.getCompanyId());
        view.put("deptList", deptList);
        String deptId = (deptList != null && !deptList.isEmpty()) ? deptList.get(0).getDeptId() : null;
        view.put("defaultDeptId", deptId != null ? deptId : "5372001001");
        //获取所有仓库
        List<GroupDepotData> depotList = groupManager.getDepotData(user.getCompanyId());
        view.put("depotList", depotList);

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

        return prefix + "/gis_modeling";
    }


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

        return groupManager.getGroupIndexData(param);
    }

    /**
     * @param param
     * @return
     */
    @RequestMapping("/camera-list")
    @ResponseBody
    public PageResponse<List<Camera>> cameraList(@RequestBody IgdsBaseParam param) {

        return groupManager.cameraList(param);
    }

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

        return groupManager.indexDeptList(param);
    }

//    /**
//     * 首页--抓拍跟踪信息
//     *
//     * @param param
//     * @return
//     */
//    @RequestMapping("/index-snap-list")
//    @ResponseBody
//    public PageResponse<List<SnapRecord>> indexSnapList(@RequestBody IgdsBaseParam param) {
//
//        return groupManager.indexSnapList(param);
//    }

    /**
     * 首页--抓拍跟踪信息
     *
     * @param param
     * @return
     */
    @RequestMapping("/index-snap-list")
    @ResponseBody
    public PageResponse<List<EventInfo>> indexSnapList(@RequestBody IgdsBaseParam param) {

        return groupManager.indexEventInfoList(param);
    }

}