From 122049419ccb58c051a02f2156b37d9f35a71766 Mon Sep 17 00:00:00 2001 From: yuan <1363654894@qq.com> Date: Thu, 26 Sep 2024 14:53:11 +0800 Subject: [PATCH] =?UTF-8?q?feat():=E8=BF=9E=E6=8E=A5=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-car/pom.xml | 112 +++++++++++ .../java/com/muyu/car/CarApplication.java | 18 ++ .../controller/CarInformationController.java | 110 +++++++++++ .../car/controller/CarMessageController.java | 71 +++++++ .../com/muyu/car/domain/CarInformation.java | 123 ++++++++++++ .../java/com/muyu/car/domain/CarMessage.java | 84 +++++++++ .../car/domain/req/CarInformationAddReq.java | 83 ++++++++ .../car/domain/req/CarInformationListReq.java | 110 +++++++++++ .../car/domain/req/CarInformationUpdReq.java | 99 ++++++++++ .../muyu/car/mapper/CarInformationMapper.java | 66 +++++++ .../com/muyu/car/mapper/CarMessageMapper.java | 34 ++++ .../car/service/CarInformationService.java | 64 +++++++ .../muyu/car/service/CarMessageService.java | 36 ++++ .../Impl/CarInformationServiceImpl.java | 66 +++++++ .../service/Impl/CarMessageServiceImpl.java | 55 ++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/logback/dev.xml | 0 .../src/main/resources/logback/prod.xml | 0 .../src/main/resources/logback/test.xml | 0 .../mapper/car/CarInformationMapper.xml | 177 ++++++++++++++++++ .../resources/mapper/car/CarMessageMapper.xml | 94 ++++++++++ .../warn/controller/WarnLogsController.java | 24 ++- .../controller/WarnStrategyController.java | 7 + .../java/com/muyu/warn/domain/WarnLogs.java | 8 +- .../java/com/muyu/warn/domain/WarnRule.java | 42 +---- .../com/muyu/warn/domain/WarnStrategy.java | 16 +- .../muyu/warn/domain/req/WarnStrategyReq.java | 35 ++++ .../muyu/warn/mapper/WarnStrategyMapper.java | 4 + .../warn/service/WarnStrategyService.java | 3 + .../service/impl/WarnStrategyServiceImpl.java | 6 + .../mapper/warn/WarnStrategyMapper.xml | 10 + cloud-modules/pom.xml | 1 + 32 files changed, 1502 insertions(+), 58 deletions(-) create mode 100644 cloud-modules/cloud-modules-car/pom.xml create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/CarApplication.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarInformation.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationAddReq.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationListReq.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationUpdReq.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarMessageMapper.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarInformationService.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java create mode 100644 cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarMessageServiceImpl.java create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/banner.txt create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml create mode 100644 cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarMessageMapper.xml create mode 100644 cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/req/WarnStrategyReq.java diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml new file mode 100644 index 0000000..c7be081 --- /dev/null +++ b/cloud-modules/cloud-modules-car/pom.xml @@ -0,0 +1,112 @@ + + + 4.0.0 + + com.muyu + cloud-modules + 3.6.3 + + + cloud-modules-car + + + 17 + 17 + UTF-8 + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + + com.muyu + cloud-common-xxl + + + + com.muyu + cloud-common-rabbit + + + + + com.muyu + cloud-common-system + + + + + com.muyu + cloud-common-api-doc + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + + diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/CarApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/CarApplication.java new file mode 100644 index 0000000..75f209c --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/CarApplication.java @@ -0,0 +1,18 @@ +package com.muyu.car; + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import lombok.extern.log4j.Log4j2; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@EnableCustomConfig +@EnableMyFeignClients +@SpringBootApplication +public class CarApplication { + public static void main(String[] args){ + SpringApplication.run(CarApplication.class,args); + } + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java new file mode 100644 index 0000000..a1b3096 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java @@ -0,0 +1,110 @@ +package com.muyu.car.controller; + +import com.github.pagehelper.PageInfo; +import com.muyu.car.domain.CarInformation; +import com.muyu.car.domain.req.CarInformationAddReq; +import com.muyu.car.domain.req.CarInformationListReq; +import com.muyu.car.domain.req.CarInformationUpdReq; +import com.muyu.car.service.CarInformationService; +import com.muyu.common.core.domain.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.stereotype.Controller; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import org.springframework.web.context.annotation.RequestScope; + +import javax.annotation.Resource; +import java.util.List; + + +@Log4j2 +@RestController +@RequestMapping("/carinformation") +@Tag(name = "车辆信息管理控制层" ,description = "进行车辆管理基础业务操作") +public class CarInformationController { + @Resource + private CarInformationService carInformationService; + + /** + * 企业车辆管理列表 + * 联查--> 车辆管理--车辆类型表--车辆电子围栏 + * 搜索-->(车辆唯一VIN carInformationVIN 精确查 + * 车辆类型ID carTypeId 精确查 + * 车辆电子围栏外键ID carInformationFence 精确查 + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + * carInformationState 精确查 + * 车辆电机厂商 carInformationMotorManufacturer 模糊查 + * 车辆电机型号 carInformationMotorModel 精确查 + * 车辆电池厂商 carInformationBatteryManufacturer 模糊查 + * 车辆电池型号 carInformationBatteryModel 精确查 + * ) + * 分页--> 分页页数 pageNum 分页条数 pageSize + * + * @param carInformationListReq + * @return + */ + @PostMapping("/selectCarInformationList") + @Operation(summary = "企业车辆管理列表") + public Result> selectCarInformationList(@Validated @RequestBody CarInformationListReq carInformationListReq) { + PageInfo pageInfo = carInformationService.selectCarInformationList(carInformationListReq); + log.info("企业车辆管理列表查询",carInformationListReq,pageInfo); + return Result.success(pageInfo); + + } + + + /** + * 企业车辆添加管理 + * @param carInformationAddReq + * @return + */ + @PostMapping("/addCarInformation") + @Operation(summary = "企业车辆添加管理") + public Result addCarInformation(@Validated @RequestBody CarInformationAddReq carInformationAddReq){ + return carInformationService.addCarInformation(carInformationAddReq); + } + + /** + * 企业车辆删除 + * @param carInformationId + * @return + */ + @GetMapping("/delBycarInformationId/{carInformationId}") + @Operation(summary = "企业车辆删除") + public Result delBycarInformationId(@Validated @PathVariable("carInformationId") Integer carInformationId){ + return carInformationService.delBycarInformationId(carInformationId); + } + + + /** + * 企业车辆修改管理 + * @param carInformationUpdReq + * @return + */ + @PostMapping("/updatecarInformation") + @Operation(summary = "企业车辆修改管理") + public Result updatecarInformation(@Validated @RequestBody CarInformationUpdReq carInformationUpdReq) { + log.info(carInformationUpdReq); + return carInformationService.updatecarInformation(carInformationUpdReq); + } + + + + /** + * To 电子围栏负责人 + * 查询企业车辆 carInformationID 和 carInformationLicensePlate + * 无参 + * @return + */ + @GetMapping("/selectCarInformationIdAndLicensePlate") + @Operation(summary = "查询企业车辆 carInformationID 和 carInformationLicensePlate") + public Result> selectCarInformationIdAndLicensePlate(){ + List carInformations = carInformationService.selectBycarInformationIDAndLicensePlate(); + return Result.success(carInformations); + } + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java new file mode 100644 index 0000000..75d370a --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java @@ -0,0 +1,71 @@ +package com.muyu.car.controller; + +import com.muyu.car.domain.CarMessage; +import com.muyu.car.service.CarMessageService; +import com.muyu.common.core.domain.Result; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.extern.log4j.Log4j2; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; + +@Log4j2 +@RestController +@RequestMapping("/carMessage") +@Tag(name = "信息报文模块" ) +public class CarMessageController { + @Resource + private CarMessageService carMessageService; + /** + * 根据所属车类别 解析 车辆报文模板 + * @param + * @return + */ + @PostMapping("/selectCarMessageList") + @Operation(summary = "报文模板展示列表") + public Result> selectCarMessageList(){ + List carMessages = carMessageService.selectCarMessageList(); + return Result.success(carMessages); + } + + + /** + * 添加车辆报文规则 + */ + @PostMapping("/insertCarMessage") + @Operation(summary = "添加报文信息") + public Result insertCarMessage(@Validated @RequestBody CarMessage carMessage){ + Result carMessage1 = carMessageService.insertCarMessage(carMessage); + return Result.success(carMessage1); + } + + /** + * 删除车辆报文规则 + * + */ + @PostMapping("/delectByCarMessageId") + @Operation(summary = "删除报文信息") + public Result delectByCarMessageId(Integer carMessageId){ + Result carMessage1 = carMessageService.delectByCarMessageId(carMessageId); + return Result.success(carMessage1); + } + + /** + * 修改车辆报文规则 + */ + @PostMapping("/updateCarMessage") + @Operation(summary = "修改报文信息") + public Result updateCarMessage(@Validated @RequestBody CarMessage carMessage){ + Result carMessage1 = carMessageService.updateCarMessage(carMessage); + return Result.success(carMessage1); + } + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarInformation.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarInformation.java new file mode 100644 index 0000000..2427db7 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarInformation.java @@ -0,0 +1,123 @@ +package com.muyu.car.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "企业车辆管理实体类",autoResultMap = true) +public class CarInformation { + + /** + * 车辆ID + */ + private Long carInformationId; + + /** + * 车辆唯一VIN + * 固定(不可修改) + */ + private String carInformationVIN; + + /** + * 车牌号 + * 固定(不可修改) + */ + private String carInformationLicensePlate; + + /** + * 车辆品牌 + */ + private String carInformationBrand; + + /** + * 车辆颜色 + */ + private String carInformationColor; + + /** + * 车辆驾驶员 + */ + private String carInformationDriver; + + /** + * 车检到期日期 + * 固定(不可修改) + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") + private Date carInformationExamineEnddata; + + /** + * 车辆电机厂商 + */ + private String carInformationMotorManufacturer; + + /** + * 车辆电机型号 + */ + private String carInformationMotorModel; + + /** + * 车辆电池厂商 + */ + private String carInformationBatteryManufacturer; + + /** + * 车辆电池型号 + */ + private String carInformationBatteryModel; + + /** + * 车辆电子围栏外键ID + */ + private Integer carInformationFence; + + /** + * 车辆类型外键ID + */ + private Integer carInformationType; + + /** + * 是否重点车辆 (0否默认 1是 ) + */ + private Integer carInformationFocus; + + /** + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + */ + private Integer carInformationState; + + + //车辆类型表 + /** + * 车辆类型ID + */ + private Integer carTypeId; + /** + * 车辆类型名 + */ + private String carTypeName; + + //电子围栏 + /** + *电子围栏ID + */ + private Integer fenceid; + + /** + * 电子围栏名 + */ + private String fencename; + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java new file mode 100644 index 0000000..551156d --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java @@ -0,0 +1,84 @@ +package com.muyu.car.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.models.security.SecurityScheme; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "车辆报文模板实体类",autoResultMap = true) +public class CarMessage { + //报文类型模块表 + /** + * 自增主键 + */ + private Long messageTypeId; + /** + * 报文编码 + */ + private String messageTypeCode; + /** + * 报文名称 + */ + private String messageTypeName; + /** + * 报文所属类别 + */ + private String messageTypeBelongs; + + //报文拆分位置主表 + /** + * 自增主键 + */ + private Long carMessageId; + /** + * 车辆类型外键 + */ + private Integer carMessageCartype; + /** + * 车辆报文类型外键 + */ + private Integer carMessageType; + /** + * 开始位下标 + */ + private Integer carMessageStartIndex; + /** + * 结束位下标 + */ + private Integer carMessageEndIndex; + /** + * 报文数据类型 (固定值 区间随机值) + */ + private String messageTypeClass; + /** + * 报文是否开启故障检测(0默认未开启 1开启) + */ + private Integer carMessageState; + + + +/* + private Long messageTypeId ; + private String messageTypeCode ; + private String messageTypeName ; + private String messageTypeBelongs ; + private String messageTypeClass ; + private Long carMessageId ; + private Integer carMessageCartype ; + private Integer carMessageType ; + private Integer carMessageStartIndex ; + private Integer carMessageEndIndex ; + private Integer carMessageState ; + */ + + + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationAddReq.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationAddReq.java new file mode 100644 index 0000000..3d97a36 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationAddReq.java @@ -0,0 +1,83 @@ +package com.muyu.car.domain.req; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "车辆管理信息添加对象") +public class CarInformationAddReq { + + /** + * 车辆唯一VIN + */ + private String carInformationVIN; + + /** + * 车牌号 + */ + private String carInformationLicensePlate; + + /** + * 车辆品牌 + */ + private String carInformationBrand; + + /** + * 车辆颜色 + */ + private String carInformationColor; + + /** + * 车辆驾驶员 + */ + private String carInformationDriver; + + /** + * 车检到期日期 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") + private String carInformationExamineEnddata; + + /** + * 车辆电机厂商 + */ + private String carInformationMotorManufacturer; + + /** + * 车辆电机型号 + */ + private String carInformationMotorModel; + + /** + * 车辆电池厂商 + */ + private String carInformationBatteryManufacturer; + + /** + * 车辆电池型号 + */ + private String carInformationBatteryModel; + + /** + * 车辆电子围栏外键ID + */ + private Integer carInformationFence; + + /** + * 车辆类型外键ID + */ + private Integer carInformationType; + + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationListReq.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationListReq.java new file mode 100644 index 0000000..6dc3a49 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationListReq.java @@ -0,0 +1,110 @@ +package com.muyu.car.domain.req; + +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@Tag(name="车辆管理列表请求对象") +public class CarInformationListReq { + + /** + * 车辆唯一VIN + */ + @Schema( + description = "车辆唯一VIN", + type = "String" + ) + private String carInformationVIN; + + + + /** + * 车辆类型ID + */ + @Schema( + description = "车辆类型ID", + type = "Interger" + ) + private Integer carTypeId; + + /** + * 车辆电子围栏外键ID + */ + @Schema( + description = "车辆电子围栏外键ID", + type = "Interger" + ) + private Integer carInformationFence; + + /** + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + */ + @Schema( + description = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)", + type = "Interger" + ) + private Integer carInformationState; + + /** + * 车辆电机厂商 + */ + @Schema( + description = "车辆电机厂商", + type = "String" + ) + private String carInformationMotorManufacturer; + + /** + * 车辆电机型号 + */ + @Schema( + description = "车辆电机型号", + type = "String" + ) + private String carInformationMotorModel; + + /** + * 车辆电池厂商 + */ + @Schema( + description = "车辆电池厂商", + type = "String" + ) + private String carInformationBatteryManufacturer; + + /** + * 车辆电池型号 + */ + @Schema( + description = "车辆电池型号", + type = "String" + ) + private String carInformationBatteryModel; + + //分页页数 + private Integer pageNum = 1; + //分页条数 + private Integer pageSize = 5; + + + + + + + + + + + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationUpdReq.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationUpdReq.java new file mode 100644 index 0000000..e846045 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationUpdReq.java @@ -0,0 +1,99 @@ +package com.muyu.car.domain.req; + +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@Tag(name = "车辆管理修改操作请求对象") +public class CarInformationUpdReq { + + /** + * 车辆ID + */ + @Schema(title = "车辆管理主键", type = "Long") + private Long carInformationId; + + /** + * 车辆品牌 + */ + @Schema(title = "车辆品牌", type = "String") + private String carInformationBrand; + + /** + * 车辆颜色 + */ + @Schema(title = "车辆颜色", type = "String") + private String carInformationColor; + + /** + * 车辆驾驶员 + */ + @Schema(title = "车辆驾驶员", type = "String") + private String carInformationDriver; + /** + * 车辆电机厂商 + */ + @Schema(title = "车辆电机厂商", type = "String") + private String carInformationMotorManufacturer; + + /** + * 车辆电机型号 + */ + @Schema(title = "车辆电机型号", type = "String") + private String carInformationMotorModel; + + /** + * 车辆电池厂商 + */ + @Schema(title = "车辆电池厂商", type = "String") + private String carInformationBatteryManufacturer; + + /** + * 车辆电池型号 + */ + @Schema(title = "车辆电池型号", type = "String") + private String carInformationBatteryModel; + + /** + * 车辆电子围栏外键ID + */ + @Schema(title = "车辆电子围栏外键ID", type = "Integer") + private Integer carInformationFence; + + /** + * 车辆类型外键ID + */ + @Schema(title = "车辆类型外键ID", type = "Integer") + private Integer carInformationType; + + /** + * 是否重点车辆 (0否默认 1是 ) + */ + @Schema(title = "是否重点车辆 (0否默认 1是 )", type = "Integer") + private Integer carInformationFocus; + + /** + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + */ + @Schema(title = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)", type = "Integer") + private Integer carInformationState; + + + + + + + + + + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java new file mode 100644 index 0000000..0954456 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java @@ -0,0 +1,66 @@ +package com.muyu.car.mapper; + + +import com.muyu.car.domain.CarInformation; +import com.muyu.car.domain.req.CarInformationAddReq; +import com.muyu.car.domain.req.CarInformationListReq; +import com.muyu.car.domain.req.CarInformationUpdReq; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CarInformationMapper { +/** + * 企业车辆管理列表 + * 联查--> 车辆管理--车辆类型表--车辆电子围栏 + * 搜索-->(车辆唯一VIN carInformationVIN 精确查 + * 车辆类型ID carTypeId 精确查 + * 车辆电子围栏外键ID carInformationFence 精确查 + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + * carInformationState 精确查 + * 车辆电机厂商 carInformationMotorManufacturer 模糊查 + * 车辆电机型号 carInformationMotorModel 精确查 + * 车辆电池厂商 carInformationBatteryManufacturer 模糊查 + * 车辆电池型号 carInformationBatteryModel 精确查 + * ) + * 分页--> 分页页数 pageNum 分页条数 pageSize + * @param carInformationListReq + * @return + */ + List selectCarInformationList(CarInformationListReq carInformationListReq); + +/** + * 企业车辆添加管理 + * @param carInformationAddReq + * @return + */ + Integer addCarInformation(CarInformationAddReq carInformationAddReq); + +/** + * 企业车辆删除 + * @param carInformationId + * @return + */ + Integer delBycarInformationId(Integer carInformationId); + + +/** + * 企业车辆修改管理 + * @param carInformationUpdReq + * @return + */ + Integer updatecarInformation(CarInformationUpdReq carInformationUpdReq); + +/** + * To 电子围栏负责人 + * 查询企业车辆 carInformationID 和 carInformationLicensePlate + * 无参 + * @return + */ + List selectBycarInformationIDAndLicensePlate(); + + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarMessageMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarMessageMapper.java new file mode 100644 index 0000000..7e4d846 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarMessageMapper.java @@ -0,0 +1,34 @@ +package com.muyu.car.mapper; + +import com.muyu.car.domain.CarMessage; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +@Mapper +public interface CarMessageMapper { + /** + * 根据所属车类别 解析 车辆报文模板 + * @param + * @return + */ + List selectCarMessageList(); + + + /** + * 添加车辆报文规则 + */ + Integer insertCarMessage(CarMessage carMessage); + + + /** + * 删除车辆报文规则 + */ + Integer deleteByCarMessageId(Integer carMessageId); + + /** + * 修改车辆报文规则 + */ + Integer updateCarMessage(CarMessage carMessage); + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarInformationService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarInformationService.java new file mode 100644 index 0000000..62e733b --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarInformationService.java @@ -0,0 +1,64 @@ +package com.muyu.car.service; + +import com.github.pagehelper.PageInfo; +import com.muyu.car.domain.CarInformation; +import com.muyu.car.domain.req.CarInformationAddReq; +import com.muyu.car.domain.req.CarInformationListReq; +import com.muyu.car.domain.req.CarInformationUpdReq; +import com.muyu.common.core.domain.Result; + +import java.util.List; + +public interface CarInformationService { + /** + * 企业车辆管理列表 + * 联查--> 车辆管理--车辆类型表--车辆电子围栏 + * 搜索-->(车辆唯一VIN carInformationVIN 精确查 + * 车辆类型ID carTypeId 精确查 + * 车辆电子围栏外键ID carInformationFence 精确查 + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + * carInformationState 精确查 + * 车辆电机厂商 carInformationMotorManufacturer 模糊查 + * 车辆电机型号 carInformationMotorModel 精确查 + * 车辆电池厂商 carInformationBatteryManufacturer 模糊查 + * 车辆电池型号 carInformationBatteryModel 精确查 + * ) + * 分页--> 分页页数 pageNum 分页条数 pageSize + * @param carInformationListReq + * @return + */ + PageInfo selectCarInformationList(CarInformationListReq carInformationListReq); + + + /** + * 企业车辆添加管理 + * @param carInformationAddReq + * @return + */ + Result addCarInformation(CarInformationAddReq carInformationAddReq); + + /** + * 企业车辆删除 + * @param carInformationId + * @return + */ + Result delBycarInformationId(Integer carInformationId); + + + /** + * 企业车辆修改管理 + * @param carInformationUpdReq + * @return + */ + Result updatecarInformation(CarInformationUpdReq carInformationUpdReq); + + + /** + * To 电子围栏负责人 + * 查询企业车辆 carInformationID 和 carInformationLicensePlate + * 无参 + * @return + */ + List selectBycarInformationIDAndLicensePlate(); + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java new file mode 100644 index 0000000..8f3a113 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java @@ -0,0 +1,36 @@ +package com.muyu.car.service; + +import com.muyu.car.domain.CarMessage; +import com.muyu.common.core.domain.Result; + +import java.util.List; + +public interface CarMessageService { + + /** + * 根据所属车类别 解析 车辆报文模板 + * @param + * @return + */ + List selectCarMessageList(); + + + /** + * 添加车辆报文规则 + */ + Result insertCarMessage(CarMessage carMessage); + + + /** + * 删除车辆报文规则 + */ + Result delectByCarMessageId(Integer carMessageId); + + + /** + * 修改车辆报文规则 + */ + Result updateCarMessage(CarMessage carMessage); + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java new file mode 100644 index 0000000..053884d --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java @@ -0,0 +1,66 @@ +package com.muyu.car.service.Impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.muyu.car.domain.CarInformation; +import com.muyu.car.domain.req.CarInformationAddReq; +import com.muyu.car.domain.req.CarInformationListReq; +import com.muyu.car.domain.req.CarInformationUpdReq; +import com.muyu.car.mapper.CarInformationMapper; +import com.muyu.car.service.CarInformationService; +import com.muyu.common.core.domain.Result; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class CarInformationServiceImpl implements CarInformationService { + @Resource + private CarInformationMapper carInformationMapper; + @Autowired + private HttpServletResponse response; + + + @Override + public PageInfo selectCarInformationList(CarInformationListReq carInformationListReq) { + PageHelper.startPage(carInformationListReq.getPageNum(),carInformationListReq.getPageSize()); + List carInformations = carInformationMapper.selectCarInformationList(carInformationListReq); + PageInfo pageInfo = new PageInfo<>(carInformations); + return pageInfo; + } + + @Override + public Result addCarInformation(CarInformationAddReq carInformationAddReq) { + Integer addCarInformation = carInformationMapper.addCarInformation(carInformationAddReq); + if(addCarInformation > 0){ + return Result.success(addCarInformation,"添加车辆成功"); + } + return Result.error(402,"添加车辆失败"); + } + + @Override + public Result delBycarInformationId(Integer carInformationId) { + Integer delBycarInformationId = carInformationMapper.delBycarInformationId(carInformationId); + if (delBycarInformationId > 0){ + return Result.success(delBycarInformationId ,"删除车辆成功"); + } + return Result.success(402,"删除车辆失败"); + } + + @Override + public Result updatecarInformation(CarInformationUpdReq carInformationUpdReq) { + Integer updatecarInformation = carInformationMapper.updatecarInformation(carInformationUpdReq); + if (updatecarInformation > 0){ + return Result.success(updatecarInformation,"修改车辆信息成功"); + } + return Result.error(402,"修改车辆信息失败"); + } + + @Override + public List selectBycarInformationIDAndLicensePlate() { + return carInformationMapper.selectBycarInformationIDAndLicensePlate(); + } +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarMessageServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarMessageServiceImpl.java new file mode 100644 index 0000000..830252f --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarMessageServiceImpl.java @@ -0,0 +1,55 @@ +package com.muyu.car.service.Impl; + +import com.muyu.car.domain.CarMessage; +import com.muyu.car.mapper.CarMessageMapper; +import com.muyu.car.service.CarMessageService; +import com.muyu.common.core.domain.Result; +import org.springframework.stereotype.Service; + +import javax.annotation.Resource; +import java.util.List; + +@Service +public class CarMessageServiceImpl implements CarMessageService { + @Resource + private CarMessageMapper carMessageMapper; + + @Override + public List selectCarMessageList() { + return carMessageMapper.selectCarMessageList(); + } + + @Override + public Result insertCarMessage(CarMessage carMessage) { + Integer inserted = carMessageMapper.insertCarMessage(carMessage); + if (inserted > 0){ + return Result.success(inserted,"添加成功"); + } + return Result.error(402,"添加失败"); + } + + @Override + public Result delectByCarMessageId(Integer carMessageId) { + Integer deleteByCarMessageId = carMessageMapper.deleteByCarMessageId(carMessageId); + if (deleteByCarMessageId >0){ + return Result.success(carMessageId ,"删除成功"); + } + return Result.error(402,"删除失败"); + } + + @Override + public Result updateCarMessage(CarMessage carMessage) { + Integer integer = carMessageMapper.updateCarMessage(carMessage); + if(integer > 0) + { + return Result.success(carMessage,"修改成功"); + } + return Result.error( 402,"修改失败"); + } + + + + + + +} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/banner.txt b/cloud-modules/cloud-modules-car/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..e69de29 diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..e69de29 diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml new file mode 100644 index 0000000..e69de29 diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml new file mode 100644 index 0000000..1325b02 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + SELECT + car_information_id, + car_information_VIN, + car_information_license_plate, + car_information_brand, + car_information_color, + car_information_driver, + car_information_examine_enddata, + car_information_motor_manufacturer, + car_information_motor_model, + car_information_battery_manufacturer, + car_information_battery_model, + car_information_fence, + car_information_type, + car_information_focus, + car_information_state + FROM `car_information` + + + + + + + + + INSERT INTO `car_information` + ( + car_information_VIN, + car_information_license_plate, + car_information_brand, + car_information_color, + car_information_driver, + car_information_examine_enddata, + car_information_motor_manufacturer, + car_information_motor_model, + car_information_battery_manufacturer, + car_information_battery_model, + car_information_fence, + car_information_type ) + VALUES ( + #{carInformationVIN}, + #{carInformationLicensePlate}, + #{carInformationBrand} , + #{carInformationColor}, + #{carInformationDriver}, + #{carInformationExamineEnddata}, + #{carInformationMotorManufacturer}, + #{carInformationMotorModel}, + #{carInformationBatteryManufacturer}, + #{carInformationBatteryModel}, + #{carInformationFence}, + #{carInformationType} ); + + + + UPDATE `car_information` + SET + `car_information_VIN` = #{carInformationVIN}, + + `car_information_license_plate` = #{carInformationLicensePlate}, + + `car_information_brand` = #{carInformationBrand}, + + `car_information_color` = #{carInformationColor}, + + `car_information_driver` = #{carInformationDriver}, + + `car_information_examine_enddata` = #{carInformationExamineEnddata}, + + `car_information_motor_manufacturer` = #{carInformationMotorManufacturer}, + + `car_information_motor_model` = #{carInformationMotorModel} , + + `car_information_battery_manufacturer` = #{carInformationBatteryManufacturer}, + + `car_information_battery_model` = #{carInformationBatteryModel}, + + `car_information_fence` = #{carInformationFence}, + + `car_information_type` = #{carInformationType} + + WHERE `car_information_id` = #{carInformationId} + + + + + DELETE FROM `car_information` + WHERE `car_information`.car_information_id= #{carInformationId} + + + + + + + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarMessageMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarMessageMapper.xml new file mode 100644 index 0000000..1c5e4e5 --- /dev/null +++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarMessageMapper.xml @@ -0,0 +1,94 @@ + + + + + + + + + + + + + + + + + + + + + + INSERT INTO `car_message` ( + car_message_cartype, + car_message_type, + car_message_start_index, + car_message_end_index, + message_type_class, + car_message_state + ) + VALUES( + #{carMessageCartype}, + #{carMessageType}, + #{carMessageStartIndex}, + #{carMessageEndIndex}, + #{messageTypeClass}, + #{carMessageState} + ) + + + + UPDATE `car_message` + SET + + car_message_cartype = #{carMessageCartype} , + + + car_message_type = #{carMessageType} , + + + car_message_start_index = #{carMessageStartIndex} , + + + car_message_end_index = #{carMessageEndIndex} , + + + message_type_class = #{messageTypeClass} , + + + car_message_state = #{carMessageState} + + + + + + DELETE FROM `car_message` + WHERE `car_message`.car_message_id = #{carMessageId} + + + + + diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java index 7393306..754f916 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java @@ -10,6 +10,7 @@ import com.muyu.warn.domain.WarnLogs; import com.muyu.warn.domain.WarnStrategy; import com.muyu.warn.service.WarnLogsService; import jakarta.servlet.http.HttpServletResponse; +import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -70,35 +71,40 @@ public class WarnLogsController extends BaseController { /** * 新增预警日志 + * @param warnLogs 新增预警日志信息 + * @return 新增结果 */ @RequiresPermissions("platform:logs:add") @PostMapping public Result add( - @Validated @RequestBody WarnLogs warnLogs) - { - if (warnLogsService.checkIdUnique(warnLogs)) { - return error("新增 预警日志 '" + warnLogs + "'失败，预警日志已存在"); + @Validated @RequestBody WarnLogs warnLogs + ){ + if (warnLogsService.checkIdUnique(warnLogs)){ + return error("新增 预警日志 '"+ warnLogs +"' 失败，预警日志已存在 "); } return toAjax(warnLogsService.save(warnLogs)); } /** * 修改预警日志 + * @param warnLogs 修改预警日志信息 + * @return 修改结果 */ @RequiresPermissions("platform:logs:edit") @PutMapping public Result edit( - @Validated @RequestBody WarnLogs warnLogs) - { - if (!warnLogsService.checkIdUnique(warnLogs)) { - return error("修改 预警日志 '" + warnLogs + "'失败，预警日志不存在"); + @Validated @RequestBody WarnLogs warnLogs + ){ + if (!warnLogsService.checkIdUnique(warnLogs)){ + return error("修改 预警日志'"+ warnLogs +"'失败，预警日志不存在"); } -// warnLogs.setUpdateBy(SecurityUtils.getUsername()); return toAjax(warnLogsService.updateById(warnLogs)); } /** * 删除预警日志 + * @param ids 删除预警日志id + * @return 删除结果 */ @RequiresPermissions("platform:logs:remove") @DeleteMapping("/{ids}") diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java index 06374a3..72f6bd9 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java @@ -7,6 +7,7 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.warn.domain.car.CartType; import com.muyu.warn.domain.WarnStrategy; +import com.muyu.warn.domain.req.WarnStrategyReq; import com.muyu.warn.service.WarnStrategyService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; @@ -110,4 +111,10 @@ public class WarnStrategyController extends BaseController return Result.success(warnStrategyService.findByCarType()); } + @RequiresPermissions("platform:strategy:strategytype") + @PostMapping("/strategyType/{ids}") + public Result> selectStrategyType(@PathVariable("ids") Long ids){ + return Result.success(warnStrategyService.selectStrategyType(ids)); + } + } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java index 8e221ba..46bfcb2 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java @@ -29,18 +29,18 @@ public class WarnLogs { * 预警日志id */ @Excel(name = "预警日志id", cellType = Excel.ColumnType.NUMERIC) - @TableId( type = IdType.AUTO) - private Long id ; + @TableId(type = IdType.AUTO) + private Long id; /** * 车辆vin码 */ @Excel(name = "车辆vin码") - private String vin ; + private String vin; /** * 规则id */ @Excel(name = "规则id") - private Long warnRuleId ; + private Long warnRuleId; /** * 开始时间 */ diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnRule.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnRule.java index c798e92..8649708 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnRule.java @@ -21,39 +21,15 @@ import lombok.NoArgsConstructor; @TableName("warn_rule") public class WarnRule { - /** - * 规则id - */ - @TableId( type = IdType.AUTO) - private Long id ; - /** - * 规则名称 - */ - private String ruleName ; - /** - * 策略id - */ - private Long strategyId ; - /** - * 报文数据类型id - */ - private Long msgTypeId ; - /** - * 滑窗时间 - */ - private Long slideTime ; - /** - * 滑窗频率 - */ - private Long slideFrequency ; - /** - * 最大值 - */ - private Long maxValue ; - /** - * 最小值 - */ - private Long minValue ; + @TableId(type = IdType.AUTO) + private Long id; + private String ruleName; + private Long strategyId; + private Long msgTypeId; + private Long slideTime; + private Long slideFrequency; + private Long maxValue; + private Long minValue; // /** // * 创建人 // */ diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java index f2f1ed8..0028376 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java @@ -22,22 +22,14 @@ import lombok.NoArgsConstructor; public class WarnStrategy { /** - * 策略id + * 策略Id */ @TableId( type = IdType.AUTO) - private Long id ; - /** - * 车辆类型id - */ + private Long id; private Long carTypeId ; - /** - * 策略名称 - */ - private String strategyName ; - /** - * 报文模版id - */ + private String strategyName ; private Long msgId ; + // /** // * 创建人 // */ diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/req/WarnStrategyReq.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/req/WarnStrategyReq.java new file mode 100644 index 0000000..32f37e7 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/req/WarnStrategyReq.java @@ -0,0 +1,35 @@ +package com.muyu.warn.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author：蓬叁 + * @Package：com.muyu.warn.domain.req + * @Project：cloud-server-8 + * @name：WarnStrategyReq + * @Date：2024/9/25 下午10:28 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class WarnStrategyReq { + + /** + * 策略id + */ + private Long id; + /** + * 车辆类型 + */ + private String carTypeId; + /** + * 策略名称 + */ + private String strategyName; + + +} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java index e367f9f..0a4eecb 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java @@ -3,7 +3,9 @@ package com.muyu.warn.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.warn.domain.car.CartType; import com.muyu.warn.domain.WarnStrategy; +import com.muyu.warn.domain.req.WarnStrategyReq; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -18,4 +20,6 @@ import java.util.List; public interface WarnStrategyMapper extends BaseMapper { List findByCarType(); + + List selectStrategyType(@Param("ids") Long ids); } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnStrategyService.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnStrategyService.java index 053adde..c80d97d 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnStrategyService.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnStrategyService.java @@ -3,6 +3,7 @@ package com.muyu.warn.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.warn.domain.car.CartType; import com.muyu.warn.domain.WarnStrategy; +import com.muyu.warn.domain.req.WarnStrategyReq; import java.util.List; @@ -38,4 +39,6 @@ public interface WarnStrategyService extends IService { Boolean checkIdUnique(WarnStrategy warnStrategy); List findByCarType(); + + List selectStrategyType(Long ids); } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java index 9e81a67..6c5ce23 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.warn.domain.car.CartType; import com.muyu.warn.domain.WarnStrategy; +import com.muyu.warn.domain.req.WarnStrategyReq; import com.muyu.warn.mapper.WarnStrategyMapper; import com.muyu.warn.service.WarnStrategyService; import org.springframework.beans.factory.annotation.Autowired; @@ -82,4 +83,9 @@ public class WarnStrategyServiceImpl return warnStrategyMapper.findByCarType(); } + @Override + public List selectStrategyType(Long ids) { + return warnStrategyMapper.selectStrategyType(ids); + } + } diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnStrategyMapper.xml index 0be349d..5cca314 100644 --- a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnStrategyMapper.xml +++ b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnStrategyMapper.xml @@ -11,4 +11,14 @@ from car_type + diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index acb1449..eed823d 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -13,6 +13,7 @@ cloud-modules-gen cloud-modules-file cloud-modules-warn + cloud-modules-car cloud-test