From be878ef01aefdd3ce3263c38e0cee305e576f900 Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Fri, 28 Jun 2024 23:46:24 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E8=BD=A6=E8=BE=86=E6=8A=A5=E6=96=87?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/business/domain/FaultRecord.java | 3 +- .../muyu/customer/business/domain/Fence.java | 6 +- .../business/domain/MessageDetail.java | 111 +++++++++++----- .../customer/business/domain/Vehicle.java | 7 +- .../domain/model/MessageDetailModel.java | 25 ++++ .../business/domain/model/VehicleModel.java | 10 +- .../domain/req/MessageDetailEditReq.java | 46 +++++++ .../domain/req/MessageDetailQueryReq.java | 46 +++++++ .../domain/req/MessageDetailSaveReq.java | 58 +++++++++ .../business/consumer/RabbitConsumer.java | 2 - .../business/controller/FenceController.java | 1 - .../controller/MessageDetailController.java | 122 ++++++++++++++++++ .../controller/VehicleController.java | 16 +-- .../business/mapper/FaultCodeMapper.java | 1 - .../customer/business/mapper/FenceMapper.java | 1 - .../business/mapper/MessageDetailMapper.java | 24 ++++ .../business/mapper/VehicleMapper.java | 9 +- .../service/MessageDetailService.java | 30 +++++ .../business/service/VehicleService.java | 4 +- .../service/impl/FenceServiceImpl.java | 1 - .../impl/MessageDetailServiceImpl.java | 117 +++++++++++++++++ .../service/impl/VehicleServiceImpl.java | 54 +++++--- .../customerBusiness/MessageDetailMapper.xml | 33 +++++ .../mapper/customerBusiness/VehicleMapper.xml | 30 ++++- 24 files changed, 666 insertions(+), 91 deletions(-) create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/MessageDetailModel.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailEditReq.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailQueryReq.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailSaveReq.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/MessageDetailController.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/MessageDetailMapper.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/MessageDetailService.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/MessageDetailServiceImpl.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/MessageDetailMapper.xml diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultRecord.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultRecord.java index b079747..7569d55 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultRecord.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/FaultRecord.java @@ -1,13 +1,14 @@ package com.muyu.customer.business.domain; import java.util.Date; + +import com.muyu.customer.business.domain.req.FaultRecordSaveReq; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.customer.business.domain.req.FaultRecordEditReq; import com.muyu.customer.business.domain.req.FaultRecordQueryReq; -import com.muyu.customer.business.domain.req.FaultRecordSaveReq; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Fence.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Fence.java index 40ae606..e2925a5 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Fence.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Fence.java @@ -3,6 +3,9 @@ package com.muyu.customer.business.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.customer.business.domain.req.FenceEditReq; +import com.muyu.customer.business.domain.req.FenceQueryReq; +import com.muyu.customer.business.domain.req.FenceSaveReq; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -10,9 +13,6 @@ import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; import io.swagger.annotations.*; import com.muyu.common.core.annotation.Excel; -import com.muyu.customer.business.domain.req.FenceQueryReq; -import com.muyu.customer.business.domain.req.FenceSaveReq; -import com.muyu.customer.business.domain.req.FenceEditReq; import com.muyu.common.core.web.domain.BaseEntity; /** diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/MessageDetail.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/MessageDetail.java index 4e5a213..31ba0d5 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/MessageDetail.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/MessageDetail.java @@ -1,51 +1,104 @@ package com.muyu.customer.business.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.common.core.annotation.Excel; +import com.muyu.customer.business.domain.req.MessageDetailEditReq; +import com.muyu.customer.business.domain.req.MessageDetailQueryReq; +import com.muyu.customer.business.domain.req.MessageDetailSaveReq; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; -import java.io.Serializable; - /** - * 报文详情对象 MessageDetail + * 报文详情对象 message_detail * - * @author DeKangLiu - * Date 2024/6/26 20:48 + * @author muyu + * @date 2024-06-28 */ @Data @SuperBuilder @NoArgsConstructor @AllArgsConstructor -public class MessageDetail { +@TableName("message_detail") +@ApiModel(value = "MessageDetail", description = "报文详情") +public class MessageDetail { - /** - * 报文id - */ - private Integer id; - /** - * 报文key - */ - private String key; + /** 报文id */ + @TableId(value = "id",type = IdType.AUTO) + @ApiModelProperty(name = "报文id", value = "报文id") + private Long id; - /** - * 报文起始位 - */ - private Integer startBit; + /** 数据项key */ + @Excel(name = "数据项key") + @ApiModelProperty(name = "数据项key", value = "数据项key") + private String keyCode; - /** - * 报文结束位 - */ - private Integer stopBit; + /** 起始位 */ + @Excel(name = "起始位") + @ApiModelProperty(name = "起始位", value = "起始位") + private String startBit; - /** - * 报文标签 - */ - private String lable; + /** 结束位 */ + @Excel(name = "结束位") + @ApiModelProperty(name = "结束位", value = "结束位") + private String stopBit; - /** - * 报文类型 - */ + /** 标签 */ + @Excel(name = "标签") + @ApiModelProperty(name = "标签", value = "标签") + private String label; + + /** 类型 */ + @Excel(name = "类型") + @ApiModelProperty(name = "类型", value = "类型") private String type; + +// private String vin; + + /** + * 查询构造器 + */ + public static MessageDetail queryBuild( MessageDetailQueryReq messageDetailQueryReq){ + return MessageDetail.builder() + .keyCode(messageDetailQueryReq.getKeyCode()) + .startBit(messageDetailQueryReq.getStartBit()) + .stopBit(messageDetailQueryReq.getStopBit()) + .label(messageDetailQueryReq.getLabel()) + .type(messageDetailQueryReq.getType()) + .build(); + } + + /** + * 添加构造器 + */ + public static MessageDetail saveBuild(MessageDetailSaveReq messageDetailSaveReq){ + return MessageDetail.builder() + .keyCode(messageDetailSaveReq.getKeyCode()) + .startBit(messageDetailSaveReq.getStartBit()) + .stopBit(messageDetailSaveReq.getStopBit()) + .label(messageDetailSaveReq.getLabel()) + .type(messageDetailSaveReq.getType()) + .build(); + } + + /** + * 修改构造器 + */ + public static MessageDetail editBuild(Long id, MessageDetailEditReq messageDetailEditReq){ + return MessageDetail.builder() + .id(id) + .keyCode(messageDetailEditReq.getKeyCode()) + .startBit(messageDetailEditReq.getStartBit()) + .stopBit(messageDetailEditReq.getStopBit()) + .label(messageDetailEditReq.getLabel()) + .type(messageDetailEditReq.getType()) + .build(); + } + } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java index 50f04c4..6af6b92 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/Vehicle.java @@ -2,11 +2,15 @@ package com.muyu.customer.business.domain; import java.math.BigDecimal; import java.util.Date; + +import com.muyu.customer.business.domain.req.VehicleQueryReq; import com.fasterxml.jackson.annotation.JsonFormat; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.customer.business.domain.req.VehicleEditReq; +import com.muyu.customer.business.domain.req.VehicleSaveReq; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; @@ -14,9 +18,6 @@ import lombok.AllArgsConstructor; import lombok.experimental.SuperBuilder; import io.swagger.annotations.*; import com.muyu.common.core.annotation.Excel; -import com.muyu.customer.business.domain.req.VehicleQueryReq; -import com.muyu.customer.business.domain.req.VehicleSaveReq; -import com.muyu.customer.business.domain.req.VehicleEditReq; import com.muyu.common.core.web.domain.BaseEntity; /** diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/MessageDetailModel.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/MessageDetailModel.java new file mode 100644 index 0000000..7439388 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/MessageDetailModel.java @@ -0,0 +1,25 @@ +package com.muyu.customer.business.domain.model; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * MessDetaiModel + * + * @author DeKangLiu + * Date 2024/6/28 21:39 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +public class MessageDetailModel { + + private String vin; + + private List ids; +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleModel.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleModel.java index a26373f..b25d0d6 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleModel.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleModel.java @@ -1,16 +1,8 @@ package com.muyu.customer.business.domain.model; -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.annotation.Excel; -import com.muyu.customer.business.domain.MessageDetail; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; -import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.springframework.format.annotation.DateTimeFormat; @@ -84,5 +76,5 @@ public class VehicleModel { private String vehicleType; /** 报文详情对象 */ - private String[] messageDetail; + private List messageDetail; } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailEditReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailEditReq.java new file mode 100644 index 0000000..143f537 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailEditReq.java @@ -0,0 +1,46 @@ +package com.muyu.customer.business.domain.req; + +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 报文详情对象 message_detail + * + * @author muyu + * @date 2024-06-28 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "MessageDetailEditReq", description = "报文详情") +public class MessageDetailEditReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 数据项key */ + @ApiModelProperty(name = "数据项key", value = "数据项key") + private String keyCode; + + /** 起始位 */ + @ApiModelProperty(name = "起始位", value = "起始位") + private String startBit; + + /** 结束位 */ + @ApiModelProperty(name = "结束位", value = "结束位") + private String stopBit; + + /** 标签 */ + @ApiModelProperty(name = "标签", value = "标签") + private String label; + + /** 类型 */ + @ApiModelProperty(name = "类型", value = "类型") + private String type; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailQueryReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailQueryReq.java new file mode 100644 index 0000000..19377e4 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailQueryReq.java @@ -0,0 +1,46 @@ +package com.muyu.customer.business.domain.req; + +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 报文详情对象 message_detail + * + * @author muyu + * @date 2024-06-28 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "MessageDetailQueryReq", description = "报文详情") +public class MessageDetailQueryReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 数据项key */ + @ApiModelProperty(name = "数据项key", value = "数据项key") + private String keyCode; + + /** 起始位 */ + @ApiModelProperty(name = "起始位", value = "起始位") + private String startBit; + + /** 结束位 */ + @ApiModelProperty(name = "结束位", value = "结束位") + private String stopBit; + + /** 标签 */ + @ApiModelProperty(name = "标签", value = "标签") + private String label; + + /** 类型 */ + @ApiModelProperty(name = "类型", value = "类型") + private String type; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailSaveReq.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailSaveReq.java new file mode 100644 index 0000000..7d0280e --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/req/MessageDetailSaveReq.java @@ -0,0 +1,58 @@ +package com.muyu.customer.business.domain.req; + +import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 报文详情对象 message_detail + * + * @author muyu + * @date 2024-06-28 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@ApiModel(value = "MessageDetailSaveReq", description = "报文详情") +public class MessageDetailSaveReq extends BaseEntity { + + private static final long serialVersionUID = 1L; + + /** 报文id */ + + @ApiModelProperty(name = "报文id", value = "报文id") + private Long id; + + /** 数据项key */ + + @ApiModelProperty(name = "数据项key", value = "数据项key") + private String keyCode; + + /** 起始位 */ + + @ApiModelProperty(name = "起始位", value = "起始位") + private String startBit; + + /** 结束位 */ + + @ApiModelProperty(name = "结束位", value = "结束位") + private String stopBit; + + /** 标签 */ + + @ApiModelProperty(name = "标签", value = "标签") + private String label; + + /** 类型 */ + + @ApiModelProperty(name = "类型", value = "类型") + private String type; + + private String vin; + +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/consumer/RabbitConsumer.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/consumer/RabbitConsumer.java index 7e0f924..2bf2f60 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/consumer/RabbitConsumer.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/consumer/RabbitConsumer.java @@ -1,7 +1,5 @@ package com.muyu.customer.business.consumer; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.muyu.common.security.utils.SecurityUtils; import com.muyu.customer.business.domain.FaultRecord; import com.muyu.customer.business.saas.holder.DynamicDataSourceHolder; import com.muyu.customer.business.service.FaultRecordService; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FenceController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FenceController.java index acf9ebd..c673488 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FenceController.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FenceController.java @@ -6,7 +6,6 @@ import javax.servlet.http.HttpServletResponse; import com.muyu.customer.business.domain.Vehicle; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.*; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/MessageDetailController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/MessageDetailController.java new file mode 100644 index 0000000..03925ab --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/MessageDetailController.java @@ -0,0 +1,122 @@ +package com.muyu.customer.business.controller; + +import java.util.List; +import javax.servlet.http.HttpServletResponse; + +import com.muyu.customer.business.domain.model.MessageDetailModel; +import com.muyu.customer.business.domain.req.MessageDetailEditReq; +import com.muyu.customer.business.domain.req.MessageDetailQueryReq; +import com.muyu.customer.business.domain.req.MessageDetailSaveReq; +import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.customer.business.domain.MessageDetail; +import com.muyu.customer.business.service.MessageDetailService; +import com.muyu.common.core.web.page.TableDataInfo; + +/** + * 报文详情Controller + * + * @author muyu + * @date 2024-06-28 + */ +@Api(tags = "报文详情") +@RestController +@RequestMapping("/detail") +public class MessageDetailController extends BaseController { + @Autowired + private MessageDetailService messageDetailService; + + /** + * 查询报文详情列表 + */ + @ApiOperation("获取报文详情列表") + @RequiresPermissions("customerBusiness:detail:list") + @GetMapping("/list") + public Result> list(MessageDetailQueryReq messageDetailQueryReq) { + startPage(); + List list = messageDetailService.list(MessageDetail.queryBuild(messageDetailQueryReq)); + return getDataTable(list); + } + + /** + * 导出报文详情列表 + */ + @ApiOperation("导出报文详情列表") + @RequiresPermissions("customerBusiness:detail:export") + @Log(title = "报文详情", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, MessageDetail messageDetail) { + List list = messageDetailService.list(messageDetail); + ExcelUtil util = new ExcelUtil(MessageDetail.class); + util.exportExcel(response, list, "报文详情数据"); + } + + @GetMapping("/selectByVin/{vin}") + public Result> selectByVin(@PathVariable String vin) { + return Result.success(messageDetailService.selectMessage(vin)); + } + + /** + * 获取报文详情详细信息 + */ + @ApiOperation("获取报文详情详细信息") + @RequiresPermissions("customerBusiness:detail: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) { + return Result.success(messageDetailService.getById(id)); + } + + /** + * 新增报文详情 + */ + @RequiresPermissions("customerBusiness:detail:add") + @Log(title = "报文详情", businessType = BusinessType.INSERT) + @PostMapping + @ApiOperation("新增报文详情") + public Result add(@RequestBody MessageDetailModel messageDetailModel) { + return messageDetailService.add(messageDetailModel); + } + + /** + * 修改报文详情 + */ + @RequiresPermissions("customerBusiness:detail:edit") + @Log(title = "报文详情", businessType = BusinessType.UPDATE) + @PutMapping("/{id}") + @ApiOperation("修改报文详情") + public Result edit(@PathVariable Long id, @RequestBody MessageDetailEditReq messageDetailEditReq) { + return toAjax(messageDetailService.updateById(MessageDetail.editBuild(id,messageDetailEditReq))); + } + + @PostMapping("/updateMessage") + public Result updateMessage(@RequestBody MessageDetailModel messageDetailModel) { + return messageDetailService.updateVehicle(messageDetailModel); + } + + /** + * 删除报文详情 + */ + @RequiresPermissions("customerBusiness:detail:remove") + @Log(title = "报文详情", businessType = BusinessType.DELETE) + @DeleteMapping("/{ids}") + @ApiOperation("删除报文详情") + @ApiImplicitParam(name = "id", value = "id", required = true, dataType = "Long", paramType = "path", dataTypeClass = String.class, example = "1,2,3,4") + public Result remove(@PathVariable List ids) { + return toAjax(messageDetailService.removeBatchByIds(ids)); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java index bc89021..aed6deb 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/VehicleController.java @@ -7,14 +7,10 @@ import java.util.concurrent.TimeUnit; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import com.alibaba.fastjson.JSON; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.muyu.common.core.utils.ServletUtils; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.customer.business.domain.MessageDetail; import com.muyu.customer.business.domain.model.VehicleModel; -import com.muyu.customer.business.mapper.VehicleMapper; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; @@ -27,11 +23,8 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.customer.business.domain.Vehicle; import com.muyu.customer.business.domain.req.VehicleQueryReq; -import com.muyu.customer.business.domain.req.VehicleSaveReq; -import com.muyu.customer.business.domain.req.VehicleEditReq; import com.muyu.customer.business.service.VehicleService; import com.muyu.common.core.web.page.TableDataInfo; -import springfox.documentation.spring.web.json.Json; /** * 车辆录入Controller @@ -76,11 +69,6 @@ public class VehicleController extends BaseController { } }); }); - Integer enterpriseId = SecurityUtils.getLoginUser().getSysUser().getEnterpriseId(); - for (Vehicle vehicle : list) { - List messageList = vehicleService.selectMessage(vehicle.getId()); - redisTemplate.opsForHash().put(enterpriseId+"", vehicle.getVin(), JSON.toJSONString(messageList)); - } return getDataTable(list); } @@ -128,8 +116,8 @@ public class VehicleController extends BaseController { @Log(title = "车辆录入", businessType = BusinessType.UPDATE) @PutMapping("/{id}") @ApiOperation("修改车辆录入") - public Result edit(@PathVariable Long id, @RequestBody VehicleEditReq vehicleEditReq) { - return toAjax(vehicleService.updateById(Vehicle.editBuild(id,vehicleEditReq))); + public Result edit(@PathVariable Long id, @RequestBody VehicleModel vehicleModel) { + return vehicleService.updateVehicle(id, vehicleModel); } /** diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultCodeMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultCodeMapper.java index 7ee1cd1..912d222 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultCodeMapper.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultCodeMapper.java @@ -1,6 +1,5 @@ package com.muyu.customer.business.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.customer.business.domain.FaultCode; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FenceMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FenceMapper.java index 3c9b260..fdedf29 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FenceMapper.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FenceMapper.java @@ -1,6 +1,5 @@ package com.muyu.customer.business.mapper; -import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.customer.business.domain.Fence; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/MessageDetailMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/MessageDetailMapper.java new file mode 100644 index 0000000..9080de9 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/MessageDetailMapper.java @@ -0,0 +1,24 @@ +package com.muyu.customer.business.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.customer.business.domain.MessageDetail; +import com.muyu.customer.business.domain.Vehicle; +import com.muyu.customer.business.domain.model.VehicleMiddle; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 报文详情Mapper接口 + * + * @author muyu + * @date 2024-06-28 + */ +public interface MessageDetailMapper extends BaseMapper { + + Vehicle selectByVin(@Param("vin") String vin); + + List selectByVehicleId(@Param("id") Long id); + + List selectMessage(@Param("list") List vehicleMiddleList); +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java index cd9b297..747d022 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/VehicleMapper.java @@ -4,7 +4,6 @@ import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.customer.business.domain.MessageDetail; import com.muyu.customer.business.domain.Vehicle; -import com.muyu.customer.business.domain.model.VehicleMiddle; import com.muyu.customer.business.domain.model.VehicleModel; import org.apache.ibatis.annotations.Param; @@ -22,9 +21,15 @@ public interface VehicleMapper extends BaseMapper { void addMiddle(@Param("id") Long id, @Param("integer") Integer integer); - List selectMessageList(@Param("id") Long id); + List selectMessageList(@Param("id") Long id); VehicleModel selectId(@Param("id") Long id); List selectMessage(@Param("id") Long id); + + int updateVehicle(@Param("id") Long id, @Param("vehicleModel") VehicleModel vehicleModel); + + MessageDetail selectDetail(@Param("s") Integer s); + + void deleteMiddle(@Param("id") Long id); } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/MessageDetailService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/MessageDetailService.java new file mode 100644 index 0000000..554bfb7 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/MessageDetailService.java @@ -0,0 +1,30 @@ +package com.muyu.customer.business.service; + +import java.util.List; + +import com.muyu.common.core.domain.Result; +import com.muyu.customer.business.domain.MessageDetail; +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.customer.business.domain.model.MessageDetailModel; + +/** + * 报文详情Service接口 + * + * @author muyu + * @date 2024-06-28 + */ +public interface MessageDetailService extends IService { + /** + * 查询报文详情列表 + * + * @param messageDetail 报文详情 + * @return 报文详情集合 + */ + public List list(MessageDetail messageDetail); + + List selectMessage(String vin); + + Result add(MessageDetailModel messageDetailModel); + + Result updateVehicle(MessageDetailModel messageDetailModel); +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java index aacce8f..0da6c73 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/VehicleService.java @@ -2,11 +2,11 @@ package com.muyu.customer.business.service; import java.util.List; +import com.muyu.common.core.domain.Result; import com.muyu.customer.business.domain.MessageDetail; import com.muyu.customer.business.domain.Vehicle; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.customer.business.domain.model.VehicleModel; -import com.muyu.customer.business.domain.req.VehicleQueryReq; /** * 车辆录入Service接口 @@ -31,4 +31,6 @@ public interface VehicleService extends IService { VehicleModel selectById(Long id); List selectMessage(Long id); + + Result updateVehicle(Long id, VehicleModel vehicleModel); } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java index 81b1852..d474dd5 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FenceServiceImpl.java @@ -8,7 +8,6 @@ import com.muyu.common.core.utils.ObjUtils; import com.muyu.customer.business.domain.Vehicle; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import com.muyu.customer.business.mapper.FenceMapper; diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/MessageDetailServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/MessageDetailServiceImpl.java new file mode 100644 index 0000000..46dd309 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/MessageDetailServiceImpl.java @@ -0,0 +1,117 @@ +package com.muyu.customer.business.service.impl; + +import java.util.ArrayList; +import java.util.List; + +import com.alibaba.fastjson2.JSON; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.ObjUtils; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.customer.business.domain.Vehicle; +import com.muyu.customer.business.domain.model.MessageDetailModel; +import com.muyu.customer.business.domain.model.VehicleMiddle; +import com.muyu.customer.business.mapper.VehicleMapper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.stereotype.Service; +import com.muyu.customer.business.mapper.MessageDetailMapper; +import com.muyu.customer.business.domain.MessageDetail; +import com.muyu.customer.business.service.MessageDetailService; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; + +/** + * 报文详情Service业务层处理 + * + * @author muyu + * @date 2024-06-28 + */ +@Slf4j +@Service +public class MessageDetailServiceImpl extends ServiceImpl implements MessageDetailService { + + @Autowired + private MessageDetailMapper messageDetailMapper; + @Autowired + private VehicleMapper vehicleMapper; + @Autowired + private StringRedisTemplate redisTemplate; + @Autowired + private RabbitTemplate rabbitTemplate; + + /** + * 查询报文详情列表 + * + * @param messageDetail 报文详情 + * @return 报文详情 + */ + @Override + public List list(MessageDetail messageDetail) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + + if (ObjUtils.notNull(messageDetail.getKeyCode())){ + queryWrapper.eq(MessageDetail::getKeyCode, messageDetail.getKeyCode()); + } + + if (ObjUtils.notNull(messageDetail.getStartBit())){ + queryWrapper.eq(MessageDetail::getStartBit, messageDetail.getStartBit()); + } + + if (ObjUtils.notNull(messageDetail.getStopBit())){ + queryWrapper.eq(MessageDetail::getStopBit, messageDetail.getStopBit()); + } + + if (ObjUtils.notNull(messageDetail.getLabel())){ + queryWrapper.eq(MessageDetail::getLabel, messageDetail.getLabel()); + } + + if (ObjUtils.notNull(messageDetail.getType())){ + queryWrapper.eq(MessageDetail::getType, messageDetail.getType()); + } + return list(queryWrapper); + } + + @Override + public List selectMessage(String vin) { + + Vehicle vehicle=messageDetailMapper.selectByVin(vin); + List vehicleMiddleList=messageDetailMapper.selectByVehicleId(vehicle.getId()); + if (vehicleMiddleList.isEmpty()){ + return null; + } + return messageDetailMapper.selectMessage(vehicleMiddleList); + } + + @Override + public Result add(MessageDetailModel messageDetailModel) { + Integer enterpriseId = SecurityUtils.getLoginUser().getSysUser().getEnterpriseId(); + Vehicle vehicle=messageDetailMapper.selectByVin(messageDetailModel.getVin()); + ArrayList messageDetails = new ArrayList<>(); + for (Integer s : messageDetailModel.getIds()) { + vehicleMapper.addMiddle(vehicle.getId(), s); + MessageDetail messageDetail = vehicleMapper.selectDetail(s); + messageDetails.add(messageDetail); + } + redisTemplate.opsForHash().put(enterpriseId+"", messageDetailModel.getVin(), JSON.toJSONString(messageDetails)); + return Result.success(); + } + + @Override + public Result updateVehicle(MessageDetailModel messageDetailModel) { + Integer enterpriseId = SecurityUtils.getLoginUser().getSysUser().getEnterpriseId(); + Vehicle vehicle=messageDetailMapper.selectByVin(messageDetailModel.getVin()); + vehicleMapper.deleteMiddle(vehicle.getId()); + ArrayList messageList = new ArrayList<>(); + for (Integer s : messageDetailModel.getIds()) { + vehicleMapper.addMiddle(vehicle.getId(), s); + MessageDetail messageDetail = vehicleMapper.selectDetail(s); + messageList.add(messageDetail); + } + redisTemplate.opsForHash().put(enterpriseId+"", messageDetailModel.getVin(), JSON.toJSONString(messageList)); + rabbitTemplate.convertAndSend("eventMonitor",messageDetailModel.getVin()+"_"+enterpriseId); + return Result.success(); + } +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java index 3ce09a2..6c50bf0 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/VehicleServiceImpl.java @@ -1,13 +1,18 @@ package com.muyu.customer.business.service.impl; +import java.util.ArrayList; import java.util.List; +import com.alibaba.fastjson.JSON; +import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.ObjUtils; +import com.muyu.common.security.utils.SecurityUtils; import com.muyu.customer.business.domain.MessageDetail; -import com.muyu.customer.business.domain.model.VehicleMiddle; import com.muyu.customer.business.domain.model.VehicleModel; import lombok.extern.slf4j.Slf4j; +import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; import com.muyu.customer.business.mapper.VehicleMapper; import com.muyu.customer.business.domain.Vehicle; @@ -50,51 +55,51 @@ public class VehicleServiceImpl extends ServiceImpl imp queryWrapper.eq(Vehicle::getModel, vehicle.getModel()); } - if (ObjUtils.notNull(vehicle.getProductionDate())){ + if (ObjUtils.notNull(vehicle.getProductionDate())) { queryWrapper.eq(Vehicle::getProductionDate, vehicle.getProductionDate()); } - if (ObjUtils.notNull(vehicle.getBodyType())){ + if (ObjUtils.notNull(vehicle.getBodyType())) { queryWrapper.eq(Vehicle::getBodyType, vehicle.getBodyType()); } - if (ObjUtils.notNull(vehicle.getColor())){ + if (ObjUtils.notNull(vehicle.getColor())) { queryWrapper.eq(Vehicle::getColor, vehicle.getColor()); } - if (ObjUtils.notNull(vehicle.getEngineCapacity())){ + if (ObjUtils.notNull(vehicle.getEngineCapacity())) { queryWrapper.eq(Vehicle::getEngineCapacity, vehicle.getEngineCapacity()); } - if (ObjUtils.notNull(vehicle.getFuelType())){ + if (ObjUtils.notNull(vehicle.getFuelType())) { queryWrapper.eq(Vehicle::getFuelType, vehicle.getFuelType()); } - if (ObjUtils.notNull(vehicle.getTransmission())){ + if (ObjUtils.notNull(vehicle.getTransmission())) { queryWrapper.eq(Vehicle::getTransmission, vehicle.getTransmission()); } - if (ObjUtils.notNull(vehicle.getDriveType())){ + if (ObjUtils.notNull(vehicle.getDriveType())) { queryWrapper.eq(Vehicle::getDriveType, vehicle.getDriveType()); } - if (ObjUtils.notNull(vehicle.getMileage())){ + if (ObjUtils.notNull(vehicle.getMileage())) { queryWrapper.eq(Vehicle::getMileage, vehicle.getMileage()); } - if (ObjUtils.notNull(vehicle.getRegistrationDate())){ + if (ObjUtils.notNull(vehicle.getRegistrationDate())) { queryWrapper.eq(Vehicle::getRegistrationDate, vehicle.getRegistrationDate()); } - if (ObjUtils.notNull(vehicle.getLicenseNumber())){ + if (ObjUtils.notNull(vehicle.getLicenseNumber())) { queryWrapper.eq(Vehicle::getLicenseNumber, vehicle.getLicenseNumber()); } - if (ObjUtils.notNull(vehicle.getHolder())){ + if (ObjUtils.notNull(vehicle.getHolder())) { queryWrapper.eq(Vehicle::getHolder, vehicle.getHolder()); } - if (ObjUtils.notNull(vehicle.getVehicleType())){ + if (ObjUtils.notNull(vehicle.getVehicleType())) { queryWrapper.eq(Vehicle::getVehicleType, vehicle.getVehicleType()); } @@ -111,20 +116,16 @@ public class VehicleServiceImpl extends ServiceImpl imp @Override public String add(VehicleModel vehicleModel) { vehicleMapper.add(vehicleModel); - for (String s : vehicleModel.getMessageDetail()) { - vehicleMapper.addMiddle(vehicleModel.getId(),Integer.valueOf(s)); - } - - System.out.println(vehicleModel.getId()); -// MessageDetail messageDetail = vehicleModel.getMessageDetail(); return "成功"; } @Override public VehicleModel selectById(Long id) { - List vehicleMiddleList= vehicleMapper.selectMessageList(id); +// List vehicleMiddleList= vehicleMapper.selectMessageList(id); VehicleModel vehicleModel= vehicleMapper.selectId(id); +// vehicleModel.setMessageDetail(vehicleMiddleList); + System.out.println(vehicleModel.getMessageDetail()); return vehicleModel; } @@ -133,4 +134,17 @@ public class VehicleServiceImpl extends ServiceImpl imp return vehicleMapper.selectMessage(id); } + @Autowired + private StringRedisTemplate redisTemplate; + @Autowired + private RabbitTemplate rabbitTemplate; + @Override + public Result updateVehicle(Long id, VehicleModel vehicleModel) { + int i = vehicleMapper.updateVehicle(id, vehicleModel); +// vehicleMapper.deleteMiddle(id); +// +// + return Result.success(); + } + } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/MessageDetailMapper.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/MessageDetailMapper.xml new file mode 100644 index 0000000..b179209 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/MessageDetailMapper.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + select id, `key_code`, start_bit, stop_bit, label, `type` from message_detail + + + + + + diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml index ee1ab4b..cd15abc 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/VehicleMapper.xml @@ -43,12 +43,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" values (#{id}, #{integer}) + + update vehicle set + vin = #{vehicleModel.vin}, + brand = #{vehicleModel.brand}, + model = #{vehicleModel.model}, + production_date = #{vehicleModel.productionDate}, + body_type = #{vehicleModel.bodyType}, + color = #{vehicleModel.color}, + engine_capacity = #{vehicleModel.engineCapacity}, + fuel_type = #{vehicleModel.fuelType}, + transmission = #{vehicleModel.transmission}, + drive_type = #{vehicleModel.driveType}, + mileage = #{vehicleModel.mileage}, + registration_date = #{vehicleModel.registrationDate}, + license_number = #{vehicleModel.licenseNumber}, + holder = #{vehicleModel.holder}, + vehicle_type = #{vehicleModel.vehicleType} where id = #{id} + + + delete from vehicle_middle where vehicle_id = #{id} + - @@ -56,4 +74,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select m.id,m.key,m.lable,m.start_bit,m.stop_bit,m.type from message_detail m,vehicle_middle v where m.id = v.message_id and v.vehicle_id = #{id} + +