From b431c00a3e736e27599cd34793c65369fdb7b8cd Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 04 Jan 2024 15:50:50 +0800
Subject: [PATCH] 模拟成绩查询修改
---
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
index f966eed..c02ba25 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -2,6 +2,7 @@
import com.google.zxing.WriterException;
import lombok.AllArgsConstructor;
+import org.springblade.common.config.QrcodeConfig;
import org.springblade.common.utils.QRCodeUtil;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.tool.api.R;
@@ -45,17 +46,10 @@
*/
@GetMapping("/getQrCode")
public ResponseEntity<byte[]> getQrCode(String securityNumber) throws UnsupportedEncodingException {
-// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
- String url = "http://61.131.136.25:2080/securityInfo.html";
+ String url = QrcodeConfig.baseUrl + "securityInfo.html";
if (null!=securityNumber) {
String encoded = URLEncoder.encode(securityNumber,"UTF-8");
String content = url + "?securityNumber=" + encoded;
-// "&realName=" + one.getRealName() +
-// "&age=" + one.getAge() +
-// "&sex=" + one.getSex() +
-// "&avatar=" + one.getAvatar() +
-// "&deptName=" + one.getDeptName();
-
ResponseEntity<byte[]> aEntity = null;
try {
@@ -84,8 +78,7 @@
*/
@GetMapping("/getQrCodeBase64")
public String getQrCodeBase64(String securityNumber) throws Exception{
-// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
- String url = "http://61.131.136.25:2080/securityInfo.html";
+ String url = QrcodeConfig.baseUrl + "securityInfo.html";
if (null!=securityNumber) {
String encoded = URLEncoder.encode(securityNumber,"UTF-8");
String content = url + "?securityNumber=" + encoded;
@@ -104,8 +97,7 @@
*/
@GetMapping("/getQrCodeDown")
public String getQrCodeDown(String securityNumber) throws Exception{
-// String url = "http://s16s652780.51mypc.cn/securityInfo/securityInfo.html";
- String url = "http://61.131.136.25:2080/securityInfo.html";
+ String url = QrcodeConfig.baseUrl + "securityInfo.html";
if (null!=securityNumber) {
String encoded = URLEncoder.encode(securityNumber,"UTF-8");
String content = url + "?securityNumber=" + encoded;
@@ -126,9 +118,10 @@
* @return
*/
@GetMapping("/getUserInfo")
- public UserVO getUserInfo(String securityNumber,String cardid){
+ public R getUserInfo(String securityNumber,String cardid){
+ UserVO userInfoBySecurityNumber = userService.getUserInfoBySecurityNumber(securityNumber, cardid);
//根据保安员编码查询保安员信息
- return userService.getUserInfoBySecurityNumber(securityNumber,cardid);
+ return R.data(userInfoBySecurityNumber);
}
/**
--
Gitblit v1.9.3