From d47e5818d63bef779ff8c4cef79382ae63e99fb4 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 16:30:28 +0800
Subject: [PATCH] 二维码生成修改，保安员证信息查询修改
---
src/main/java/org/springblade/modules/system/mapper/UserMapper.xml | 20 ++++++++++
src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java | 13 ++++++
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 7 ++-
src/main/java/org/springblade/modules/system/mapper/UserMapper.java | 7 +++
src/main/java/org/springblade/modules/system/vo/UserVO.java | 18 +++++++++
5 files changed, 61 insertions(+), 4 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..6cd8734 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -46,7 +46,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 +84,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 +104,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");
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
index d5e20bc..61637ce 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.java
@@ -227,4 +227,11 @@
* @return
*/
List<Map<String, Object>> selectEquipent();
+
+ /**
+ * 查詢派遣信息
+ * @param id 用戶id
+ * @return
+ */
+ DispatcherVO getUserDispatcherInfo(Long id);
}
diff --git a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
index 561990c..220ebc5 100644
--- a/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
+++ b/src/main/java/org/springblade/modules/system/mapper/UserMapper.xml
@@ -804,4 +804,24 @@
AND equipment_code IS NOT NULL
</select>
+ <!--查詢用戶派遣記錄信息-->
+ <select id="getUserDispatcherInfo" resultType="org.springblade.modules.dispatcher.vo.DispatcherVO">
+ select
+ sdu.name dispatcherCompany,
+ dispatcherTime dispatchertime,
+ sd.end_time endTime
+ from blade_user bu
+ left join
+ sys_dispatcher sd
+ on
+ sd.user_ids = bu.id
+ left join
+ sys_dispatcher_unit sdu
+ on
+ sdu.id = sd.dispatcher_unit_id
+ where 1=1
+ and sd.status = 0
+ and bu.dispatch = 0
+ and bu.id = #{id}
+ </select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
index 9c66160..0d22d61 100644
--- a/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
+++ b/src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java
@@ -42,6 +42,7 @@
import org.springblade.core.tool.utils.*;
import org.springblade.modules.FTP.FtpUtil;
import org.springblade.modules.auth.enums.UserEnum;
+import org.springblade.modules.dispatcher.entity.Dispatcher;
import org.springblade.modules.dispatcher.vo.DispatcherVO;
import org.springblade.modules.experience.entity.Experience;
import org.springblade.modules.experience.service.IExperienceService;
@@ -1390,7 +1391,17 @@
*/
@Override
public UserVO getUserInfoBySecurityNumber(String securityNumber) {
- return baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ UserVO userVO = baseMapper.getUserInfoBySecurityNumber(securityNumber);
+ //查询派遣信息
+ if (null!=userVO) {
+ DispatcherVO dispatcherVO = baseMapper.getUserDispatcherInfo(userVO.getId());
+ if (null != dispatcherVO) {
+ userVO.setDispatchUnitName(dispatcherVO.getDispatcherCompany());
+ userVO.setDispatchStartTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getDispatchertime()));
+ userVO.setDispatchEndTime(new SimpleDateFormat("yyyy-MM-dd").format(dispatcherVO.getEndTime()));
+ }
+ }
+ return userVO;
}
diff --git a/src/main/java/org/springblade/modules/system/vo/UserVO.java b/src/main/java/org/springblade/modules/system/vo/UserVO.java
index 83ee7b2..ecbc64f 100644
--- a/src/main/java/org/springblade/modules/system/vo/UserVO.java
+++ b/src/main/java/org/springblade/modules/system/vo/UserVO.java
@@ -134,4 +134,22 @@
private String candidateNo;
+ /**
+ * 派遣单位名称
+ */
+ private String dispatchUnitName;
+
+ /**
+ * 派遣开始时间
+ */
+ private String dispatchStartTime;
+
+ /**
+ * 派遣结束时间
+ */
+ private String dispatchEndTime;
+
+
+
+
}
--
Gitblit v1.9.3