From 49294296c33f2f6b24341c45124d5338e0a6f2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=86=AF=E5=87=AF?= <371894675@qq.com> Date: Tue, 21 Nov 2023 15:16:45 +0800 Subject: [PATCH] upd --- .../server/DragonVehicleFirmApplication.java | 3 ++- .../server/controller/FirmInfoController.java | 4 +-- .../firm/server/mapper/FirmInfoMapper.java | 7 ++--- .../firm/server/service/FirmInfoService.java | 4 +-- .../service/impl/FirmInfoServiceImpl.java | 26 +++++++++---------- .../resources/mapper/firm/FirmInfoMapper.xml | 2 +- 6 files changed, 24 insertions(+), 22 deletions(-) rename vehicle-firm-server/src/main/java/{ => com}/dragon/vehicle/firm/server/DragonVehicleFirmApplication.java (89%) rename vehicle-firm-server/src/main/java/{ => com}/dragon/vehicle/firm/server/controller/FirmInfoController.java (90%) rename vehicle-firm-server/src/main/java/{ => com}/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java (60%) rename vehicle-firm-server/src/main/java/{ => com}/dragon/vehicle/firm/server/service/FirmInfoService.java (82%) rename vehicle-firm-server/src/main/java/{ => com}/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java (57%) diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/DragonVehicleFirmApplication.java b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/DragonVehicleFirmApplication.java similarity index 89% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/DragonVehicleFirmApplication.java rename to vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/DragonVehicleFirmApplication.java index ab6a578..b78f013 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/DragonVehicleFirmApplication.java +++ b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/DragonVehicleFirmApplication.java @@ -1,8 +1,9 @@ -package dragon.vehicle.firm.server; +package com.dragon.vehicle.firm.server; import com.dragon.common.security.annotation.EnableCustomConfig; import com.dragon.common.security.annotation.EnableDragonFeignClients; import com.dragon.common.swagger.annotation.EnableCustomSwagger2; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmInfoController.java b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/controller/FirmInfoController.java similarity index 90% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmInfoController.java rename to vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/controller/FirmInfoController.java index 648982c..2ca7602 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/controller/FirmInfoController.java +++ b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/controller/FirmInfoController.java @@ -1,8 +1,8 @@ -package dragon.vehicle.firm.server.controller; +package com.dragon.vehicle.firm.server.controller; import com.dragon.common.core.domain.Result; import com.dragon.vehicle.firm.domain.cache.FirmInfoCache; -import dragon.vehicle.firm.server.service.FirmInfoService; +import com.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; diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java similarity index 60% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java rename to vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java index 39ddc5d..6066e93 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java +++ b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/mapper/FirmInfoMapper.java @@ -1,8 +1,9 @@ -package dragon.vehicle.firm.server.mapper; +package com.dragon.vehicle.firm.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.dragon.vehicle.firm.domain.common.FirmInfo; import org.apache.ibatis.annotations.Mapper; +import org.mybatis.spring.annotation.MapperScan; /** * @author 冯凯 @@ -10,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @description: * @date 2023/11/21 13:57 */ -@Mapper -public interface FirmInfoMapper { + +public interface FirmInfoMapper extends BaseMapper{ } diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmInfoService.java b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/service/FirmInfoService.java similarity index 82% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmInfoService.java rename to vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/service/FirmInfoService.java index ebedb47..acfef0b 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/FirmInfoService.java +++ b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/service/FirmInfoService.java @@ -1,4 +1,4 @@ -package dragon.vehicle.firm.server.service; +package com.dragon.vehicle.firm.server.service; import com.baomidou.mybatisplus.extension.service.IService; import com.dragon.vehicle.firm.domain.cache.FirmInfoCache; @@ -10,7 +10,7 @@ import com.dragon.vehicle.firm.domain.common.FirmInfo; * @description: * @date 2023/11/21 13:57 */ -public interface FirmInfoService { +public interface FirmInfoService extends IService{ /*** diff --git a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java similarity index 57% rename from vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java rename to vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java index 20c494e..fac87ac 100644 --- a/vehicle-firm-server/src/main/java/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java +++ b/vehicle-firm-server/src/main/java/com/dragon/vehicle/firm/server/service/impl/FirmInfoServiceImpl.java @@ -1,12 +1,12 @@ -package dragon.vehicle.firm.server.service.impl; +package com.dragon.vehicle.firm.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.FirmInfoMapper; -import dragon.vehicle.firm.server.service.FirmInfoService; +import com.dragon.vehicle.firm.server.mapper.FirmInfoMapper; +import com.dragon.vehicle.firm.server.service.FirmInfoService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,7 +20,7 @@ import org.springframework.util.Assert; */ @Service @Log4j2 -public class FirmInfoServiceImpl implements FirmInfoService { +public class FirmInfoServiceImpl extends ServiceImpl implements FirmInfoService { @Autowired private FirmInfoMapper firmInfoMapper; @@ -39,15 +39,15 @@ public class FirmInfoServiceImpl implements FirmInfoService { public FirmInfoCache getFirmInfoByUserId(Long userId) { -// FirmInfoCache firmInfoCache=null; -// if (redisService.hasKey("firm"+userId)){ -// firmInfoCache=redisService.getCacheObject("firm"+userId); -// } -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// Assert.notNull(userId,"用户不能为空"); -// queryWrapper.eq(FirmInfo::getCreateBy,userId); -// firmInfoCache= FirmInfoCache.getCache(firmInfoMapper.selectOne(queryWrapper)); -// log.info(firmInfoCache); + FirmInfoCache firmInfoCache=null; + if (redisService.hasKey("firm"+userId)){ + firmInfoCache=redisService.getCacheObject("firm"+userId); + } + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(userId,"用户不能为空"); + queryWrapper.eq(FirmInfo::getCreateBy,userId); + firmInfoCache= FirmInfoCache.getCache(firmInfoMapper.selectOne(queryWrapper)); + log.info(firmInfoCache); return null; } } diff --git a/vehicle-firm-server/src/main/resources/mapper/firm/FirmInfoMapper.xml b/vehicle-firm-server/src/main/resources/mapper/firm/FirmInfoMapper.xml index 774cd63..161bca7 100644 --- a/vehicle-firm-server/src/main/resources/mapper/firm/FirmInfoMapper.xml +++ b/vehicle-firm-server/src/main/resources/mapper/firm/FirmInfoMapper.xml @@ -1,6 +1,6 @@ - +