From 66c9d93ebe37d55fe28234ecb94cc917dba2dfc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E5=A4=A7=E4=B8=BE?= <13970129+huandgaju@user.noreply.gitee.com> Date: Fri, 5 Apr 2024 22:14:34 +0800 Subject: [PATCH] =?UTF-8?q?4.5:=E6=95=85=E9=9A=9C=E9=A2=84=E8=AD=A6?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=85=E9=9A=9C=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- muyu-analyze/pom.xml | 4 + .../com/muyu/analyze/consumer/Consumer.java | 7 - .../muyu/analyze/mapper/VehicleMapper.java | 7 +- .../analyze/service/impl/BreakdownImpl.java | 219 +++++++++++++++++- .../analyze/service/impl/StoredEventImpl.java | 6 +- .../com/muyu/analyze/utils/StateConstant.java | 88 +++++++ muyu-analyze/src/main/resources/bootstrap.yml | 13 +- .../mapper/business/StoredEventMapper.xml | 16 ++ .../muyu-business-common/pom.xml | 4 + .../muyu/business}/domain/FaultCodeInfo.java | 25 +- .../com/muyu/business/domain/FaultLogs.java | 30 ++- .../domain/config/RestClientConfig.java | 2 +- .../business}/domain/req/FaultCodeReq.java | 9 +- .../domain/req/FaultCodesAddReq.java | 18 +- .../domain/req/FaultCodesUpdReq.java | 18 +- .../business/domain/req/FaultLogsAddReq.java | 102 +++++++- .../business/domain/req/FaultLogsReq.java | 14 +- .../business/domain/req/FaultLogsUpdReq.java | 13 +- .../domain/res/FaultCodeResponse.java | 11 +- .../controller/FaultCodesController.java | 8 +- .../business/mapper/FaultCodesMapper.java | 4 +- .../business/service/FaultCodesService.java | 4 +- .../service/impl/FaultCodesServiceImpl.java | 4 +- .../com/muyu/system/common/domain/Fence.java | 2 +- 24 files changed, 528 insertions(+), 100 deletions(-) create mode 100644 muyu-analyze/src/main/java/com/muyu/analyze/utils/StateConstant.java create mode 100644 muyu-analyze/src/main/resources/mapper/business/StoredEventMapper.xml rename muyu-modules/{muyu-system/muyu-system-common/src/main/java/com/muyu/system/common => muyu-business/muyu-business-common/src/main/java/com/muyu/business}/domain/FaultCodeInfo.java (84%) rename muyu-modules/{muyu-system/muyu-system-common/src/main/java/com/muyu/system/common => muyu-business/muyu-business-common/src/main/java/com/muyu/business}/domain/config/RestClientConfig.java (91%) rename muyu-modules/{muyu-system/muyu-system-common/src/main/java/com/muyu/system/common => muyu-business/muyu-business-common/src/main/java/com/muyu/business}/domain/req/FaultCodeReq.java (67%) rename muyu-modules/{muyu-system/muyu-system-common/src/main/java/com/muyu/system/common => muyu-business/muyu-business-common/src/main/java/com/muyu/business}/domain/req/FaultCodesAddReq.java (78%) rename muyu-modules/{muyu-system/muyu-system-common/src/main/java/com/muyu/system/common => muyu-business/muyu-business-common/src/main/java/com/muyu/business}/domain/req/FaultCodesUpdReq.java (79%) rename muyu-modules/{muyu-system/muyu-system-common/src/main/java/com/muyu/system/common => muyu-business/muyu-business-common/src/main/java/com/muyu/business}/domain/res/FaultCodeResponse.java (83%) diff --git a/muyu-analyze/pom.xml b/muyu-analyze/pom.xml index 721b504..6b7eec6 100644 --- a/muyu-analyze/pom.xml +++ b/muyu-analyze/pom.xml @@ -101,6 +101,10 @@ spring-kafka 2.8.1 + + com.muyu + muyu-business-common + diff --git a/muyu-analyze/src/main/java/com/muyu/analyze/consumer/Consumer.java b/muyu-analyze/src/main/java/com/muyu/analyze/consumer/Consumer.java index 743092b..5bdbf95 100644 --- a/muyu-analyze/src/main/java/com/muyu/analyze/consumer/Consumer.java +++ b/muyu-analyze/src/main/java/com/muyu/analyze/consumer/Consumer.java @@ -35,7 +35,6 @@ public class Consumer { @KafkaListener(topics = "test", groupId = "group", properties = {"bootstrap.servers = 10.10.26.5:9092"}) - @PostMapping("/msg") public void getMessage(String msg) { VehicleData analyze = AnalyzeUtils.analyze(msg); for (String s : list) { @@ -44,12 +43,6 @@ public class Consumer { } } - - - - - - } diff --git a/muyu-analyze/src/main/java/com/muyu/analyze/mapper/VehicleMapper.java b/muyu-analyze/src/main/java/com/muyu/analyze/mapper/VehicleMapper.java index d7b457b..65eaea5 100644 --- a/muyu-analyze/src/main/java/com/muyu/analyze/mapper/VehicleMapper.java +++ b/muyu-analyze/src/main/java/com/muyu/analyze/mapper/VehicleMapper.java @@ -17,16 +17,11 @@ import java.util.List; */ @Mapper public interface VehicleMapper{ + Boolean addVehicleStoredEvent(ArrayList list); -// void addVehicleStoredEvent(VehicleData analyze); - - -// void addVehicleStoredEvent1(ArrayList list); - - } diff --git a/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/BreakdownImpl.java b/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/BreakdownImpl.java index 5f2535f..9f4a3c1 100644 --- a/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/BreakdownImpl.java +++ b/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/BreakdownImpl.java @@ -1,9 +1,19 @@ package com.muyu.analyze.service.impl; +import com.alibaba.fastjson.JSON; import com.muyu.analyze.domian.VehicleData; import com.muyu.analyze.service.VehicleService; +import com.muyu.analyze.utils.StateConstant; + +import com.muyu.business.domain.FaultLogs; +import lombok.extern.slf4j.Slf4j; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; +import java.util.concurrent.TimeUnit; + /** * @ProjectName: cloud-vehicles * @PackageName: com.muyu.analyze.service.impl.historicalTrack @@ -13,16 +23,221 @@ import org.springframework.stereotype.Service; * @Version 1.0 */ @Service("breakdown") +@Slf4j public class BreakdownImpl implements VehicleService{ + @Autowired + private StringRedisTemplate redisTemplate; + @Override - public void eventResolution(VehicleData analyze) { - System.out.println("我是故障报警"); + public void eventResolution(VehicleData vehicleData) { + + log.info("故障事件解析"); + if (StateConstant.VEHICLE_STATUS != vehicleData.getVehicleStatus() + || StateConstant.CHARGING_STATUS!=vehicleData.getChgStatus() + || StateConstant.OPERATING_STATUS!=vehicleData.getOperatingStatus() + || StateConstant.SOC_STATUS!=vehicleData.getSocStatus() + || StateConstant.CHARGING_ENERGY_STORAGE_STATUS != vehicleData.getChargingEnergyStorageStatus() + || StateConstant.DRIVE_MOTOR_STATUS != vehicleData.getDriveMotorStatus() + || StateConstant.POSITION_STATUS != vehicleData.getPositionStatus() + || StateConstant.EAS_STATUS != vehicleData.getEasStatus() + || StateConstant.PTC_STATUS != vehicleData.getPtcStatus() + || StateConstant.ABS_STATUS != vehicleData.getAbsStatus() + || StateConstant.MCU_STATUS != vehicleData.getMcuStatus() + || StateConstant.HEATING_STATUS != vehicleData.getHeatingStatus() + || StateConstant.BATTERY_STATUS != vehicleData.getBatteryStatus() + || StateConstant.BATTERY_INSULATION_STATUS != vehicleData.getBatteryInsulationStatus() + || StateConstant.DCDC_STATUS != vehicleData.getDcdcStatus() + || StateConstant.CHG_STATUS != vehicleData.getChgStatus()){ + + + FaultLogs faultLogsAddReq = new FaultLogs(); + faultLogsAddReq.setCarVin(vehicleData.getVin()); + + // /** + + + // * 车辆状态 + // */ + // private int vehicleStatus ; + + if (vehicleData.getVehicleStatus()==0){ + faultLogsAddReq.setFaultCode("GTB001"); + faultLogsAddReq.setFaultLevel(3); + } + // /** + // * 充电状态 + // */ + // private int chargingStatus; + if (vehicleData.getChargingStatus()==0){ + faultLogsAddReq.setFaultCode("GTB002"); + faultLogsAddReq.setFaultLevel(3); + } + // /** + // * 运行状态 + // */ + // private int operatingStatus; + if (vehicleData.getOperatingStatus()==0){ + faultLogsAddReq.setFaultCode("GTB003"); + faultLogsAddReq.setFaultLevel(3); + } + // /** + // * SOC + // */ + // private int socStatus; + if (vehicleData.getSocStatus()==0){ + faultLogsAddReq.setFaultCode("GTO001"); + faultLogsAddReq.setFaultLevel(2); + } + // + // + //GTO003 + + // /** + // * 可充电储能装置工作状态 + // */ + // private int chargingEnergyStorageStatus ; + if (vehicleData.getChargingEnergyStorageStatus()==0){ + faultLogsAddReq.setFaultCode("GTO002"); + faultLogsAddReq.setFaultLevel(2); + } + // /** + // * 驱动电机状态 + // */ + // private int driveMotorStatus ; + if (vehicleData.getDriveMotorStatus()==0){ + faultLogsAddReq.setFaultCode("GT0003"); + faultLogsAddReq.setFaultLevel(2); + } + // /** + // * 定位是否有效 + // */ + // private int positionStatus ; + if (vehicleData.getPositionStatus()==0){ + faultLogsAddReq.setFaultCode("GT0004"); + faultLogsAddReq.setFaultLevel(2); + } //GTO004 + //GTO005 + //GTO006 + //GTO007 + // /** + // * EAS(汽车防盗系统)状态 + // */ + // private int easStatus ; + if (vehicleData.getEasStatus()==0){ + faultLogsAddReq.setFaultCode("GTO005"); + faultLogsAddReq.setFaultLevel(2); + } + // /** + // * PTC(电动加热器)状态 + // */ + // private int ptcStatus ; + if (vehicleData.getPtcStatus()==0){ + + faultLogsAddReq.setFaultCode("GTO006"); + faultLogsAddReq.setFaultLevel(2); + } + // /** + // * EPS(电动助力系统)状态 + // */ + // private int epsStatus ; + if (vehicleData.getEpsStatus()==0){ + + faultLogsAddReq.setFaultCode("GTO007"); + faultLogsAddReq.setFaultLevel(2); + } + // /** + // * ABS(防抱死)状态 + // */ + // private int absStatus ; + if (vehicleData.getAbsStatus()==0){ + + faultLogsAddReq.setFaultCode("GTX001"); + faultLogsAddReq.setFaultLevel(1); + } + + // /** + // * MCU(电机/逆变器)状态 + // */ + // private int mcuStatus ; + if (vehicleData.getMcuStatus()==0){ + + faultLogsAddReq.setFaultCode("GTX002"); + faultLogsAddReq.setFaultLevel(1); + } + // /** + // * 动力电池加热状态 + // */ + // private int heatingStatus ; + if (vehicleData.getHeatingStatus()==0){ + + faultLogsAddReq.setFaultCode("GTX003"); + faultLogsAddReq.setFaultLevel(1); + } + // /** + // * 动力电池当前状态 + // */ + // private int batteryStatus ; + if (vehicleData.getBatteryStatus()==0){ + + faultLogsAddReq.setFaultCode("GTX004"); + faultLogsAddReq.setFaultLevel(1); + } + // /** + // * 动力电池保温状态 + // */ + // private int batteryInsulationStatus ; + if (vehicleData.getBatteryInsulationStatus()==0){ + + faultLogsAddReq.setFaultCode("GTX005"); + faultLogsAddReq.setFaultLevel(1); + } + // /** + // * DCDC(电力交换系统)状态 + // */ + // private int dcdcStatus ; + if (vehicleData.getDcdcStatus()==0){ + + faultLogsAddReq.setFaultCode("GTX006"); + faultLogsAddReq.setFaultLevel(1); + } + // /** + // * CHG(充电机)状态 + // */ + // private int chgStatus ; + if (vehicleData.getChgStatus()==0){ + + faultLogsAddReq.setFaultCode("GTX007"); + faultLogsAddReq.setFaultLevel(1); + } +// rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE, RabbitMqConfig.KEY,faultLogsAddReq, message -> { +// message.getMessageProperties().setMessageId(UUID.randomUUID().toString()); +// return message; +// } ,new CorrelationData(UUID.randomUUID().toString())); + + + + String key = "breakdown"; + String value = JSON.toJSONString(faultLogsAddReq); + redisTemplate.opsForSet().add(key, value); + long expireTime = 30; + redisTemplate.expire(key, expireTime, TimeUnit.MINUTES); + } + + log.info("故障事件结束"); } + + + + + + + + } diff --git a/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/StoredEventImpl.java b/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/StoredEventImpl.java index 980b37d..c426eb8 100644 --- a/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/StoredEventImpl.java +++ b/muyu-analyze/src/main/java/com/muyu/analyze/service/impl/StoredEventImpl.java @@ -25,10 +25,12 @@ import java.util.List; @Slf4j public class StoredEventImpl implements VehicleService { + @Autowired + private VehicleMapper vehicleMapper; + private final ArrayList list = new ArrayList<>(); - @Autowired - private VehicleMapper vehicleMapper; + @Override public void eventResolution(VehicleData analyze) { diff --git a/muyu-analyze/src/main/java/com/muyu/analyze/utils/StateConstant.java b/muyu-analyze/src/main/java/com/muyu/analyze/utils/StateConstant.java new file mode 100644 index 0000000..bc1f11f --- /dev/null +++ b/muyu-analyze/src/main/java/com/muyu/analyze/utils/StateConstant.java @@ -0,0 +1,88 @@ +package com.muyu.analyze.utils; + +import org.springframework.stereotype.Component; + +/** + * @Author: LiJiaYao + * @Date: 2024/4/4 + * @Description: + */ +@Component +public class StateConstant { + + /** + * 车辆状态 + */ + public static final Integer VEHICLE_STATUS = 1; + + /** + * 充电状态 + */ + public static final Integer CHARGING_STATUS = 1; + + /** + * 运行状态 + */ + public static final Integer OPERATING_STATUS = 1; + + /** + * soc状态 + */ + public static final Integer SOC_STATUS = 1; + + /** + * 可充电储能装置工作状态 + */ + public static final Integer CHARGING_ENERGY_STORAGE_STATUS = 1; + + /** + * 驱动电机状态 + */ + public static final Integer DRIVE_MOTOR_STATUS = 1; + + /** + * 定位是否有效 + */ + public static final Integer POSITION_STATUS = 1; + + /** + * EAS(汽车防盗系统)状态 + */ + public static final Integer EAS_STATUS = 1; + + /** + * PTC(电动加热器)状态 + */ + public static final Integer PTC_STATUS = 1; + + /** + * ABS(防抱死)状态 + */ + public static final Integer ABS_STATUS = 1; + + /** + * MCU(电机/逆变器)状态 + */ + public static final Integer MCU_STATUS = 1; + /** + * 动力电池加热状态 + */ + public static final Integer HEATING_STATUS = 1; + /** + * 动力电池当前状态 + */ + public static final Integer BATTERY_STATUS = 1; + /** + * 动力电池保温状态 + */ + public static final Integer BATTERY_INSULATION_STATUS = 1; + /** + * DCDC(电力交换系统) 状态 + */ + public static final Integer DCDC_STATUS = 1; + /** + * CHG(充电机)状态 + */ + public static final Integer CHG_STATUS = 1; + +} diff --git a/muyu-analyze/src/main/resources/bootstrap.yml b/muyu-analyze/src/main/resources/bootstrap.yml index a829f2f..eca5822 100644 --- a/muyu-analyze/src/main/resources/bootstrap.yml +++ b/muyu-analyze/src/main/resources/bootstrap.yml @@ -22,15 +22,4 @@ spring: # 共享配置 shared-configs: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # Kafka - kafka: - producer: - key-serializer: org.apache.kafka.common.serialization.StringSerializer - value-serializer: org.apache.kafka.common.serialization.StringSerializer - bootstrap-servers: 10.10.26.5:9092 - consumer: - group-id: group - key-deserializer: org.apache.kafka.common.serialization.StringDeserializer - value-deserializer: org.apache.kafka.common.serialization.StringDeserializer -#kafka: -# topic: test + diff --git a/muyu-analyze/src/main/resources/mapper/business/StoredEventMapper.xml b/muyu-analyze/src/main/resources/mapper/business/StoredEventMapper.xml new file mode 100644 index 0000000..39979fd --- /dev/null +++ b/muyu-analyze/src/main/resources/mapper/business/StoredEventMapper.xml @@ -0,0 +1,16 @@ + + + + + + + INSERT INTO vehicle_data (vin, date_time, speed, longitude, latitude, single_battery_min_voltage, motor_voltage, motor_speed, self_check_counter, voltage, gear, remaining_battery, motor_current, brake_pedal, current, single_battery_max_voltage, fuel_consumption_rate, resistance, maximum_feedback_power, single_battery_max_temperature) + VALUES + + (#{item.vin}, #{item.dateTime}, #{item.speed}, #{item.longitude}, #{item.latitude}, #{item.singleBatteryMinVoltage}, #{item.motorVoltage}, #{item.motorSpeed}, #{item.selfCheckCounter}, #{item.voltage}, #{item.gear}, #{item.remainingBattery}, #{item.motorCurrent}, #{item.brakePedal}, #{item.current}, #{item.singleBatteryMaxVoltage}, #{item.fuelConsumptionRate}, #{item.resistance}, #{item.maximumFeedbackPower}, #{item.singleBatteryMaxTemperature}) + + + + diff --git a/muyu-modules/muyu-business/muyu-business-common/pom.xml b/muyu-modules/muyu-business/muyu-business-common/pom.xml index b34c785..c458b38 100644 --- a/muyu-modules/muyu-business/muyu-business-common/pom.xml +++ b/muyu-modules/muyu-business/muyu-business-common/pom.xml @@ -16,6 +16,10 @@ com.muyu muyu-common-core + + com.muyu + muyu-system-common + diff --git a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/FaultCodeInfo.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultCodeInfo.java similarity index 84% rename from muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/FaultCodeInfo.java rename to muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultCodeInfo.java index 2c411fb..0b037dc 100644 --- a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/FaultCodeInfo.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultCodeInfo.java @@ -1,16 +1,19 @@ -package com.muyu.system.common.domain; +package com.muyu.business.domain; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.*; +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.business.domain.req.FaultCodesAddReq; +import com.muyu.business.domain.req.FaultCodesUpdReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; -import com.muyu.system.common.domain.req.FaultCodesAddReq; -import com.muyu.system.common.domain.req.FaultCodesUpdReq; -import lombok.*; -import lombok.experimental.*; -import org.springframework.format.annotation.*; - -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Date; /** * 故障码对象 fault_codes diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultLogs.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultLogs.java index da7d57d..eeb2738 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultLogs.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/FaultLogs.java @@ -1,15 +1,21 @@ package com.muyu.business.domain; -import com.baomidou.mybatisplus.annotation.*; -import com.fasterxml.jackson.annotation.*; -import com.muyu.business.domain.req.*; -import io.swagger.annotations.*; -import lombok.*; -import lombok.experimental.*; -import org.springframework.format.annotation.*; +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.business.domain.req.FaultLogsAddReq; +import com.muyu.business.domain.req.FaultLogsUpdReq; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.springframework.format.annotation.DateTimeFormat; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Date; /** * 故障日志对象 @@ -103,6 +109,12 @@ public class FaultLogs implements Serializable { @ApiModelProperty("备注") private String remark; + /** + * 故障等级 + */ + private Integer faultLevel; + + public static FaultLogs addFaultLogsReq(FaultLogsAddReq faultLogsAddReq){ return FaultLogs.builder() .carVin(faultLogsAddReq.getCarVin()) diff --git a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/config/RestClientConfig.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/config/RestClientConfig.java similarity index 91% rename from muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/config/RestClientConfig.java rename to muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/config/RestClientConfig.java index 38ea102..bbd3dce 100644 --- a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/config/RestClientConfig.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/config/RestClientConfig.java @@ -1,4 +1,4 @@ -package com.muyu.system.common.domain.config; +package com.muyu.business.domain.config; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodeReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodeReq.java similarity index 67% rename from muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodeReq.java rename to muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodeReq.java index 1fed9c5..fb7e3b2 100644 --- a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodeReq.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodeReq.java @@ -1,9 +1,12 @@ -package com.muyu.system.common.domain.req; +package com.muyu.business.domain.req; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; -import java.io.*; +import java.io.Serializable; /** * 查询故障码对象 diff --git a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodesAddReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesAddReq.java similarity index 78% rename from muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodesAddReq.java rename to muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesAddReq.java index 7b8bccb..4c27def 100644 --- a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodesAddReq.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesAddReq.java @@ -1,12 +1,16 @@ -package com.muyu.system.common.domain.req; +package com.muyu.business.domain.req; -import com.fasterxml.jackson.annotation.*; -import lombok.*; -import org.springframework.format.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.*; -import java.io.*; -import java.util.*; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; /** * 新增故障码对象 diff --git a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodesUpdReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesUpdReq.java similarity index 79% rename from muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodesUpdReq.java rename to muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesUpdReq.java index ecdb660..5e6bcc5 100644 --- a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/req/FaultCodesUpdReq.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultCodesUpdReq.java @@ -1,12 +1,16 @@ -package com.muyu.system.common.domain.req; +package com.muyu.business.domain.req; -import com.fasterxml.jackson.annotation.*; -import lombok.*; -import org.springframework.format.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; -import javax.validation.constraints.*; -import java.io.*; -import java.util.*; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; +import java.io.Serializable; +import java.util.Date; /** * 编辑故障码对象 diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsAddReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsAddReq.java index 40b2b76..c1773d0 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsAddReq.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsAddReq.java @@ -1,11 +1,14 @@ package com.muyu.business.domain.req; -import com.fasterxml.jackson.annotation.*; -import lombok.*; -import org.springframework.format.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Date; /** * 新增故障日志对象 @@ -77,6 +80,11 @@ public class FaultLogsAddReq implements Serializable { */ private String disposeStatus; + /** + * 故障等级 + */ + private Integer faultLevel; + /** * 创建者 */ @@ -93,4 +101,88 @@ public class FaultLogsAddReq implements Serializable { * 备注 */ private String remark; + /** + * 车辆状态 + */ + private int vehicleStatus ; + + /** + * 充电状态 + */ + private int chargingStatus; + + /** + * 运行状态 + */ + private int operatingStatus; + + /** + * SOC + */ + private int socStatus; + + /** + * 可充电储能装置工作状态 + */ + private int chargingEnergyStorageStatus ; + + /** + * 驱动电机状态 + */ + private int driveMotorStatus ; + + /** + * 定位是否有效 + */ + private int positionStatus ; + + /** + * EAS(汽车防盗系统)状态 + */ + private int easStatus ; + + /** + * PTC(电动加热器)状态 + */ + private int ptcStatus ; + + /** + * EPS(电动助力系统)状态 + */ + private int epsStatus ; + + /** + * ABS(防抱死)状态 + */ + private int absStatus ; + + /** + * MCU(电机/逆变器)状态 + */ + private int mcuStatus ; + + /** + * 动力电池加热状态 + */ + private int heatingStatus ; + + /** + * 动力电池当前状态 + */ + private int batteryStatus ; + + /** + * 动力电池保温状态 + */ + private int batteryInsulationStatus ; + + /** + * DCDC(电力交换系统)状态 + */ + private int dcdcStatus ; + + /** + * CHG(充电机)状态 + */ + private int chgStatus ; } diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsReq.java index 1644717..c47361b 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsReq.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsReq.java @@ -1,12 +1,14 @@ package com.muyu.business.domain.req; -import com.fasterxml.jackson.annotation.*; -import io.swagger.annotations.*; -import lombok.*; -import org.springframework.format.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Date; /** * 故障日志查询对象 diff --git a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsUpdReq.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsUpdReq.java index 0374daa..eab8cf2 100644 --- a/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsUpdReq.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/req/FaultLogsUpdReq.java @@ -1,11 +1,14 @@ package com.muyu.business.domain.req; -import com.fasterxml.jackson.annotation.*; -import lombok.*; -import org.springframework.format.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; -import java.io.*; -import java.util.*; +import java.io.Serializable; +import java.util.Date; /** * 编辑故障日志对象 diff --git a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/res/FaultCodeResponse.java b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/res/FaultCodeResponse.java similarity index 83% rename from muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/res/FaultCodeResponse.java rename to muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/res/FaultCodeResponse.java index 1a8cf1f..31508f0 100644 --- a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/res/FaultCodeResponse.java +++ b/muyu-modules/muyu-business/muyu-business-common/src/main/java/com/muyu/business/domain/res/FaultCodeResponse.java @@ -1,11 +1,12 @@ package com.muyu.business.domain.res; -import com.baomidou.mybatisplus.annotation.*; -import com.muyu.business.domain.*; -import lombok.*; -import lombok.experimental.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; -import java.io.*; +import java.io.Serializable; /** * 故障码响应类 diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java index 8cb8070..b9a9cca 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/controller/FaultCodesController.java @@ -1,5 +1,9 @@ package com.muyu.business.controller; +import com.muyu.business.domain.FaultCodeInfo; +import com.muyu.business.domain.req.FaultCodeReq; +import com.muyu.business.domain.req.FaultCodesAddReq; +import com.muyu.business.domain.req.FaultCodesUpdReq; import com.muyu.business.service.*; import com.muyu.common.core.domain.*; import com.muyu.common.core.web.controller.*; @@ -7,10 +11,6 @@ import com.muyu.common.core.web.page.*; import com.muyu.common.log.annotation.*; import com.muyu.common.log.enums.*; import com.muyu.common.security.annotation.*; -import com.muyu.system.common.domain.FaultCodeInfo; -import com.muyu.system.common.domain.req.FaultCodeReq; -import com.muyu.system.common.domain.req.FaultCodesAddReq; -import com.muyu.system.common.domain.req.FaultCodesUpdReq; import io.swagger.annotations.*; import org.springframework.beans.factory.annotation.*; import org.springframework.validation.annotation.*; diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java index 4a3dd33..5eb7d8e 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/mapper/FaultCodesMapper.java @@ -4,9 +4,7 @@ package com.muyu.business.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.system.common.domain.FaultCodeInfo; - -import java.util.*; +import com.muyu.business.domain.FaultCodeInfo; /** * 故障码Mapper接口 diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java index be1781c..1f82669 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/FaultCodesService.java @@ -4,8 +4,8 @@ package com.muyu.business.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.system.common.domain.FaultCodeInfo; -import com.muyu.system.common.domain.req.FaultCodeReq; +import com.muyu.business.domain.FaultCodeInfo; +import com.muyu.business.domain.req.FaultCodeReq; import java.util.*; diff --git a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java index 099a237..ee4c034 100644 --- a/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java +++ b/muyu-modules/muyu-business/muyu-business-server/src/main/java/com/muyu/business/service/impl/FaultCodesServiceImpl.java @@ -4,13 +4,13 @@ package com.muyu.business.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.business.domain.FaultCodeInfo; +import com.muyu.business.domain.req.FaultCodeReq; import com.muyu.business.mapper.FaultCodesMapper; import com.muyu.business.service.FaultCodesService; import com.muyu.common.core.utils.DateUtils; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.system.common.domain.FaultCodeInfo; -import com.muyu.system.common.domain.req.FaultCodeReq; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/Fence.java b/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/Fence.java index 3badcf0..088c3ee 100644 --- a/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/Fence.java +++ b/muyu-modules/muyu-system/muyu-system-common/src/main/java/com/muyu/system/common/domain/Fence.java @@ -22,7 +22,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @TableName("fence_info") -public class Fence{ +public class Fence { /** * 围栏ID