From 973f1953cc22742e113967bb0cb87607708b69bf Mon Sep 17 00:00:00 2001 From: Shi Xu Chao <2184233957@qq.com> Date: Sat, 2 Dec 2023 14:35:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/.gitignore | 8 ++ .idea/encodings.xml | 13 ++ .idea/misc.xml | 12 ++ .idea/vcs.xml | 6 + .../main/java/com/fate/domain/Battery.java | 111 ++++++++++++++++++ .../src/main/java/com/fate/domain/Drive.java | 55 +++++++++ .../main/java/com/fate/domain/FaultCode.java | 33 +----- .../src/main/java/com/fate/domain/Police.java | 39 ++++++ .../fate/domain/request/BatteryRequest.java | 107 +++++++++++++++++ .../com/fate/domain/request/DriveRequest.java | 51 ++++++++ .../fate/domain/request/FaultCodeRequest.java | 25 +--- .../fate/domain/request/PoliceRequest.java | 32 +++++ .../fault/controller/FaultController.java | 24 ++++ .../java/com/fate/fault/delay/RabbitMq.java | 2 +- .../com/fate/fault/mapper/FaultMapper.java | 13 +- .../com/fate/fault/service/FaultService.java | 6 +- .../fault/service/impl/FaultServiceImpl.java | 77 +++++++++++- .../src/main/resources/mapper/FaultMapper.xml | 80 +++++++++---- 18 files changed, 611 insertions(+), 83 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/encodings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/vcs.xml create mode 100644 fate-fault-common/src/main/java/com/fate/domain/Battery.java create mode 100644 fate-fault-common/src/main/java/com/fate/domain/Drive.java create mode 100644 fate-fault-common/src/main/java/com/fate/domain/Police.java create mode 100644 fate-fault-common/src/main/java/com/fate/domain/request/BatteryRequest.java create mode 100644 fate-fault-common/src/main/java/com/fate/domain/request/DriveRequest.java create mode 100644 fate-fault-common/src/main/java/com/fate/domain/request/PoliceRequest.java diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..35410ca --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# 默认忽略的文件 +/shelf/ +/workspace.xml +# 基于编辑器的 HTTP 客户端请求 +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e7c4386 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..26f4fe2 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,12 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/fate-fault-common/src/main/java/com/fate/domain/Battery.java b/fate-fault-common/src/main/java/com/fate/domain/Battery.java new file mode 100644 index 0000000..f5b39e8 --- /dev/null +++ b/fate-fault-common/src/main/java/com/fate/domain/Battery.java @@ -0,0 +1,111 @@ +package com.fate.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 电池信息 + * + * @author ShiXuChao + * @version 2023/12/1-19:40 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class Battery { + + /** + * 电池ID 1 2 + */ + public Integer batteryId; + + /** + *电池编号 1 2 + */ + public Integer batteryCoding; + + /** + *电池类型 + */ + public String batteryType; + + /** + *电池容量 + */ + public Integer batteryCapacity; + + /** + *电池电压 + */ + public Double batteryActualVoltage; + + /** + *电池质量 + */ + public Integer batteryActualMass; + + /** + *出厂时间 + */ + public Date batteryDeliveryTime; + + /** + *动力电池加热状态 1 2 + */ + public Integer batteryHeatingFlag ; + + /** + *动力电池当前状态 1 2 + */ + public Integer batteryFlag; + + /** + *动力电池保温状态 1 2 + */ + public Integer batteryPreservationFlag; + + /** + *DCDC(电力交换系统)状态 1 2 + */ + public Integer batteryExchangeFlag; + + /** + *车辆状态 1 2 + */ + public Integer carFlag; + + /** + *充电状态 1 2 + */ + public Integer carLaterFlag; + + /** + *运行状态 1 2 + */ + public Integer carRunningFlag; + + /** + *SOC状态 1 2 + */ + public Integer carSocFlag; + + /** + *可充电储能装置工作状态 1 2 + */ + public Integer carStorageFlag; + + /** + * 驱动电机状态 1 2 + */ + public Integer carDriveFlag; + + /** + * 定位是否有效 1 2 + */ + public Integer carPositioningFlag; +} diff --git a/fate-fault-common/src/main/java/com/fate/domain/Drive.java b/fate-fault-common/src/main/java/com/fate/domain/Drive.java new file mode 100644 index 0000000..2538575 --- /dev/null +++ b/fate-fault-common/src/main/java/com/fate/domain/Drive.java @@ -0,0 +1,55 @@ +package com.fate.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * 零件信息 + * + * @author ShiXuChao + * @version 2023/12/1-20:41 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor + +public class Drive { + + /** + * 驱动零件ID + */ + private Integer driveId; + + /** + * 配置型号 + */ + private String driveName; + + /** + * 生产厂商名称 + */ + private String drivePartNumber; + + /** + * EAS(汽车防盗系统)状态 + */ + private Integer driveTheftFlag; + + /** + * PTC（电动加热器）状态 + */ + private Integer drivePowerFlag; + + /** + * EPS（电动助力系统）状态 + */ + private Integer driveAssistFlag; + + /** + *ABS(防抱死)状态 + */ + private Integer driveBrakingFlag; +} diff --git a/fate-fault-common/src/main/java/com/fate/domain/FaultCode.java b/fate-fault-common/src/main/java/com/fate/domain/FaultCode.java index ab25422..25e6763 100644 --- a/fate-fault-common/src/main/java/com/fate/domain/FaultCode.java +++ b/fate-fault-common/src/main/java/com/fate/domain/FaultCode.java @@ -29,14 +29,6 @@ public class FaultCode { private Integer faultId; - /** - * @Author：shixuchao - * @Date： - * @Description 故障内容 - */ - @NotEmpty(message = "故障内容不能为空") - private String faultContent; - /** * @Author：shixuchao * @Date： @@ -63,28 +55,10 @@ public class FaultCode { private Integer faultTypeId; /** - * @Author：shixuchao - * @Date： - * @Description 故障异常指标 + * 报警ID */ - @NotEmpty(message = "故障异常指标不能为空") - private Integer faultErrorInformation; - - /** - * @Author：shixuchao - * @Date： - * @Description 故障正常指标 - */ - @NotEmpty(message = "故障正常指标不能为空") - private Integer faultSucceedInformation; - - /** - * @Author：shixuchao - * @Date： - * @Description 故障状态 - */ - @NotEmpty(message = "故障状态不能为空") - private Integer faultFlag; + @NotEmpty(message = "报警ID不能为空") + private Integer policeId; /** * @Author：shixuchao @@ -93,4 +67,5 @@ public class FaultCode { */ @NotEmpty(message = "车辆ID不能为空") private Integer carId; + } diff --git a/fate-fault-common/src/main/java/com/fate/domain/Police.java b/fate-fault-common/src/main/java/com/fate/domain/Police.java new file mode 100644 index 0000000..124e5b1 --- /dev/null +++ b/fate-fault-common/src/main/java/com/fate/domain/Police.java @@ -0,0 +1,39 @@ +package com.fate.domain; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * 报警信息 + * + * @author ShiXuChao + * @version 2023/12/1-16:31 + */ + +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class Police { + + /** + * 报警ID + */ + @NotEmpty(message = "报警ID不能为空") + private Integer policeId; + + /** + * 报警信息 + */ + @NotEmpty(message = "报警信息不能为空") + private String policeName; + + /** + * 异常状态 + */ + private String policeNum; +} diff --git a/fate-fault-common/src/main/java/com/fate/domain/request/BatteryRequest.java b/fate-fault-common/src/main/java/com/fate/domain/request/BatteryRequest.java new file mode 100644 index 0000000..24572ab --- /dev/null +++ b/fate-fault-common/src/main/java/com/fate/domain/request/BatteryRequest.java @@ -0,0 +1,107 @@ +package com.fate.domain.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 电池信息 + * + * @author ShiXuChao + * @version 2023/12/1-20:00 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class BatteryRequest { + + /** + *电池编号 + */ + public Integer batteryCoding; + + /** + *电池类型 + */ + public String batteryType; + + /** + *电池容量 + */ + public Integer batteryCapacity; + + /** + *电池电压 + */ + public Double batteryActualVoltage; + + /** + *电池质量 + */ + public Integer batteryActualMass; + + /** + *出厂时间 + */ + public Date batteryDeliveryTime; + + /** + *动力电池加热状态 + */ + public Integer batteryHeatingFlag; + + /** + *动力电池当前状态 + */ + public Integer batteryFlag; + + /** + *动力电池保温状态 + */ + public Integer batteryPreservationFlag; + + /** + *DCDC(电力交换系统)状态 + */ + public Integer batteryExchangeFlag; + + /** + *车辆状态 + */ + public Integer carFlag; + + /** + *充电状态 + */ + public Integer carLaterFlag; + + /** + *运行状态 + */ + public Integer carRunningFlag; + + /** + *SOC状态 + */ + public Integer carSocFlag; + + /** + *可充电储能装置工作状态 + */ + public Integer carStorageFlag; + + /** + * 驱动电机状态 + */ + public Integer carDriveFlag; + + /** + * 定位是否有效 + */ + public Integer carPositioningFlag; + +} diff --git a/fate-fault-common/src/main/java/com/fate/domain/request/DriveRequest.java b/fate-fault-common/src/main/java/com/fate/domain/request/DriveRequest.java new file mode 100644 index 0000000..3bbc344 --- /dev/null +++ b/fate-fault-common/src/main/java/com/fate/domain/request/DriveRequest.java @@ -0,0 +1,51 @@ +package com.fate.domain.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.Negative; + +/** + * 零件信息 + * + * @author ShiXuChao + * @version 2023/12/1-20:07 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class DriveRequest { + + /** + * 配置型号 + */ + private String driveName; + + /** + * 生产厂商名称 + */ + private String drivePartNumber; + + /** + * EAS(汽车防盗系统)状态 + */ + private Integer driveTheftFlag; + + /** + * PTC（电动加热器）状态 + */ + private Integer drivePowerFlag; + + /** + * EPS（电动助力系统）状态 + */ + private Integer driveAssistFlag; + + /** + *ABS(防抱死)状态 + */ + private Integer driveBrakingFlag; +} diff --git a/fate-fault-common/src/main/java/com/fate/domain/request/FaultCodeRequest.java b/fate-fault-common/src/main/java/com/fate/domain/request/FaultCodeRequest.java index f6a36ff..c8e2f2c 100644 --- a/fate-fault-common/src/main/java/com/fate/domain/request/FaultCodeRequest.java +++ b/fate-fault-common/src/main/java/com/fate/domain/request/FaultCodeRequest.java @@ -21,15 +21,6 @@ import java.util.Date; public class FaultCodeRequest { - - /** - * @Author：shixuchao - * @Date： - * @Description 故障内容 - */ - @NotEmpty(message = "内容不能为空") - private String faultContent; - /** * @Author：shixuchao * @Date： @@ -55,21 +46,11 @@ public class FaultCodeRequest { private Integer faultTypeId; /** - * @Author：shixuchao - * @Date： - * @Description 故障异常指标 + * 报警ID */ - @NotEmpty(message = "故障异常指标不能为空") - private Integer faultErrorInformation; + @NotEmpty(message = "报警ID不能为空") + private Integer policeId; - /** - * @Author：shixuchao - * @Date： - * @Description 故障正常指标 - */ - - @NotEmpty(message = "故障正常指标不能为空") - private Integer faultSucceedInformation; /** * @Author：shixuchao * @Date： diff --git a/fate-fault-common/src/main/java/com/fate/domain/request/PoliceRequest.java b/fate-fault-common/src/main/java/com/fate/domain/request/PoliceRequest.java new file mode 100644 index 0000000..f2c5e0c --- /dev/null +++ b/fate-fault-common/src/main/java/com/fate/domain/request/PoliceRequest.java @@ -0,0 +1,32 @@ +package com.fate.domain.request; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import javax.validation.constraints.NotEmpty; + +/** + * 报警类型 + * + * @author ShiXuChao + * @version 2023/12/1-16:41 + */ +@Data +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class PoliceRequest { + + /** + * 报警信息 + */ + @NotEmpty(message = "报警信息不能为空") + private String policeName; + + /** + * 报警类型 + */ + private String policeNum; +} diff --git a/fate-fault-server/src/main/java/com/fate/fault/controller/FaultController.java b/fate-fault-server/src/main/java/com/fate/fault/controller/FaultController.java index b34b095..441d0ba 100644 --- a/fate-fault-server/src/main/java/com/fate/fault/controller/FaultController.java +++ b/fate-fault-server/src/main/java/com/fate/fault/controller/FaultController.java @@ -83,4 +83,28 @@ public class FaultController { return r; } + + @GetMapping("/policeList") + public Result policeList(){ + Result result=faultService.policeList(); + log.info("功能：报警信息列表 URI:{} 方法：{} 参数：{}",request.getRequestURI(),request.getMethod() + ,result.getData()); + return result; + } + + @GetMapping("/driveList") + public Result driveList(){ + Result result=faultService.driveList(); + log.info("功能：零件信息列表展示 URI：{} 方法：{} 参数：{}",request.getRequestURI(),request.getMethod() + ,result.getData()); + return result; + } + + @GetMapping("/batteryList") + public Result batteryList(){ + Result result=faultService.batteryList(); + log.info("功能：电池信息列表展示 URI：{} 方法：{} 参数：{}",request.getRequestURI(),request.getMethod() + ,result.getData()); + return result; + } } diff --git a/fate-fault-server/src/main/java/com/fate/fault/delay/RabbitMq.java b/fate-fault-server/src/main/java/com/fate/fault/delay/RabbitMq.java index 16d9fc7..b181e1e 100644 --- a/fate-fault-server/src/main/java/com/fate/fault/delay/RabbitMq.java +++ b/fate-fault-server/src/main/java/com/fate/fault/delay/RabbitMq.java @@ -35,7 +35,7 @@ public class RabbitMq { MsgUtils.sendCode("你看不起我？草", "13120856998"); count++; if (count == 3) { - faultService.rabbitUpdate(item.getFaultId()); + } } if (item.getPriorityId() == 4) { diff --git a/fate-fault-server/src/main/java/com/fate/fault/mapper/FaultMapper.java b/fate-fault-server/src/main/java/com/fate/fault/mapper/FaultMapper.java index 4295d6e..26f6645 100644 --- a/fate-fault-server/src/main/java/com/fate/fault/mapper/FaultMapper.java +++ b/fate-fault-server/src/main/java/com/fate/fault/mapper/FaultMapper.java @@ -1,7 +1,6 @@ package com.fate.fault.mapper; -import com.fate.domain.FaultCode; -import com.fate.domain.FaultType; +import com.fate.domain.*; import com.fate.domain.request.FaultCodeRequest; import com.fate.modle.Vo; import org.apache.ibatis.annotations.Mapper; @@ -66,5 +65,13 @@ public interface FaultMapper { List timeList(); - Integer rabbitUpdate(@Param("faultId") Integer faultId); + List policeList(); + + List driveList(); + + List batteryList(); + + void driveInsert(@Param("i") int i, Drive item); + + void batteryInsert(@Param("num") int num, Battery item); } diff --git a/fate-fault-server/src/main/java/com/fate/fault/service/FaultService.java b/fate-fault-server/src/main/java/com/fate/fault/service/FaultService.java index bc75d22..8ce3d81 100644 --- a/fate-fault-server/src/main/java/com/fate/fault/service/FaultService.java +++ b/fate-fault-server/src/main/java/com/fate/fault/service/FaultService.java @@ -61,5 +61,9 @@ public interface FaultService { Result> timeList(); - void rabbitUpdate(Integer faultId); + Result policeList(); + + Result driveList(); + + Result batteryList(); } diff --git a/fate-fault-server/src/main/java/com/fate/fault/service/impl/FaultServiceImpl.java b/fate-fault-server/src/main/java/com/fate/fault/service/impl/FaultServiceImpl.java index 80c9361..588db09 100644 --- a/fate-fault-server/src/main/java/com/fate/fault/service/impl/FaultServiceImpl.java +++ b/fate-fault-server/src/main/java/com/fate/fault/service/impl/FaultServiceImpl.java @@ -1,8 +1,7 @@ package com.fate.fault.service.impl; import com.fate.common.core.domain.Result; -import com.fate.domain.FaultCode; -import com.fate.domain.FaultType; +import com.fate.domain.*; import com.fate.domain.request.FaultCodeRequest; import com.fate.fault.mapper.FaultMapper; import com.fate.fault.service.FaultService; @@ -78,8 +77,78 @@ public class FaultServiceImpl implements FaultService { } @Override - public void rabbitUpdate(Integer faultId) { - Integer rabbitUpdate=faultMapper.rabbitUpdate(faultId); + public Result policeList() { + List policeList=faultMapper.policeList(); + return Result.success(policeList); + } + + @Override + public Result driveList() { + List driveList=faultMapper.driveList(); + driveList.forEach(item->{ + if (item.getDriveAssistFlag()==2){ + faultMapper.driveInsert(4,item); + } + if (item.getDriveBrakingFlag()==2){ + faultMapper.driveInsert(10,item); + } + if (item.getDriveTheftFlag() == 2) { + faultMapper.driveInsert(5,item); + } + if (item.getDrivePowerFlag()==2){ + faultMapper.driveInsert(6,item); + } + }); + return Result.success(driveList); + } + + @Override + public Result batteryList() { + List batteryList=faultMapper.batteryList(); + + List result = (List) this.policeList().getData(); + + + + + + batteryList.forEach(item->{ + boolean batteryHeatingFlag = batteryList.stream().allMatch(item1 -> item1.getBatteryHeatingFlag()==2); + if (batteryHeatingFlag){ + faultMapper.batteryInsert(1,item); + } + if (item.getBatteryFlag()==2){ + faultMapper.batteryInsert(2,item); + } + if (item.getBatteryPreservationFlag()==2){ + faultMapper.batteryInsert(3,item); + } + if (item.getBatteryExchangeFlag()==2){ + faultMapper.batteryInsert(7,item); + } + if (item.getCarFlag()==2){ + faultMapper.batteryInsert(12,item); + } + if (item.getCarLaterFlag()==2){ + faultMapper.batteryInsert(13,item); + } + if (item.getCarRunningFlag()==2){ + faultMapper.batteryInsert(14,item); + } + if (item.getCarSocFlag()==2){ + faultMapper.batteryInsert(15,item); + } + if (item.getCarStorageFlag()==2){ + faultMapper.batteryInsert(16,item); + } + if (item.getCarDriveFlag()==2){ + faultMapper.batteryInsert(17,item); + } + if (item.getCarPositioningFlag()==2){ + faultMapper.batteryInsert(18,item); + } + }); + return Result.success(batteryList); } } diff --git a/fate-fault-server/src/main/resources/mapper/FaultMapper.xml b/fate-fault-server/src/main/resources/mapper/FaultMapper.xml index bfbeb16..5319fdf 100644 --- a/fate-fault-server/src/main/resources/mapper/FaultMapper.xml +++ b/fate-fault-server/src/main/resources/mapper/FaultMapper.xml @@ -4,67 +4,101 @@ - - - - + INSERT INTO `t_fault_code` - (`fault_content`, + ( `priority_id`, `fault_time`, `fault_type_id`, - `fault_error_information`, - `fault_succeed_information`, - `fault_flag`, + `police_id`, `car_id`) - VALUES (#{faultContent}, + VALUES ( #{priorityId}, #{faultTime}, #{faultTypeId}, - #{faultErrorInformation}, - #{faultSucceedInformation}, - #{faultFlag}, + #{policeId}, #{carId}); + + INSERT INTO `t_fault_code` + (`priority_id`, + `fault_time`, + `fault_type_id`, + `police_id`, + `car_id`) + VALUES (#{}, + now(), + #{}, + #{i}, + #{carId}); + + + + INSERT INTO `t_fault_code` + (`priority_id`, + `fault_time`, + `fault_type_id`, + `police_id`, + `car_id`) + VALUES (#{}, + now(), + #{}, + #{num}, + #{carId}); + UPDATE `t_fault_code` - SET `fault_content` = #{faultContent}, - `priority_id` = #{priorityId}, + SET `priority_id` = #{priorityId}, `fault_time` = now(), `fault_type_id` = #{faultTypeId}, - `fault_error_information` = #{faultErrorInformation}, - `fault_succeed_information` = #{faultSucceedInformation}, - `fault_flag`=#{faultFlag}, + `police_id`=#{policeId}, `car_id` = #{carId} WHERE `fault_id` = #{faultId}; - - update `t_fault_code` set `fault_flag`=3 where `fault_id`=#{faultId} - delete from t_fault_code where fault_oid=#{faultId} + + +