diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java index 3318518..79e79a4 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java @@ -3,7 +3,8 @@ package com.muyu.fault.controller; import com.muyu.common.core.domain.Result; import com.muyu.fault.common.FaultLog; -import com.muyu.fault.service.impl.FaultLogService; +import com.muyu.fault.service.FaultLogService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -12,6 +13,7 @@ import java.util.List; @RestController @RequestMapping("/log") +@Tag(name = "故障日志",description = "对故障记录日志") public class FaultLogController{ @Autowired private FaultLogService faultLogService; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java index f9ffde6..35bb9fa 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.common.core.domain.Result; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; -import com.muyu.fault.service.impl.FaultMessageService; +import com.muyu.fault.service.FaultMessageService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -12,6 +13,7 @@ import java.util.List; @RestController @RequestMapping("/message") +@Tag(name = "站内信的管理",description = "对站内信息的处理与查看") public class FaultMessageController { @Autowired private FaultMessageService faultMessageService; @@ -43,7 +45,7 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/selectOne",method = RequestMethod.POST) - public Result selectOne(){ + public Result> selectOne(){ List one = faultMessageService.selectOne(); return Result.success(one); } @@ -53,7 +55,7 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/selectTwo",method = RequestMethod.POST) - public Result selectTwo(){ + public Result> selectTwo(){ List one = faultMessageService.selectTwo(); return Result.success(one); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java new file mode 100644 index 0000000..0f8fcb7 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java @@ -0,0 +1,29 @@ +package com.muyu.fault.controller; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.common.core.domain.Result; +import com.muyu.fault.common.FaultType; +import com.muyu.fault.service.FaultTypeService; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/type") +@Tag(name = "故障类型",description = "对故障类型的定义") +public class FaultTypeController { + @Autowired + private FaultTypeService faultTypeService; + + /** + * 故障类型表 + * @return + */ + @RequestMapping(value = "faultTypeList",method = RequestMethod.GET) + public Result faultTypeList(){ + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return Result.success(faultTypeService.list(queryWrapper)); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java index 1a930ba..e316e3c 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -2,12 +2,9 @@ package com.muyu.fault.controller; import com.muyu.common.core.domain.Result; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.fault.common.FaultLog; -import com.muyu.fault.common.FaultMessage; import com.muyu.fault.common.FaultrRule; -import com.muyu.fault.common.SysCarFault; -import com.muyu.fault.service.impl.FaultrRuleService; +import com.muyu.fault.service.FaultrRuleService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -16,6 +13,7 @@ import java.util.List; @RestController @RequestMapping("/rule") +@Tag(name = "故障的规则",description = "对故障数据规则的判断") public class FaultrRuleController { @Autowired private FaultrRuleService faultrRuleService; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java index 0313b60..a7ee151 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java @@ -7,21 +7,22 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultLog; import com.muyu.fault.common.SysCarFault; -import com.muyu.fault.service.impl.FaultLogService; -import com.muyu.fault.service.impl.SysCarFaultService; +import com.muyu.fault.service.FaultLogService; +import com.muyu.fault.service.SysCarFaultService; +import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.time.LocalDateTime; import java.util.Arrays; import java.util.List; import java.util.Random; @RestController @RequestMapping("/faultInfo") +@Tag(name = "故障管理",description = "故障的管理与查看") public class SysCarFaultController extends BaseController { @Resource diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java new file mode 100644 index 0000000..5265201 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java @@ -0,0 +1,9 @@ +package com.muyu.fault.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.FaultType; +import org.apache.ibatis.annotations.Mapper; + +@Mapper +public interface FaultTypeMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java similarity index 88% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java index bf9f182..2af9a14 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultLog; @@ -10,4 +10,5 @@ public interface FaultLogService extends IService { FaultLog byidId(Long faultLogId); + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java similarity index 90% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java index 83d0d19..89f6b81 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultMessage; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java new file mode 100644 index 0000000..5b8d7b9 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java @@ -0,0 +1,7 @@ +package com.muyu.fault.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultType; + +public interface FaultTypeService extends IService { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java similarity index 89% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java index 9d3262a..3899aa7 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.fault.common.FaultrRule; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java similarity index 95% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultService.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java index ed175a3..9afe833 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java @@ -1,4 +1,4 @@ -package com.muyu.fault.service.impl; +package com.muyu.fault.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java index 6e56a64..3387ba9 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -5,13 +5,14 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultLog; import com.muyu.fault.mapper.FaultLogMapper; +import com.muyu.fault.service.FaultLogService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; @Service -public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService{ +public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { @Override public List faultLogList(FaultLog faultLog) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java index 252e842..bf697a5 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -6,12 +6,13 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.mapper.FaultMessageMapper; +import com.muyu.fault.service.FaultMessageService; import org.springframework.stereotype.Service; import java.util.List; @Service -public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService{ +public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService { @Override public List selectOne() { diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java new file mode 100644 index 0000000..3c871c4 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java @@ -0,0 +1,11 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultType; +import com.muyu.fault.mapper.FaultTypeMapper; +import com.muyu.fault.service.FaultTypeService; +import org.springframework.stereotype.Service; + +@Service +public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java index e923634..5f55d1a 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -3,16 +3,16 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; -import com.muyu.fault.common.FaultLog; import com.muyu.fault.common.FaultrRule; import com.muyu.fault.mapper.FaultrRuleMapper; +import com.muyu.fault.service.FaultrRuleService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; import java.util.List; @Service -public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService{ +public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService { @Override public List faultRuleList(FaultrRule faultrRule) { diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java index ead1679..c229932 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java @@ -3,6 +3,7 @@ package com.muyu.fault.service.impl; import java.util.List; import com.muyu.fault.common.SysCarFault; +import com.muyu.fault.service.SysCarFaultService; import org.springframework.stereotype.Service; import com.muyu.fault.mapper.SysCarFaultMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;