出入库优化-登记1

jiazx0107@163.com

2023-05-29 135e1039d78e767536d91bcbce04d2efedb2f7b2

 igds-inout/src/main/java/com/ld/igds/inout/manager/InoutDeviceManager.java

@@ -6,12 +6,13 @@
import com.ld.igds.camera.data.ApiCameraResp;
import com.ld.igds.camera.data.ApiSnapReq;
import com.ld.igds.file.CoreFileService;
import com.ld.igds.inout.ApiInoutManager;
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutApiData;
import com.ld.igds.inout.dto.ApiInoutData;
import com.ld.igds.inout.dto.InoutCameraDto;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.dto.InoutSnapImgDto;
import com.ld.igds.io.InoutApiService;
import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.InoutConf;
@@ -49,7 +50,7 @@
    private ApiCameraManager apiCameraManager;


    public InoutApiData getPlateNum(InoutApiData param) {
    public ApiInoutData getPlateNum(ApiInoutData param) {

        //如果使用的是地磅插件获取，则需要调整设备为地磅插件信息
        if (ProtocolEnum.TCP_FZZY_WEIGHT.getCode().equals(param.getProtocol())) {
@@ -60,7 +61,7 @@
                return param;
            }

            InoutApiData pluginWeight = new InoutApiData();
            ApiInoutData pluginWeight = new ApiInoutData();
            pluginWeight = param;
            pluginWeight.setIp(conf.getIp());
            pluginWeight.setPort(conf.getPort());
@@ -74,7 +75,7 @@
        return apiInoutManager.getApiService(param.getProtocol()).getPlateNum(param);
    }

    public InoutApiData getIcCardNum(InoutApiData param) {
    public ApiInoutData getIcCardNum(ApiInoutData param) {

        return apiInoutManager.getApiService(param.getProtocol()).getIcCardNum(param);
    }
@@ -119,14 +120,9 @@

        if (null == conf) return;

        InoutApiData lprData = new InoutApiData(conf);
        ApiInoutData lprData = new ApiInoutData(conf);

        apiInoutManager.getApiService(conf.getProtocol()).initLpr(lprData);
    }


    public String reConnectLpr(InoutApiData param) {
        return apiInoutManager.getApiService(param.getProtocol()).reConnectLpr(param);
    }


@@ -134,7 +130,7 @@
     * @param param
     * @return
     */
    public String noticeWeightDone(InoutApiData param) {
    public String noticeWeightDone(ApiInoutData param) {
        //获取称重主控器配置
        InoutConf conf = getWeightGateway(param.getCompanyId(), param.getDeptId(), param.getSort());

@@ -142,14 +138,14 @@
            return "称重主控未配置，支持失败";
        }

        InoutApiData apiData = new InoutApiData(conf);
        ApiInoutData apiData = new ApiInoutData(conf);
        apiData.setPlateNum(param.getPlateNum());
        apiData.setInoutProgress(param.getInoutProgress());
        apiData.setTime(new Date());

        InoutApiService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());
        ApiInoutService inoutApiService = apiInoutManager.getApiService(conf.getProtocol());

        return inoutApiService.noticeWeightDone(apiData);
       // return inoutApiService.noticeWeightDone(apiData); TODO
        return null;
    }

    /**
@@ -215,7 +211,7 @@
            return;
        }

        InoutApiData apiData = new InoutApiData(conf);
        ApiInoutData apiData = new ApiInoutData(conf);
        apiData.setTime(new Date());
        apiData.setRepeat(2);
        apiData.setWeight(snapImgDto.getWeight());
@@ -244,13 +240,13 @@

        log.debug("-------------登记完成，增加车牌白名单-----------{}", imgDto.getPlateNum());

        InoutApiService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
        ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());

        InoutApiData apiData;
        ApiInoutData apiData;
        for (InoutConf conf : list) {
            apiData = new InoutApiData(conf);
            apiData = new ApiInoutData(conf);
            apiData.setPlateNum(imgDto.getPlateNum());
            inoutApiService.addWhitePlate(apiData);
           // inoutApiService.addWhitePlate(apiData);
        }
    }

@@ -262,13 +258,14 @@
            return;
        }

        InoutApiService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());
        ApiInoutService inoutApiService = apiInoutManager.getApiService(list.get(0).getProtocol());

        InoutApiData apiData;
        ApiInoutData apiData;
        for (InoutConf conf : list) {
            apiData = new InoutApiData(conf);
            apiData = new ApiInoutData(conf);
            apiData.setPlateNum(data.getPlateNum());
            inoutApiService.delWhitePlate(apiData);

           // inoutApiService.delWhitePlate(apiData); TODO
        }
    }