巡检轨迹查看修改

sgj

2026-03-02 06f4d2f5cc46ffa9402dcb4e6bec08fbab2bcfa6

 fzzy-igdss-web/src/main/java/com/fzzy/security/manager/SecManager.java

@@ -4,9 +4,13 @@
import com.fzzy.igds.camera.ApiCameraManager;
import com.fzzy.igds.camera.data.ApiCameraData;
import com.fzzy.igds.camera.data.ApiCameraResp;
import com.fzzy.igds.constant.DepotType;
import com.fzzy.igds.constant.OrderRespEnum;
import com.fzzy.igds.constant.RespCodeEnum;
import com.fzzy.igds.data.*;
import com.fzzy.igds.data.GroupIndexData;
import com.fzzy.igds.data.IgdsBaseParam;
import com.fzzy.igds.data.PageResponse;
import com.fzzy.igds.data.PatrolSuperData;
import com.fzzy.igds.domain.*;
import com.fzzy.igds.io.manager.QuantityRemoteManager;
import com.fzzy.igds.io.service.RemoteQuantityService;
@@ -19,14 +23,10 @@
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;

import javax.annotation.Resource;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

/**
 * @Description
@@ -229,9 +229,9 @@
     * @param patrolId
     * @return
     */
    public List<PatrolRecord> getRecordByPatrolId(String patrolId) {
    public List<PatrolRecord> getRecordByPatrolId(String patrolId,String userId,String confId) {

        List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId);
        List<PatrolRecord> patrolRecords = patrolService.getRecordByPatrolId(patrolId,userId,confId);

        if (null != patrolRecords && !patrolRecords.isEmpty()) {
            //判断文件是否存在
@@ -361,6 +361,7 @@
        request.setDeptId(conf.getDeptId());
        request.setSn(conf.getSn());
        request.setLength(conf.getLength());
        request.setExeUser(ContextUtil.getLoginUserName());

        request.setBatchId(conf.getDepotId() + "_" + DateFormatUtils.format(new Date(), "yyyyMMddHHmm"));

@@ -403,4 +404,42 @@

        return remoteQuantityService.checkStop(request);
    }


    /**
     * 获取油罐油情及液位信息
     *
     * @param deptId
     * @return
     */
    public List<Quantity> getHeightList(String deptId) {

        if (StringUtils.isEmpty(deptId)) {
            deptId = ContextUtil.subDeptId(null);
        }
        //获取所有筒仓及浅圆仓
        List<Depot> depotList = commonManager.listAllDepot(deptId, DepotType.TYPE_02.getCode() + "," + DepotType.TYPE_04.getCode());
        if (null == depotList || depotList.isEmpty()) {
            return null;
        }

        List<Quantity> list = new ArrayList<>();
        List<Quantity> quantityList;
        Quantity quantity;
        for (Depot depot : depotList) {

            quantityList = quantityService.getQuantityList(depot.getId(), 1);
            if (null == quantityList || quantityList.isEmpty()) {
                quantity = new Quantity();
                quantity.setDepotId(depot.getId());
            }else {
                quantity = quantityList.get(0);
            }
            quantity.setDepotData(depot);

            list.add(quantity);
        }

        return list;
    }
}