From b62bc392f3c1658381107be1d5f737a3389e7f5f Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 20 九月 2025 14:53:50 +0800
Subject: [PATCH] feat:dev
---
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleGps.java | 2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java | 11
ruoyi-gps/src/main/resources/archetype-resources/src/test/java/AppTest.java | 38 ++++
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/SysGpsConfig.java | 2
ruoyi-gps/src/main/resources/mapper/gps/SysGpsConfigMapper.xml | 2
ruoyi-quartz/pom.xml | 11 +
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryRequest.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGpsConfigController.java | 5
ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsCollectServiceImpl.java | 18 -
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionRequest.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsGpsLoginResponse.java | 2
ruoyi-gps/src/main/resources/mapper/gps/VehicleInfoMapper.xml | 4
ruoyi-gps/src/main/resources/archetype-resources/src/main/java/App.java | 13 +
ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/SysGpsConfigMapper.java | 5
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleInfo.java | 2
ruoyi-admin/src/main/resources/application.yml | 2
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/VehicleSyncTask.java | 12
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsCollectLog.java | 2
ruoyi-gps/src/main/resources/archetype-resources/pom.xml | 15 +
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceResponse.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectController.java | 4
ruoyi-admin/src/main/resources/application-dev.yml | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleInfoService.java | 4
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionResponse.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/CmsGpsCollectServiceImpl.java | 20 +-
ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleGpsServiceImpl.java | 12
ruoyi-gps/src/main/resources/META-INF/maven/archetype.xml | 9 +
ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleInfoMapper.java | 5
pom.xml | 14 +
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java | 16 +-
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDeviceListResponse.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsServiceConfig.java | 2
ruoyi-gps/pom.xml | 23 ++
ruoyi-gps/src/main/resources/mapper/gps/VehicleGpsMapper.xml | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginRequest.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java | 5
ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsConfigService.java | 4
ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsCollectService.java | 4
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsGroup.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/service/ICmsGpsCollectService.java | 12
ruoyi-admin/pom.xml | 10 +
ruoyi-system/pom.xml | 4
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanVehicleGpsTask.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPosition.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDevice.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsConfigServiceImpl.java | 8
ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleInfoServiceImpl.java | 8
ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/GpsCollectLogMapper.java | 5
/dev/null | 78 ---------
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginResponse.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleGpsMapper.java | 5
ruoyi-gps/src/main/resources/mapper/gps/GpsCollectLogMapper.xml | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleGpsService.java | 4
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleInfoController.java | 5
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsTrackDetailResponse.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleLocationResponse.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackPoint.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryResponse.java | 2
ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceListResponse.java | 2
59 files changed, 254 insertions(+), 191 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0d08086..5c27382 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,6 +218,19 @@
<version>${ruoyi.version}</version>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-gps</artifactId>
+ <version>${ruoyi.version}</version>
+ </dependency>
+
+ <!-- SQL Server JDBC椹卞姩 -->
+ <dependency>
+ <groupId>com.microsoft.sqlserver</groupId>
+ <artifactId>mssql-jdbc</artifactId>
+ <version>12.4.2.jre8</version>
+ </dependency>
+
</dependencies>
</dependencyManagement>
@@ -228,6 +241,7 @@
<module>ruoyi-quartz</module>
<module>ruoyi-generator</module>
<module>ruoyi-common</module>
+ <module>ruoyi-gps</module>
</modules>
<packaging>pom</packaging>
diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml
index 624a352..3478740 100644
--- a/ruoyi-admin/pom.xml
+++ b/ruoyi-admin/pom.xml
@@ -51,6 +51,10 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-framework</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-system</artifactId>
+ </dependency>
<!-- 瀹氭椂浠诲姟-->
<dependency>
@@ -68,6 +72,12 @@
<artifactId>lombok</artifactId>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-gps</artifactId>
+ <version>3.8.9</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectController.java
index 659d991..dd40f32 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectController.java
@@ -3,8 +3,8 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.system.domain.*;
-import com.ruoyi.system.service.IGpsCollectService;
+import com.ruoyi.gps.domain.*;
+import com.ruoyi.gps.service.IGpsCollectService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectLogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectLogController.java
deleted file mode 100644
index 21d9bc6..0000000
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectLogController.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.ruoyi.web.controller.system;
-
-import java.util.List;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.GpsCollectLog;
-import com.ruoyi.system.service.IGpsCollectLogService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
-
-/**
- * GPS閲囬泦鏃ュ織Controller
- */
-@RestController
-@RequestMapping("/system/gpslog")
-public class GpsCollectLogController extends BaseController {
- @Autowired
- private IGpsCollectLogService gpsCollectLogService;
-
- /**
- * 鏌ヨGPS閲囬泦鏃ュ織鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:gpslog:list')")
- @GetMapping("/list")
- public TableDataInfo list(GpsCollectLog gpsCollectLog) {
- startPage();
- List<GpsCollectLog> list = gpsCollectLogService.selectGpsCollectLogList(gpsCollectLog);
- return getDataTable(list);
- }
-
- /**
- * 瀵煎嚭GPS閲囬泦鏃ュ織鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:gpslog:export')")
- @Log(title = "GPS閲囬泦鏃ュ織", businessType = BusinessType.EXPORT)
- @GetMapping("/export")
- public AjaxResult export(GpsCollectLog gpsCollectLog) {
- List<GpsCollectLog> list = gpsCollectLogService.selectGpsCollectLogList(gpsCollectLog);
- ExcelUtil<GpsCollectLog> util = new ExcelUtil<GpsCollectLog>(GpsCollectLog.class);
- return util.exportExcel(list, "GPS閲囬泦鏃ュ織鏁版嵁");
- }
-
- /**
- * 鑾峰彇GPS閲囬泦鏃ュ織璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:gpslog:query')")
- @GetMapping(value = "/{logId}")
- public AjaxResult getInfo(@PathVariable("logId") Long logId) {
- return success(gpsCollectLogService.selectGpsCollectLogById(logId));
- }
-
- /**
- * 鏂板GPS閲囬泦鏃ュ織
- */
- @PreAuthorize("@ss.hasPermi('system:gpslog:add')")
- @Log(title = "GPS閲囬泦鏃ュ織", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@RequestBody GpsCollectLog gpsCollectLog) {
- return toAjax(gpsCollectLogService.insertGpsCollectLog(gpsCollectLog));
- }
-
- /**
- * 淇敼GPS閲囬泦鏃ュ織
- */
- @PreAuthorize("@ss.hasPermi('system:gpslog:edit')")
- @Log(title = "GPS閲囬泦鏃ュ織", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@RequestBody GpsCollectLog gpsCollectLog) {
- return toAjax(gpsCollectLogService.updateGpsCollectLog(gpsCollectLog));
- }
-
- /**
- * 鍒犻櫎GPS閲囬泦鏃ュ織
- */
- @PreAuthorize("@ss.hasPermi('system:gpslog:remove')")
- @Log(title = "GPS閲囬泦鏃ュ織", businessType = BusinessType.DELETE)
- @DeleteMapping("/{logIds}")
- public AjaxResult remove(@PathVariable Long[] logIds) {
- return toAjax(gpsCollectLogService.deleteGpsCollectLogByIds(logIds));
- }
-}
\ No newline at end of file
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGpsConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGpsConfigController.java
index 8616fdc..7dfa08e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGpsConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysGpsConfigController.java
@@ -2,6 +2,8 @@
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.gps.service.IGpsConfigService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -16,8 +18,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.SysGpsConfig;
-import com.ruoyi.system.service.IGpsConfigService;
+import com.ruoyi.gps.domain.SysGpsConfig;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.utils.SecurityUtils;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
index 145b63d..075daf7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleGpsController.java
@@ -2,10 +2,11 @@
import java.util.*;
import java.text.SimpleDateFormat;
-import java.text.ParseException;
-import com.ruoyi.system.domain.*;
+import com.ruoyi.gps.domain.*;
+import com.ruoyi.gps.service.*;
import com.ruoyi.system.service.*;
+import com.ruoyi.system.domain.*;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleInfoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleInfoController.java
index b33aea0..6fc6267 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleInfoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/VehicleInfoController.java
@@ -1,6 +1,8 @@
package com.ruoyi.web.controller.system;
import java.util.List;
+
+import com.ruoyi.gps.service.IVehicleInfoService;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -15,8 +17,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.domain.VehicleInfo;
-import com.ruoyi.system.service.IVehicleInfoService;
+import com.ruoyi.gps.domain.VehicleInfo;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.core.page.TableDataInfo;
diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml
index 5975026..42ba794 100644
--- a/ruoyi-admin/src/main/resources/application-dev.yml
+++ b/ruoyi-admin/src/main/resources/application-dev.yml
@@ -12,7 +12,7 @@
# 浠庡簱鏁版嵁婧�
# SQL Server鏁版嵁婧�
sqlserver:
- url: jdbc:sqlserver://120.25.98.119:1432;databaseName=came
+ url: jdbc:sqlserver://120.25.98.119:1432;databaseName=came;encrypt=false;trustServerCertificate=false;hostNameInCertificate=*.database.windows.net;loginTimeout=30;connectTimeout=30;integratedSecurity=false
username: camesa
password: camesa
driverClassName: com.microsoft.sqlserver.jdbc.SQLServerDriver
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index 0128223..ae08b40 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -56,7 +56,7 @@
basename: i18n/messages
profiles:
# 鐜 dev|test|prod
- active: prod
+ active: dev
# 鏂囦欢涓婁紶
servlet:
multipart:
diff --git a/ruoyi-gps/pom.xml b/ruoyi-gps/pom.xml
new file mode 100644
index 0000000..da47837
--- /dev/null
+++ b/ruoyi-gps/pom.xml
@@ -0,0 +1,23 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <artifactId>ruoyi</artifactId>
+ <groupId>com.ruoyi</groupId>
+ <version>3.8.9</version>
+ </parent>
+
+ <artifactId>ruoyi-gps</artifactId>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.projectlombok</groupId>
+ <artifactId>lombok</artifactId>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsGpsLoginResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsGpsLoginResponse.java
similarity index 96%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsGpsLoginResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsGpsLoginResponse.java
index d4c0552..9af25b1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsGpsLoginResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsGpsLoginResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsTrackDetailResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsTrackDetailResponse.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsTrackDetailResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsTrackDetailResponse.java
index bf33338..e5af72e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsTrackDetailResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsTrackDetailResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import lombok.Data;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleDeviceListResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceListResponse.java
similarity index 96%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleDeviceListResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceListResponse.java
index 120754e..d89beff 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleDeviceListResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceListResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.util.List;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleDeviceResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceResponse.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleDeviceResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceResponse.java
index 00fd638..f4b3f25 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleDeviceResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleLocationResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleLocationResponse.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleLocationResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleLocationResponse.java
index 8305773..21b19e3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleLocationResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleLocationResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsCollectLog.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsCollectLog.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsCollectLog.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsCollectLog.java
index c711fa5..c4fd082 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsCollectLog.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsCollectLog.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsDevice.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDevice.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsDevice.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDevice.java
index 6ccbfb7..bf24017 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsDevice.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDevice.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.io.Serializable;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsDeviceListResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDeviceListResponse.java
similarity index 95%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsDeviceListResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDeviceListResponse.java
index a2dcd83..fd01aec 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsDeviceListResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDeviceListResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.io.Serializable;
import java.util.List;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsGroup.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsGroup.java
similarity index 96%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsGroup.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsGroup.java
index c2a34b8..7685426 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsGroup.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsGroup.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.io.Serializable;
import java.util.List;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPosition.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPosition.java
similarity index 99%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPosition.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPosition.java
index 6569b8c..4b7ee44 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPosition.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPosition.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.io.Serializable;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPositionRequest.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionRequest.java
similarity index 95%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPositionRequest.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionRequest.java
index 383294b..8bfb7d1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPositionRequest.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionRequest.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.io.Serializable;
import java.util.List;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPositionResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionResponse.java
similarity index 96%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPositionResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionResponse.java
index ca11e65..98cc3e6 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPositionResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.io.Serializable;
import java.util.List;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginRequest.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginRequest.java
similarity index 97%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginRequest.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginRequest.java
index 028e1ca..b8faba4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginRequest.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginRequest.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import com.fasterxml.jackson.annotation.JsonProperty;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginResponse.java
similarity index 96%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginResponse.java
index 06df1d9..a13d435 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.io.Serializable;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/config/GpsServiceConfig.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsServiceConfig.java
similarity index 96%
rename from ruoyi-system/src/main/java/com/ruoyi/system/config/GpsServiceConfig.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsServiceConfig.java
index 0a43d81..1c1f3b5 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/config/GpsServiceConfig.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsServiceConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.config;
+package com.ruoyi.gps.domain;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.stereotype.Component;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackPoint.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackPoint.java
similarity index 97%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackPoint.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackPoint.java
index 0e19c30..322f8ab 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackPoint.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackPoint.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import lombok.Data;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryRequest.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryRequest.java
similarity index 95%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryRequest.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryRequest.java
index 0286ddf..028eecd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryRequest.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryRequest.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
public class GpsTrackQueryRequest {
private String deviceid;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryResponse.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryResponse.java
similarity index 95%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryResponse.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryResponse.java
index 62e2011..498be49 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryResponse.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryResponse.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import java.util.List;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysGpsConfig.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/SysGpsConfig.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/SysGpsConfig.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/SysGpsConfig.java
index 9073e84..5bf8acc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysGpsConfig.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/SysGpsConfig.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleGps.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleGps.java
index daf5d6e..7b1c5c4 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleGps.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleGps.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleInfo.java
similarity index 98%
rename from ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleInfo.java
index b8aa771..e39dd4e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/VehicleInfo.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleInfo.java
@@ -1,4 +1,4 @@
-package com.ruoyi.system.domain;
+package com.ruoyi.gps.domain;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GpsCollectLogMapper.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/GpsCollectLogMapper.java
similarity index 91%
rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/GpsCollectLogMapper.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/GpsCollectLogMapper.java
index 67aeb8a..f5a8d6c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/GpsCollectLogMapper.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/GpsCollectLogMapper.java
@@ -1,7 +1,8 @@
-package com.ruoyi.system.mapper;
+package com.ruoyi.gps.mapper;
+
+import com.ruoyi.gps.domain.GpsCollectLog;
import java.util.List;
-import com.ruoyi.system.domain.GpsCollectLog;
/**
* GPS閲囬泦鏃ュ織Mapper鎺ュ彛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysGpsConfigMapper.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/SysGpsConfigMapper.java
similarity index 93%
rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysGpsConfigMapper.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/SysGpsConfigMapper.java
index 5887f2b..247356e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysGpsConfigMapper.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/SysGpsConfigMapper.java
@@ -1,6 +1,7 @@
-package com.ruoyi.system.mapper;
+package com.ruoyi.gps.mapper;
-import com.ruoyi.system.domain.SysGpsConfig;
+import com.ruoyi.gps.domain.SysGpsConfig;
+
import java.util.List;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleGpsMapper.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleGpsMapper.java
similarity index 92%
rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleGpsMapper.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleGpsMapper.java
index 52f64bd..9aef359 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleGpsMapper.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleGpsMapper.java
@@ -1,7 +1,8 @@
-package com.ruoyi.system.mapper;
+package com.ruoyi.gps.mapper;
+
+import com.ruoyi.gps.domain.VehicleGps;
import java.util.List;
-import com.ruoyi.system.domain.VehicleGps;
/**
* 杞﹁締GPS鍧愭爣Mapper鎺ュ彛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleInfoMapper.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleInfoMapper.java
similarity index 94%
rename from ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleInfoMapper.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleInfoMapper.java
index f688808..da0e18c 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleInfoMapper.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleInfoMapper.java
@@ -1,7 +1,8 @@
-package com.ruoyi.system.mapper;
+package com.ruoyi.gps.mapper;
+
+import com.ruoyi.gps.domain.VehicleInfo;
import java.util.List;
-import com.ruoyi.system.domain.VehicleInfo;
/**
* 杞﹁締淇℃伅Mapper鎺ュ彛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ICmsGpsCollectService.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/ICmsGpsCollectService.java
similarity index 86%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/ICmsGpsCollectService.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/ICmsGpsCollectService.java
index 131acd2..5b1dbab 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ICmsGpsCollectService.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/ICmsGpsCollectService.java
@@ -1,10 +1,10 @@
-package com.ruoyi.system.service;
+package com.ruoyi.gps.service;
-import com.ruoyi.system.domain.CmsGpsLoginResponse;
-import com.ruoyi.system.domain.CmsVehicleDeviceResponse;
-import com.ruoyi.system.domain.CmsVehicleDeviceListResponse;
-import com.ruoyi.system.domain.CmsVehicleLocationResponse;
-import com.ruoyi.system.domain.CmsTrackDetailResponse;
+import com.ruoyi.gps.domain.CmsGpsLoginResponse;
+import com.ruoyi.gps.domain.CmsVehicleDeviceResponse;
+import com.ruoyi.gps.domain.CmsVehicleDeviceListResponse;
+import com.ruoyi.gps.domain.CmsVehicleLocationResponse;
+import com.ruoyi.gps.domain.CmsTrackDetailResponse;
/**
* CMS GPS閲囬泦鏈嶅姟鎺ュ彛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsCollectService.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsCollectService.java
similarity index 92%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsCollectService.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsCollectService.java
index d0512fa..dedddcd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsCollectService.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsCollectService.java
@@ -1,6 +1,6 @@
-package com.ruoyi.system.service;
+package com.ruoyi.gps.service;
-import com.ruoyi.system.domain.*;
+import com.ruoyi.gps.domain.*;
/**
* GPS閲囬泦鏈嶅姟鎺ュ彛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsConfigService.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsConfigService.java
similarity index 95%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsConfigService.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsConfigService.java
index ed52202..08e5d65 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsConfigService.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsConfigService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.system.service;
+package com.ruoyi.gps.service;
import java.util.List;
-import com.ruoyi.system.domain.SysGpsConfig;
+import com.ruoyi.gps.domain.SysGpsConfig;
import java.util.Date;
/**
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IVehicleGpsService.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleGpsService.java
similarity index 91%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IVehicleGpsService.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleGpsService.java
index 970c3ac..6bc1d73 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IVehicleGpsService.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleGpsService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.system.service;
+package com.ruoyi.gps.service;
import java.util.List;
-import com.ruoyi.system.domain.VehicleGps;
+import com.ruoyi.gps.domain.VehicleGps;
/**
* 杞﹁締GPS鍧愭爣Service鎺ュ彛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IVehicleInfoService.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleInfoService.java
similarity index 94%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/IVehicleInfoService.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleInfoService.java
index 49da046..1e28b5b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IVehicleInfoService.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleInfoService.java
@@ -1,7 +1,7 @@
-package com.ruoyi.system.service;
+package com.ruoyi.gps.service;
import java.util.List;
-import com.ruoyi.system.domain.VehicleInfo;
+import com.ruoyi.gps.domain.VehicleInfo;
/**
* 杞﹁締淇℃伅Service鎺ュ彛
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CmsGpsCollectServiceImpl.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/CmsGpsCollectServiceImpl.java
similarity index 94%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CmsGpsCollectServiceImpl.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/CmsGpsCollectServiceImpl.java
index 2c6b036..536cfdd 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/CmsGpsCollectServiceImpl.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/CmsGpsCollectServiceImpl.java
@@ -1,23 +1,21 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.gps.service.impl;
import com.ruoyi.common.utils.HttpUtil;
import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.system.domain.CmsGpsLoginResponse;
-import com.ruoyi.system.domain.CmsVehicleDeviceResponse;
-import com.ruoyi.system.domain.CmsVehicleDeviceListResponse;
-import com.ruoyi.system.domain.CmsVehicleLocationResponse;
-import com.ruoyi.system.domain.CmsTrackDetailResponse;
-import com.ruoyi.system.domain.SysGpsConfig;
-import com.ruoyi.system.service.ICmsGpsCollectService;
-import com.ruoyi.system.service.IGpsConfigService;
+import com.ruoyi.gps.domain.CmsGpsLoginResponse;
+import com.ruoyi.gps.domain.CmsVehicleDeviceResponse;
+import com.ruoyi.gps.domain.CmsVehicleDeviceListResponse;
+import com.ruoyi.gps.domain.CmsVehicleLocationResponse;
+import com.ruoyi.gps.domain.CmsTrackDetailResponse;
+import com.ruoyi.gps.domain.SysGpsConfig;
+import com.ruoyi.gps.service.ICmsGpsCollectService;
+import com.ruoyi.gps.service.IGpsConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.alibaba.fastjson.JSONObject;
import java.util.Date;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
/**
* CMS GPS閲囬泦鏈嶅姟瀹炵幇
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsCollectServiceImpl.java
similarity index 97%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsCollectServiceImpl.java
index 7c20adb..6279efc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectServiceImpl.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsCollectServiceImpl.java
@@ -1,31 +1,25 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.gps.service.impl;
-import com.ruoyi.common.utils.http.HttpUtils;
-import com.ruoyi.system.domain.*;
-import com.ruoyi.system.service.IGpsCollectService;
-import com.ruoyi.system.config.GpsServiceConfig;
+import com.ruoyi.gps.domain.*;
+import com.ruoyi.gps.service.IGpsCollectService;
import com.ruoyi.common.utils.MD5Util;
import org.springframework.stereotype.Service;
import org.springframework.web.client.RestTemplate;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
+
import java.util.HashMap;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import com.ruoyi.common.utils.HttpUtil;
import com.alibaba.fastjson.JSONObject;
-import com.ruoyi.common.exception.ServiceException;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
-import com.ruoyi.system.service.IGpsConfigService;
+import com.ruoyi.gps.service.IGpsConfigService;
import java.util.ArrayList;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import com.ruoyi.common.utils.DateUtils;
import java.util.Date;
-import com.ruoyi.system.service.IVehicleInfoService;
+import com.ruoyi.gps.service.IVehicleInfoService;
/**
* GPS閲囬泦鏈嶅姟瀹炵幇
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsConfigServiceImpl.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsConfigServiceImpl.java
similarity index 92%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsConfigServiceImpl.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsConfigServiceImpl.java
index f5c2f16..ab7bf18 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsConfigServiceImpl.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsConfigServiceImpl.java
@@ -1,9 +1,9 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.gps.service.impl;
import com.ruoyi.common.utils.DateUtils;
-import com.ruoyi.system.domain.SysGpsConfig;
-import com.ruoyi.system.mapper.SysGpsConfigMapper;
-import com.ruoyi.system.service.IGpsConfigService;
+import com.ruoyi.gps.domain.SysGpsConfig;
+import com.ruoyi.gps.mapper.SysGpsConfigMapper;
+import com.ruoyi.gps.service.IGpsConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleGpsServiceImpl.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleGpsServiceImpl.java
similarity index 89%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleGpsServiceImpl.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleGpsServiceImpl.java
index ad9eb5a..4efaf0d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleGpsServiceImpl.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleGpsServiceImpl.java
@@ -1,12 +1,14 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.gps.service.impl;
import java.util.List;
+
+import com.ruoyi.common.exception.ServiceException;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.VehicleGpsMapper;
-import com.ruoyi.system.domain.VehicleGps;
-import com.ruoyi.system.service.IVehicleGpsService;
-import com.ruoyi.system.exception.ServiceException;
+import com.ruoyi.gps.mapper.VehicleGpsMapper;
+import com.ruoyi.gps.domain.VehicleGps;
+import com.ruoyi.gps.service.IVehicleGpsService;
+
/**
* 杞﹁締GPS鍧愭爣Service涓氬姟灞傚鐞�
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleInfoServiceImpl.java b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleInfoServiceImpl.java
similarity index 92%
rename from ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleInfoServiceImpl.java
rename to ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleInfoServiceImpl.java
index 42a8c82..6089f83 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleInfoServiceImpl.java
+++ b/ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleInfoServiceImpl.java
@@ -1,11 +1,11 @@
-package com.ruoyi.system.service.impl;
+package com.ruoyi.gps.service.impl;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.VehicleInfoMapper;
-import com.ruoyi.system.domain.VehicleInfo;
-import com.ruoyi.system.service.IVehicleInfoService;
+import com.ruoyi.gps.mapper.VehicleInfoMapper;
+import com.ruoyi.gps.domain.VehicleInfo;
+import com.ruoyi.gps.service.IVehicleInfoService;
/**
* 杞﹁締淇℃伅Service涓氬姟灞傚鐞�
diff --git a/ruoyi-gps/src/main/resources/META-INF/maven/archetype.xml b/ruoyi-gps/src/main/resources/META-INF/maven/archetype.xml
new file mode 100644
index 0000000..1311bbc
--- /dev/null
+++ b/ruoyi-gps/src/main/resources/META-INF/maven/archetype.xml
@@ -0,0 +1,9 @@
+<archetype>
+ <id>ruoyi-gps</id>
+ <sources>
+ <source>src/main/java/App.java</source>
+ </sources>
+ <testSources>
+ <source>src/test/java/AppTest.java</source>
+ </testSources>
+</archetype>
diff --git a/ruoyi-gps/src/main/resources/archetype-resources/pom.xml b/ruoyi-gps/src/main/resources/archetype-resources/pom.xml
new file mode 100644
index 0000000..62e2837
--- /dev/null
+++ b/ruoyi-gps/src/main/resources/archetype-resources/pom.xml
@@ -0,0 +1,15 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>$org.example</groupId>
+ <artifactId>$ruoyi-gps</artifactId>
+ <version>$3.8.9</version>
+ <dependencies>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
diff --git a/ruoyi-gps/src/main/resources/archetype-resources/src/main/java/App.java b/ruoyi-gps/src/main/resources/archetype-resources/src/main/java/App.java
new file mode 100644
index 0000000..1fa6a95
--- /dev/null
+++ b/ruoyi-gps/src/main/resources/archetype-resources/src/main/java/App.java
@@ -0,0 +1,13 @@
+package $org.example;
+
+/**
+ * Hello world!
+ *
+ */
+public class App
+{
+ public static void main( String[] args )
+ {
+ System.out.println( "Hello World!" );
+ }
+}
diff --git a/ruoyi-gps/src/main/resources/archetype-resources/src/test/java/AppTest.java b/ruoyi-gps/src/main/resources/archetype-resources/src/test/java/AppTest.java
new file mode 100644
index 0000000..65be417
--- /dev/null
+++ b/ruoyi-gps/src/main/resources/archetype-resources/src/test/java/AppTest.java
@@ -0,0 +1,38 @@
+package $org.example;
+
+import junit.framework.Test;
+import junit.framework.TestCase;
+import junit.framework.TestSuite;
+
+/**
+ * Unit test for simple App.
+ */
+public class AppTest
+ extends TestCase
+{
+ /**
+ * Create the test case
+ *
+ * @param testName name of the test case
+ */
+ public AppTest( String testName )
+ {
+ super( testName );
+ }
+
+ /**
+ * @return the suite of tests being tested
+ */
+ public static Test suite()
+ {
+ return new TestSuite( AppTest.class );
+ }
+
+ /**
+ * Rigourous Test :-)
+ */
+ public void testApp()
+ {
+ assertTrue( true );
+ }
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/GpsCollectLogMapper.xml b/ruoyi-gps/src/main/resources/mapper/gps/GpsCollectLogMapper.xml
similarity index 98%
rename from ruoyi-system/src/main/resources/mapper/system/GpsCollectLogMapper.xml
rename to ruoyi-gps/src/main/resources/mapper/gps/GpsCollectLogMapper.xml
index 3d03992..3928387 100644
--- a/ruoyi-system/src/main/resources/mapper/system/GpsCollectLogMapper.xml
+++ b/ruoyi-gps/src/main/resources/mapper/gps/GpsCollectLogMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.GpsCollectLogMapper">
+<mapper namespace="com.ruoyi.gps.mapper.GpsCollectLogMapper">
<resultMap type="GpsCollectLog" id="GpsCollectLogResult">
<result property="logId" column="log_id" />
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysGpsConfigMapper.xml b/ruoyi-gps/src/main/resources/mapper/gps/SysGpsConfigMapper.xml
similarity index 98%
rename from ruoyi-system/src/main/resources/mapper/system/SysGpsConfigMapper.xml
rename to ruoyi-gps/src/main/resources/mapper/gps/SysGpsConfigMapper.xml
index f6568c6..f47ffbb 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysGpsConfigMapper.xml
+++ b/ruoyi-gps/src/main/resources/mapper/gps/SysGpsConfigMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.SysGpsConfigMapper">
+<mapper namespace="com.ruoyi.gps.mapper.SysGpsConfigMapper">
<resultMap type="SysGpsConfig" id="SysGpsConfigResult">
<result property="configId" column="config_id" />
diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml b/ruoyi-gps/src/main/resources/mapper/gps/VehicleGpsMapper.xml
similarity index 98%
rename from ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
rename to ruoyi-gps/src/main/resources/mapper/gps/VehicleGpsMapper.xml
index 9e01aae..4eb0a3c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
+++ b/ruoyi-gps/src/main/resources/mapper/gps/VehicleGpsMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.VehicleGpsMapper">
+<mapper namespace="com.ruoyi.gps.mapper.VehicleGpsMapper">
<resultMap type="VehicleGps" id="VehicleGpsResult">
<result property="gpsId" column="gps_id" />
diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml b/ruoyi-gps/src/main/resources/mapper/gps/VehicleInfoMapper.xml
similarity index 97%
rename from ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml
rename to ruoyi-gps/src/main/resources/mapper/gps/VehicleInfoMapper.xml
index aa34be7..e05a941 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml
+++ b/ruoyi-gps/src/main/resources/mapper/gps/VehicleInfoMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.system.mapper.VehicleInfoMapper">
+<mapper namespace="com.ruoyi.gps.mapper.VehicleInfoMapper">
- <resultMap type="com.ruoyi.system.domain.VehicleInfo" id="VehicleInfoResult">
+ <resultMap type="com.ruoyi.gps.domain.VehicleInfo" id="VehicleInfoResult">
<id property="vehicleId" column="vehicle_id" />
<result property="deviceId" column="device_id" />
<result property="vehicleNo" column="vehicle_no" />
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index 4b194ba..6b99b26 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -34,10 +34,21 @@
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-common</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-gps</artifactId>
+ </dependency>
<dependency>
<groupId>com.ruoyi</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-gps</artifactId>
+ <version>3.8.9</version>
+ <scope>compile</scope>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanVehicleGpsTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanVehicleGpsTask.java
index 321d326..d68dacd 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanVehicleGpsTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CleanVehicleGpsTask.java
@@ -1,10 +1,10 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.gps.service.IVehicleGpsService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.ruoyi.system.service.IVehicleGpsService;
/**
* 娓呯悊杞﹁締GPS鍘嗗彶鏁版嵁浠诲姟
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java
index c5abe54..30c2035 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/CmsVehicleSyncTask.java
@@ -6,16 +6,19 @@
import java.util.List;
import java.util.stream.Collectors;
-import com.ruoyi.system.domain.*;
+import com.ruoyi.gps.domain.CmsVehicleDeviceListResponse;
+import com.ruoyi.gps.domain.CmsVehicleLocationResponse;
+import com.ruoyi.gps.domain.VehicleGps;
+import com.ruoyi.gps.domain.VehicleInfo;
+import com.ruoyi.gps.service.ICmsGpsCollectService;
+import com.ruoyi.gps.service.IVehicleGpsService;
+import com.ruoyi.gps.service.IVehicleInfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.system.service.ICmsGpsCollectService;
-import com.ruoyi.system.service.IVehicleGpsService;
-import com.ruoyi.system.service.IVehicleInfoService;
/**
* CMS杞﹁締鍚屾瀹氭椂浠诲姟
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java
index 692c14f..05ee5ce 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/GpsSyncTask.java
@@ -4,19 +4,19 @@
import java.util.Date;
import java.util.List;
+import com.ruoyi.gps.service.IGpsCollectService;
+import com.ruoyi.gps.service.IVehicleGpsService;
+import com.ruoyi.gps.service.IVehicleInfoService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.ruoyi.system.domain.GpsLastPosition;
-import com.ruoyi.system.domain.GpsLastPositionRequest;
-import com.ruoyi.system.domain.GpsLastPositionResponse;
-import com.ruoyi.system.domain.VehicleGps;
-import com.ruoyi.system.domain.VehicleInfo;
-import com.ruoyi.system.service.IGpsCollectService;
-import com.ruoyi.system.service.IVehicleGpsService;
-import com.ruoyi.system.service.IVehicleInfoService;
+import com.ruoyi.gps.domain.GpsLastPosition;
+import com.ruoyi.gps.domain.GpsLastPositionRequest;
+import com.ruoyi.gps.domain.GpsLastPositionResponse;
+import com.ruoyi.gps.domain.VehicleGps;
+import com.ruoyi.gps.domain.VehicleInfo;
/**
* GPS鍚屾瀹氭椂浠诲姟
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/VehicleSyncTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/VehicleSyncTask.java
index e969f5f..b598e73 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/VehicleSyncTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/VehicleSyncTask.java
@@ -1,17 +1,17 @@
package com.ruoyi.quartz.task;
+import com.ruoyi.gps.service.IGpsCollectService;
+import com.ruoyi.gps.service.IVehicleInfoService;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import com.ruoyi.system.domain.GpsDevice;
-import com.ruoyi.system.domain.GpsDeviceListResponse;
-import com.ruoyi.system.domain.GpsGroup;
-import com.ruoyi.system.domain.VehicleInfo;
-import com.ruoyi.system.service.IGpsCollectService;
-import com.ruoyi.system.service.IVehicleInfoService;
+import com.ruoyi.gps.domain.GpsDevice;
+import com.ruoyi.gps.domain.GpsDeviceListResponse;
+import com.ruoyi.gps.domain.GpsGroup;
+import com.ruoyi.gps.domain.VehicleInfo;
/**
* 杞﹁締鍚屾瀹氭椂浠诲姟
diff --git a/ruoyi-system/pom.xml b/ruoyi-system/pom.xml
index 1b2a373..2619347 100644
--- a/ruoyi-system/pom.xml
+++ b/ruoyi-system/pom.xml
@@ -23,6 +23,10 @@
<artifactId>ruoyi-common</artifactId>
</dependency>
<dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-gps</artifactId>
+ </dependency>
+ <dependency>
<groupId>com.baomidou</groupId>
<artifactId>dynamic-datasource-spring-boot-starter</artifactId>
<version>3.5.1</version>
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsCollectLogService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsCollectLogService.java
deleted file mode 100644
index 8f3b0a9..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsCollectLogService.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.ruoyi.system.service;
-
-import java.util.List;
-import com.ruoyi.system.domain.GpsCollectLog;
-
-/**
- * GPS閲囬泦鏃ュ織Service鎺ュ彛
- */
-public interface IGpsCollectLogService {
- /**
- * 鏌ヨGPS閲囬泦鏃ュ織
- */
- public GpsCollectLog selectGpsCollectLogById(Long logId);
-
- /**
- * 鏌ヨGPS閲囬泦鏃ュ織鍒楄〃
- */
- public List<GpsCollectLog> selectGpsCollectLogList(GpsCollectLog gpsCollectLog);
-
- /**
- * 鏂板GPS閲囬泦鏃ュ織
- */
- public int insertGpsCollectLog(GpsCollectLog gpsCollectLog);
-
- /**
- * 淇敼GPS閲囬泦鏃ュ織
- */
- public int updateGpsCollectLog(GpsCollectLog gpsCollectLog);
-
- /**
- * 鎵归噺鍒犻櫎GPS閲囬泦鏃ュ織
- */
- public int deleteGpsCollectLogByIds(Long[] logIds);
-
- /**
- * 鍒犻櫎GPS閲囬泦鏃ュ織淇℃伅
- */
- public int deleteGpsCollectLogById(Long logId);
-}
\ No newline at end of file
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectLogServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectLogServiceImpl.java
deleted file mode 100644
index 645e960..0000000
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectLogServiceImpl.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.ruoyi.system.service.impl;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ruoyi.system.mapper.GpsCollectLogMapper;
-import com.ruoyi.system.domain.GpsCollectLog;
-import com.ruoyi.system.service.IGpsCollectLogService;
-import com.ruoyi.system.exception.ServiceException;
-
-/**
- * GPS閲囬泦鏃ュ織Service涓氬姟灞傚鐞�
- */
-@Service
-public class GpsCollectLogServiceImpl implements IGpsCollectLogService {
- @Autowired
- private GpsCollectLogMapper gpsCollectLogMapper;
-
- /**
- * 鏌ヨGPS閲囬泦鏃ュ織
- */
- @Override
- public GpsCollectLog selectGpsCollectLogById(Long logId) {
- return gpsCollectLogMapper.selectGpsCollectLogById(logId);
- }
-
- /**
- * 鏌ヨGPS閲囬泦鏃ュ織鍒楄〃
- */
- @Override
- public List<GpsCollectLog> selectGpsCollectLogList(GpsCollectLog gpsCollectLog) {
- return gpsCollectLogMapper.selectGpsCollectLogList(gpsCollectLog);
- }
-
- /**
- * 鏂板GPS閲囬泦鏃ュ織
- */
- @Override
- public int insertGpsCollectLog(GpsCollectLog gpsCollectLog) {
- // 鏍规嵁杞︾墝鍙疯幏鍙栬溅杈咺D
- Long vehicleId = gpsCollectLogMapper.getVehicleIdByNo(gpsCollectLog.getVehicleNo());
- if (vehicleId == null) {
- throw new ServiceException("鏈壘鍒板搴旂殑杞﹁締淇℃伅");
- }
- gpsCollectLog.setVehicleId(vehicleId);
- return gpsCollectLogMapper.insertGpsCollectLog(gpsCollectLog);
- }
-
- /**
- * 淇敼GPS閲囬泦鏃ュ織
- */
- @Override
- public int updateGpsCollectLog(GpsCollectLog gpsCollectLog) {
- // 鏍规嵁杞︾墝鍙疯幏鍙栬溅杈咺D
- Long vehicleId = gpsCollectLogMapper.getVehicleIdByNo(gpsCollectLog.getVehicleNo());
- if (vehicleId == null) {
- throw new ServiceException("鏈壘鍒板搴旂殑杞﹁締淇℃伅");
- }
- gpsCollectLog.setVehicleId(vehicleId);
- return gpsCollectLogMapper.updateGpsCollectLog(gpsCollectLog);
- }
-
- /**
- * 鎵归噺鍒犻櫎GPS閲囬泦鏃ュ織
- */
- @Override
- public int deleteGpsCollectLogByIds(Long[] logIds) {
- return gpsCollectLogMapper.deleteGpsCollectLogByIds(logIds);
- }
-
- /**
- * 鍒犻櫎GPS閲囬泦鏃ュ織淇℃伅
- */
- @Override
- public int deleteGpsCollectLogById(Long logId) {
- return gpsCollectLogMapper.deleteGpsCollectLogById(logId);
- }
-}
\ No newline at end of file
--
Gitblit v1.9.1