From 027e3df9d09c65bdab9c309fe4457ad42a41dc32 Mon Sep 17 00:00:00 2001 From: liuyibo <14460729+liuyibo12345@user.noreply.gitee.com> Date: Tue, 24 Sep 2024 09:26:19 +0800 Subject: [PATCH] =?UTF-8?q?feat():.=E6=A0=B9=E6=8D=AE=E8=BD=A6=E8=BE=86vin?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=BD=A6=E8=BE=86=E7=B1=BB=E5=9E=8B=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E8=BD=A6=E8=BE=86=E7=B1=BB=E5=9E=8B=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=8A=A5=E6=96=87=E6=A8=A1=E6=9D=BFid=EF=BC=8C?= =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8A=A5=E6=96=87=E6=A8=A1=E6=9D=BFid?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=AD=96=E7=95=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-car/pom.xml | 6 - .../java/com/muyu/CloudCarApplication.java | 7 +- cloud-warn/pom.xml | 6 + .../muyu/warn/controller/CarController.java | 38 +++++++ .../controller/WarnStrategyController.java | 12 ++ .../main/java/com/muyu/warn/domain/Car.java | 103 ++++++++++++++++++ .../warn/domain/Resp/StrategyRespList.java | 48 ++++++++ .../java/com/muyu/warn/mapper/CarMapper.java | 11 ++ .../muyu/warn/mapper/WarnStrategyMapper.java | 3 + .../com/muyu/warn/service/CarService.java | 11 ++ .../warn/service/IWarnStrategyService.java | 12 ++ .../warn/service/impl/CarServiceImpl.java | 33 ++++++ .../service/impl/WarnStrategyServiceImpl.java | 6 + .../src/main/resources/mapper/CarMapper.xml | 9 ++ .../resources/mapper/WarnStrategyMapper.xml | 8 ++ 15 files changed, 301 insertions(+), 12 deletions(-) create mode 100644 cloud-warn/src/main/java/com/muyu/warn/controller/CarController.java create mode 100644 cloud-warn/src/main/java/com/muyu/warn/domain/Car.java create mode 100644 cloud-warn/src/main/java/com/muyu/warn/domain/Resp/StrategyRespList.java create mode 100644 cloud-warn/src/main/java/com/muyu/warn/mapper/CarMapper.java create mode 100644 cloud-warn/src/main/java/com/muyu/warn/service/CarService.java create mode 100644 cloud-warn/src/main/java/com/muyu/warn/service/impl/CarServiceImpl.java create mode 100644 cloud-warn/src/main/resources/mapper/CarMapper.xml diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml index 5b8a4e1..02d5532 100644 --- a/cloud-modules/cloud-modules-car/pom.xml +++ b/cloud-modules/cloud-modules-car/pom.xml @@ -81,12 +81,6 @@ com.muyu cloud-common-rabbit - - - - com.muyu - cloud-common-saas - diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java index 8708bdc..6242a48 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java @@ -14,13 +14,8 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; * @author muyu */ @EnableCustomConfig -//@EnableCustomSwagger2 @EnableMyFeignClients -@SpringBootApplication(exclude = { - DataSourceAutoConfiguration.class, - DruidDataSourceAutoConfigure.class, - DynamicDataSourceAutoConfiguration.class -}) +@SpringBootApplication public class CloudCarApplication { public static void main (String[] args) { SpringApplication.run(CloudCarApplication.class, args); diff --git a/cloud-warn/pom.xml b/cloud-warn/pom.xml index 4b6edda..1a0197c 100644 --- a/cloud-warn/pom.xml +++ b/cloud-warn/pom.xml @@ -73,6 +73,12 @@ cloud-common-api-doc + + org.springframework.boot + spring-boot-starter-web + 3.3.2 + + diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/CarController.java b/cloud-warn/src/main/java/com/muyu/warn/controller/CarController.java new file mode 100644 index 0000000..38ccfec --- /dev/null +++ b/cloud-warn/src/main/java/com/muyu/warn/controller/CarController.java @@ -0,0 +1,38 @@ +package com.muyu.warn.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.warn.domain.Car; +import com.muyu.warn.service.CarService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * @ClassName CarController + * @Description 描述 + * @Author YiBo.Liu + * @Date 2024/9/23 22:42 + */ +@RequestMapping("/car") +@RestController +public class CarController { + + @Autowired + private CarService carService; + + /** + * 根据车辆vin码 + * @param vin + * @return + */ + @PostMapping("/ByVin") + public Result findByVin(@RequestParam("vin") String vin) { + Car car = carService.findByVin(vin); + return Result.success(car); + } + + + +} diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java b/cloud-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java index f37fed3..5bdfe27 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java +++ b/cloud-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java @@ -3,6 +3,7 @@ package com.muyu.warn.controller; import java.util.Arrays; import java.util.List; +import com.muyu.warn.domain.Resp.StrategyRespList; import com.muyu.warn.domain.Resp.WarnStrategyList; import jakarta.servlet.http.HttpServletResponse; import javax.annotation.Resource; @@ -120,4 +121,15 @@ public class WarnStrategyController extends BaseController List list = warnStrategyService.strategyList(warnStrategy); return Result.success(list); } + + /** + * 三表联查 + * @param warnStrategy + * @return + */ + @PostMapping("/strategyList") + public Result> StrategyList(@RequestBody WarnStrategy warnStrategy){ + List list = warnStrategyService.strategyRespList(warnStrategy); + return Result.success(list); + } } diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/Car.java b/cloud-warn/src/main/java/com/muyu/warn/domain/Car.java new file mode 100644 index 0000000..aa38985 --- /dev/null +++ b/cloud-warn/src/main/java/com/muyu/warn/domain/Car.java @@ -0,0 +1,103 @@ +package com.muyu.warn.domain; + +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.annotation.security.DenyAll; + +/** + * @ClassName Car + * @Description 描述 + * @Author YiBo.Liu + * @Date 2024/9/23 22:42 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "车辆表") +public class Car { + + /** + * + */ + private String carId; + /** + * + */ + private String carFrame; + /** + * + */ + private String carCoed; + /** + * + */ + private String carColor; + /** + * + */ + private String carVin; + /** + * + */ + private String userId; + /** + * + */ + private String typeId; + /** + * + */ + private String audditTime; + /** + * + */ + private String licenseTime; + /** + * + */ + private String insuranceTime; + /** + * + */ + private String carStatus; + /** + * + */ + private String createdTime; + /** + * + */ + private String carGears; + /** + * + */ + private String carModel; + /** + * + */ + private String carBrand; + /** + * + */ + private String carLastJoinTime; + /** + * + */ + private String carLastOfflineTime; + /** + * + */ + private String companyId; + /** + * + */ + private String carType; + + +} diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/Resp/StrategyRespList.java b/cloud-warn/src/main/java/com/muyu/warn/domain/Resp/StrategyRespList.java new file mode 100644 index 0000000..d3c8e48 --- /dev/null +++ b/cloud-warn/src/main/java/com/muyu/warn/domain/Resp/StrategyRespList.java @@ -0,0 +1,48 @@ +package com.muyu.warn.domain.Resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @ClassName StrategyRespList + * @Description 描述 + * @Author YiBo.Liu + * @Date 2024/9/23 14:39 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "三表联查") +public class StrategyRespList { + + /** 策略id */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 车辆类型id */ + @Excel(name = "车辆类型id") + private Long carTypeId; + + /** 策略名称 */ + @Excel(name = "策略名称") + private String strategyName; + + /** 报文模版id */ + @Excel(name = "报文模版id") + private Long templateId; + + /** 车辆类型 */ + private String carTypeName; + + /** 模板名称*/ + private String templateName; + + +} diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/CarMapper.java b/cloud-warn/src/main/java/com/muyu/warn/mapper/CarMapper.java new file mode 100644 index 0000000..f523483 --- /dev/null +++ b/cloud-warn/src/main/java/com/muyu/warn/mapper/CarMapper.java @@ -0,0 +1,11 @@ +package com.muyu.warn.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.warn.domain.Car; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +@Mapper +public interface CarMapper extends BaseMapper { + Car findByVin(@Param("vin") String vin); +} diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java b/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java index 5a048df..677c017 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java +++ b/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java @@ -1,5 +1,6 @@ package com.muyu.warn.mapper; +import com.muyu.warn.domain.Resp.StrategyRespList; import com.muyu.warn.domain.Resp.WarnStrategyList; import com.muyu.warn.domain.WarnStrategy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -17,4 +18,6 @@ import java.util.List; public interface WarnStrategyMapper extends BaseMapper{ List strategyList(WarnStrategy warnStrategy); + + List strategyRespList(WarnStrategy warnStrategy); } diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/CarService.java b/cloud-warn/src/main/java/com/muyu/warn/service/CarService.java new file mode 100644 index 0000000..916767e --- /dev/null +++ b/cloud-warn/src/main/java/com/muyu/warn/service/CarService.java @@ -0,0 +1,11 @@ +package com.muyu.warn.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.warn.domain.Car; +import org.springframework.stereotype.Service; + +@Service +public interface CarService extends IService { + Car findByVin(String vin); + +} diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnStrategyService.java b/cloud-warn/src/main/java/com/muyu/warn/service/IWarnStrategyService.java index 41641d4..ecd2659 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnStrategyService.java +++ b/cloud-warn/src/main/java/com/muyu/warn/service/IWarnStrategyService.java @@ -2,6 +2,7 @@ package com.muyu.warn.service; import java.util.List; +import com.muyu.warn.domain.Resp.StrategyRespList; import com.muyu.warn.domain.Resp.WarnStrategyList; import com.muyu.warn.domain.WarnStrategy; import com.baomidou.mybatisplus.extension.service.IService; @@ -37,6 +38,17 @@ public interface IWarnStrategyService extends IService { Boolean checkIdUnique(WarnStrategy warnStrategy); + /** + * 双表联查 + * @param warnStrategy + * @return + */ List strategyList(WarnStrategy warnStrategy); + /** + * 三表联查列表 + * @param warnStrategy + * @return + */ + List strategyRespList(WarnStrategy warnStrategy); } diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/CarServiceImpl.java b/cloud-warn/src/main/java/com/muyu/warn/service/impl/CarServiceImpl.java new file mode 100644 index 0000000..47e3e2f --- /dev/null +++ b/cloud-warn/src/main/java/com/muyu/warn/service/impl/CarServiceImpl.java @@ -0,0 +1,33 @@ +package com.muyu.warn.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.warn.domain.Car; +import com.muyu.warn.mapper.CarMapper; +import com.muyu.warn.service.CarService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @ClassName CarServiceImpl + * @Description 描述 + * @Author YiBo.Liu + * @Date 2024/9/24 0:27 + */ +@Service +public class CarServiceImpl + extends ServiceImpl + implements CarService { + + @Autowired + private CarMapper carMapper; + + /** + * 通过车辆vin码查询车辆类型 + * @param vin + * @return + */ + @Override + public Car findByVin(String vin) { + return carMapper.findByVin(vin); + } +} diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java b/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java index 12626ca..c35fd40 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java @@ -3,6 +3,7 @@ package com.muyu.warn.service.impl; import java.util.List; import com.muyu.common.core.domain.Result; +import com.muyu.warn.domain.Resp.StrategyRespList; import com.muyu.warn.domain.Resp.WarnStrategyList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.autoconfigure.AutoConfigureBefore; @@ -85,4 +86,9 @@ public class WarnStrategyServiceImpl } + @Override + public List strategyRespList(WarnStrategy warnStrategy) { + return warnStrategyMapper.strategyRespList(warnStrategy); + } + } diff --git a/cloud-warn/src/main/resources/mapper/CarMapper.xml b/cloud-warn/src/main/resources/mapper/CarMapper.xml new file mode 100644 index 0000000..cced449 --- /dev/null +++ b/cloud-warn/src/main/resources/mapper/CarMapper.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/cloud-warn/src/main/resources/mapper/WarnStrategyMapper.xml b/cloud-warn/src/main/resources/mapper/WarnStrategyMapper.xml index 3a2504c..d95c1fb 100644 --- a/cloud-warn/src/main/resources/mapper/WarnStrategyMapper.xml +++ b/cloud-warn/src/main/resources/mapper/WarnStrategyMapper.xml @@ -23,4 +23,12 @@ LEFT JOIN warn_rule r ON s.id = r.strategy_id LEFT JOIN t_message_type on r.msg_type_id = t_message_type.message_type_id +