客户问题优化调整10

czt

2026-02-11 0c665d8cd63cf1d7bd0e800e3989f04061194927

 fzzy-igdss-web/src/main/java/com/fzzy/inout/InoutController.java

@@ -1,6 +1,8 @@
package com.fzzy.inout;

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.Constant;
import com.fzzy.igds.data.*;
import com.fzzy.igds.domain.*;
@@ -20,8 +22,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.net.URLDecoder;
import java.util.Date;
import java.util.List;

@@ -44,17 +48,18 @@

    /**
     * 登记，出入库共用
     *
     * @param httpRequest
     * @param sort         配套号
     * @param type         业务类型：IN-入库，OUT-出库
     * @param sort        配套号
     * @param type        业务类型：IN-入库，OUT-出库
     * @param view
     * @return
     */
    @RequestMapping("/register")
    public String register(HttpServletRequest httpRequest,
                              @RequestParam(value = "sort", required = false) String sort,
                              @RequestParam(value = "type", required = false) String type,
                              ModelMap view) {
                           @RequestParam(value = "sort", required = false) String sort,
                           @RequestParam(value = "type", required = false) String type,
                           ModelMap view) {

        SysUser user = ContextUtil.getLoginUser();
        view.put(Constant.MODEL_KEY_LOGIN_USER, user);
@@ -92,11 +97,16 @@
        InoutConf conf = inoutManager.getInoutConf(listInoutConf, sort, Constant.CONF_TYPE_10, Constant.PROGRESS_REGISTER, 1);
        view.put("lprDto", conf);

        //库区网关信息
        GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
        view.put("gatewaySer", gatewaySer);

        return prefix + "/register";
    }

    /**
     * 质检页面
     *
     * @return
     */
    @RequestMapping("/check")
@@ -140,6 +150,7 @@

    /**
     * 出入库值仓
     *
     * @param httpRequest
     * @param sort
     * @param type
@@ -148,9 +159,9 @@
     */
    @RequestMapping("/handle")
    public String handle(HttpServletRequest httpRequest,
                           @RequestParam(value = "sort", required = false) String sort,
                           @RequestParam(value = "type", required = false) String type,
                           ModelMap view) {
                         @RequestParam(value = "sort", required = false) String sort,
                         @RequestParam(value = "type", required = false) String type,
                         ModelMap view) {

        //如果没有指定地磅，从用户上一个选择中获取
        if (StringUtils.isEmpty(sort)) {
@@ -278,6 +289,9 @@
        view.put("endTime", DateFormatUtils.format(new Date(), "yyyy-MM-dd"));
        view.put("startTime", DateFormatUtils.format(DateUtil.getNewByDay(null, -30), "yyyy-MM-dd"));

        //库区网关信息
        GatewaySer gatewaySer = commonManager.getGatewaySerByDeptId(deptId);
        view.put("gatewaySer", gatewaySer);

        String viewStr = prefix + "/weight";
        if ("1".equals(viewTag)) {
@@ -328,6 +342,7 @@

    /**
     * 根据条件查询待称重的数据
     *
     * @param param
     * @return
     */
@@ -354,6 +369,7 @@

    /**
     * 出入库化验信息提交
     *
     * @param data
     * @return
     */
@@ -366,6 +382,7 @@

    /**
     * 出入库称重环节提交
     *
     * @param data
     * @return
     */
@@ -427,4 +444,48 @@
    public PageResponse<List<InoutNoticeOut>> listNoticeOut(@RequestBody NoticeParam param) {
        return inoutManager.listNoticeOut(param);
    }


    /**
     * 出入库详单页面的可视化追踪页面
     *
     * @return
     */
    @RequestMapping("/inout-img")
    public String inoutImg(@RequestParam(value = "id", required = true) String id,
                           @RequestParam(value = "plateNum", required = false) String plateNum,
                           @RequestParam(value = "user", required = false) String userName,
                           ModelMap view) {
        try {
            if (StringUtils.isNotEmpty(plateNum)) {
                view.put("plateNum", URLDecoder.decode(plateNum, "UtF-8"));
            }
            if (StringUtils.isNotEmpty(userName)) {
                view.put("userName", URLDecoder.decode(userName, "UtF-8"));
            }

            List<FileInfo> files = inoutManager.cutImgList(id);
            view.put("files", files);
        } catch (Exception e) {
            log.error("后台异常:{}", e);
        }
        return prefix + "/inout-img";
    }




    /**
     * 获取视频播放地址
     *
     * @param param
     * @return
     */
    @RequestMapping("/get-media")
    @ResponseBody
    public ApiCameraResp getMedia(@RequestBody InoutConf param) {
        //获取请求方IP
        return inoutManager.getPlayAddr(param);
    }

}