From a103801256e3ff8b93a80f3224e35fab6b3af5fb Mon Sep 17 00:00:00 2001 From: niuniuniu Date: Mon, 27 Nov 2023 20:29:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dragon/vehicle/common/page/PageQuery.java | 4 +- .../company/common/domain/FaultRecord.java | 100 ++++++++++++++++++ .../company/common/domain/FaultType.java | 26 +++++ .../company/common/domain/FirmInfo.java | 8 +- .../common/domain/VehicleBreakdown.java | 59 +++++++++++ .../common/domain/req/BreakdowmAddReq.java | 30 ++++++ .../common/domain/req/BreakdownUpdateReq.java | 33 ++++++ .../common/domain/req/FaultRecordAddReq.java | 71 +++++++++++++ .../domain/req/FaultRecordQueryReq.java | 41 +++++++ .../domain/req/FaultRecordUpdateReq.java | 70 ++++++++++++ .../company/common/domain/req/FirmAddReq.java | 2 +- .../common/domain/req/FirmQueryReq.java | 7 +- .../common/domain/req/FrimUpdateReq.java | 2 +- .../domain/req/VehicleBreakdownQueryReq.java | 37 +++++++ .../vehicle/company/server/aop/AopLog.java | 1 + .../controller/FaultRecordController.java | 69 ++++++++++++ .../server/controller/FirmController.java | 7 +- .../server/mapper/FaultRecordMapper.java | 13 +++ .../server/mapper/VehicleBreakdownMapper.java | 13 +++ .../server/service/FaultRecordService.java | 14 +++ .../service/VehicleBreakdownService.java | 15 +++ .../service/impl/FaultRecordServiceImpl.java | 79 ++++++++++++++ .../server/service/impl/FirmServiceImpl.java | 4 +- .../impl/VehicleBreakdownServiceImpl.java | 50 +++++++++ 24 files changed, 735 insertions(+), 20 deletions(-) create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultRecord.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultType.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/VehicleBreakdown.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdowmAddReq.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdownUpdateReq.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordAddReq.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordQueryReq.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordUpdateReq.java create mode 100644 vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/VehicleBreakdownQueryReq.java create mode 100644 vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FaultRecordController.java create mode 100644 vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/FaultRecordMapper.java create mode 100644 vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/VehicleBreakdownMapper.java create mode 100644 vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/FaultRecordService.java create mode 100644 vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/VehicleBreakdownService.java create mode 100644 vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FaultRecordServiceImpl.java create mode 100644 vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/VehicleBreakdownServiceImpl.java diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/common/page/PageQuery.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/common/page/PageQuery.java index 3cad5a0..657b231 100644 --- a/vehicle-company-common/src/main/java/com/dragon/vehicle/common/page/PageQuery.java +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/common/page/PageQuery.java @@ -24,12 +24,12 @@ public class PageQuery { /** * 第几页 */ - private Integer page; + private Integer page=1; /** * 分页长度 */ - private Integer pageSize; + private Integer pageSize=5; /** diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultRecord.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultRecord.java new file mode 100644 index 0000000..36a7d2a --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultRecord.java @@ -0,0 +1,100 @@ +package com.dragon.vehicle.company.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.dragon.vehicle.company.common.domain.req.FaultRecordAddReq; +import com.dragon.vehicle.company.common.domain.req.FaultRecordUpdateReq; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 故障记录 + * + * @author HuZhiYong + * @version 2023/11/23 - 13:40 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "falut_record") +public class FaultRecord { + /** + * 故障记录表ID + */ + @TableId(value = "falut_record_id",type = IdType.AUTO) + private Integer falutRecordId; + /** + * 故障码ID + */ + private Integer falutCodeId; + /** + * 车辆VIN + */ + private String vin; + /** + * 故障等级 + * 0低 + * 1中 + * 2高 + */ + private Integer alertScore; + /** + * 开始报警时间 + */ + private Date startAlertTime; + /** + * 最近一次报警时间 + */ + private Date recentAlertTime; + /** + * 处理时间 + */ + private Date dealTime; + /** + * 处理人 + */ + private String dealUser; + /** + * 处理状态 + * 0待处理 + * 1正在处理 + * 2处理完成 + */ + private Integer dealStatus; + + + public static FaultRecord addReqBuild(FaultRecordAddReq recordAddReq){ + return FaultRecord.builder() + .falutCodeId(recordAddReq.getFalutCodeId()) + .vin(recordAddReq.getVin()) + .alertScore(recordAddReq.getAlertScore()) + .startAlertTime(recordAddReq.getStartAlertTime()) + .recentAlertTime(recordAddReq.getRecentAlertTime()) + .dealTime(recordAddReq.getDealTime()) + .dealUser(recordAddReq.getDealUser()) + .dealStatus(recordAddReq.getDealStatus()) + .build(); + } + + public static FaultRecord updateReqBuild(FaultRecordUpdateReq faultRecordUpdateReq){ + return FaultRecord.builder() + .falutRecordId(faultRecordUpdateReq.getFalutRecordId()) + .falutCodeId(faultRecordUpdateReq.getFalutCodeId()) + .vin(faultRecordUpdateReq.getVin()) + .alertScore(faultRecordUpdateReq.getAlertScore()) + .startAlertTime(faultRecordUpdateReq.getStartAlertTime()) + .recentAlertTime(faultRecordUpdateReq.getRecentAlertTime()) + .dealTime(faultRecordUpdateReq.getDealTime()) + .dealUser(faultRecordUpdateReq.getDealUser()) + .dealStatus(faultRecordUpdateReq.getDealStatus()) + .build(); + } + +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultType.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultType.java new file mode 100644 index 0000000..5622ec5 --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FaultType.java @@ -0,0 +1,26 @@ +package com.dragon.vehicle.company.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 故障类型 + * + * @author HuZhiYong + * @version 2023/11/23 - 13:40 + */ +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "fault_type") +@Builder +@Data +public class FaultType { + @TableId(value = "fault_type_id",type = IdType.AUTO) + private Integer faultTypeId; + private String faultTypeName; +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FirmInfo.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FirmInfo.java index 1751333..8e11332 100644 --- a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FirmInfo.java +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/FirmInfo.java @@ -24,7 +24,7 @@ public class FirmInfo { /** * 企业编号 */ - @TableId(value = "firm_id",type = IdType.AUTO) + @TableId(value = "firm_id",type =IdType.AUTO) private Integer firmId; /** * 企业名称 @@ -70,7 +70,7 @@ public class FirmInfo { /** * 统一社会信用代码 */ - private String unifiedSocialCredit; + private String firmSocialCredit; public static FirmInfo addReqBuild(FirmAddReq firmAddReq){ return FirmInfo.builder() @@ -85,7 +85,7 @@ public class FirmInfo { .firmBankBranch(firmAddReq.getFirmBankBranch()) .firmBankAccount(firmAddReq.getFirmBankAccount()) .firmBusinessLicense(firmAddReq.getFirmBusinessLicense()) - .unifiedSocialCredit(firmAddReq.getUnifiedSocialCredit()) + .firmSocialCredit(firmAddReq.getFirmSocialCredit()) .build(); } @@ -104,7 +104,7 @@ public class FirmInfo { .firmBankBranch(frimUpdateReq.getFirmBankBranch()) .firmBankAccount(frimUpdateReq.getFirmBankAccount()) .firmBusinessLicense(frimUpdateReq.getFirmBusinessLicense()) - .unifiedSocialCredit(frimUpdateReq.getUnifiedSocialCredit()) + .firmSocialCredit(frimUpdateReq.getFirmSocialCredit()) .build(); } diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/VehicleBreakdown.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/VehicleBreakdown.java new file mode 100644 index 0000000..85f51aa --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/VehicleBreakdown.java @@ -0,0 +1,59 @@ +package com.dragon.vehicle.company.common.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.dragon.vehicle.company.common.domain.req.BreakdowmAddReq; +import com.dragon.vehicle.company.common.domain.req.BreakdownUpdateReq; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 故障码表 + * + * @author HuZhiYong + * @version 2023/11/24 - 20:43 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@TableName(value = "vehicle_breakdown") +public class VehicleBreakdown { + + /** + * 故障码ID + */ + @TableId(value = "breakdown_id",type = IdType.AUTO) + public Integer breakdownId; + /** + * 故障码代码 + */ + @TableField(value = "breakdown_code") + public String breakdownCode; + /** + * 故障码状态 + */ + @TableField(value = "breakdown_status") + public Integer breakdownStatus; + + + public static VehicleBreakdown addBreakdownBuild(BreakdowmAddReq breakdowmAddReq){ + return VehicleBreakdown.builder() + .breakdownCode(breakdowmAddReq.getBreakdownCode()) + .breakdownStatus(breakdowmAddReq.getBreakdownStatus()) + .build(); + } + + + public static VehicleBreakdown updateBreakdownBuild(BreakdownUpdateReq breakdownUpdateReq){ + return VehicleBreakdown.builder() + .breakdownId(breakdownUpdateReq.getBreakdownId()) + .breakdownCode(breakdownUpdateReq.getBreakdownCode()) + .breakdownStatus(breakdownUpdateReq.getBreakdownStatus()) + .build(); + } +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdowmAddReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdowmAddReq.java new file mode 100644 index 0000000..f33194c --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdowmAddReq.java @@ -0,0 +1,30 @@ +package com.dragon.vehicle.company.common.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 故障码Add + * + * @author HuZhiYong + * @version 2023/11/24 - 20:49 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@Builder +public class BreakdowmAddReq { + + + /** + * 故障码代码 + */ + public String breakdownCode; + + /** + * 故障码状态 + */ + public Integer breakdownStatus; +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdownUpdateReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdownUpdateReq.java new file mode 100644 index 0000000..b5681c6 --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/BreakdownUpdateReq.java @@ -0,0 +1,33 @@ +package com.dragon.vehicle.company.common.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 故障码Update + * + * @author HuZhiYong + * @version 2023/11/24 - 21:44 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +public class BreakdownUpdateReq { + + /** + * 故障码ID + */ + public Integer breakdownId; + /** + * 故障码代码 + */ + public String breakdownCode; + + /** + * 故障码状态 + */ + public Integer breakdownStatus; +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordAddReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordAddReq.java new file mode 100644 index 0000000..8fec5a3 --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordAddReq.java @@ -0,0 +1,71 @@ +package com.dragon.vehicle.company.common.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import java.util.Date; + +/** + * 故障记录addReq + * + * @author HuZhiYong + * @version 2023/11/23 - 13:51 + */ + +@Builder +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FaultRecordAddReq { + + + /** + * 故障码ID + */ + @NotEmpty(message = "故障码ID不能为空") + private Integer falutCodeId; + /** + * 车辆VIN + */ + @NotEmpty(message = "车辆VIN不能为空") + private String vin; + /** + * 故障等级 + * 0低 + * 1中 + * 2高 + */ + @NotEmpty(message = "故障等级不能为空") + private Integer alertScore; + /** + * 开始报警时间 + */ + @NotEmpty(message = "开始报警时间不能为空") + private Date startAlertTime; + /** + * 最近一次报警时间 + */ + @NotEmpty(message = "最近一次报警时间不能为空") + private Date recentAlertTime; + /** + * 处理时间 + */ + @NotEmpty(message = "处理时间不能为空") + private Date dealTime; + /** + * 处理人 + */ + @NotEmpty(message = "处理人不能为空") + private String dealUser; + /** + * 处理状态 + * 0待处理 + * 1正在处理 + * 2处理完成 + */ + @NotEmpty(message = "处理状态不能为空") + private Integer dealStatus; +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordQueryReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordQueryReq.java new file mode 100644 index 0000000..67a70f0 --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordQueryReq.java @@ -0,0 +1,41 @@ +package com.dragon.vehicle.company.common.domain.req; + +import com.dragon.vehicle.common.page.PageQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import javax.validation.constraints.NotEmpty; +import java.util.Date; + +/** + * 查询故障记录列表 + * + * @author HuZhiYong + * @version 2023/11/23 - 22:29 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class FaultRecordQueryReq extends PageQuery { + @NotEmpty(message = "故障记录表ID不能为空") + private Integer faultRecordId; + @NotEmpty(message = "故障码ID不能为空") + private Integer faultCodeId; + @NotEmpty(message = "车辆vin不能为空") + private String vin; + @NotEmpty(message = "故障等级不能为空") + private Integer alertScore; + @NotEmpty(message = "开始报警时间不能为空") + private Date startAlerTime; + @NotEmpty(message = "最近一次报警时间不能为空") + private Date recentAlerTime; + @NotEmpty(message = "处理时间不能为空") + private Date dealTime; + @NotEmpty(message = "处理人不能为空") + private String dealUser; + @NotEmpty(message = "处理状态不能为空") + private UnknownError dealStatus; +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordUpdateReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordUpdateReq.java new file mode 100644 index 0000000..1855e99 --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FaultRecordUpdateReq.java @@ -0,0 +1,70 @@ +package com.dragon.vehicle.company.common.domain.req; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; +import java.util.Date; + +/** + * 故障记录UpdateReq + * + * @author HuZhiYong + * @version 2023/11/23 - 13:53 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class FaultRecordUpdateReq { + + private Integer falutRecordId; + /** + * 故障码ID + */ + @NotEmpty(message = "故障码不能为空") + private Integer falutCodeId; + /** + * 车辆VIN + */ + @NotEmpty(message = "车辆VIN不能为空") + private String vin; + /** + * 故障等级 + * 0低 + * 1中 + * 2高 + */ + @NotEmpty(message = "故障等级不能为空") + private Integer alertScore; + /** + * 开始报警时间 + */ + @NotEmpty(message = "开始报警时间不能为空") + private Date startAlertTime; + /** + * 最近一次报警时间 + */ + @NotEmpty(message = "最近一次报警时间不能为空") + private Date recentAlertTime; + /** + * 处理时间 + */ + @NotEmpty(message = "处理时间不能为空") + private Date dealTime; + /** + * 处理人 + */ + @NotEmpty(message = "处理人不能为空") + private String dealUser; + /** + * 处理状态 + * 0待处理 + * 1正在处理 + * 2处理完成 + */ + @NotEmpty(message = "处理状态不能为空") + private Integer dealStatus; +} diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmAddReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmAddReq.java index 08be5f7..fc58333 100644 --- a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmAddReq.java +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmAddReq.java @@ -77,6 +77,6 @@ public class FirmAddReq { */ @NotEmpty(message = "企业统一社会信用代码不能为空") @Pattern(regexp = License) - private String unifiedSocialCredit; + private String firmSocialCredit; } diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmQueryReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmQueryReq.java index 444df76..ded7243 100644 --- a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmQueryReq.java +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FirmQueryReq.java @@ -20,11 +20,6 @@ import static com.dragon.vehicle.company.common.contsants.RegexConstants.*; @AllArgsConstructor public class FirmQueryReq extends PageQuery { - /** - * 企业编号 - */ - @NotEmpty(message = "企业编号不能为空") - private Integer firmId; /** * 企业名称 */ @@ -88,5 +83,5 @@ public class FirmQueryReq extends PageQuery { */ @NotEmpty(message = "企业统一社会信用代码不能为空") @Pattern(regexp = License) - private String unifiedSocialCredit; + private String firmSocialCredit; } diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FrimUpdateReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FrimUpdateReq.java index a0f3f94..3ccc1d4 100644 --- a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FrimUpdateReq.java +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/FrimUpdateReq.java @@ -88,5 +88,5 @@ public class FrimUpdateReq { */ @NotEmpty(message = "企业统一社会信用代码不能为空") @Pattern(regexp = License) - private String unifiedSocialCredit; + private String firmSocialCredit; } diff --git a/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/VehicleBreakdownQueryReq.java b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/VehicleBreakdownQueryReq.java new file mode 100644 index 0000000..9e485b5 --- /dev/null +++ b/vehicle-company-common/src/main/java/com/dragon/vehicle/company/common/domain/req/VehicleBreakdownQueryReq.java @@ -0,0 +1,37 @@ +package com.dragon.vehicle.company.common.domain.req; + +import com.dragon.vehicle.common.page.PageQuery; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import javax.validation.constraints.NotEmpty; + +/** + * 故障记录Query + * + * @author HuZhiYong + * @version 2023/11/24 - 22:22 + */ +@Data +@NoArgsConstructor +@AllArgsConstructor +@SuperBuilder +public class VehicleBreakdownQueryReq extends PageQuery { + /** + * 故障码ID + */ + @NotEmpty(message = "故障码ID不能为空") + public Integer breakdownId; + /** + * 故障码代码 + */ + @NotEmpty(message = "故障码代码不能为空") + public String breakdownCode; + /** + * 故障码状态 + */ + @NotEmpty(message = "故障码状态不能为空") + public Integer breakdownStatus; +} diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/aop/AopLog.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/aop/AopLog.java index 6618c42..f6d8851 100644 --- a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/aop/AopLog.java +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/aop/AopLog.java @@ -60,5 +60,6 @@ public class AopLog { logger.info("调用后：目标方法的类名：{}，方法名：{}，传递的参数为：{}",className,methodName,mapper.writeValueAsString(obj)); logger.info("耗时：{}ms",System.currentTimeMillis()-startTime.get()); return obj; + } } diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FaultRecordController.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FaultRecordController.java new file mode 100644 index 0000000..5e12e29 --- /dev/null +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FaultRecordController.java @@ -0,0 +1,69 @@ +package com.dragon.vehicle.company.server.controller; + +import com.dragon.common.core.domain.Result; +import com.dragon.common.core.web.page.TableDataInfo; +import com.dragon.vehicle.company.common.domain.FaultRecord; +import com.dragon.vehicle.company.common.domain.req.FaultRecordAddReq; +import com.dragon.vehicle.company.common.domain.req.FaultRecordQueryReq; +import com.dragon.vehicle.company.common.domain.req.FaultRecordUpdateReq; +import com.dragon.vehicle.company.server.service.FaultRecordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +/** + * 故障记录 + * + * @author HuZhiYong + * @version 2023/11/23 - 14:30 + */ +@RestController +@RequestMapping("/faultRecord") +public class FaultRecordController { + + @Autowired + private FaultRecordService faultRecordService; + + /** + * 添加故障记录 + * @param faultRecordAddReq + * @return + */ + @PostMapping() + public Result addFaultRecord(@RequestBody @Validated FaultRecordAddReq faultRecordAddReq){ + faultRecordService.save(FaultRecord.addReqBuild(faultRecordAddReq)); + return Result.success(); + } + + + /** + * 修改 + * @param recordUpdateReq + * @return + */ + @PostMapping("/{updateById}") + public Result updateFaultRecord(@RequestBody FaultRecordUpdateReq recordUpdateReq){ + faultRecordService.updateById(FaultRecord.updateReqBuild(recordUpdateReq)); + return Result.success(); + } + + /** + * 删除故障记录 + * @param faultRecordId + * @return + */ + @PostMapping("/{faultRecordId}") + public Result delRecordId(@PathVariable Integer faultRecordId){ + faultRecordService.removeById(faultRecordId); + return Result.success(); + } + + /** + * 查看故障记录列表 + */ + @GetMapping("/list") + public Result> selectFaultList( FaultRecordQueryReq faultRecordQueryReq){ + TableDataInfo tableDataInfo=faultRecordService.seletFaultlist(faultRecordQueryReq); + return Result.success (tableDataInfo); + } +} diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FirmController.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FirmController.java index 58de5a5..3285ecd 100644 --- a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FirmController.java +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/controller/FirmController.java @@ -14,7 +14,7 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @RestController -@RequestMapping("/firm/company") +@RequestMapping("/firm") public class FirmController { @Autowired @@ -50,14 +50,13 @@ public class FirmController { * 查看企业列表 * @return */ - @GetMapping("/list") - public Result> selectFirmList(@RequestBody @Validated FirmQueryReq firmQueryReq){ + @GetMapping("/firmInfoList") + public Result> selectFirmList( FirmQueryReq firmQueryReq){ TableDataInfo tableDataInfo = firmService.selectFirmList(firmQueryReq); return Result.success(tableDataInfo); } - /** * 逻辑删除 * @param firmId diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/FaultRecordMapper.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/FaultRecordMapper.java new file mode 100644 index 0000000..26a273e --- /dev/null +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/FaultRecordMapper.java @@ -0,0 +1,13 @@ +package com.dragon.vehicle.company.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dragon.vehicle.company.common.domain.FaultRecord; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author HuZhiYong + * @version 2023/11/23 - 14:32 + */ +@Mapper +public interface FaultRecordMapper extends BaseMapper { +} diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/VehicleBreakdownMapper.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/VehicleBreakdownMapper.java new file mode 100644 index 0000000..c33476a --- /dev/null +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/mapper/VehicleBreakdownMapper.java @@ -0,0 +1,13 @@ +package com.dragon.vehicle.company.server.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.dragon.vehicle.company.common.domain.VehicleBreakdown; +import org.apache.ibatis.annotations.Mapper; + +/** + * @author HuZhiYong + * @version 2023/11/24 - 21:29 + */ +@Mapper +public interface VehicleBreakdownMapper extends BaseMapper { +} diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/FaultRecordService.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/FaultRecordService.java new file mode 100644 index 0000000..a5a4d7c --- /dev/null +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/FaultRecordService.java @@ -0,0 +1,14 @@ +package com.dragon.vehicle.company.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.dragon.common.core.web.page.TableDataInfo; +import com.dragon.vehicle.company.common.domain.FaultRecord; +import com.dragon.vehicle.company.common.domain.req.FaultRecordQueryReq; + +/** + * @author HuZhiYong + * @version 2023/11/23 - 14:31 + */ +public interface FaultRecordService extends IService { + TableDataInfo seletFaultlist(FaultRecordQueryReq faultRecordQueryReq); +} diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/VehicleBreakdownService.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/VehicleBreakdownService.java new file mode 100644 index 0000000..384fad1 --- /dev/null +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/VehicleBreakdownService.java @@ -0,0 +1,15 @@ +package com.dragon.vehicle.company.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.dragon.common.core.web.page.TableDataInfo; +import com.dragon.vehicle.company.common.domain.VehicleBreakdown; +import com.dragon.vehicle.company.common.domain.req.VehicleBreakdownQueryReq; + +/** + * @author HuZhiYong + * @version 2023/11/24 - 21:29 + */ +public interface VehicleBreakdownService extends IService { + TableDataInfo selectBreaklist(VehicleBreakdownQueryReq vehicleBreakdownQueryReq); + +} diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FaultRecordServiceImpl.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FaultRecordServiceImpl.java new file mode 100644 index 0000000..a8a9343 --- /dev/null +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FaultRecordServiceImpl.java @@ -0,0 +1,79 @@ +package com.dragon.vehicle.company.server.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dragon.common.core.exception.ServiceException; +import com.dragon.common.core.utils.StringUtils; +import com.dragon.common.core.web.page.TableDataInfo; +import com.dragon.vehicle.company.common.domain.FaultRecord; +import com.dragon.vehicle.company.common.domain.req.FaultRecordQueryReq; +import com.dragon.vehicle.company.server.mapper.FaultRecordMapper; +import com.dragon.vehicle.company.server.service.FaultRecordService; +import lombok.extern.log4j.Log4j2; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.io.Serializable; + +/** + * @author HuZhiYong + * @version 2023/11/23 - 14:31 + */ +@Service +@Log4j2 +public class FaultRecordServiceImpl extends ServiceImpl implements FaultRecordService { + @Autowired + private FaultRecordMapper faultRecordMapper; + + @Override + public boolean save(FaultRecord entity) { + boolean save = super.save(entity); + if (!save){ + log.warn("添加失败：[{}]",entity.getFalutCodeId()); + throw new ServiceException("添加失败"); + } + return true; + } + + + @Override + public boolean updateById(FaultRecord entity) { + boolean update = super.updateById(entity); + if (!update){ + log.warn("修改失败：[{}]",entity.getFalutCodeId()); + throw new ServiceException("修改失败"); + } + + return true; + } + + @Override + public boolean removeById(Serializable id) { + boolean remove = super.removeById(id); + if (!remove){ + log.warn("删除失败：[{}]",id); + throw new ServiceException("删除失败"); + } + return true; + } + + @Override + public TableDataInfo seletFaultlist(FaultRecordQueryReq faultRecordQueryReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultRecordQueryReq.getVin())){ + queryWrapper.like(FaultRecord::getVin,faultRecordQueryReq); + } + + if (StringUtils.isNotEmpty(faultRecordQueryReq.getDealUser())){ + queryWrapper.like(FaultRecord::getDealUser,faultRecordQueryReq); + } + + Page page = this.page(faultRecordQueryReq.buildPage()); + return TableDataInfo.builder() + .rows(page.getRecords()) + .total(page.getTotal()) + .build(); + + } +} diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FirmServiceImpl.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FirmServiceImpl.java index c377cfb..aa125fd 100644 --- a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FirmServiceImpl.java +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/FirmServiceImpl.java @@ -112,8 +112,8 @@ public class FirmServiceImpl extends ServiceImpl implement queryWrapper.eq(FirmInfo::getFirmBankAccount,firmQueryReq.getFirmBankAccount()); } - if (StringUtils.isNotEmpty(firmQueryReq.getUnifiedSocialCredit())){ - queryWrapper.eq(FirmInfo::getUnifiedSocialCredit,firmQueryReq.getUnifiedSocialCredit()); + if (StringUtils.isNotEmpty(firmQueryReq.getFirmSocialCredit())){ + queryWrapper.eq(FirmInfo::getFirmSocialCredit,firmQueryReq.getFirmSocialCredit()); } if (StringUtils.isNotEmpty(firmQueryReq.getFirmRepresentativeId())){ diff --git a/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/VehicleBreakdownServiceImpl.java b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/VehicleBreakdownServiceImpl.java new file mode 100644 index 0000000..dc30ef8 --- /dev/null +++ b/vehicle-company-server/src/main/java/com/dragon/vehicle/company/server/service/impl/VehicleBreakdownServiceImpl.java @@ -0,0 +1,50 @@ +package com.dragon.vehicle.company.server.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.dragon.common.core.utils.StringUtils; +import com.dragon.common.core.web.page.TableDataInfo; +import com.dragon.vehicle.company.common.domain.VehicleBreakdown; +import com.dragon.vehicle.company.common.domain.req.VehicleBreakdownQueryReq; +import com.dragon.vehicle.company.server.mapper.VehicleBreakdownMapper; +import com.dragon.vehicle.company.server.service.VehicleBreakdownService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +/** + * @author HuZhiYong + * @version 2023/11/24 - 21:29 + */ +@Service +public class VehicleBreakdownServiceImpl extends ServiceImpl implements VehicleBreakdownService { + @Autowired + private VehicleBreakdownMapper vehicleBreakdownMapper; + + + @Override + public TableDataInfo selectBreaklist(VehicleBreakdownQueryReq vehicleBreakdownQueryReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(vehicleBreakdownQueryReq.breakdownCode)){ + queryWrapper.like(VehicleBreakdown::getBreakdownCode,vehicleBreakdownQueryReq.getBreakdownCode()); + } + + + Page page = this.page(vehicleBreakdownQueryReq.buildPage(), queryWrapper); + return TableDataInfo.builder() + .rows(page.getRecords()) + .total(page.getTotal()) + .build(); + } + + + @Override + public boolean updateById(VehicleBreakdown entity) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.eq(VehicleBreakdown::getBreakdownId,entity.breakdownId) + .set(VehicleBreakdown::getBreakdownStatus,1); + vehicleBreakdownMapper.update(null,updateWrapper); + return true; + } +}