From 8e6f6217e52a635d1dfd4ccbb549b0427d3f9fa6 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 27 Apr 2022 15:55:17 +0800
Subject: [PATCH] 新增保安员新增审查
---
src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java b/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
index fa83c3a..527a6a7 100644
--- a/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
+++ b/src/main/java/org/springblade/modules/location/service/impl/LiveLocationServiceImpl.java
@@ -17,10 +17,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Comparator;
-import java.util.List;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -87,10 +85,12 @@
//创建集合
List<LiveLocationVo> list = new ArrayList<>();
if (gunList.size()>0){
+ String startTime = "2020-05-25";
+ String endTime = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
//遍历
gunList.forEach(gun -> {
//远程调用
- String body = InvestigateUtil.httpGetGunPosition(gun.getCardNo(),null,null,null,null,null);
+ String body = InvestigateUtil.httpGetGunPosition(gun.getCardNo(),null,startTime,endTime,null,null);
// System.out.println("body = " + body);
if (null != body && !body.equals("")) {
JSONObject jsonObject = new JSONObject(body);
@@ -111,11 +111,21 @@
locationVo.setRecordTime(gunLiveLocationVO.getDwsj());
locationVo.setLinkman(gunLiveLocationVO.getHwy());
locationVo.setCardNo(gunLiveLocationVO.getHwysfzh());
- locationVo.setNumber(gunLiveLocationVO.getQzbh());
+ locationVo.setGunNum(gunLiveLocationVO.getQzbh());
+ locationVo.setNumber(gunLiveLocationVO.getQzxh());
locationVo.setQh(gunLiveLocationVO.getQh());
locationVo.setLongitude(gunLiveLocationVO.getDwjd().toString());
locationVo.setLatitude(gunLiveLocationVO.getDwwd().toString());
locationVo.setCompany(gunLiveLocationVO.getSzdw());
+ if (null!=gun.getIssueUnit() && !gun.getIssueUnit().equals("")){
+ locationVo.setIssueUnit(gun.getIssueUnit());
+ }
+ if (null!=gun.getIssueTime() && !gun.getIssueTime().equals("")){
+ locationVo.setIssueTime(gun.getIssueTime());
+ }
+ if (null!=gun.getValidTime() && !gun.getValidTime().equals("")){
+ locationVo.setValidTime(gun.getValidTime());
+ }
//存入集合
list.add(locationVo);
}
--
Gitblit v1.9.3