From ffb62aac389a6ac596fe8d0d44d4e242beeea0f2 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Thu, 10 Mar 2022 11:46:31 +0800
Subject: [PATCH] 考勤查询接口修改，电子围栏自定义新增、修改，查询一个点是否在电子围栏内接口新增
---
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
index 7f9bcda..f368d26 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -7,6 +7,7 @@
import org.springblade.core.tool.api.R;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IUserService;
+import org.springblade.modules.system.service.MyAsyncService;
import org.springblade.modules.system.vo.UserVO;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
@@ -35,6 +36,8 @@
private final IUserService userService;
+ private final MyAsyncService myAsyncService;
+
/**
* 二维码生成-字节流
* @param securityNumber 保安证编号
@@ -46,7 +49,6 @@
String url = "http://223.82.109.183:2080/securityInfo.html";
if (null!=securityNumber) {
String encoded = URLEncoder.encode(securityNumber,"UTF-8");
- System.out.println("encoded = " + encoded);
String content = url + "?securityNumber=" + encoded;
// "&realName=" + one.getRealName() +
// "&age=" + one.getAge() +
@@ -85,7 +87,8 @@
// 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;
@@ -104,7 +107,8 @@
// 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 path = "D:\\QrCode\\";
FileOutputStream fileOutputStream = new FileOutputStream(path+securityNumber+".png");
@@ -122,9 +126,23 @@
* @return
*/
@GetMapping("/getUserInfo")
- public UserVO getUserInfo(String securityNumber){
+ public UserVO getUserInfo(String securityNumber,String cardid){
//根据保安员编码查询保安员信息
- return userService.getUserInfoBySecurityNumber(securityNumber);
+ return userService.getUserInfoBySecurityNumber(securityNumber,cardid);
+ }
+
+ /**
+ * test
+ * 异步调用测试
+ */
+ @GetMapping("/test")
+ public void test(){
+ //根据保安员编码查询保安员信息
+ for (int i = 0; i < 500; i++) {
+ User user = new User();
+ user.setCardid("cardid"+i);
+ myAsyncService.test(user);
+ }
}
}
--
Gitblit v1.9.3