From 06815c8552831051bc345a02676bdee38e229192 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Fri, 27 Sep 2024 22:39:14 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feax:()=E8=A7=A3=E5=86=B3=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E4=BF=AE=E6=94=B9=E5=90=8E=E7=9A=84=E5=86=B2?= =?UTF-8?q?=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/common/system/domain/SysEnt.java | 4 + .../controller/FaultTypeController.java | 13 ++ .../enterprise/service/FaultTypeService.java | 2 + .../service/impl/FaultTypeServiceImpl.java | 7 + cloud-modules/cloud-modules-fault/pom.xml | 106 +++++++++++++++ .../java/com/muyu/CloudFaultApplication.java | 16 +++ .../java/com/muyu/fault/common/FaultLog.java | 51 ++++++++ .../com/muyu/fault/common/FaultMessage.java | 54 ++++++++ .../com/muyu/fault/common/FaultNotify.java | 34 +++++ .../com/muyu/fault/common/FaultSeverity.java | 43 ++++++ .../java/com/muyu/fault/common/FaultType.java | 35 +++++ .../com/muyu/fault/common/FaultrRule.java | 39 ++++++ .../com/muyu/fault/common/SysCarFault.java | 74 +++++++++++ .../fault/controller/FaultLogController.java | 74 +++++++++++ .../controller/FaultMessageController.java | 87 +++++++++++++ .../fault/controller/FaultTypeController.java | 63 +++++++++ .../controller/FaultrRuleController.java | 74 +++++++++++ .../controller/SysCarFaultController.java | 122 ++++++++++++++++++ .../com/muyu/fault/mapper/FaultLogMapper.java | 10 ++ .../muyu/fault/mapper/FaultMessageMapper.java | 7 + .../muyu/fault/mapper/FaultTypeMapper.java | 9 ++ .../muyu/fault/mapper/FaultrRuleMapper.java | 10 ++ .../muyu/fault/mapper/SysCarFaultMapper.java | 8 ++ .../muyu/fault/service/FaultLogService.java | 14 ++ .../fault/service/FaultMessageService.java | 15 +++ .../muyu/fault/service/FaultTypeService.java | 10 ++ .../muyu/fault/service/FaultrRuleService.java | 12 ++ .../fault/service/SysCarFaultService.java | 31 +++++ .../service/impl/FaultLogServiceImpl.java | 33 +++++ .../service/impl/FaultMessageServiceImpl.java | 48 +++++++ .../service/impl/FaultTypeServiceImpl.java | 26 ++++ .../service/impl/FaultrRuleServiceImpl.java | 36 ++++++ .../service/impl/SysCarFaultServiceImpl.java | 68 ++++++++++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/logback/dev.xml | 74 +++++++++++ .../src/main/resources/logback/prod.xml | 81 ++++++++++++ .../src/main/resources/logback/test.xml | 81 ++++++++++++ .../src/test/java/Text01.java | 29 +++++ .../system/controller/SysEntController.java | 43 +++--- .../com/muyu/system/domain/resp/EntResp.java | 7 + .../muyu/system/service/SysEntService.java | 2 + .../service/impl/SysEntServiceImpl.java | 29 +++-- 42 files changed, 1558 insertions(+), 25 deletions(-) create mode 100644 cloud-modules/cloud-modules-fault/pom.xml create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java 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/FaultTypeController.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/controller/SysCarFaultController.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.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/FaultTypeMapper.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/mapper/SysCarFaultMapper.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.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/FaultTypeServiceImpl.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java create mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/banner.txt create mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml create mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml create mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml create mode 100644 cloud-modules/cloud-modules-fault/src/test/java/Text01.java diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java index aeb233d..cdead09 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java @@ -53,4 +53,8 @@ public class SysEnt extends BaseEntity { * 企业编码 */ private String entCode; + /** + * 企业状态 + */ + private Integer entStatus; } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java index 4eb6db0..05d0f0f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java @@ -1,6 +1,8 @@ package com.muyu.enterprise.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; import com.muyu.enterprise.domain.FaultType; import com.muyu.enterprise.service.FaultTypeService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -58,4 +60,15 @@ public class FaultTypeController { return Result.success(faultTypeService.removeById(faultTypeId)); } + + /** + * 查询类型详细信息 + * @param faultTypeId + * @return + */ + @RequestMapping(value = "/typeDetailOne/{faultTypeId}",method = RequestMethod.POST) + public Result> typeDetailOne(@PathVariable Long faultTypeId){ + return Result.success(faultTypeService.typeDatailOne(faultTypeId)); + } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java index 2a1c04b..1d4939c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java @@ -7,4 +7,6 @@ import java.util.List; public interface FaultTypeService extends IService { List faultTypeList(FaultType faultType); + + List typeDatailOne(Long faultTypeId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java index ae2f31e..af5abbd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java @@ -23,4 +23,11 @@ public class FaultTypeServiceImpl extends ServiceImpl typeDatailOne(Long faultTypeId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(FaultType::getFaultTypeId,faultTypeId); + return this.list(queryWrapper); + } } diff --git a/cloud-modules/cloud-modules-fault/pom.xml b/cloud-modules/cloud-modules-fault/pom.xml new file mode 100644 index 0000000..ee6f8a2 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/pom.xml @@ -0,0 +1,106 @@ + + + 4.0.0 + + com.muyu + cloud-modules + 3.6.3 + + + cloud-modules-fault + + + 17 + 17 + UTF-8 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + com.carrotsearch.thirdparty + simple-xml-safe + 2.7.1 + test + + + org.attoparser + attoparser + 2.0.7.RELEASE + test + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + + diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java new file mode 100644 index 0000000..1017e81 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java @@ -0,0 +1,16 @@ +package com.muyu; + + +import com.muyu.common.security.annotation.EnableCustomConfig; +import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@EnableCustomConfig +@EnableMyFeignClients +@SpringBootApplication +public class CloudFaultApplication { + public static void main(String[] args) { + SpringApplication.run(CloudFaultApplication.class,args); + } +} 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 new file mode 100644 index 0000000..9953029 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java @@ -0,0 +1,51 @@ +package com.muyu.fault.common; + +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.*; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "fault_log",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +public class FaultLog extends BaseEntity { + /** + * 日志ID + */ + @TableId(value = "fault_log_id", type= IdType.AUTO) + @Schema(defaultValue = "日志ID",type = "Long",description = "日志ID") + private Long faultLogId; + /** + * 故障码 + */ + @Schema(defaultValue = "故障码",type = "String",description = "故障码") + private String faultLogCodes; + /** + * 车辆VIN + */ + @Schema(defaultValue = "车辆VIN",type = "String",description = "车辆VIN") + private String faultLogVin; + /** + * 开始报警时间 + */ + @Schema(defaultValue = "开始报警时间",type = "Date",description = "开始报警时间") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date faultLogStartTime; + /** + * 结束报警时间 + */ + @Schema(defaultValue = "结束报警时间",type = "Date",description = "结束报警时间") + @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 new file mode 100644 index 0000000..b264b28 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -0,0 +1,54 @@ +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 org.springframework.format.annotation.DateTimeFormat; + +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 = "消息内容") + private String faultMessageContent; + /** + * 发送时间 + */ + @Schema(defaultValue = "发送时间",type = "Date",description = "发送时间") + @DateTimeFormat(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/FaultNotify.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java new file mode 100644 index 0000000..5ccb6bb --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java @@ -0,0 +1,34 @@ +package com.muyu.fault.common; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "fault_notify",autoResultMap = true) +public class FaultNotify { + /** + * ID + */ + @TableId(value = "fault_notify_id", type= IdType.AUTO) + @Schema(defaultValue = "ID",type = "Long",description = "ID") + private Long faultNotifyId; + /** + * 通知方 + */ + @Schema(defaultValue = "通知方",type = "String",description = "通知方") + private String faultNotifyParty; + /** + * 联系方式 + */ + @Schema(defaultValue = "联系方式",type = "String",description = "联系方式") + 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 new file mode 100644 index 0000000..63fa98b --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java @@ -0,0 +1,43 @@ +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.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "fault_severity",autoResultMap = true) +public class FaultSeverity extends BaseEntity { + /** + * 等级ID + */ + @TableId(value = "fault_severity_id", type= IdType.AUTO) + @Schema(defaultValue = "等级ID",type = "Long",description = "等级ID") + private Long faultSeverityId; + /** + * 等级名称 + */ + @Schema(defaultValue = "等级名称",type = "String",description = "等级名称") + private String faultSeverityName; + /** + * 优先级 + */ + @Schema(defaultValue = "优先级",type = "Integer",description = "优先级: 1_(立即) 2_(1小时内) 3_(24小时内)") + private Integer faultSeverityPriority; + /** + * 通知策略 + */ + @Schema(defaultValue = "通知策略",type = "String",description = "通知策略: 提示：邮件通知团队\n" + + "警告：邮件通知负责人\n" + + "严重：立即通知技术人员") + private String faultSeverityNotificationPolicy; +} 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 new file mode 100644 index 0000000..7bae718 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java @@ -0,0 +1,35 @@ +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; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "fault_type",autoResultMap = true) +public class FaultType{ + /** + * 故障类型ID + */ + @TableId(value = "fault_type_id", type= IdType.AUTO) + @Schema(defaultValue = "故障类型ID",type = "Long",description = "故障类型ID") + private Long faultTypeId; + /** + * 故障类型名称 + */ + @Schema(defaultValue = "故障类型名称",type = "String",description = "故障类型名称") + private String faultTypeName; + /** + * 故障类型描述 + */ + @Schema(defaultValue = "故障类型描述",type = "String",description = "故障类型描述") + private String faultTypeDescription; +} 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 new file mode 100644 index 0000000..6e649d5 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java @@ -0,0 +1,39 @@ +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.*; +import lombok.experimental.SuperBuilder; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "fault_rule",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +public class FaultrRule extends BaseEntity { + /** + * 故障规则ID + */ + @TableId(value = "fault_rule_id", type= IdType.AUTO) + @Schema(defaultValue = "故障规则ID",type = "Long",description = "故障规则ID") + private Long faultRuleId; + /** + * 故障规则名称 + */ + @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") + private String faultRuleName; + /** + * 故障规则参数 + */ + @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") + private String faultRuleParameter; + /** + * 故障规则描述 + */ + @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") + private String faultRuleDescription; +} 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 new file mode 100644 index 0000000..690c07e --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java @@ -0,0 +1,74 @@ +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 jakarta.validation.constraints.NotNull; +import lombok.*; +import lombok.experimental.SuperBuilder; +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName(value = "sys_car_fault", autoResultMap = true) +@EqualsAndHashCode(callSuper = true) +public class SysCarFault extends BaseEntity { + /** + * 自增主键 + */ + @TableId(value = "id", type= IdType.AUTO) + @Schema(defaultValue = "自增主键",type = "Long",description = "自增主键") + private Long id; + /** + * 车辆故障编码 + */ + @Schema(defaultValue = "车辆故障编码",type = "String",description = "车辆故障编码") + private String faultCode; + /** + * 车辆故障类型ID + */ + @Schema(defaultValue = "车辆故障类型ID",type = "Integer",description = "车辆故障类型ID") + private Integer faultTypeId; + /** + * 故障VIN编码 + */ + @Schema(defaultValue = "故障VIN编码",type = "String",description = "故障VIN编码") + private String carVin; + /** + * 车辆故障标签 + */ + @Schema(defaultValue = "车辆故障标签",type = "String",description = "车辆故障标签") + private String faultLabel; + /** + * 车辆故障位 + */ + @Schema(defaultValue = "车辆故障位",type = "String",description = "车辆故障位") + private String faultBit; + /** + * 车辆故障值 + */ + @Schema(defaultValue = "车辆故障值",type = "String",description = "车辆故障值") + private String faultValue; + /** + * 故障级别 + */ + @Schema(defaultValue = "故障级别",type = "String",description = "故障级别") + private String faultWarn; + /** + * 报警状态（Y.是，N.否） + */ + @Schema(defaultValue = "报警状态",type = "String",description = "报警状态") + private String warnStatus; + /** + * 故障描述信息 + */ + @Schema(defaultValue = "故障描述信息",type = "String",description = "故障描述信息") + private String faultDesc; + /** + * 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) + */ + @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 new file mode 100644 index 0000000..79e79a4 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java @@ -0,0 +1,74 @@ +package com.muyu.fault.controller; + + +import com.muyu.common.core.domain.Result; +import com.muyu.fault.common.FaultLog; +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.*; + +import java.util.Arrays; +import java.util.List; + +@RestController +@RequestMapping("/log") +@Tag(name = "故障日志",description = "对故障记录日志") +public class FaultLogController{ + @Autowired + private FaultLogService faultLogService; + + /** + * 查询车辆故障日志列表 + */ + @RequestMapping(value = "/faultLogList", method = RequestMethod.GET) + public Result> faultLogList(FaultLog faultLog){ + List list = faultLogService.faultLogList(faultLog); + return Result.success(list); + } + + /** + * 添加车辆故障日志 + * @param faultLog + * @return + */ + @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..35bb9fa --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -0,0 +1,87 @@ +package com.muyu.fault.controller; + +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.FaultMessageService; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/message") +@Tag(name = "站内信的管理",description = "对站内信息的处理与查看") +public class FaultMessageController { + @Autowired + private FaultMessageService faultMessageService; + + /** + * 站内信列表 + * @return + */ + @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) + public Result> faultMessageList( FaultMessage faultMessage){ + return Result.success(faultMessageService.faultMessageList(faultMessage)); + } + + /** + * 添加消息 + * @param faultMessage + * @return + */ + @RequestMapping(value = "/insertMessage",method = RequestMethod.POST) + public Result insertMessage(@RequestBody FaultMessage faultMessage){ + String username = SecurityUtils.getUsername(); + //消息发送人 + faultMessage.setFaultMessageSendName(username); + return Result.success(faultMessageService.save(faultMessage)); + } + + /** + * 查询未读状态(faultMessageState==1)信息 + * @return + */ + @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 = "/updateTwo/{faultMessageId}",method = RequestMethod.POST) + public Result updateTwo(@PathVariable(name = "faultMessageId") Long faultMessageId){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(FaultMessage::getFaultMessageState,2); + updateWrapper.eq(FaultMessage::getFaultMessageId,faultMessageId); + faultMessageService.update(updateWrapper); + return Result.success(faultMessageId,"消息已读"); + } + + /** + * 删除消息 + * @param faultMessageId + * @return + */ + @RequestMapping(value = "/deleteMessageId/{faultMessageId}",method = RequestMethod.POST) + 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/FaultTypeController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java new file mode 100644 index 0000000..342e984 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java @@ -0,0 +1,63 @@ +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; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/type") +@Tag(name = "故障类型",description = "对故障类型的定义") +public class FaultTypeController { + @Autowired + private FaultTypeService faultTypeService; + + /** + * 故障类型表 + * @return + */ + @RequestMapping(value = "faultTypeList",method = RequestMethod.GET) + public Result> faultTypeList(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 updateype(@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/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java new file mode 100644 index 0000000..176d8c1 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -0,0 +1,74 @@ +package com.muyu.fault.controller; + + +import com.muyu.common.core.domain.Result; +import com.muyu.fault.common.FaultrRule; +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.*; + +import java.util.Arrays; +import java.util.List; + +@RestController +@RequestMapping("/rule") +@Tag(name = "故障的规则",description = "对故障数据规则的判断") +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); + } + + /** + * 添加车辆规则 + * @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/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java new file mode 100644 index 0000000..a7ee151 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java @@ -0,0 +1,122 @@ +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.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.util.Arrays; +import java.util.List; +import java.util.Random; + +@RestController +@RequestMapping("/faultInfo") +@Tag(name = "故障管理",description = "故障的管理与查看") +public class SysCarFaultController extends BaseController +{ + @Resource + private SysCarFaultService sysCarFaultService; + @Autowired + private FaultLogService faultLogService; + + /** + * 查询车辆故障列表 + */ + @RequestMapping(value = "/list", method = RequestMethod.GET) + public Result> list(SysCarFault sysCarFault) + { + List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); + return success(list); + } + + /** + * 导出车辆故障列表 + */ + @RequestMapping(value = "export",method = RequestMethod.POST) + public void export(HttpServletResponse response, SysCarFault sysCarFault) + { + List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); + ExcelUtil util = new ExcelUtil(SysCarFault.class); + util.exportExcel(response, list, "车辆故障数据"); + } + + /** + * 获取车辆故障详细信息 + */ + @RequestMapping(value = "/getInfo/{id}",method = RequestMethod.GET) + public Result> getInfo(@PathVariable("id") Long id) + { + return success(sysCarFaultService.selectSysCarFaultById(id)); + } + + /** + * 新增车辆故障 + */ + @RequestMapping(value = "add",method = RequestMethod.POST) + public Result add( + @Validated @RequestBody SysCarFault sysCarFault) + { + 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); // 输出随机码 + //赋值 + 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); + faultLogService.save(faultLog); + if (sysCarFaultService.checkIdUnique(sysCarFault)) { + return error("新增 车辆故障 '" + sysCarFault + "'失败，车辆故障已存在"); + } + return toAjax(sysCarFaultService.save(sysCarFault)); + } + + /** + * 修改车辆故障 + */ + @RequestMapping(value = "edit",method = RequestMethod.PUT) + public Result edit( + @Validated @RequestBody SysCarFault sysCarFault) + { + if (!sysCarFaultService.checkIdUnique(sysCarFault)) { + return error("修改 车辆故障 '" + sysCarFault + "'失败，车辆故障不存在"); + } + sysCarFault.setUpdateBy(SecurityUtils.getUsername()); + return toAjax(sysCarFaultService.updateById(sysCarFault)); + } + + /** + * 删除车辆故障 + */ + @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) + public Result remove(@PathVariable("ids") Long[] ids) + { + sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); + return success(); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java new file mode 100644 index 0000000..5e9fc19 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java @@ -0,0 +1,10 @@ +package com.muyu.fault.mapper; + + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.FaultLog; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface FaultLogMapper extends BaseMapper { +} 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/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/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/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java new file mode 100644 index 0000000..92ece6a --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java @@ -0,0 +1,8 @@ +package com.muyu.fault.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.SysCarFault; +import org.apache.ibatis.annotations.Mapper; +@Mapper +public interface SysCarFaultMapper extends BaseMapper{ +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java new file mode 100644 index 0000000..2af9a14 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java @@ -0,0 +1,14 @@ +package com.muyu.fault.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultLog; + +import java.util.List; + +public interface FaultLogService extends IService { + List faultLogList(FaultLog faultLog); + + + FaultLog byidId(Long faultLogId); + +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java new file mode 100644 index 0000000..89f6b81 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java @@ -0,0 +1,15 @@ +package com.muyu.fault.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultMessage; + +import java.util.List; + +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/FaultTypeService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java new file mode 100644 index 0000000..e4e6037 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java @@ -0,0 +1,10 @@ +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/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java new file mode 100644 index 0000000..3899aa7 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java @@ -0,0 +1,12 @@ +package com.muyu.fault.service; + +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); + + FaultrRule byidRuleId(Long faultRuleId); +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java new file mode 100644 index 0000000..9afe833 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java @@ -0,0 +1,31 @@ +package com.muyu.fault.service; + +import java.util.List; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.SysCarFault; + +public interface SysCarFaultService extends IService { + /** + * 精确查询车辆故障 + * + * @param id 车辆故障主键 + * @return 车辆故障 + */ + public SysCarFault selectSysCarFaultById(Long id); + + /** + * 查询车辆故障列表 + * + * @param sysCarFault 车辆故障 + * @return 车辆故障集合 + */ + public List selectSysCarFaultList(SysCarFault sysCarFault); + + /** + * 判断 车辆故障 id是否唯一 + * @param sysCarFault 车辆故障 + * @return 结果 + */ + Boolean checkIdUnique(SysCarFault sysCarFault); + +} 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 new file mode 100644 index 0000000..3387ba9 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -0,0 +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.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 { + @Override + 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/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java new file mode 100644 index 0000000..bf697a5 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -0,0 +1,48 @@ +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 com.muyu.fault.service.FaultMessageService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService { + + @Override + public List selectOne() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //查询消息状态为1的未读数据 + queryWrapper.eq(FaultMessage::getFaultMessageState, 1); + return this.list(queryWrapper); + } + + @Override + public List selectTwo() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //查询消息状态为2的已读数据 + queryWrapper.eq(FaultMessage::getFaultMessageState, 2); + return this.list(queryWrapper); + } + + @Override + public List faultMessageList(FaultMessage faultMessage) { + String username = SecurityUtils.getUsername(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + 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/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java new file mode 100644 index 0000000..d316e3c --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java @@ -0,0 +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/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java new file mode 100644 index 0000000..5f55d1a --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -0,0 +1,36 @@ +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.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 { + + @Override + public List 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); + } + + @Override + public FaultrRule byidRuleId(Long faultRuleId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(faultRuleId, "规则ID不可为空"); + queryWrapper.eq(FaultrRule::getFaultRuleId, faultRuleId); + return this.getOne(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 new file mode 100644 index 0000000..a3ba13f --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java @@ -0,0 +1,68 @@ +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; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import org.springframework.util.Assert; + +@Service +public class SysCarFaultServiceImpl + extends ServiceImpl + implements SysCarFaultService { + + /** + * 精确查询车辆故障 + * + * @param id 车辆故障主键 + * @return 车辆故障 + */ + @Override + public SysCarFault selectSysCarFaultById(Long id) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(SysCarFault::getId, id); + return this.getOne(queryWrapper); + } + + + /** + * 查询车辆故障列表 + * + * @param sysCarFault 车辆故障 + * @return 车辆故障 + */ + @Override + public List selectSysCarFaultList(SysCarFault sysCarFault) + { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(sysCarFault.getFaultTypeId())), + SysCarFault::getFaultTypeId, sysCarFault.getFaultTypeId()); + queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getState()), + SysCarFault::getState, sysCarFault.getState()); + queryWrapper.like(StringUtils.isNotEmpty(sysCarFault.getCarVin()), + SysCarFault::getCarVin, sysCarFault.getCarVin()); + queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getFaultWarn()), + SysCarFault::getFaultWarn, sysCarFault.getFaultWarn()); + return this.list(queryWrapper); + } + + /** + * 唯一 判断 + * @param sysCarFault 车辆故障 + * @return 车辆故障 + */ + @Override + public Boolean checkIdUnique(SysCarFault sysCarFault) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysCarFault::getId, sysCarFault.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/banner.txt b/cloud-modules/cloud-modules-fault/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..d1b5629 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml new file mode 100644 index 0000000..76a0d8f --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml new file mode 100644 index 0000000..2cd69e4 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + ${log.sky.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + + + ERROR + + ACCEPT + + DENY + + + + + + + + ${log.sky.pattern} + + + + + + + + + + + + + + + + + + + + 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); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java index c508058..f04083d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java @@ -4,6 +4,7 @@ import com.muyu.common.core.constant.Constants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.system.domain.SysEnt; import com.muyu.system.domain.req.EntAddReq; import com.muyu.system.domain.req.EntListReq; import com.muyu.system.domain.req.EntUpdateReq; @@ -26,7 +27,7 @@ import java.util.List; @RestController @RequiredArgsConstructor @RequestMapping(value = "/ent") -@Tag(name = "SysEntController", description = "企业管理") +@Tag(name = "SysEntController",description = "企业管理") public class SysEntController extends BaseController { /** @@ -41,7 +42,9 @@ public class SysEntController extends BaseController { @GetMapping(value = "/getInfo") @Operation(summary = "获取企业信息", description = "现有的基础企业信息") public Result> getInfo() { - return Result.success(sysEntService.selectList(new EntListReq()), Constants.SUCCESS_MESSAGE); + return Result.success( + sysEntService.selectList(new EntListReq()), Constants.SUCCESS_MESSAGE + ); } /** @@ -89,25 +92,35 @@ public class SysEntController extends BaseController { * @return 响应结果 */ @PutMapping(value = "/{entId}") - @Operation(summary = "修改企业信息", description = "根据企业唯一标识修改企业信息") - public Result update( - @Schema(title = "企业ID", type = "Long", defaultValue = "1", description = "企业唯一标识") - @NotNull(message = "企业ID不能为空") @PathVariable(value = "entId") Long entId, - @RequestBody EntUpdateReq entUpdateReq) { - sysEntService.updateById(EntUpdateReq.updateBuild(entUpdateReq, () -> entId)); - return Result.success(null, Constants.SUCCESS_MESSAGE); + @Operation(summary = "修改企业信息",description = "根据企业唯一标识修改企业信息") + public Result update(@Schema(title = "企业ID",type = "Long",defaultValue = "1",description = "企业唯一标识") + @NotNull(message = "企业ID不能为空") @PathVariable(value = "entId") Long entId, + @RequestBody EntUpdateReq entUpdateReq){ + sysEntService.updateById(EntUpdateReq.updateBuild(entUpdateReq,()->entId)); + return Result.success(null,Constants.SUCCESS_MESSAGE); } /** * 删除企业信息 * @param entId 企业ID - * @return 响应结果 + * @return */ - @DeleteMapping(value = "/{entId}") - @Operation(summary = "删除企业信息", description = "根据企业唯一标识删除企业记录") - public Result remove(@Schema(title = "企业ID", type = "Long", defaultValue = "1", description = "企业唯一标识") - @NotNull(message = "企业ID不能为空") @PathVariable(value = "entId") Long entId) { + @RequestMapping(value = "/entId",method = RequestMethod.DELETE) + @Operation(summary = "删除企业信息",description = "根据企业唯一标识删除企业记录") + public Result remove(@Schema(title = "企业ID",type = "Long",defaultValue = "1",description = "企业唯一标识") + @NotNull(message = "企业ID不能为空") @PathVariable(value = "entId")Long entId){ sysEntService.removeById(entId); - return Result.success(null, Constants.SUCCESS_MESSAGE); + return Result.success(null,Constants.SUCCESS_MESSAGE); + } + + + /** + * 查询状态为待审核的企业 + * @return + */ + @RequestMapping(value = "/selectOne",method = RequestMethod.POST) + @Operation(summary = "查询状态为待审核的企业",description = "根据企业状态查询待审核的企业") + public Result> selectOne(){ + return Result.success(sysEntService.selectOne()); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java index b787779..350a414 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java @@ -54,6 +54,12 @@ public class EntResp { @Schema(title = "企业编码", type = "String", defaultValue = "db", description = "连接的数据源") private String entCode; + /** + * 企业状态 + */ + @Schema(title = "企业状态", type = "Integer", defaultValue = "0", description = "企业状态(待处理(0),通过(1),未通过(2))") + private Integer entStatus; + /** * 企业管理响应对象构建者模式 * @param sysEnt 企业管理 @@ -67,6 +73,7 @@ public class EntResp { .phoneNumber(sysEnt.getPhoneNumber()) .email(sysEnt.getEmail()) .entCode(sysEnt.getEntCode()) + .entStatus(sysEnt.getEntStatus()) .build(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java index 321b6b8..f305258 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java @@ -20,4 +20,6 @@ public interface SysEntService extends IService { * @return 返回结果 */ public List selectList(EntListReq entListReq); + + List selectOne(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java index a44821a..98c5a93 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java @@ -1,6 +1,7 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.SysEnt; @@ -22,9 +23,7 @@ import java.util.List; @RequiredArgsConstructor public class SysEntServiceImpl extends ServiceImpl implements SysEntService { - /** - * 企业管理持久层 - */ + //企业管理持久层 private final SysEntMapper sysEntMapper; /** @@ -35,31 +34,41 @@ public class SysEntServiceImpl extends ServiceImpl impleme @Override public List selectList(EntListReq entListReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //查询企业名称 queryWrapper.like( StringUtils.isNotEmpty(entListReq.getEntName()), - SysEnt::getName, entListReq.getEntName() + SysEnt::getName,entListReq.getEntName() ); + //查询负责人 queryWrapper.like( StringUtils.isNotEmpty(entListReq.getLeader()), - SysEnt::getLeader, entListReq.getLeader() + SysEnt::getLeader,entListReq.getLeader() ); + //查询联系电话 queryWrapper.like( StringUtils.isNotEmpty(entListReq.getPhoneNumber()), - SysEnt::getPhoneNumber, entListReq.getPhoneNumber() + SysEnt::getPhoneNumber,entListReq.getPhoneNumber() ); + //查询邮箱 queryWrapper.like( StringUtils.isNotEmpty(entListReq.getEmail()), - SysEnt::getEmail, entListReq.getEmail() + SysEnt::getEmail,entListReq.getEmail() ); + //精确查询企业编码 queryWrapper.eq( StringUtils.isNotEmpty(entListReq.getEntCode()), - SysEnt::getEntCode, entListReq.getEntCode() - + SysEnt::getEntCode,entListReq.getEntCode() ); List sysEntList = this.list(queryWrapper); - return sysEntList.stream() .map(EntResp::entBuild) .toList(); } + + @Override + public List selectOne() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(EntResp::getEntStatus,0); + return this.list((IPage) queryWrapper); + } } From 2c3197fac9a0e2603888fa0319191eaa89cb6832 Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Sat, 28 Sep 2024 12:30:55 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83(=E6=B3=A8=E9=87=8A,swagger=E6=96=87=E6=A1=A3?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/enterprise/domain/FaultLog.java | 13 ++++--- .../muyu/enterprise/domain/FaultMessage.java | 6 +++- .../muyu/enterprise/domain/FaultNotify.java | 34 ------------------- .../muyu/enterprise/domain/FaultSeverity.java | 7 ++-- .../com/muyu/enterprise/domain/FaultType.java | 7 ++-- .../muyu/enterprise/domain/FaultrRule.java | 6 +++- .../muyu/enterprise/domain/SysCarFault.java | 12 +++++-- .../controller/FaultLogController.java | 5 +++ .../controller/FaultMessageController.java | 6 +++- .../controller/FaultTypeController.java | 7 ++-- .../controller/FaultrRuleController.java | 6 +++- .../controller/SysCarFaultController.java | 5 +++ .../enterprise/mapper/FaultLogMapper.java | 6 +++- .../enterprise/mapper/FaultMessageMapper.java | 7 ++++ .../enterprise/mapper/FaultTypeMapper.java | 6 +++- .../enterprise/mapper/FaultrRuleMapper.java | 6 +++- .../enterprise/mapper/SysCarFaultMapper.java | 7 ++++ .../enterprise/service/FaultLogService.java | 5 +++ .../service/FaultMessageService.java | 6 +++- .../enterprise/service/FaultTypeService.java | 6 +++- .../enterprise/service/FaultrRuleService.java | 6 +++- .../service/SysCarFaultService.java | 6 +++- .../service/impl/FaultLogServiceImpl.java | 6 +++- .../service/impl/FaultMessageServiceImpl.java | 6 +++- .../service/impl/FaultTypeServiceImpl.java | 6 +++- .../service/impl/FaultrRuleServiceImpl.java | 6 +++- .../service/impl/SysCarFaultServiceImpl.java | 6 ++++ 27 files changed, 144 insertions(+), 61 deletions(-) delete mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultNotify.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java index c7840d1..71ffb89 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java @@ -1,18 +1,23 @@ package com.muyu.enterprise.domain; -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.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultLog:故障日志 + */ @Data @SuperBuilder @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java index 704cf9f..825a5df 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java @@ -3,7 +3,6 @@ package com.muyu.enterprise.domain; 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; @@ -13,6 +12,11 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +/** + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultMessage:站内信 + */ @Data @SuperBuilder @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultNotify.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultNotify.java deleted file mode 100644 index e8e1d3b..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultNotify.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.enterprise.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "fault_notify",autoResultMap = true) -public class FaultNotify { - /** - * ID - */ - @TableId(value = "fault_notify_id", type= IdType.AUTO) - @Schema(defaultValue = "ID",type = "Long",description = "ID") - private Long faultNotifyId; - /** - * 通知方 - */ - @Schema(defaultValue = "通知方",type = "String",description = "通知方") - private String faultNotifyParty; - /** - * 联系方式 - */ - @Schema(defaultValue = "联系方式",type = "String",description = "联系方式") - private String faultNotifyManner; -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java index dc5701c..149f6d5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java @@ -6,11 +6,14 @@ 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.experimental.SuperBuilder; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultSeverity:故障等级 + */ @Data @SuperBuilder @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java index ede5526..be8c5f0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java @@ -3,13 +3,16 @@ package com.muyu.enterprise.domain; 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; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultType:故障类型 + */ @Data @SuperBuilder @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java index ff73541..b49c706 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java @@ -7,7 +7,11 @@ import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultrRule:故障规则 + */ @Data @SuperBuilder @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java index 1c4c0ce..af17480 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java @@ -5,9 +5,17 @@ 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 jakarta.validation.constraints.NotNull; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; + +/** + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description SysCarFault:故障表 + */ @Data @SuperBuilder @NoArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java index 2c9496d..ea58d5d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java @@ -11,6 +11,11 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +/** + * @Author: chenruijia + * @Date 2024/9/28 11:58 + * @Description FaultLogController:故障日志控制层 + */ @RestController @RequestMapping("/log") @Tag(name = "故障日志",description = "对故障记录日志") diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java index f6c1ef0..c22aed5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java @@ -10,7 +10,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 11:58 + * @Description FaultMessageController:站内信控制层 + */ @RestController @RequestMapping("/fault-message") @Tag(name = "站内信的管理",description = "对站内信息的处理与查看") diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java index 05d0f0f..8878297 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java @@ -1,8 +1,6 @@ package com.muyu.enterprise.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.StringUtils; import com.muyu.enterprise.domain.FaultType; import com.muyu.enterprise.service.FaultTypeService; import io.swagger.v3.oas.annotations.tags.Tag; @@ -11,6 +9,11 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * @Author: chenruijia + * @Date 2024/9/28 11:58 + * @Description FaultTypeController:故障类型控制层 + */ @RestController @RequestMapping("/type") @Tag(name = "故障类型",description = "对故障类型的定义") diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java index 99e7a8d..9a539c6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java @@ -10,7 +10,11 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 11:58 + * @Description FaultrRuleController:故障的规则控制层 + */ @RestController @RequestMapping("/rule") @Tag(name = "故障的规则",description = "对故障数据规则的判断") diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java index 0aff974..4534256 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java @@ -20,6 +20,11 @@ import java.util.Arrays; import java.util.List; import java.util.Random; +/** + * @Author: chenruijia + * @Date 2024/9/28 11:58 + * @Description SysCarFaultController:故障管理控制层 + */ @RestController @RequestMapping("/faultInfo") @Tag(name = "故障管理",description = "故障的管理与查看") diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java index 5108162..e7970f5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java @@ -4,7 +4,11 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.enterprise.domain.FaultLog; import org.apache.ibatis.annotations.Mapper; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.17 + * @Description FaultLogMapper:故障日志持久层 + */ @Mapper public interface FaultLogMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java index f4bdec8..5e42fac 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java @@ -2,6 +2,13 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.enterprise.domain.FaultMessage; +import org.apache.ibatis.annotations.Mapper; +/** + * @Author: chenruijia + * @Date 2024/9/28 12.17 + * @Description FaultMessageMapper:站内信持久层 + */ +@Mapper public interface FaultMessageMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java index 1c21de5..494e549 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java @@ -3,7 +3,11 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.enterprise.domain.FaultType; import org.apache.ibatis.annotations.Mapper; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.17 + * @Description FaultTypeMapper:故障类型持久层 + */ @Mapper public interface FaultTypeMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java index 7630bca..72e8cec 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.enterprise.domain.FaultrRule; import org.apache.ibatis.annotations.Mapper; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.17 + * @Description FaultrRuleMapper:故障规则持久层 + */ @Mapper public interface FaultrRuleMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java index 357d382..ce8fbef 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java @@ -3,6 +3,13 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.enterprise.domain.SysCarFault; import org.apache.ibatis.annotations.Mapper; + + +/** + * @Author: chenruijia + * @Date 2024/9/28 12.17 + * @Description SysCarFaultMapper:故障管理持久层 + */ @Mapper public interface SysCarFaultMapper extends BaseMapper{ } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java index cc24bf8..2656c13 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java @@ -5,6 +5,11 @@ import com.muyu.enterprise.domain.FaultLog; import java.util.List; +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultLogService:故障日志业务层 + */ public interface FaultLogService extends IService { List faultLogList(FaultLog faultLog); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java index 491d102..8a4fe7c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.enterprise.domain.FaultMessage; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultMessageService:站内信业务层 + */ public interface FaultMessageService extends IService { List selectOne(); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java index 1d4939c..62874ec 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.enterprise.domain.FaultType; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultTypeService:故障类型业务层 + */ public interface FaultTypeService extends IService { List faultTypeList(FaultType faultType); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java index b700cb4..1d4069c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.enterprise.domain.FaultrRule; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultrRuleService:故障规则业务层 + */ public interface FaultrRuleService extends IService { List faultRuleList(FaultrRule faultrRule); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java index 35833cf..0b24801 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java @@ -4,7 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.enterprise.domain.SysCarFault; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description SysCarFaultService:故障管理业务层 + */ public interface SysCarFaultService extends IService { /** * 精确查询车辆故障 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java index 6e32e58..69c068e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java @@ -10,7 +10,11 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultLogServiceImpl:故障日志业务实现层 + */ @Service public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java index 0b3c476..4c82369 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java @@ -10,7 +10,11 @@ import com.muyu.enterprise.service.FaultMessageService; import org.springframework.stereotype.Service; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultMessageServiceImpl:站内信业务实现层 + */ @Service public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java index af5abbd..88b60d7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java @@ -9,7 +9,11 @@ import com.muyu.enterprise.service.FaultTypeService; import org.springframework.stereotype.Service; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultTypeServiceImpl:故障类型业务实现层 + */ @Service public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { @Override diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java index 8e9b1ef..942b19a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java @@ -10,7 +10,11 @@ import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; - +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description FaultrRuleServiceImpl:故障规则业务实现层 + */ @Service public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java index a4caef1..9b0708f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java @@ -11,6 +11,12 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import org.springframework.util.Assert; + +/** + * @Author: chenruijia + * @Date 2024/9/28 12.19 + * @Description SysCarFaultServiceImpl:故障管理业务实现层 + */ @Service public class SysCarFaultServiceImpl extends ServiceImpl From 40d0dde1f9dbc21bfb7ad7ae7679e026fd4e9387 Mon Sep 17 00:00:00 2001 From: chenruijia <1518542096@qq.com> Date: Sat, 28 Sep 2024 14:58:20 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83(=E6=B3=A8=E9=87=8A,swagger=E6=96=87=E6=A1=A3?= =?UTF-8?q?)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-modules/cloud-modules-fault/pom.xml | 106 --------------- .../java/com/muyu/CloudFaultApplication.java | 16 --- .../java/com/muyu/fault/common/FaultLog.java | 51 -------- .../com/muyu/fault/common/FaultMessage.java | 54 -------- .../com/muyu/fault/common/FaultNotify.java | 34 ----- .../com/muyu/fault/common/FaultSeverity.java | 43 ------ .../java/com/muyu/fault/common/FaultType.java | 35 ----- .../com/muyu/fault/common/FaultrRule.java | 39 ------ .../com/muyu/fault/common/SysCarFault.java | 74 ----------- .../fault/controller/FaultLogController.java | 74 ----------- .../controller/FaultMessageController.java | 87 ------------- .../fault/controller/FaultTypeController.java | 63 --------- .../controller/FaultrRuleController.java | 74 ----------- .../controller/SysCarFaultController.java | 122 ------------------ .../com/muyu/fault/mapper/FaultLogMapper.java | 10 -- .../muyu/fault/mapper/FaultMessageMapper.java | 7 - .../muyu/fault/mapper/FaultTypeMapper.java | 9 -- .../muyu/fault/mapper/FaultrRuleMapper.java | 10 -- .../muyu/fault/mapper/SysCarFaultMapper.java | 8 -- .../muyu/fault/service/FaultLogService.java | 14 -- .../fault/service/FaultMessageService.java | 15 --- .../muyu/fault/service/FaultTypeService.java | 10 -- .../muyu/fault/service/FaultrRuleService.java | 12 -- .../fault/service/SysCarFaultService.java | 31 ----- .../service/impl/FaultLogServiceImpl.java | 33 ----- .../service/impl/FaultMessageServiceImpl.java | 48 ------- .../service/impl/FaultTypeServiceImpl.java | 26 ---- .../service/impl/FaultrRuleServiceImpl.java | 36 ------ .../service/impl/SysCarFaultServiceImpl.java | 68 ---------- .../src/main/resources/logback/dev.xml | 74 ----------- .../src/main/resources/logback/prod.xml | 81 ------------ .../src/main/resources/logback/test.xml | 81 ------------ .../src/test/java/Text01.java | 29 ----- .../system/controller/SysEntController.java | 11 -- .../muyu/system/service/SysEntService.java | 2 - .../service/impl/SysEntServiceImpl.java | 7 - 36 files changed, 1494 deletions(-) delete mode 100644 cloud-modules/cloud-modules-fault/pom.xml delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java delete mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml delete mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml delete mode 100644 cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml delete 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 deleted file mode 100644 index ee6f8a2..0000000 --- a/cloud-modules/cloud-modules-fault/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-fault - - - 17 - 17 - UTF-8 - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - com.carrotsearch.thirdparty - simple-xml-safe - 2.7.1 - test - - - org.attoparser - attoparser - 2.0.7.RELEASE - test - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java deleted file mode 100644 index 1017e81..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/CloudFaultApplication.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu; - - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class CloudFaultApplication { - public static void main(String[] args) { - SpringApplication.run(CloudFaultApplication.class,args); - } -} 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 deleted file mode 100644 index 9953029..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.muyu.fault.common; - -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.*; -import lombok.experimental.SuperBuilder; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "fault_log",autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -public class FaultLog extends BaseEntity { - /** - * 日志ID - */ - @TableId(value = "fault_log_id", type= IdType.AUTO) - @Schema(defaultValue = "日志ID",type = "Long",description = "日志ID") - private Long faultLogId; - /** - * 故障码 - */ - @Schema(defaultValue = "故障码",type = "String",description = "故障码") - private String faultLogCodes; - /** - * 车辆VIN - */ - @Schema(defaultValue = "车辆VIN",type = "String",description = "车辆VIN") - private String faultLogVin; - /** - * 开始报警时间 - */ - @Schema(defaultValue = "开始报警时间",type = "Date",description = "开始报警时间") - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date faultLogStartTime; - /** - * 结束报警时间 - */ - @Schema(defaultValue = "结束报警时间",type = "Date",description = "结束报警时间") - @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 deleted file mode 100644 index b264b28..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java +++ /dev/null @@ -1,54 +0,0 @@ -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 org.springframework.format.annotation.DateTimeFormat; - -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 = "消息内容") - private String faultMessageContent; - /** - * 发送时间 - */ - @Schema(defaultValue = "发送时间",type = "Date",description = "发送时间") - @DateTimeFormat(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/FaultNotify.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java deleted file mode 100644 index 5ccb6bb..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.fault.common; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "fault_notify",autoResultMap = true) -public class FaultNotify { - /** - * ID - */ - @TableId(value = "fault_notify_id", type= IdType.AUTO) - @Schema(defaultValue = "ID",type = "Long",description = "ID") - private Long faultNotifyId; - /** - * 通知方 - */ - @Schema(defaultValue = "通知方",type = "String",description = "通知方") - private String faultNotifyParty; - /** - * 联系方式 - */ - @Schema(defaultValue = "联系方式",type = "String",description = "联系方式") - 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 deleted file mode 100644 index 63fa98b..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java +++ /dev/null @@ -1,43 +0,0 @@ -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.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "fault_severity",autoResultMap = true) -public class FaultSeverity extends BaseEntity { - /** - * 等级ID - */ - @TableId(value = "fault_severity_id", type= IdType.AUTO) - @Schema(defaultValue = "等级ID",type = "Long",description = "等级ID") - private Long faultSeverityId; - /** - * 等级名称 - */ - @Schema(defaultValue = "等级名称",type = "String",description = "等级名称") - private String faultSeverityName; - /** - * 优先级 - */ - @Schema(defaultValue = "优先级",type = "Integer",description = "优先级: 1_(立即) 2_(1小时内) 3_(24小时内)") - private Integer faultSeverityPriority; - /** - * 通知策略 - */ - @Schema(defaultValue = "通知策略",type = "String",description = "通知策略: 提示：邮件通知团队\n" + - "警告：邮件通知负责人\n" + - "严重：立即通知技术人员") - private String faultSeverityNotificationPolicy; -} 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 deleted file mode 100644 index 7bae718..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java +++ /dev/null @@ -1,35 +0,0 @@ -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; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "fault_type",autoResultMap = true) -public class FaultType{ - /** - * 故障类型ID - */ - @TableId(value = "fault_type_id", type= IdType.AUTO) - @Schema(defaultValue = "故障类型ID",type = "Long",description = "故障类型ID") - private Long faultTypeId; - /** - * 故障类型名称 - */ - @Schema(defaultValue = "故障类型名称",type = "String",description = "故障类型名称") - private String faultTypeName; - /** - * 故障类型描述 - */ - @Schema(defaultValue = "故障类型描述",type = "String",description = "故障类型描述") - private String faultTypeDescription; -} 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 deleted file mode 100644 index 6e649d5..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java +++ /dev/null @@ -1,39 +0,0 @@ -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.*; -import lombok.experimental.SuperBuilder; - -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@TableName(value = "fault_rule",autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -public class FaultrRule extends BaseEntity { - /** - * 故障规则ID - */ - @TableId(value = "fault_rule_id", type= IdType.AUTO) - @Schema(defaultValue = "故障规则ID",type = "Long",description = "故障规则ID") - private Long faultRuleId; - /** - * 故障规则名称 - */ - @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") - private String faultRuleName; - /** - * 故障规则参数 - */ - @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") - private String faultRuleParameter; - /** - * 故障规则描述 - */ - @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") - private String faultRuleDescription; -} 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 deleted file mode 100644 index 690c07e..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java +++ /dev/null @@ -1,74 +0,0 @@ -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 jakarta.validation.constraints.NotNull; -import lombok.*; -import lombok.experimental.SuperBuilder; -@Data -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName(value = "sys_car_fault", autoResultMap = true) -@EqualsAndHashCode(callSuper = true) -public class SysCarFault extends BaseEntity { - /** - * 自增主键 - */ - @TableId(value = "id", type= IdType.AUTO) - @Schema(defaultValue = "自增主键",type = "Long",description = "自增主键") - private Long id; - /** - * 车辆故障编码 - */ - @Schema(defaultValue = "车辆故障编码",type = "String",description = "车辆故障编码") - private String faultCode; - /** - * 车辆故障类型ID - */ - @Schema(defaultValue = "车辆故障类型ID",type = "Integer",description = "车辆故障类型ID") - private Integer faultTypeId; - /** - * 故障VIN编码 - */ - @Schema(defaultValue = "故障VIN编码",type = "String",description = "故障VIN编码") - private String carVin; - /** - * 车辆故障标签 - */ - @Schema(defaultValue = "车辆故障标签",type = "String",description = "车辆故障标签") - private String faultLabel; - /** - * 车辆故障位 - */ - @Schema(defaultValue = "车辆故障位",type = "String",description = "车辆故障位") - private String faultBit; - /** - * 车辆故障值 - */ - @Schema(defaultValue = "车辆故障值",type = "String",description = "车辆故障值") - private String faultValue; - /** - * 故障级别 - */ - @Schema(defaultValue = "故障级别",type = "String",description = "故障级别") - private String faultWarn; - /** - * 报警状态（Y.是，N.否） - */ - @Schema(defaultValue = "报警状态",type = "String",description = "报警状态") - private String warnStatus; - /** - * 故障描述信息 - */ - @Schema(defaultValue = "故障描述信息",type = "String",description = "故障描述信息") - private String faultDesc; - /** - * 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) - */ - @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 deleted file mode 100644 index 79e79a4..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.common.FaultLog; -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.*; - -import java.util.Arrays; -import java.util.List; - -@RestController -@RequestMapping("/log") -@Tag(name = "故障日志",description = "对故障记录日志") -public class FaultLogController{ - @Autowired - private FaultLogService faultLogService; - - /** - * 查询车辆故障日志列表 - */ - @RequestMapping(value = "/faultLogList", method = RequestMethod.GET) - public Result> faultLogList(FaultLog faultLog){ - List list = faultLogService.faultLogList(faultLog); - return Result.success(list); - } - - /** - * 添加车辆故障日志 - * @param faultLog - * @return - */ - @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 deleted file mode 100644 index 35bb9fa..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.muyu.fault.controller; - -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.FaultMessageService; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/message") -@Tag(name = "站内信的管理",description = "对站内信息的处理与查看") -public class FaultMessageController { - @Autowired - private FaultMessageService faultMessageService; - - /** - * 站内信列表 - * @return - */ - @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) - public Result> faultMessageList( FaultMessage faultMessage){ - return Result.success(faultMessageService.faultMessageList(faultMessage)); - } - - /** - * 添加消息 - * @param faultMessage - * @return - */ - @RequestMapping(value = "/insertMessage",method = RequestMethod.POST) - public Result insertMessage(@RequestBody FaultMessage faultMessage){ - String username = SecurityUtils.getUsername(); - //消息发送人 - faultMessage.setFaultMessageSendName(username); - return Result.success(faultMessageService.save(faultMessage)); - } - - /** - * 查询未读状态(faultMessageState==1)信息 - * @return - */ - @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 = "/updateTwo/{faultMessageId}",method = RequestMethod.POST) - public Result updateTwo(@PathVariable(name = "faultMessageId") Long faultMessageId){ - LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); - updateWrapper.set(FaultMessage::getFaultMessageState,2); - updateWrapper.eq(FaultMessage::getFaultMessageId,faultMessageId); - faultMessageService.update(updateWrapper); - return Result.success(faultMessageId,"消息已读"); - } - - /** - * 删除消息 - * @param faultMessageId - * @return - */ - @RequestMapping(value = "/deleteMessageId/{faultMessageId}",method = RequestMethod.POST) - 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/FaultTypeController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java deleted file mode 100644 index 342e984..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java +++ /dev/null @@ -1,63 +0,0 @@ -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; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -@RestController -@RequestMapping("/type") -@Tag(name = "故障类型",description = "对故障类型的定义") -public class FaultTypeController { - @Autowired - private FaultTypeService faultTypeService; - - /** - * 故障类型表 - * @return - */ - @RequestMapping(value = "faultTypeList",method = RequestMethod.GET) - public Result> faultTypeList(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 updateype(@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/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java deleted file mode 100644 index 176d8c1..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.common.FaultrRule; -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.*; - -import java.util.Arrays; -import java.util.List; - -@RestController -@RequestMapping("/rule") -@Tag(name = "故障的规则",description = "对故障数据规则的判断") -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); - } - - /** - * 添加车辆规则 - * @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/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java deleted file mode 100644 index a7ee151..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ /dev/null @@ -1,122 +0,0 @@ -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.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.util.Arrays; -import java.util.List; -import java.util.Random; - -@RestController -@RequestMapping("/faultInfo") -@Tag(name = "故障管理",description = "故障的管理与查看") -public class SysCarFaultController extends BaseController -{ - @Resource - private SysCarFaultService sysCarFaultService; - @Autowired - private FaultLogService faultLogService; - - /** - * 查询车辆故障列表 - */ - @RequestMapping(value = "/list", method = RequestMethod.GET) - public Result> list(SysCarFault sysCarFault) - { - List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); - return success(list); - } - - /** - * 导出车辆故障列表 - */ - @RequestMapping(value = "export",method = RequestMethod.POST) - public void export(HttpServletResponse response, SysCarFault sysCarFault) - { - List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); - ExcelUtil util = new ExcelUtil(SysCarFault.class); - util.exportExcel(response, list, "车辆故障数据"); - } - - /** - * 获取车辆故障详细信息 - */ - @RequestMapping(value = "/getInfo/{id}",method = RequestMethod.GET) - public Result> getInfo(@PathVariable("id") Long id) - { - return success(sysCarFaultService.selectSysCarFaultById(id)); - } - - /** - * 新增车辆故障 - */ - @RequestMapping(value = "add",method = RequestMethod.POST) - public Result add( - @Validated @RequestBody SysCarFault sysCarFault) - { - 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); // 输出随机码 - //赋值 - 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); - faultLogService.save(faultLog); - if (sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("新增 车辆故障 '" + sysCarFault + "'失败，车辆故障已存在"); - } - return toAjax(sysCarFaultService.save(sysCarFault)); - } - - /** - * 修改车辆故障 - */ - @RequestMapping(value = "edit",method = RequestMethod.PUT) - public Result edit( - @Validated @RequestBody SysCarFault sysCarFault) - { - if (!sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("修改 车辆故障 '" + sysCarFault + "'失败，车辆故障不存在"); - } - sysCarFault.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(sysCarFaultService.updateById(sysCarFault)); - } - - /** - * 删除车辆故障 - */ - @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) - public Result remove(@PathVariable("ids") Long[] ids) - { - sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java deleted file mode 100644 index 5e9fc19..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.muyu.fault.mapper; - - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.common.FaultLog; -import org.apache.ibatis.annotations.Mapper; - -@Mapper -public interface FaultLogMapper extends BaseMapper { -} 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 deleted file mode 100644 index 73a3930..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java +++ /dev/null @@ -1,7 +0,0 @@ -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/FaultTypeMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java deleted file mode 100644 index 5265201..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -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/mapper/FaultrRuleMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java deleted file mode 100644 index 3fd2169..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java +++ /dev/null @@ -1,10 +0,0 @@ -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/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java deleted file mode 100644 index 92ece6a..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.common.SysCarFault; -import org.apache.ibatis.annotations.Mapper; -@Mapper -public interface SysCarFaultMapper extends BaseMapper{ -} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java deleted file mode 100644 index 2af9a14..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.FaultLog; - -import java.util.List; - -public interface FaultLogService extends IService { - List faultLogList(FaultLog faultLog); - - - FaultLog byidId(Long faultLogId); - -} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java deleted file mode 100644 index 89f6b81..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.FaultMessage; - -import java.util.List; - -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/FaultTypeService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java deleted file mode 100644 index e4e6037..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java +++ /dev/null @@ -1,10 +0,0 @@ -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/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java deleted file mode 100644 index 3899aa7..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.muyu.fault.service; - -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); - - FaultrRule byidRuleId(Long faultRuleId); -} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java deleted file mode 100644 index 9afe833..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.muyu.fault.service; - -import java.util.List; -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.SysCarFault; - -public interface SysCarFaultService extends IService { - /** - * 精确查询车辆故障 - * - * @param id 车辆故障主键 - * @return 车辆故障 - */ - public SysCarFault selectSysCarFaultById(Long id); - - /** - * 查询车辆故障列表 - * - * @param sysCarFault 车辆故障 - * @return 车辆故障集合 - */ - public List selectSysCarFaultList(SysCarFault sysCarFault); - - /** - * 判断 车辆故障 id是否唯一 - * @param sysCarFault 车辆故障 - * @return 结果 - */ - Boolean checkIdUnique(SysCarFault sysCarFault); - -} 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 deleted file mode 100644 index 3387ba9..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ /dev/null @@ -1,33 +0,0 @@ -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.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 { - @Override - 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/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java deleted file mode 100644 index bf697a5..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ /dev/null @@ -1,48 +0,0 @@ -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 com.muyu.fault.service.FaultMessageService; -import org.springframework.stereotype.Service; - -import java.util.List; - -@Service -public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService { - - @Override - public List selectOne() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - //查询消息状态为1的未读数据 - queryWrapper.eq(FaultMessage::getFaultMessageState, 1); - return this.list(queryWrapper); - } - - @Override - public List selectTwo() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - //查询消息状态为2的已读数据 - queryWrapper.eq(FaultMessage::getFaultMessageState, 2); - return this.list(queryWrapper); - } - - @Override - public List faultMessageList(FaultMessage faultMessage) { - String username = SecurityUtils.getUsername(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - 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/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java deleted file mode 100644 index d316e3c..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java +++ /dev/null @@ -1,26 +0,0 @@ -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/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java deleted file mode 100644 index 5f55d1a..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java +++ /dev/null @@ -1,36 +0,0 @@ -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.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 { - - @Override - public List 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); - } - - @Override - public FaultrRule byidRuleId(Long faultRuleId) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(faultRuleId, "规则ID不可为空"); - queryWrapper.eq(FaultrRule::getFaultRuleId, faultRuleId); - return this.getOne(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 deleted file mode 100644 index a3ba13f..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java +++ /dev/null @@ -1,68 +0,0 @@ -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; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.util.Assert; - -@Service -public class SysCarFaultServiceImpl - extends ServiceImpl - implements SysCarFaultService { - - /** - * 精确查询车辆故障 - * - * @param id 车辆故障主键 - * @return 车辆故障 - */ - @Override - public SysCarFault selectSysCarFaultById(Long id) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(SysCarFault::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询车辆故障列表 - * - * @param sysCarFault 车辆故障 - * @return 车辆故障 - */ - @Override - public List selectSysCarFaultList(SysCarFault sysCarFault) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(sysCarFault.getFaultTypeId())), - SysCarFault::getFaultTypeId, sysCarFault.getFaultTypeId()); - queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getState()), - SysCarFault::getState, sysCarFault.getState()); - queryWrapper.like(StringUtils.isNotEmpty(sysCarFault.getCarVin()), - SysCarFault::getCarVin, sysCarFault.getCarVin()); - queryWrapper.eq(StringUtils.isNotEmpty(sysCarFault.getFaultWarn()), - SysCarFault::getFaultWarn, sysCarFault.getFaultWarn()); - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param sysCarFault 车辆故障 - * @return 车辆故障 - */ - @Override - public Boolean checkIdUnique(SysCarFault sysCarFault) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarFault::getId, sysCarFault.getId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml deleted file mode 100644 index d1b5629..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml deleted file mode 100644 index 76a0d8f..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml deleted file mode 100644 index 2cd69e4..0000000 --- a/cloud-modules/cloud-modules-fault/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-fault/src/test/java/Text01.java b/cloud-modules/cloud-modules-fault/src/test/java/Text01.java deleted file mode 100644 index 921a9e8..0000000 --- a/cloud-modules/cloud-modules-fault/src/test/java/Text01.java +++ /dev/null @@ -1,29 +0,0 @@ -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); - } -} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java index f04083d..5fc4492 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java @@ -112,15 +112,4 @@ public class SysEntController extends BaseController { sysEntService.removeById(entId); return Result.success(null,Constants.SUCCESS_MESSAGE); } - - - /** - * 查询状态为待审核的企业 - * @return - */ - @RequestMapping(value = "/selectOne",method = RequestMethod.POST) - @Operation(summary = "查询状态为待审核的企业",description = "根据企业状态查询待审核的企业") - public Result> selectOne(){ - return Result.success(sysEntService.selectOne()); - } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java index f305258..321b6b8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java @@ -20,6 +20,4 @@ public interface SysEntService extends IService { * @return 返回结果 */ public List selectList(EntListReq entListReq); - - List selectOne(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java index 98c5a93..a014b52 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java @@ -64,11 +64,4 @@ public class SysEntServiceImpl extends ServiceImpl impleme .map(EntResp::entBuild) .toList(); } - - @Override - public List selectOne() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(EntResp::getEntStatus,0); - return this.list((IPage) queryWrapper); - } } From 97ab01bd2ac152432766568716b9bc1d108e1f2d Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sat, 28 Sep 2024 15:28:08 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83(=E6=B3=A8=E9=87=8A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/enterprise/domain/FaultLog.java | 1 + .../src/main/java/com/muyu/enterprise/domain/FaultMessage.java | 1 + .../src/main/java/com/muyu/enterprise/domain/FaultSeverity.java | 1 + .../src/main/java/com/muyu/enterprise/domain/FaultType.java | 1 + .../src/main/java/com/muyu/enterprise/domain/FaultrRule.java | 1 + .../src/main/java/com/muyu/enterprise/domain/SysCarFault.java | 1 + .../src/main/java/com/muyu/enterprise/domain/Template.java | 1 + .../src/main/java/com/muyu/enterprise/domain/TestUser.java | 1 + .../java/com/muyu/enterprise/controller/FaultLogController.java | 1 + .../com/muyu/enterprise/controller/FaultMessageController.java | 1 + .../java/com/muyu/enterprise/controller/FaultTypeController.java | 1 + .../com/muyu/enterprise/controller/FaultrRuleController.java | 1 + .../com/muyu/enterprise/controller/SysCarFaultController.java | 1 + .../src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java | 1 + .../main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java | 1 + .../main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java | 1 + .../main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java | 1 + .../java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java | 1 + .../main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java | 1 + .../main/java/com/muyu/enterprise/service/FaultLogService.java | 1 + .../java/com/muyu/enterprise/service/FaultMessageService.java | 1 + .../main/java/com/muyu/enterprise/service/FaultTypeService.java | 1 + .../main/java/com/muyu/enterprise/service/FaultrRuleService.java | 1 + .../java/com/muyu/enterprise/service/SysCarCompanyService.java | 1 + .../java/com/muyu/enterprise/service/SysCarFaultService.java | 1 + .../src/main/java/com/muyu/enterprise/service/SysCarService.java | 1 + .../main/java/com/muyu/enterprise/service/TestUserService.java | 1 + .../com/muyu/enterprise/service/impl/FaultLogServiceImpl.java | 1 + .../muyu/enterprise/service/impl/FaultMessageServiceImpl.java | 1 + .../com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java | 1 + .../com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java | 1 + .../muyu/enterprise/service/impl/SysCarCompanyServiceImpl.java | 1 + .../com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java | 1 + .../java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java | 1 + .../com/muyu/enterprise/service/impl/TemplateServiceImpl.java | 1 + .../com/muyu/enterprise/service/impl/TestUserServiceImpl.java | 1 + .../src/main/java/com/muyu/system/domain/req/EntAddReq.java | 1 + .../src/main/java/com/muyu/system/domain/req/EntListReq.java | 1 + .../src/main/java/com/muyu/system/domain/req/EntUpdateReq.java | 1 + .../src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java | 1 + .../src/main/java/com/muyu/system/domain/resp/EntResp.java | 1 + .../src/main/java/com/muyu/system/domain/resp/ProfileResp.java | 1 + .../main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java | 1 + .../java/com/muyu/system/domain/resp/UserDetailInfoResp.java | 1 + .../src/main/java/com/muyu/system/domain/resp/UserInfoResp.java | 1 + .../src/main/java/com/muyu/system/service/SysConfigService.java | 1 + .../src/main/java/com/muyu/system/service/SysEntService.java | 1 + .../java/com/muyu/system/service/impl/SysEntServiceImpl.java | 1 + 48 files changed, 48 insertions(+) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java index 71ffb89..756d1a6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java @@ -14,6 +14,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** + * 故障日志 * @Author: chenruijia * @Date 2024/9/28 12.23 * @Description FaultLog:故障日志 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java index 825a5df..cee12ed 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java @@ -13,6 +13,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** + * 站内信 * @Author: chenruijia * @Date 2024/9/28 12.23 * @Description FaultMessage:站内信 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java index 149f6d5..cd43592 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java @@ -10,6 +10,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** + * 故障等级 * @Author: chenruijia * @Date 2024/9/28 12.23 * @Description FaultSeverity:故障等级 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java index be8c5f0..67fc8ad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** + * 故障类型 * @Author: chenruijia * @Date 2024/9/28 12.23 * @Description FaultType:故障类型 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java index b49c706..4a60df3 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java @@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import lombok.experimental.SuperBuilder; /** + * 故障规则 * @Author: chenruijia * @Date 2024/9/28 12.23 * @Description FaultrRule:故障规则 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java index af17480..4d45a75 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java @@ -12,6 +12,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** + * 故障表 * @Author: chenruijia * @Date 2024/9/28 12.23 * @Description SysCarFault:故障表 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Template.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Template.java index 0665578..0e5c9ea 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Template.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Template.java @@ -7,6 +7,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** + * 描述 * @ClassName Template * @Description 描述 * @Author YiBo.Liu diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/TestUser.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/TestUser.java index 9f420e0..138c6fa 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/TestUser.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/TestUser.java @@ -9,6 +9,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** + * 测试用户实体类 * @Author: zi run * @Date 2024/9/21 0:07 * @Description 测试用户实体类 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java index ea58d5d..48fea67 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java @@ -12,6 +12,7 @@ import java.util.Arrays; import java.util.List; /** + * 故障日志控制层 * @Author: chenruijia * @Date 2024/9/28 11:58 * @Description FaultLogController:故障日志控制层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java index c22aed5..c7539ab 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** + * 站内信控制层 * @Author: chenruijia * @Date 2024/9/28 11:58 * @Description FaultMessageController:站内信控制层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java index 8878297..f8c78e9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java @@ -10,6 +10,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** + * 故障类型控制层 * @Author: chenruijia * @Date 2024/9/28 11:58 * @Description FaultTypeController:故障类型控制层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java index 9a539c6..a3958f1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java @@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; /** + * 故障的规则控制层 * @Author: chenruijia * @Date 2024/9/28 11:58 * @Description FaultrRuleController:故障的规则控制层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java index 4534256..2506bd4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java @@ -21,6 +21,7 @@ import java.util.List; import java.util.Random; /** + * 故障管理控制层 * @Author: chenruijia * @Date 2024/9/28 11:58 * @Description SysCarFaultController:故障管理控制层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java index e7970f5..ad65839 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.enterprise.domain.FaultLog; import org.apache.ibatis.annotations.Mapper; /** + * 故障日志持久层 * @Author: chenruijia * @Date 2024/9/28 12.17 * @Description FaultLogMapper:故障日志持久层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java index 5e42fac..b570c5a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java @@ -5,6 +5,7 @@ import com.muyu.enterprise.domain.FaultMessage; import org.apache.ibatis.annotations.Mapper; /** + * 站内信持久层 * @Author: chenruijia * @Date 2024/9/28 12.17 * @Description FaultMessageMapper:站内信持久层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java index 494e549..d5e6366 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.enterprise.domain.FaultType; import org.apache.ibatis.annotations.Mapper; /** + * 故障类型持久层 * @Author: chenruijia * @Date 2024/9/28 12.17 * @Description FaultTypeMapper:故障类型持久层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java index 72e8cec..ea21d00 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java @@ -5,6 +5,7 @@ import com.muyu.enterprise.domain.FaultrRule; import org.apache.ibatis.annotations.Mapper; /** + * 故障规则持久层 * @Author: chenruijia * @Date 2024/9/28 12.17 * @Description FaultrRuleMapper:故障规则持久层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java index b2ec077..547f9a0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java @@ -5,6 +5,7 @@ import com.muyu.enterprise.domain.CarCompany; /** + * 配置mybatis配置 * @author zmw * @description: 配置mybatis配置 * @Date 2023-11-13 上午 10:05 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java index ce8fbef..c1cc3ea 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java @@ -6,6 +6,7 @@ import org.apache.ibatis.annotations.Mapper; /** + * 故障管理持久层 * @Author: chenruijia * @Date 2024/9/28 12.17 * @Description SysCarFaultMapper:故障管理持久层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java index 2656c13..2ba7cf8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java @@ -6,6 +6,7 @@ import com.muyu.enterprise.domain.FaultLog; import java.util.List; /** + * 故障日志业务层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultLogService:故障日志业务层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java index 8a4fe7c..f012de9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java @@ -5,6 +5,7 @@ import com.muyu.enterprise.domain.FaultMessage; import java.util.List; /** + * 站内信业务层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultMessageService:站内信业务层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java index 62874ec..c5f88fd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java @@ -5,6 +5,7 @@ import com.muyu.enterprise.domain.FaultType; import java.util.List; /** + * 故障类型业务层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultTypeService:故障类型业务层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java index 1d4069c..4851358 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java @@ -5,6 +5,7 @@ import com.muyu.enterprise.domain.FaultrRule; import java.util.List; /** + * 故障规则业务层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultrRuleService:故障规则业务层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarCompanyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarCompanyService.java index bd2e3a5..486504d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarCompanyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarCompanyService.java @@ -3,6 +3,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.enterprise.domain.CarCompany; /** + * 配置plus业务层 * @author zmw * @description: 配置plus业务层 * @Date 2023-11-13 上午 10:06 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java index 0b24801..295082f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java @@ -5,6 +5,7 @@ import com.muyu.enterprise.domain.SysCarFault; import java.util.List; /** + * 故障管理业务层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description SysCarFaultService:故障管理业务层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java index 9b0bed9..7c0ffd0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java @@ -6,6 +6,7 @@ import com.muyu.enterprise.domain.vo.CarVO; import java.util.List; /** + * 配置plus业务层 * @author zmw * @description: 配置plus业务层 * @Date 2023-11-13 上午 10:06 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/TestUserService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/TestUserService.java index fb49bb7..ccb1189 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/TestUserService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/TestUserService.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.enterprise.domain.TestUser; /** + * 测试用户也业务层 * @Author: zi run * @Date 2024/9/21 0:10 * @Description 测试用户也业务层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java index 69c068e..100254a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.util.Assert; import java.util.List; /** + * 故障日志业务实现层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultLogServiceImpl:故障日志业务实现层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java index 4c82369..1031280 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultMessageServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** + * 站内信业务实现层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultMessageServiceImpl:站内信业务实现层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java index 88b60d7..b485eb0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultTypeServiceImpl.java @@ -10,6 +10,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** + * 故障类型业务实现层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultTypeServiceImpl:故障类型业务实现层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java index 942b19a..25a56b8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultrRuleServiceImpl.java @@ -11,6 +11,7 @@ import org.springframework.util.Assert; import java.util.List; /** + * 故障规则业务实现层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description FaultrRuleServiceImpl:故障规则业务实现层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarCompanyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarCompanyServiceImpl.java index 8e04629..3f4b389 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarCompanyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarCompanyServiceImpl.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** + * 配置plus业务实现层 * @author zmw * @description: 配置plus业务实现层 * @Date 2023-11-13 上午 10:06 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java index 9b0708f..e752002 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarFaultServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.util.Assert; /** + * 故障管理业务实现层 * @Author: chenruijia * @Date 2024/9/28 12.19 * @Description SysCarFaultServiceImpl:故障管理业务实现层 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java index ce22c99..7ac9f4e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** + * 配置plus业务实现层 * @author zmw * @description: 配置plus业务实现层 * @Date 2023-11-13 上午 10:06 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TemplateServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TemplateServiceImpl.java index a8f2857..0bede33 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TemplateServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TemplateServiceImpl.java @@ -8,6 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** + * 描述 * @ClassName TemplateServiceImpl * @Description 描述 * @Author YiBo.Liu diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TestUserServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TestUserServiceImpl.java index 52000ce..5ccb19b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TestUserServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/TestUserServiceImpl.java @@ -8,6 +8,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; /** + * 测试用户业务实现层 * @Author: zi run * @Date 2024/9/21 0:10 * @Description 测试用户业务实现层 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntAddReq.java index f60cbb0..952f8ca 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntAddReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntAddReq.java @@ -11,6 +11,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** + * 企业添加请求对象 * @Author: zi run * @Date 2024/9/26 11:51 * @Description 企业添加请求对象 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntListReq.java index f281352..32e97e5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntListReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntListReq.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** + * 企业信息列表请求对象 * @Author: zi run * @Date 2024/9/26 0:49 * @Description 企业信息列表请求对象 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntUpdateReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntUpdateReq.java index 52590b5..0f0b198 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntUpdateReq.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/EntUpdateReq.java @@ -10,6 +10,7 @@ import lombok.NoArgsConstructor; import java.util.function.Supplier; /** + * 企业修改请求对象 * @Author: zi run * @Date 2024/9/26 14:34 * @Description 企业修改请求对象 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java index cfb79ea..48a3664 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/DeptTreeResp.java @@ -10,6 +10,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** + * 部门树返回结果集 * @author zmw * @description: 部门树返回结果集 * @Date 2023-6-19 下午 02:52 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java index 350a414..5597b4d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/EntResp.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** + * 企业管理响应对象 * @Author: zi run * @Date 2024/9/26 0:42 * @Description 企业管理响应对象 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java index ac4939b..6ad0372 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/ProfileResp.java @@ -7,6 +7,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** + * 个人信息模型对象 * @author zmw * @description: 个人信息模型对象 * @Date 2023-6-19 下午 02:05 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java index a61b8b3..8c24b0b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/RoleMenuTreeResp.java @@ -9,6 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** + * 角色返回菜单树 * @author zmw * @description: 角色返回菜单树 * @Date 2023-6-19 下午 02:40 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java index 0778a0d..b9e3c2d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserDetailInfoResp.java @@ -10,6 +10,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** + * 用户详细信息 * @author zmw * @description: 用户详细信息 * @Date 2023-6-19 下午 02:45 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java index 1c7f99f..617a814 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/UserInfoResp.java @@ -9,6 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.Set; /** + * 用户信息结果集 * @author zmw * @description: 用户信息结果集 * @Date 2023-6-19 下午 02:42 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index 8da2c4c..dde7c7d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -6,6 +6,7 @@ import com.muyu.system.domain.SysConfig; import java.util.List; /** + * 配置plus业务层 * @author zmw * @description: 配置plus业务层 * @Date 2023-11-13 上午 10:06 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java index 321b6b8..cee3c65 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysEntService.java @@ -8,6 +8,7 @@ import com.muyu.system.domain.resp.EntResp; import java.util.List; /** + * 企业管理业务层 * @Author: zi run * @Date 2024/9/26 0:14 * @Description 企业管理业务层 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java index a014b52..acc38f8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysEntServiceImpl.java @@ -15,6 +15,7 @@ import org.springframework.stereotype.Service; import java.util.List; /** + * 企业管理业务实现层 * @Author: zi run * @Date 2024/9/26 0:15 * @Description 企业管理业务实现层 From af712e39373bc974aec448235d1f01d5cd78cbe3 Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sat, 28 Sep 2024 15:33:46 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83(=E6=B3=A8=E9=87=8A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/muyu/common/system/domain/SysEnt.java | 1 + .../src/main/java/com/muyu/enterprise/domain/CarCompany.java | 1 + .../src/main/java/com/muyu/enterprise/domain/FaultLog.java | 2 ++ .../src/main/java/com/muyu/enterprise/domain/FaultMessage.java | 2 ++ .../src/main/java/com/muyu/enterprise/domain/FaultSeverity.java | 2 ++ .../src/main/java/com/muyu/enterprise/domain/FaultType.java | 2 ++ .../src/main/java/com/muyu/enterprise/domain/FaultrRule.java | 2 ++ .../src/main/java/com/muyu/enterprise/domain/SysCarFault.java | 2 ++ .../src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java | 1 + 9 files changed, 15 insertions(+) diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java index cdead09..38a359f 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java @@ -11,6 +11,7 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** + * 企业表 * @Author: zi run * @Date 2024/9/25 22:38 * @Description 企业表 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java index 0acce79..f02909d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java @@ -3,6 +3,7 @@ package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java index 756d1a6..f9ca93d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java @@ -5,6 +5,7 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -25,6 +26,7 @@ import java.util.Date; @NoArgsConstructor @TableName(value = "fault_log",autoResultMap = true) @EqualsAndHashCode(callSuper = true) +@Tag(name = "故障日志") public class FaultLog extends BaseEntity { /** * 日志ID diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java index cee12ed..41ace35 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -23,6 +24,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @TableName(value = "fault_message",autoResultMap = true) +@Tag(name = "站内信") public class FaultMessage { /** * 站内信ID diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java index cd43592..31b67ab 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java @@ -5,6 +5,7 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -20,6 +21,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @TableName(value = "fault_severity",autoResultMap = true) +@Tag(name = "故障等级") public class FaultSeverity extends BaseEntity { /** * 等级ID diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java index 67fc8ad..56f702f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -19,6 +20,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @TableName(value = "fault_type",autoResultMap = true) +@Tag(name = "故障类型") public class FaultType{ /** * 故障类型ID diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java index 4a60df3..8d0cb89 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java @@ -5,6 +5,7 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; import lombok.*; import lombok.experimental.SuperBuilder; /** @@ -19,6 +20,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @TableName(value = "fault_rule",autoResultMap = true) @EqualsAndHashCode(callSuper = true) +@Tag(name = "故障规则") public class FaultrRule extends BaseEntity { /** * 故障规则ID diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java index 4d45a75..25a3957 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java @@ -5,6 +5,7 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -23,6 +24,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @TableName(value = "sys_car_fault", autoResultMap = true) @EqualsAndHashCode(callSuper = true) +@Tag(name = "故障表") public class SysCarFault extends BaseEntity { /** * 自增主键 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java index 9c47e87..0e7a04b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/resp/AuthRoleResp.java @@ -11,6 +11,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** + * 授权角色返回结果集 * @author zmw * @description: 授权角色返回结果集 * @Date 2023-6-19 下午 02:50 From 2d25fd9a04a4cebeeb9f89ed00c8e42cece42297 Mon Sep 17 00:00:00 2001 From: crj <1518542096@qq.com> Date: Sat, 28 Sep 2024 16:36:58 +0800 Subject: [PATCH 6/6] =?UTF-8?q?feax:()=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E8=A7=84=E8=8C=83(=E6=B3=A8=E9=87=8A)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/muyu/enterprise/domain/CarCompany.java | 8 +++++++- .../main/java/com/muyu/enterprise/domain/CarMessage.java | 8 ++++---- .../java/com/muyu/enterprise/domain/CarMessageType.java | 7 ++++++- .../main/java/com/muyu/enterprise/domain/CarTemplate.java | 6 ++++++ .../src/main/java/com/muyu/enterprise/domain/CarType.java | 1 + .../com/muyu/enterprise/controller/CarTypeController.java | 1 + .../muyu/enterprise/controller/FaultLogController.java | 2 +- .../enterprise/controller/FaultMessageController.java | 2 +- .../java/com/muyu/system/controller/SysEntController.java | 3 ++- 9 files changed, 29 insertions(+), 9 deletions(-) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java index f02909d..91a0bdc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java @@ -8,12 +8,18 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - +/** + * 企业表 + * @Author: chenruijia + * @Date 2024/9/28 16.06 + * @Description CarCompany:企业表 + */ @Data @NoArgsConstructor @AllArgsConstructor @Builder @TableName(value = "t_company") +@Tag(name = "") public class CarCompany { /** * 企业表 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java index aa1737e..82af336 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java @@ -8,10 +8,10 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @ClassName CarMessage - * @Description 描述 - * @Author YiBo.Liu - * @Date 2024/9/22 22:24 + * 报文表 + * @Author: chenruijia + * @Date 2024/9/28 16.06 + * @Description CarMessage:报文表 */ @Data @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java index 5674719..8a32b5c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java @@ -7,7 +7,12 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; - +/** + * 报文类型表 + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description CarMessageType:报文类型表 + */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java index 8eeeb36..420a2bf 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java @@ -8,6 +8,12 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +/** + * 故障规则 + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultrRule:故障规则 + */ @Data @NoArgsConstructor @AllArgsConstructor diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java index faf4a53..9e75010 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java @@ -8,6 +8,7 @@ import lombok.Data; import lombok.NoArgsConstructor; /** + * 车辆类型表 * @ClassName CarType * @Description 描述 * @Author YiBo.Liu diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java index 51ab78d..afd1ec5 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java @@ -9,6 +9,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** + * 车辆类型控制层 * @ClassName CarController * @Description 车辆类型Controller层 * @Author YiBo.Liu diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java index 48fea67..045e489 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java @@ -13,7 +13,7 @@ import java.util.List; /** * 故障日志控制层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 11:58 * @Description FaultLogController:故障日志控制层 */ diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java index c7539ab..896bf73 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java @@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** * 站内信控制层 - * @Author: chenruijia + * @author chenruijia * @Date 2024/9/28 11:58 * @Description FaultMessageController:站内信控制层 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java index 5fc4492..0b7ad98 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysEntController.java @@ -20,7 +20,8 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author: zi run + * 企业管理控制层 + * @Author: chenruijia * @Date 2024/9/26 0:21 * @Description 企业管理控制层 */