From ea9876fed9bd43f65ab9e880e54a8759df69bb48 Mon Sep 17 00:00:00 2001 From: baize <3533151373@qq.com> Date: Thu, 27 Jun 2024 11:59:30 +0800 Subject: [PATCH] =?UTF-8?q?feat():=20=E8=BD=A6=E8=BE=86=E6=8A=A5=E6=96=87?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E5=88=9D=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/domain/MessageDetail.java | 51 +++++++++++ .../customer/business/domain/Vehicle.java | 3 + .../business/domain/model/VehicleMiddle.java | 25 ++++++ .../business/domain/model/VehicleModel.java | 88 +++++++++++++++++++ .../business/domain/vo/FaultRecordVo.java | 27 ++++++ .../business/domain/EnterPriseInfo.java | 40 --------- .../remote/RemoteBusinessService.java | 24 ----- .../RemoteBusinessFallbackFactory.java | 35 -------- .../business/consumer/RabbitConsumer.java | 6 +- .../controller/FaultRecordController.java | 8 ++ .../controller/VehicleController.java | 29 +++++- .../business/mapper/FaultRecordMapper.java | 6 +- .../business/mapper/VehicleMapper.java | 15 ++++ .../business/service/FaultRecordService.java | 6 +- .../business/service/VehicleService.java | 11 +++ .../service/impl/FaultRecordServiceImpl.java | 15 +++- .../service/impl/VehicleServiceImpl.java | 38 ++++++++ .../customerBusiness/FaultRecordMapper.xml | 38 ++++++-- .../mapper/customerBusiness/VehicleMapper.xml | 25 ++++++ 19 files changed, 371 insertions(+), 119 deletions(-) create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/MessageDetail.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleMiddle.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleModel.java create mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/vo/FaultRecordVo.java delete mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/domain/EnterPriseInfo.java delete mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/RemoteBusinessService.java delete mode 100644 muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/factory/RemoteBusinessFallbackFactory.java 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 new file mode 100644 index 0000000..4e5a213 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/MessageDetail.java @@ -0,0 +1,51 @@ +package com.muyu.customer.business.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.io.Serializable; + +/** + * 报文详情对象 MessageDetail + * + * @author DeKangLiu + * Date 2024/6/26 20:48 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class MessageDetail { + + /** + * 报文id + */ + private Integer id; + + /** + * 报文key + */ + private String key; + + /** + * 报文起始位 + */ + private Integer startBit; + + /** + * 报文结束位 + */ + private Integer stopBit; + + /** + * 报文标签 + */ + private String lable; + + /** + * 报文类型 + */ + private String type; +} 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 df46a7e..50f04c4 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 @@ -118,6 +118,9 @@ public class Vehicle extends BaseEntity { @ApiModelProperty(name = "车辆类型", value = "车辆类型") private String vehicleType; +// /** 报文详情对象 */ +// private MessageDetail messageDetail; + /** * 查询构造器 */ diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleMiddle.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleMiddle.java new file mode 100644 index 0000000..38236f7 --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleMiddle.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; + +/** + * 车辆中间表 VehicleMiddle + * + * @author DeKangLiu + * Date 2024/6/27 09:53 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class VehicleMiddle { + + private Integer id; + + private Integer vehicleId; + + private Integer messageId; +} 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 new file mode 100644 index 0000000..a26373f --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/model/VehicleModel.java @@ -0,0 +1,88 @@ +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; + +import java.math.BigDecimal; +import java.util.Date; +import java.util.List; + +/** + * 车辆录入对象 VehicleModel + * + * @author DeKangLiu + * Date 2024/6/27 08:18 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class VehicleModel { + + /** 车辆id */ + private Long id; + + /** 车辆vin */ + private String vin; + + /** 品牌 */ + private String brand; + + /** 型号 */ + private String model; + + /** 生产日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date productionDate; + + /** 车身类型 */ + private String bodyType; + + /** 车身颜色 */ + private String color; + + /** 发动机排量 */ + private BigDecimal engineCapacity; + + /** 燃油类型 */ + private String fuelType; + + /** 变速器类型 */ + private String transmission; + + /** 驱动方式 */ + private String driveType; + + /** 行驶里程 */ + private BigDecimal mileage; + + /** 注册日期 */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date registrationDate; + + /** 车牌号码 */ + private String licenseNumber; + + /** 持有者 */ + private String holder; + + /** 车辆类型 */ + private String vehicleType; + + /** 报文详情对象 */ + private String[] messageDetail; +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/vo/FaultRecordVo.java b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/vo/FaultRecordVo.java new file mode 100644 index 0000000..e0a6edc --- /dev/null +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-common/src/main/java/com/muyu/customer/business/domain/vo/FaultRecordVo.java @@ -0,0 +1,27 @@ +package com.muyu.customer.business.domain.vo; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 故障日志条件查询 FaultRecordVo + * + * @author DeKangLiu + * Date 2024/6/24 19:32 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class FaultRecordVo { + /** + * 故障码 + */ + private String faultCode; + /** + * 车辆vin + */ + private String vin; + private String count; + private String faultLabel; +} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/domain/EnterPriseInfo.java b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/domain/EnterPriseInfo.java deleted file mode 100644 index d117e7d..0000000 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/domain/EnterPriseInfo.java +++ /dev/null @@ -1,40 +0,0 @@ -//package com.muyu.customer.business.domain; -// -//import com.muyu.common.core.annotation.Excel; -//import com.muyu.common.core.web.domain.BaseEntity; -//import lombok.AllArgsConstructor; -//import lombok.Data; -//import lombok.EqualsAndHashCode; -//import lombok.NoArgsConstructor; -//import lombok.experimental.SuperBuilder; -// -///** -// * 多数据源对象 EnterpriseInfo -// * -// * @author DeKangLiu -// * Date 2024/6/22 20:37 -// */ -//@Data -//@SuperBuilder -//@NoArgsConstructor -//@AllArgsConstructor -//@EqualsAndHashCode(callSuper = true) -////@TableName("entinfo") -//public class EnterPriseInfo extends BaseEntity { -// private static final long serialVersionUID = 1L; -// -// /** 数据源key */ -// @Excel(name = "数据源key") -// private String entCode; -// -// /** 数据源ip */ -// @Excel(name = "数据源ip") -// private String ip; -// -// /** 数据源端口 */ -// @Excel(name = "数据源端口") -// private Integer port; -// -// /** 数据源ID */ -// private Long id; -//} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/RemoteBusinessService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/RemoteBusinessService.java deleted file mode 100644 index 612ba81..0000000 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/RemoteBusinessService.java +++ /dev/null @@ -1,24 +0,0 @@ -//package com.muyu.customer.business.remote; -// -//import com.muyu.common.core.constant.ServiceNameConstants; -//import com.muyu.customer.business.remote.factory.RemoteBusinessFallbackFactory; -//import org.springframework.cloud.openfeign.FeignClient; -//import org.springframework.web.bind.annotation.GetMapping; -//import com.muyu.net.working.domain.DataSource; -//import java.util.List; -// -///** -// * 用户服务 RemoteBusinessService -// * -// * @author DeKangLiu -// * Date 2024/6/22 20:39 -// */ -//@FeignClient( -// contextId = "remoteBusinessService", -// value = ServiceNameConstants.SYSTEM_BUSINESS, -// fallbackFactory = RemoteBusinessFallbackFactory.class -//) -//public interface RemoteBusinessService { -// @GetMapping("/datasource/listAll") -// public List listAll(); -//} diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/factory/RemoteBusinessFallbackFactory.java b/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/factory/RemoteBusinessFallbackFactory.java deleted file mode 100644 index 4b1afca..0000000 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-remote/src/main/java/com/muyu/customer/business/remote/factory/RemoteBusinessFallbackFactory.java +++ /dev/null @@ -1,35 +0,0 @@ -//package com.muyu.customer.business.remote.factory; -// -//import com.muyu.customer.business.remote.RemoteBusinessService; -//import com.muyu.net.working.domain.DataSource; -//import org.slf4j.Logger; -//import org.slf4j.LoggerFactory; -//import org.springframework.cloud.openfeign.FallbackFactory; -//import org.springframework.stereotype.Component; -// -//import java.util.List; -// -///** -// * 熔断器 RemoteBusinessFallbackFactory -// * -// * @author DeKangLiu -// * Date 2024/6/22 20:41 -// */ -//@Component -//public class RemoteBusinessFallbackFactory implements FallbackFactory { -// private static final Logger log = LoggerFactory.getLogger(RemoteBusinessFallbackFactory.class); -// -// @Override -// public RemoteBusinessService create (Throwable throwable) { -// log.error("用户服务调用失败:{}", throwable.getMessage()); -// return new RemoteBusinessService() { -// /** -// * 获取所有企业信息 -// */ -// @Override -// public List listAll() { -// return null; -// } -// }; -// } -//} 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 2e588da..7e0f924 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 @@ -92,13 +92,13 @@ public void consumptionStartMessage(Message message, Channel channel) { .vin(split[0]) .faultCode(split[1]) .faultLevel(split[2]) - .startTime(date) + .endTime(date) .build(); FaultRecord faultRecordOne = faultRecordService.selectFault(build); log.info("查询到的故障为：{}",faultRecordOne); - faultRecordOne.setEndTime(faultRecord.getEndTime()); + faultRecordOne.setEndTime(build.getEndTime()); // 进行修改故障表 - faultRecordService.updateByFaultRecord(faultRecordOne); + faultRecordService.updateFault(faultRecordOne); // 移除数据源， DynamicDataSourceHolder.removeDynamicDataSourceKey(); channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultRecordController.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultRecordController.java index ea82c06..89b0901 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultRecordController.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/controller/FaultRecordController.java @@ -7,6 +7,7 @@ import com.muyu.customer.business.domain.FaultRecord; 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 com.muyu.customer.business.domain.vo.FaultRecordVo; import com.muyu.customer.business.service.FaultRecordService; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.Autowired; @@ -108,4 +109,11 @@ public class FaultRecordController extends BaseController { public Result remove(@PathVariable List ids) { return toAjax(faultRecordService.removeBatchByIds(ids)); } + + @Log(title = "柱状图",businessType = BusinessType.DELETE) + @GetMapping("/countList") + @ApiOperation("柱状图展示") + public Result> countList( ) { + return Result.success(faultRecordService.countList()); + } } 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 6ff616d..bc89021 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,9 +7,13 @@ 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; @@ -27,6 +31,7 @@ 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 @@ -44,6 +49,8 @@ public class VehicleController extends BaseController { private HttpServletRequest request; @Autowired private StringRedisTemplate redisTemplate; + @Autowired + private RedisService redisService; /** * 查询车辆录入列表 @@ -69,6 +76,11 @@ 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); } @@ -93,8 +105,8 @@ public class VehicleController extends BaseController { @RequiresPermissions("customerBusiness:vehicle: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(vehicleService.getById(id)); + public Result getInfo(@PathVariable("id") Long id) { + return Result.success(vehicleService.selectById(id)); } /** @@ -104,9 +116,9 @@ public class VehicleController extends BaseController { @Log(title = "车辆录入", businessType = BusinessType.INSERT) @PostMapping @ApiOperation("新增车辆录入") - public Result add(@RequestBody VehicleSaveReq vehicleSaveReq) { + public Result add(@RequestBody VehicleModel vehicleModel) { - return toAjax(vehicleService.save(Vehicle.saveBuild(vehicleSaveReq))); + return Result.success(vehicleService.add(vehicleModel)); } /** @@ -132,6 +144,15 @@ public class VehicleController extends BaseController { return toAjax(vehicleService.removeBatchByIds(ids)); } + + /** + * 查询报文详情列表 + */ + @GetMapping("/MessageList") + public Result> MessageList() { + return Result.success(vehicleService.MessageList()); + } + // @Autowired // private VehicleMapper vehicleMapper; // diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultRecordMapper.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultRecordMapper.java index ea1baff..7512a9e 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultRecordMapper.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/mapper/FaultRecordMapper.java @@ -3,6 +3,7 @@ package com.muyu.customer.business.mapper; import java.util.List; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.customer.business.domain.FaultRecord; +import com.muyu.customer.business.domain.vo.FaultRecordVo; /** * 故障记录Mapper接口 @@ -12,7 +13,10 @@ import com.muyu.customer.business.domain.FaultRecord; */ public interface FaultRecordMapper extends BaseMapper { - void addRecord(FaultRecord build); FaultRecord selectFault(FaultRecord build); + + void updateFault(FaultRecord faultRecordOne); + + List countList(); } 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 aa124e4..cd9b297 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 @@ -2,7 +2,11 @@ package com.muyu.customer.business.mapper; 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; /** * 车辆录入Mapper接口 @@ -12,4 +16,15 @@ import com.muyu.customer.business.domain.Vehicle; */ public interface VehicleMapper extends BaseMapper { + List MessageList(); + + void add(VehicleModel vehicleModel); + + void addMiddle(@Param("id") Long id, @Param("integer") Integer integer); + + List selectMessageList(@Param("id") Long id); + + VehicleModel selectId(@Param("id") Long id); + + List selectMessage(@Param("id") Long id); } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultRecordService.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultRecordService.java index 8f4ac0d..1c805b6 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultRecordService.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/FaultRecordService.java @@ -3,6 +3,7 @@ package com.muyu.customer.business.service; import java.util.List; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.customer.business.domain.FaultRecord; +import com.muyu.customer.business.domain.vo.FaultRecordVo; /** * 故障记录Service接口 @@ -19,7 +20,10 @@ public interface FaultRecordService extends IService { */ public List list(FaultRecord faultRecord); - void addRecord(FaultRecord build); FaultRecord selectFault(FaultRecord build); + + void updateFault(FaultRecord faultRecordOne); + + List countList(); } 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 de7260e..aacce8f 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 @@ -1,8 +1,11 @@ package com.muyu.customer.business.service; import java.util.List; + +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; /** @@ -20,4 +23,12 @@ public interface VehicleService extends IService { */ List list(Vehicle vehicle); + List MessageList(); + + + String add(VehicleModel vehicleModel); + + VehicleModel selectById(Long id); + + List selectMessage(Long id); } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultRecordServiceImpl.java b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultRecordServiceImpl.java index bcbf1a9..1c22c4e 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultRecordServiceImpl.java +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/java/com/muyu/customer/business/service/impl/FaultRecordServiceImpl.java @@ -5,6 +5,7 @@ import java.util.List; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.ObjUtils; import com.muyu.customer.business.domain.FaultRecord; +import com.muyu.customer.business.domain.vo.FaultRecordVo; import com.muyu.customer.business.mapper.FaultRecordMapper; import com.muyu.customer.business.service.FaultRecordService; import lombok.extern.slf4j.Slf4j; @@ -49,13 +50,19 @@ public class FaultRecordServiceImpl extends ServiceImpl countList() { + return faultRecordMapper.countList(); + } } 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 5db4bef..3ce09a2 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 @@ -3,7 +3,11 @@ package com.muyu.customer.business.service.impl; import java.util.List; import com.muyu.common.core.utils.ObjUtils; +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.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.muyu.customer.business.mapper.VehicleMapper; import com.muyu.customer.business.domain.Vehicle; @@ -20,6 +24,8 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @Slf4j @Service public class VehicleServiceImpl extends ServiceImpl implements VehicleService { + @Autowired + private VehicleMapper vehicleMapper; /** * 查询车辆录入列表 @@ -95,4 +101,36 @@ public class VehicleServiceImpl extends ServiceImpl imp return list(queryWrapper); } + + @Override + public List MessageList() { + return vehicleMapper.MessageList(); + } + + + @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); + VehicleModel vehicleModel= vehicleMapper.selectId(id); + return vehicleModel; + } + + @Override + public List selectMessage(Long id) { + return vehicleMapper.selectMessage(id); + } + } diff --git a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultRecordMapper.xml b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultRecordMapper.xml index 1cce7a5..52809ff 100644 --- a/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultRecordMapper.xml +++ b/muyu-modules/muyu-customer-business/muyu-customer-business-server/src/main/resources/mapper/customerBusiness/FaultRecordMapper.xml @@ -1,7 +1,7 @@ + PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> @@ -17,14 +17,38 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, fault_code, vin, start_time, end_time, fault_level, fault_handle from fault_record - - INSERT INTO fault_record - (`fault_code`, `vin`, `start_time`, `end_time`, `fault_level`, `fault_handle`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES - values(#{faultCode},#{vin},#{startTime},null,#{faultLevel},#{faultHandle},null,null,null,null,null) - + + + update fault_record set end_time=#{endTime} where id=#{id} + + + + + 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 b43bc4b..ee1ab4b 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 @@ -31,4 +31,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select id, vin, brand, model, production_date, body_type, color, engine_capacity, fuel_type, transmission, drive_type, mileage, registration_date, license_number, holder, vehicle_type, create_by, create_time, update_by, update_time, remark from vehicle + + insert into vehicle + (id, vin, brand, model, production_date, body_type, color, engine_capacity, fuel_type, transmission, drive_type, mileage, registration_date, license_number, holder, vehicle_type) + values + (#{id}, #{vin}, #{brand}, #{model}, #{productionDate}, #{bodyType}, #{color}, #{engineCapacity}, #{fuelType}, #{transmission}, #{driveType}, #{mileage}, #{registrationDate}, #{licenseNumber}, #{holder}, #{vehicleType}) + + + insert into vehicle_middle + (vehicle_id, message_id) + values + (#{id}, #{integer}) + + + + +