diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java index 28c4927..a045f1e 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/domain/BaseEntity.java @@ -45,7 +45,7 @@ public class BaseEntity implements Serializable { */ @TableField(fill = FieldFill.INSERT) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private String createTime; /** * 更新者 @@ -58,7 +58,7 @@ public class BaseEntity implements Serializable { */ @TableField(fill = FieldFill.UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date updateTime; + private String updateTime; /** * 备注 diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java index 4ced773..ed16379 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java @@ -4,22 +4,25 @@ import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; @Data -@Builder +@SuperBuilder @AllArgsConstructor @NoArgsConstructor @TableName(value = "fault_log",autoResultMap = true) -public class FaultLog { +@EqualsAndHashCode(callSuper = true) +public class FaultLog extends BaseEntity { /** * 日志ID */ - @TableId(value = "faultLogId", type= IdType.AUTO) + @TableId(value = "fault_log_id", type= IdType.AUTO) @Schema(defaultValue = "日志ID",type = "Long",description = "日志ID") private Long faultLogId; /** @@ -31,15 +34,17 @@ public class FaultLog { * 车辆VIN */ @Schema(defaultValue = "车辆VIN",type = "String",description = "车辆VIN") - private String faultLogVIN; + private String faultLogVin; /** * 开始报警时间 */ - @Schema(defaultValue = "开始报警时间",type = "DateTime",description = "开始报警时间") - private DateTime faultLogStartTime; + @Schema(defaultValue = "开始报警时间",type = "Date",description = "开始报警时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date faultLogStartTime; /** * 结束报警时间 */ - @Schema(defaultValue = "结束报警时间",type = "DateTime",description = "结束报警时间") - private DateTime faultLogEndTime; + @Schema(defaultValue = "结束报警时间",type = "Date",description = "结束报警时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date faultLogEndTime; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java new file mode 100644 index 0000000..5248024 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -0,0 +1,48 @@ +package com.muyu.fault.common; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +@Data +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor +@TableName(value = "fault_message",autoResultMap = true) +public class FaultMessage { + /** + * 站内信ID + */ + @TableId(value = "fault_message_id", type= IdType.AUTO) + @Schema(defaultValue = "站内信ID",type = "Long",description = "站内信ID") + private Long faultMessageId; + /** + * 消息发送人 + */ + @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") + private String faultMessageSendName; + /** + * 消息接收人 + */ + @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") + private String faultMessageRemoveName; + /** + * 发送时间 + */ + @Schema(defaultValue = "发送时间",type = "String",description = "发送时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date faultMessageSendTime; + /** + * 消息状态(1:未读,2:已读) + */ + @Schema(defaultValue = "消息状态",type = "Integer",description = "消息状态(1:未读,2:已读)") + private Integer faultMessageState; +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutNotify.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java similarity index 74% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutNotify.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java index b742eb6..5ccb6bb 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutNotify.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java @@ -13,22 +13,22 @@ import lombok.NoArgsConstructor; @Builder @AllArgsConstructor @NoArgsConstructor -@TableName(value = "falut_notify",autoResultMap = true) -public class FalutNotify { +@TableName(value = "fault_notify",autoResultMap = true) +public class FaultNotify { /** * ID */ - @TableId(value = "falutNotifyId", type= IdType.AUTO) + @TableId(value = "fault_notify_id", type= IdType.AUTO) @Schema(defaultValue = "ID",type = "Long",description = "ID") - private Long falutNotifyId; + private Long faultNotifyId; /** * 通知方 */ @Schema(defaultValue = "通知方",type = "String",description = "通知方") - private String falutNotifyParty; + private String faultNotifyParty; /** * 联系方式 */ @Schema(defaultValue = "联系方式",type = "String",description = "联系方式") - private String falutNotifyManner; + private String faultNotifyManner; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java index cdb3ba6..63fa98b 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java @@ -20,7 +20,7 @@ public class FaultSeverity extends BaseEntity { /** * 等级ID */ - @TableId(value = "id", type= IdType.AUTO) + @TableId(value = "fault_severity_id", type= IdType.AUTO) @Schema(defaultValue = "等级ID",type = "Long",description = "等级ID") private Long faultSeverityId; /** diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutType.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java similarity index 87% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutType.java rename to cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java index 2de911a..62a7433 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FalutType.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java @@ -13,12 +13,12 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName(value = "falut_type",autoResultMap = true) -public class FalutType { +@TableName(value = "fault_type",autoResultMap = true) +public class FaultType { /** * 故障类型ID */ - @TableId(value = "faultTypeId", type= IdType.AUTO) + @TableId(value = "fault_type_id", type= IdType.AUTO) @Schema(defaultValue = "故障类型ID",type = "Long",description = "故障类型ID") private Long faultTypeId; /** diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java index bc71d5a..6e649d5 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java @@ -5,32 +5,35 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; +import lombok.*; import lombok.experimental.SuperBuilder; @Data @SuperBuilder @AllArgsConstructor @NoArgsConstructor -@TableName(value = "faultr_rule",autoResultMap = true) +@TableName(value = "fault_rule",autoResultMap = true) +@EqualsAndHashCode(callSuper = true) public class FaultrRule extends BaseEntity { /** * 故障规则ID */ - @TableId(value = "faultrRuleId", type= IdType.AUTO) + @TableId(value = "fault_rule_id", type= IdType.AUTO) @Schema(defaultValue = "故障规则ID",type = "Long",description = "故障规则ID") - private Long faultrRuleId; + private Long faultRuleId; /** * 故障规则名称 */ @Schema(defaultValue = "故障规则名称",type = "String",description = "故障规则名称") - private String faultrRuleName; + private String faultRuleName; + /** + * 故障规则参数 + */ + @Schema(defaultValue = "故障规则参数",type = "String",description = "故障规则参数") + private String faultRuleParameter; /** * 故障规则描述 */ @Schema(defaultValue = "故障规则描述",type = "String",description = "故障规则描述") - private String faultrRuleDescription; + private String faultRuleDescription; } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java index c63ac97..3318518 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java @@ -5,11 +5,9 @@ import com.muyu.common.core.domain.Result; import com.muyu.fault.common.FaultLog; import com.muyu.fault.service.impl.FaultLogService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; @RestController @@ -21,9 +19,9 @@ public class FaultLogController{ /** * 查询车辆故障日志列表 */ - @RequestMapping(value = "/logList", method = RequestMethod.GET) - public Result> logList(){ - List list = faultLogService.logList(); + @RequestMapping(value = "/faultLogList", method = RequestMethod.GET) + public Result> faultLogList(FaultLog faultLog){ + List list = faultLogService.faultLogList(faultLog); return Result.success(list); } @@ -32,8 +30,43 @@ public class FaultLogController{ * @param faultLog * @return */ - @RequestMapping(value = "/addLog",method = RequestMethod.POST) - public Result addLog(@RequestBody FaultLog faultLog){ + @RequestMapping(value = "/insertLog",method = RequestMethod.POST) + public Result insertLog(@RequestBody FaultLog faultLog){ return Result.success(faultLogService.save(faultLog)); } + + /** + * 修改车辆故障日志 + * @param faultLog + * @return + */ + @RequestMapping(value = "/updateLog",method = RequestMethod.PUT) + public Result updateLog(@RequestBody FaultLog faultLog){ + return Result.success(faultLogService.updateById(faultLog)); + } + + /** + * + * 批量删除车辆故障日志 + * @param ids + * @return + */ + @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) + public Result remove(@PathVariable("ids") Long[] ids) + { + return Result.success(faultLogService.removeBatchByIds(Arrays.asList(ids))); + } + + /** + * 获取单条日志详细信息 + * @param faultLogId + * @return + */ + @RequestMapping(value = "/byidId/{faultLogId}",method = RequestMethod.GET) + public Result byidId(@PathVariable Long faultLogId){ + FaultLog byid = faultLogService.byidId(faultLogId); + return Result.success(byid); + } + + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java new file mode 100644 index 0000000..5181ede --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -0,0 +1,61 @@ +package com.muyu.fault.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.fault.common.FaultMessage; +import com.muyu.fault.service.impl.FaultMessageService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequestMapping("/message") +public class FaultMessageController { + @Autowired + private FaultMessageService faultMessageService; + + /** + * 站内信列表 + * @return + */ + @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) + public Result faultMessageList(){ + List list = faultMessageService.faultMessageList(); + return Result.success(list); + } + + /** + * 添加站内信 + * @param faultMessage + * @return + */ + @RequestMapping(value = "/insertMessage",method = RequestMethod.POST) + public Result insertMessage(@RequestBody FaultMessage faultMessage){ + //消息发送人 + faultMessage.setFaultMessageSendName(SecurityUtils.getUsername()); + return Result.success(faultMessageService.save(faultMessage)); + } + + /** + * 查询未读(faultMessageState==1)信息 + * @param faultMessageId + * @return + */ + @RequestMapping(value = "/selectOne/{faultMessageId}",method = RequestMethod.POST) + public Result selectOne(@PathVariable Long faultMessageId){ + List one = faultMessageService.selectOne(faultMessageId); + return Result.success(one); + } + + /** + * 查询未读信息 + * @param faultMessageId + * @return + */ + @RequestMapping(value = "/selectTwo/{faultMessageId}",method = RequestMethod.POST) + public Result selectTwo(@PathVariable Long faultMessageId){ + List one = faultMessageService.selectTwo(faultMessageId); + return Result.success(one); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java new file mode 100644 index 0000000..c6635d1 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -0,0 +1,29 @@ +package com.muyu.fault.controller; + + +import com.muyu.common.core.domain.Result; +import com.muyu.fault.common.FaultrRule; +import com.muyu.fault.common.SysCarFault; +import com.muyu.fault.service.impl.FaultrRuleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestMethod; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController +@RequestMapping("/rule") +public class FaultrRuleController { + @Autowired + private FaultrRuleService faultrRuleService; + /** + * 查询车辆故障列表 + */ + @RequestMapping(value = "/faultRuleList", method = RequestMethod.GET) + public Result> faultRuleList(FaultrRule faultrRule) + { + List list = faultrRuleService.faultRuleList(faultrRule); + return Result.success(list); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java index 47eb968..0313b60 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java @@ -85,10 +85,9 @@ public class SysCarFaultController extends BaseController sysCarFault.setCreateBy(SecurityUtils.getUsername()); FaultLog faultLog = new FaultLog(); faultLog.setFaultLogCodes(sysCarFault.getFaultCode()); - faultLog.setFaultLogVIN(sysCarFault.getCarVin()); + faultLog.setFaultLogVin(sysCarFault.getCarVin()); DateTime startTime = DateTime.now(); // 获取当前时间作为开始时间 faultLog.setFaultLogStartTime(startTime); - faultLog.setFaultLogEndTime(startTime); faultLogService.save(faultLog); if (sysCarFaultService.checkIdUnique(sysCarFault)) { return error("新增 车辆故障 '" + sysCarFault + "'失败,车辆故障已存在"); diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java new file mode 100644 index 0000000..73a3930 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java @@ -0,0 +1,7 @@ +package com.muyu.fault.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.FaultMessage; + +public interface FaultMessageMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java new file mode 100644 index 0000000..3fd2169 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java @@ -0,0 +1,10 @@ +package com.muyu.fault.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.fault.common.FaultrRule; +import org.apache.ibatis.annotations.Mapper; + + +@Mapper +public interface FaultrRuleMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java index 6c6e27b..bf9f182 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogService.java @@ -6,7 +6,8 @@ import com.muyu.fault.common.FaultLog; import java.util.List; public interface FaultLogService extends IService { - List logList(); + List faultLogList(FaultLog faultLog); + FaultLog byidId(Long faultLogId); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java index 901dfd1..8b71700 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java @@ -1,16 +1,33 @@ package com.muyu.fault.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.fault.common.FaultLog; +import com.muyu.fault.common.SysCarFault; import com.muyu.fault.mapper.FaultLogMapper; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import java.util.List; @Service public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService{ @Override - public List logList() { - return null; + public List faultLogList(FaultLog faultLog) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(faultLog.getFaultLogVin()), + FaultLog::getFaultLogVin, faultLog.getFaultLogVin()); + queryWrapper.like(StringUtils.isNotEmpty(faultLog.getFaultLogCodes()), + FaultLog::getFaultLogCodes, faultLog.getFaultLogCodes()); + return this.list(queryWrapper); + } + + @Override + public FaultLog byidId(Long faultLogId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(faultLogId, "日志ID不可为空"); + queryWrapper.eq(FaultLog::getFaultLogId, faultLogId); + return this.getOne(queryWrapper); } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java new file mode 100644 index 0000000..cf7a542 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java @@ -0,0 +1,14 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultMessage; + +import java.util.List; + +public interface FaultMessageService extends IService { + List faultMessageList(); + + List selectOne(Long faultMessageId); + + List selectTwo(Long faultMessageId); +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java new file mode 100644 index 0000000..2ee06c7 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -0,0 +1,34 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultMessage; +import com.muyu.fault.mapper.FaultMessageMapper; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService{ + @Override + public List faultMessageList() { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return this.list(queryWrapper); + } + + @Override + public List selectOne(Long faultMessageId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //查询消息状态为1的未读数据 + queryWrapper.eq(FaultMessage::getFaultMessageState, 1); + return this.list(queryWrapper); + } + + @Override + public List selectTwo(Long faultMessageId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + //查询消息状态为2的已读数据 + queryWrapper.eq(FaultMessage::getFaultMessageState, 2); + return this.list(queryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java new file mode 100644 index 0000000..c983aa4 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java @@ -0,0 +1,10 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.fault.common.FaultrRule; + +import java.util.List; + +public interface FaultrRuleService extends IService { + List faultRuleList(FaultrRule faultrRule); +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java new file mode 100644 index 0000000..e258817 --- /dev/null +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -0,0 +1,19 @@ +package com.muyu.fault.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultrRule; +import com.muyu.fault.mapper.FaultrRuleMapper; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class FaultrRuleServiceImpl extends ServiceImpl implements FaultrRuleService{ + + @Override + public List faultRuleList(FaultrRule faultrRule) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + return this.list(queryWrapper); + } +}