扦样提交3

czt

2023-05-31 ae2c433ecf08e10d55488320e5db0936ca323710

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

@@ -5,13 +5,13 @@
import com.ld.igds.camera.data.ApiCameraData;
import com.ld.igds.camera.data.ApiCameraResp;
import com.ld.igds.camera.data.ApiSnapReq;
import com.ld.igds.data.SnapImgDto;
import com.ld.igds.file.CoreFileService;
import com.ld.igds.inout.ApiInoutManager;
import com.ld.igds.inout.InoutConstant;
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.inout.ApiInoutService;
import com.ld.igds.io.constant.ProtocolEnum;
import com.ld.igds.m.service.InoutCommonService;
@@ -154,7 +154,7 @@
     * @param param
     * @return
     */
    public InoutSnapImgDto snapImg(InoutSnapImgDto param) {
    public SnapImgDto snapImg(SnapImgDto param) {
        try {
            InoutConf conf;

@@ -201,7 +201,7 @@
     *
     * @param snapImgDto
     */
    private void noticeGatewayWeightInfo(InoutSnapImgDto snapImgDto) {
    private void noticeGatewayWeightInfo(SnapImgDto snapImgDto) {

        log.debug("-------------用户确认称重----通知称重网关----{}", snapImgDto.getWeight());
        InoutConf conf = this.getWeightGateway(snapImgDto.getCompanyId(), snapImgDto.getDeptId(), snapImgDto.getSort());
@@ -229,7 +229,7 @@
     *
     * @param imgDto
     */
    private void noticeGatewayAddWhitePlate(InoutSnapImgDto imgDto) {
    private void noticeGatewayAddWhitePlate(SnapImgDto imgDto) {

        List<InoutConf> list = this.getWeightGateway(imgDto.getCompanyId(), imgDto.getDeptId());

@@ -277,7 +277,7 @@
     * @param snapSer
     * @return
     */
    private String snapImgByConf(InoutConf conf, InoutSnapImgDto param, SnapSer snapSer) {
    private String snapImgByConf(InoutConf conf, SnapImgDto param, SnapSer snapSer) {
        if (null == conf) return null;

        if (null == conf.getSnapType()) {