From 2ad4794e7895b5cbf572569fbe321ecd3412c451 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Sun, 22 Sep 2024 10:24:55 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=95=85=E9=9A=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-fault/pom.xml | 12 +++++ .../com/muyu/fault/common/SysCarFault.java | 2 +- .../fault/controller/FaultLogController.java | 28 +++++++++++ .../controller/SysCarFaultController.java | 46 +++++++++++-------- .../fault/service/impl/FaultLogService.java | 5 ++ .../service/impl/FaultLogServiceImpl.java | 6 +++ .../src/test/java/Text01.java | 29 ++++++++++++ 7 files changed, 109 insertions(+), 19 deletions(-) create mode 100644 cloud-modules/cloud-modules-fault/src/test/java/Text01.java diff --git a/cloud-modules/cloud-modules-fault/pom.xml b/cloud-modules/cloud-modules-fault/pom.xml index c068b4b..ee6f8a2 100644 --- a/cloud-modules/cloud-modules-fault/pom.xml +++ b/cloud-modules/cloud-modules-fault/pom.xml @@ -72,6 +72,18 @@ com.muyu cloud-common-api-doc + + com.carrotsearch.thirdparty + simple-xml-safe + 2.7.1 + test + + + org.attoparser + attoparser + 2.0.7.RELEASE + test + diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java index 3217fe0..0c313ea 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java @@ -71,6 +71,6 @@ public class SysCarFault extends BaseEntity { /** * 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) */ - @Schema(defaultValue = "启用状态",type = "String",description = "启用状态") + @Schema(defaultValue = "启用状态",type = "String",description = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") private String state; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java index 013de02..c63ac97 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java @@ -1,11 +1,39 @@ package com.muyu.fault.controller; +import com.muyu.common.core.domain.Result; +import com.muyu.fault.common.FaultLog; +import com.muyu.fault.service.impl.FaultLogService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @RestController @RequestMapping("/log") public class FaultLogController{ + @Autowired + private FaultLogService faultLogService; + /** + * 查询车辆故障日志列表 + */ + @RequestMapping(value = "/logList", method = RequestMethod.GET) + public Result> logList(){ + List list = faultLogService.logList(); + return Result.success(list); + } + + /** + * 添加车辆故障日志 + * @param faultLog + * @return + */ + @RequestMapping(value = "/addLog",method = RequestMethod.POST) + public Result addLog(@RequestBody FaultLog faultLog){ + return Result.success(faultLogService.save(faultLog)); + } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java index c744d2e..47eb968 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java @@ -1,29 +1,33 @@ package com.muyu.fault.controller; +import cn.hutool.core.date.DateTime; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.fault.common.FaultLog; +import com.muyu.fault.common.SysCarFault; +import com.muyu.fault.service.impl.FaultLogService; +import com.muyu.fault.service.impl.SysCarFaultService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.util.Random; -import com.muyu.fault.common.SysCarFault; -import com.muyu.fault.service.impl.SysCarFaultService; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.*; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; -import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; - @RestController @RequestMapping("/faultInfo") public class SysCarFaultController extends BaseController { @Resource private SysCarFaultService sysCarFaultService; + @Autowired + private FaultLogService faultLogService; /** * 查询车辆故障列表 @@ -62,10 +66,6 @@ public class SysCarFaultController extends BaseController public Result add( @Validated @RequestBody SysCarFault sysCarFault) { - - if (sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("新增 车辆故障 '" + sysCarFault + "'失败，车辆故障已存在"); - } String prefix = "GT"; // 随机码的前缀 int minNumber = 1; // 随机数字的最小值 int maxNumber = 999; // 随机数字的最大值 @@ -83,6 +83,16 @@ public class SysCarFaultController extends BaseController //赋值 sysCarFault.setFaultCode(randomCode); sysCarFault.setCreateBy(SecurityUtils.getUsername()); + FaultLog faultLog = new FaultLog(); + faultLog.setFaultLogCodes(sysCarFault.getFaultCode()); + faultLog.setFaultLogVIN(sysCarFault.getCarVin()); + DateTime startTime = DateTime.now(); // 获取当前时间作为开始时间 + faultLog.setFaultLogStartTime(startTime); + faultLog.setFaultLogEndTime(startTime); + faultLogService.save(faultLog); + if (sysCarFaultService.checkIdUnique(sysCarFault)) { + return error("新增 车辆故障 '" + sysCarFault + "'失败，车辆故障已存在"); + } return toAjax(sysCarFaultService.save(sysCarFault)); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java index 325939e..6c6e27b 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java @@ -3,5 +3,10 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultLog; +import java.util.List; + public interface FaultLogService extends IService { + List logList(); + + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java index c42007d..901dfd1 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -5,6 +5,12 @@ import com.muyu.fault.common.FaultLog; import com.muyu.fault.mapper.FaultLogMapper; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService{ + @Override + public List logList() { + return null; + } } diff --git a/cloud-modules/cloud-modules-fault/src/test/java/Text01.java b/cloud-modules/cloud-modules-fault/src/test/java/Text01.java new file mode 100644 index 0000000..921a9e8 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/test/java/Text01.java @@ -0,0 +1,29 @@ +import org.simpleframework.xml.Text; + +import java.time.LocalDateTime; +import java.util.Random; + +@Text +public class Text01 { + public static void main(String[] args) { +// String prefix = "GT"; // 随机码的前缀 +// int minNumber = 1; // 随机数字的最小值 +// int maxNumber = 999; // 随机数字的最大值 +// Random random = new Random(); // 创建一个随机对象 +// // 生成一个随机数字 +// int number = random.nextInt(maxNumber - minNumber + 1) + minNumber; +// // 将数字格式化为三位字符串，不足三位前面补0 +// String formattedNumber = String.format("%03d", number); +// // 生成一个随机字母 +// String alphabets = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"; +// String randomLetter = alphabets.charAt(random.nextInt(alphabets.length())) + ""; +// // 拼接前缀、随机字母和随机数字 +// String randomCode = prefix + randomLetter + formattedNumber; +// System.out.println(randomCode); // 输出随机码 +// LocalDateTime startTime = LocalDateTime.now(); // 开始时间 +// LocalDateTime endTime = startTime.plusHours(2); // 结束时间设置为开始时间后2小时 +// +// System.out.println("Start Time: " + startTime); +// System.out.println("End Time: " + endTime); + } +} From 9e6ca8a8ff3abcaa89b7572b5fecee3b25aac577 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Sun, 22 Sep 2024 16:56:32 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E7=AB=99=E5=86=85=E4=BF=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/core/web/domain/BaseEntity.java | 4 +- .../java/com/muyu/fault/common/FaultLog.java | 29 +++++---- .../com/muyu/fault/common/FaultMessage.java | 48 +++++++++++++++ .../{FalutNotify.java => FaultNotify.java} | 12 ++-- .../com/muyu/fault/common/FaultSeverity.java | 2 +- .../common/{FalutType.java => FaultType.java} | 6 +- .../com/muyu/fault/common/FaultrRule.java | 21 ++++--- .../fault/controller/FaultLogController.java | 51 +++++++++++++--- .../controller/FaultMessageController.java | 61 +++++++++++++++++++ .../controller/FaultrRuleController.java | 29 +++++++++ .../controller/SysCarFaultController.java | 3 +- .../muyu/fault/mapper/FaultMessageMapper.java | 7 +++ .../muyu/fault/mapper/FaultrRuleMapper.java | 10 +++ .../fault/service/impl/FaultLogService.java | 3 +- .../service/impl/FaultLogServiceImpl.java | 21 ++++++- .../service/impl/FaultMessageService.java | 14 +++++ .../service/impl/FaultMessageServiceImpl.java | 34 +++++++++++ .../fault/service/impl/FaultrRuleService.java | 10 +++ .../service/impl/FaultrRuleServiceImpl.java | 19 ++++++ 19 files changed, 337 insertions(+), 47 deletions(-) create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java rename cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/{FalutNotify.java => FaultNotify.java} (74%) rename cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/{FalutType.java => FaultType.java} (87%) create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java index 28c4927..a045f1e 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java @@ -45,7 +45,7 @@ public class BaseEntity implements Serializable { */ @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private String createTime; /** * 更新者 @@ -58,7 +58,7 @@ public class BaseEntity implements Serializable { */ @TableField(fill = FieldFill.UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + private String updateTime; /** * 备注 diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java index 4ced773..ed16379 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java @@ -4,22 +4,25 @@ import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; @Data -@Builder +@SuperBuilder @AllArgsConstructor @NoArgsConstructor @TableName(value = "fault_log",autoResultMap = true) -public class FaultLog { +@EqualsAndHashCode(callSuper = true) +public class FaultLog extends BaseEntity { /** * 日志ID */ - @TableId(value = "faultLogId", type= IdType.AUTO) + @TableId(value = "fault_log_id", type= IdType.AUTO) @Schema(defaultValue = "日志ID",type = "Long",description = "日志ID") private Long faultLogId; /** @@ -31,15 +34,17 @@ public class FaultLog { * 车辆VIN */ @Schema(defaultValue = "车辆VIN",type = "String",description = "车辆VIN") - private String faultLogVIN; + private String faultLogVin; /** * 开始报警时间 */ - @Schema(defaultValue = "开始报警时间",type = "DateTime",description = "开始报警时间") - private DateTime faultLogStartTime; + @Schema(defaultValue = "开始报警时间",type = "Date",description = "开始报警时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date faultLogStartTime; /** * 结束报警时间 */ - @Schema(defaultValue = "结束报警时间",type = "DateTime",description = "结束报警时间") - private DateTime faultLogEndTime; + @Schema(defaultValue = "结束报警时间",type = "Date",description = "结束报警时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date faultLogEndTime; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java new file mode 100644 index 0000000..5248024 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -0,0 +1,48 @@ +package com.muyu.fault.common; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "fault_message",autoResultMap = true) +public class FaultMessage { + /** + * 站内信ID + */ + @TableId(value = "fault_message_id", type= IdType.AUTO) + @Schema(defaultValue = "站内信ID",type = "Long",description = "站内信ID") + private Long faultMessageId; + /** + * 消息发送人 + */ + @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") + private String faultMessageSendName; + /** + * 消息接收人 + */ + @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") + private String faultMessageRemoveName; + /** + * 发送时间 + */ + @Schema(defaultValue = "发送时间",type = "String",description = "发送时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date faultMessageSendTime; + /** + * 消息状态(1:未读,2:已读) + */ + @Schema(defaultValue = "消息状态",type = "Integer",description = "消息状态(1:未读,2:已读)") + private Integer faultMessageState; +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutNotify.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java similarity index 74% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutNotify.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java index b742eb6..5ccb6bb 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutNotify.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java @@ -13,22 +13,22 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -@TableName(value = "falut_notify",autoResultMap = true) -public class FalutNotify { +@TableName(value = "fault_notify",autoResultMap = true) +public class FaultNotify { /** * ID */ - @TableId(value = "falutNotifyId", type= IdType.AUTO) + @TableId(value = "fault_notify_id", type= IdType.AUTO) @Schema(defaultValue = "ID",type = "Long",description = "ID") - private Long falutNotifyId; + private Long faultNotifyId; /** * 通知方 */ @Schema(defaultValue = "通知方",type = "String",description = "通知方") - private String falutNotifyParty; + private String faultNotifyParty; /** * 联系方式 */ @Schema(defaultValue = "联系方式",type = "String",description = "联系方式") - private String falutNotifyManner; + private String faultNotifyManner; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java index cdb3ba6..63fa98b 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java @@ -20,7 +20,7 @@ public class FaultSeverity extends BaseEntity { /** * 等级ID */ - @TableId(value = "id", type= IdType.AUTO) + @TableId(value = "fault_severity_id", type= IdType.AUTO) @Schema(defaultValue = "等级ID",type = "Long",description = "等级ID") private Long faultSeverityId; /** diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutType.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java similarity index 87% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutType.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java index 2de911a..62a7433 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutType.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java @@ -13,12 +13,12 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName(value = "falut_type",autoResultMap = true) -public class FalutType { +@TableName(value = "fault_type",autoResultMap = true) +public class FaultType { /** * 故障类型ID */ - @TableId(value = "faultTypeId", type= IdType.AUTO) + @TableId(value = "fault_type_id", type= IdType.AUTO) @Schema(defaultValue = "故障类型ID",type = "Long",description = "故障类型ID") private Long faultTypeId; /** diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java index bc71d5a..6e649d5 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java @@ -5,32 +5,35 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; @Data @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName(value = "faultr_rule",autoResultMap = true) +@TableName(value = "fault_rule",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) public class FaultrRule extends BaseEntity { /** * 故障规则ID */ - @TableId(value = "faultrRuleId", type= IdType.AUTO) + @TableId(value = "fault_rule_id", type= IdType.AUTO) @Schema(defaultValue = "故障规则ID",type = "Long",description = "故障规则ID") - private Long faultrRuleId; + private Long faultRuleId; /** * 故障规则名称 */ @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") - private String faultrRuleName; + private String faultRuleName; + /** + * 故障规则参数 + */ + @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") + private String faultRuleParameter; /** * 故障规则描述 */ @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") - private String faultrRuleDescription; + private String faultRuleDescription; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java index c63ac97..3318518 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java @@ -5,11 +5,9 @@ import com.muyu.common.core.domain.Result; import com.muyu.fault.common.FaultLog; import com.muyu.fault.service.impl.FaultLogService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; @RestController @@ -21,9 +19,9 @@ public class FaultLogController{ /** * 查询车辆故障日志列表 */ - @RequestMapping(value = "/logList", method = RequestMethod.GET) - public Result> logList(){ - List list = faultLogService.logList(); + @RequestMapping(value = "/faultLogList", method = RequestMethod.GET) + public Result> faultLogList(FaultLog faultLog){ + List list = faultLogService.faultLogList(faultLog); return Result.success(list); } @@ -32,8 +30,43 @@ public class FaultLogController{ * @param faultLog * @return */ - @RequestMapping(value = "/addLog",method = RequestMethod.POST) - public Result addLog(@RequestBody FaultLog faultLog){ + @RequestMapping(value = "/insertLog",method = RequestMethod.POST) + public Result insertLog(@RequestBody FaultLog faultLog){ return Result.success(faultLogService.save(faultLog)); } + + /** + * 修改车辆故障日志 + * @param faultLog + * @return + */ + @RequestMapping(value = "/updateLog",method = RequestMethod.PUT) + public Result updateLog(@RequestBody FaultLog faultLog){ + return Result.success(faultLogService.updateById(faultLog)); + } + + /** + * + * 批量删除车辆故障日志 + * @param ids + * @return + */ + @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) + public Result remove(@PathVariable("ids") Long[] ids) + { + return Result.success(faultLogService.removeBatchByIds(Arrays.asList(ids))); + } + + /** + * 获取单条日志详细信息 + * @param faultLogId + * @return + */ + @RequestMapping(value = "/byidId/{faultLogId}",method = RequestMethod.GET) + public Result byidId(@PathVariable Long faultLogId){ + FaultLog byid = faultLogService.byidId(faultLogId); + return Result.success(byid); + } + + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java new file mode 100644 index 0000000..5181ede --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -0,0 +1,61 @@ +package com.muyu.fault.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.fault.common.FaultMessage; +import com.muyu.fault.service.impl.FaultMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/message") +public class FaultMessageController { + @Autowired + private FaultMessageService faultMessageService; + + /** + * 站内信列表 + * @return + */ + @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) + public Result faultMessageList(){ + List list = faultMessageService.faultMessageList(); + return Result.success(list); + } + + /** + * 添加站内信 + * @param faultMessage + * @return + */ + @RequestMapping(value = "/insertMessage",method = RequestMethod.POST) + public Result insertMessage(@RequestBody FaultMessage faultMessage){ + //消息发送人 + faultMessage.setFaultMessageSendName(SecurityUtils.getUsername()); + return Result.success(faultMessageService.save(faultMessage)); + } + + /** + * 查询未读(faultMessageState==1)信息 + * @param faultMessageId + * @return + */ + @RequestMapping(value = "/selectOne/{faultMessageId}",method = RequestMethod.POST) + public Result selectOne(@PathVariable Long faultMessageId){ + List one = faultMessageService.selectOne(faultMessageId); + return Result.success(one); + } + + /** + * 查询未读信息 + * @param faultMessageId + * @return + */ + @RequestMapping(value = "/selectTwo/{faultMessageId}",method = RequestMethod.POST) + public Result selectTwo(@PathVariable Long faultMessageId){ + List one = faultMessageService.selectTwo(faultMessageId); + return Result.success(one); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java new file mode 100644 index 0000000..c6635d1 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -0,0 +1,29 @@ +package com.muyu.fault.controller; + + +import com.muyu.common.core.domain.Result; +import com.muyu.fault.common.FaultrRule; +import com.muyu.fault.common.SysCarFault; +import com.muyu.fault.service.impl.FaultrRuleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/rule") +public class FaultrRuleController { + @Autowired + private FaultrRuleService faultrRuleService; + /** + * 查询车辆故障列表 + */ + @RequestMapping(value = "/faultRuleList", method = RequestMethod.GET) + public Result> faultRuleList(FaultrRule faultrRule) + { + List list = faultrRuleService.faultRuleList(faultrRule); + return Result.success(list); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java index 47eb968..0313b60 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java @@ -85,10 +85,9 @@ public class SysCarFaultController extends BaseController sysCarFault.setCreateBy(SecurityUtils.getUsername()); FaultLog faultLog = new FaultLog(); faultLog.setFaultLogCodes(sysCarFault.getFaultCode()); - faultLog.setFaultLogVIN(sysCarFault.getCarVin()); + faultLog.setFaultLogVin(sysCarFault.getCarVin()); DateTime startTime = DateTime.now(); // 获取当前时间作为开始时间 faultLog.setFaultLogStartTime(startTime); - faultLog.setFaultLogEndTime(startTime); faultLogService.save(faultLog); if (sysCarFaultService.checkIdUnique(sysCarFault)) { return error("新增 车辆故障 '" + sysCarFault + "'失败，车辆故障已存在"); diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java new file mode 100644 index 0000000..73a3930 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java @@ -0,0 +1,7 @@ +package com.muyu.fault.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.FaultMessage; + +public interface FaultMessageMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java new file mode 100644 index 0000000..3fd2169 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java @@ -0,0 +1,10 @@ +package com.muyu.fault.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.FaultrRule; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface FaultrRuleMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java index 6c6e27b..bf9f182 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java @@ -6,7 +6,8 @@ import com.muyu.fault.common.FaultLog; import java.util.List; public interface FaultLogService extends IService { - List logList(); + List faultLogList(FaultLog faultLog); + FaultLog byidId(Long faultLogId); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java index 901dfd1..8b71700 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -1,16 +1,33 @@ package com.muyu.fault.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultLog; +import com.muyu.fault.common.SysCarFault; import com.muyu.fault.mapper.FaultLogMapper; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import java.util.List; @Service public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService{ @Override - public List logList() { - return null; + public List faultLogList(FaultLog faultLog) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(faultLog.getFaultLogVin()), + FaultLog::getFaultLogVin, faultLog.getFaultLogVin()); + queryWrapper.like(StringUtils.isNotEmpty(faultLog.getFaultLogCodes()), + FaultLog::getFaultLogCodes, faultLog.getFaultLogCodes()); + return this.list(queryWrapper); + } + + @Override + public FaultLog byidId(Long faultLogId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(faultLogId, "日志ID不可为空"); + queryWrapper.eq(FaultLog::getFaultLogId, faultLogId); + return this.getOne(queryWrapper); } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java new file mode 100644 index 0000000..cf7a542 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java @@ -0,0 +1,14 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultMessage; + +import java.util.List; + +public interface FaultMessageService extends IService { + List faultMessageList(); + + List selectOne(Long faultMessageId); + + List selectTwo(Long faultMessageId); +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java new file mode 100644 index 0000000..2ee06c7 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -0,0 +1,34 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultMessage; +import com.muyu.fault.mapper.FaultMessageMapper; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService{ + @Override + public List faultMessageList() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return this.list(queryWrapper); + } + + @Override + public List selectOne(Long faultMessageId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //查询消息状态为1的未读数据 + queryWrapper.eq(FaultMessage::getFaultMessageState, 1); + return this.list(queryWrapper); + } + + @Override + public List selectTwo(Long faultMessageId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //查询消息状态为2的已读数据 + queryWrapper.eq(FaultMessage::getFaultMessageState, 2); + return this.list(queryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java new file mode 100644 index 0000000..c983aa4 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java @@ -0,0 +1,10 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultrRule; + +import java.util.List; + +public interface FaultrRuleService extends IService { + List faultRuleList(FaultrRule faultrRule); +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java new file mode 100644 index 0000000..e258817 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -0,0 +1,19 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultrRule; +import com.muyu.fault.mapper.FaultrRuleMapper; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService{ + + @Override + public List faultRuleList(FaultrRule faultrRule) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return this.list(queryWrapper); + } +} From 882819a6e08d2c6e13cc30f3a0b14cc7c42d3c7e Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Sun, 22 Sep 2024 20:36:53 +0800 Subject: [PATCH 3/8] =?UTF-8?q?feat:{=E4=BF=A1=E6=81=AF=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD,=E8=A7=84=E5=88=99=E7=9A=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/fault/common/FaultMessage.java | 5 ++ .../controller/FaultMessageController.java | 50 ++++++++++++------ .../controller/FaultrRuleController.java | 52 +++++++++++++++++-- .../service/impl/FaultMessageService.java | 5 +- .../service/impl/FaultMessageServiceImpl.java | 9 +--- .../fault/service/impl/FaultrRuleService.java | 2 + .../service/impl/FaultrRuleServiceImpl.java | 10 ++++ 7 files changed, 105 insertions(+), 28 deletions(-) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java index 5248024..38f0f03 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -34,6 +34,11 @@ public class FaultMessage { */ @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") private String faultMessageRemoveName; + /** + * 消息内容 + */ + @Schema(defaultValue = "消息内容",type = "String",description = "消息内容") + private String faultMessageContent; /** * 发送时间 */ diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java index 5181ede..7bf218d 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -1,6 +1,9 @@ package com.muyu.fault.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.service.impl.FaultMessageService; @@ -20,42 +23,59 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) - public Result faultMessageList(){ - List list = faultMessageService.faultMessageList(); - return Result.success(list); + public Result faultMessageList(@RequestBody FaultMessage faultMessage){ + String username = SecurityUtils.getUsername(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { + queryWrapper.eq(FaultMessage::getFaultMessageSendName,username); + } + return Result.success(faultMessageService.list(queryWrapper)); } /** - * 添加站内信 + * 添加消息 * @param faultMessage * @return */ @RequestMapping(value = "/insertMessage",method = RequestMethod.POST) public Result insertMessage(@RequestBody FaultMessage faultMessage){ + String username = SecurityUtils.getUsername(); //消息发送人 - faultMessage.setFaultMessageSendName(SecurityUtils.getUsername()); + faultMessage.setFaultMessageSendName(username); return Result.success(faultMessageService.save(faultMessage)); } /** - * 查询未读(faultMessageState==1)信息 - * @param faultMessageId + * 查询未读状态(faultMessageState==1)信息 * @return */ - @RequestMapping(value = "/selectOne/{faultMessageId}",method = RequestMethod.POST) - public Result selectOne(@PathVariable Long faultMessageId){ - List one = faultMessageService.selectOne(faultMessageId); + @RequestMapping(value = "/selectOne",method = RequestMethod.POST) + public Result selectOne(){ + List one = faultMessageService.selectOne(); return Result.success(one); } /** - * 查询未读信息 + * 查询已读状态(faultMessageState==2)信息 + * @return + */ + @RequestMapping(value = "/selectTwo",method = RequestMethod.POST) + public Result selectTwo(){ + List one = faultMessageService.selectTwo(); + return Result.success(one); + } + + /** + * 更改已读状态 * @param faultMessageId * @return */ - @RequestMapping(value = "/selectTwo/{faultMessageId}",method = RequestMethod.POST) - public Result selectTwo(@PathVariable Long faultMessageId){ - List one = faultMessageService.selectTwo(faultMessageId); - return Result.success(one); + @RequestMapping(value = "/updateTwo/{faultMessageId}",method = RequestMethod.POST) + public Result updateTwo(@PathVariable Long faultMessageId){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(FaultMessage::getFaultMessageState,2); + updateWrapper.eq(FaultMessage::getFaultMessageId,faultMessageId); + faultMessageService.update(updateWrapper); + return Result.success(faultMessageId,"消息已读"); } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java index c6635d1..c7e3611 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -2,14 +2,16 @@ package com.muyu.fault.controller; import com.muyu.common.core.domain.Result; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.fault.common.FaultLog; +import com.muyu.fault.common.FaultMessage; import com.muyu.fault.common.FaultrRule; import com.muyu.fault.common.SysCarFault; import com.muyu.fault.service.impl.FaultrRuleService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; @RestController @@ -26,4 +28,48 @@ public class FaultrRuleController { List list = faultrRuleService.faultRuleList(faultrRule); return Result.success(list); } + + + /** + * 添加车辆规则 + * @param faultrRule + * @return + */ + @RequestMapping(value = "/insertRule",method = RequestMethod.POST) + public Result insertRule(@RequestBody FaultrRule faultrRule){ + return Result.success(faultrRuleService.save(faultrRule)); + } + + /** + * 修改车辆规则 + * @param faultrRule + * @return + */ + @RequestMapping(value = "/updateRule",method = RequestMethod.POST) + public Result updateRule(@RequestBody FaultrRule faultrRule){ + return Result.success(faultrRuleService.updateById(faultrRule)); + } + + /** + * 获取单条故障规则详细信息 + * @param faultRuleId + * @return + */ + @RequestMapping(value = "/byidRuleId/{faultRuleId}",method = RequestMethod.GET) + public Result byidRuleId(@PathVariable Long faultRuleId){ + FaultrRule byid = faultrRuleService.byidRuleId(faultRuleId); + return Result.success(byid); + } + + /** + * 删除车辆故障 + */ + @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) + public Result remove(@PathVariable("ids") Long[] ids) + { + faultrRuleService.removeBatchByIds(Arrays.asList(ids)); + return Result.success(); + } + + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java index cf7a542..77e6c20 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java @@ -6,9 +6,8 @@ import com.muyu.fault.common.FaultMessage; import java.util.List; public interface FaultMessageService extends IService { - List faultMessageList(); - List selectOne(Long faultMessageId); + List selectOne(); - List selectTwo(Long faultMessageId); + List selectTwo(); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java index 2ee06c7..e2dcc9e 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -10,14 +10,9 @@ import java.util.List; @Service public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService{ - @Override - public List faultMessageList() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - return this.list(queryWrapper); - } @Override - public List selectOne(Long faultMessageId) { + public List selectOne() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); //查询消息状态为1的未读数据 queryWrapper.eq(FaultMessage::getFaultMessageState, 1); @@ -25,7 +20,7 @@ public class FaultMessageServiceImpl extends ServiceImpl selectTwo(Long faultMessageId) { + public List selectTwo() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); //查询消息状态为2的已读数据 queryWrapper.eq(FaultMessage::getFaultMessageState, 2); diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java index c983aa4..9d3262a 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java @@ -7,4 +7,6 @@ import java.util.List; public interface FaultrRuleService extends IService { List faultRuleList(FaultrRule faultrRule); + + FaultrRule byidRuleId(Long faultRuleId); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java index e258817..9f5a45e 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -2,9 +2,11 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultLog; import com.muyu.fault.common.FaultrRule; import com.muyu.fault.mapper.FaultrRuleMapper; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import java.util.List; @@ -16,4 +18,12 @@ public class FaultrRuleServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); return this.list(queryWrapper); } + + @Override + public FaultrRule byidRuleId(Long faultRuleId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(faultRuleId, "规则ID不可为空"); + queryWrapper.eq(FaultrRule::getFaultRuleId, faultRuleId); + return this.getOne(queryWrapper); + } } From ecf2c96c80e298076f28fffa77112b43a0301836 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Mon, 23 Sep 2024 21:03:36 +0800 Subject: [PATCH 4/8] =?UTF-8?q?feat:{=E7=AB=99=E5=86=85=E4=BF=A1=E7=9A=84?= =?UTF-8?q?=E7=BC=96=E5=86=99}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/fault/common/FaultMessage.java | 4 ++-- .../controller/FaultMessageController.java | 23 +++++++++++-------- .../service/impl/FaultLogServiceImpl.java | 1 - .../service/impl/FaultMessageService.java | 2 ++ .../service/impl/FaultMessageServiceImpl.java | 12 ++++++++++ 5 files changed, 30 insertions(+), 12 deletions(-) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java index 38f0f03..af5daae 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -32,7 +32,7 @@ public class FaultMessage { /** * 消息接收人 */ - @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") + @Schema(defaultValue = "消息接收人",type = "String",description = "消息发送人") private String faultMessageRemoveName; /** * 消息内容 @@ -42,7 +42,7 @@ public class FaultMessage { /** * 发送时间 */ - @Schema(defaultValue = "发送时间",type = "String",description = "发送时间") + @Schema(defaultValue = "发送时间",type = "Date",description = "发送时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date faultMessageSendTime; /** diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java index 7bf218d..88fce62 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -1,9 +1,7 @@ package com.muyu.fault.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.service.impl.FaultMessageService; @@ -22,14 +20,10 @@ public class FaultMessageController { * 站内信列表 * @return */ - @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) + @RequestMapping(value = "/faultMessageList",method = RequestMethod.POST) public Result faultMessageList(@RequestBody FaultMessage faultMessage){ - String username = SecurityUtils.getUsername(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { - queryWrapper.eq(FaultMessage::getFaultMessageSendName,username); - } - return Result.success(faultMessageService.list(queryWrapper)); + List list = faultMessageService.faultMessageList(faultMessage); + return Result.success(list); } /** @@ -78,4 +72,15 @@ public class FaultMessageController { faultMessageService.update(updateWrapper); return Result.success(faultMessageId,"消息已读"); } + + /** + * 删除消息 + * @param faultMessageId + * @return + */ + @RequestMapping(value = "/deleteMessageId/{faultMessageId}",method = RequestMethod.POST) + public Result deleteMessageId(@PathVariable Long faultMessageId){ + return Result.success(faultMessageService.removeById(faultMessageId)); + } + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java index 8b71700..6e56a64 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultLog; -import com.muyu.fault.common.SysCarFault; import com.muyu.fault.mapper.FaultLogMapper; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java index 77e6c20..83d0d19 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java @@ -10,4 +10,6 @@ public interface FaultMessageService extends IService { List selectOne(); List selectTwo(); + + List faultMessageList(FaultMessage faultMessage); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java index e2dcc9e..96f33d6 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -2,6 +2,8 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.mapper.FaultMessageMapper; import org.springframework.stereotype.Service; @@ -26,4 +28,14 @@ public class FaultMessageServiceImpl extends ServiceImpl faultMessageList(FaultMessage faultMessage) { + String username = SecurityUtils.getUsername(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { + queryWrapper.eq(FaultMessage::getFaultMessageSendName,username); + } + return this.list(queryWrapper); + } } From c8cd62c1be7e360dff9c308fdb14de2b4a9f05b6 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Tue, 24 Sep 2024 14:49:04 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E8=A7=84=E5=88=99=E7=9A=84=E7=BC=96?= =?UTF-8?q?=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/fault/common/FaultLog.java | 5 +++-- .../java/com/muyu/fault/common/FaultMessage.java | 3 ++- .../fault/controller/FaultMessageController.java | 13 ++++++------- .../muyu/fault/controller/FaultrRuleController.java | 1 - .../fault/service/impl/FaultMessageServiceImpl.java | 8 +++++++- .../fault/service/impl/FaultrRuleServiceImpl.java | 7 +++++++ 6 files changed, 25 insertions(+), 12 deletions(-) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java index ed16379..9953029 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java @@ -9,6 +9,7 @@ import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -39,12 +40,12 @@ public class FaultLog extends BaseEntity { * 开始报警时间 */ @Schema(defaultValue = "开始报警时间",type = "Date",description = "开始报警时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date faultLogStartTime; /** * 结束报警时间 */ @Schema(defaultValue = "结束报警时间",type = "Date",description = "结束报警时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date faultLogEndTime; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java index af5daae..b264b28 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -9,6 +9,7 @@ import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; @@ -43,7 +44,7 @@ public class FaultMessage { * 发送时间 */ @Schema(defaultValue = "发送时间",type = "Date",description = "发送时间") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date faultMessageSendTime; /** * 消息状态(1:未读,2:已读) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java index 88fce62..f9ffde6 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -20,10 +20,9 @@ public class FaultMessageController { * 站内信列表 * @return */ - @RequestMapping(value = "/faultMessageList",method = RequestMethod.POST) - public Result faultMessageList(@RequestBody FaultMessage faultMessage){ - List list = faultMessageService.faultMessageList(faultMessage); - return Result.success(list); + @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) + public Result> faultMessageList( FaultMessage faultMessage){ + return Result.success(faultMessageService.faultMessageList(faultMessage)); } /** @@ -65,7 +64,7 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/updateTwo/{faultMessageId}",method = RequestMethod.POST) - public Result updateTwo(@PathVariable Long faultMessageId){ + public Result updateTwo(@PathVariable(name = "faultMessageId") Long faultMessageId){ LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); updateWrapper.set(FaultMessage::getFaultMessageState,2); updateWrapper.eq(FaultMessage::getFaultMessageId,faultMessageId); @@ -79,8 +78,8 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/deleteMessageId/{faultMessageId}",method = RequestMethod.POST) - public Result deleteMessageId(@PathVariable Long faultMessageId){ - return Result.success(faultMessageService.removeById(faultMessageId)); + public Result deleteMessageId(@PathVariable(name = "faultMessageId") Long faultMessageId){ + return Result.success(faultMessageService.removeById(faultMessageId),"删除成功"); } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java index c7e3611..1a930ba 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -29,7 +29,6 @@ public class FaultrRuleController { return Result.success(list); } - /** * 添加车辆规则 * @param faultrRule diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java index 96f33d6..252e842 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -33,9 +33,15 @@ public class FaultMessageServiceImpl extends ServiceImpl faultMessageList(FaultMessage faultMessage) { String username = SecurityUtils.getUsername(); LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { + if (StringUtils.isNotEmpty(faultMessage.getFaultMessageRemoveName())) { queryWrapper.eq(FaultMessage::getFaultMessageSendName,username); } + if (StringUtils.isNotEmpty(String.valueOf(faultMessage.getFaultMessageState()))) { + queryWrapper.eq(FaultMessage::getFaultMessageState,faultMessage.getFaultMessageState()); + } + if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { + queryWrapper.like(FaultMessage::getFaultMessageSendName,faultMessage.getFaultMessageSendName()); + } return this.list(queryWrapper); } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java index 9f5a45e..e923634 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultLog; import com.muyu.fault.common.FaultrRule; import com.muyu.fault.mapper.FaultrRuleMapper; @@ -16,6 +17,12 @@ public class FaultrRuleServiceImpl extends ServiceImpl faultRuleList(FaultrRule faultrRule) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultrRule.getFaultRuleName())) { + queryWrapper.eq(FaultrRule::getFaultRuleName,faultrRule.getFaultRuleName()); + } + if (StringUtils.isNotEmpty(faultrRule.getFaultRuleParameter())) { + queryWrapper.eq(FaultrRule::getFaultRuleParameter,faultrRule.getFaultRuleParameter()); + } return this.list(queryWrapper); } From 2ed82cdd8029ce4f76781f707aba719c88661b43 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Tue, 24 Sep 2024 15:27:49 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fault/controller/FaultLogController.java | 4 ++- .../controller/FaultMessageController.java | 8 +++-- .../fault/controller/FaultTypeController.java | 29 +++++++++++++++++++ .../controller/FaultrRuleController.java | 8 ++--- .../controller/SysCarFaultController.java | 7 +++-- .../muyu/fault/mapper/FaultTypeMapper.java | 9 ++++++ .../service/{impl => }/FaultLogService.java | 3 +- .../{impl => }/FaultMessageService.java | 2 +- .../muyu/fault/service/FaultTypeService.java | 7 +++++ .../service/{impl => }/FaultrRuleService.java | 2 +- .../{impl => }/SysCarFaultService.java | 2 +- .../service/impl/FaultLogServiceImpl.java | 3 +- .../service/impl/FaultMessageServiceImpl.java | 3 +- .../service/impl/FaultTypeServiceImpl.java | 11 +++++++ .../service/impl/FaultrRuleServiceImpl.java | 4 +-- .../service/impl/SysCarFaultServiceImpl.java | 1 + 16 files changed, 83 insertions(+), 20 deletions(-) create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java rename cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/{impl => }/FaultLogService.java (88%) rename cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/{impl => }/FaultMessageService.java (90%) create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java rename cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/{impl => }/FaultrRuleService.java (89%) rename cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/{impl => }/SysCarFaultService.java (95%) create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java index 3318518..79e79a4 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java @@ -3,7 +3,8 @@ package com.muyu.fault.controller; import com.muyu.common.core.domain.Result; import com.muyu.fault.common.FaultLog; -import com.muyu.fault.service.impl.FaultLogService; +import com.muyu.fault.service.FaultLogService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -12,6 +13,7 @@ import java.util.List; @RestController @RequestMapping("/log") +@Tag(name = "故障日志",description = "对故障记录日志") public class FaultLogController{ @Autowired private FaultLogService faultLogService; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java index f9ffde6..35bb9fa 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.common.core.domain.Result; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; -import com.muyu.fault.service.impl.FaultMessageService; +import com.muyu.fault.service.FaultMessageService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -12,6 +13,7 @@ import java.util.List; @RestController @RequestMapping("/message") +@Tag(name = "站内信的管理",description = "对站内信息的处理与查看") public class FaultMessageController { @Autowired private FaultMessageService faultMessageService; @@ -43,7 +45,7 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/selectOne",method = RequestMethod.POST) - public Result selectOne(){ + public Result> selectOne(){ List one = faultMessageService.selectOne(); return Result.success(one); } @@ -53,7 +55,7 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/selectTwo",method = RequestMethod.POST) - public Result selectTwo(){ + public Result> selectTwo(){ List one = faultMessageService.selectTwo(); return Result.success(one); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java new file mode 100644 index 0000000..0f8fcb7 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java @@ -0,0 +1,29 @@ +package com.muyu.fault.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.common.core.domain.Result; +import com.muyu.fault.common.FaultType; +import com.muyu.fault.service.FaultTypeService; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/type") +@Tag(name = "故障类型",description = "对故障类型的定义") +public class FaultTypeController { + @Autowired + private FaultTypeService faultTypeService; + + /** + * 故障类型表 + * @return + */ + @RequestMapping(value = "faultTypeList",method = RequestMethod.GET) + public Result faultTypeList(){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return Result.success(faultTypeService.list(queryWrapper)); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java index 1a930ba..e316e3c 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -2,12 +2,9 @@ package com.muyu.fault.controller; import com.muyu.common.core.domain.Result; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.fault.common.FaultLog; -import com.muyu.fault.common.FaultMessage; import com.muyu.fault.common.FaultrRule; -import com.muyu.fault.common.SysCarFault; -import com.muyu.fault.service.impl.FaultrRuleService; +import com.muyu.fault.service.FaultrRuleService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,6 +13,7 @@ import java.util.List; @RestController @RequestMapping("/rule") +@Tag(name = "故障的规则",description = "对故障数据规则的判断") public class FaultrRuleController { @Autowired private FaultrRuleService faultrRuleService; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java index 0313b60..a7ee151 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java @@ -7,21 +7,22 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultLog; import com.muyu.fault.common.SysCarFault; -import com.muyu.fault.service.impl.FaultLogService; -import com.muyu.fault.service.impl.SysCarFaultService; +import com.muyu.fault.service.FaultLogService; +import com.muyu.fault.service.SysCarFaultService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.util.Random; @RestController @RequestMapping("/faultInfo") +@Tag(name = "故障管理",description = "故障的管理与查看") public class SysCarFaultController extends BaseController { @Resource diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java new file mode 100644 index 0000000..5265201 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java @@ -0,0 +1,9 @@ +package com.muyu.fault.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.FaultType; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface FaultTypeMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java similarity index 88% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java index bf9f182..2af9a14 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultLog; @@ -10,4 +10,5 @@ public interface FaultLogService extends IService { FaultLog byidId(Long faultLogId); + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java similarity index 90% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java index 83d0d19..89f6b81 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultMessage; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java new file mode 100644 index 0000000..5b8d7b9 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java @@ -0,0 +1,7 @@ +package com.muyu.fault.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultType; + +public interface FaultTypeService extends IService { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java similarity index 89% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java index 9d3262a..3899aa7 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultrRule; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java similarity index 95% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java index ed175a3..9afe833 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java index 6e56a64..3387ba9 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -5,13 +5,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultLog; import com.muyu.fault.mapper.FaultLogMapper; +import com.muyu.fault.service.FaultLogService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; @Service -public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService{ +public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { @Override public List faultLogList(FaultLog faultLog) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java index 252e842..bf697a5 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -6,12 +6,13 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.mapper.FaultMessageMapper; +import com.muyu.fault.service.FaultMessageService; import org.springframework.stereotype.Service; import java.util.List; @Service -public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService{ +public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService { @Override public List selectOne() { diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java new file mode 100644 index 0000000..3c871c4 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java @@ -0,0 +1,11 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultType; +import com.muyu.fault.mapper.FaultTypeMapper; +import com.muyu.fault.service.FaultTypeService; +import org.springframework.stereotype.Service; + +@Service +public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java index e923634..5f55d1a 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -3,16 +3,16 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; -import com.muyu.fault.common.FaultLog; import com.muyu.fault.common.FaultrRule; import com.muyu.fault.mapper.FaultrRuleMapper; +import com.muyu.fault.service.FaultrRuleService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; @Service -public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService{ +public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService { @Override public List faultRuleList(FaultrRule faultrRule) { diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java index ead1679..c229932 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java @@ -3,6 +3,7 @@ package com.muyu.fault.service.impl; import java.util.List; import com.muyu.fault.common.SysCarFault; +import com.muyu.fault.service.SysCarFaultService; import org.springframework.stereotype.Service; import com.muyu.fault.mapper.SysCarFaultMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; From 5cd6840e2a6bbe8f99a9c0df46830e5797b8667c Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Wed, 25 Sep 2024 20:32:18 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/fault/common/SysCarFault.java | 6 +-- .../fault/controller/FaultTypeController.java | 45 ++++++++++++++++--- .../muyu/fault/service/FaultTypeService.java | 3 ++ .../service/impl/FaultTypeServiceImpl.java | 15 +++++++ .../service/impl/SysCarFaultServiceImpl.java | 6 +-- 5 files changed, 62 insertions(+), 13 deletions(-) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java index 0c313ea..301b292 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java @@ -29,10 +29,10 @@ public class SysCarFault extends BaseEntity { @Schema(defaultValue = "车辆故障编码",type = "String",description = "车辆故障编码") private String faultCode; /** - * 车辆故障类型 + * 车辆故障类型ID */ - @Schema(defaultValue = "车辆故障类型",type = "String",description = "车辆故障类型") - private String faultType; + @Schema(defaultValue = "车辆故障类型ID",type = "Integer",description = "车辆故障类型ID") + private Integer faultTypeId; /** * 故障VIN编码 */ diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java index 0f8fcb7..7d4ee75 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java @@ -6,9 +6,9 @@ import com.muyu.fault.common.FaultType; import com.muyu.fault.service.FaultTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; + +import java.util.List; @RestController @RequestMapping("/type") @@ -22,8 +22,41 @@ public class FaultTypeController { * @return */ @RequestMapping(value = "faultTypeList",method = RequestMethod.GET) - public Result faultTypeList(){ - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - return Result.success(faultTypeService.list(queryWrapper)); + public Result> faultTypeList(@RequestBody FaultType faultType){ + return Result.success(faultTypeService.faultTypeList(faultType)); } + + + /** + * 添加故障类型 + * @param faultType + * @return + */ + @RequestMapping(value = "insertType",method = RequestMethod.POST) + public Result insertType(@RequestBody FaultType faultType){ + return Result.success(faultTypeService.save(faultType)); + } + + + /** + * 修改故障类型 + * @param faultType + * @return + */ + @RequestMapping(value = "updateType",method = RequestMethod.POST) + public Result updtaeType(@RequestBody FaultType faultType){ + return Result.success(faultTypeService.updateById(faultType)); + } + + + /** + * 删除故障类型 + * @param faultTypeId + * @return + */ + @RequestMapping(value = "deleteType/{faultTypeId}",method = RequestMethod.DELETE) + public Result deleteType(@PathVariable(name = "faultTypeId") Long faultTypeId){ + return Result.success(faultTypeService.removeById(faultTypeId)); + } + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java index 5b8d7b9..e4e6037 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java @@ -3,5 +3,8 @@ package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultType; +import java.util.List; + public interface FaultTypeService extends IService { + List faultTypeList(FaultType faultType); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java index 3c871c4..d316e3c 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java @@ -1,11 +1,26 @@ package com.muyu.fault.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultType; import com.muyu.fault.mapper.FaultTypeMapper; import com.muyu.fault.service.FaultTypeService; import org.springframework.stereotype.Service; +import java.util.List; + @Service public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { + @Override + public List faultTypeList(FaultType faultType) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultType.getFaultTypeName())) { + queryWrapper.like(FaultType::getFaultTypeName,faultType.getFaultTypeName()); + } + if (StringUtils.isNotEmpty(faultType.getFaultTypeDescription())) { + queryWrapper.like(FaultType::getFaultTypeDescription,faultType.getFaultTypeDescription()); + } + return this.list(queryWrapper); + } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java index c229932..a3ba13f 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java @@ -42,12 +42,10 @@ public class SysCarFaultServiceImpl public List selectSysCarFaultList(SysCarFault sysCarFault) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.like(StringUtils.isNotEmpty(sysCarFault.getFaultType()), - SysCarFault::getFaultType, sysCarFault.getFaultType()); + queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(sysCarFault.getFaultTypeId())), + SysCarFault::getFaultTypeId, sysCarFault.getFaultTypeId()); queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getState()), SysCarFault::getState, sysCarFault.getState()); - queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getFaultType()), - SysCarFault::getFaultType, sysCarFault.getFaultType()); queryWrapper.like(StringUtils.isNotEmpty(sysCarFault.getCarVin()), SysCarFault::getCarVin, sysCarFault.getCarVin()); queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getFaultWarn()), From c9d25d1ebcc3599e589d69816aef2d1a553179b7 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Thu, 26 Sep 2024 10:06:30 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=95=85=E9=9A=9C=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/fault/common/FaultType.java | 3 ++- .../src/main/java/com/muyu/fault/common/SysCarFault.java | 6 ++---- .../java/com/muyu/fault/controller/FaultTypeController.java | 5 +++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java index 62a7433..7bae718 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java @@ -3,6 +3,7 @@ package com.muyu.fault.common; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.AllArgsConstructor; import lombok.Data; @@ -14,7 +15,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @TableName(value = "fault_type",autoResultMap = true) -public class FaultType { +public class FaultType{ /** * 故障类型ID */ diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java index 301b292..690c07e 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java @@ -5,10 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import jakarta.validation.constraints.NotNull; +import lombok.*; import lombok.experimental.SuperBuilder; @Data @SuperBuilder diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java index 7d4ee75..342e984 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java @@ -2,6 +2,7 @@ package com.muyu.fault.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; +import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultType; import com.muyu.fault.service.FaultTypeService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,7 +23,7 @@ public class FaultTypeController { * @return */ @RequestMapping(value = "faultTypeList",method = RequestMethod.GET) - public Result> faultTypeList(@RequestBody FaultType faultType){ + public Result> faultTypeList(FaultType faultType){ return Result.success(faultTypeService.faultTypeList(faultType)); } @@ -44,7 +45,7 @@ public class FaultTypeController { * @return */ @RequestMapping(value = "updateType",method = RequestMethod.POST) - public Result updtaeType(@RequestBody FaultType faultType){ + public Result updateype(@RequestBody FaultType faultType){ return Result.success(faultTypeService.updateById(faultType)); }