ToBeNumberOne
/
god-car-base
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

整体大改动

master
fst1996 2023-11-27 22:21:42 +08:00
parent 9953aab7bd
commit b5b21c6583
57 changed files with 89 additions and 246 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
car-base-server/src/main/java/com/god/base/server/constant/BreakConstant.java → car-base-common/src/main/java/com/god/base/common/constant/BreakConstant.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.constant;
package com.god.base.common.constant;
/**
* 故障信息

2
car-base-common/src/main/java/com/god/base/server/common/domainConstants/HBaseConstant.java → car-base-common/src/main/java/com/god/base/common/constant/HBaseConstant.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domainConstants;
package com.god.base.common.constant;

2
car-base-common/src/main/java/com/god/base/server/common/domainConstants/RabbitConstant.java → car-base-common/src/main/java/com/god/base/common/constant/RabbitConstant.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domainConstants;
package com.god.base.common.constant;
/**
* RabbitMQ常量

2
car-base-common/src/main/java/com/god/base/server/common/domainConstants/RedisConstant.java → car-base-common/src/main/java/com/god/base/common/constant/RedisConstant.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domainConstants;
package com.god.base.common.constant;
/**
* 数据解析端

2
car-base-common/src/main/java/com/god/base/server/common/domainConstants/TimeConstant.java → car-base-common/src/main/java/com/god/base/common/constant/TimeConstant.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domainConstants;
package com.god.base.common.constant;
/**

2
car-base-server/src/main/java/com/god/base/server/config/ErrorConfig.java → car-base-common/src/main/java/com/god/base/config/ErrorConfig.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.config;
package com.god.base.config;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBox.java → car-base-common/src/main/java/com/god/base/domain/BatteryBox.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;

2
car-base-common/src/main/java/com/god/base/server/common/domain/BatteryBoxModel.java → car-base-common/src/main/java/com/god/base/domain/BatteryBoxModel.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;

4
car-base-common/src/main/java/com/god/base/common/domain/Breakdown.java → car-base-common/src/main/java/com/god/base/domain/Breakdown.java
View File

@ -1,8 +1,8 @@
package com.god.base.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.god.base.common.domain.request.BreakdownRequest;
import com.god.base.domain.request.BreakdownRequest;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;

4
car-base-common/src/main/java/com/god/base/server/common/domain/Car.java → car-base-common/src/main/java/com/god/base/domain/Car.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.god.base.server.common.domain.request.CarRequest;
import com.god.base.domain.request.CarRequest;
import com.god.common.core.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Builder;

2
car-base-common/src/main/java/com/god/base/server/common/domain/CarType.java → car-base-common/src/main/java/com/god/base/domain/CarType.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;

2
car-base-common/src/main/java/com/god/base/server/common/domain/DrivingRecord.java → car-base-common/src/main/java/com/god/base/domain/DrivingRecord.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;

4
car-base-common/src/main/java/com/god/base/common/domain/Fault.java → car-base-common/src/main/java/com/god/base/domain/Fault.java
View File

@ -1,7 +1,7 @@
package com.god.base.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import com.god.base.common.domain.request.FaultRequest;
import com.god.base.domain.request.FaultRequest;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
car-base-common/src/main/java/com/god/base/common/domain/Faultcodealarm.java → car-base-common/src/main/java/com/god/base/domain/Faultcodealarm.java
View File

@ -1,4 +1,4 @@
package com.god.base.common.domain;
package com.god.base.domain;
import lombok.AllArgsConstructor;
import lombok.Data;

5
car-base-common/src/main/java/com/god/base/common/domain/Fence.java → car-base-common/src/main/java/com/god/base/domain/Fence.java
View File

@ -1,10 +1,10 @@
package com.god.base.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.god.base.common.domain.request.FenceAddRequest;
import com.god.base.domain.request.FenceAddRequest;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
@ -12,7 +12,6 @@ import lombok.NoArgsConstructor;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotEmpty;
import javax.validation.constraints.NotNull;
import java.util.Date;
/**

2
car-base-common/src/main/java/com/god/base/common/domain/PageQuery.java → car-base-common/src/main/java/com/god/base/domain/PageQuery.java
View File

@ -1,4 +1,4 @@
package com.god.base.common.domain;
package com.god.base.domain;
import com.alibaba.druid.util.StringUtils;
import com.baomidou.mybatisplus.core.metadata.OrderItem;

2
car-base-common/src/main/java/com/god/base/common/domain/RequestLog.java → car-base-common/src/main/java/com/god/base/domain/RequestLog.java
View File

@ -1,4 +1,4 @@
package com.god.base.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

2
car-base-common/src/main/java/com/god/base/server/common/domain/VehicleMessage.java → car-base-common/src/main/java/com/god/base/domain/VehicleMessage.java
View File

@ -1,4 +1,4 @@
package com.god.base.server.common.domain;
package com.god.base.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;

4
car-base-common/src/main/java/com/god/base/common/domain/request/BreakdownRequest.java → car-base-common/src/main/java/com/god/base/domain/request/BreakdownRequest.java
View File

@ -1,8 +1,8 @@
package com.god.base.common.domain.request;
package com.god.base.domain.request;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.god.base.common.domain.PageQuery;
import com.god.base.domain.PageQuery;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

4
car-base-common/src/main/java/com/god/base/server/common/domain/request/CarRequest.java → car-base-common/src/main/java/com/god/base/domain/request/CarRequest.java
View File

@ -1,6 +1,6 @@
package com.god.base.server.common.domain.request;
package com.god.base.domain.request;
import com.god.base.common.domain.PageQuery;
import com.god.base.domain.PageQuery;
import com.god.common.core.annotation.Excel;
import lombok.AllArgsConstructor;
import lombok.Data;

4
car-base-common/src/main/java/com/god/base/common/domain/request/FaultRequest.java → car-base-common/src/main/java/com/god/base/domain/request/FaultRequest.java
View File

@ -1,6 +1,6 @@
package com.god.base.common.domain.request;
package com.god.base.domain.request;
import com.god.base.common.domain.PageQuery;
import com.god.base.domain.PageQuery;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

2
car-base-common/src/main/java/com/god/base/common/domain/request/FenceAddRequest.java → car-base-common/src/main/java/com/god/base/domain/request/FenceAddRequest.java
View File

@ -1,4 +1,4 @@
package com.god.base.common.domain.request;
package com.god.base.domain.request;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;

4
car-base-common/src/main/java/com/god/base/common/domain/request/FenceQueryRequest.java → car-base-common/src/main/java/com/god/base/domain/request/FenceQueryRequest.java
View File

@ -1,6 +1,6 @@
package com.god.base.common.domain.request;
package com.god.base.domain.request;
import com.god.base.common.domain.PageQuery;
import com.god.base.domain.PageQuery;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

4
car-base-common/src/main/java/com/god/base/common/domain/response/BreakdownResponse.java → car-base-common/src/main/java/com/god/base/domain/response/BreakdownResponse.java
View File

@ -1,6 +1,6 @@
package com.god.base.common.domain.response;
package com.god.base.domain.response;
import com.god.base.common.domain.PageQuery;
import com.god.base.domain.PageQuery;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

32
car-base-common/src/main/java/com/god/base/server/common/constants/VehicleConstant.java
View File

@ -1,32 +0,0 @@
package com.god.base.server.common.constants;
/**
* 车辆信息
*/
public class VehicleConstant {
/**
* 车辆启动
*/
public static final Integer VEHICLE_START = 1;
/**
* 车辆停止
*/
public static final Integer VEHICLE_END = 0 ;
/**
* 车辆状态更改队列
*/
public static final String VEHICLE_STATUS_UPDATE_QUEUE = "vehicle_status_update_queue";
/**
* 车辆信息前缀
*/
public static final String VEHICLE_INFO_MAP = "vehicle_info_map";
}

88
car-base-common/src/main/java/com/god/base/server/common/domainConstants/VehicleConstant.java
View File

@ -1,88 +0,0 @@
package com.god.base.server.common.domainConstants;
/**
* @ClassName VehicleConstant
* @Author WenHao.Sao
*/
public class VehicleConstant {
/**
* 分包符
*/
public static final String DATA_PACK_SEPARATOR = "#$&*";
/**
* 报文起始位
*/
public static final String MSG_START = "7E";
/**
* 报文结束符
*/
public static final String MSG_END= "7E";
/**
* 连接信息vin
*/
public static final String START_VIN_SUF = "START_VIN";
/**
* 连接信息VIN
*/
public static final String START_VIN_SUCCESS_SUF = "SUCCESS_CIN:";
/**
* 车辆信息报文前缀
*/
public static final String VEHICLE_MSG_SUF = "VEHICLE_MSG:";
/**
* 车辆关闭报文前缀
*/
public static final String VEHICLE_STOP_SUF = "VEHICLE_STOP:";
/**
* 连接启动信息
*/
public static final String NETTY_CONNECT = "CONNECT";
/**
*
*/
public static final String NETTY_WILL_CLOSE = "CLOSE";
// public static final String
//
// public static final String
//
// public static final String
//
// public static final String
//
// public static final String
//
// public static final String
//
// public static final String
}

8
car-base-remote/src/main/java/com/god/base/remote/RemoteCarService.java
View File

@ -1,13 +1,9 @@
package com.god.base.remote;
import com.god.base.common.domain.Fence;
import com.god.base.domain.Fence;
import com.god.base.remote.factory.RemoteCarFallbackFactory;
import com.god.base.server.common.domain.Car;
import com.god.common.core.constant.SecurityConstants;
import com.god.common.core.constant.ServiceNameConstants;
import com.god.base.domain.Car;
import com.god.common.core.domain.Result;
import com.god.common.security.annotation.RequiresPermissions;
import com.god.common.system.remote.factory.RemoteLogFallbackFactory;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;

3
car-base-remote/src/main/java/com/god/base/remote/RemoteFenceService.java
View File

@ -1,10 +1,9 @@
package com.god.base.remote;
import com.god.base.common.domain.Fence;
import com.god.base.domain.Fence;
import com.god.base.remote.factory.RemoteFenceFallbackFactory;
import com.god.common.core.constant.SecurityConstants;
import com.god.common.core.domain.Result;
import com.god.common.log.annotation.Log;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestHeader;

4
car-base-remote/src/main/java/com/god/base/remote/factory/RemoteCarFallbackFactory.java
View File

@ -1,8 +1,8 @@
package com.god.base.remote.factory;
import com.god.base.common.domain.Fence;
import com.god.base.domain.Fence;
import com.god.base.remote.RemoteCarService;
import com.god.base.server.common.domain.Car;
import com.god.base.domain.Car;
import com.god.common.core.domain.Result;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

2
car-base-remote/src/main/java/com/god/base/remote/factory/RemoteFenceFallbackFactory.java
View File

@ -1,6 +1,6 @@
package com.god.base.remote.factory;
import com.god.base.common.domain.Fence;
import com.god.base.domain.Fence;
import com.god.base.remote.RemoteFenceService;
import com.god.common.core.domain.Result;
import org.slf4j.Logger;

28
car-base-server/src/main/java/com/god/base/server/config/SpringUtils.java
View File

@ -1,28 +0,0 @@
package com.god.base.server.config;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
/**
* @author ChenXinHai
* @version 2023/11/22 - 19:55
*/
public class SpringUtils implements ApplicationContextAware {
private static ApplicationContext applicationContext;
@Override
public void setApplicationContext(ApplicationContext applicationContext) {
SpringUtils.applicationContext=applicationContext;
}
public static ApplicationContext getApplicationContext(){
return applicationContext;
}
/**
* 通过name 获取bean
*/
public static Object getBean(String name){
return getApplicationContext().getBean(name);
}
}

4
car-base-server/src/main/java/com/god/base/server/controller/BreakdownController.java
View File

@ -2,8 +2,8 @@ package com.god.base.server.controller;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.model.v2.Result;
import com.god.base.common.domain.Breakdown;
import com.god.base.common.domain.request.BreakdownRequest;
import com.god.base.domain.Breakdown;
import com.god.base.domain.request.BreakdownRequest;
import com.god.base.server.service.BreakdownService;
import com.god.common.core.web.page.TableDataInfo;
import lombok.extern.log4j.Log4j2;

6
car-base-server/src/main/java/com/god/base/server/controller/CarController.java
View File

@ -1,9 +1,9 @@
package com.god.base.server.controller;
import com.alibaba.fastjson.JSONObject;
import com.god.base.server.common.domain.Car;
import com.god.base.server.common.domain.VehicleMessage;
import com.god.base.server.common.domain.request.CarRequest;
import com.god.base.domain.Car;
import com.god.base.domain.VehicleMessage;
import com.god.base.domain.request.CarRequest;
import com.god.base.server.mapper.CarMapper;
import com.god.base.server.service.CarService;
import com.god.base.server.util.AopConfig;

4
car-base-server/src/main/java/com/god/base/server/controller/DrivingRecordController.java
View File

@ -1,7 +1,7 @@
package com.god.base.server.controller;
import com.god.base.server.common.domain.DrivingRecord;
import com.god.base.server.common.domain.VehicleMessage;
import com.god.base.domain.DrivingRecord;
import com.god.base.domain.VehicleMessage;
import com.god.base.server.service.IDrivingRecordService;
import com.god.common.core.domain.Result;
import com.god.common.core.utils.poi.ExcelUtil;

4
car-base-server/src/main/java/com/god/base/server/controller/FaultController.java
View File

@ -2,8 +2,8 @@ package com.god.base.server.controller;
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.api.model.v2.Result;
import com.god.base.common.domain.Fault;
import com.god.base.common.domain.request.FaultRequest;
import com.god.base.domain.Fault;
import com.god.base.domain.request.FaultRequest;
import com.god.base.server.service.FaultService;
import com.god.common.core.web.controller.BaseController;
import com.god.common.core.web.page.TableDataInfo;

8
car-base-server/src/main/java/com/god/base/server/controller/FenceController.java
View File

@ -8,11 +8,9 @@ package com.god.base.server.controller;
* @Description TODO
**/
import com.alibaba.fastjson.JSONObject;
import com.god.base.common.domain.Fence;
import com.god.base.common.domain.request.FenceAddRequest;
import com.god.base.common.domain.request.FenceQueryRequest;
import com.god.base.domain.Fence;
import com.god.base.domain.request.FenceAddRequest;
import com.god.base.domain.request.FenceQueryRequest;
import com.god.base.server.service.FenceService;
import com.god.common.core.web.page.TableDataInfo;
import com.god.common.log.annotation.Log;

2
car-base-server/src/main/java/com/god/base/server/mapper/BreakdownMapper.java
View File

@ -1,7 +1,7 @@
package com.god.base.server.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.god.base.common.domain.Breakdown;
import com.god.base.domain.Breakdown;
import org.apache.ibatis.annotations.Mapper;
/**

4
car-base-server/src/main/java/com/god/base/server/mapper/CarMapper.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.god.base.server.common.domain.Car;
import com.god.base.server.common.domain.request.CarRequest;
import com.god.base.domain.Car;
import com.god.base.domain.request.CarRequest;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;

2
car-base-server/src/main/java/com/god/base/server/mapper/DrivingRecordMapper.java
View File

@ -1,6 +1,6 @@
package com.god.base.server.mapper;
import com.god.base.server.common.domain.DrivingRecord;
import com.god.base.domain.DrivingRecord;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;

2
car-base-server/src/main/java/com/god/base/server/mapper/FaultMapper.java
View File

@ -1,7 +1,7 @@
package com.god.base.server.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.god.base.common.domain.Fault;
import com.god.base.domain.Fault;
import org.apache.ibatis.annotations.Mapper;
/**

3
car-base-server/src/main/java/com/god/base/server/mapper/FenceMapper.java
View File

@ -1,8 +1,7 @@
package com.god.base.server.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.god.base.common.domain.Fence;
import org.apache.ibatis.annotations.Mapper;
import com.god.base.domain.Fence;
/**
* @ClassName FenceMapper

4
car-base-server/src/main/java/com/god/base/server/service/BreakdownService.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.god.base.common.domain.Breakdown;
import com.god.base.common.domain.request.BreakdownRequest;
import com.god.base.domain.Breakdown;
import com.god.base.domain.request.BreakdownRequest;
import com.god.common.core.web.page.TableDataInfo;
/**

4
car-base-server/src/main/java/com/god/base/server/service/CarService.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.god.base.server.common.domain.Car;
import com.god.base.server.common.domain.VehicleMessage;
import com.god.base.domain.Car;
import com.god.base.domain.VehicleMessage;
import com.god.common.core.domain.Result;
import org.apache.ibatis.annotations.Param;

4
car-base-server/src/main/java/com/god/base/server/service/FaultService.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.god.base.common.domain.Fault;
import com.god.base.common.domain.request.FaultRequest;
import com.god.base.domain.Fault;
import com.god.base.domain.request.FaultRequest;
import com.god.common.core.web.page.TableDataInfo;
/**

4
car-base-server/src/main/java/com/god/base/server/service/FenceService.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.god.base.common.domain.Fence;
import com.god.base.common.domain.request.FenceQueryRequest;
import com.god.base.domain.Fence;
import com.god.base.domain.request.FenceQueryRequest;
import com.god.common.core.web.page.TableDataInfo;
/**

2
car-base-server/src/main/java/com/god/base/server/service/IDrivingRecordService.java
View File

@ -1,7 +1,7 @@
package com.god.base.server.service;
import com.god.base.server.common.domain.DrivingRecord;
import com.god.base.domain.DrivingRecord;
import org.apache.ibatis.annotations.Param;
import java.util.List;

2
car-base-server/src/main/java/com/god/base/server/service/RequestLogService.java
View File

@ -1,7 +1,7 @@
//package com.god.base.server.service;
//
//import com.baomidou.mybatisplus.extension.service.IService;
//import com.god.base.common.domain.RequestLog;
//import com.god.base.domain.RequestLog;
//
///**
// * AOP

4
car-base-server/src/main/java/com/god/base/server/service/impl/BreakdownServiceImpl.java
View File

@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.god.base.common.domain.Breakdown;
import com.god.base.common.domain.request.BreakdownRequest;
import com.god.base.domain.Breakdown;
import com.god.base.domain.request.BreakdownRequest;
import com.god.base.server.mapper.BreakdownMapper;
import com.god.base.server.service.BreakdownService;
import com.god.common.core.web.page.TableDataInfo;

6
car-base-server/src/main/java/com/god/base/server/service/impl/CarServiceImpl.java
View File

@ -1,9 +1,9 @@
package com.god.base.server.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.god.base.server.common.domain.Car;
import com.god.base.server.common.domain.VehicleMessage;
import com.god.base.server.common.domainConstants.RedisConstant;
import com.god.base.domain.Car;
import com.god.base.domain.VehicleMessage;
import com.god.base.common.constant.RedisConstant;
import com.god.base.server.mapper.CarMapper;
import com.god.base.server.service.CarService;
import com.god.common.core.domain.Result;

4
car-base-server/src/main/java/com/god/base/server/service/impl/FaultServiceImpl.java
View File

@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.god.base.common.domain.Fault;
import com.god.base.common.domain.request.FaultRequest;
import com.god.base.domain.Fault;
import com.god.base.domain.request.FaultRequest;
import com.god.base.server.mapper.FaultMapper;
import com.god.base.server.service.FaultService;
import com.god.common.core.web.page.TableDataInfo;

4
car-base-server/src/main/java/com/god/base/server/service/impl/FenceServiceImpl.java
View File

@ -4,8 +4,8 @@ import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.god.base.common.domain.Fence;
import com.god.base.common.domain.request.FenceQueryRequest;
import com.god.base.domain.Fence;
import com.god.base.domain.request.FenceQueryRequest;
import com.god.base.server.mapper.FenceMapper;
import com.god.base.server.service.FenceService;
import com.god.common.core.web.page.TableDataInfo;

2
car-base-server/src/main/java/com/god/base/server/service/impl/IDrivingRecordServiceImpl.java
View File

@ -1,6 +1,6 @@
package com.god.base.server.service.impl;
import com.god.base.server.common.domain.DrivingRecord;
import com.god.base.domain.DrivingRecord;
import com.god.base.server.mapper.DrivingRecordMapper;
import com.god.base.server.service.IDrivingRecordService;
import org.springframework.beans.factory.annotation.Autowired;

2
car-base-server/src/main/java/com/god/base/server/webSocket/entity/VehicleAllData.java
View File

@ -1,6 +1,6 @@
package com.god.base.server.webSocket.entity;
import com.god.base.server.common.domain.VehicleMessage;
import com.god.base.domain.VehicleMessage;
import lombok.Data;
import java.util.List;

4
car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketBatchHandler.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.webSocket.handler;
import com.alibaba.fastjson.JSON;
import com.god.base.server.common.domain.VehicleMessage;
import com.god.base.server.common.domainConstants.RedisConstant;
import com.god.base.domain.VehicleMessage;
import com.god.base.common.constant.RedisConstant;
import com.god.base.server.mapper.CarMapper;
import com.god.base.server.webSocket.entity.VehicleAllData;
import lombok.extern.log4j.Log4j2;

4
car-base-server/src/main/java/com/god/base/server/webSocket/handler/SocketHandler.java
View File

@ -1,8 +1,8 @@
package com.god.base.server.webSocket.handler;
import com.alibaba.fastjson.JSON;
import com.god.base.server.common.domain.VehicleMessage;
import com.god.base.server.common.domainConstants.RedisConstant;
import com.god.base.domain.VehicleMessage;
import com.god.base.common.constant.RedisConstant;
import com.god.base.server.webSocket.entity.SocketData;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;

4
car-base-server/src/main/resources/mapper/CarMapper.xml
View File

@ -26,7 +26,7 @@
select car_vin_id, car_type_id, fence_id, battery_manufacturer, motor_manufacturer, motor_numberr, battery_number,status from t_car
</sql>
<!--车辆列表查询-->
<select id="selectVehicleInfoList" resultType="com.god.base.server.common.domain.Car">
<select id="selectVehicleInfoList" resultType="com.god.base.domain.Car">
<include refid="selectVehicleInfoVo"/>
<where>
<if test="carVinId != null and carVinId != ''"> and car_vin_id = #{carVinId}</if>"
@ -56,7 +56,7 @@
from t_car
</select>
<!-- 根据vin查询当前对象的所有信息-->
<select id="HuiCarSelect" resultType="com.god.base.server.common.domain.Car">
<select id="HuiCarSelect" resultType="com.god.base.domain.Car">
<include refid="selectVehicleInfoVo"/>
where car_vin_id = #{vinId}
</select>

10
car-base-server/src/main/resources/mapper/DrivingRecordMapper.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.god.base.server.mapper.DrivingRecordMapper">
<resultMap id="DrivingRecordResult" type="com.god.base.server.common.domain.DrivingRecord">
<resultMap id="DrivingRecordResult" type="com.god.base.domain.DrivingRecord">
<result property="id" column="id"/>
<result property="vin" column="vin"/>
<result property="startTime" column="start_time"/>
@ -16,7 +16,7 @@
</sql>
<!-- 查询车辆行驶记录列表-->
<select id="selectDrivingRecordList" resultType="com.god.base.server.common.domain.DrivingRecord">
<select id="selectDrivingRecordList" resultType="com.god.base.domain.DrivingRecord">
<include refid="selectDrivingRecordVo"/>
<where>
<if test="vin != null and vin != '' "> and vin = #{vin} </if>
@ -26,13 +26,13 @@
</select>
<!-- 查询车辆行驶记录-->
<select id="selectDrivingRecordById" resultType="com.god.base.server.common.domain.DrivingRecord">
<select id="selectDrivingRecordById" resultType="com.god.base.domain.DrivingRecord">
<include refid="selectDrivingRecordVo"/>
where id = #{id}
</select>
<!-- 新增车辆行驶记录 -->
<insert id="insertDrivingRecord" parameterType="com.god.base.server.common.domain.DrivingRecord" useGeneratedKeys="true" keyProperty="id" >
<insert id="insertDrivingRecord" parameterType="com.god.base.domain.DrivingRecord" useGeneratedKeys="true" keyProperty="id" >
insert into driving_record
<trim prefix="(" suffix= ")" suffixOverrides=",">
<if test="vin != null and vin != '' ">vin,</if>
@ -51,7 +51,7 @@
</insert>
<!-- 修改车辆行驶记录-->
<update id="updateDrivingRecord" parameterType="com.god.base.server.common.domain.DrivingRecord">
<update id="updateDrivingRecord" parameterType="com.god.base.domain.DrivingRecord">
update driving_record
<trim prefix="SET" suffixOverrides=",">
<if test="vin != null and vin != '' ">vin = #{vin},</if>