|
@@ -8,19 +8,9 @@ import com.abi.qms.platform.dao.enums.InvalidEnum;
|
|
|
import com.abi.qms.platform.dao.mapper.BaseFactoryMapper;
|
|
|
import com.abi.qms.platform.dao.mapper.QrBoxMappingMapper;
|
|
|
import com.abi.qms.platform.dao.tablestore.entity.QrCode;
|
|
|
-import com.abi.qms.platform.dao.vo.result.ActivateDetailVo;
|
|
|
-import com.abi.qms.platform.dao.vo.result.ActivationRecordVO;
|
|
|
-import com.abi.qms.platform.dao.vo.result.PrintingDetailVO;
|
|
|
-import com.abi.qms.platform.dao.vo.result.QrBoxMappingVO;
|
|
|
-import com.abi.qms.platform.dao.vo.result.QueryWxQrBoxMappingDetailsVO;
|
|
|
+import com.abi.qms.platform.dao.vo.result.*;
|
|
|
import com.abi.qms.platform.dto.req.*;
|
|
|
-import com.abi.qms.platform.dto.res.ActivateDetailRes;
|
|
|
-import com.abi.qms.platform.dto.res.ActivationRecordRes;
|
|
|
-import com.abi.qms.platform.dto.res.ListQrBoxCodeMappingRes;
|
|
|
-import com.abi.qms.platform.dto.res.PrintingDetailRes;
|
|
|
-import com.abi.qms.platform.dto.res.QrBoxCodeUploadRes;
|
|
|
-import com.abi.qms.platform.dto.res.QueryWxQrBoxMappingDetailsWxRes;
|
|
|
-import com.abi.qms.platform.dto.res.UploadFileRes;
|
|
|
+import com.abi.qms.platform.dto.res.*;
|
|
|
import com.abi.qms.platform.infrastructure.util.AssertUtil;
|
|
|
import com.abi.qms.platform.infrastructure.util.PageUtil;
|
|
|
import com.abi.qms.platform.infrastructure.util.UserUtil;
|
|
@@ -48,7 +38,6 @@ import java.time.LocalDateTime;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
|
|
@@ -154,11 +143,11 @@ public class QrBoxMappingServiceImpl implements QrBoxMappingService {
|
|
|
doUpload(file, packageId);
|
|
|
resultMap.put(o.getKey(), new UploadFileRes(SUCCESS, "上传箱码合一文件成功!"));
|
|
|
} catch (BusinessException e) {
|
|
|
+ log.warn("文件上传失败",e);
|
|
|
throw new BusinessException(ErrorCodeEnum.FAIL.getCode(), "文件上传失败");
|
|
|
-// resultMap.put(o.getKey(), new UploadFileRes(FAIL, e.getMessage()));
|
|
|
} catch (Exception e) {
|
|
|
+ log.warn("文件上传异常",e);
|
|
|
throw new BusinessException(ErrorCodeEnum.FAIL.getCode(), "文件上传异常");
|
|
|
-// resultMap.put(o.getKey(), new UploadFileRes(FAIL, e.getMessage()));
|
|
|
}
|
|
|
});
|
|
|
|