扫码存样7

cement-business/src/main/java/cn/wise/sc/cement/business/controller/SampleController.java

@@ -9,6 +9,7 @@ import cn.wise.sc.cement.business.model.BaseResponse;
 import cn.wise.sc.cement.business.model.PageQuery;
 import cn.wise.sc.cement.business.model.query.SampleManageQuery;
 import cn.wise.sc.cement.business.model.query.SampleScanQuery;
+import cn.wise.sc.cement.business.model.vo.SampleVo;
 import cn.wise.sc.cement.business.service.ISampleService;
 import cn.wise.sc.cement.business.service.ISysDictionaryService;
 import cn.wise.sc.cement.business.util.RedisUtil;
@@ -180,12 +181,20 @@ public class SampleController {
 	@ApiOperation("获取样品二维码")
 	@PostMapping("/samplerq/init")
 	public BaseResponse<String> getSampleRQ(String sampleId) throws IOException {
-
 		if (StrUtil.isBlank(sampleId)) {
 			log.error("生成样品二维码失败!savePosition参数为空!");
 		}
-		ByteArrayOutputStream stream = new ByteArrayOutputStream();
-		BufferedImage bufferedImage = QrCodeUtil.generate(sampleId, 200, 200);
+		SampleVo sampleVo = sampleService.getDetail(Integer.valueOf(sampleId)).getData();
+		String content = "";
+		if(sampleVo != null){
+			content = "样品名称："+sampleVo.getName()+"\n"+
+					"本所编号："+sampleVo.getCementCode()+"\n"+
+					"项目编号："+sampleVo.getProjectCode()+"\n"+
+					"项目名称："+sampleVo.getProjectName()+"\n"+
+					"小样位置："+sampleVo.getLittlePosition();
+		}
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+		BufferedImage bufferedImage = QrCodeUtil.generate(content, 200, 200);
 		ImageIO.write(bufferedImage, "png", stream);
 		stream.close();
 		return BaseResponse.okData(Base64.encode(stream.toByteArray()));