six-vehicle
/
cloud-server
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1.feat(): 添加将pom文件版本号统一管理 

2.fix(): 修复了项目运行时的报错:
Error creating bean with name 'com.muyu.common.cache.config.CacheAbsBasic': Failed to instantiate [com.muyu.common.cache.config.CacheAbsBasic]: Is it an abstract class?
更新时间09301928
dev.entOperation
微醺 2024-09-30 19:28:04 +08:00
parent b9f3cac204
commit a229006c89
8 changed files with 43 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/config/CacheAbsBasic.java vendored
View File

@ -9,6 +9,9 @@ package com.muyu.common.cache.config;
import com.muyu.common.redis.service.RedisService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
public abstract class CacheAbsBasic<K,V> implements CacheBasic<K,V> {

1
cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -1 +0,0 @@
com.muyu.common.cache.config.SpringDocConfig

3
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml
View File

@ -26,8 +26,9 @@
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-cache</artifactId>
<version>3.6.3</version>
</dependency>
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-enterprise-common</artifactId>

1
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
View File

@ -1 +1,2 @@
com.muyu.enterprise.cache.CarManageCacheService

31
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java
View File

@ -24,33 +24,22 @@ public class CarDTO {
*/
private Long companyId;
/**
* 能源类型 1.电动 2.纯油 3.混动
* 车辆配置
*/
private Integer energyType;
/**
* 档的类型 1.手动 2.自动
*/
private Integer gearType;
private Integer configId;
private Integer pageNum = 1;
private Integer pageSize = 3;
/** 最后一次连线时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date carLastJoinTime;
/** 最后一次离线时间 */
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date carLastOfflineTime;
/**
* 在线状态 1.无信号 2.行驶中 3.已停止
*/
private Integer carStatus;
/**
* 企业名称
* 车辆品牌
*/
@TableField(exist = false)
private String companyName;
private String carModel;
/**
* 车辆型号
*/
private String carBrand;
}

3
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml
View File

@ -77,11 +77,10 @@
<artifactId>cloud-common-api-doc</artifactId>
</dependency>
<!-- redis 缓存 -->
<!-- 企业缓存 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-enterprise-cache</artifactId>
<version>3.6.3</version>
</dependency>
<!-- 企业业务平台 - 公共依赖 -->

12
cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/CarManageServiceImpl.java
View File

@ -52,7 +52,11 @@ public class CarManageServiceImpl extends ServiceImpl<CarManageMapper, CarManage
CarManage carManage = BeanUtil.copyProperties(carDTO, CarManage.class);
List<CarManage> list = lambdaQuery()
.eq(carManage.getCarVin() != null && carManage.getCarVin() != "", CarManage::getCarVin, carManage.getCarVin())
.eq(carManage.getCarModel() != null && carManage.getCarModel() != "", CarManage::getCarModel, carManage.getCarModel())
.eq(carManage.getCarBrand() != null && carManage.getCarBrand() != "", CarManage::getCarBrand, carManage.getCarBrand())
.eq(carManage.getCarStatus() > 0, CarManage::getCarStatus, carManage.getCarStatus())
.eq(carManage.getConfigId() > 0, CarManage::getConfigId, carManage.getConfigId())
.eq(carManage.getCompanyId() > 0, CarManage::getCompanyId, carManage.getCompanyId())
.list();
// List<CarManage> list = list();
@ -73,6 +77,8 @@ public class CarManageServiceImpl extends ServiceImpl<CarManageMapper, CarManage
}
@Override
public List<CarVO> CarListShow(CarDTO carDTO) {
// 获取 企业
CarManage carManage = BeanUtil.copyProperties(carDTO, CarManage.class);
return carManageMapper.selectJoinList(CarVO.class, new MPJLambdaWrapper<CarManage>()
.selectAll(CarManage.class) // 查询所有车辆表
.select(CarCompany::getCompanyName)
@ -81,6 +87,12 @@ public class CarManageServiceImpl extends ServiceImpl<CarManageMapper, CarManage
.select(CarConfig::getEnergyType)
.leftJoin(CarConfig.class, CarConfig::getConfigId, CarManage::getConfigId)
.leftJoin(CarCompany.class, CarCompany::getCompanyId, CarManage::getCompanyId)
.eq(carManage.getCarVin() != null && carManage.getCarVin() != "", CarManage::getCarVin, carManage.getCarVin())
.eq(carManage.getCarModel() != null && carManage.getCarModel() != "", CarManage::getCarModel, carManage.getCarModel())
.eq(carManage.getCarBrand() != null && carManage.getCarBrand() != "", CarManage::getCarBrand, carManage.getCarBrand())
.eq(carManage.getCarStatus() > 0, CarManage::getCarStatus, carManage.getCarStatus())
.eq(carManage.getConfigId() > 0, CarManage::getConfigId, carManage.getConfigId())
.eq(carManage.getCompanyId() > 0, CarManage::getCompanyId, carManage.getCompanyId())
);
}

14
pom.xml
View File

@ -281,6 +281,20 @@
<version>${muyu.version}</version>
</dependency>
<!-- 公共缓存模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-cache</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- 企业缓存模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-enterprise-cache</artifactId>
<version>${muyu.version}</version>
</dependency>
<!-- 企业业务平台 - 公告模块 -->
<dependency>
<groupId>com.muyu</groupId>