From e1c2b533d242571e7d321b05b3a9da3803004399 Mon Sep 17 00:00:00 2001
From: 钟日健 <5689795+arsn@user.noreply.gitee.com>
Date: Tue, 22 Feb 2022 09:26:30 +0800
Subject: [PATCH] 保安员证电子信息查询修改
---
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 39 +++++++++++++++++++++++++++++++++------
1 files changed, 33 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
index 7e99721..8c10da2 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -17,6 +17,7 @@
import org.springframework.web.bind.annotation.RestController;
import sun.misc.BASE64Encoder;
+import java.io.FileOutputStream;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
@@ -40,11 +41,12 @@
* @return
*/
@GetMapping("/getQrCode")
- public ResponseEntity<byte[]> getQrCode(String securityNumber){
+ public ResponseEntity<byte[]> getQrCode(String securityNumber) throws UnsupportedEncodingException {
// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
String url = "http://223.82.109.183:2080/securityInfo.html";
if (null!=securityNumber) {
- String content = url + "?securityNumber=" + securityNumber;
+ String encoded = URLEncoder.encode(securityNumber,"UTF-8");
+ String content = url + "?securityNumber=" + encoded;
// "&realName=" + one.getRealName() +
// "&age=" + one.getAge() +
// "&sex=" + one.getSex() +
@@ -55,8 +57,8 @@
ResponseEntity<byte[]> aEntity = null;
try {
URLEncoder.encode(content,"utf-8");
- System.out.println("content = " + content);
byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
+
// Set headers
final HttpHeaders headers = new HttpHeaders();
headers.setContentType(MediaType.IMAGE_PNG);
@@ -82,10 +84,35 @@
// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
String url = "http://223.82.109.183:2080/securityInfo.html";
if (null!=securityNumber) {
- String content = url + "?securityNumber=" + securityNumber;
+ String encoded = URLEncoder.encode(securityNumber,"UTF-8");
+ String content = url + "?securityNumber=" + encoded;
byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
String encode = new BASE64Encoder().encode(qrCodeImage);
return "data:image/png;base64,"+encode;
+ }
+ return null;
+ }
+
+
+ /**
+ * 二维码生成base64
+ * @param securityNumber 保安证编号
+ * @return
+ */
+ @GetMapping("/getQrCodeDown")
+ public String getQrCodeDown(String securityNumber) throws Exception{
+// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
+ String url = "http://223.82.109.183:2080/securityInfo.html";
+ if (null!=securityNumber) {
+ String encoded = URLEncoder.encode(securityNumber,"UTF-8");
+ String content = url + "?securityNumber=" + encoded;
+ byte[] qrCodeImage = QRCodeUtil.getQRCodeImage(content, 350, 350);
+ String path = "D:\\QrCode\\";
+ FileOutputStream fileOutputStream = new FileOutputStream(path+securityNumber+".png");
+ fileOutputStream.write(qrCodeImage,0,qrCodeImage.length);
+ fileOutputStream.flush();
+ fileOutputStream.close();
+ return securityNumber;
}
return null;
}
@@ -96,9 +123,9 @@
* @return
*/
@GetMapping("/getUserInfo")
- public UserVO getUserInfo(String securityNumber){
+ public UserVO getUserInfo(String securityNumber,String cardid){
//根据保安员编码查询保安员信息
- return userService.getUserInfoBySecurityNumber(securityNumber);
+ return userService.getUserInfoBySecurityNumber(securityNumber,cardid);
}
}
--
Gitblit v1.9.3