couplet-auth/src/main/resources/bootstrap.yml

@@ -4,8 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-auth
@@ -25,3 +23,5 @@ spring:
         # 共享配置
         shared-configs:
           - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
+  main:
+    allow-bean-definition-overriding: true

couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/domain/PageResult.java

@@ -1,34 +0,0 @@
-package com.couplet.common.core.domain;
-
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author DongZl
- * @description: 列表返回结果集
- */
-@Data
-public class PageResult<T> implements Serializable {
-    /**
-     * 总条数
-     */
-    private long total;
-    /**
-     * 结果集合
-     */
-    private List<T> list;
-    public PageResult() {
-    }
-    public PageResult(long total, List<T> list) {
-        this.total = total;
-        this.list = list;
-    }
-    public static <T> PageResult<T> toPageResult(long total, List<T> list){
-        return new PageResult(total , list);
-    }
-    public static <T> Result<PageResult<T>> toResult(long total, List<T> list){
-        return Result.success(PageResult.toPageResult(total,list));
-    }
-}

couplet-common/couplet-common-system/src/main/java/com/couplet/common/system/domain/SysDept.java

@@ -40,10 +40,6 @@ public class SysDept extends BaseEntity {
      */
     private Long parentId;
 
-
-    @TableField(exist = false)
-    private String remark;
-
     /**
      * 祖级列表
      */

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml

@@ -16,11 +16,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/bootstrap.yml

@@ -15,11 +15,9 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-file/src/main/resources/bootstrap.yml

@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-gen/src/main/resources/bootstrap.yml

@@ -4,8 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-gen
@@ -17,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: 968741d4-299d-483c-8d30-ede2aff8cfd4
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-job/src/main/resources/bootstrap.yml

@@ -4,8 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-job
@@ -17,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-modules-vehicle/pom.xml

@@ -84,13 +84,6 @@
             <artifactId>couplet-common-swagger</artifactId>
         </dependency>
 
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.1</version>
-        </dependency>
-
     </dependencies>
 
     <build>

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java

@@ -10,8 +10,6 @@ import com.couplet.vehicle.domain.req.VehicleEditParams;
 import com.couplet.vehicle.domain.req.VehicleInsertParams;
 import com.couplet.vehicle.domain.req.VehicleListParams;
 import com.couplet.vehicle.service.VehicleService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -41,13 +39,10 @@ public class VehicleController extends BaseController {
     @PostMapping("/list")
     @Log(title = "车辆列表")
     public Result list(@RequestBody VehicleListParams listParams) {
-        PageHelper.startPage(listParams.getPageNum(), listParams.getPageSize());
 
-        List<Vehicle> list = vehicleService.list(listParams);
+        List<Vehicle> List = vehicleService.list(listParams);
 
-        PageInfo<Vehicle> vehiclePageInfo = new PageInfo<>(list);
+        return Result.success(List);
-
-        return Result.success(vehiclePageInfo);
     }
 
     /*
@@ -95,27 +90,9 @@ public class VehicleController extends BaseController {
     @PostMapping("/insert")
     @Log(title = "新增车辆", businessType = BusinessType.INSERT)
     public Result insert(@RequestBody @Validated VehicleInsertParams insertParams) {
-        System.out.println(insertParams);
+
         String result = vehicleService.insert(insertParams);
 
         return Result.success(result);
     }
-
-
-    /*
-     * @Author: LiuYunHu
-     * @Date: 2024/3/31 21:34
-     * @Description: 获取绑定当前车辆的标识
-     * @Param: [vehicleId]
-     * @Return: com.couplet.common.core.domain.Result
-     **/
-    @RequiresPermissions("couplet:vehicle:list")
-    @GetMapping("/getBindLogoById/{vehicleId}")
-    public Result getBindLogoById(@PathVariable("vehicleId") Long vehicleId) {
-
-        List<Long> bindLogoById = vehicleService.getBindLogoById(vehicleId);
-
-
-        return Result.success(bindLogoById);
-    }
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java

@@ -6,7 +6,6 @@ import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotNull;
-import java.util.List;
 
 
 /**
@@ -54,7 +53,4 @@ public class VehicleEditParams {
      * */
     private String batteryNumber;
 
-    //标识id集合
-    private List<Long> logoIds;
-
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java

@@ -57,6 +57,7 @@ public class VehicleInsertParams {
     /*
     * 一辆车可以绑定多个标识
     * */
+    @Size(min = 1, message = "车辆至少绑定一个标识")
     private List<Long> logoIds;
 
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java

@@ -26,10 +26,4 @@ public class VehicleListParams {
      * */
     private Integer vehicleState;
 
-    /*
-     * 分页参数
-     * */
-    private Integer pageNum = 1;
-    private Integer pageSize = 5;
-
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java

@@ -18,8 +18,4 @@ import java.util.List;
 @Component
 public interface VehicleAndLogoMapper extends BaseMapper<VehicleAndLogo> {
     int vehicleBindLogo(@Param("vehicleId") Long vehicleId, @Param("logoIds") List<Long> logoIds);
-
-    int deleteByVehicleId(@Param("vehicleId") Long vehicleId);
-
-    List<Long> getBindLogoById(@Param("vehicleId") Long vehicleId);
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java

@@ -14,8 +14,4 @@ import java.util.List;
 
 public interface VehicleAndLogoService extends IService<VehicleAndLogo> {
     int vehicleBindLogo(Long vehicleId, List<Long> logoIds);
-
-    int deleteByVehicleId(Long vehicleId);
-
-    List<Long> getBindLogoById(Long vehicleId);
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleService.java

@@ -23,6 +23,4 @@ public interface VehicleService extends IService<Vehicle> {
     String editById(VehicleEditParams editParams);
 
     String insert(VehicleInsertParams insertParams);
-
-    List<Long> getBindLogoById(Long vehicleId);
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java

@@ -8,7 +8,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -35,43 +34,7 @@ public class VehicleAndLogoServiceImpl extends ServiceImpl<VehicleAndLogoMapper,
      **/
     @Override
     public int vehicleBindLogo(Long vehicleId, List<Long> logoIds) {
-        //将ids转为list
-//        ArrayList<Long> logoIdList = new ArrayList<>();
-//        String[] split = logoIds.split(",");
-//        for (String s : split) {
-//            logoIdList.add(Long.parseLong(s));
-//        }
 
-        //执行绑定
         return mapper.vehicleBindLogo(vehicleId, logoIds);
     }
-
-    /*
-     * @Author: LiuYunHu
-     * @Date: 2024/3/31 21:21
-     * @Description: 删除掉车辆绑定
-     * @Param: [vehicleId]
-     * @Return: int
-     **/
-    @Override
-    public int deleteByVehicleId(Long vehicleId) {
-
-
-        return mapper.deleteByVehicleId(vehicleId);
-    }
-
-    /*
-     * @Author: LiuYunHu
-     * @Date: 2024/3/31 21:35
-     * @Description: 获取绑定当前车辆的标识
-     * @Param: [vehicleId]
-     * @Return: java.util.List<java.lang.Long>
-     **/
-    @Override
-    public List<Long> getBindLogoById(Long vehicleId) {
-
-
-        return mapper.getBindLogoById(vehicleId);
-    }
-
 }

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java

@@ -3,13 +3,13 @@ package com.couplet.vehicle.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.utils.StringUtils;
 import com.couplet.vehicle.domain.Vehicle;
 import com.couplet.vehicle.domain.VehicleType;
 import com.couplet.vehicle.domain.req.VehicleEditParams;
 import com.couplet.vehicle.domain.req.VehicleInsertParams;
 import com.couplet.vehicle.domain.req.VehicleListParams;
+import com.couplet.vehicle.exception.VehicleException;
 import com.couplet.vehicle.mapper.VehicleMapper;
 import com.couplet.vehicle.service.VehicleAndLogoService;
 import com.couplet.vehicle.service.VehicleService;
@@ -107,7 +107,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
 
         if (!update) {
             result = "删除失败";
-            Result.error(result);
+            throw new VehicleException(result);
         }
 
         result = "删除成功！";
@@ -126,14 +126,10 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
     public String editById(VehicleEditParams editParams) {
         String result = "";
 
-        if ((editParams.getLogoIds() == null || editParams.getLogoIds().isEmpty())) {
-            result = "未选择电子围栏";
-            Result.error(result);
-        }
-
         UpdateWrapper<Vehicle> updateWrapper = new UpdateWrapper<>();
 
         //编辑车辆类型
+
         updateWrapper.set("vehicle_type", editParams.getVehicleType())
 
                 //编辑电机厂商
@@ -156,15 +152,9 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
 
         if (!update) {
             result = "编辑失败";
-            Result.error(result);
+            throw new VehicleException(result);
         }
 
-        //删除掉车辆id为入参的车辆、标识的中间表数据
-        int delete = vehicleAndLogoService.deleteByVehicleId(editParams.getVehicleId());
-
-        //删除绑定之后，再添加新的绑定
-        vehicleAndLogoService.vehicleBindLogo(editParams.getVehicleId(), editParams.getLogoIds());
-
         result = "编辑成功！";
 
         return result;
@@ -181,12 +171,6 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
     public String insert(VehicleInsertParams insertParams) {
         String result = "";
 
-        if ((insertParams.getLogoIds() == null || insertParams.getLogoIds().isEmpty())) {
-            result = "未选择电子围栏";
-            Result.error(result);
-        }
-
-
         //雪花算法生成随机数
         SnowflakeIdGenerator idGenerator = new SnowflakeIdGenerator(1, 1);
         long randomId = idGenerator.nextId();
@@ -211,7 +195,7 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
 
         if (insert == 0) {
             result = "新增失败";
-            Result.error(result);
+            throw new VehicleException(result);
         }
 
         //获取新增的车辆id值
@@ -224,19 +208,4 @@ public class VehicleServiceImpl extends ServiceImpl<VehicleMapper, Vehicle> impl
         return result;
     }
 
-
-    /*
-     * @Author: LiuYunHu
-     * @Date: 2024/3/31 21:34
-     * @Description: 获取绑定当前车辆的标识
-     * @Param: [vehicleId]
-     * @Return: java.util.List<java.lang.Long>
-     **/
-    @Override
-    public List<Long> getBindLogoById(Long vehicleId) {
-        List<Long> logoIds = vehicleAndLogoService.getBindLogoById(vehicleId);
-
-        return logoIds;
-    }
-
 }

couplet-modules/couplet-modules-vehicle/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml

@@ -12,16 +12,4 @@
             (#{vehicleId},#{logoId})
         </foreach>
     </insert>
-
-    <delete id="deleteByVehicleId">
-        DELETE
-        FROM `couplet_vehicle_and_logo`
-        WHERE `vehicle_id` = #{vehicleId}
-    </delete>
-
-    <select id="getBindLogoById" resultType="java.lang.Long">
-        SELECT val.logo_id
-        FROM `couplet_vehicle_and_logo` val
-        WHERE val.vehicle_id = #{vehicleId}
-    </select>
 </mapper>

couplet-modules/couplet-msg/pom.xml

@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>com.couplet</groupId>
-        <artifactId>couplet-modules</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>couplet-msg</artifactId>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-    <dependencies>
-
-        <!-- SpringCloud Alibaba Nacos -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Nacos Config -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
-        </dependency>
-
-        <!-- SpringCloud Alibaba Sentinel -->
-        <dependency>
-            <groupId>com.alibaba.cloud</groupId>
-            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
-        </dependency>
-
-        <!-- SpringBoot Actuator -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
-
-        <!-- Swagger UI -->
-        <dependency>
-            <groupId>io.springfox</groupId>
-            <artifactId>springfox-swagger-ui</artifactId>
-            <version>${swagger.fox.version}</version>
-        </dependency>
-
-        <!-- Mysql Connector -->
-        <dependency>
-            <groupId>com.mysql</groupId>
-            <artifactId>mysql-connector-j</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataSource -->
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-datasource</artifactId>
-        </dependency>
-
-        <!-- MuYu Common DataScope -->
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-datascope</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Log -->
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-log</artifactId>
-        </dependency>
-
-        <!-- MuYu Common Swagger -->
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-swagger</artifactId>
-        </dependency>
-
-    </dependencies>
-</project>

couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/MsgData.java

@@ -1,382 +0,0 @@
-package com.couplet.msg.domain;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-import java.math.BigDecimal;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/31 16:01
- * @description
- */
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class MsgData {
-    /**
-     * VIN
-     */
-    private String vin;
-    /**
-     * 行驶路线
-     */
-    private String drivingRoute;
-
-    /**
-     * 经度
-     */
-    private String longitude;
-
-    /**
-     * 维度
-     */
-    private String latitude;
-
-    /**
-     * 速度
-     */
-    private String speed;
-
-    /**
-     * 里程
-     */
-    private BigDecimal mileage;
-
-    /**
-     * 总电压
-     */
-    private String voltage;
-
-    /**
-     * 总电流
-     */
-    private String current;
-
-    /**
-     * 绝缘电阻
-     */
-    private String resistance;
-
-    /**
-     * 档位
-     */
-    private String gear = "P";
-
-    /**
-     * 加速踏板行程值
-     */
-    private String accelerationPedal;
-
-    /**
-     * 制动踏板行程值
-     */
-    private String brakePedal;
-
-    /**
-     * 燃料消耗率
-     */
-    private String fuelConsumptionRate;
-
-    /**
-     * 电机控制器温度
-     */
-    private String motorControllerTemperature;
-
-    /**
-     * 电机转速
-     */
-    private String motorSpeed;
-
-    /**
-     * 电机转矩
-     */
-    private String motorTorque;
-
-    /**
-     * 电机温度
-     */
-    private String motorTemperature;
-
-    /**
-     * 电机电压
-     */
-    private String motorVoltage;
-
-    /**
-     * 电机电流
-     */
-    private String motorCurrent;
-
-    /**
-     * 动力电池剩余电量SOC
-     */
-    private BigDecimal remainingBattery;
-
-    /**
-     * 电池总容量
-     */
-    private BigDecimal batteryLevel;
-
-    /**
-     * 当前状态允许的最大反馈功率
-     */
-    private String maximumFeedbackPower;
-
-    /**
-     * 当前状态允许最大放电功率
-     */
-    private String maximumDischargePower;
-
-    /**
-     * BMS自检计数器
-     */
-    private String selfCheckCounter;
-
-    /**
-     * 动力电池充放电电流
-     */
-    private String totalBatteryCurrent;
-
-    /**
-     * 动力电池负载端总电压V3
-     */
-    private String totalBatteryVoltage;
-
-    /**
-     * 单次最大电压
-     */
-    private String singleBatteryMaxVoltage;
-
-    /**
-     * 单体电池最低电压
-     */
-    private String singleBatteryMinVoltage;
-
-    /**
-     * 单体电池最高温度
-     */
-    private String singleBatteryMaxTemperature;
-
-    /**
-     * 单体电池最低温度
-     */
-    private String singleBatteryMinTemperature;
-
-    /**
-     * 动力电池可用容量
-     */
-    private String availableBatteryCapacity;
-
-    /**
-     * 车辆状态
-     */
-    private int vehicleStatus = 1;
-
-    /**
-     * 充电状态
-     */
-    private int chargingStatus = 1;
-
-    /**
-     * 运行状态
-     */
-    private int operatingStatus = 1;
-
-    /**
-     * SOC
-     */
-    private int socStatus = 1;
-
-    /**
-     * 可充电储能装置工作状态
-     */
-    private int chargingEnergyStorageStatus = 1;
-
-    /**
-     * 驱动电机状态
-     */
-    private int driveMotorStatus = 1;
-
-    /**
-     * 定位是否有效
-     */
-    private int positionStatus = 1;
-
-    /**
-     * EAS(汽车防盗系统)状态
-     */
-    private int easStatus = 1;
-
-    /**
-     * PTC(电动加热器)状态
-     */
-    private int ptcStatus = 1;
-
-    /**
-     * EPS(电动助力系统)状态
-     */
-    private int epsStatus = 1;
-
-    /**
-     * ABS(防抱死)状态
-     */
-    private int absStatus = 1;
-
-    /**
-     * MCU(电机/逆变器)状态
-     */
-    private int mcuStatus = 1;
-
-    /**
-     * 动力电池加热状态
-     */
-    private int heatingStatus = 1;
-
-    /**
-     * 动力电池当前状态
-     */
-    private int batteryStatus = 1;
-
-    /**
-     * 动力电池保温状态
-     */
-    private int batteryInsulationStatus = 1;
-
-    /**
-     * DCDC(电力交换系统)状态
-     */
-    private int dcdcStatus = 1;
-
-    /**
-     * CHG(充电机)状态
-     */
-    private int chgStatus = 1;
-
-    /**
-     * 车辆状态 报文
-     */
-    private String vehicleStatusMsg;
-    /**
-     * 智能硬件 报文
-     */
-    private String smartHardwareMsg;
-    /**
-     * 电池报文
-     */
-    private String batteryMsg;
-
-    public String getMsg(){
-        //第一位VIN
-        return vin +
-                // 当前时间戳
-                System.currentTimeMillis() +
-                //第二位经度 longitude latitude
-                getValue(longitude, 11) +
-                //第三位维度 longitude latitude
-                getValue(latitude, 10) +
-                //车速
-                getValue(speed, 6) +
-                //总里程
-                getValue(mileage == null ? "" : mileage.toString(), 11) +
-                // 总电压
-                getValue(voltage, 6) +
-                //总电流
-                getValue(current, 5) +
-                //绝缘电阻 79 - 87
-                getValue(resistance, 9) +
-                //档位
-                (gear == null ? "D" : gear) +
-                // 加速踏板行程值
-                getValue(accelerationPedal, 2) +
-                // 制动踏板行程值
-                getValue(brakePedal, 2) +
-                // 燃料消耗率
-                getValue(fuelConsumptionRate, 5) +
-                //电机控制器温度
-                getValue(motorControllerTemperature, 6) +
-                //电机转速
-                getValue(motorSpeed, 5) +
-                //点击转矩
-                getValue(motorTorque, 4) +
-                //电机温度
-                getValue(motorTemperature, 6) +
-                //电机电压
-                getValue(motorVoltage, 5) +
-                //电机电流
-                getValue(motorCurrent, 8) +
-                //动力电池剩余电量SOC
-                getValue(remainingBattery == null ? "" : remainingBattery.toString(), 6) +
-                //当前状态允许的最大反馈功率
-                getValue(maximumFeedbackPower, 6) +
-                //当前状态允许最大放电功率
-                getValue(maximumDischargePower, 6) +
-                //BMS自检计数器
-                getValue(selfCheckCounter, 2) +
-                //动力电池充放电电流
-                getValue(totalBatteryCurrent, 5) +
-                //动力电池负载端总电压V3
-                getValue(totalBatteryVoltage, 6) +
-                //单次最大电压
-                getValue(singleBatteryMaxVoltage, 4) +
-                //单体电池最低电压
-                getValue(singleBatteryMinVoltage, 4) +
-                //单体电池最高温度
-                getValue(singleBatteryMaxTemperature, 6) +
-                //单体电池最低温度
-                getValue(singleBatteryMinTemperature, 6) +
-                //动力电池可用容量
-                getValue(availableBatteryCapacity, 6) +
-                //车辆状态
-                vehicleStatus +
-                //充电状态
-                chargingStatus +
-                //运行状态
-                operatingStatus +
-                //SOC
-                socStatus +
-                //可充电储能装置工作状态
-                chargingEnergyStorageStatus +
-                //驱动电机状态
-                driveMotorStatus +
-                //定位是否有效
-                positionStatus +
-                //EAS
-                easStatus +
-                //PTC
-                ptcStatus +
-                //EPS
-                epsStatus +
-                //ABS
-                absStatus +
-                //MCU
-                mcuStatus +
-                //动力电池加热状态
-                heatingStatus +
-                //动力电池当前状态
-                batteryStatus +
-                //动力电池保温状态
-                batteryInsulationStatus +
-                //DCDC
-                dcdcStatus +
-                //CHG
-                chgStatus;
-    }
-
-    public String getValue(String val , int valLength){
-        if(val == null){
-            val = "";
-        }
-        int length = val.length();
-        if (length > valLength){
-            return val.substring( 0 , valLength);
-        }
-        val = val + "0".repeat(valLength - length);
-        return val;
-    }
-
-}

couplet-modules/couplet-msg/src/main/java/com/couplet/msg/domain/TroubleLog.java

@@ -1,51 +0,0 @@
-package com.couplet.msg.domain;
-
-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.util.Date;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/31 21:18
- * @description
- */
-@Data
-@Builder
-@AllArgsConstructor
-@NoArgsConstructor
-public class TroubleLog {
-    /**
-     * 故障记录Id
-     */
-    private Integer troubleLogId;
-
-    /**
-     * 故障码
-     */
-    private String troubleLogCode;
-
-    /**
-     * 故障记录车辆VIN
-     */
-    private String troubleLogVin;
-
-    /**
-     * 开始预警时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date troubleLogStartTime;
-
-    /**
-     * 结束预警时间
-     */
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
-    private Date troubleLogEndTime;
-}

couplet-modules/couplet-msg/src/test/java/com/couplet/msg/Main.java

@@ -1,28 +0,0 @@
-package com.couplet.msg;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/31 16:57
- * @description
- */
-public class Main {
-    public static void main(String[] args) {
-        String msgString = "VIN123456789DIJE41711764104506116.664380039.531990072.00031.3760000022000022000852000000D00809.600940000589066790930000203002030000044282.55000014000080700007440003000400095000058000054000011111111111111111";
-
-        //使用正则表达式匹配需要的部分
-        String pattern = "(.{17})(.{10})(.{4})(.{2})(.{2})";
-        Pattern compile = Pattern.compile(pattern);
-        Matcher matcher = compile.matcher(msgString);
-
-        if (matcher.find()) {
-            for (int i = 1; i <= matcher.groupCount(); i++) {
-                System.out.println("Group "+ i + ":" + matcher.group(i));
-            }
-        }
-
-    }
-}

couplet-modules/couplet-msg/src/test/java/com/couplet/msg/ParsingMsg.java

@@ -1,69 +0,0 @@
-package com.couplet.msg;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/30 11:39
- * @description
- */
-public class ParsingMsg {
-    private static final List<String> msgList = new ArrayList<>(){{
-       add("7E 56 49 4e 31 32 33 34 35 36 37 38 39 44 49 4a 45 34 31 37 31 31 37 36 34 31 30 34 35 30 36 31 31 36 2e 36 36 34 33 38 30 30 33 39 2e 35 33 31 39 39 30 30 37 32 2e 30 30 30 33 31 2e 33 37 36 30 30 30 30 30 32 32 30 30 30 30 32 32 30 30 30 38 35 32 30 30 30 30 30 30 44 30 30 38 30 39 2e 36 30 30 39 34 30 30 30 30 35 38 39 30 36 36 37 39 30 39 33 30 30 30 30 32 30 33 30 30 32 30 33 30 30 30 30 30 34 34 32 38 32 2e 35 35 30 30 30 30 31 34 30 30 30 30 38 30 37 30 30 30 30 37 34 34 30 30 30 33 30 30 30 34 30 30 30 39 35 30 30 30 30 35 38 30 30 30 30 35 34 30 30 30 30 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 31 24 7E");
-    }};
-
-    public static void main(String[] args) {
-        // 去头去尾
-        for (String string : msgList) {
-            String substring = string.substring(2, string.length() - 2);
-            System.out.println("去头去尾字符串："+ substring);
-
-            String hexStringWithoutSpaces = substring.replaceAll("\\s+", "");
-            String asciiString = hexToString(hexStringWithoutSpaces);
-            System.out.println("16进制解析后的数据："+asciiString);
-//            //截取前17位
-//            String substring1 = asciiString.substring(0, 17);
-//            System.out.println("VIN："+substring1);
-//            String substring2 = asciiString.substring(17, 30);
-//            System.out.println("时间戳："+substring2);
-//            String substring3 = asciiString.substring(30, 40);
-//            System.out.println("经度：" +substring3);
-//            String substring4 = asciiString.substring(41, 50);
-//            System.out.println("纬度："+ substring4);
-//            String substring5 = asciiString.substring(51, 56);
-//            System.out.println("车速："+ substring5);
-//            String substring6 = asciiString.substring(57, 67);
-//            System.out.println("总里程："+ substring6);
-//            String substring7 = asciiString.substring(68, 73);
-//            System.out.println("总电压："+ substring7);
-            String pattern = "(.{17})(.{10})(.{9})(.{8})(.{2})";
-            Pattern compile = Pattern.compile(pattern);
-            Matcher matcher = compile.matcher(asciiString);
-            if (matcher.find()) {
-                for (int i = 1; i < matcher.groupCount(); i++) {
-                    System.out.println("Group "+ i + ":" + matcher.group(i));
-                }
-            }
-        }
-    }
-
-
-    /**
-     * 将16进制字符串转换为ASCII字符串
-     * @param hexString 16进制字符串
-     * @return ASCII字符串
-     */
-    public static String hexToString(String hexString) {
-        StringBuilder asciiString = new StringBuilder();
-        for (int i = 0; i < hexString.length(); i += 2) {
-            String hex = hexString.substring(i, i + 2);
-            int decimal = Integer.parseInt(hex, 16);
-            asciiString.append((char) decimal);
-        }
-        return asciiString.toString();
-    }
-}

couplet-modules/couplet-system/src/main/java/com/couplet/system/controller/SysFirmController.java

@@ -66,7 +66,7 @@ public class SysFirmController {
      * @param deptId
      * @return com.couplet.common.core.domain.Result
     **/
-    @PostMapping("delFirm/{deptId}")
+    @DeleteMapping("delFirm/{deptId}")
     public Result delFirm(@PathVariable Integer deptId){
         int i = sysFirmService.delFirm(deptId);
         Result<Integer> success = Result.success(i);

couplet-modules/couplet-system/src/main/resources/bootstrap.yml

@@ -4,8 +4,6 @@ server:
 
 # Spring
 spring:
-  main:
-    allow-bean-definition-overriding: true
   application:
     # 应用名称
     name: couplet-system

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java

@@ -1,19 +1,18 @@
 package com.couplet.trouble.controller;
 
-import com.couplet.common.core.domain.PageResult;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.controller.BaseController;
+import com.couplet.common.core.web.page.TableDataInfo;
 import com.couplet.common.log.annotation.Log;
 import com.couplet.common.log.enums.BusinessType;
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.trouble.domain.coupletTroubleCode;
-import com.couplet.trouble.domain.CoupletTroubleGrade;
+import com.couplet.trouble.domain.req.TroubleUpdReq;
-import com.couplet.trouble.domain.CoupletTroubleType;
-import com.couplet.trouble.domain.resp.TroubleResp;
 import com.couplet.trouble.service.SysTroubleService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+
 import java.util.List;
 
 /**
@@ -29,28 +28,13 @@ public class SysTroubleController extends BaseController {
     private SysTroubleService troubleService;
 
     /**
-     * 故障码管理列表
+     * 故障管理列表
      */
-    @PostMapping("/troubleList")
+    @GetMapping("/troubleList")
-    public Result<PageResult<CoupletTroubleCode>> list(@RequestBody TroubleResp troubleReq) {
+    public Result<TableDataInfo<coupletTroubleCode>> list(@RequestBody coupletTroubleCode trouble) {
-        PageResult<CoupletTroubleCode> result = troubleService.selectTroubleList(troubleReq);
+        startPage();
-        return Result.success(result);
+        List<coupletTroubleCode> list = troubleService.selectTroubleList(trouble);
-    }
+        return getDataTable(list);
-
-    /**
-     * 故障类型信息
-     */
-    @GetMapping("/troubleTypeList")
-    public List<CoupletTroubleType> listType() {
-        return troubleService.selectTroubleListByType();
-    }
-
-    /**
-     * 故障等级信息
-     */
-    @GetMapping("/troubleGradeList")
-    public List<CoupletTroubleGrade> listGrade() {
-        return troubleService.selectTroubleListByGrade();
     }
 
     /**
@@ -58,16 +42,16 @@ public class SysTroubleController extends BaseController {
      */
     @Log(title = "新增故障码数据", businessType = BusinessType.INSERT)
     @PostMapping("insertTrouble")
-    public Result<?> insert(@Validated @RequestBody CoupletTroubleCode troubleAddReq) {
+    public Result<?> insert(@Validated @RequestBody coupletTroubleCode  troubleAddReq) {
         return toAjax(troubleService.save(troubleAddReq));
     }
 
     /**
-     * 修改故障码数据
+     * 修改保存故障码数据
      */
     @Log(title = "修改故障码数据",businessType = BusinessType.UPDATE)
     @PostMapping("updateTrouble")
-    public Result<?> edit(@Validated @RequestBody CoupletTroubleCode troubleUpdReq) {
+    public Result<?> edit(@Validated @RequestBody coupletTroubleCode troubleUpdReq) {
         return toAjax(troubleService.updateById(troubleUpdReq));
     }
 
@@ -76,7 +60,7 @@ public class SysTroubleController extends BaseController {
      */
     @Log(title = "删除故障码",businessType = BusinessType.DELETE)
     @GetMapping("/remove/{troubleId}")
-    public Result<?> remove(@PathVariable Integer troubleId) {
+    public Result<?> remove(@PathVariable Long troubleId) {
         troubleService.removeById(troubleId);
         return success();
     }

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleCode.java

@@ -3,6 +3,7 @@ package com.couplet.trouble.domain;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.couplet.common.core.annotation.Excel;
+import com.couplet.common.core.web.domain.BaseEntity;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -17,7 +18,7 @@ import lombok.experimental.SuperBuilder;
 @SuperBuilder
 @NoArgsConstructor
 @AllArgsConstructor
-public class CoupletTroubleCode {
+public class coupletTroubleCode {
     /**
      * 主键id
      */
@@ -52,12 +53,10 @@ public class CoupletTroubleCode {
     /**
      * 故障类型Id
      */
-    @Excel(name = "故障类型Id")
+    private Integer troubleTypeId;
-    private Integer typeId;
 
     /**
      * 故障等级Id
      */
-    @Excel(name = "故障等级Id")
+    private Integer troubleGradeId;
-    private Integer gradeId;
 }

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleGrade.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @description
  */
 @Data
-public class CoupletTroubleGrade {
+public class coupletTroubleGrade {
     private Integer gradeId;
     private String gradeName;
 }

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/coupletTroubleType.java

@@ -9,7 +9,7 @@ import lombok.Data;
  * @description
  */
 @Data
-public class CoupletTroubleType {
+public class coupletTroubleType {
     private Integer typeId;
     private String typeName;
 }

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java

@@ -1,26 +0,0 @@
-package com.couplet.trouble.domain.resp;
-
-import com.couplet.trouble.domain.CoupletTroubleCode;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
-import java.io.Serializable;
-
-/**
- * @author DongXiaoDong
- * @version 1.0
- * @date 2024/3/30 19:22
- * @description
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = true)
-public class TroubleResp extends CoupletTroubleCode implements Serializable {
-    private Integer pageNum=1;
-    private Integer pageSize=5;
-    private String troubleCode;
-    private String troublePosition;
-}

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java

@@ -1,10 +1,9 @@
 package com.couplet.trouble.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.trouble.domain.coupletTroubleCode;
-import com.couplet.trouble.domain.CoupletTroubleGrade;
+import com.couplet.trouble.domain.req.TroubleAddReq;
-import com.couplet.trouble.domain.CoupletTroubleType;
+import com.couplet.trouble.domain.req.TroubleUpdReq;
-import com.couplet.trouble.domain.resp.TroubleResp;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;
@@ -16,12 +15,8 @@ import java.util.List;
  * @description
  */
 @Mapper
-public interface SysTroubleMapper extends BaseMapper<CoupletTroubleCode> {
+public interface SysTroubleMapper extends BaseMapper<coupletTroubleCode> {
-    List<CoupletTroubleCode> selectTroubleList(TroubleResp troubleReq);
+    List<coupletTroubleCode> selectTroubleList(coupletTroubleCode trouble);
-
-    List<CoupletTroubleType> selectTroubleListByType();
-
-    List<CoupletTroubleGrade> selectTroubleListByGrade();
 
 //    int addTrouble(TroubleAddReq troubleAddReq);
 

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java

@@ -1,11 +1,9 @@
 package com.couplet.trouble.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.common.core.domain.PageResult;
+import com.couplet.trouble.domain.coupletTroubleCode;
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.trouble.domain.req.TroubleAddReq;
-import com.couplet.trouble.domain.CoupletTroubleGrade;
+import com.couplet.trouble.domain.req.TroubleUpdReq;
-import com.couplet.trouble.domain.CoupletTroubleType;
-import com.couplet.trouble.domain.resp.TroubleResp;
 
 import java.util.List;
 
@@ -15,12 +13,8 @@ import java.util.List;
  * @date 2024/3/26 22:38
  * @description
  */
-public interface SysTroubleService extends IService<CoupletTroubleCode> {
+public interface SysTroubleService extends IService<coupletTroubleCode> {
-    PageResult<CoupletTroubleCode> selectTroubleList(TroubleResp troubleReq);
+    List<coupletTroubleCode> selectTroubleList(coupletTroubleCode trouble);
-
-    List<CoupletTroubleType> selectTroubleListByType();
-
-    List<CoupletTroubleGrade> selectTroubleListByGrade();
 
 //    int addTrouble (TroubleAddReq troubleAddReq);
 

couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java

@@ -1,15 +1,11 @@
 package com.couplet.trouble.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.common.core.domain.PageResult;
+import com.couplet.trouble.domain.coupletTroubleCode;
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.trouble.domain.req.TroubleAddReq;
-import com.couplet.trouble.domain.CoupletTroubleGrade;
+import com.couplet.trouble.domain.req.TroubleUpdReq;
-import com.couplet.trouble.domain.CoupletTroubleType;
-import com.couplet.trouble.domain.resp.TroubleResp;
 import com.couplet.trouble.mapper.SysTroubleMapper;
 import com.couplet.trouble.service.SysTroubleService;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -22,32 +18,19 @@ import java.util.List;
  * @description
  */
 @Service
-public class SysTroubleServiceImpl extends ServiceImpl<SysTroubleMapper, CoupletTroubleCode> implements SysTroubleService{
+public class SysTroubleServiceImpl extends ServiceImpl<SysTroubleMapper, coupletTroubleCode> implements SysTroubleService{
 
     @Autowired
     private SysTroubleMapper sysTroubleMapper;
 
     /**
      * 查询故障码列表
-     * @param troubleReq
+     * @param trouble
      * @return
      */
     @Override
-    public PageResult<CoupletTroubleCode> selectTroubleList(TroubleResp troubleReq) {
+    public List<coupletTroubleCode> selectTroubleList(coupletTroubleCode trouble) {
-        PageHelper.startPage(troubleReq.getPageNum(), troubleReq.getPageSize());
+        return sysTroubleMapper.selectTroubleList(trouble);
-        List<CoupletTroubleCode> troubleList = sysTroubleMapper.selectTroubleList(troubleReq);
-        PageInfo<CoupletTroubleCode> info = new PageInfo<>(troubleList);
-        return PageResult.toPageResult(info.getTotal(),troubleList);
-    }
-
-    @Override
-    public List<CoupletTroubleType> selectTroubleListByType() {
-        return sysTroubleMapper.selectTroubleListByType();
-    }
-
-    @Override
-    public List<CoupletTroubleGrade> selectTroubleListByGrade() {
-        return sysTroubleMapper.selectTroubleListByGrade();
     }
 
     /**

couplet-modules/couplet-trouble/src/main/resources/bootstrap.yml

@@ -15,11 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
-        namespace: 172469
+        namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15
         # 配置文件格式
         file-extension: yml
         # 共享配置

couplet-modules/couplet-trouble/src/main/resources/mapper/trouble/SysTroubleMapper.xml

@@ -4,20 +4,20 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.couplet.trouble.mapper.SysTroubleMapper">
 
-    <resultMap type="com.couplet.trouble.domain.CoupletTroubleCode" id="SysTroubleResult">
+    <resultMap type="com.couplet.trouble.domain.coupletTroubleCode" id="SysTroubleResult">
         <id property="troubleId" column="trouble_id"/>
         <result property="troubleCode" column="trouble_code"/>
-        <result property="troubleValue" column="trouble_value"/>
+        <result property="troubleGradeId" column="trouble_gradeId"/>
         <result property="troublePosition" column="trouble_position"/>
         <result property="troubleTag" column="trouble_tag"/>
-        <result property="typeId" column="type_id"/>
+        <result property="troubleTypeId" column="trouble_typeId"/>
-        <result property="gradeId" column="grade_id"/>
+        <result property="troubleValue" column="trouble_value"/>
     </resultMap>
 
     <sql id="selectTroubleVo">
         select t.*,g.grade_name,y.type_name from couplet_trouble_code t
-        LEFT JOIN couplet_trouble_grade g on t.grade_id = g.grade_id
+        LEFT JOIN couplet_trouble_grade g on t.trouble_grade_id = g.grade_id
-        LEFT JOIN couplet_trouble_type y on t.type_id= y.type_id
+        LEFT JOIN couplet_trouble_type y on t.trouble_type_id= y.type_id
     </sql>
 <!--    <insert id="addTrouble">-->
 <!--        insert into couplet_trouble_code (trouble_code,trouble_position,trouble_value,trouble_tag,trouble_type_id,trouble_grade_id)-->
@@ -56,12 +56,7 @@
                 AND trouble_position like concat('%', #{troublePosition}, '%')
             </if>
         </where>
-    </select>
+        order by trouble_position desc
-    <select id="selectTroubleListByType" resultType="com.couplet.trouble.domain.CoupletTroubleType">
-        select * from couplet_trouble_type
-    </select>
-    <select id="selectTroubleListByGrade" resultType="com.couplet.trouble.domain.CoupletTroubleGrade">
-        select * from couplet_trouble_grade
     </select>
 
 

couplet-modules/pom.xml

@@ -18,7 +18,6 @@
         <module>couplet-modules-vehicle</module>
         <module>couplet-modules-mq</module>
         <module>couplet-enterprisemanagement</module>
-        <module>couplet-msg</module>
     </modules>
 
     <artifactId>couplet-modules</artifactId>

couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml

@@ -15,9 +15,11 @@ spring:
       discovery:
         # 服务注册地址
         server-addr: 121.89.211.230:8848
+        namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
       config:
         # 配置中心地址
         server-addr: 121.89.211.230:8848
+        namespace: 00004c44-c962-48f0-bc9a-7e589b2881e3
         # 配置文件格式
         file-extension: yml
         # 共享配置

pom.xml

@@ -250,14 +250,14 @@
             <dependency>
                 <groupId>com.couplet</groupId>
                 <artifactId>couplet-modules-vehicle</artifactId>
-                <version>${couplet.version}</version>
+                <version>3.6.3</version>
             </dependency>
 
             <!-- RabbitMq模块 -->
             <dependency>
                 <groupId>com.couplet</groupId>
                 <artifactId>couplet-modules-mq</artifactId>
-                <version>${couplet.version}</version>
+                <version>3.6.3</version>
             </dependency>
 
         </dependencies>