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 8a6808f..7e2c1fe 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 企业表 @@ -53,4 +54,8 @@ public class SysEnt extends BaseEntity { * 企业编码 */ private String entCode; + /** + * 企业状态 + */ + private Integer entStatus; } 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..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 @@ -3,16 +3,23 @@ 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; 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-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..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 @@ -1,24 +1,32 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; +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 @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 704cf9f..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 @@ -3,8 +3,8 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -13,11 +13,18 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; +/** + * 站内信 + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultMessage:站内信 + */ @Data @SuperBuilder @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/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..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,17 +5,23 @@ 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.Builder; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; - +/** + * 故障等级 + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultSeverity:故障等级 + */ @Data @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 ede5526..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 @@ -3,18 +3,24 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; 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 @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 ff73541..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,15 +5,22 @@ 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; - +/** + * 故障规则 + * @Author: chenruijia + * @Date 2024/9/28 12.23 + * @Description FaultrRule:故障规则 + */ @Data @SuperBuilder @AllArgsConstructor @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 1c4c0ce..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,15 +5,26 @@ 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 io.swagger.v3.oas.annotations.tags.Tag; +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 @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-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/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 2c9496d..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 @@ -11,6 +11,12 @@ 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..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 @@ -10,7 +10,12 @@ 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 4eb6db0..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 @@ -9,6 +9,12 @@ 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 = "对故障类型的定义") @@ -58,4 +64,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/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java index 99e7a8d..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 @@ -10,7 +10,12 @@ 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..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 @@ -20,6 +20,12 @@ 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..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 @@ -4,7 +4,12 @@ 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..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 @@ -2,6 +2,14 @@ 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..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 @@ -3,7 +3,12 @@ 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..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 @@ -4,7 +4,12 @@ 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/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 357d382..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 @@ -3,6 +3,14 @@ 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..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 @@ -5,6 +5,12 @@ 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..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 @@ -4,7 +4,12 @@ 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 2a1c04b..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 @@ -4,7 +4,14 @@ 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); + + List typeDatailOne(Long faultTypeId); } 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..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 @@ -4,7 +4,12 @@ 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/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 35833cf..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 @@ -4,7 +4,12 @@ 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/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 6e32e58..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 @@ -10,7 +10,12 @@ 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..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 @@ -10,7 +10,12 @@ 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 ae2f31e..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 @@ -9,7 +9,12 @@ 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 @@ -23,4 +28,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-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..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 @@ -10,7 +10,12 @@ 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/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 a4caef1..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 @@ -11,6 +11,13 @@ 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 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-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-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..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 @@ -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; @@ -19,14 +20,15 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author: zi run + * 企业管理控制层 + * @Author: chenruijia * @Date 2024/9/26 0:21 * @Description 企业管理控制层 */ @RestController @RequiredArgsConstructor @RequestMapping(value = "/ent") -@Tag(name = "SysEntController", description = "企业管理") +@Tag(name = "SysEntController",description = "企业管理") public class SysEntController extends BaseController { /** @@ -41,7 +43,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 +93,24 @@ 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); } } 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 213721d..36d532c 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 2c05f4b..ea241b1 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 5efa4b6..f28ab4d 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/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 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 64f36cd..eb8ab22 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 企业管理响应对象 @@ -54,6 +55,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 +74,7 @@ public class EntResp { .phoneNumber(sysEnt.getPhone()) .email(sysEnt.getEmail()) .entCode(sysEnt.getEntCode()) + .entStatus(sysEnt.getEntStatus()) .build(); } } 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 企业管理业务层