From 742960dec9dc5fa054822d99968a2679ddd878cd Mon Sep 17 00:00:00 2001
From: zhitong.yu <xynz17@163.com>
Date: 星期四, 11 十二月 2025 18:32:22 +0800
Subject: [PATCH] BS通用版本1.2.0 实时位置接口压缩
---
src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java | 1 +
src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java | 1 +
src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java | 1 +
src/main/resources/mapper/Person/TbPersonMapper.xml | 2 +-
src/main/java/com/hxzk/gps/entity/Person/TbPerson.java | 2 ++
src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java | 10 ++++++++--
src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java | 1 +
src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java | 1 +
src/main/resources/application.yml | 4 ++--
9 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java b/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java
index 1ae23ea..361c854 100644
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java
+++ b/src/main/java/com/hxzk/gps/controller/Cabinet/TbFakalogController.java
@@ -34,3 +34,4 @@
}
}
+
diff --git a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java b/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java
index cc85cb7..30a364e 100644
--- a/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java
+++ b/src/main/java/com/hxzk/gps/controller/Cabinet/deo/TableSearchResultFakalog.java
@@ -23,3 +23,4 @@
private String endSaveTime;
}
+
diff --git a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java b/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java
index fc8e4fb..84c2ffe 100644
--- a/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java
+++ b/src/main/java/com/hxzk/gps/entity/Cabinet/TbFakalog.java
@@ -81,3 +81,4 @@
}
+
diff --git a/src/main/java/com/hxzk/gps/entity/Person/TbPerson.java b/src/main/java/com/hxzk/gps/entity/Person/TbPerson.java
index c67d8c8..28e94cb 100644
--- a/src/main/java/com/hxzk/gps/entity/Person/TbPerson.java
+++ b/src/main/java/com/hxzk/gps/entity/Person/TbPerson.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonInclude;
import lombok.Data;
import java.io.Serializable;
@@ -17,6 +18,7 @@
*/
@Data
@TableName("tb_person")
+@JsonInclude(JsonInclude.Include.NON_NULL) // 搴忓垪鍖栨椂鑷姩蹇界暐 null 鍊硷紝鍑忓皯鍝嶅簲澶у皬锛屾�ц兘鏈�浼�
public class TbPerson implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java b/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java
index e051d3b..ebdffcb 100644
--- a/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java
+++ b/src/main/java/com/hxzk/gps/mapper/Cabinet/TbFakalogMapper.java
@@ -15,3 +15,4 @@
}
+
diff --git a/src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java b/src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java
index df97fc3..f6d2ea8 100644
--- a/src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java
+++ b/src/main/java/com/hxzk/gps/service/Cabinet/TbFakalogService.java
@@ -25,3 +25,4 @@
}
+
diff --git a/src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java b/src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java
index 645b09f..02cede1 100644
--- a/src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java
+++ b/src/main/java/com/hxzk/gps/service/impl/Person/TbPersonServiceImpl.java
@@ -91,7 +91,11 @@
// 鎺掑簭
queryWrapper.orderByDesc("p_tagid");
-
+ // 娣诲姞杞﹁締鏍囩鏉′欢
+ queryWrapper.and(wrapper ->
+ wrapper.eq("baoliu19", "绯荤粺榛樿")
+ .or()
+ .eq("baoliu19", "LORA鏍囩"));
// 鏂瑰紡1锛氫娇鐢≒ageHelper鐨勫垎椤垫煡璇�
Page<TbPerson> page = PageHelper.startPage(personTreeTableDto.getPageNum(), personTreeTableDto.getPageSize())
.doSelectPage(() -> baseMapper.selectList(queryWrapper));
@@ -199,7 +203,8 @@
List<Long> list = companyService.getChildCompanyIds(UserInfoUtil.getUserCompanyId());
list.add(Long.valueOf(UserInfoUtil.getUserCompanyId()));
List<TbPerson> info = personMapper.RealPosition(list);
- return ListDataResult.resultListSuccess(info,MessageUtils.getMessage("Success"));
+ // 鐩存帴杩斿洖锛宯ull 鍊肩敱鍏ㄥ眬 Jackson 閰嶇疆鑷姩杩囨护锛岄伩鍏嶆�ц兘寮�閿�
+ return ListDataResult.resultListSuccess(info, MessageUtils.getMessage("Success"));
}
@Override
@@ -316,4 +321,5 @@
tag.setTagId(person.getPTagid());
tagService.getBaseMapper().update(tag, queryWrapperTag);
}
+
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 019eeec..e3b418c 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -15,7 +15,7 @@
driver-class-name: com.mysql.cj.jdbc.Driver
url: jdbc:mysql://localhost:3306/hxzkuwb
username: root
- password: hxzk20151102
+ password: 123456
web:
resources:
resources:
@@ -60,7 +60,7 @@
# 涓婁紶鏂囦欢鐨勫瓨鏀捐矾寰�
dir: D:Bs/uploads/
# 涓婁紶鏂囦欢鐨処P鍦板潃
- dir-IP: http://103.155.76.198:9002/uploads/
+ dir-IP: http://127.0.0.1:9002/uploads/
# 鐢ㄦ埛澶村儚瀛樻斁璺緞
dir-UserImg: D:Bs/uploads/User/
# 浜哄憳澶村儚瀛樻斁璺緞
diff --git a/src/main/resources/mapper/Person/TbPersonMapper.xml b/src/main/resources/mapper/Person/TbPersonMapper.xml
index b6c6de5..b6e8755 100644
--- a/src/main/resources/mapper/Person/TbPersonMapper.xml
+++ b/src/main/resources/mapper/Person/TbPersonMapper.xml
@@ -15,7 +15,7 @@
<!--瀹炴椂浜哄憳浣嶇疆-->
<select id="RealPosition" resultType="com.hxzk.gps.entity.Person.TbPerson">
- SELECT p.p_tagid,p.baoliu2,p.baoliu3,p.p_addtiem,p.baoliu4,p.company FROM tb_person p
+ SELECT p.p_tagid,p.baoliu2,p.baoliu3,p.p_addtiem,p.baoliu4,p.company,p.p_x,p.p_y,p.p_online FROM tb_person p
WHERE (p.companyid IN
<foreach item="item" index="index" collection="list"
open="(" separator="," close=")">
--
Gitblit v1.10.0