refactor: 修改框架

couplet-common/couplet-common-business/pom.xml

@@ -9,7 +9,8 @@
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>couplet-common-vehicle</artifactId>
+
+    <artifactId>couplet-common-business</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -17,7 +18,6 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <dependencies>
-        <!-- MuYu Common Core-->
         <dependency>
             <groupId>com.couplet</groupId>
             <artifactId>couplet-common-core</artifactId>

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleCode.java

@@ -1,9 +1,11 @@
-package com.couplet.trouble.domain;
+package com.couplet.common.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.couplet.common.core.annotation.Excel;
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 
 import javax.validation.constraints.NotEmpty;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleGrade.java

@@ -1,4 +1,4 @@
-package com.couplet.trouble.domain;
+package com.couplet.common.domain;
 
 import lombok.Data;
 

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleLog.java

@@ -1,7 +1,6 @@
-package com.couplet.trouble.domain;
+package com.couplet.common.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.models.auth.In;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleType.java

@@ -1,4 +1,4 @@
-package com.couplet.trouble.domain;
+package com.couplet.common.domain;
 
 import lombok.Data;
 

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Fence.java

@@ -1,25 +1,20 @@
-package com.couplet.map.common.domain;
+package com.couplet.common.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.couplet.common.core.web.domain.BaseEntity;
-import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.common.domain.request.FenceUpdateRequest;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import lombok.experimental.SuperBuilder;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.validation.annotation.Validated;
 
 import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Author: LiJiaYao

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Logo.java

@@ -1,4 +1,4 @@
-package com.couplet.map.common.domain;
+package com.couplet.common.domain;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Vehicle.java

@@ -1,4 +1,4 @@
-package com.couplet.vehicle.domain;
+package com.couplet.common.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -17,12 +17,11 @@ import lombok.experimental.SuperBuilder;
  */
 
 @Data
+@SuperBuilder
 @AllArgsConstructor
 @NoArgsConstructor
 @TableName("couplet_vehicle")
 public class Vehicle{
-
-
     /*
      *车辆id
      * */

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleAndLogo.java

@@ -1,4 +1,4 @@
-package com.couplet.vehicle.domain;
+package com.couplet.common.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleMiddle.java

@@ -1,4 +1,4 @@
-package com.couplet.common.system.domain;
+package com.couplet.common.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleType.java

@@ -1,4 +1,4 @@
-package com.couplet.common.system.domain;
+package com.couplet.common.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
 
 /**
  * @ProjectName: five-groups-couplet

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceConfig.java

@@ -1,4 +1,4 @@
-package com.couplet.map.common.domain.request;
+package com.couplet.common.domain.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceRequest.java

@@ -1,4 +1,4 @@
-package com.couplet.map.common.domain.request;
+package com.couplet.common.domain.request;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.AllArgsConstructor;
@@ -8,7 +8,6 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
-import java.util.List;
 
 /**
  * @Author: LiJiaYao

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceUpdateRequest.java

@@ -1,6 +1,5 @@
-package com.couplet.map.common.domain.request;
+package com.couplet.common.domain.request;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/TroubleResp.java

@@ -1,6 +1,6 @@
-package com.couplet.trouble.domain.resp;
+package com.couplet.common.domain.request;
 
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.common.domain.CoupletTroubleCode;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleEditParams.java

@@ -1,4 +1,4 @@
-package com.couplet.vehicle.domain.req;
+package com.couplet.common.domain.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleInsertParams.java

@@ -1,4 +1,4 @@
-package com.couplet.vehicle.domain.req;
+package com.couplet.common.domain.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleListParams.java

@@ -1,4 +1,4 @@
-package com.couplet.vehicle.domain.req;
+package com.couplet.common.domain.request;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

couplet-common/couplet-common-business/src/main/java/com/couplet/common/utils/SnowflakeIdGenerator.java

@@ -1,4 +1,4 @@
-package com.couplet.vehicle.utils;
+package com.couplet.common.utils;
 
 /**
  * @ProjectName: five-groups-couplet

couplet-common/couplet-common-business/src/main/java/com/couplet/log/annotation/Record.java

@@ -1,4 +1,4 @@
-package com.couplet.common.log.annotation;
+package com.couplet.log.annotation;
 
 /**
  * @author DongXiaoDong

couplet-common/couplet-common-business/src/main/java/com/couplet/log/aop/AopRecord.java

@@ -1,4 +1,4 @@
-package com.couplet.common.log.aop;
+package com.couplet.log.aop;
 
 /**
  * @author DongXiaoDong

couplet-common/couplet-common-business/src/main/java/com/couplet/remote/RemoteVehicleService.java

@@ -1,15 +1,12 @@
-package com.couplet.common.system.remote;
+package com.couplet.remote;
 
 import com.couplet.common.core.constant.ServiceNameConstants;
 import com.couplet.common.core.domain.Result;
-import com.couplet.common.system.domain.Vehicle;
+import com.couplet.common.domain.Vehicle;
-import com.couplet.common.system.domain.VehicleMiddle;
+import com.couplet.common.domain.VehicleMiddle;
-import com.couplet.common.system.remote.factory.RemoteVehicleFallbackFactory;
+import com.couplet.remote.factory.RemoteVehicleFallbackFactory;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 
@@ -49,4 +46,9 @@ public interface RemoteVehicleService {
 
     @PostMapping("vehicleAll")
     public Result<List<Vehicle>> VehicleManageList();
+
+
+    @GetMapping("/findByVIN/{vin}")
+    public Result<List<Vehicle>> findByVIN(@PathVariable("vin") String vin);
+
 }

couplet-common/couplet-common-business/src/main/java/com/couplet/remote/factory/RemoteVehicleFallbackFactory.java

@@ -1,9 +1,11 @@
-package com.couplet.common.system.remote.factory;
+package com.couplet.remote.factory;
 
 import com.couplet.common.core.domain.Result;
-import com.couplet.common.system.domain.Vehicle;
+import com.couplet.common.domain.Vehicle;
-import com.couplet.common.system.domain.VehicleMiddle;
+import com.couplet.common.domain.VehicleMiddle;
-import com.couplet.common.system.remote.RemoteVehicleService;
+import com.couplet.remote.RemoteVehicleService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.cloud.openfeign.FallbackFactory;
 
 import java.util.List;
@@ -15,6 +17,7 @@ import java.util.List;
  * @date 2024/4/2 14:46
  */
 public class RemoteVehicleFallbackFactory implements FallbackFactory<RemoteVehicleService> {
+    private static final Logger log = LoggerFactory.getLogger(RemoteVehicleFallbackFactory.class);
 
 
     @Override
@@ -39,6 +42,12 @@ public class RemoteVehicleFallbackFactory implements FallbackFactory<RemoteVehic
             public Result<List<Vehicle>> VehicleManageList() {
                 return Result.error("调用失败....."+cause.getMessage());
             }
+
+
+            @Override
+            public Result<List<Vehicle>> findByVIN(String vin) {
+                return Result.error("车辆服务调用失败:" + cause.getMessage());
+            }
         };
     }
 }

couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/vehicle/VehicleException.java

@@ -1,4 +1,4 @@
-package com.couplet.vehicle.exception;
+package com.couplet.common.core.exception.vehicle;
 
 /**
  * @ProjectName: five-groups-couplet

couplet-common/couplet-common-vehicle/src/main/java/com/couplet/common/system/domain/Vehicle.java

@@ -1,89 +0,0 @@
-package com.couplet.common.system.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-import java.io.Serializable;
-
-/**
- * @ProjectName: five-groups-couplet
- * @Author: LiuYunHu
- * @CreateTime: 2024/3/26
- * @Description: 车辆信息表
- */
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName("couplet_vehicle")
-public class Vehicle{
-    /*
-     *车辆id
-     * */
-    @TableId(type = IdType.AUTO, value = "vehicle_id")
-    private Long vehicleId;
-
-    /*
-     *车辆类型
-     * */
-    @TableField(value = "vehicle_type")
-    private Long vehicleType;
-
-    /*
-     * 车辆类型名称
-     * */
-    @TableField(exist = false)
-    private String vehicleTypeName;
-
-
-    /*
-     *电机厂商
-     * */
-    @TableField(value = "motor_manufacturer")
-    private String motorManufacturer;
-
-    /*
-     *电池厂商
-     * */
-    @TableField(value = "battery_manufacturer")
-    private String batteryManufacturer;
-
-    /*
-     *电机编号
-     * */
-    @TableField(value = "motor_number")
-    private String motorNumber;
-
-    /*
-     *电池编号
-     * */
-    @TableField(value = "battery_number")
-    private String batteryNumber;
-
-    /*
-     *vin码
-     * */
-    @TableField(value = "vin")
-    private String vin;
-
-    /*
-     *0离线 1在线
-     * */
-    @TableField(value = "vehicle_state")
-    private Integer vehicleState;
-
-    /*
-     *0未删除 1删除
-     * */
-    @TableField(value = "isdelete")
-    private Integer isdelete;
-
-
-}

couplet-common/couplet-common-vehicle/src/main/java/com/couplet/common/system/domain/VehicleAndLogo.java

@@ -1,44 +0,0 @@
-package com.couplet.common.system.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-/**
- * @ProjectName: five-groups-couplet
- * @Author: LiuYunHu
- * @CreateTime: 2024/3/30
- * @Description: 车辆和标志中间表
- */
-
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName("couplet_vehicle_and_logo")
-public class VehicleAndLogo {
-
-    /*
-     * 车辆、标志中间表id
-     * */
-    @TableId(type = IdType.AUTO, value = "vehicle_logo_middle_id")
-    private Long vehicleLogoMiddleId;
-
-    /*
-     * 车辆id
-     * */
-    @TableField("vehicle_id")
-    private Long vehicleId;
-
-    /*
-     * 标志id
-     * */
-    @TableField("logo_id")
-    private Long logoId;
-
-}

couplet-common/couplet-common-vehicle/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.couplet.common.system.remote.factory.RemoteVehicleFallbackFactory

couplet-common/couplet-trouble-log/pom.xml

@@ -1,20 +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-common</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>couplet-trouble-log</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>
-
-</project>

couplet-common/pom.xml

@@ -18,8 +18,8 @@
         <module>couplet-common-datascope</module>
         <module>couplet-common-datasource</module>
         <module>couplet-common-system</module>
-        <module>couplet-trouble-log</module>
+        <module>couplet-common-business</module>
-        <module>couplet-common-vehicle</module>
+
     </modules>
 
     <artifactId>couplet-common</artifactId>

couplet-modules/couplet-business/pom.xml

@@ -5,25 +5,22 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.couplet</groupId>
-        <artifactId>couplet-electronic-fence</artifactId>
+        <artifactId>couplet-modules</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>couplet-electronic-fence-server</artifactId>
+    <artifactId>couplet-business</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>
         <dependency>
             <groupId>com.couplet</groupId>
-            <artifactId>couplet-electronic-fence-common</artifactId>
+            <artifactId>couplet-common-business</artifactId>
         </dependency>
-
-
         <!-- SpringCloud Alibaba Nacos -->
         <dependency>
             <groupId>com.alibaba.cloud</groupId>
@@ -48,7 +45,6 @@
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
 
-
         <!-- Swagger UI -->
         <dependency>
             <groupId>io.springfox</groupId>
@@ -85,14 +81,6 @@
             <groupId>com.couplet</groupId>
             <artifactId>couplet-common-swagger</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-system</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.kafka</groupId>
-            <artifactId>kafka-clients</artifactId>
-        </dependency>
 
     </dependencies>
 
@@ -121,5 +109,4 @@
         </plugins>
     </build>
 
-
 </project>

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java

@@ -1,4 +1,4 @@
-package com.couplet.map.server;
+package com.couplet.business.server;
 
 import com.couplet.common.security.annotation.EnableCustomConfig;
 import com.couplet.common.security.annotation.EnableMyFeignClients;
@@ -7,16 +7,17 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 /**
- * 系统模块
+ * @Author: LiJiaYao
- *
+ * @Date: 2024/4/3
- * @author couplet
+ * @Description: 业务实现启动类
  */
 @EnableCustomConfig
 @EnableCustomSwagger2
 @EnableMyFeignClients
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.couplet"})
-public class CoupletElectronicFenceApplication {
+public class CoupletBusinessApplication {
     public static void main (String[] args) {
-        SpringApplication.run(CoupletElectronicFenceApplication.class, args);
+        SpringApplication.run(CoupletBusinessApplication.class, args);
     }
+
 }

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/EmployeeController.java

@@ -1,11 +1,11 @@
-package com.couplet.server.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.EmployeeService;
 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.security.annotation.RequiresPermissions;
 import com.couplet.common.system.domain.SysUser;
-import com.couplet.server.service.EmployeeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/FenceController.java

@@ -1,15 +1,15 @@
-package com.couplet.map.server.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.FenceService;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.controller.BaseController;
+import com.couplet.common.domain.Fence;
+import com.couplet.common.domain.request.FenceConfig;
+import com.couplet.common.domain.request.FenceRequest;
+import com.couplet.common.domain.request.FenceUpdateRequest;
 import com.couplet.common.log.annotation.Log;
 import com.couplet.common.log.enums.BusinessType;
 import com.couplet.common.security.annotation.RequiresPermissions;
-import com.couplet.map.common.domain.Fence;
-import com.couplet.map.common.domain.request.FenceConfig;
-import com.couplet.map.common.domain.request.FenceRequest;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
-import com.couplet.map.server.service.FenceService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/LogoController.java

@@ -1,19 +1,17 @@
-package com.couplet.map.server.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.LogoService;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.controller.BaseController;
+import com.couplet.common.domain.Logo;
 import com.couplet.common.log.annotation.Log;
 import com.couplet.common.log.enums.BusinessType;
 import com.couplet.common.security.annotation.RequiresPermissions;
-import com.couplet.map.common.domain.Logo;
-import com.couplet.map.common.domain.request.FenceRequest;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
-import com.couplet.map.server.service.LogoService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/ManageController.java

@@ -1,11 +1,11 @@
-package com.couplet.server.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.ManageServer;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.log.annotation.Log;
 import com.couplet.common.log.enums.BusinessType;
 import com.couplet.common.security.annotation.RequiresPermissions;
 import com.couplet.common.system.domain.SysDept;
-import com.couplet.server.service.ManageServer;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java

@@ -1,15 +1,15 @@
-package com.couplet.trouble.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.SysTroubleService;
 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.domain.CoupletTroubleCode;
+import com.couplet.common.domain.CoupletTroubleGrade;
+import com.couplet.common.domain.CoupletTroubleType;
+import com.couplet.common.domain.request.TroubleResp;
 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.CoupletTroubleGrade;
-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.*;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleController.java

@@ -1,16 +1,15 @@
-package com.couplet.vehicle.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.VehicleService;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.controller.BaseController;
+import com.couplet.common.domain.Vehicle;
+import com.couplet.common.domain.request.VehicleEditParams;
+import com.couplet.common.domain.request.VehicleInsertParams;
+import com.couplet.common.domain.request.VehicleListParams;
 import com.couplet.common.log.annotation.Log;
 import com.couplet.common.log.enums.BusinessType;
 import com.couplet.common.security.annotation.RequiresPermissions;
-import com.couplet.vehicle.domain.Vehicle;
-import com.couplet.vehicle.domain.VehicleMiddle;
-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;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleManageController.java

@@ -1,9 +1,9 @@
-package com.couplet.server.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.VehicleManageService;
 import com.couplet.common.core.domain.Result;
-import com.couplet.common.system.domain.Vehicle;
+import com.couplet.common.domain.Vehicle;
-import com.couplet.common.system.domain.VehicleMiddle;
+import com.couplet.common.domain.VehicleMiddle;
-import com.couplet.server.service.VehicleManageService;
 import io.swagger.v3.oas.annotations.parameters.RequestBody;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleTypeController.java

@@ -1,10 +1,10 @@
-package com.couplet.vehicle.controller;
+package com.couplet.business.server.controller;
 
+import com.couplet.business.server.service.VehicleTypeService;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.controller.BaseController;
+import com.couplet.common.domain.VehicleType;
 import com.couplet.common.security.annotation.RequiresPermissions;
-import com.couplet.vehicle.domain.VehicleType;
-import com.couplet.vehicle.service.VehicleTypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenAndLogoMapper.java

@@ -1,7 +1,7 @@
-package com.couplet.map.server.mapper;
+package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.map.common.domain.Fence;
+import com.couplet.common.domain.Fence;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenceMapper.java

@@ -1,10 +1,11 @@
-package com.couplet.map.server.mapper;
+package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.map.common.domain.Fence;
+
-import com.couplet.map.common.domain.request.FenceConfig;
+import com.couplet.common.domain.Fence;
-import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.common.domain.request.FenceConfig;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
+import com.couplet.common.domain.request.FenceRequest;
+import com.couplet.common.domain.request.FenceUpdateRequest;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/LogoMapper.java

@@ -1,9 +1,7 @@
-package com.couplet.map.server.mapper;
+package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.map.common.domain.Fence;
+import com.couplet.common.domain.Logo;
-import com.couplet.map.common.domain.Logo;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
 import org.apache.ibatis.annotations.Mapper;
 
 /**

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java

@@ -1,10 +1,10 @@
-package com.couplet.trouble.mapper;
+package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.common.domain.CoupletTroubleCode;
-import com.couplet.trouble.domain.CoupletTroubleGrade;
+import com.couplet.common.domain.CoupletTroubleGrade;
-import com.couplet.trouble.domain.CoupletTroubleType;
+import com.couplet.common.domain.CoupletTroubleType;
-import com.couplet.trouble.domain.resp.TroubleResp;
+import com.couplet.common.domain.request.TroubleResp;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.List;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleAndLogoMapper.java

@@ -1,7 +1,7 @@
-package com.couplet.vehicle.mapper;
+package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.vehicle.domain.VehicleAndLogo;
+import com.couplet.common.domain.VehicleAndLogo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleMapper.java

@@ -1,8 +1,8 @@
-package com.couplet.vehicle.mapper;
+package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.vehicle.domain.Vehicle;
+import com.couplet.common.domain.Vehicle;
-import com.couplet.vehicle.domain.VehicleMiddle;
+import com.couplet.common.domain.VehicleMiddle;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleTypeMapper.java

@@ -1,7 +1,7 @@
-package com.couplet.vehicle.mapper;
+package com.couplet.business.server.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.couplet.vehicle.domain.VehicleType;
+import com.couplet.common.domain.VehicleType;
 import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Component;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/EmployeeService.java

@@ -1,4 +1,4 @@
-package com.couplet.server.service;
+package com.couplet.business.server.service;
 
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.page.TableDataInfo;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenAndLogoService.java

@@ -1,7 +1,8 @@
-package com.couplet.map.server.service;
+package com.couplet.business.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.map.common.domain.Fence;
+import com.couplet.common.domain.Fence;
+
 
 /**
  * @Author: LiJiaYao

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenceService.java

@@ -1,10 +1,10 @@
-package com.couplet.map.server.service;
+package com.couplet.business.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.map.common.domain.Fence;
+import com.couplet.common.domain.Fence;
-import com.couplet.map.common.domain.request.FenceConfig;
+import com.couplet.common.domain.request.FenceConfig;
-import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.common.domain.request.FenceRequest;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
+import com.couplet.common.domain.request.FenceUpdateRequest;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -27,7 +27,7 @@ public interface FenceService extends IService<Fence> {
      *
      * @param fenceRequest
      */
-    void fenceInsert(HttpServletRequest request,FenceRequest fenceRequest);
+    void fenceInsert(HttpServletRequest request, FenceRequest fenceRequest);
 
     /**
      * 删除电子围栏

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/LogoService.java

@@ -1,7 +1,8 @@
-package com.couplet.map.server.service;
+package com.couplet.business.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.map.common.domain.Logo;
+import com.couplet.common.domain.Logo;
+
 
 import java.util.List;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/ManageServer.java

@@ -1,8 +1,7 @@
-package com.couplet.server.service;
+package com.couplet.business.server.service;
 
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.system.domain.SysDept;
-import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java

@@ -1,11 +1,12 @@
-package com.couplet.trouble.service;
+package com.couplet.business.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.couplet.common.core.domain.PageResult;
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.common.domain.CoupletTroubleCode;
-import com.couplet.trouble.domain.CoupletTroubleGrade;
+import com.couplet.common.domain.CoupletTroubleGrade;
-import com.couplet.trouble.domain.CoupletTroubleType;
+import com.couplet.common.domain.CoupletTroubleType;
-import com.couplet.trouble.domain.resp.TroubleResp;
+import com.couplet.common.domain.request.TroubleResp;
+
 
 import java.util.List;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleAndLogoService.java

@@ -1,7 +1,8 @@
-package com.couplet.vehicle.service;
+package com.couplet.business.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.vehicle.domain.VehicleAndLogo;
+import com.couplet.common.domain.VehicleAndLogo;
+
 
 import java.util.List;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleManageService.java

@@ -1,9 +1,9 @@
-package com.couplet.server.service;
+package com.couplet.business.server.service;
 
 
 import com.couplet.common.core.domain.Result;
-import com.couplet.common.system.domain.Vehicle;
+import com.couplet.common.domain.Vehicle;
-import com.couplet.common.system.domain.VehicleMiddle;
+import com.couplet.common.domain.VehicleMiddle;
 
 import java.util.List;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleService.java

@@ -1,11 +1,11 @@
-package com.couplet.vehicle.service;
+package com.couplet.business.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.vehicle.domain.Vehicle;
+import com.couplet.common.domain.Vehicle;
-import com.couplet.vehicle.domain.VehicleMiddle;
+import com.couplet.common.domain.VehicleMiddle;
-import com.couplet.vehicle.domain.req.VehicleEditParams;
+import com.couplet.common.domain.request.VehicleEditParams;
-import com.couplet.vehicle.domain.req.VehicleInsertParams;
+import com.couplet.common.domain.request.VehicleInsertParams;
-import com.couplet.vehicle.domain.req.VehicleListParams;
+import com.couplet.common.domain.request.VehicleListParams;
 
 import java.util.List;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleTypeService.java

@@ -1,7 +1,8 @@
-package com.couplet.vehicle.service;
+package com.couplet.business.server.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.couplet.vehicle.domain.VehicleType;
+import com.couplet.common.domain.VehicleType;
+
 
 import java.util.List;
 

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/EmployeeServiceImpl.java

@@ -1,5 +1,6 @@
-package com.couplet.server.service.impl;
+package com.couplet.business.server.service.impl;
 
+import com.couplet.business.server.service.EmployeeService;
 import com.couplet.common.core.constant.SecurityConstants;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.web.page.TableDataInfo;
@@ -8,7 +9,6 @@ import com.couplet.common.system.domain.LoginUser;
 import com.couplet.common.system.domain.SysUser;
 import com.couplet.common.system.remote.RemoteEmployeeService;
 import com.couplet.common.system.remote.RemoteUserService;
-import com.couplet.server.service.EmployeeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -21,7 +21,7 @@ import java.util.List;
  * @date 2024/3/31 19:42
  */
 @Service
-public class EmployeeServiceImpl implements EmployeeService{
+public class EmployeeServiceImpl implements EmployeeService {
 
 
     @Autowired

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenAndLogoServiceImpl.java

@@ -1,9 +1,9 @@
-package com.couplet.map.server.service.impl;
+package com.couplet.business.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.map.common.domain.Fence;
+import com.couplet.business.server.mapper.FenAndLogoMapper;
-import com.couplet.map.server.mapper.FenAndLogoMapper;
+import com.couplet.business.server.service.FenAndLogoService;
-import com.couplet.map.server.service.FenAndLogoService;
+import com.couplet.common.domain.Fence;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java

@@ -1,13 +1,13 @@
-package com.couplet.map.server.service.impl;
+package com.couplet.business.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.map.common.domain.Fence;
+import com.couplet.business.server.mapper.FenceMapper;
-import com.couplet.map.common.domain.request.FenceConfig;
+import com.couplet.business.server.service.FenAndLogoService;
-import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.business.server.service.FenceService;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
+import com.couplet.common.domain.Fence;
-import com.couplet.map.server.mapper.FenceMapper;
+import com.couplet.common.domain.request.FenceConfig;
-import com.couplet.map.server.service.FenAndLogoService;
+import com.couplet.common.domain.request.FenceRequest;
-import com.couplet.map.server.service.FenceService;
+import com.couplet.common.domain.request.FenceUpdateRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
@@ -58,7 +58,7 @@ public class FenceServiceImpl extends ServiceImpl<FenceMapper, Fence> implements
      * @param fenceRequest
      */
     @Override
-    public void fenceInsert(HttpServletRequest request,FenceRequest fenceRequest) {
+    public void fenceInsert(HttpServletRequest request, FenceRequest fenceRequest) {
 
         //先添加围栏
         int a= fenceMapper.insertFence(fenceRequest);

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/LogoServiceImpl.java

@@ -1,19 +1,14 @@
-package com.couplet.map.server.service.impl;
+package com.couplet.business.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.map.common.domain.Fence;
+import com.couplet.business.server.mapper.LogoMapper;
-import com.couplet.map.common.domain.Logo;
+import com.couplet.business.server.service.LogoService;
-import com.couplet.map.common.domain.request.FenceRequest;
+import com.couplet.common.domain.Logo;
-import com.couplet.map.common.domain.request.FenceUpdateRequest;
-import com.couplet.map.server.mapper.LogoMapper;
-import com.couplet.map.server.service.LogoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.stereotype.Service;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/ManageServiceImpl.java

@@ -1,18 +1,16 @@
-package com.couplet.server.service.impl;
+package com.couplet.business.server.service.impl;
 
-import com.couplet.common.core.constant.SecurityConstants;
+import com.couplet.business.server.service.ManageServer;
 import com.couplet.common.core.domain.Result;
-import com.couplet.common.core.utils.StringUtils;
 import com.couplet.common.security.utils.SecurityUtils;
 import com.couplet.common.system.domain.LoginUser;
 import com.couplet.common.system.domain.SysDept;
 import com.couplet.common.system.remote.RemoteDeptService;
 import com.couplet.common.system.remote.RemoteUserService;
-import com.couplet.server.service.ManageServer;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -22,7 +20,7 @@ import java.util.List;
  * @date 2024/3/27 15:34
  */
 @Service
-public class ManageServiceImpl implements ManageServer{
+public class ManageServiceImpl implements ManageServer {
 
     @Autowired
     private RemoteDeptService remoteDeptService;

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

@@ -1,13 +1,13 @@
-package com.couplet.trouble.service.impl;
+package com.couplet.business.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.couplet.business.server.mapper.SysTroubleMapper;
+import com.couplet.business.server.service.SysTroubleService;
 import com.couplet.common.core.domain.PageResult;
-import com.couplet.trouble.domain.CoupletTroubleCode;
+import com.couplet.common.domain.CoupletTroubleCode;
-import com.couplet.trouble.domain.CoupletTroubleGrade;
+import com.couplet.common.domain.CoupletTroubleGrade;
-import com.couplet.trouble.domain.CoupletTroubleType;
+import com.couplet.common.domain.CoupletTroubleType;
-import com.couplet.trouble.domain.resp.TroubleResp;
+import com.couplet.common.domain.request.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;
@@ -22,7 +22,7 @@ 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;

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

@@ -1,9 +1,9 @@
-package com.couplet.vehicle.service.impl;
+package com.couplet.business.server.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.vehicle.domain.VehicleAndLogo;
+import com.couplet.business.server.mapper.VehicleAndLogoMapper;
-import com.couplet.vehicle.mapper.VehicleAndLogoMapper;
+import com.couplet.business.server.service.VehicleAndLogoService;
-import com.couplet.vehicle.service.VehicleAndLogoService;
+import com.couplet.common.domain.VehicleAndLogo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleManageServiceImpl.java

@@ -1,11 +1,11 @@
-package com.couplet.server.service.impl;
+package com.couplet.business.server.service.impl;
 
+import com.couplet.business.server.service.VehicleManageService;
 import com.couplet.common.core.domain.Result;
+import com.couplet.common.domain.Vehicle;
+import com.couplet.common.domain.VehicleMiddle;
 import com.couplet.common.security.utils.SecurityUtils;
-import com.couplet.common.system.domain.Vehicle;
+import com.couplet.remote.RemoteVehicleService;
-import com.couplet.common.system.domain.VehicleMiddle;
-import com.couplet.common.system.remote.RemoteVehicleService;
-import com.couplet.server.service.VehicleManageService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2024/4/2 9:05
  */
 @Service
-public class VehicleManageServiceImpl implements VehicleManageService{
+public class VehicleManageServiceImpl implements VehicleManageService {
 
 
     @Autowired

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

@@ -1,22 +1,21 @@
-package com.couplet.vehicle.service.impl;
+package com.couplet.business.server.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.business.server.mapper.VehicleMapper;
+import com.couplet.business.server.service.VehicleAndLogoService;
+import com.couplet.business.server.service.VehicleService;
+import com.couplet.business.server.service.VehicleTypeService;
 import com.couplet.common.core.domain.Result;
 import com.couplet.common.core.utils.StringUtils;
 import com.couplet.common.core.utils.uuid.UUID;
-import com.couplet.common.security.utils.SecurityUtils;
+import com.couplet.common.domain.Vehicle;
-import com.couplet.vehicle.domain.Vehicle;
+import com.couplet.common.domain.VehicleMiddle;
-import com.couplet.vehicle.domain.VehicleMiddle;
+import com.couplet.common.domain.VehicleType;
-import com.couplet.vehicle.domain.VehicleType;
+import com.couplet.common.domain.request.VehicleEditParams;
-import com.couplet.vehicle.domain.req.VehicleEditParams;
+import com.couplet.common.domain.request.VehicleInsertParams;
-import com.couplet.vehicle.domain.req.VehicleInsertParams;
+import com.couplet.common.domain.request.VehicleListParams;
-import com.couplet.vehicle.domain.req.VehicleListParams;
-import com.couplet.vehicle.mapper.VehicleMapper;
-import com.couplet.vehicle.service.VehicleAndLogoService;
-import com.couplet.vehicle.service.VehicleService;
-import com.couplet.vehicle.service.VehicleTypeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleTypeServiceImpl.java

@@ -1,10 +1,10 @@
-package com.couplet.vehicle.service.impl;
+package com.couplet.business.server.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.couplet.vehicle.domain.VehicleType;
+import com.couplet.business.server.mapper.VehicleTypeMapper;
-import com.couplet.vehicle.mapper.VehicleTypeMapper;
+import com.couplet.business.server.service.VehicleTypeService;
-import com.couplet.vehicle.service.VehicleTypeService;
+import com.couplet.common.domain.VehicleType;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 

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

@@ -6,7 +6,7 @@ server:
 spring:
   application:
     # 应用名称
-    name: couplet-electronic-fence
+    name: couplet-business
 
   profiles:
     # 环境配置

couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.couplet.map.server.mapper.FenAndLogoMapper">
+<mapper namespace="com.couplet.business.server.mapper.FenAndLogoMapper">
 
-    <resultMap id="map" type="com.couplet.map.common.domain.Fence">
+    <resultMap id="map" type="com.couplet.common.domain.Fence">
         <id property="fenceId" column="fence_id"/>
         <result property="fenceName" column="fence_name"/>
         <result property="fenceDescription" column="fence_description"/>
@@ -15,7 +15,7 @@
         <result property="isDelete" column="is_delete" />
         <result property="maintainerName" column="maintainer_name" />
     </resultMap>
-    <resultMap id="logoMap" type="com.couplet.map.common.domain.Logo">
+    <resultMap id="logoMap" type="com.couplet.common.domain.Logo">
         <id property="logoId" column="logo_id"/>
         <result property="logoName" column="logo_name" />
     </resultMap>

couplet-modules/couplet-business/src/main/resources/mapper/business/FenceMapper.xml

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.couplet.map.server.mapper.FenceMapper">
+<mapper namespace="com.couplet.business.server.mapper.FenceMapper">
 
-    <resultMap id="map" type="com.couplet.map.common.domain.Fence">
+    <resultMap id="map" type="com.couplet.common.domain.Fence">
         <id property="fenceId" column="fence_id"/>
         <result property="fenceName" column="fence_name"/>
         <result property="fenceDescription" column="fence_description"/>
@@ -15,7 +15,7 @@
         <result property="isDelete" column="is_delete" />
         <result property="maintainerName" column="maintainer_name" />
     </resultMap>
-    <resultMap id="logoMap" type="com.couplet.map.common.domain.Logo">
+    <resultMap id="logoMap" type="com.couplet.common.domain.Logo">
         <id property="logoId" column="logo_id"/>
         <result property="logoName" column="logo_name" />
     </resultMap>
@@ -52,7 +52,7 @@
             alarm_status
         FROM couplet_fence_info
     </sql>
-    <insert id="insertFence" parameterType="com.couplet.map.common.domain.request.FenceRequest" keyProperty="fenceId"
+    <insert id="insertFence" parameterType="com.couplet.common.domain.request.FenceRequest" keyProperty="fenceId"
             useGeneratedKeys="true">
         INSERT INTO `couplet-cloud`.`couplet_fence_info`
             (`fence_name`, `fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`,
@@ -63,7 +63,7 @@
 
     </insert>
 
-    <update id="changeFence" parameterType="com.couplet.map.common.domain.request.FenceUpdateRequest">
+    <update id="changeFence" parameterType="com.couplet.common.domain.request.FenceUpdateRequest">
 
         UPDATE `couplet-cloud`.`couplet_fence_info`
             SET `fence_name` = #{fenceName},
@@ -81,7 +81,7 @@
         delete from  couplet_fence_info where fence_id = #{fenceId}
     </delete>
     <select id="pageQuery" resultMap="map"
-            parameterType="com.couplet.map.common.domain.request.FenceConfig">
+            parameterType="com.couplet.common.domain.request.FenceConfig">
         <include refid="selectFence"></include>
         <where>
             <if test="fenceName!=null and fenceName!='' ">

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

@@ -2,9 +2,9 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.couplet.trouble.mapper.SysTroubleMapper">
+<mapper namespace="com.couplet.business.server.mapper.SysTroubleMapper">
 
-    <resultMap type="com.couplet.trouble.domain.CoupletTroubleCode" id="SysTroubleResult">
+    <resultMap type="com.couplet.common.domain.CoupletTroubleCode" id="SysTroubleResult">
         <id property="troubleId" column="trouble_id"/>
         <result property="troubleCode" column="trouble_code"/>
         <result property="troubleValue" column="trouble_value"/>
@@ -20,7 +20,7 @@
         LEFT JOIN couplet_trouble_type y on t.type_id= y.type_id
     </sql>
 
-    <select id="selectTroubleList" parameterType="com.couplet.trouble.mapper.SysTroubleMapper" resultMap="SysTroubleResult">
+    <select id="selectTroubleList" parameterType="com.couplet.business.server.mapper.SysTroubleMapper" resultMap="SysTroubleResult">
         <include refid="selectTroubleVo"/>
         <where>
             <if test="troubleCode != null and troubleCode != ''">
@@ -31,10 +31,10 @@
             </if>
         </where>
     </select>
-    <select id="selectTroubleListByType" resultType="com.couplet.trouble.domain.CoupletTroubleType">
+    <select id="selectTroubleListByType" resultType="com.couplet.common.domain.CoupletTroubleType">
         select * from couplet_trouble_type
     </select>
-    <select id="selectTroubleListByGrade" resultType="com.couplet.trouble.domain.CoupletTroubleGrade">
+    <select id="selectTroubleListByGrade" resultType="com.couplet.common.domain.CoupletTroubleGrade">
         select * from couplet_trouble_grade
     </select>
 

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

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.couplet.vehicle.mapper.VehicleAndLogoMapper">
+<mapper namespace="com.couplet.business.server.mapper.VehicleAndLogoMapper">
 
 
     <insert id="vehicleBindLogo">

couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.couplet.vehicle.mapper.VehicleMapper">
+<mapper namespace="com.couplet.business.server.mapper.VehicleMapper">
 
 
     <sql id="selectMiddleUserOrVehicle">
@@ -51,13 +51,13 @@
         where middle_id = #{middleId}
     </delete>
 
-    <select id="UserUnderTheVehicleList" resultType="com.couplet.vehicle.domain.Vehicle">
+    <select id="UserUnderTheVehicleList" resultType="com.couplet.common.domain.Vehicle">
         <include refid="selectMiddleUserOrVehicle"/>
             <if test="userId!=null">
                 AND m.user_id  = #{userId}
             </if>
     </select>
-    <select id="vehicleAll" resultType="com.couplet.vehicle.domain.Vehicle">
+    <select id="vehicleAll" resultType="com.couplet.common.domain.Vehicle">
         <include refid="selectVehicle"/>
     </select>
 </mapper>

couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleTypeMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper
         PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.couplet.vehicle.mapper.VehicleTypeMapper">
+<mapper namespace="com.couplet.business.server.mapper.VehicleTypeMapper">
 
 
 </mapper>

couplet-modules/couplet-electronic-fence/.gitignore

@@ -1,38 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/.gitignore

@@ -1,38 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml

@@ -1,34 +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-electronic-fence</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-
-    <artifactId>couplet-electronic-fence-common</artifactId>
-
-    <description>
-        couplet-electronic-fence-common
-    </description>
-
-    <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>
-
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-core</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/.gitignore

@@ -1,38 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-remote/pom.xml

@@ -1,29 +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-electronic-fence</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>couplet-electronic-fence-remote</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>
-
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-electronic-fence-common</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/.gitignore

@@ -1,38 +0,0 @@
-target/
-!.mvn/wrapper/maven-wrapper.jar
-!**/src/main/**/target/
-!**/src/test/**/target/
-
-### IntelliJ IDEA ###
-.idea/modules.xml
-.idea/jarRepositories.xml
-.idea/compiler.xml
-.idea/libraries/
-*.iws
-*.iml
-*.ipr
-
-### Eclipse ###
-.apt_generated
-.classpath
-.factorypath
-.project
-.settings
-.springBeans
-.sts4-cache
-
-### NetBeans ###
-/nbproject/private/
-/nbbuild/
-/dist/
-/nbdist/
-/.nb-gradle/
-build/
-!**/src/main/**/build/
-!**/src/test/**/build/
-
-### VS Code ###
-.vscode/
-
-### Mac OS ###
-.DS_Store

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test.java

@@ -1,33 +0,0 @@
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-
-import java.util.Properties;
-
-/**
- * @Author: LiJiaYao
- * @Date: 2024/4/1
- * 异步发送
- */
-public class test {
-    public static void main(String[] args) {
-
-        Properties props = new Properties();
-        props.put("bootstrap.servers","39.103.133.136:9092");
-        //使用默认的配置
-//        props.put("acks","all");
-//        props.put("retries",0);
-//        props.put("batch.size",16384);
-//        props.put("linger.ms",1);
-//        props.put("buffer.memory",33554432);
-        props.put("key.serializer","org.apache.kafka.common.serialization.StringSerializer");
-        props.put("value.serializer","org.apache.kafka.common.serialization.StringSerializer");
-        KafkaProducer<String, String> producer = new KafkaProducer<>(props);
-        for (int i = 0; i < 10; i++) {
-            producer.send(new ProducerRecord<String,String>("my-topic",Integer.toString(i),Integer.toString(i)));
-        }
-        producer.close();
-    }
-
-
-
-}

couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/test/java/test2.java

@@ -1,40 +0,0 @@
-import org.apache.kafka.clients.producer.KafkaProducer;
-import org.apache.kafka.clients.producer.Producer;
-import org.apache.kafka.clients.producer.ProducerRecord;
-import org.apache.kafka.clients.producer.RecordMetadata;
-import org.yaml.snakeyaml.introspector.Property;
-
-import java.util.Properties;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-/**
- * @Author: LiJiaYao
- * @Date: 2024/4/1
- * 同步发送
- */
-public class test2 {
-
-    public static void main(String[] args) {
-
-        Properties properties = new Properties();
-        properties.put("bootstrap.servers", "39.103.133.136:9092");
-        properties.put("key.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-        properties.put("value.serializer", "org.apache.kafka.common.serialization.StringSerializer");
-        KafkaProducer<String, String> producer = new KafkaProducer<String, String>(properties);
-        for (int i = 0; i < 10; i++) {
-            Future<RecordMetadata> result = producer.send(new ProducerRecord<>("test", Integer.toString(i), Integer.toString(i)));
-            try {
-                RecordMetadata recordMetadata =result.get();
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            } catch (ExecutionException e) {
-                e.printStackTrace();
-            }
-        }
-        producer.close();
-
-    }
-
-
-}

couplet-modules/couplet-electronic-fence/pom.xml

@@ -1,30 +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>
-
-    <packaging>pom</packaging>
-
-
-
-    <artifactId>couplet-electronic-fence</artifactId>
-
-    <modules>
-        <module>couplet-electronic-fence-server</module>
-        <module>couplet-electronic-fence-common</module>
-        <module>couplet-electronic-fence-remote</module>
-    </modules>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-</project>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-common/pom.xml

@@ -1,30 +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-enterprisemanagement</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>couplet-enterprisemanagement-common</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>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-core</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-system</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-remote/pom.xml

@@ -1,34 +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-enterprisemanagement</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>couplet-enterprisemanagement-remote</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>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-enterprisemanagement-common</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-security</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-security</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/pom.xml

@@ -1,99 +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-enterprisemanagement</artifactId>
-        <version>3.6.3</version>
-    </parent>
-
-    <artifactId>couplet-enterprisemanagement-server</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>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-enterprisemanagement-common</artifactId>
-        </dependency>
-        <!-- 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>
-
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-modules-vehicle</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-vehicle</artifactId>
-            <version>3.6.3</version>
-            <scope>compile</scope>
-        </dependency>
-
-
-    </dependencies>
-
-</project>

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/CoupleManagementApp.java

@@ -1,27 +0,0 @@
-package com.couplet.server;
-
-import com.couplet.common.security.annotation.EnableCustomConfig;
-import com.couplet.common.security.annotation.EnableMyFeignClients;
-import com.couplet.common.swagger.annotation.EnableCustomSwagger2;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @author fufanrui
- * @version 1.0
- * @description: 启动类
- * @date 2024/3/27 14:04
- */
-@EnableCustomConfig
-@EnableCustomSwagger2
-@EnableMyFeignClients
-@SpringBootApplication
-public class CoupleManagementApp {
-
-    public static void main(String[] args) {
-
-        SpringApplication.run(CoupleManagementApp.class, args);
-
-
-    }
-}

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/banner.txt

@@ -1,2 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}

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

@@ -1,32 +0,0 @@
-# Tomcat
-server:
-  port: 9222
-
-# Spring
-spring:
-  application:
-    # 应用名称
-    name: couplet-enterprisemanagement
-  profiles:
-    # 环境配置
-    active: dev
-  cloud:
-    nacos:
-      discovery:
-        # 服务注册地址
-        server-addr: 121.89.211.230:8848
-        namespace: 172469
-      config:
-        # 配置中心地址
-        server-addr: 121.89.211.230:8848
-        namespace: 172469
-        # 配置文件格式
-        file-extension: yml
-        # 共享配置
-        shared-configs:
-          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}
-  main:
-    allow-bean-definition-overriding: true
-logging:
-  level:
-    com.couplet.system.mapper: DEBUG

couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/resources/logback.xml

@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="60 seconds" debug="false">
-    <!-- 日志存放路径 -->
-    <property name="log.path" value="logs/couplet-system"/>
-    <!-- 日志输出格式 -->
-    <property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n"/>
-
-    <!-- 控制台输出 -->
-    <appender name="console" class="ch.qos.logback.core.ConsoleAppender">
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-    </appender>
-
-    <!-- 系统日志输出 -->
-    <appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/info.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>INFO</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
-        <file>${log.path}/error.log</file>
-        <!-- 循环政策：基于时间创建日志文件 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <!-- 日志文件名格式 -->
-            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
-            <!-- 日志最大的历史 60天 -->
-            <maxHistory>60</maxHistory>
-        </rollingPolicy>
-        <encoder>
-            <pattern>${log.pattern}</pattern>
-        </encoder>
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <!-- 过滤的级别 -->
-            <level>ERROR</level>
-            <!-- 匹配时的操作：接收（记录） -->
-            <onMatch>ACCEPT</onMatch>
-            <!-- 不匹配时的操作：拒绝（不记录） -->
-            <onMismatch>DENY</onMismatch>
-        </filter>
-    </appender>
-
-    <!-- 系统模块日志级别控制  -->
-    <logger name="com.couplet" level="info"/>
-    <!-- Spring日志级别控制  -->
-    <logger name="org.springframework" level="warn"/>
-
-    <root level="info">
-        <appender-ref ref="console"/>
-    </root>
-
-    <!--系统操作日志-->
-    <root level="info">
-        <appender-ref ref="file_info"/>
-        <appender-ref ref="file_error"/>
-    </root>
-</configuration>

couplet-modules/couplet-enterprisemanagement/pom.xml

@@ -1,26 +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-enterprisemanagement</artifactId>
-    <packaging>pom</packaging>
-    <modules>
-        <module>couplet-enterprisemanagement-common</module>
-        <module>couplet-enterprisemanagement-server</module>
-        <module>couplet-enterprisemanagement-remote</module>
-    </modules>
-
-    <properties>
-        <maven.compiler.source>17</maven.compiler.source>
-        <maven.compiler.target>17</maven.compiler.target>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    </properties>
-
-</project>

couplet-modules/couplet-modules-onLine/pom.xml

@@ -94,7 +94,7 @@
 <!--        注入车辆服务，调用接口-->
         <dependency>
             <groupId>com.couplet</groupId>
-            <artifactId>couplet-modules-vehicle</artifactId>
+            <artifactId>couplet-common-business</artifactId>
         </dependency>
 
     </dependencies>

couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java

@@ -1,9 +1,9 @@
 package com.couplet.online.utils;
 
 import com.alibaba.fastjson2.JSON;
+import com.couplet.common.domain.Vehicle;
 import com.couplet.common.redis.service.RedisService;
-import com.couplet.vehicle.domain.Vehicle;
+import com.couplet.remote.RemoteVehicleService;
-import com.couplet.vehicle.remote.RemoteVehicleService;
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.paho.client.mqttv3.*;
 import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;

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

@@ -1,126 +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">
-    <parent>
-        <groupId>com.couplet</groupId>
-        <artifactId>couplet-modules</artifactId>
-        <version>3.6.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>couplet-modules-vehicle</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>-->
-
-    <description>
-        couplet-modules-vehicle车辆管理模块
-    </description>
-
-    <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>
-
-        <!-- Pagehelper -->
-        <dependency>
-            <groupId>com.github.pagehelper</groupId>
-            <artifactId>pagehelper-spring-boot-starter</artifactId>
-            <version>1.4.1</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.couplet</groupId>
-            <artifactId>couplet-common-core</artifactId>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <!-- 加入maven deploy插件，当在deploy时，忽略些model-->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-deploy-plugin</artifactId>
-                <configuration>
-                    <skip>true</skip>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-</project>

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/CoupletVehicleApplication.java

@@ -1,24 +0,0 @@
-package com.couplet.vehicle;
-
-import com.couplet.common.security.annotation.EnableCustomConfig;
-import com.couplet.common.security.annotation.EnableMyFeignClients;
-import com.couplet.common.swagger.annotation.EnableCustomSwagger2;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-
-/**
- * @ProjectName: Default (Template) Project
- * @Author: LiuYunHu
- * @CreateTime: 2024/3/26
- * @Description: 车辆管理模块启动类
- */
-@EnableCustomConfig
-@EnableCustomSwagger2
-@EnableMyFeignClients
-@SpringBootApplication
-public class CoupletVehicleApplication {
-    public static void main(String[] args) {
-        SpringApplication.run(CoupletVehicleApplication.class, args);
-        System.out.println("车辆管理模块启动成功");
-    }
-}

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleMiddle.java

@@ -1,27 +0,0 @@
-package com.couplet.vehicle.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.ToString;
-
-/**
- * @author fufanrui
- * @version 1.0
- * @description: TODO
- * @date 2024/4/2 11:22
- */
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-@ToString
-public class VehicleMiddle{
-
-    private Long middleId;
-    private Long userId;
-    private Long vehicleId;
-    private Long delFlag;
-}

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleType.java

@@ -1,36 +0,0 @@
-package com.couplet.vehicle.domain;
-
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import lombok.experimental.SuperBuilder;
-
-/**
- * @ProjectName: five-groups-couplet
- * @Author: LiuYunHu
- * @CreateTime: 2024/3/31
- * @Description: 车辆类型
- */
-@Data
-@SuperBuilder
-@AllArgsConstructor
-@NoArgsConstructor
-@TableName("couplet_vehicle_type")
-public class VehicleType {
-
-    /*
-     * 车辆类型id
-     * */
-    @TableId(type = IdType.AUTO, value = "vehicle_type_id")
-    private Long vehicleTypeId;
-
-    /*
-     * 车辆类型名称
-     * */
-    @TableField(value = "vehicle_type_name")
-    private String vehicleTypeName;
-}

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/remote/RemoteVehicleService.java

@@ -1,27 +0,0 @@
-package com.couplet.vehicle.remote;
-
-import com.couplet.common.core.constant.ServiceNameConstants;
-import com.couplet.common.core.domain.Result;
-import com.couplet.vehicle.domain.Vehicle;
-import com.couplet.vehicle.remote.factory.RemoteVehicleFallbackFactory;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-
-import java.util.List;
-
-/**
- * 车辆服务
- *
- * @author couplet
- */
-@FeignClient(contextId = "remoteVehicleService",value = ServiceNameConstants.VEHICLE_SERVICE, fallbackFactory = RemoteVehicleFallbackFactory.class, path = "/vehicle")
-@Component
-public interface RemoteVehicleService {
-
-    @GetMapping("/findByVIN/{vin}")
-    public Result<List<Vehicle>> findByVIN(@PathVariable("vin") String vin);
-
-
-}

couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/remote/factory/RemoteVehicleFallbackFactory.java

@@ -1,33 +0,0 @@
-package com.couplet.vehicle.remote.factory;
-
-import com.couplet.common.core.domain.Result;
-import com.couplet.vehicle.domain.Vehicle;
-import com.couplet.vehicle.remote.RemoteVehicleService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.cloud.openfeign.FallbackFactory;
-import org.springframework.stereotype.Component;
-
-import java.util.List;
-
-/**
- * 车辆服务降级处理
- *
- * @author couplet
- */
-@Component
-public class RemoteVehicleFallbackFactory implements FallbackFactory<RemoteVehicleService> {
-    private static final Logger log = LoggerFactory.getLogger(RemoteVehicleFallbackFactory.class);
-
-    @Override
-    public RemoteVehicleService create(Throwable throwable) {
-        log.error("车辆服务调用失败:{}", throwable.getMessage());
-        return new RemoteVehicleService() {
-
-            @Override
-            public Result<List<Vehicle>> findByVIN(String vin) {
-                return Result.error("车辆服务调用失败:" + throwable.getMessage());
-            }
-        };
-    }
-}

couplet-modules/couplet-modules-vehicle/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-com.couplet.vehicle.remote.factory.RemoteVehicleFallbackFactory

couplet-modules/couplet-modules-vehicle/src/main/resources/banner.txt

@@ -1,6 +0,0 @@
-Spring Boot Version: ${spring-boot.version}
-Spring Application Name: ${spring.application.name}
- _  _  ____  _   _  ____   ___  __    ____
-( \/ )( ___)( )_( )(_  _) / __)(  )  ( ___)
- \  /  )__)  ) _ (  _)(_ ( (__  )(__  )__)
-  \/  (____)(_) (_)(____) \___)(____)(____)