Skip to content

A
amos-boot-biz
Commit f01709de authored by caotao's avatar caotao
Browse files
Options

车辆里程过滤掉正常里程数处理，车辆里程的结束时间取上报的最后一次有效坐标的时间

parent af3fc8a6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 100 deletions
.idea/compiler.xml
View file @ f01709de
...@@ -2,114 +2,65 @@ ...@@ -2,114 +2,65 @@
<project version="4"> <project version="4">
<component name="CompilerConfiguration"> <component name="CompilerConfiguration">
<annotationProcessing> <annotationProcessing>
<profile default="true" name="Default" enabled="true" />
<profile name="Maven default annotation processors profile" enabled="true"> <profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" /> <sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="amos-boot-module-latentdanger-biz" /> <module name="amos-boot-module-equip-biz" />
<module name="amos-boot-module-knowledgebase-biz" />
<module name="amos-boot-utils-video" /> <module name="amos-boot-utils-video" />
<module name="amos-boot-module-supervision-api" />
<module name="amos-boot-module-maintenance-biz" />
<module name="amos-boot-system-fas" /> <module name="amos-boot-system-fas" />
<module name="amos-boot-module-avic-biz" /> <module name="amos-boot-module-maintenance-biz" />
<module name="amos-boot-module-knowledgebase-api" />
<module name="amos-boot-module-fas-api" /> <module name="amos-boot-module-fas-api" />
<module name="amos-boot-module-tzs-biz" /> <module name="amos-boot-module-equip-api" />
<module name="amos-boot-module-patrol-api" /> <module name="amos-boot-module-knowledgebase-biz" />
<module name="amos-boot-system-maintenance" /> <module name="amos-boot-module-maintenance-api" />
<module name="amos-boot-system-ccs" /> <module name="amos-boot-system-ccs" />
<module name="amos-boot-system-supervision" />
<module name="amos-boot-module-command-biz" />
<module name="amos-boot-system-latentdanger" />
<module name="amos-boot-core" />
<module name="amos-boot-biz-common" /> <module name="amos-boot-biz-common" />
<module name="amos-boot-utils-speech" />
<module name="amos-boot-module-supervision-biz" />
<module name="amos-boot-module-knowledgebase-api" />
<module name="amos-boot-system-precontrol" />
<module name="amos-boot-module-fas-biz" />
<module name="amos-boot-module-ccs-api" />
<module name="amos-boot-module-jcs-api" />
<module name="amos-boot-module-ccs-biz" />
<module name="amos-boot-module-latentdanger-api" />
<module name="amos-boot-module-precontrol-api" />
<module name="amos-boot-module-precontrol-biz" />
<module name="amos-boot-system-jcs" />
<module name="amos-boot-module-common-biz" /> <module name="amos-boot-module-common-biz" />
<module name="amos-boot-system-equip" /> <module name="amos-boot-module-common-api" />
<module name="amos-boot-cloud-gateway" /> <module name="amos-boot-data-alarm" />
<module name="amos-boot-module-avic-api" /> <module name="amos-boot-module-precontrol-biz" />
<module name="amos-boot-system-knowledgebase" /> <module name="amos-boot-data-common" />
<module name="amos-boot-module-tzs-api" /> <module name="amos-boot-module-precontrol-api" />
<module name="amos-boot-module-jcs-biz" /> <module name="amos-boot-module-jcs-biz" />
<module name="amos-boot-utils-jpush" /> <module name="amos-boot-module-ccs-biz" />
<module name="amos-boot-module-equip-biz" /> <module name="amos-boot-module-patrol-api" />
<module name="amos-boot-system-knowledgebase" />
<module name="amos-boot-system-supervision" />
<module name="amos-boot-module-ccs-api" />
<module name="amos-boot-module-patrol-biz" /> <module name="amos-boot-module-patrol-biz" />
<module name="amos-boot-module-maintenance-api" /> <module name="amos-boot-system-maintenance" />
<module name="amos-boot-module-command-api" /> <module name="amos-boot-system-jcs" />
<module name="amos-boot-module-equip-api" />
<module name="amos-boot-data-openapi" /> <module name="amos-boot-data-openapi" />
<module name="amos-boot-data-common" /> <module name="amos-boot-module-jcs-api" />
<module name="amos-boot-module-common-api" /> <module name="amos-boot-cloud-gateway" />
<module name="amos-boot-module-latentdanger-biz" />
<module name="amos-boot-module-supervision-biz" />
<module name="amos-boot-module-latentdanger-api" />
<module name="amos-boot-utils-jpush" />
<module name="amos-boot-module-tzs-api" />
<module name="amos-boot-system-patrol" /> <module name="amos-boot-system-patrol" />
<module name="amos-boot-module-tzs-biz" />
<module name="amos-boot-system-latentdanger" />
<module name="amos-boot-system-precontrol" />
<module name="amos-boot-module-supervision-api" />
<module name="amos-boot-core" />
<module name="amos-boot-module-avic-biz" />
<module name="amos-boot-utils-speech" />
<module name="amos-boot-module-command-api" />
<module name="amos-boot-module-avic-api" />
<module name="amos-boot-data-equip" />
<module name="amos-boot-utils-message" />
<module name="amos-boot-module-fas-biz" />
<module name="amos-boot-module-command-biz" />
<module name="amos-boot-system-equip" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
<bytecodeTargetLevel> <bytecodeTargetLevel>
<module name="amos-biz-boot" target="1.8" />
<module name="amos-boot-biz-common" target="1.8" />
<module name="amos-boot-cloud-gateway" target="1.8" />
<module name="amos-boot-core" target="1.8" />
<module name="amos-boot-data" target="1.8" />
<module name="amos-boot-data-common" target="1.8" />
<module name="amos-boot-data-openapi" target="1.8" />
<module name="amos-boot-jcs-system" target="1.8" /> <module name="amos-boot-jcs-system" target="1.8" />
<module name="amos-boot-module" target="1.8" />
<module name="amos-boot-module-api" target="1.8" />
<module name="amos-boot-module-avic-api" target="1.8" />
<module name="amos-boot-module-avic-biz" target="1.8" />
<module name="amos-boot-module-biz" target="1.8" />
<module name="amos-boot-module-ccs-api" target="1.8" />
<module name="amos-boot-module-ccs-biz" target="1.8" />
<module name="amos-boot-module-command-api" target="1.8" />
<module name="amos-boot-module-command-biz" target="1.8" />
<module name="amos-boot-module-common-api" target="1.8" />
<module name="amos-boot-module-common-biz" target="1.8" />
<module name="amos-boot-module-equip-api" target="1.8" />
<module name="amos-boot-module-equip-biz" target="1.8" />
<module name="amos-boot-module-fas-api" target="1.8" />
<module name="amos-boot-module-fas-biz" target="1.8" />
<module name="amos-boot-module-jcs-api" target="1.8" />
<module name="amos-boot-module-jcs-biz" target="1.8" />
<module name="amos-boot-module-knowledgebase-api" target="1.8" />
<module name="amos-boot-module-knowledgebase-biz" target="1.8" />
<module name="amos-boot-module-latentdanger-api" target="1.8" />
<module name="amos-boot-module-latentdanger-biz" target="1.8" />
<module name="amos-boot-module-maintenance-api" target="1.8" />
<module name="amos-boot-module-maintenance-biz" target="1.8" />
<module name="amos-boot-module-patrol-api" target="1.8" />
<module name="amos-boot-module-patrol-biz" target="1.8" />
<module name="amos-boot-module-precontrol-api" target="1.8" />
<module name="amos-boot-module-precontrol-biz" target="1.8" />
<module name="amos-boot-module-supervision-api" target="1.8" />
<module name="amos-boot-module-supervision-biz" target="1.8" />
<module name="amos-boot-module-tzs-api" target="1.8" />
<module name="amos-boot-module-tzs-biz" target="1.8" />
<module name="amos-boot-system-ccs" target="1.8" />
<module name="amos-boot-system-equip" target="1.8" />
<module name="amos-boot-system-fas" target="1.8" />
<module name="amos-boot-system-jcs" target="1.8" />
<module name="amos-boot-system-knowledgebase" target="1.8" />
<module name="amos-boot-system-latentdanger" target="1.8" />
<module name="amos-boot-system-maintenance" target="1.8" />
<module name="amos-boot-system-patrol" target="1.8" />
<module name="amos-boot-system-precontrol" target="1.8" />
<module name="amos-boot-system-supervision" target="1.8" />
<module name="amos-boot-system-tzs" target="1.8" />
<module name="amos-boot-tzs-system" target="1.8" /> <module name="amos-boot-tzs-system" target="1.8" />
<module name="amos-boot-utils" target="1.8" />
<module name="amos-boot-utils-jpush" target="1.8" />
<module name="amos-boot-utils-speech" target="1.8" />
<module name="amos-boot-utils-video" target="1.8" />
</bytecodeTargetLevel> </bytecodeTargetLevel>
</component> </component>
<component name="JavacSettings"> <component name="JavacSettings">
...@@ -117,7 +68,9 @@ ...@@ -117,7 +68,9 @@
<module name="amos-boot-biz-common" options="-parameters" /> <module name="amos-boot-biz-common" options="-parameters" />
<module name="amos-boot-cloud-gateway" options="-parameters" /> <module name="amos-boot-cloud-gateway" options="-parameters" />
<module name="amos-boot-core" options="-parameters" /> <module name="amos-boot-core" options="-parameters" />
<module name="amos-boot-data-alarm" options="-parameters" />
<module name="amos-boot-data-common" options="-parameters" /> <module name="amos-boot-data-common" options="-parameters" />
<module name="amos-boot-data-equip" options="-parameters" />
<module name="amos-boot-data-openapi" options="-parameters" /> <module name="amos-boot-data-openapi" options="-parameters" />
<module name="amos-boot-module-avic-api" options="-parameters" /> <module name="amos-boot-module-avic-api" options="-parameters" />
<module name="amos-boot-module-avic-biz" options="-parameters" /> <module name="amos-boot-module-avic-biz" options="-parameters" />
...@@ -157,8 +110,9 @@ ...@@ -157,8 +110,9 @@
<module name="amos-boot-system-patrol" options="-parameters" /> <module name="amos-boot-system-patrol" options="-parameters" />
<module name="amos-boot-system-precontrol" options="-parameters" /> <module name="amos-boot-system-precontrol" options="-parameters" />
<module name="amos-boot-system-supervision" options="-parameters" /> <module name="amos-boot-system-supervision" options="-parameters" />
<module name="amos-boot-system-tzs" options="-parameters" /> <module name="amos-boot-system-tzs" options="" />
<module name="amos-boot-utils-jpush" options="-parameters" /> <module name="amos-boot-utils-jpush" options="-parameters" />
<module name="amos-boot-utils-message" options="-parameters" />
<module name="amos-boot-utils-speech" options="-parameters" /> <module name="amos-boot-utils-speech" options="-parameters" />
<module name="amos-boot-utils-video" options="-parameters" /> <module name="amos-boot-utils-video" options="-parameters" />
</option> </option>
......
.idea/encodings.xml
View file @ f01709de
This diff is collapsed.
.idea/misc.xml
View file @ f01709de
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">
<list> <list>
...@@ -8,8 +9,8 @@ ...@@ -8,8 +9,8 @@
</option> </option>
<option name="ignoredFiles"> <option name="ignoredFiles">
<set> <set>
<option value="D:/Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-api/pom.xml" /> <option value="$PROJECT_DIR$/../../../Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-api/pom.xml" />
<option value="D:/Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-biz/pom.xml" /> <option value="$PROJECT_DIR$/../../../Sanwei/developer/amos-boot-system-ugp/amos-boot-module-ugp-biz/pom.xml" />
<option value="$PROJECT_DIR$/amos-boot-data/amos-boot-data-accessapi/pom.xml" /> <option value="$PROJECT_DIR$/amos-boot-data/amos-boot-data-accessapi/pom.xml" />
<option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api/pom.xml" /> <option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-api/amos-boot-module-kgd-api/pom.xml" />
<option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-kgd-biz/pom.xml" /> <option value="$PROJECT_DIR$/amos-boot-module/amos-boot-module-biz/amos-boot-module-kgd-biz/pom.xml" />
......
.idea/modules.xml
View file @ f01709de
This diff is collapsed.
.idea/vcs.xml
View file @ f01709de
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>
\ No newline at end of file
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/WlCarMileageController.java
View file @ f01709de
...@@ -169,14 +169,13 @@ public class WlCarMileageController { ...@@ -169,14 +169,13 @@ public class WlCarMileageController {
for (WlCarMileage wl : page.getRecords()) { for (WlCarMileage wl : page.getRecords()) {
WlCarMileageDto wlCarMileageDto = new WlCarMileageDto(); WlCarMileageDto wlCarMileageDto = new WlCarMileageDto();
wl.setTime(millisToStringShort(wl.getTakeTime())); wl.setTime(millisToStringShort(wl.getTakeTime()));
totalTravel += wl.getTravel();
totalTime += wl.getTakeTime();
BeanUtil.copyPropertiesIgnoreNull(wl, wlCarMileageDto); BeanUtil.copyPropertiesIgnoreNull(wl, wlCarMileageDto);
wlCarMileageDto.setStartTime(sdf.format(wl.getStartTime())); wlCarMileageDto.setStartTime(sdf.format(wl.getStartTime()));
wlCarMileageDto.setEndTime(sdf.format(wl.getEndTime())); wlCarMileageDto.setEndTime(sdf.format(wl.getEndTime()));
//判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回 //判断当前车辆全程是否异常,如果时速小于阈值 则对数据进行返回 否则不予返回
if ((!ObjectUtils.isEmpty(wl.getTakeTime()) && (!ObjectUtils.isEmpty(wl.getTravel()) && (wl.getTravel() / (wl.getTakeTime() / 3600000)) < CAR_MAX_SPEED))) if (!ObjectUtils.isEmpty(wl.getTakeTime()) && !ObjectUtils.isEmpty(wl.getTravel()) && ((wl.getTravel() / (wl.getTakeTime() / 3600000.0)) < CAR_MAX_SPEED)) {
{ totalTravel += wl.getTravel();
totalTime += wl.getTakeTime();
list.add(wlCarMileageDto); list.add(wlCarMileageDto);
} }
} }
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/WlCarMileageServiceImpl.java
View file @ f01709de
...@@ -256,7 +256,7 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC ...@@ -256,7 +256,7 @@ public class WlCarMileageServiceImpl extends ServiceImpl<WlCarMileageMapper, WlC
.isNotNull("end_time") .isNotNull("end_time")
.ge("travel", 0.5) .ge("travel", 0.5)
.groupBy("date")); .groupBy("date"));
List<WlCarMileage> wlCarMileageListActiveData = wlCarMileageList.stream().filter(wlCarMileage -> (!ObjectUtils.isEmpty(wlCarMileage.getTakeTime()) && (!ObjectUtils.isEmpty(wlCarMileage.getTravel()) && (wlCarMileage.getTravel() / (wlCarMileage.getTakeTime() / 3600000)) < CAR_MAX_SPEED))).collect(Collectors.toList()); List<WlCarMileage> wlCarMileageListActiveData = wlCarMileageList.stream().filter(wl -> (!ObjectUtils.isEmpty(wl.getTakeTime()) && !ObjectUtils.isEmpty(wl.getTravel()) && ((wl.getTravel() / (wl.getTakeTime() / 3600000.0)) < CAR_MAX_SPEED))).collect(Collectors.toList());
List<String> activeDateList = wlCarMileageListActiveData.stream().map(wlCarMileage -> String.valueOf(DateUtils.convertDateToString(wlCarMileage.getDate(),DateUtils.DATE_PATTERN))).collect(Collectors.toList()); List<String> activeDateList = wlCarMileageListActiveData.stream().map(wlCarMileage -> String.valueOf(DateUtils.convertDateToString(wlCarMileage.getDate(),DateUtils.DATE_PATTERN))).collect(Collectors.toList());
for (String day : daylist) { for (String day : daylist) {
boolean has = false; boolean has = false;
......
amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/thread/ThreadCar.java
View file @ f01709de
...@@ -96,13 +96,14 @@ ThreadCar extends Thread { ...@@ -96,13 +96,14 @@ ThreadCar extends Thread {
} }
double endLongitude = lastObj.getDoubleValue("FireCar_Longitude"); double endLongitude = lastObj.getDoubleValue("FireCar_Longitude");
double endLatitude = lastObj.getDoubleValue("FireCar_Latitude"); double endLatitude = lastObj.getDoubleValue("FireCar_Latitude");
//里程结束时间设置为最后一次的上报时间
Date endTime = new Date(); Date endTime = new Date(last.getStartTime().getTime()/ 1000 * 1000);
//实时库中的时间虽然坐标与记录的一致，但是更新时间可能最新,故可能会有记录的结束时间早于开始时间 //实时库中的时间虽然坐标与记录的一致，但是更新时间可能最新,故可能会有记录的结束时间早于开始时间
long takeTime = (endTime.getTime() / 1000 * 1000) - (last.getStartTime().getTime() / 1000 * 1000); long takeTime = (endTime.getTime() / 1000 * 1000) - (last.getStartTime().getTime() / 1000 * 1000);
if (takeTime < 0) { if (takeTime < 0) {
takeTime = 0 - takeTime; takeTime = 0 - takeTime;
} }
last.setTakeTime(takeTime); last.setTakeTime(takeTime);
last.setEndLongitude(endLongitude); last.setEndLongitude(endLongitude);
last.setEndLatitude(endLatitude); last.setEndLatitude(endLatitude);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment