diff --git a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java index c205507..970a65d 100644 --- a/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java +++ b/vehicle-firm-common/src/main/java/com/dragon/vehicle/firm/domain/common/FirmInfo.java @@ -1,5 +1,8 @@ package com.dragon.vehicle.firm.domain.common; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.dragon.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Builder; @@ -16,10 +19,12 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor +@TableName("firm_info") public class FirmInfo { /** *编号 */ + @TableId(type = IdType.AUTO) @Excel(name = "编号") private String firmId; /** diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmController.java b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmInfoController.java similarity index 85% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmController.java rename to vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmInfoController.java index f5e70a7..648982c 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmController.java +++ b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmInfoController.java @@ -1,9 +1,8 @@ package dragon.vehicle.firm.server.controller; import com.dragon.common.core.domain.Result; -import com.dragon.common.security.utils.SecurityUtils; import com.dragon.vehicle.firm.domain.cache.FirmInfoCache; -import dragon.vehicle.firm.server.service.FirmService; +import dragon.vehicle.firm.server.service.FirmInfoService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -17,13 +16,13 @@ import org.springframework.web.bind.annotation.RestController; */ @RestController @RequestMapping("/firm") -public class FirmController { +public class FirmInfoController { /** *注入公司service */ @Autowired - private FirmService firmService; + private FirmInfoService firmService; /*** * @description: 通过userId获取用户的公司 diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmMapper.java b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java similarity index 82% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmMapper.java rename to vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java index 0b3efac..621152b 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmMapper.java +++ b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java @@ -11,5 +11,5 @@ import org.apache.ibatis.annotations.Mapper; * @date 2023/11/21 13:57 */ @Mapper -public interface FirmMapper extends BaseMapper { +public interface FirmInfoMapper extends BaseMapper { } diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmService.java b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmInfoService.java similarity index 89% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmService.java rename to vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmInfoService.java index 73f5eb8..bcb0463 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmService.java +++ b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmInfoService.java @@ -10,7 +10,7 @@ import com.dragon.vehicle.firm.domain.common.FirmInfo; * @description: * @date 2023/11/21 13:57 */ -public interface FirmService extends IService { +public interface FirmInfoService extends IService { /*** diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmServiceImpl.java b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java similarity index 80% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmServiceImpl.java rename to vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java index 43d7775..5d6ae38 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmServiceImpl.java +++ b/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java @@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.dragon.common.redis.service.RedisService; import com.dragon.vehicle.firm.domain.cache.FirmInfoCache; import com.dragon.vehicle.firm.domain.common.FirmInfo; -import dragon.vehicle.firm.server.mapper.FirmMapper; -import dragon.vehicle.firm.server.service.FirmService; +import dragon.vehicle.firm.server.mapper.FirmInfoMapper; +import dragon.vehicle.firm.server.service.FirmInfoService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,10 +20,10 @@ import org.springframework.util.Assert; */ @Service @Log4j2 -public class FirmServiceImpl extends ServiceImpl implements FirmService { +public class FirmInfoServiceImpl extends ServiceImpl implements FirmInfoService { @Autowired - private FirmMapper firmMapper; + private FirmInfoMapper firmInfoMapper; @Autowired private RedisService redisService; @@ -45,7 +45,7 @@ public class FirmServiceImpl extends ServiceImpl implement LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); Assert.notNull(userId,"用户不能为空"); queryWrapper.eq(FirmInfo::getCreateBy,userId); - firmInfoCache= FirmInfoCache.getCache(firmMapper.selectOne(queryWrapper)); + firmInfoCache= FirmInfoCache.getCache(firmInfoMapper.selectOne(queryWrapper)); log.info(firmInfoCache); return firmInfoCache; }