diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml b/couplet-common/couplet-common-business/pom.xml similarity index 80% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml rename to couplet-common/couplet-common-business/pom.xml index d1ab065..966a25d 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/pom.xml +++ b/couplet-common/couplet-common-business/pom.xml @@ -5,30 +5,23 @@ 4.0.0 com.couplet - couplet-electronic-fence + couplet-common 3.6.3 - couplet-electronic-fence-common - - - couplet-electronic-fence-common - + couplet-common-business 17 17 UTF-8 - - com.couplet couplet-common-core - diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleCode.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleCode.java similarity index 92% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleCode.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleCode.java index a4c166c..3134a5e 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleCode.java +++ b/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; diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleGrade.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleGrade.java similarity index 85% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleGrade.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleGrade.java index a4eef19..b5207e1 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleGrade.java +++ b/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; diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleLog.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleLog.java similarity index 93% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleLog.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleLog.java index e61d496..565ca22 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleLog.java +++ b/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; diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleType.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleType.java similarity index 85% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleType.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/CoupletTroubleType.java index aedb004..497e180 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/CoupletTroubleType.java +++ b/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; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Fence.java similarity index 92% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Fence.java index 7f1c787..67504f0 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Fence.java +++ b/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.map.common.domain.request.FenceUpdateRequest; +import com.couplet.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 diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Logo.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Logo.java similarity index 91% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Logo.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Logo.java index 2cbf020..2122cf7 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/Logo.java +++ b/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; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/Vehicle.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Vehicle.java similarity index 96% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/Vehicle.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/Vehicle.java index a12fcbe..ef89d45 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/Vehicle.java +++ b/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; @@ -21,8 +21,7 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @NoArgsConstructor @TableName("couplet_vehicle") -public class Vehicle { - +public class Vehicle{ /* *车辆id * */ diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleAndLogo.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleAndLogo.java similarity index 96% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleAndLogo.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleAndLogo.java index 7664101..48c5dc4 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleAndLogo.java +++ b/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; diff --git a/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleMiddle.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleMiddle.java new file mode 100644 index 0000000..3b6308f --- /dev/null +++ b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleMiddle.java @@ -0,0 +1,26 @@ +package com.couplet.common.domain; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.SuperBuilder; + +/** + * @author fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/4/2 11:22 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@ToString +public class VehicleMiddle{ + + private Long middleId; + private Long userId; + private Long vehicleId; + private Long delFlag; +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleType.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleType.java similarity index 89% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleType.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleType.java index 8d5afd9..e86025a 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/VehicleType.java +++ b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/VehicleType.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; @@ -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 @@ -16,7 +15,6 @@ import lombok.experimental.SuperBuilder; * @Description: 车辆类型 */ @Data -@SuperBuilder @AllArgsConstructor @NoArgsConstructor @TableName("couplet_vehicle_type") diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceConfig.java similarity index 87% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceConfig.java index c2be21a..06f931e 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceConfig.java +++ b/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; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceRequest.java similarity index 95% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceRequest.java index 9b74a87..63bc49c 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceRequest.java +++ b/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 diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceUpdateRequest.java similarity index 93% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/FenceUpdateRequest.java index 5c39c70..0f596cb 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-common/src/main/java/com/couplet/map/common/domain/request/FenceUpdateRequest.java +++ b/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; diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/TroubleResp.java similarity index 84% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/TroubleResp.java index 5394d62..7f5731d 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/domain/resp/TroubleResp.java +++ b/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; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleEditParams.java similarity index 95% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleEditParams.java index 3eeeb6f..f1b1736 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java +++ b/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; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleInsertParams.java similarity index 93% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleInsertParams.java index 51c2279..556b88f 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java +++ b/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; @@ -7,7 +7,6 @@ import lombok.experimental.SuperBuilder; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; import java.util.List; /** diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleListParams.java similarity index 93% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/domain/request/VehicleListParams.java index 31acc33..2315090 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java +++ b/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; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/utils/SnowflakeIdGenerator.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/common/utils/SnowflakeIdGenerator.java similarity index 98% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/utils/SnowflakeIdGenerator.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/common/utils/SnowflakeIdGenerator.java index 3f6132c..aeb40d2 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/utils/SnowflakeIdGenerator.java +++ b/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 diff --git a/couplet-common/couplet-trouble-log/src/main/java/com/couplet/common/log/annotation/Record.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/log/annotation/Record.java similarity index 73% rename from couplet-common/couplet-trouble-log/src/main/java/com/couplet/common/log/annotation/Record.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/log/annotation/Record.java index aa61bb5..03f040a 100644 --- a/couplet-common/couplet-trouble-log/src/main/java/com/couplet/common/log/annotation/Record.java +++ b/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 diff --git a/couplet-common/couplet-trouble-log/src/main/java/com/couplet/common/log/aop/AopRecord.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/log/aop/AopRecord.java similarity index 76% rename from couplet-common/couplet-trouble-log/src/main/java/com/couplet/common/log/aop/AopRecord.java rename to couplet-common/couplet-common-business/src/main/java/com/couplet/log/aop/AopRecord.java index 1676967..e4ff8b0 100644 --- a/couplet-common/couplet-trouble-log/src/main/java/com/couplet/common/log/aop/AopRecord.java +++ b/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 diff --git a/couplet-common/couplet-common-business/src/main/java/com/couplet/remote/RemoteVehicleService.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/remote/RemoteVehicleService.java new file mode 100644 index 0000000..7e8a46b --- /dev/null +++ b/couplet-common/couplet-common-business/src/main/java/com/couplet/remote/RemoteVehicleService.java @@ -0,0 +1,54 @@ +package com.couplet.remote; + +import com.couplet.common.core.constant.ServiceNameConstants; +import com.couplet.common.core.domain.Result; +import com.couplet.common.domain.Vehicle; +import com.couplet.common.domain.VehicleMiddle; +import com.couplet.remote.factory.RemoteVehicleFallbackFactory; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@FeignClient(contextId = "remoteVehicleService" , + value = ServiceNameConstants.VEHICLE_SERVICE, + fallbackFactory = RemoteVehicleFallbackFactory.class, + path = "/vehicle" +) +public interface RemoteVehicleService { + + /* + * @param null: + * @return null + * @author 付凡芮 + * @description 根据员工id查询员工下有哪些车 + * @date + */ + @PostMapping("UserUnderTheVehicle/{userId}") + public Result> UserUnderTheVehicleList(@PathVariable(value = "userId") Long userId); + + + /* + * @param middleId: + * @return Result + * @author 付凡芮 + * @description 删除员工管理的车辆 + * @date + */ + @DeleteMapping("/{middleId}") + public Result deleteVehicle(@PathVariable(value = "middleId") Long middleId); + + + @PostMapping + public Result addVehicle(@RequestBody VehicleMiddle vehicleMiddle); + + + + @PostMapping("vehicleAll") + public Result> VehicleManageList(); + + + @GetMapping("/findByVIN/{vin}") + public Result> findByVIN(@PathVariable("vin") String vin); + +} diff --git a/couplet-common/couplet-common-business/src/main/java/com/couplet/remote/factory/RemoteVehicleFallbackFactory.java b/couplet-common/couplet-common-business/src/main/java/com/couplet/remote/factory/RemoteVehicleFallbackFactory.java new file mode 100644 index 0000000..58fa254 --- /dev/null +++ b/couplet-common/couplet-common-business/src/main/java/com/couplet/remote/factory/RemoteVehicleFallbackFactory.java @@ -0,0 +1,55 @@ +package com.couplet.remote.factory; + +import com.couplet.common.core.domain.Result; +import com.couplet.common.domain.Vehicle; +import com.couplet.common.domain.VehicleMiddle; +import com.couplet.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 fufanrui + * @version 1.0 + * @description: TODO + * @date 2024/4/2 14:46 + */ +@Component +public class RemoteVehicleFallbackFactory implements FallbackFactory { + private static final Logger log = LoggerFactory.getLogger(RemoteVehicleFallbackFactory.class); + + + @Override + public RemoteVehicleService create(Throwable cause) { + return new RemoteVehicleService() { + @Override + public Result> UserUnderTheVehicleList(Long userId) { + return Result.error("调用失败...."+cause.getMessage()); + } + + @Override + public Result deleteVehicle(Long middleId) { + return Result.error("调用失败...."+cause.getMessage()); + } + + @Override + public Result addVehicle(VehicleMiddle vehicleMiddle) { + return Result.error("调用失败....."+cause.getMessage()); + } + + @Override + public Result> VehicleManageList() { + return Result.error("调用失败....."+cause.getMessage()); + } + + + @Override + public Result> findByVIN(String vin) { + return Result.error("车辆服务调用失败:" + cause.getMessage()); + } + }; + } +} diff --git a/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java index d8ed518..ed65064 100644 --- a/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java +++ b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/constant/ServiceNameConstants.java @@ -20,4 +20,14 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "couplet-file"; + + + /* + * @param null: + * @return null + * @author 付凡芮 + * @description 车辆管理模块 + * @date + */ + public static final String VEHICLE_SERVICE = "couplet-vehicle"; } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/exception/VehicleException.java b/couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/vehicle/VehicleException.java similarity index 90% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/exception/VehicleException.java rename to couplet-common/couplet-common-core/src/main/java/com/couplet/common/core/exception/vehicle/VehicleException.java index 37b0f52..f778fc2 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/exception/VehicleException.java +++ b/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 diff --git a/couplet-common/couplet-trouble-log/pom.xml b/couplet-common/couplet-trouble-log/pom.xml deleted file mode 100644 index 359681a..0000000 --- a/couplet-common/couplet-trouble-log/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.couplet - couplet-common - 3.6.3 - - - couplet-trouble-log - - - 17 - 17 - UTF-8 - - - diff --git a/couplet-common/pom.xml b/couplet-common/pom.xml index f882cfb..e1454b0 100644 --- a/couplet-common/pom.xml +++ b/couplet-common/pom.xml @@ -18,7 +18,8 @@ couplet-common-datascope couplet-common-datasource couplet-common-system - couplet-trouble-log + couplet-common-business + couplet-common diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml b/couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml index 715187a..2dd1c32 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/pom.xml @@ -86,12 +86,6 @@ org.eclipse.paho.client.mqttv3 1.2.5 - - - - org.springframework.boot - spring-boot-starter-amqp - diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/config/RabbitAdminConfig.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/config/RabbitAdminConfig.java deleted file mode 100644 index 71e900d..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/config/RabbitAdminConfig.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.couplet.analyze.msg.config; - -import org.springframework.amqp.rabbit.connection.CachingConnectionFactory; -import org.springframework.amqp.rabbit.connection.ConnectionFactory; -import org.springframework.amqp.rabbit.core.RabbitAdmin; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; - -@Configuration -public class RabbitAdminConfig { - - @Value("${spring.rabbitmq.host}") - private String host; - @Value("${spring.rabbitmq.username}") - private String username; - @Value("${spring.rabbitmq.password}") - private String password; - @Value("${spring.rabbitmq.virtualhost}") - private String virtualhost; - - /** - * 构建RabbitMQ的连接工厂 - * @return - */ - @Bean - public ConnectionFactory connectionFactory() { - CachingConnectionFactory connectionFactory = new CachingConnectionFactory(); - connectionFactory.setAddresses(host); - connectionFactory.setUsername(username); - connectionFactory.setPassword(password); - connectionFactory.setVirtualHost(virtualhost); - return connectionFactory; - } - - - /** - * 初始化RabbitAdmin - * @param connectionFactory - * @return - */ - @Bean - public RabbitAdmin rabbitAdmin(ConnectionFactory connectionFactory) { - RabbitAdmin rabbitAdmin = new RabbitAdmin(connectionFactory); - rabbitAdmin.setAutoStartup(true); - return rabbitAdmin; - } - -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/consumer/IncidentConsumer.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/consumer/IncidentConsumer.java deleted file mode 100644 index 7c4eb87..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/consumer/IncidentConsumer.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.couplet.analyze.msg.consumer; - -import com.couplet.analyze.msg.domain.CoupletMsgData; -import com.couplet.analyze.msg.service.IncidentService; -import com.couplet.common.core.utils.SpringUtils; -import com.rabbitmq.client.Channel; -import lombok.extern.log4j.Log4j2; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.RabbitHandler; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.TimeUnit; - -/** - * @Author: LiJiaYao - * @Date: 2024/4/2 - * @Description: 消费传输过来的数据 - */ -@Component -@Log4j2 -@RabbitListener(queues = "couplet-msg-queue") -public class IncidentConsumer { - - /** - * 调用事件服务接口 - */ - @Autowired - private IncidentService incidentService; - - @Autowired - private StringRedisTemplate redis; - - static ArrayList strings = new ArrayList<>(){ - { - add("breakdown"); - add("electronic-fence"); - add("real-time-data"); - add("stored-event"); - } - }; - @RabbitHandler - public void incidentConsumer(List list, Channel channel, Message message) throws IOException { - - log.info("消费者收到的消息是:【{}】",list); - - long deliveryTag = message.getMessageProperties().getDeliveryTag(); - String messageId = message.getMessageProperties().getMessageId(); - - if (redis.hasKey("解析系统value:"+messageId)){ - redis.opsForValue().set("解析系统value:"+messageId,deliveryTag+"",5, TimeUnit.MINUTES); - } - Long add = redis.opsForSet().add("解析系统:set" + messageId,messageId); - redis.expire("解析系统:set"+messageId,5,TimeUnit.MINUTES); - - try { - if (0 < add){ - log.info("消费者开始消费，消费者收到消息是:【{ }】"+list); - for (CoupletMsgData coupletMsgData : list) { - for (String string : strings) { - CoupletMsgData bean = SpringUtils.getBean(string); - incidentService.incident(coupletMsgData); - } - } - channel.basicAck(deliveryTag,false); - } else { - //重复消费 - log.error("重复消费"); - //拒绝消费 - channel.basicReject(deliveryTag, false); - - //删除缓存 - redis.opsForSet().remove("解析系统:set"+messageId, messageId); - - } - } catch (Exception e) { - log.error("消息消费失败...消息信息为:【{ }】", list); - String s = redis.opsForValue().get("解析系统value:" + messageId); - Long o = Long.parseLong( s ); - if (deliveryTag == o+2){ - log.error("队列无法进入了,消息是:【{}】",list); - channel.basicNack(deliveryTag,false,false); - } else { - log.info("再一次进入队列，消息是:[{}]", list); - channel.basicNack(deliveryTag,false,true); - } - } - } - - -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/controller/IncidentController.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/controller/IncidentController.java deleted file mode 100644 index 44b71db..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/controller/IncidentController.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.couplet.analyze.msg.controller; - -import com.couplet.analyze.msg.domain.CoupletMsgData; -import com.couplet.analyze.msg.service.IncidentService; -import com.couplet.common.core.domain.Result; -import com.couplet.common.core.web.controller.BaseController; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.ArrayList; -import java.util.List; - -/** - * @Author: LiJiaYao - * @Date: 2024/4/2 - * 事件控制器 - */ -@RestController -@RequestMapping("/incident") -public class IncidentController extends BaseController { - - /** - * 事件服务 - */ - @Autowired - private IncidentService incidentService; - -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/mapper/CoupletMapper.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/mapper/CoupletMapper.java deleted file mode 100644 index 98c825e..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/mapper/CoupletMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.couplet.analyze.msg.mapper; - -import com.couplet.analyze.msg.domain.CoupletMsgData; -import org.apache.ibatis.annotations.Mapper; - -/** - * @author DongXiaoDong - * @version 1.0 - * @date 2024/4/2 19:58 - * @description - */ -@Mapper -public interface CoupletMapper { - void insertMsgData(CoupletMsgData msgData); -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelMessage.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelMessage.java index c6c34ba..0a53f09 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelMessage.java +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelMessage.java @@ -1,11 +1,13 @@ package com.couplet.analyze.msg.model; import com.couplet.analyze.msg.domain.CoupletMsgData; -import com.couplet.analyze.msg.service.CoupletMsgService; +import com.couplet.analyze.msg.service.IncidentService; +import com.couplet.common.core.utils.SpringUtils; +import com.couplet.common.core.utils.uuid.IdUtils; import lombok.extern.slf4j.Slf4j; import org.eclipse.paho.client.mqttv3.*; -import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; @@ -33,16 +35,32 @@ import static io.lettuce.core.pubsub.PubSubOutput.Type.message; @Component public class ModelMessage { - @Autowired - private CoupletMsgService coupletMsgService; +// @Autowired +// private CoupletMsgService coupletMsgService; - @Autowired - private RabbitTemplate rabbitTemplate; +// @Autowired +// public ModelMessage(CoupletMsgService coupletMsgService){ +// this.coupletMsgService = coupletMsgService; +// } + static ArrayList strings = new ArrayList<>() { + { + add("breakdown"); + add("electronic-fence"); + add("real-time-data"); + add("stored-event"); + } + }; - @Autowired - public ModelMessage(CoupletMsgService coupletMsgService){ - this.coupletMsgService = coupletMsgService; - } + @Value("${mq.queueName}") + public String queueName; + + //交换机 + @Value("${mq.exchangeName}") + public String exchangeName; + + //路由键 + @Value("${mq.routingKey}") + public String routingKey; @Scheduled(cron = "0/5 * * * * ?") public void startMsg() { @@ -70,10 +88,15 @@ public class ModelMessage { for (CoupletMsgData msgData : coupletMsgDataList) { log.info("解析到车辆数据：{}", msgData); //发送日志到MQ - rabbitTemplate.convertAndSend("couplet-msg-queue",msgData,message -> { - message.getMessageProperties().setMessageId(UUID.randomUUID().toString()); - return message; - }); + for (String string : strings) { + IncidentService incidentService = SpringUtils.getBean(string); + incidentService.incident(msgData); + } + try { + Thread.sleep(1000); + } catch (InterruptedException e) { + throw new RuntimeException(e); + } } } diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/CoupletMsgService.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/CoupletMsgService.java deleted file mode 100644 index f0834fb..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/CoupletMsgService.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.couplet.analyze.msg.service; - -import com.couplet.analyze.msg.domain.CoupletMsgData; - -/** - * @author DongXiaoDong - * @version 1.0 - * @date 2024/4/2 16:44 - * @description 存储报文数据信息 - */ -public interface CoupletMsgService { - void saveDataToDatabase(CoupletMsgData msgData); -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/CoupletMsgServiceImpl.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/CoupletMsgServiceImpl.java deleted file mode 100644 index 581312f..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/CoupletMsgServiceImpl.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.couplet.analyze.msg.service.impl; - -import com.couplet.analyze.msg.domain.CoupletMsgData; -import com.couplet.analyze.msg.mapper.CoupletMapper; -import com.couplet.analyze.msg.service.CoupletMsgService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @author DongXiaoDong - * @version 1.0 - * @date 2024/4/2 19:57 - * @description - */ -@Service -public class CoupletMsgServiceImpl implements CoupletMsgService { - @Autowired - private CoupletMapper coupletMapper; - @Override - public void saveDataToDatabase(CoupletMsgData msgData) { - coupletMapper.insertMsgData(msgData); - } -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/ElectronicFenceServiceImpl.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/ElectronicFenceServiceImpl.java index 5b42cd5..bed51e1 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/ElectronicFenceServiceImpl.java +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/ElectronicFenceServiceImpl.java @@ -2,6 +2,7 @@ package com.couplet.analyze.msg.service.impl; import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.analyze.msg.service.IncidentService; +import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; /** @@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; * @Description: 电子围栏事件服务实现类 */ @Service("electronic-fence") +@Log4j2 public class ElectronicFenceServiceImpl implements IncidentService { @@ -21,6 +23,11 @@ public class ElectronicFenceServiceImpl implements IncidentService { @Override public void incident(CoupletMsgData coupletMsgData) { + log.info("电子围栏事件开始......."); + log.info("电子围栏事件结束......."); + + + } /** diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java index c9bd875..971e428 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/service/impl/RealTimeDataServiceImpl.java @@ -2,6 +2,7 @@ package com.couplet.analyze.msg.service.impl; import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.analyze.msg.service.IncidentService; +import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; /** @@ -10,6 +11,7 @@ import org.springframework.stereotype.Service; * @Description: 实时数据事件 */ @Service("real-time-data") +@Log4j2 public class RealTimeDataServiceImpl implements IncidentService { /** @@ -20,6 +22,9 @@ public class RealTimeDataServiceImpl implements IncidentService { @Override public void incident(CoupletMsgData coupletMsgData) { + log.info("实时数据事件开始....."); + log.info("实时数据事件结束....."); + } /** diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/DLXQueueUtil.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/DLXQueueUtil.java deleted file mode 100644 index 5f55310..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/DLXQueueUtil.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.couplet.analyze.msg.utils; - -import org.springframework.amqp.core.Binding; -import org.springframework.amqp.core.BindingBuilder; -import org.springframework.amqp.core.DirectExchange; -import org.springframework.amqp.core.Queue; -import org.springframework.amqp.rabbit.core.RabbitAdmin; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; - -@Component -public class DLXQueueUtil { - // routingKey - private static final String DEAD_ROUTING_KEY = "dead.routingkey"; - private static final String ROUTING_KEY = "routingkey"; - private static final String DEAD_EXCHANGE = "dead.exchange"; - private static final String EXCHANGE = "common.exchange"; - @Autowired - RabbitTemplate rabbitTemplate; - @Resource - RabbitAdmin rabbitAdmin; - /** - * 发送死信队列，过期后进入死信交换机，进入死信队列 - * @param queueName 队列名称 - * @param deadQueueName 死信队列名称 - * @param params 消息内容 - * @param expiration 过期时间 毫秒 - */ - public void sendDLXQueue(String queueName, String deadQueueName, Object params, Integer expiration){ - /** - * ----------------------------------先创建一个ttl队列和死信队列-------------------------------------------- - */ - Map map = new HashMap<>(); - // 队列设置存活时间，单位ms, 必须是整形数据。 - map.put("x-message-ttl",expiration); - // 设置死信交换机 - map.put("x-dead-letter-exchange",DEAD_EXCHANGE); - // 设置死信交换器路由 - map.put("x-dead-letter-routing-key", DEAD_ROUTING_KEY); - /*参数1：队列名称  参数2：持久化  参数3：是否排他 参数4：自动删除队列  参数5：队列参数*/ - Queue queue = new Queue(queueName, true, false, false, map); - rabbitAdmin.declareQueue(queue); - /** - * ---------------------------------创建交换机--------------------------------------------- - */ - DirectExchange directExchange = new DirectExchange(EXCHANGE, true, false); - rabbitAdmin.declareExchange(directExchange); - /** - * ---------------------------------队列绑定交换机--------------------------------------------- - */ - Binding binding = BindingBuilder.bind(queue).to(directExchange).with(ROUTING_KEY); - rabbitAdmin.declareBinding(binding); - /** - * ---------------------------------在创建一个死信交换机和队列，接收死信队列--------------------------------------------- - */ - DirectExchange deadExchange = new DirectExchange(DEAD_EXCHANGE, true, false); - rabbitAdmin.declareExchange(deadExchange); - - Queue deadQueue = new Queue(deadQueueName,true,false,false); - rabbitAdmin.declareQueue(deadQueue); - /** - * ---------------------------------队列绑定死信交换机--------------------------------------------- - */ - // 将队列和交换机绑定 - Binding deadbinding = BindingBuilder.bind(deadQueue).to(deadExchange).with(DEAD_ROUTING_KEY); - rabbitAdmin.declareBinding(deadbinding); - // 发送消息 - rabbitTemplate.convertAndSend(EXCHANGE,ROUTING_KEY,params); - } -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/DelayedQueueUtil.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/DelayedQueueUtil.java deleted file mode 100644 index d47c3ec..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/DelayedQueueUtil.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.couplet.analyze.msg.utils; - -import org.springframework.amqp.AmqpException; -import org.springframework.amqp.core.*; -import org.springframework.amqp.rabbit.core.RabbitAdmin; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; - -@Component -public class DelayedQueueUtil { - // routingKey - private static final String DELAYED_ROUTING_KEY = "delayed.routingkey"; - - // 延迟队列交换机 - private static final String DELAYED_EXCHANGE = "delayed.exchange"; - - @Autowired - RabbitTemplate rabbitTemplate; - - @Resource - RabbitAdmin rabbitAdmin; - - /** - * 发送延迟队列 - * - * @param queueName 队列名称 - * @param params 消息内容 - * @param expiration 延迟时间 毫秒 - */ - public void sendDelayedQueue(String queueName, Object params, Integer expiration) { - // 先创建一个队列 - Queue queue = new Queue(queueName); - rabbitAdmin.declareQueue(queue); - // 创建延迟队列交换机 - CustomExchange customExchange = createCustomExchange(); - rabbitAdmin.declareExchange(customExchange); - // 将队列和交换机绑定 - Binding binding = BindingBuilder.bind(queue).to(customExchange).with(DELAYED_ROUTING_KEY).noargs(); - rabbitAdmin.declareBinding(binding); - // 发送延迟消息 - rabbitTemplate.convertAndSend(DELAYED_EXCHANGE, DELAYED_ROUTING_KEY, params, message -> { - message.getMessageProperties().setDelay(expiration); - return message; - }); - } - - public CustomExchange createCustomExchange() { - Map arguments = new HashMap<>(); - /** - * 参数说明： - * 1.交换机的名称 - * 2.交换机的类型 - * 3.是否需要持久化 - * 4.是否自动删除 - * 5.其它参数 - */ - arguments.put("x-delayed-type", "direct"); - return new CustomExchange(DELAYED_EXCHANGE, "x-delayed-message", true, false, arguments); - } - -} - diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/MqttMonitor.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/MqttMonitor.java deleted file mode 100644 index 41891fa..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/MqttMonitor.java +++ /dev/null @@ -1,118 +0,0 @@ -package com.couplet.analyze.msg.utils; - -import lombok.extern.slf4j.Slf4j; -import org.eclipse.paho.client.mqttv3.*; -import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; - -/** - * @ProjectName: five-groups-couplet - * @Author: LiuYunHu - * @CreateTime: 2024/4/1 - * @Description: mqtt监听者 - */ - -@Component -@Slf4j -public class MqttMonitor { - /* - * 路径 - * */ - @Value("${mqtt.server.broker}") - private String broker; - - /* - * 主题 - * */ - @Value("${mqtt.server.topic}") - private String topic; - - /* - * 客户端id - * */ - @Value("${mqtt.server.clientId}") - private String clientId; - - /* - * 用户名 - * */ - @Value("${mqtt.server.username}") - private String userName; - - /* - * 密码 - * */ - @Value("${mqtt.server.password}") - private String password; - - /* - * 遗嘱消息qos - * */ - @Value("${mqtt.server.qos}") - private Integer qos; - - - //随项目启动而执行这个方法 - @PostConstruct - public void connect() { - log.info("mqtt监听者启动"); - try { - MqttClient client = new MqttClient(broker, clientId, new MemoryPersistence()); - - MqttConnectOptions options = new MqttConnectOptions(); - options.setUserName(userName); - options.setPassword(password.toCharArray()); - - //连接超时 - options.setConnectionTimeout(10); - - //心跳时间 - options.setKeepAliveInterval(60); - - log.info("mqtt监听者启动成功，连接到：{}", broker); - - client.connect(options); - log.info("连接成功！"); - - //设置回调 - client.setCallback(new MqttCallback() { - @Override - public void connectionLost(Throwable throwable) { - log.error("连接丢失：{}", throwable.getMessage()); - } - - @Override - public void messageArrived(String topic, MqttMessage mqttMessage) { -// log.info("消息已送达"); -// log.info("接收消息主题：{}",topic); -// log.info("接收消息qos：{}", mqttMessage.getQos()); - - //接收到的原始报文 - String message = new String(mqttMessage.getPayload()); - - log.info("接收消息原始内容：{}", message); - - //去除空格 得到16进制字符串 - String replaced = message.replaceAll(" ", ""); - log.info("接收消息剪切后内容：{}", replaced); - } - - @Override - public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { - log.info("消息发送成功！"); - } - }); - - client.subscribe(topic, qos); - - - } catch (MqttException e) { - log.error("mqtt监听者启动失败，{}", e.getMessage()); - throw new RuntimeException(e); - } - } - -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/TTLQueueUtil.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/TTLQueueUtil.java deleted file mode 100644 index bb08630..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/utils/TTLQueueUtil.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.couplet.analyze.msg.utils; - -import org.springframework.amqp.core.*; -import org.springframework.amqp.rabbit.core.RabbitAdmin; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; -import javax.annotation.Resource; -import java.util.HashMap; -import java.util.Map; -@Component -public class TTLQueueUtil { - // routingKey - private static final String TTL_KEY = "ttl.routingkey"; - private static final String TTL_EXCHANGE = "ttl.exchange"; - @Autowired - RabbitTemplate rabbitTemplate; - @Resource - RabbitAdmin rabbitAdmin; - /** - * 发送TTL队列 - * @param queueName 队列名称 - * @param params 消息内容 - * @param expiration 过期时间 毫秒 - */ - public void sendTtlQueue(String queueName, Object params, Integer expiration) { - /** - * ----------------------------------先创建一个ttl队列-------------------------------------------- - */ - Map map = new HashMap<>(); - // 队列设置存活时间，单位ms,必须是整形数据。 - map.put("x-message-ttl",expiration); - /*参数1：队列名称  参数2：持久化  参数3：是否排他 参数4：自动删除队列  参数5：队列参数*/ - Queue queue = new Queue(queueName,true,false,false,map); - rabbitAdmin.declareQueue(queue); - /** - * ---------------------------------创建交换机--------------------------------------------- - */ - DirectExchange directExchange = new DirectExchange(TTL_EXCHANGE, true, false); - rabbitAdmin.declareExchange(directExchange); - /** - * ---------------------------------队列绑定交换机--------------------------------------------- - */ - // 将队列和交换机绑定 - Binding binding = BindingBuilder.bind(queue).to(directExchange).with(TTL_KEY); - rabbitAdmin.declareBinding(binding); - // 发送消息 - rabbitTemplate.convertAndSend(TTL_EXCHANGE,TTL_KEY,params); - } -} diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml index c0b236f..bed4d26 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/bootstrap.yml @@ -15,11 +15,9 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 config: # 配置中心地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 # 配置文件格式 file-extension: yml # 共享配置 @@ -27,14 +25,32 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} main: allow-bean-definition-overriding: true + rabbitmq: + host: 39.103.133.57 + port: 5672 + username: guest + password: guest + virtual-host: / + publisher-confirm-type: correlated #确认消息已发送到交换机(Exchange) + publisher-returns: true #确认消息已发送到队列(Queue) + listener: + simple: + prefetch: 1 # 每次只能获取一条，处理完成才能获取下一条 + #acknowledge-mode: manual # 设置消费端手动ack确认 + retry: + enabled: true # 是否支持重试 + template: + # 只要消息抵达Queue，就会异步发送优先回调return firm + mandatory: true logging: level: com.couplet.analyze.msg.mapper: DEBUG mybatis-plus: configuration: map-underscore-to-camel-case: true + # RabbitMQ配置 -#mq: -# queueName: queue -# exchangeName: exchange -# routingKey: routingKey +mq: + queueName: queue + exchangeName: exchange + routingKey: routingKey diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/incident/SysIncidentMapper.xml b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/incident/SysIncidentMapper.xml index 2e8d8a1..3b863a6 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/incident/SysIncidentMapper.xml +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/incident/SysIncidentMapper.xml @@ -6,7 +6,7 @@ - INSERT INTO `vehicle-resolver`.`resolver_report_data` + INSERT INTO `couplet-cloud`.`couplet_msg_data` (`vin`, `create_time`, `longitude`, `latitude`, `speed`, `mileage`, `voltage`, `current`, `resistance`, `gear`, `acceleration_pedal`, `fuel_consumption_rate`, diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/msg/SysMsgMapper.xml b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/msg/SysMsgMapper.xml deleted file mode 100644 index 7e187be..0000000 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/resources/mapper/msg/SysMsgMapper.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml b/couplet-modules/couplet-business/pom.xml similarity index 88% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml rename to couplet-modules/couplet-business/pom.xml index 0dbec53..cc7969f 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/pom.xml +++ b/couplet-modules/couplet-business/pom.xml @@ -5,25 +5,22 @@ 4.0.0 com.couplet - couplet-electronic-fence + couplet-modules 3.6.3 - couplet-electronic-fence-server + couplet-business 17 17 UTF-8 - com.couplet - couplet-electronic-fence-common + couplet-common-business - - com.alibaba.cloud @@ -48,7 +45,6 @@ spring-boot-starter-actuator - io.springfox @@ -85,14 +81,6 @@ com.couplet couplet-common-swagger - - com.couplet - couplet-common-system - - - org.apache.kafka - kafka-clients - @@ -121,5 +109,4 @@ - diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/CoupletElectronicFenceApplication.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java similarity index 55% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/CoupletElectronicFenceApplication.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/CoupletBusinessApplication.java index 2f3466e..e0beabf 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/CoupletElectronicFenceApplication.java +++ b/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 couplet + * @Author: LiJiaYao + * @Date: 2024/4/3 + * @Description: 业务实现启动类 */ @EnableCustomConfig @EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class CoupletElectronicFenceApplication { +@EnableMyFeignClients(basePackages = ("com.couplet")) +@SpringBootApplication(scanBasePackages = {"com.couplet"}) +public class CoupletBusinessApplication { public static void main (String[] args) { - SpringApplication.run(CoupletElectronicFenceApplication.class, args); + SpringApplication.run(CoupletBusinessApplication.class, args); } + } diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/EmployeeController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/EmployeeController.java similarity index 95% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/EmployeeController.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/EmployeeController.java index c06e2c9..d6dd5d1 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/EmployeeController.java +++ b/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.*; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/FenceController.java similarity index 89% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/FenceController.java index 6c9227b..5f38304 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/FenceController.java +++ b/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.*; @@ -83,7 +83,7 @@ public class FenceController extends BaseController { @DeleteMapping("/{fenceId}") @RequiresPermissions("couplet:fence:fenceDelete") @Log(title = "电子围栏删除",businessType = BusinessType.DELETE) - public Result fenceDelete(@PathVariable Long fenceId){ + public Result fenceDelete(@PathVariable Long fenceId){ fenceService.removeByFenceId(fenceId); return Result.success(); } diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/LogoController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/LogoController.java similarity index 69% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/LogoController.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/LogoController.java index 4aac884..38d382b 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/controller/LogoController.java +++ b/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.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletRequest; import java.util.List; /** diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/ManageController.java similarity index 96% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/ManageController.java index 443a909..c78395b 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/controller/ManageController.java +++ b/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.*; diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java similarity index 87% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/SysTroubleController.java index 9db2dc2..38f9a64 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/controller/SysTroubleController.java +++ b/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.*; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleController.java similarity index 74% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleController.java index 655dc34..ad24025 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleController.java @@ -1,15 +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.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; @@ -60,7 +60,7 @@ public class VehicleController extends BaseController { @RequiresPermissions("couplet:vehicle:deleteById") @GetMapping("/deleteById/{vehicleId}") @Log(title = "删除车辆", businessType = BusinessType.DELETE) - public Result deleteById(@PathVariable Long vehicleId) { + public Result deleteById(@PathVariable Long vehicleId) { String result = vehicleService.deleteById(vehicleId); return Result.success(result); @@ -77,7 +77,7 @@ public class VehicleController extends BaseController { @RequiresPermissions("couplet:vehicle:editById") @PostMapping("/editById") @Log(title = "编辑车辆", businessType = BusinessType.UPDATE) - public Result editById(@RequestBody VehicleEditParams editParams) { + public Result editById(@RequestBody VehicleEditParams editParams) { String result = vehicleService.editById(editParams); @@ -94,7 +94,7 @@ public class VehicleController extends BaseController { @RequiresPermissions("couplet:vehicle:insert") @PostMapping("/insert") @Log(title = "新增车辆", businessType = BusinessType.INSERT) - public Result insert(@RequestBody @Validated VehicleInsertParams insertParams) { + public Result insert(@RequestBody @Validated VehicleInsertParams insertParams) { System.out.println(insertParams); String result = vehicleService.insert(insertParams); @@ -111,11 +111,26 @@ public class VehicleController extends BaseController { **/ @RequiresPermissions("couplet:vehicle:list") @GetMapping("/getBindLogoById/{vehicleId}") - public Result getBindLogoById(@PathVariable("vehicleId") Long vehicleId) { + public Result> getBindLogoById(@PathVariable("vehicleId") Long vehicleId) { List bindLogoById = vehicleService.getBindLogoById(vehicleId); return Result.success(bindLogoById); } + + + /* + * @Author: LiuYunHu + * @Date: 2024/4/2 15:35 + * @Description: 通过vin码查询车辆 + * @Param: [vin] + * @Return: com.couplet.common.core.domain.Result> + **/ + @GetMapping("/findByVIN/{vin}") + public Result> findByVIN(@PathVariable("vin") String vin) { + List list = vehicleService.findByVIN(vin); + + return Result.success(list); + } } diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleManageController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleManageController.java new file mode 100644 index 0000000..0a35b96 --- /dev/null +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleManageController.java @@ -0,0 +1,73 @@ +package com.couplet.business.server.controller; + +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 io.swagger.v3.oas.annotations.parameters.RequestBody; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @author fufanrui + * @version 1.0 + * @description: 车辆管理控制层 + * @date 2024/4/2 9:05 + */ +@RestController +@RequestMapping("/VehicleManage") +public class VehicleManageController { + + + @Autowired + private VehicleManageService vehicleManageService; + + /* + * @param : + * @return Result> + * @author 付凡芮 + * @description Y管理车辆列表 + * @date + */ + @PostMapping("/VehicleManageList") + public Result> VehicleManageList(){ + List vehicles = vehicleManageService.VehicleManageList(); + Result> success = Result.success(vehicles); + return success; + } + /* + * @param middleId: + * @return Result + * @author 付凡芮 + * @description 删除员工管理的车辆 + * @date + */ + + @DeleteMapping("/{middleId}") + public Result deleteVehicle(@PathVariable(value = "middleId") Long middleId){ + return vehicleManageService.deleteVehicle(middleId); + } + + + /* + * @param middle: + * @return Result + * @author 付凡芮 + * @description 添加车辆 + * @date + */ + @PostMapping + public Result addVehicle(@RequestBody VehicleMiddle middle){ + return vehicleManageService.addVehicle(middle); + } + + + @PostMapping("vehicleAll") + public Result> vehicleAll(){ + List vehicles = vehicleManageService.vehicleAll(); + return Result.success(vehicles); + } + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleTypeController.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleTypeController.java similarity index 86% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleTypeController.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/controller/VehicleTypeController.java index 33ca5db..5ded139 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleTypeController.java +++ b/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; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenAndLogoMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenAndLogoMapper.java similarity index 83% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenAndLogoMapper.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenAndLogoMapper.java index 42ff9a6..32c0b46 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenAndLogoMapper.java +++ b/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; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenceMapper.java similarity index 67% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenceMapper.java index 2623be8..01c30c8 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/FenceMapper.java +++ b/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.map.common.domain.request.FenceRequest; -import com.couplet.map.common.domain.request.FenceUpdateRequest; + +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 org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -19,7 +20,7 @@ public interface FenceMapper extends BaseMapper { * 改变围栏信息 * @param fenceUpdateRequest */ - void changeFence(FenceUpdateRequest fenceUpdateRequest); + void changeFence(FenceUpdateRequest fenceUpdateRequest); int insertFence(FenceRequest fenceRequest); diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/LogoMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/LogoMapper.java similarity index 53% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/LogoMapper.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/LogoMapper.java index 0ae5445..caad6fc 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/mapper/LogoMapper.java +++ b/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.map.common.domain.Logo; -import com.couplet.map.common.domain.request.FenceUpdateRequest; +import com.couplet.common.domain.Logo; import org.apache.ibatis.annotations.Mapper; /** diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java similarity index 69% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/SysTroubleMapper.java index e447574..7f211bd 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/mapper/SysTroubleMapper.java +++ b/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.trouble.domain.CoupletTroubleGrade; -import com.couplet.trouble.domain.CoupletTroubleType; -import com.couplet.trouble.domain.resp.TroubleResp; +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 org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleAndLogoMapper.java similarity index 87% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleAndLogoMapper.java index aff8454..e917c7d 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleAndLogoMapper.java +++ b/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; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleMapper.java similarity index 50% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleMapper.java index 264e973..2f3a903 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleMapper.java @@ -1,10 +1,13 @@ -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.common.domain.VehicleMiddle; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; +import java.util.List; + /** * @ProjectName: five-groups-couplet * @Author: LiuYunHu @@ -14,4 +17,11 @@ import org.springframework.stereotype.Component; @Mapper @Component public interface VehicleMapper extends BaseMapper { + List UserUnderTheVehicleList(Long userId); + + Integer deleteVehicle(Long middleId); + + Integer addVehicle(VehicleMiddle vehicleMiddle); + + List vehicleAll(); } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleTypeMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleTypeMapper.java similarity index 74% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleTypeMapper.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleTypeMapper.java index 4e406bc..aec2781 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleTypeMapper.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/VehicleTypeMapper.java @@ -1,8 +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.Vehicle; -import com.couplet.vehicle.domain.VehicleType; +import com.couplet.common.domain.VehicleType; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Component; diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/EmployeeService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/EmployeeService.java similarity index 90% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/EmployeeService.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/EmployeeService.java index b30cc38..1440a1c 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/EmployeeService.java +++ b/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; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenAndLogoService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenAndLogoService.java similarity index 78% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenAndLogoService.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenAndLogoService.java index bc530f6..f2517f5 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenAndLogoService.java +++ b/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 diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenceService.java similarity index 69% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenceService.java index 67b7cf9..8a05254 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/FenceService.java +++ b/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.map.common.domain.request.FenceConfig; -import com.couplet.map.common.domain.request.FenceRequest; -import com.couplet.map.common.domain.request.FenceUpdateRequest; +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 javax.servlet.http.HttpServletRequest; import java.util.List; @@ -27,7 +27,7 @@ public interface FenceService extends IService { * * @param fenceRequest */ - void fenceInsert(HttpServletRequest request,FenceRequest fenceRequest); + void fenceInsert(HttpServletRequest request, FenceRequest fenceRequest); /** * 删除电子围栏 diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/LogoService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/LogoService.java similarity index 72% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/LogoService.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/LogoService.java index 7639057..c34afba 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/LogoService.java +++ b/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; diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/ManageServer.java similarity index 79% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/ManageServer.java index 7d5be72..fc9bdfa 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/ManageServer.java +++ b/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; diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java similarity index 69% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/SysTroubleService.java index abf803f..5018464 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/SysTroubleService.java +++ b/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.trouble.domain.CoupletTroubleGrade; -import com.couplet.trouble.domain.CoupletTroubleType; -import com.couplet.trouble.domain.resp.TroubleResp; +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 java.util.List; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleAndLogoService.java similarity index 81% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleAndLogoService.java index 1e15138..306bb6e 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleAndLogoService.java +++ b/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; diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleManageService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleManageService.java new file mode 100644 index 0000000..7f611e1 --- /dev/null +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleManageService.java @@ -0,0 +1,20 @@ +package com.couplet.business.server.service; + + +import com.couplet.common.core.domain.Result; +import com.couplet.common.domain.Vehicle; +import com.couplet.common.domain.VehicleMiddle; + +import java.util.List; + +public interface VehicleManageService { + List VehicleManageList(); + + + Result deleteVehicle(Long middleId); + + Result addVehicle(VehicleMiddle middle); + + List vehicleAll(); + +} diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleService.java new file mode 100644 index 0000000..954fe8b --- /dev/null +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleService.java @@ -0,0 +1,40 @@ +package com.couplet.business.server.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.couplet.common.domain.Vehicle; +import com.couplet.common.domain.VehicleMiddle; +import com.couplet.common.domain.request.VehicleEditParams; +import com.couplet.common.domain.request.VehicleInsertParams; +import com.couplet.common.domain.request.VehicleListParams; + +import java.util.List; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/26 + * @Description: 车辆服务 + */ + +public interface VehicleService extends IService { + List list(VehicleListParams listParams); + + String deleteById(Long vehicleId); + + String editById(VehicleEditParams editParams); + + String insert(VehicleInsertParams insertParams); + + List getBindLogoById(Long vehicleId); + + List findByVIN(String vin); + + List UserUnderTheVehicleList(Long userId); + + Integer deleteVehicle(Long middleId); + + Integer addVehicle(VehicleMiddle vehicleMiddle); + + List vehicleAll(); + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleTypeService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleTypeService.java similarity index 77% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleTypeService.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/VehicleTypeService.java index b92b896..52971f5 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/VehicleTypeService.java +++ b/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; diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/EmployeeServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/EmployeeServiceImpl.java similarity index 89% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/EmployeeServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/EmployeeServiceImpl.java index faeacc6..fc5a2c7 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/EmployeeServiceImpl.java +++ b/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 @@ -91,6 +91,14 @@ public class EmployeeServiceImpl implements EmployeeService{ return remoteEmployeeService.changeStatus(user); } + + /* + * @param user: + * @return List + * @author 付凡芮 + * @description 员工管理列表 + * @date + */ @Override public List userList(SysUser user) { String username = SecurityUtils.getUsername(); diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenAndLogoServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenAndLogoServiceImpl.java similarity index 80% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenAndLogoServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenAndLogoServiceImpl.java index 1c8f347..f8877ce 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenAndLogoServiceImpl.java +++ b/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.map.server.mapper.FenAndLogoMapper; -import com.couplet.map.server.service.FenAndLogoService; +import com.couplet.business.server.mapper.FenAndLogoMapper; +import com.couplet.business.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; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java similarity index 78% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java index 5d39192..732e658 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/FenceServiceImpl.java +++ b/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.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.mapper.FenceMapper; -import com.couplet.map.server.service.FenAndLogoService; -import com.couplet.map.server.service.FenceService; +import com.couplet.business.server.mapper.FenceMapper; +import com.couplet.business.server.service.FenAndLogoService; +import com.couplet.business.server.service.FenceService; +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 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 implements * @param fenceRequest */ @Override - public void fenceInsert(HttpServletRequest request,FenceRequest fenceRequest) { + public void fenceInsert(HttpServletRequest request, FenceRequest fenceRequest) { //先添加围栏 int a= fenceMapper.insertFence(fenceRequest); diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/LogoServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/LogoServiceImpl.java similarity index 65% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/LogoServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/LogoServiceImpl.java index b95eea9..aa7beec 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/java/com/couplet/map/server/service/impl/LogoServiceImpl.java +++ b/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.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.mapper.LogoMapper; -import com.couplet.map.server.service.LogoService; +import com.couplet.business.server.mapper.LogoMapper; +import com.couplet.business.server.service.LogoService; +import com.couplet.common.domain.Logo; 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; /** diff --git a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/ManageServiceImpl.java similarity index 89% rename from couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/ManageServiceImpl.java index 33f2bf5..2c0281d 100644 --- a/couplet-modules/couplet-enterprisemanagement/couplet-enterprisemanagement-server/src/main/java/com/couplet/server/service/impl/ManageServiceImpl.java +++ b/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; diff --git a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java similarity index 80% rename from couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/SysTroubleServiceImpl.java index 5fc5d79..48c34bb 100644 --- a/couplet-modules/couplet-trouble/src/main/java/com/couplet/trouble/service/impl/SysTroubleServiceImpl.java +++ b/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.trouble.domain.CoupletTroubleGrade; -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.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.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 implements SysTroubleService{ +public class SysTroubleServiceImpl extends ServiceImpl implements SysTroubleService { @Autowired private SysTroubleMapper sysTroubleMapper; diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleAndLogoServiceImpl.java similarity index 88% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleAndLogoServiceImpl.java index e5e5a5e..6fa20bc 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleAndLogoServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleAndLogoServiceImpl.java @@ -1,14 +1,13 @@ -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.vehicle.mapper.VehicleAndLogoMapper; -import com.couplet.vehicle.service.VehicleAndLogoService; +import com.couplet.business.server.mapper.VehicleAndLogoMapper; +import com.couplet.business.server.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; -import java.util.ArrayList; import java.util.List; /** diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleManageServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleManageServiceImpl.java new file mode 100644 index 0000000..fa3c412 --- /dev/null +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleManageServiceImpl.java @@ -0,0 +1,78 @@ +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.remote.RemoteVehicleService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @author fufanrui + * @version 1.0 + * @description: 车辆管理服务实现类 + * @date 2024/4/2 9:05 + */ +@Service +public class VehicleManageServiceImpl implements VehicleManageService { + + + @Autowired + private RemoteVehicleService remoteVehicleService; + + /* + * @description: 车辆管理列表 + * @param: [] + * @return: com.couplet.common.core.domain.Result> + */ + @Override + public List VehicleManageList() { + Long userId = SecurityUtils.getUserId(); + Result> listResult = remoteVehicleService.UserUnderTheVehicleList(userId); + List list = listResult.getData(); + return list; + } + + /* + * @param middleId: + * @return Result + * @author 付凡芮 + * @description 删除员工管理车辆 + * @date + */ + @Override + public Result deleteVehicle(Long middleId) { + Result integerResult = remoteVehicleService.deleteVehicle(middleId); + Integer resultData = integerResult.getData(); + + return resultData==1?Result.success():Result.error("删除失败"); + } + + /* + * @param middle: + * @return Result + * @author 付凡芮 + * @description 添加车辆 + * @date + */ + @Override + public Result addVehicle(VehicleMiddle middle) { + Long userId = SecurityUtils.getUserId(); + middle.setUserId(userId); + Result integerResult = remoteVehicleService.addVehicle(middle); + Integer resultData = integerResult.getData(); + return resultData==1?Result.success():Result.error("添加失败"); + } + + @Override + public List vehicleAll() { + Result> listResult = remoteVehicleService.VehicleManageList(); + return listResult.getData(); + } + + +} diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java similarity index 78% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java index 12e7591..1ee5a95 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java @@ -1,20 +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.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.mapper.VehicleMapper; -import com.couplet.vehicle.service.VehicleAndLogoService; -import com.couplet.vehicle.service.VehicleService; -import com.couplet.vehicle.service.VehicleTypeService; -import com.couplet.vehicle.utils.SnowflakeIdGenerator; +import com.couplet.common.core.utils.uuid.UUID; +import com.couplet.common.domain.Vehicle; +import com.couplet.common.domain.VehicleMiddle; +import com.couplet.common.domain.VehicleType; +import com.couplet.common.domain.request.VehicleEditParams; +import com.couplet.common.domain.request.VehicleInsertParams; +import com.couplet.common.domain.request.VehicleListParams; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -187,6 +188,14 @@ public class VehicleServiceImpl extends ServiceImpl impl } + //UUID生成17位随机字符串 + UUID uuid = UUID.randomUUID(); + String string = uuid.toString(); + String s = string.replaceAll("-", ""); + String vin = s.substring(0, 17); +// System.out.println(vin+" "+vin.length()); + + /* //雪花算法生成随机数 SnowflakeIdGenerator idGenerator = new SnowflakeIdGenerator(1, 1); long randomId = idGenerator.nextId(); @@ -196,6 +205,8 @@ public class VehicleServiceImpl extends ServiceImpl impl //切割，只留后17位 vin = vin.substring(vin.length() - 17); + */ + //创建入参对象 Vehicle vehicle = new Vehicle(); @@ -243,4 +254,46 @@ public class VehicleServiceImpl extends ServiceImpl impl return logoIds; } + /* + * @param userId: + * @return List + * @author 付凡芮 + * @description 根据登入人id查询管理车辆 + * + */ + @Override + public List UserUnderTheVehicleList(Long userId) { + return vehicleMapper.UserUnderTheVehicleList(userId); + } + + @Override + public Integer deleteVehicle(Long middleId) { + return vehicleMapper.deleteVehicle(middleId); + } + + @Override + public Integer addVehicle(VehicleMiddle vehicleMiddle) { + + return vehicleMapper.addVehicle(vehicleMiddle); + } + + @Override + public List vehicleAll() { + return vehicleMapper.vehicleAll(); + } + + @Override + public List findByVIN(String vin) { + + //创建查询条件包装器 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + + if (!StringUtils.isEmpty(vin)) { + queryWrapper.eq(Vehicle::getVin, vin); + } + + //执行查询 + return this.list(queryWrapper); + } + } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleTypeServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleTypeServiceImpl.java similarity index 80% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleTypeServiceImpl.java rename to couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleTypeServiceImpl.java index 4fc867f..046d002 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/VehicleTypeServiceImpl.java +++ b/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.vehicle.mapper.VehicleTypeMapper; -import com.couplet.vehicle.service.VehicleTypeService; +import com.couplet.business.server.mapper.VehicleTypeMapper; +import com.couplet.business.server.service.VehicleTypeService; +import com.couplet.common.domain.VehicleType; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml similarity index 94% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml rename to couplet-modules/couplet-business/src/main/resources/bootstrap.yml index 770cb7e..cf4e9b6 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml @@ -6,7 +6,7 @@ server: spring: application: # 应用名称 - name: couplet-electronic-fence + name: couplet-business profiles: # 环境配置 diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml b/couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml similarity index 84% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml rename to couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml index 7ff788a..7213b1e 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenAndLogoMapper.xml +++ b/couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -15,7 +15,7 @@ - + diff --git a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml b/couplet-modules/couplet-business/src/main/resources/mapper/business/FenceMapper.xml similarity index 87% rename from couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml rename to couplet-modules/couplet-business/src/main/resources/mapper/business/FenceMapper.xml index 0cf782d..e769293 100644 --- a/couplet-modules/couplet-electronic-fence/couplet-electronic-fence-server/src/main/resources/mapper/map/FenceMapper.xml +++ b/couplet-modules/couplet-business/src/main/resources/mapper/business/FenceMapper.xml @@ -2,9 +2,9 @@ - + - + @@ -15,7 +15,7 @@ - + @@ -52,7 +52,7 @@ alarm_status FROM couplet_fence_info - INSERT INTO `couplet-cloud`.`couplet_fence_info` (`fence_name`, `fence_longitude_latitude`, `fence_description`, `is_delete`, `fence_state`, `create_time`, @@ -63,7 +63,7 @@ - + UPDATE `couplet-cloud`.`couplet_fence_info` SET `fence_name` = #{fenceName}, @@ -81,7 +81,7 @@ delete from couplet_fence_info where fence_id = #{fenceId} + - select * from couplet_trouble_type - select * from couplet_trouble_grade diff --git a/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml b/couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleAndLogoMapper.xml similarity index 90% rename from couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml rename to couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleAndLogoMapper.xml index 854c18e..e8985ae 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleAndLogoMapper.xml +++ b/couplet-modules/couplet-business/src/main/resources/mapper/business/VehicleAndLogoMapper.xml @@ -2,7 +2,7 @@ - +