feat commit

存储事件、故障时间测试成功

zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/constants/MqttConnectConstants.java

@@ -0,0 +1,12 @@
+package com.zhilian.common.resolver.constants;
+/**
+  * @ClassName MqttConnectConstants
+  * @Description Mqtt 连接常量
+  * @Author Can.J
+  * @Date  2024/4/4 10:13
+ */
+public class MqttConnectConstants {
+    public static final String BROKER_URL = "tcp://111.229.33.194:1883";
+
+    public static final String CLIENT_ID = "mqttx_53f082e9";
+}

zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/EnhancedServicesType.java

@@ -0,0 +1,25 @@
+package com.zhilian.common.resolver.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+/**
+  * @ClassName EnhancedServicesType
+  * @Description 增值服务表 测试用
+  * @Author Can.J
+  * @Date  2024/4/4 11:20
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EnhancedServicesType {
+    /**
+     *  增值服务id
+     */
+    private Long id;
+
+    /**
+     *  增值服务名称
+     */
+    private String enhancedServicesName;
+}

zhilian-common/zhilian-common-resolver/src/main/java/com/zhilian/common/resolver/domain/SysUserEnhancedServices.java

@@ -0,0 +1,33 @@
+package com.zhilian.common.resolver.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+/**
+  * @ClassName SysUserEnhancedServices
+  * @Description 客户增值服务中间表(客户-增值服务)
+  * @Author Can.J
+  * @Date  2024/4/4 11:23
+ */
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class SysUserEnhancedServices {
+    private Long useId;
+    private Long enhancedServicesId;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private String updateTime;
+    private String createBy;
+    private String updateBy;
+    private int isDelete;
+    private String remark;
+
+}

zhilian-modules/zhilian-manager/src/main/java/com/zhilian/manager/zhilianMangerApplication.java

@@ -1,11 +0,0 @@
-package com.zhilian.manager;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class zhilianMangerApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(zhilianMangerApplication.class, args);
-    }
-}

zhilian-modules/zhilian-online/src/main/java/com/zhilian/ZhiLianOnLineApplication.java

@@ -1,11 +0,0 @@
-package com.zhilian;
-
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-@SpringBootApplication
-public class ZhiLianOnLineApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(ZhiLianOnLineApplication.class);
-    }
-}

zhilian-modules/zhilian-resolver/pom.xml

@@ -89,32 +89,33 @@
             <artifactId>zhilian-common-datascope</artifactId>
         </dependency>
 
-        <!-- zhilian Common Log -->
+        <!-- zhilian Common Core -->
-        <dependency>
-            <groupId>com.zhilian</groupId>
-            <artifactId>zhilian-common-log</artifactId>
-        </dependency>
-
         <dependency>
             <groupId>com.zhilian</groupId>
             <artifactId>zhilian-common-core</artifactId>
         </dependency>
 
+        <!-- zhilian Common Resolver -->
         <dependency>
             <groupId>com.zhilian</groupId>
             <artifactId>zhilian-common-resolver</artifactId>
         </dependency>
 
+        <!-- Elasticsearch -->
         <dependency>
             <groupId>org.elasticsearch.client</groupId>
             <artifactId>elasticsearch-rest-high-level-client</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.amqp</groupId>
+            <artifactId>spring-rabbit-test</artifactId>
+        </dependency>
+
         <!-- Mqtt -->
         <dependency>
             <groupId>org.eclipse.paho</groupId>
             <artifactId>org.eclipse.paho.client.mqttv3</artifactId>
-            <version>1.2.5</version>
         </dependency>
 
     </dependencies>

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/ZhilianResolverApplication.java

@@ -11,8 +11,8 @@ import org.springframework.scheduling.annotation.EnableScheduling;
 @EnableMyFeignClients
 @MapperScan({"com.zhilian.resolver.mapper", "com.zhilian.resolver.resolverReport"})
 @SpringBootApplication
-public class ZhiLianResolverApplication {
+public class ZhilianResolverApplication {
     public static void main(String[] args) {
-        SpringApplication.run(ZhiLianResolverApplication.class, args);
+        SpringApplication.run(ZhilianResolverApplication.class, args);
     }
 }

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/controller/UserController.java

@@ -0,0 +1,29 @@
+package com.zhilian.resolver.controller;
+
+import com.zhilian.common.core.domain.Result;
+import com.zhilian.common.resolver.domain.SysUserEnhancedServices;
+import com.zhilian.resolver.service.UserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+  * @ClassName UserController
+  * @Description 用户信息 测试用
+  * @Author Can.J
+  * @Date  2024/4/4 11:30
+ */
+@RestController
+public class UserController {
+    @Autowired
+    private UserService userService;
+
+
+    @GetMapping("/getUser")
+    public Result<List<SysUserEnhancedServices>> getUserEnhancedServices(){
+        Result<List<SysUserEnhancedServices>> result =userService.getUserEnhancedServices();
+        return result;
+    }
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/ResolverReportInfoMapper.java

@@ -4,11 +4,23 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhilian.common.resolver.domain.ResolverReportData;
 import com.zhilian.common.resolver.domain.ResolverReportInfo;
 import org.apache.ibatis.annotations.Mapper;
-
+/**
+  * @ClassName ResolverReportInfoMapper
+  * @Description 解析事件服务业务实现层
+  * @Author Can.J
+  * @Date  2024/4/4 10:04
+ */
 @Mapper
 public interface ResolverReportInfoMapper extends BaseMapper<ResolverReportInfo> {
-
+    /**
-//    void saveDataToDatabase(ResolverReportData resolverReportData);
+     *  存储事件
-
+     * @param vehicleData
+     */
     void reportMapper(ResolverReportData vehicleData);
+
+    /**
+     *  故障事件
+     * @param resolverReportData
+     */
+    void saveDataToDatabaseByMalfunction(ResolverReportData resolverReportData);
 }

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/mapper/UserMapper.java

@@ -0,0 +1,17 @@
+package com.zhilian.resolver.mapper;
+
+import com.zhilian.common.resolver.domain.SysUserEnhancedServices;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+/**
+  * @ClassName UserMapper
+  * @Description 用户信息测试用
+  * @Author Can.J
+  * @Date  2024/4/4 11:28
+ */
+@Mapper
+public interface UserMapper {
+    List<SysUserEnhancedServices> getUserEnhancedServices();
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/resolverReport/ResolverMqttMsg.java

@@ -1,47 +1,73 @@
 package com.zhilian.resolver.resolverReport;
+import com.zhilian.common.core.utils.SpringUtils;
+import com.zhilian.common.core.utils.StringUtils;
 import com.zhilian.common.resolver.domain.ResolverReportData;
+import com.zhilian.resolver.service.ResolverEventService;
 import com.zhilian.resolver.service.ResolverReportInfoService;
+import com.zhilian.resolver.service.impl.eventMalfunction.MalfunctionEventServiceImpl;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
+
 import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
+import static com.zhilian.common.resolver.constants.MqttConnectConstants.BROKER_URL;
+import static com.zhilian.common.resolver.constants.MqttConnectConstants.CLIENT_ID;
+
 /**
-  * @ClassName ResolverMqttMsg
+ * @ClassName ResolverMqttMsg
-  * @Description mqtt获取报文数据 解析并同步到数据库
+ * @Description 获取mqtt报文消息 解析ResolverReportData vehicleData
-  * @Author Can.J
+ * @Author Can.J
-  * @Date  2024/4/2 14:17
+ * @Date  2024/3/30 8:36
  */
 @Slf4j
 @Component
 public class ResolverMqttMsg {
+    @Autowired
+    private MalfunctionEventServiceImpl malfunctionEventService;
+
     @Autowired
     private ResolverReportInfoService resolverReportInfoService;
-    private static final String BROKER_URL = "tcp://111.229.33.194:1883";
+
-    private static final String CLIENT_ID = "mqttx_53f082e9";
     @Autowired
     public ResolverMqttMsg(ResolverReportInfoService resolverReportInfoService) {
         this.resolverReportInfoService = resolverReportInfoService;
     }
 
+    public static ArrayList<String> stringEvents = new ArrayList<>(){
+        {
+            add("malfunction");     //故障事件
+            add("event-realTimeTrajectory"); //实时轨迹数事件
+            add("event-storage");      //存储服务事件
+            add("geofence");        //电子围栏事件
+        }
+    };
+//    @Scheduled(fixedRate = 500) //执行频率500毫秒
+    // 执行频率5秒
     @Scheduled(cron = "0/5 * * * * ?")
     public void start() {
 
         try {
+            // 创建客户端
             MqttClient mqttClient = new MqttClient(BROKER_URL, CLIENT_ID);
 
+            // 设置连接参数
             MqttConnectOptions options = new MqttConnectOptions();
 
+            // 设置是否清除会话
             options.setCleanSession(true);
+            // 连接
             mqttClient.connect(options);
 
+            // 设置回调
             mqttClient.setCallback(new MqttCallback() {
+
                 @Override
                 public void connectionLost(Throwable throwable) {
                     log.error("Mqtt[{}-{}]连接断开:[{}]", CLIENT_ID, BROKER_URL, throwable.getMessage(), throwable);
@@ -49,17 +75,49 @@ public class ResolverMqttMsg {
 
                 @Override
                 public void messageArrived(String topic, MqttMessage message) throws Exception {
-                    // 打印接收到的消息和主题
                     log.info("主题='{}':消息内容={}", topic, new String(message.getPayload()));
+
+                    // 解析后的字符串
+                    // { ~2BL9IQ15JX3IEL4OZ1712199325613116.659444039.521254072.00030.4900000034800080000163190000D303011.00360000929212560134000281007032000062102.93000070000030120007490003000400016000090000084000011111111111111111z~ }
                     String str = hexStringToString(new String(message.getPayload()));
+
                     List<ResolverReportData> vehicleDataList = parseVehicleData(str);
 
                     for (ResolverReportData vehicleData : vehicleDataList) {
+                        //str-->vehicleDataList-->vehicleData实例
                         log.info("解析到车辆数据：{}", vehicleData);
-                        resolverReportInfoService.saveDataToDatabase(vehicleData);
+
+                        for (String stringEvent : stringEvents) {
+                            ResolverEventService resolverEventService =SpringUtils.getBean(stringEvent);
+                            resolverEventService.execute(vehicleData);
+
+//                            if(isAnyFieldZero(vehicleData)){
+//                                malfunctionEventService.execute(vehicleData);
+//                            }
+                        }
                     }
+                    log.info("字符串：{}",str);
                 }
 
+//                private boolean isAnyFieldZero(ResolverReportData resolverReportData){
+//                    return resolverReportData.getChargingStatus() == 0 ||
+//                            resolverReportData.getOperatingStatus() == 0 ||
+//                            resolverReportData.getSocStatus() == 0 ||
+//                            resolverReportData.getVehicleStatus() == 0 ||
+//                            resolverReportData.getChargingEnergyStorageStatus() == 0 ||
+//                            resolverReportData.getDriveMotorStatus() == 0 ||
+//                            resolverReportData.getPositionStatus() == 0 ||
+//                            resolverReportData.getEasStatus() == 0 ||
+//                            resolverReportData.getPtcStatus() == 0 ||
+//                            resolverReportData.getEpsStatus() == 0 ||
+//                            resolverReportData.getAbsStatus() == 0 ||
+//                            resolverReportData.getMcuStatus() == 0 ||
+//                            resolverReportData.getHeatingStatus() == 0 ||
+//                            resolverReportData.getBatteryStatus() == 0 ||
+//                            resolverReportData.getBatteryInsulationStatus() == 0 ||
+//                            resolverReportData.getDcdcStatus() == 0 ||
+//                            resolverReportData.getChgStatus() == 0;
+//                }
 
                 @Override
                 public void deliveryComplete(IMqttDeliveryToken token) {
@@ -79,7 +137,7 @@ public class ResolverMqttMsg {
         }
 
     }
-        /**
+    /**
      * 16进制转换成为string类型字符串
      *
      * @param s
@@ -106,6 +164,8 @@ public class ResolverMqttMsg {
         }
         return s;
     }
+
+    // 解析数据 字符串切割 获取适合的数据
     private static List<ResolverReportData> parseVehicleData(String str) {
         List<ResolverReportData> vehicleDataList = new ArrayList<>();
         ResolverReportData vehicleData = new ResolverReportData();
@@ -118,11 +178,15 @@ public class ResolverMqttMsg {
         String tim =str.substring(18,31);
         long timestamp = Long.parseLong(tim);
 
+        log.info("时间串=="+tim);
         Date date = new Date(timestamp);
+        System.out.println("时间"+date);
         vehicleData.setCreateTime(date);
+        log.info("shijian =="+vehicleData.getCreateTime());
 
         //经度
         String lt = str.substring(31,42);
+        log.info("经度串==：{}",lt);
         // 如果末尾是零，则舍去
         int endIndex = lt.length() - 1;
         while (lt.charAt(endIndex) == '0'){
@@ -131,9 +195,11 @@ public class ResolverMqttMsg {
 
         String longitude = lt.substring(0, endIndex + 1);
         vehicleData.setLongitude(longitude);
+        log.info("经度 =="+vehicleData.getLongitude());
 
         //维度
         String latitudeIndex =str.substring(42,52);
+        log.info("维度串==：{}",latitudeIndex);
         int endIndexT = latitudeIndex.length() - 1;
         while (latitudeIndex.charAt(endIndexT) == '0'){
             endIndexT--;
@@ -141,230 +207,303 @@ public class ResolverMqttMsg {
 
         String latitude = latitudeIndex.substring(0, endIndexT + 1);
         vehicleData.setLatitude(latitude);
+        log.info("维度==:{}",vehicleData.getLatitude());
 
         //速度speed
         String speed =str.substring(52,58);
+        log.info("速度==：{}",speed);
         vehicleData.setSpeed(speed);
+        log.info("速度==:{}",vehicleData.getSpeed());
 
         //里程
         BigDecimal mileage= new BigDecimal(str.substring(58,69));
+        log.info("里程==：{}",mileage);
         mileage=mileage.stripTrailingZeros();
         vehicleData.setMileage(mileage);
+        log.info("里程==:{}",vehicleData.getMileage());
 
         //总电压
         String voltage =str.substring(69,75);
+        log.info("总电压==：{}",voltage);
         while (voltage.endsWith("0")) {
             voltage = voltage.substring(0, voltage.length() - 1); // 去除末尾的零
         }
         vehicleData.setVoltage(voltage);
+        log.info("总电压==:{}",vehicleData.getVoltage());
 
         //总电流
         String current =str.substring(75,80);
+        log.info("总电流==：{}",current);
         while (current.endsWith("0")){
             current=current.substring(0,current.length()-1);
         }
         vehicleData.setCurrent(current);
+        log.info("总电流==：{}",vehicleData.getCurrent());
 
         //绝缘电阻 resistance
         String res =str.substring(80,89);
+        log.info("绝缘电阻==：{}",res);
         String resistance = res.substring(0, 5);
         vehicleData.setResistance(resistance);
+        log.info("绝缘电阻==：{}",vehicleData.getResistance());
 
         //档位
         String gear =str.substring(89,90);
+        log.info("档位==：{}",gear);
         vehicleData.setGear(gear);
+        log.info("档位==：{}",vehicleData.getGear());
 
         //accelerationPedal 加速踏板行程值
         String accelerationPedal =str.substring(90,91);
+        log.info("加速踏板行程值==：{}",accelerationPedal);
         vehicleData.setAccelerationPedal(accelerationPedal);
+        log.info("加速踏板行程值==：{}",vehicleData.getAccelerationPedal());
 
         //brakePedal 制动踏板行程值
         String brakePedal =str.substring(92,93);
+        log.info("制动踏板行程值==：{}",brakePedal);
         vehicleData.setBrakePedal(brakePedal);
+        log.info("制动踏板行程值==：{}",vehicleData.getBrakePedal());
 
         //fuelConsumptionRate  燃料消耗率
         String fuelConsumptionRate =str.substring(94,99);
+        log.info("燃料消耗率==：{}",fuelConsumptionRate);
         vehicleData.setFuelConsumptionRate(fuelConsumptionRate);
+        log.info("燃料消耗率==：{}",vehicleData.getFuelConsumptionRate());
 
         //motorControllerTemperature 电机控制器温度
         String motorControllerTemperature =str.substring(99,105);
         while (motorControllerTemperature.endsWith("0")){
             motorControllerTemperature=motorControllerTemperature.substring(0,motorControllerTemperature.length()-1);
         }
+        log.info("电机控制器温度==：{}",motorControllerTemperature);
         vehicleData.setMotorControllerTemperature(motorControllerTemperature);
+        log.info("电机控制器温度==：{}",vehicleData.getMotorControllerTemperature());
 
         //motorSpeed 电机转速
         String motorSpeed =str.substring(105,110);
+        log.info("电机转速==：{}",motorSpeed);
         vehicleData.setMotorSpeed(motorSpeed);
+        log.info("电机转速==：{}",vehicleData.getMotorSpeed());
 
         //motorTorque 电机转矩
         String motorTorque =str.substring(110,114);
+        log.info("电机转矩==：{}",motorTorque);
         while (motorTorque.endsWith("0")){
             motorTorque=motorTorque.substring(0,motorTorque.length()-1);
         }
         vehicleData.setMotorTorque(motorTorque);
+        log.info("电机转矩==：{}",vehicleData.getMotorTorque());
+
 
         //motorTemperature 电机温度
         String motorTemperature =str.substring(114,120);
+        log.info("电机温度==：{}",motorTemperature);
         while (motorTemperature.endsWith("0")){
             motorTemperature=motorTemperature.substring(0,motorTemperature.length()-1);
         }
         vehicleData.setMotorTemperature(motorTemperature);
+        log.info("电机温度==：{}",vehicleData.getMotorTemperature());
 
         //motorVoltage 电机电压
         String motorVoltage =str.substring(120,125);
+        log.info("电机电压==：{}",motorVoltage);
         while (motorVoltage.endsWith("0")){
             motorVoltage=motorVoltage.substring(0,motorVoltage.length()-1);
         }
         vehicleData.setMotorVoltage(motorVoltage);
+        log.info("电机电压==：{}",vehicleData.getMotorVoltage());
 
         //motorCurrent 电机电流
         String motorCurrent =str.substring(125,133);
+        log.info("电机电流==：{}",motorCurrent);
         while (motorCurrent.endsWith("0")){
             motorCurrent=motorCurrent.substring(0,motorCurrent.length()-1);
         }
         vehicleData.setMotorCurrent(motorCurrent);
+        log.info("电机电流==：{}",vehicleData.getMotorCurrent());
 
         //remainingBattery 动力电池剩余电量SOC
         BigDecimal remainingBattery = new BigDecimal(str.substring(133,138));
+        log.info("动力电池剩余电量SOC==：{}",remainingBattery);
         vehicleData.setRemainingBattery(remainingBattery);
+        log.info("动力电池剩余电量SOC==：{}",vehicleData.getRemainingBattery());
 
         //maximumFeedbackPower 当前状态允许的最大反馈功率
         String maximumFeedbackPower =str.substring(139,144);
+        log.info("当前状态允许的最大反馈功率==：{}",maximumFeedbackPower);
         while (maximumFeedbackPower.endsWith("0")){
             maximumFeedbackPower=maximumFeedbackPower.substring(0,maximumFeedbackPower.length()-1);
         }
         vehicleData.setMaximumFeedbackPower(maximumFeedbackPower);
+        log.info("当前状态允许的最大反馈功率==:{}",vehicleData.getMaximumFeedbackPower());
 
         //maximumDischargePower 当前状态允许最大放电功率
         String maximumDischargePower =str.substring(145,151);
+        log.info("当前状态允许最大放电功率:{}",maximumDischargePower);
         while (maximumDischargePower.endsWith("0")){
             maximumDischargePower=maximumDischargePower.substring(0,maximumDischargePower.length()-1);
         }
         vehicleData.setMaximumDischargePower(maximumDischargePower);
+        log.info("当前状态允许最大放电功率：{}",vehicleData.getMaximumDischargePower());
 
         //selfCheckCounter BMS自检计数器
         String selfCheckCounter =str.substring(151,153);
         String selfCheckCounterReplace = selfCheckCounter.replace("0", "");
+        log.info("BMS自检计数器==：{}",selfCheckCounter);
         vehicleData.setSelfCheckCounter(selfCheckCounterReplace);
+        log.info("BMS自检计数器==：{}",vehicleData.getSelfCheckCounter());
 
         //totalBatteryCurrent 动力电池充放电电流
         String totalBatteryCurrent =str.substring(153,158);
+        log.info("BMS自检计数器==：{}",totalBatteryCurrent);
         while (totalBatteryCurrent.endsWith("0")){
             totalBatteryCurrent=totalBatteryCurrent.substring(0,totalBatteryCurrent.length()-1);
         }
         vehicleData.setTotalBatteryCurrent(totalBatteryCurrent);
+        log.info("BMS自检计数器==：{}",vehicleData.getTotalBatteryCurrent());
 
         //totalBatteryVoltage 动力电池负载端总电压V3
         String totalBatteryVoltage =str.substring(158,164);
+        log.info("动力电池负载端总电压V3==：{}",totalBatteryVoltage);
         while (totalBatteryVoltage.endsWith("0")){
             totalBatteryVoltage=totalBatteryVoltage.substring(0,totalBatteryVoltage.length()-1);
         }
         vehicleData.setTotalBatteryVoltage(totalBatteryVoltage);
+        log.info("动力电池负载端总电压V3==：{}",vehicleData.getTotalBatteryVoltage());
 
         //singleBatteryMaxVoltage 单次最大电压
         String singleBatteryMaxVoltage =str.substring(164,168);
+        log.info("单次最大电压==：{}",singleBatteryMaxVoltage);
         while (singleBatteryMaxVoltage.endsWith("0")){
             singleBatteryMaxVoltage=singleBatteryMaxVoltage.substring(0,singleBatteryMaxVoltage.length()-1);
         }
         vehicleData.setSingleBatteryMaxVoltage(singleBatteryMaxVoltage);
+        log.info("单次最大电压==：{}",vehicleData.getSingleBatteryMaxVoltage());
 
         //singleBatteryMinVoltage 单体电池最低电压
         String singleBatteryMinVoltage =str.substring(168,172);
+        log.info("单体电池最低电压==：{}",singleBatteryMinVoltage);
         while (singleBatteryMinVoltage.endsWith("0")){
             singleBatteryMinVoltage=singleBatteryMinVoltage.substring(0,singleBatteryMinVoltage.length()-1);
         }
 
         vehicleData.setSingleBatteryMinVoltage(singleBatteryMinVoltage);
+        log.info("单体电池最低电压==：{}",vehicleData.getSingleBatteryMinVoltage());
 
         //singleBatteryMaxTemperature 单体电池最高温度
         String singleBatteryMaxTemperature =str.substring(172,178);
+        log.info("单体电池最高温度==：{}",singleBatteryMaxTemperature);
         while (singleBatteryMaxTemperature.endsWith("0")){
             singleBatteryMaxTemperature=singleBatteryMaxTemperature.substring(0,singleBatteryMaxTemperature.length()-1);
         }
         vehicleData.setSingleBatteryMaxTemperature(singleBatteryMaxTemperature);
+        log.info("单体电池最高温度==：{}",vehicleData.getSingleBatteryMaxTemperature());
 
         //singleBatteryMinTemperature 单体电池最低温度
         String singleBatteryMinTemperature =str.substring(178,184);
+        log.info("单体电池最低温度==：{}",singleBatteryMinTemperature);
         while (singleBatteryMinTemperature.endsWith("0")){
             singleBatteryMinTemperature=singleBatteryMinTemperature.substring(0,singleBatteryMinTemperature.length()-1);
         }
         vehicleData.setSingleBatteryMinTemperature(singleBatteryMinTemperature);
+        log.info("单体电池最低温度==：{}",vehicleData.getSingleBatteryMinTemperature());
 
         //availableBatteryCapacity 可用电池容量
         String availableBatteryCapacity =str.substring(184,190);
+        log.info("可用电池容量==：{}",availableBatteryCapacity);
         while (availableBatteryCapacity.endsWith("0")){
             availableBatteryCapacity=availableBatteryCapacity.substring(0,availableBatteryCapacity.length()-1);
         }
         vehicleData.setAvailableBatteryCapacity(availableBatteryCapacity);
+        log.info("可用电池容量==：{}",vehicleData.getAvailableBatteryCapacity());
 
         //vehicleStatus 车辆状态
         int vehicleStatus = Integer.parseInt(str.substring(190,191));
         vehicleData.setVehicleStatus(vehicleStatus);
+        log.info("车辆状态==：{}",vehicleData.getVehicleStatus());
 
         //chargingStatus 充电状态
         int chargingStatus = Integer.parseInt(str.substring(191,192));
         vehicleData.setChargingStatus(chargingStatus);
+        log.info("充电状态==：{}",vehicleData.getChargingStatus());
 
         //operatingStatus 运行状态
         int operatingStatus = Integer.parseInt(str.substring(192,193));
         vehicleData.setOperatingStatus(operatingStatus);
+        log.info("运行状态==：{}",vehicleData.getOperatingStatus());
 
         //socStatus SOC
         int socStatus = Integer.parseInt(str.substring(193,194));
         vehicleData.setSocStatus(socStatus);
+        log.info("SOC==：{}",vehicleData.getSocStatus());
 
         //chargingEnergyStorageStatus 可充电储能装置工作状态
         int chargingEnergyStorageStatus = Integer.parseInt(str.substring(194,195));
         vehicleData.setChargingEnergyStorageStatus(chargingEnergyStorageStatus);
+        log.info("可充电储能装置工作状态==：{}",vehicleData.getChargingEnergyStorageStatus());
 
         //driveMotorStatus 驱动电机状态
         int driveMotorStatus = Integer.parseInt(str.substring(195,196));
         vehicleData.setDriveMotorStatus(driveMotorStatus);
+        log.info("驱动电机状态==：{}",vehicleData.getDriveMotorStatus());
 
         //positionStatus 定位是否有效
         int positionStatus = Integer.parseInt(str.substring(196,197));
         vehicleData.setPositionStatus(positionStatus);
+        log.info("定位是否有效==：{}",vehicleData.getPositionStatus());
 
         //easStatus EAS(汽车防盗系统)状态
         int easStatus = Integer.parseInt(str.substring(197,198));
         vehicleData.setEasStatus(easStatus);
+        log.info("EAS(汽车防盗系统)状态==：{}",vehicleData.getEasStatus());
 
         //ptcStatus PTC(电动加热器)状态
         int ptcStatus = Integer.parseInt(str.substring(198,199));
         vehicleData.setPtcStatus(ptcStatus);
+        log.info("PTC(电动加热器)状态==：{}",vehicleData.getPtcStatus());
 
         //epsStatus
         int epsStatus = Integer.parseInt(str.substring(199,200));
         vehicleData.setEpsStatus(epsStatus);
+        log.info("车辆状态==：{}",vehicleData.getEpsStatus());
 
         //absStatus EPS(电动助力系统)状态
         int absStatus = Integer.parseInt(str.substring(200,201));
         vehicleData.setAbsStatus(absStatus);
+        log.info("EPS(电动助力系统)状态==：{}",vehicleData.getAbsStatus());
 
         //mcuStatus MCU(电机/逆变器)状态
         int mcuStatus = Integer.parseInt(str.substring(201,202));
         vehicleData.setMcuStatus(mcuStatus);
+        log.info("MCU(电机/逆变器)状态==：{}",vehicleData.getMcuStatus());
 
         //heatingStatus 动力电池加热状态
         int heatingStatus = Integer.parseInt(str.substring(202,203));
         vehicleData.setHeatingStatus(heatingStatus);
+        log.info("动力电池加热状态==：{}",vehicleData.getHeatingStatus());
 
         //batteryStatus 动力电池当前状态
         int batteryStatus = Integer.parseInt(str.substring(203,204));
         vehicleData.setBatteryStatus(batteryStatus);
+        log.info("动力电池当前状态==：{}",vehicleData.getBatteryStatus());
 
         //batteryInsulationStatus 动力电池保温状态
         int batteryInsulationStatus = Integer.parseInt(str.substring(204,205));
         vehicleData.setBatteryInsulationStatus(batteryInsulationStatus);
+        log.info("动力电池保温状态==：{}",vehicleData.getBatteryInsulationStatus());
 
         //dcdcStatus DCDC(电力交换系统)状态
         int dcdcStatus = Integer.parseInt(str.substring(205,206));
         vehicleData.setDcdcStatus(dcdcStatus);
+        log.info("DCDC(电力交换系统)状态==：{}",vehicleData.getDcdcStatus());
 
         //chgStatus CHG(充电机)状态
         int chgStatus = Integer.parseInt(str.substring(206,207));
         vehicleData.setChgStatus(chgStatus);
+        log.info("CHG(充电机)状态 ==：{}",vehicleData.getChgStatus());
+
+        log.info("车辆数据解析完成:{}",vehicleData);
 
         vehicleDataList.add(vehicleData);
 

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/ResolverEventService.java

@@ -0,0 +1,22 @@
+package com.zhilian.resolver.service;
+
+import com.zhilian.common.resolver.domain.ResolverReportData;
+/**
+  * @ClassName ResolverEventService
+  * @Description 事件接口
+  * @Author Can.J
+  * @Date  2024/4/4 9:46
+ */
+public interface ResolverEventService {
+    /**
+     *  事件分析
+     * @param resolverReportData
+     */
+    public void execute(ResolverReportData resolverReportData);
+
+    /**
+     *  事件名称
+     * @return
+     */
+    String getEventName();
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/ResolverReportInfoService.java

@@ -18,4 +18,6 @@ public interface ResolverReportInfoService extends IService<ResolverReportInfo>
     List<ResolverReportInfo> pageQuery(ResolverReportInfo report);
 
     void saveDataToDatabase(ResolverReportData vehicleData);
+
+    void saveDataToDatabaseByMalfunction(ResolverReportData resolverReportData);
 }

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/UserService.java

@@ -0,0 +1,16 @@
+package com.zhilian.resolver.service;
+
+import com.zhilian.common.core.domain.Result;
+import com.zhilian.common.resolver.domain.SysUserEnhancedServices;
+
+import java.util.List;
+
+/**
+  * @ClassName UserService
+  * @Description 用户信息 测试用
+  * @Author Can.J
+  * @Date  2024/4/4 11:28
+ */
+public interface UserService {
+    Result<List<SysUserEnhancedServices>> getUserEnhancedServices();
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/ReportByEsServiceImpl.java

@@ -27,7 +27,7 @@ import java.util.Map;
 
 /**
   * @ClassName ReportByEsServiceImpl
-  * @Description ES 查询报文业务实现层
+  * @Description ES 查询报文业务实现层  不使用此业务
   * @Author Can.J
   * @Date  2024/3/28 0:03
  */

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/ResolverReportInfoServiceImpl.java

@@ -83,11 +83,25 @@ public class ResolverReportInfoServiceImpl extends ServiceImpl<ResolverReportInf
         return resultList;
     }
 
+
+    /**
+     *  存储事件
+     * @param vehicleData
+     */
     @Override
     public void saveDataToDatabase(ResolverReportData vehicleData) {
         reportMapper.reportMapper(vehicleData);
     }
 
+    /**
+     *  故障事件
+     * @param resolverReportData
+     */
+    @Override
+    public void saveDataToDatabaseByMalfunction(ResolverReportData resolverReportData) {
+         reportMapper.saveDataToDatabaseByMalfunction(resolverReportData);
+    }
+
 
     /**
      * 生成缓存的key

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/UserServiceImpl.java

@@ -0,0 +1,30 @@
+package com.zhilian.resolver.service.impl;
+
+import com.zhilian.common.core.domain.Result;
+import com.zhilian.common.resolver.domain.SysUserEnhancedServices;
+import com.zhilian.resolver.mapper.UserMapper;
+import com.zhilian.resolver.service.UserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+  * @ClassName UserServiceImpl
+  * @Description 用户信息 业务实现层 测试用
+  * @Author Can.J
+  * @Date  2024/4/4 11:27
+ */
+@Slf4j
+@Service
+public class UserServiceImpl implements UserService {
+    @Autowired
+    private UserMapper userMapper;
+    @Override
+    public Result<List<SysUserEnhancedServices>> getUserEnhancedServices() {
+        List<SysUserEnhancedServices> list= userMapper.getUserEnhancedServices();
+        log.info("用户信息:{}",list);
+        return Result.success(list);
+    }
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventGeofence/GeofenceEventServiceImpl.java

@@ -0,0 +1,27 @@
+package com.zhilian.resolver.service.impl.eventGeofence;
+
+import com.zhilian.common.resolver.domain.ResolverReportData;
+import com.zhilian.resolver.service.ResolverEventService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+  * @ClassName GeofenceEventServiceImpl
+  * @Description 电子围栏事件
+  * @Author Can.J
+  * @Date  2024/4/4 10:25
+ */
+@Slf4j
+@Service("geofence")
+public class GeofenceEventServiceImpl implements ResolverEventService {
+
+    @Override
+    public void execute(ResolverReportData resolverReportData) {
+
+    }
+
+    @Override
+    public String getEventName() {
+        return "geofence";
+    }
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventMalfunction/MalfunctionEventServiceImpl.java

@@ -0,0 +1,75 @@
+package com.zhilian.resolver.service.impl.eventMalfunction;
+
+import com.zhilian.common.resolver.domain.ResolverReportData;
+import com.zhilian.common.resolver.domain.SysUserEnhancedServices;
+import com.zhilian.resolver.mapper.UserMapper;
+import com.zhilian.resolver.service.ResolverEventService;
+import com.zhilian.resolver.service.ResolverReportInfoService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+  * @ClassName MalfunctionEventServiceImpl
+  * @Description 故障事件服务
+  * @Author Can.J
+  * @Date  2024/4/4 10:00
+ */
+@Slf4j
+@Service("malfunction")
+public class MalfunctionEventServiceImpl implements ResolverEventService {
+
+    /**
+     *  获取用信息 模拟故障
+     */
+    @Autowired
+    private UserMapper userMapper;
+
+    /**
+     *  注入ResolverReportInfoService 业务层
+     */
+    @Autowired
+    private ResolverReportInfoService resolverReportInfoService;
+
+    @Override
+    public void execute(ResolverReportData vehicleData) {
+        log.info("故障事件开始执行");
+
+        //模拟故障 获取用户信息
+        for (SysUserEnhancedServices userEnhancedService : userMapper.getUserEnhancedServices()) {
+            if(userEnhancedService.getEnhancedServicesId()==3 && userEnhancedService.getUseId()==102){
+                if(isAnyFieldZero(vehicleData)){
+                    resolverReportInfoService.saveDataToDatabaseByMalfunction(vehicleData);
+                }
+
+            }
+        }
+
+
+        log.info("故障事件结束");
+
+    }
+    private boolean isAnyFieldZero(ResolverReportData resolverReportData) {
+        return resolverReportData.getChargingStatus() == 0 ||
+                resolverReportData.getOperatingStatus() == 0 ||
+                resolverReportData.getSocStatus() == 0 ||
+                resolverReportData.getVehicleStatus() == 0 ||
+                resolverReportData.getChargingEnergyStorageStatus() == 0 ||
+                resolverReportData.getDriveMotorStatus() == 0 ||
+                resolverReportData.getPositionStatus() == 0 ||
+                resolverReportData.getEasStatus() == 0 ||
+                resolverReportData.getPtcStatus() == 0 ||
+                resolverReportData.getEpsStatus() == 0 ||
+                resolverReportData.getAbsStatus() == 0 ||
+                resolverReportData.getMcuStatus() == 0 ||
+                resolverReportData.getHeatingStatus() == 0 ||
+                resolverReportData.getBatteryStatus() == 0 ||
+                resolverReportData.getBatteryInsulationStatus() == 0 ||
+                resolverReportData.getDcdcStatus() == 0 ||
+                resolverReportData.getChgStatus() == 0;
+    }
+    @Override
+    public String getEventName() {
+        return "malfunction";
+    }
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventRealTime/RealTimeTrajectoryEventImplService.java

@@ -0,0 +1,32 @@
+package com.zhilian.resolver.service.impl.eventRealTime;
+
+import com.zhilian.common.resolver.domain.ResolverReportData;
+import com.zhilian.resolver.service.ResolverEventService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+/**
+  * @ClassName RealTimeTrajectoryEventImplService
+  * @Description 实时轨迹数据
+  * @Author Can.J
+  * @Date  2024/4/4 9:49
+ */
+@Slf4j
+@Service("event-realTimeTrajectory")
+public class RealTimeTrajectoryEventImplService implements ResolverEventService {
+    @Override
+    public void execute(ResolverReportData resolverReportData) {
+        log.info("开始实时数据");
+        log.info("结束实时数据");
+
+    }
+
+    /**
+     * 实时轨迹数据
+     * @return
+     */
+    @Override
+    public String getEventName() {
+        return "event-realTimeTrajectory";
+    }
+}

zhilian-modules/zhilian-resolver/src/main/java/com/zhilian/resolver/service/impl/eventStorage/StorageEventServiceImpl.java

@@ -0,0 +1,45 @@
+package com.zhilian.resolver.service.impl.eventStorage;
+
+import com.zhilian.common.resolver.domain.ResolverReportData;
+import com.zhilian.common.resolver.domain.SysUserEnhancedServices;
+import com.zhilian.resolver.mapper.UserMapper;
+import com.zhilian.resolver.service.ResolverReportInfoService;
+import com.zhilian.resolver.service.ResolverEventService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+  * @ClassName StorageEventServiceImpl
+  * @Description 存储服务事件
+  * @Author Can.J
+  * @Date  2024/4/4 9:57
+ */
+@Slf4j
+@Service("event-storage")
+public class StorageEventServiceImpl implements ResolverEventService {
+    @Autowired
+    private UserMapper userMapper;
+    @Autowired
+    private ResolverReportInfoService resolverReportInfoService;
+    @Override
+    public void execute(ResolverReportData vehicleData) {
+        log.info("开始存储");
+
+        //模拟 用户userid 100  事件1(存储事件)
+        for (SysUserEnhancedServices userEnhancedService : userMapper.getUserEnhancedServices()) {
+            //userId    事件编号      客户
+            //100	     1			客户100-增值服务 存储事件
+            if(userEnhancedService.getEnhancedServicesId()==1 && userEnhancedService.getUseId()==100){
+                resolverReportInfoService.saveDataToDatabase(vehicleData);
+            }
+        }
+
+        log.info("结束存储");
+    }
+
+    @Override
+    public String getEventName() {
+        return "event-storage";
+    }
+}

zhilian-modules/zhilian-resolver/src/main/resources/bootstrap.yml

@@ -33,6 +33,20 @@ es:
   host: 111.229.33.194
   port: 9200
   scheme: http
+rabbitmq:
+  host: 111.229.33.194
+  port: 5672
+  # 开启发送端消息抵达Broker确认
+  publisher-confirms: true
+  # 开启发送端消息抵达Queue确认
+  publisher-returns: true
+  # 只要消息抵达Queue，就会异步发送优先回调 returnfirm
+  template:
+    mandatory: true
+  listener:
+    simple:
+      # 手动 ack消息，不使用默认的消费端确认
+      acknowledge-mode: manual
 # 服务器配置
 #mqtt:
 #  server:

zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/ResolverReportInfoMapper.xml

@@ -70,5 +70,71 @@
                 #{brakePedal}
                );
     </insert>
+    <insert id="saveDataToDatabaseByMalfunction">
+        INSERT INTO `vehicle-resolver`.`event_malfunction_data`
+        (`vin`, `create_time`, `longitude`, `latitude`,
+         `speed`, `mileage`, `voltage`, `current`, `resistance`, `gear`,
+         `acceleration_pedal`, `fuel_consumption_rate`,
+         `motor_controller_temperature`, `motor_speed`,
+         `motor_torque`, `motor_temperature`, `motor_voltage`,
+         `motor_current`, `remaining_battery`, `maximum_feedback_power`,
+         `maximum_discharge_power`, `self_check_counter`,
+         `total_battery_current`, `total_battery_voltage`,
+         `single_battery_max_voltage`, `single_battery_min_voltage`,
+         `single_battery_max_temperature`, `single_battery_min_temperature`,
+         `available_battery_capacity`, `vehicle_status`, `charging_status`,
+         `operatingStatus`, `soc_status`, `charging_energy_storage_status`,
+         `drive_motor_status`, `position_status`, `eas_status`, `ptc_status`,
+         `eps_status`, `abs_status`, `mcu_status`, `heating_status`, `battery_status`,
+         `battery_insulation_status`, `dcdc_status`, `chg_status`, `brake_pedal`)
+        VALUES (#{vin},
+                #{createTime},
+                #{longitude},
+                #{latitude},
+                #{speed},
+                #{mileage},
+                #{voltage},
+                #{current},
+                #{resistance},
+                #{gear},
+                #{accelerationPedal},
+                #{fuelConsumptionRate},
+                #{motorControllerTemperature},
+                #{motorSpeed},
+                #{motorTorque},
+                #{motorTemperature},
+                #{motorVoltage},
+                #{motorCurrent},
+                #{remainingBattery},
+                #{maximumFeedbackPower},
+                #{maximumDischargePower},
+                #{selfCheckCounter},
+                #{totalBatteryCurrent},
+                #{totalBatteryVoltage},
+                #{singleBatteryMaxVoltage},
+                #{singleBatteryMinVoltage},
+                #{singleBatteryMaxTemperature},
+                #{singleBatteryMinTemperature},
+                #{availableBatteryCapacity},
+                #{vehicleStatus},
+                #{chargingStatus},
+                #{operatingStatus},
+                #{socStatus},
+                #{chargingEnergyStorageStatus},
+                #{driveMotorStatus},
+                #{positionStatus},
+                #{easStatus},
+                #{ptcStatus},
+                #{epsStatus},
+                #{absStatus},
+                #{mcuStatus},
+                #{heatingStatus},
+                #{batteryStatus},
+                #{batteryInsulationStatus},
+                #{dcdcStatus},
+                #{chgStatus},
+                #{brakePedal}
+               );
+    </insert>
 
 </mapper>

zhilian-modules/zhilian-resolver/src/main/resources/mapper/resolver/UserMapper.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zhilian.resolver.mapper.UserMapper">
+
+
+    <select id="getUserEnhancedServices"
+            resultType="com.zhilian.common.resolver.domain.SysUserEnhancedServices">
+        select * from sys_user_enhanced_services
+    </select>
+</mapper>