From 882819a6e08d2c6e13cc30f3a0b14cc7c42d3c7e Mon Sep 17 00:00:00 2001 From: 15285 <1518542096@qq.com> Date: Sun, 22 Sep 2024 20:36:53 +0800 Subject: [PATCH] =?UTF-8?q?feat:{=E4=BF=A1=E6=81=AF=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=88=A4=E6=96=AD,=E8=A7=84=E5=88=99=E7=9A=84?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0}?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/fault/common/FaultMessage.java | 5 ++ .../controller/FaultMessageController.java | 50 ++++++++++++------ .../controller/FaultrRuleController.java | 52 +++++++++++++++++-- .../service/impl/FaultMessageService.java | 5 +- .../service/impl/FaultMessageServiceImpl.java | 9 +--- .../fault/service/impl/FaultrRuleService.java | 2 + .../service/impl/FaultrRuleServiceImpl.java | 10 ++++ 7 files changed, 105 insertions(+), 28 deletions(-) diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java index 5248024..38f0f03 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java @@ -34,6 +34,11 @@ public class FaultMessage { */ @Schema(defaultValue = "消息发送人",type = "String",description = "消息发送人") private String faultMessageRemoveName; + /** + * 消息内容 + */ + @Schema(defaultValue = "消息内容",type = "String",description = "消息内容") + private String faultMessageContent; /** * 发送时间 */ diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java index 5181ede..7bf218d 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java @@ -1,6 +1,9 @@ package com.muyu.fault.controller; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.fault.common.FaultMessage; import com.muyu.fault.service.impl.FaultMessageService; @@ -20,42 +23,59 @@ public class FaultMessageController { * @return */ @RequestMapping(value = "/faultMessageList",method = RequestMethod.GET) - public Result faultMessageList(){ - List list = faultMessageService.faultMessageList(); - return Result.success(list); + public Result faultMessageList(@RequestBody FaultMessage faultMessage){ + String username = SecurityUtils.getUsername(); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(faultMessage.getFaultMessageSendName())) { + queryWrapper.eq(FaultMessage::getFaultMessageSendName,username); + } + return Result.success(faultMessageService.list(queryWrapper)); } /** - * 添加站内信 + * 添加消息 * @param faultMessage * @return */ @RequestMapping(value = "/insertMessage",method = RequestMethod.POST) public Result insertMessage(@RequestBody FaultMessage faultMessage){ + String username = SecurityUtils.getUsername(); //消息发送人 - faultMessage.setFaultMessageSendName(SecurityUtils.getUsername()); + faultMessage.setFaultMessageSendName(username); return Result.success(faultMessageService.save(faultMessage)); } /** - * 查询未读(faultMessageState==1)信息 - * @param faultMessageId + * 查询未读状态(faultMessageState==1)信息 * @return */ - @RequestMapping(value = "/selectOne/{faultMessageId}",method = RequestMethod.POST) - public Result selectOne(@PathVariable Long faultMessageId){ - List one = faultMessageService.selectOne(faultMessageId); + @RequestMapping(value = "/selectOne",method = RequestMethod.POST) + public Result selectOne(){ + List one = faultMessageService.selectOne(); return Result.success(one); } /** - * 查询未读信息 + * 查询已读状态(faultMessageState==2)信息 + * @return + */ + @RequestMapping(value = "/selectTwo",method = RequestMethod.POST) + public Result selectTwo(){ + List one = faultMessageService.selectTwo(); + return Result.success(one); + } + + /** + * 更改已读状态 * @param faultMessageId * @return */ - @RequestMapping(value = "/selectTwo/{faultMessageId}",method = RequestMethod.POST) - public Result selectTwo(@PathVariable Long faultMessageId){ - List one = faultMessageService.selectTwo(faultMessageId); - return Result.success(one); + @RequestMapping(value = "/updateTwo/{faultMessageId}",method = RequestMethod.POST) + public Result updateTwo(@PathVariable Long faultMessageId){ + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(FaultMessage::getFaultMessageState,2); + updateWrapper.eq(FaultMessage::getFaultMessageId,faultMessageId); + faultMessageService.update(updateWrapper); + return Result.success(faultMessageId,"消息已读"); } } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java index c6635d1..c7e3611 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java @@ -2,14 +2,16 @@ package com.muyu.fault.controller; import com.muyu.common.core.domain.Result; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.fault.common.FaultLog; +import com.muyu.fault.common.FaultMessage; import com.muyu.fault.common.FaultrRule; import com.muyu.fault.common.SysCarFault; import com.muyu.fault.service.impl.FaultrRuleService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; +import java.util.Arrays; import java.util.List; @RestController @@ -26,4 +28,48 @@ public class FaultrRuleController { List list = faultrRuleService.faultRuleList(faultrRule); return Result.success(list); } + + + /** + * 添加车辆规则 + * @param faultrRule + * @return + */ + @RequestMapping(value = "/insertRule",method = RequestMethod.POST) + public Result insertRule(@RequestBody FaultrRule faultrRule){ + return Result.success(faultrRuleService.save(faultrRule)); + } + + /** + * 修改车辆规则 + * @param faultrRule + * @return + */ + @RequestMapping(value = "/updateRule",method = RequestMethod.POST) + public Result updateRule(@RequestBody FaultrRule faultrRule){ + return Result.success(faultrRuleService.updateById(faultrRule)); + } + + /** + * 获取单条故障规则详细信息 + * @param faultRuleId + * @return + */ + @RequestMapping(value = "/byidRuleId/{faultRuleId}",method = RequestMethod.GET) + public Result byidRuleId(@PathVariable Long faultRuleId){ + FaultrRule byid = faultrRuleService.byidRuleId(faultRuleId); + return Result.success(byid); + } + + /** + * 删除车辆故障 + */ + @RequestMapping(value = "/remove/{ids}",method = RequestMethod.DELETE) + public Result remove(@PathVariable("ids") Long[] ids) + { + faultrRuleService.removeBatchByIds(Arrays.asList(ids)); + return Result.success(); + } + + } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java index cf7a542..77e6c20 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageService.java @@ -6,9 +6,8 @@ import com.muyu.fault.common.FaultMessage; import java.util.List; public interface FaultMessageService extends IService { - List faultMessageList(); - List selectOne(Long faultMessageId); + List selectOne(); - List selectTwo(Long faultMessageId); + List selectTwo(); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java index 2ee06c7..e2dcc9e 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultMessageServiceImpl.java @@ -10,14 +10,9 @@ import java.util.List; @Service public class FaultMessageServiceImpl extends ServiceImpl implements FaultMessageService{ - @Override - public List faultMessageList() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - return this.list(queryWrapper); - } @Override - public List selectOne(Long faultMessageId) { + public List selectOne() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); //查询消息状态为1的未读数据 queryWrapper.eq(FaultMessage::getFaultMessageState, 1); @@ -25,7 +20,7 @@ public class FaultMessageServiceImpl extends ServiceImpl selectTwo(Long faultMessageId) { + public List selectTwo() { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); //查询消息状态为2的已读数据 queryWrapper.eq(FaultMessage::getFaultMessageState, 2); diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java index c983aa4..9d3262a 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleService.java @@ -7,4 +7,6 @@ import java.util.List; public interface FaultrRuleService extends IService { List faultRuleList(FaultrRule faultrRule); + + FaultrRule byidRuleId(Long faultRuleId); } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java index e258817..9f5a45e 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultrRuleServiceImpl.java @@ -2,9 +2,11 @@ package com.muyu.fault.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.fault.common.FaultLog; import com.muyu.fault.common.FaultrRule; import com.muyu.fault.mapper.FaultrRuleMapper; import org.springframework.stereotype.Service; +import org.springframework.util.Assert; import java.util.List; @@ -16,4 +18,12 @@ public class FaultrRuleServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); return this.list(queryWrapper); } + + @Override + public FaultrRule byidRuleId(Long faultRuleId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(faultRuleId, "规则ID不可为空"); + queryWrapper.eq(FaultrRule::getFaultRuleId, faultRuleId); + return this.getOne(queryWrapper); + } }