diff --git a/cloud-modules/saas/saas-common/pom.xml b/cloud-modules/saas/saas-common/pom.xml
index cb74eaa..bda0d95 100644
--- a/cloud-modules/saas/saas-common/pom.xml
+++ b/cloud-modules/saas/saas-common/pom.xml
@@ -32,12 +32,6 @@
swagger-annotations
2.2.8
-
- com.muyu.server
- saas-server
- 3.6.3
- compile
-
diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java
index c2e5e47..fd544eb 100644
--- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java
+++ b/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java
@@ -15,6 +15,7 @@ import lombok.NoArgsConstructor;
@EqualsAndHashCode(callSuper = true)
@TableName(value = "sys_car",autoResultMap = true)
public class SysCar extends BaseEntity {
+
@TableId(value = "id",type = IdType.AUTO)
private Long id;
private String carVin;
diff --git a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/config/MqttConfigure.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java
similarity index 98%
rename from cloud-modules/saas/saas-common/src/main/java/com/muyu/common/config/MqttConfigure.java
rename to cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java
index 12d4867..41de3c7 100644
--- a/cloud-modules/saas/saas-common/src/main/java/com/muyu/common/config/MqttConfigure.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java
@@ -1,4 +1,4 @@
-package com.muyu.common.config;
+package com.muyu.server.config;
import cn.hutool.json.JSONObject;
import com.muyu.server.service.TemplateService;
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java
index 70b3659..a7f34c8 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/controller/SysCarController.java
@@ -84,9 +84,10 @@ public class SysCarController {
* @return
*/
@PostMapping("/findCarByVin")
- @Operation(summary = "根据VIN码查询车信息",description = "根据VIN码查询车信息")
+// @Operation(summary = "根据VIN码查询车信息",description = "根据VIN码查询车信息")
public Result findCarByVin(@RequestParam("carVin") String carVin){
return Result.success(sysCarService.findCarByVin(carVin));
}
+
}
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java
index df697b2..d57d045 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/mapper/SysCarMapper.java
@@ -19,4 +19,8 @@ public interface SysCarMapper extends BaseMapper {
List findFenceByCarVin(@Param("carVin") String carVin);
+ SysCar findCarByVin(@Param("carVin") String carVin);
+
+ SysCar selectByCarVin(@Param("carVin") String carVin);
+
}
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java
index 1e5fc57..f9c0228 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/SysCarService.java
@@ -22,4 +22,5 @@ public interface SysCarService {
SysCar findCarByVin(String carVin);
+
}
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
index d95d684..206099b 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
@@ -1,5 +1,6 @@
package com.muyu.server.service.impl;
+import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.domain.SysCar;
@@ -13,6 +14,7 @@ import org.springframework.stereotype.Service;
import java.util.List;
+@DS("lizzDB")
@Service
public class SysCarServiceImpl extends ServiceImpl implements SysCarService {
@Autowired
@@ -51,7 +53,8 @@ public class SysCarServiceImpl extends ServiceImpl impleme
public SysCar findCarByVin(String carVin) {
QueryWrapper sysCarQueryWrapper = new QueryWrapper<>();
sysCarQueryWrapper.eq("car_vin", carVin);
- SysCar sysCar = sysCarMapper.selectOne(sysCarQueryWrapper);
- return sysCar;
+ List sysCars = sysCarMapper.selectList(sysCarQueryWrapper);
+ return sysCars.isEmpty() ? null : sysCars.get(0);
}
+
}
diff --git a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java
index 31b3b5a..34b0814 100644
--- a/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java
+++ b/cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/TemplateServiceImpl.java
@@ -66,6 +66,7 @@ public class TemplateServiceImpl extends ServiceImpl i
log.info("carVin码为:" + carVin);
//根据VIN码获取车辆信息
SysCar carByVin = sysCarService.findCarByVin(carVin);
+ log.info("车辆信息为:" + carByVin);
//对应车辆所对应的报文模版
Integer templateId = carByVin.getTemplateId();
@@ -102,6 +103,7 @@ public class TemplateServiceImpl extends ServiceImpl i
jsonObject.put(messageTemplateType.getMessageField(), result.substring(startIndex, endIndex));
}
+ System.out.println("哈哈哈红红火火恍恍惚惚");
log.info("解析后的报文是:" + jsonObject);
diff --git a/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml b/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml
index 437579a..792d531 100644
--- a/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml
+++ b/cloud-modules/saas/saas-server/src/main/resources/mapper/SysCarMapper.xml
@@ -74,4 +74,10 @@
WHERE
sys_car_fault_log.vin = #{carVin};
+
+