From 13a36aebbe6d9d3d953851c1b433b3d3888928e6 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 21 Dec 2023 14:15:20 +0800
Subject: [PATCH] 获取保安员信息返回修改，获取实时位置接口
---
src/main/java/org/springblade/modules/location/entity/LivePersonLocation.java | 5 ++++-
src/main/java/org/springblade/modules/location/mapper/LivePersonLocationMapper.xml | 16 +++++++++++++++-
src/main/java/org/springblade/modules/location/vo/LivePersonLocationVO.java | 15 +++++++++++++++
src/main/java/org/springblade/modules/qrcode/QrCodeController.java | 5 +++--
4 files changed, 37 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/location/entity/LivePersonLocation.java b/src/main/java/org/springblade/modules/location/entity/LivePersonLocation.java
index 99350d7..c23b97b 100644
--- a/src/main/java/org/springblade/modules/location/entity/LivePersonLocation.java
+++ b/src/main/java/org/springblade/modules/location/entity/LivePersonLocation.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.util.Date;
@@ -25,7 +27,8 @@
private String latitude;
private Long userId;
-
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date recordTime;
}
diff --git a/src/main/java/org/springblade/modules/location/mapper/LivePersonLocationMapper.xml b/src/main/java/org/springblade/modules/location/mapper/LivePersonLocationMapper.xml
index 462a67a..0777cab 100644
--- a/src/main/java/org/springblade/modules/location/mapper/LivePersonLocationMapper.xml
+++ b/src/main/java/org/springblade/modules/location/mapper/LivePersonLocationMapper.xml
@@ -8,6 +8,20 @@
</select>
<select id="getList" resultType="org.springblade.modules.location.vo.LivePersonLocationVO">
- SELECT lpl.* FROM sys_live_person_location lpl
+ SELECT
+ lpl.*,
+ bu.real_name as realName,
+ bu.avatar,
+ bd.dept_name as deptName,
+ sdu.name as dispatchCompany,
+ sd.dispatcherTime as dispatchStartTime,
+ sd.end_time as dispatchEndTime
+ FROM sys_live_person_location lpl
+ LEFT JOIN blade_user bu ON bu.id = lpl.user_id
+ LEFT JOIN blade_dept bd ON bd.id = bu.dept_id
+ 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
+
</select>
</mapper>
diff --git a/src/main/java/org/springblade/modules/location/vo/LivePersonLocationVO.java b/src/main/java/org/springblade/modules/location/vo/LivePersonLocationVO.java
index bb547ee..86768d3 100644
--- a/src/main/java/org/springblade/modules/location/vo/LivePersonLocationVO.java
+++ b/src/main/java/org/springblade/modules/location/vo/LivePersonLocationVO.java
@@ -5,4 +5,19 @@
@Data
public class LivePersonLocationVO extends LivePersonLocation {
+
+ //头像
+ private String avatar;
+
+ //姓名
+ private String realName;
+
+ //公司名称
+ private String deptName;
+
+ private String dispatchCompany;
+
+ private String dispatchStartTime;
+
+ private String dispatchEndTime;
}
diff --git a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
index 67d1a05..c02ba25 100644
--- a/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
+++ b/src/main/java/org/springblade/modules/qrcode/QrCodeController.java
@@ -118,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