1.托盘二维码类型

blade-biz-common/src/main/java/org/springblade/common/constant/CommonConstant.java

@@ -49,4 +49,19 @@ public interface CommonConstant {
 	 */
 	String DEFAULT_PASSWORD = "123456";
 
+
+	/**
+	 * 默认缓存文件地址
+	 */
+	String  SYSTEMFILEPATH ="/home/java_works/logpm_temp_file/";
+
+
+
+//	/**
+//	 * 默认缓存文件地址
+//	 */
+//	String  SYSTEMFILEPATH ="C:\\Users\\0.0\\Desktop\\汇通\\";
+
+
+
 }

blade-biz-common/src/main/java/org/springblade/common/constant/ModuleNameConstant.java

@@ -8,7 +8,7 @@ public interface ModuleNameConstant {
 	/**
 	 * 如果不需要 ""
 	 */
-	public static final String DEVAUTH ="-zhy";
+	public static final String DEVAUTH ="-lmy";
 
 	/**
 	 * 工厂对接服务名称

blade-biz-common/src/main/java/org/springblade/common/utils/QRCodeUtil.java

@@ -9,6 +9,7 @@ import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springblade.common.constant.CommonConstant;
 
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
@@ -53,7 +54,7 @@ public class QRCodeUtil {
 //			ClassLoader classLoader = QRCodeUtil.class.getClassLoader();
 //			URL resource = classLoader.getResource("resources/static/");
 //			File file = new File(resource.getFile());
-			String imgPath = "/resources/static/";
+			String imgPath = CommonConstant.SYSTEMFILEPATH;
 			File codeImgFileSaveDir = new File(imgPath);
 			//1. 使用UUID重新生成文件名，防止文件名称重复造成文件覆盖
 			String fileName = UUID.randomUUID()  + "." +FileFormat;
@@ -70,7 +71,7 @@ public class QRCodeUtil {
 			BufferedImage bufferedImage = getBufferedImage(content);
 			File codeImgFile = new File(codeImgFileSaveDir, fileName);
 			ImageIO.write(bufferedImage, FileFormat, codeImgFile);
-			fileName = imgPath.substring(1) +"/"+fileName;
+			fileName = imgPath+fileName;
 			return fileName;
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -81,7 +82,7 @@ public class QRCodeUtil {
 	public static String createCodeToFileType(String content) {
 		try {
 			//getResource("/")等同于到resource文件夹下
-			String imgPath = "/resources/static/";
+			String imgPath = CommonConstant.SYSTEMFILEPATH;
 			File codeImgFileSaveDir = new File(imgPath);
 			//1. 使用UUID重新生成文件名，防止文件名称重复造成文件覆盖
 			String fileName = UUID.randomUUID()  + "." +FileFormat;
@@ -98,7 +99,7 @@ public class QRCodeUtil {
 			BufferedImage bufferedImage = getBufferedImageMatrix(content);
 			File codeImgFile = new File(codeImgFileSaveDir, fileName);
 			ImageIO.write(bufferedImage, FileFormat, codeImgFile);
-			fileName = imgPath.substring(1) +"/"+fileName;
+			fileName = imgPath+fileName;
 			return fileName;
 		} catch (Exception e) {
 			e.printStackTrace();

blade-biz-common/src/main/java/org/springblade/common/utils/TemplateUtil.java

@@ -14,10 +14,7 @@ import javax.servlet.http.HttpServletResponse;
 import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
 import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.StringWriter;
+import java.io.*;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Map;
@@ -56,6 +53,30 @@ public class TemplateUtil {
 		return result;
 	}
 
+	/**
+	 * 根据传入的URL 获取地址里面的内容
+	 *
+	 * @param urlAddress
+	 * @return
+	 * @throws Exception
+	 */
+	public static String getTemplateByUrl2( String urlAddress) throws Exception {
+
+		URL url = new URL(urlAddress);
+		HttpURLConnection conn = (HttpURLConnection) url.openConnection();
+		conn.setRequestMethod("GET");
+		conn.connect();
+		BufferedReader reader = new BufferedReader(new InputStreamReader(conn.getInputStream()));
+		StringBuilder content = new StringBuilder();
+		String line;
+		while ((line = reader.readLine()) != null) {
+			content.append(line);
+		}
+		reader.close();
+		return content.toString();
+
+	}
+
 	/**
 	 * 通过get请求得到读取器响应数据的数据流
 	 *

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataTrayServiceImpl.java

@@ -51,6 +51,8 @@ import org.springblade.common.utils.TemplateUtil;
 import org.springblade.core.log.exception.ServiceException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 
+import org.springblade.core.secure.BladeUser;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.utils.Func;
 
 import org.springframework.beans.BeanUtils;
@@ -87,7 +89,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 
   	private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
 
-	 private IWarehouseTrayTypeClient warehouseTrayTypeClient;
+
 
 	 private IBasicPrintTemplateClient basicPrintTemplateClient;
 
@@ -207,7 +209,7 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 	public WarehouseTraybarCode printCode(List<Long> ids) throws Exception {
 		WarehouseTraybarCode warehouseTraybarCode = new WarehouseTraybarCode();
 		List<Map> data = new ArrayList<>();
-		BasicPrintTemplateEntity template = basicPrintTemplateClient.getPrintTemplate();
+		BasicPrintTemplateEntity template = basicPrintTemplateClient.getTrayCode();
 		if (ObjectUtil.isEmpty(template)) {
 			throw new ServiceException("模板内容未找到");
 		}
@@ -217,17 +219,20 @@ public class BasicdataTrayServiceImpl extends BaseServiceImpl<BasicdataTrayMappe
 		if(ObjectUtils.isNull(ids)){
 			throw new ServiceException("参数错误");
 		}
-
+		//查询登录租户
+		BladeUser user = AuthUtil.getUser();
+		user.getTenantId();
 		for (Long id : ids) {
 			WarehouseTrayQRCode trayQRCode = baseMapper.getTray(id);
 			Map<String, Object> map = JSONObject.parseObject(JSONObject.toJSONString(trayQRCode), Map.class);
 			String filename = QRCodeUtil.createCodeToFile(trayQRCode.getTrayCode());
-			map.put("img", getEmpAutograph(filename));
+			map.put("qrCode", getEmpAutograph(filename));
 			String fileTypeName = QRCodeUtil.createCodeToFileType(trayQRCode.getTrayCode());
 			map.put("imgType", getEmpAutograph(fileTypeName));
+			map.put("tenant","汇通物流");
 			data.add(map);
 		}
-
+		warehouseTraybarCode.setDataList(data);
 		return warehouseTraybarCode;
 	}