From b02a9ed457d9706317e5812288153bf14b8d7e6a Mon Sep 17 00:00:00 2001 From: zhang xu <2125563902@qq.com> Date: Thu, 27 Jun 2024 01:43:24 +0800 Subject: [PATCH] =?UTF-8?q?test:(=E6=8C=87=E6=A0=87=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E9=85=8D=E7=BD=AE)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/muyu/domain/data/MessageDetail.java | 8 +-- .../muyu/domain/req/MessageDetailEditReq.java | 2 +- .../domain/req/MessageDetailQueryReq.java | 2 +- .../muyu/domain/req/MessageDetailSaveReq.java | 2 +- .../muyu/networking/mapper/FencesMapper.java | 1 - .../controller/MessageDetailController.java | 13 ++--- .../vehicle/mapper/FaultRecordMapper.java | 27 ++++++++++ .../vehicle/mapper/MessageDetailMapper.java | 4 ++ .../Impl/MessageDetailServiceImpl.java | 13 +++++ .../vehicle/service/MessageDetailService.java | 2 + .../main/resources/mapper/FaultCodeMapper.xml | 2 +- .../resources/mapper/FaultRecordMapper.xml | 52 +++++++++++++++++++ .../resources/mapper/MessageDetailMapper.xml | 13 ++++- 13 files changed, 124 insertions(+), 17 deletions(-) create mode 100644 muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/FaultRecordMapper.java rename muyu-modules/{muyu-networking/muyu-networking-service => muyu-vehicle/muyu-vehicle-service}/src/main/resources/mapper/FaultCodeMapper.xml (91%) create mode 100644 muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultRecordMapper.xml diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/data/MessageDetail.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/data/MessageDetail.java index 80fed96..46ab1c1 100644 --- a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/data/MessageDetail.java +++ b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/data/MessageDetail.java @@ -41,7 +41,7 @@ public class MessageDetail extends BaseEntity { /** 指标项key */ @Excel(name = "指标项key") @ApiModelProperty(name = "指标项key", value = "指标项key") - private String key; + private String messageKey; /** 起始位 */ @Excel(name = "起始位") @@ -68,7 +68,7 @@ public class MessageDetail extends BaseEntity { */ public static MessageDetail queryBuild(MessageDetailQueryReq messageDetailQueryReq){ return MessageDetail.builder() - .key(messageDetailQueryReq.getKey()) + .messageKey(messageDetailQueryReq.getMessageKey()) .startBit(messageDetailQueryReq.getStartBit()) .stopBit(messageDetailQueryReq.getStopBit()) .label(messageDetailQueryReq.getLabel()) @@ -81,7 +81,7 @@ public class MessageDetail extends BaseEntity { */ public static MessageDetail saveBuild(MessageDetailSaveReq messageDetailSaveReq){ return MessageDetail.builder() - .key(messageDetailSaveReq.getKey()) + .messageKey(messageDetailSaveReq.getMessageKey()) .startBit(messageDetailSaveReq.getStartBit()) .stopBit(messageDetailSaveReq.getStopBit()) .label(messageDetailSaveReq.getLabel()) @@ -95,7 +95,7 @@ public class MessageDetail extends BaseEntity { public static MessageDetail editBuild(Long id, MessageDetailEditReq messageDetailEditReq){ return MessageDetail.builder() .id(id) - .key(messageDetailEditReq.getKey()) + .messageKey(messageDetailEditReq.getMessageKey()) .startBit(messageDetailEditReq.getStartBit()) .stopBit(messageDetailEditReq.getStopBit()) .label(messageDetailEditReq.getLabel()) diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailEditReq.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailEditReq.java index 251f415..a4b979a 100644 --- a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailEditReq.java +++ b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailEditReq.java @@ -25,7 +25,7 @@ public class MessageDetailEditReq { /** 指标项key */ @ApiModelProperty(name = "指标项key", value = "指标项key") - private String key; + private String messageKey; /** 起始位 */ @ApiModelProperty(name = "起始位", value = "起始位") diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailQueryReq.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailQueryReq.java index d1d4c12..b79b750 100644 --- a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailQueryReq.java +++ b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailQueryReq.java @@ -30,7 +30,7 @@ public class MessageDetailQueryReq{ /** 指标项key */ @ApiModelProperty(name = "指标项key", value = "指标项key") - private String key; + private String messageKey; /** 起始位 */ @ApiModelProperty(name = "起始位", value = "起始位") diff --git a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailSaveReq.java b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailSaveReq.java index f1713b4..f341f61 100644 --- a/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailSaveReq.java +++ b/muyu-modules/muyu-networking/muyu-networking-common/src/main/java/com/muyu/domain/req/MessageDetailSaveReq.java @@ -31,7 +31,7 @@ public class MessageDetailSaveReq { /** 指标项key */ @ApiModelProperty(name = "指标项key", value = "指标项key") - private String key; + private String messageKey; /** 起始位 */ diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/mapper/FencesMapper.java b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/mapper/FencesMapper.java index f773984..94340b6 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/mapper/FencesMapper.java +++ b/muyu-modules/muyu-networking/muyu-networking-service/src/main/java/com/muyu/networking/mapper/FencesMapper.java @@ -2,7 +2,6 @@ package com.muyu.networking.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.Fences; -import org.apache.ibatis.annotations.Mapper; /** * @ClassDescription: diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/controller/MessageDetailController.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/controller/MessageDetailController.java index 232f0e6..53555e3 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/controller/MessageDetailController.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/controller/MessageDetailController.java @@ -39,7 +39,6 @@ public class MessageDetailController extends BaseController { * 查询报文详情列表 */ @ApiOperation("获取报文详情列表") - @RequiresPermissions("car:messageDetail:list") @GetMapping("/list") public Result> list(MessageDetailQueryReq messageDetailQueryReq) { startPage(); @@ -51,7 +50,6 @@ public class MessageDetailController extends BaseController { * 导出报文详情列表 */ @ApiOperation("导出报文详情列表") - @RequiresPermissions("car:messageDetail:export") @Log(title = "报文详情", businessType = BusinessType.EXPORT) @PostMapping("/export") public void export(HttpServletResponse response, MessageDetail messageDetail) { @@ -64,7 +62,6 @@ public class MessageDetailController extends BaseController { * 获取报文详情详细信息 */ @ApiOperation("获取报文详情详细信息") - @RequiresPermissions("car:messageDetail:query") @GetMapping(value = "/{id}") @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = Long.class) public Result getInfo(@PathVariable("id") Long id) { @@ -74,7 +71,7 @@ public class MessageDetailController extends BaseController { /** * 新增报文详情 */ - @RequiresPermissions("car:messageDetail:add") + @Log(title = "报文详情", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("新增报文详情") @@ -85,7 +82,6 @@ public class MessageDetailController extends BaseController { /** * 修改报文详情 */ - @RequiresPermissions("car:messageDetail:edit") @Log(title = "报文详情", businessType = BusinessType.UPDATE) @PutMapping("/{id}") @ApiOperation("修改报文详情") @@ -96,7 +92,6 @@ public class MessageDetailController extends BaseController { /** * 删除报文详情 */ - @RequiresPermissions("car:messageDetail:remove") @Log(title = "报文详情", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") @ApiOperation("删除报文详情") @@ -105,6 +100,12 @@ public class MessageDetailController extends BaseController { return toAjax(messageDetailService.removeBatchByIds(ids)); } + @PostMapping("/submit") + public Result submit(@RequestBody MessageDetail vehicleMessages){ + messageDetailService.submit(vehicleMessages); + return Result.success(); + } + } diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/FaultRecordMapper.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/FaultRecordMapper.java new file mode 100644 index 0000000..2e417be --- /dev/null +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/FaultRecordMapper.java @@ -0,0 +1,27 @@ +package com.muyu.vehicle.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.FaultRecord; +import com.muyu.domain.req.FaultRecordReqVo; +import com.muyu.domain.vo.FaultRecordVo; + +import java.util.List; + +/** 车辆故障记录 + * @ClassDescription: + * @JdkVersion: 17 + * @Author: zhangxu + * @Created: 2024/6/20 15:23 + */ + +public interface FaultRecordMapper extends BaseMapper { + + + void updateByFaultRecord(FaultRecord build); + + FaultRecord getByFaultRecord(FaultRecord faultRecord); + + List countList(FaultRecordReqVo recordReqVo); + + +} diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/MessageDetailMapper.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/MessageDetailMapper.java index cf5576b..6cfebe8 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/MessageDetailMapper.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/mapper/MessageDetailMapper.java @@ -10,4 +10,8 @@ import com.muyu.domain.data.MessageDetail; * @Created: 2024/6/26 21:44 */ public interface MessageDetailMapper extends BaseMapper { + + + void submit(MessageDetail vehicleMessages); + } diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/MessageDetailServiceImpl.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/MessageDetailServiceImpl.java index 3da6920..071bb01 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/MessageDetailServiceImpl.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/Impl/MessageDetailServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.data.MessageDetail; import com.muyu.vehicle.mapper.MessageDetailMapper; import com.muyu.vehicle.service.MessageDetailService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; @@ -17,10 +18,22 @@ import java.util.List; */ @Service public class MessageDetailServiceImpl extends ServiceImpl implements MessageDetailService { + + + @Autowired + private MessageDetailMapper messageDetailMapper; + + @Override public List list(MessageDetail messageDetail) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); return list(queryWrapper); } + + @Override + public void submit(MessageDetail vehicleMessages) { + messageDetailMapper.submit(vehicleMessages); + } + } diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/MessageDetailService.java b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/MessageDetailService.java index efcff31..2d7fcbe 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/MessageDetailService.java +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/java/com/muyu/vehicle/service/MessageDetailService.java @@ -22,4 +22,6 @@ public interface MessageDetailService extends IService { public List list(MessageDetail messageDetail); + void submit(MessageDetail vehicleMessages); + } diff --git a/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/mapper/FaultCodeMapper.xml b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultCodeMapper.xml similarity index 91% rename from muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/mapper/FaultCodeMapper.xml rename to muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultCodeMapper.xml index 380f38f..6c96d28 100644 --- a/muyu-modules/muyu-networking/muyu-networking-service/src/main/resources/mapper/FaultCodeMapper.xml +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultCodeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultRecordMapper.xml b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultRecordMapper.xml new file mode 100644 index 0000000..86747e6 --- /dev/null +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/FaultRecordMapper.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + select id, fault_code, vin, start_time, end_time, fault_level, fault_handle from fault_record + + + update fault_record set end_time=#{endTime} where id=#{id} + + + + + + diff --git a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/MessageDetailMapper.xml b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/MessageDetailMapper.xml index de3e35c..fc4ac67 100644 --- a/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/MessageDetailMapper.xml +++ b/muyu-modules/muyu-vehicle/muyu-vehicle-service/src/main/resources/mapper/MessageDetailMapper.xml @@ -6,14 +6,23 @@ - + + + + + - select id, key, start_bit, stop_bit, label, type from message_detail + select id,message_key, start_bit, stop_bit, label, + type ,create_by,create_time,update_by,update_time,remark from message_detail + + INSERT INTO `networking`.`vehicle_message` (`vin`, `message_ids`) VALUES (#{vin}, #{messageIds}); + +