feat:dev

wlzboy

2025-09-20 b62bc392f3c1658381107be1d5f737a3389e7f5f

feat:dev

 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>


 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>


 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.*;


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/GpsCollectLogController.java

File was deleted

 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;

 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;

 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;


 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

 ruoyi-admin/src/main/resources/application.yml

@@ -56,7 +56,7 @@
    basename: i18n/messages
  profiles:
    # 环境 dev|test|prod
    active: prod
    active: dev
  # 文件上传
  servlet:
    multipart:

 ruoyi-gps/pom.xml

New file
@@ -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>

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsGpsLoginResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsGpsLoginResponse.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import com.fasterxml.jackson.annotation.JsonProperty;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsTrackDetailResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsTrackDetailResponse.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import lombok.Data;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceListResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/CmsVehicleDeviceListResponse.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import java.util.List;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleDeviceResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/CmsVehicleLocationResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsCollectLog.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDevice.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsDevice.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import java.io.Serializable;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsDeviceListResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsGroup.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPosition.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLastPosition.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import java.io.Serializable;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionRequest.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLastPositionResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginRequest.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginRequest.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import com.fasterxml.jackson.annotation.JsonProperty;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsLoginResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsLoginResponse.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import java.io.Serializable;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsServiceConfig.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/config/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackPoint.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackPoint.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import lombok.Data;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryRequest.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryRequest.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

public class GpsTrackQueryRequest {
    private String deviceid;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/GpsTrackQueryResponse.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/domain/GpsTrackQueryResponse.java
@@ -1,4 +1,4 @@
package com.ruoyi.system.domain;
package com.ruoyi.gps.domain;

import java.util.List;


 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/SysGpsConfig.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleGps.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/domain/VehicleInfo.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/GpsCollectLogMapper.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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接口

 ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/SysGpsConfigMapper.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

/**

 ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleGpsMapper.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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接口

 ruoyi-gps/src/main/java/com/ruoyi/gps/mapper/VehicleInfoMapper.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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接口

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/ICmsGpsCollectService.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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采集服务接口

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsCollectService.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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采集服务接口

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/IGpsConfigService.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

/**

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleGpsService.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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接口

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/IVehicleInfoService.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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接口

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/CmsGpsCollectServiceImpl.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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采集服务实现

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsCollectServiceImpl.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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采集服务实现

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/GpsConfigServiceImpl.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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;

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleGpsServiceImpl.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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业务层处理

 ruoyi-gps/src/main/java/com/ruoyi/gps/service/impl/VehicleInfoServiceImpl.java

File was renamed from ruoyi-system/src/main/java/com/ruoyi/system/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业务层处理

 ruoyi-gps/src/main/resources/META-INF/maven/archetype.xml

New file
@@ -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>

 ruoyi-gps/src/main/resources/archetype-resources/pom.xml

New file
@@ -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>

 ruoyi-gps/src/main/resources/archetype-resources/src/main/java/App.java

New file
@@ -0,0 +1,13 @@
package $org.example;

/**
 * Hello world!
 *
 */
public class App 
{
    public static void main( String[] args )
    {
        System.out.println( "Hello World!" );
    }
}

 ruoyi-gps/src/main/resources/archetype-resources/src/test/java/AppTest.java

New file
@@ -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 );
    }
}

 ruoyi-gps/src/main/resources/mapper/gps/GpsCollectLogMapper.xml

File was renamed from ruoyi-system/src/main/resources/mapper/system/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"    />

 ruoyi-gps/src/main/resources/mapper/gps/SysGpsConfigMapper.xml

File was renamed from ruoyi-system/src/main/resources/mapper/system/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"    />

 ruoyi-gps/src/main/resources/mapper/gps/VehicleGpsMapper.xml

File was renamed from ruoyi-system/src/main/resources/mapper/system/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"    />

 ruoyi-gps/src/main/resources/mapper/gps/VehicleInfoMapper.xml

File was renamed from ruoyi-system/src/main/resources/mapper/system/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"      />

 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>

 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历史数据任务

 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车辆同步定时任务

 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同步定时任务

 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;

/**
 * 车辆同步定时任务

 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>

 ruoyi-system/src/main/java/com/ruoyi/system/service/IGpsCollectLogService.java

File was deleted

 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/GpsCollectLogServiceImpl.java

File was deleted