From b9764dc297a68694b9d5f93674345453b9c6122a Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Thu, 28 Mar 2024 21:53:50 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E6=A8=A1=E5=9D=97=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E8=A7=84=E8=8C=83=E6=9B=B4=E6=AD=A3=EF=BC=8C=E6=96=B0?= =?UTF-8?q?=E5=BB=BAMqtt=E6=9C=8D=E5=8A=A1=EF=BC=8C=E5=B9=B6=E6=B5=8B?= =?UTF-8?q?=E8=AF=95=E8=BF=9E=E6=8E=A5=EF=BC=8C=E6=8E=A7=E5=88=B6=E5=8F=B0?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E6=8E=A5=E5=8F=97=E7=9A=84=E6=8A=A5=E6=96=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-modules/couplet-modules-mqtt/pom.xml | 120 ++++++++++++++++++ .../com/couplet/mqtt/LyhMqttxApplatcaion.java | 26 ++++ .../com/couplet/mqtt/controller/Test.java | 51 ++++++++ .../com/couplet/mqtt/mapper/MqttMapper.java | 15 +++ .../com/couplet/mqtt/service/MqttService.java | 12 ++ .../couplet/mqtt/service/impl/MqttListen.java | 108 ++++++++++++++++ .../mqtt/service/impl/MqttServiceImpl.java | 16 +++ .../src/main/resources/banner.txt | 2 + .../src/main/resources/bootstrap.yml | 40 ++++++ .../src/main/resources/logback.xml | 74 +++++++++++ .../resources/mapper/mqtt/MqttMapper.xml} | 2 +- ...on.java => CoupletVehicleApplication.java} | 5 +- ...Controller.java => VehicleController.java} | 14 +- ...EditParams.java => VehicleEditParams.java} | 2 +- ...rtParams.java => VehicleInsertParams.java} | 2 +- ...ListParams.java => VehicleListParams.java} | 2 +- ...hVehicleMapper.java => VehicleMapper.java} | 2 +- .../vehicle/service/LyhVehicleService.java | 12 +- .../service/impl/LyhVehicleServiceImpl.java | 18 +-- .../mapper/vehicle/VehicleMapper.xml | 8 ++ couplet-modules/pom.xml | 1 + 21 files changed, 503 insertions(+), 29 deletions(-) create mode 100644 couplet-modules/couplet-modules-mqtt/pom.xml create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml create mode 100644 couplet-modules/couplet-modules-mqtt/src/main/resources/logback.xml rename couplet-modules/{couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml => couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml} (73%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/{LyhVehicleApplication.java => CoupletVehicleApplication.java} (77%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/{LyhVehicleController.java => VehicleController.java} (83%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/{LyhVehicleEditParams.java => VehicleEditParams.java} (95%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/{LyhVehicleInsertParams.java => VehicleInsertParams.java} (96%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/{LyhVehicleListParams.java => VehicleListParams.java} (93%) rename couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/{LyhVehicleMapper.java => VehicleMapper.java} (84%) create mode 100644 couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/VehicleMapper.xml diff --git a/couplet-modules/couplet-modules-mqtt/pom.xml b/couplet-modules/couplet-modules-mqtt/pom.xml new file mode 100644 index 0000000..66187c1 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/pom.xml @@ -0,0 +1,120 @@ + + + 4.0.0 + + com.couplet + couplet-modules + 3.6.3 + + + couplet-modules-mqtt + + + + + + + + + couplet-modules-mqttx获取报文模块 + + + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + io.springfox + springfox-swagger-ui + ${swagger.fox.version} + + + + + com.mysql + mysql-connector-j + + + + + com.couplet + couplet-common-datasource + + + + + com.couplet + couplet-common-datascope + + + + + com.couplet + couplet-common-log + + + + + com.couplet + couplet-common-swagger + + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + + + + + + ${project.artifactId} + + + org.springframework.boot + spring-boot-maven-plugin + + + + repackage + + + + + + + org.apache.maven.plugins + maven-deploy-plugin + + true + + + + + diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java new file mode 100644 index 0000000..02986b8 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/LyhMqttxApplatcaion.java @@ -0,0 +1,26 @@ +package com.couplet.mqtt; + +import com.couplet.common.security.annotation.EnableCustomConfig; +import com.couplet.common.security.annotation.EnableMyFeignClients; +import com.couplet.common.swagger.annotation.EnableCustomSwagger2; +import com.couplet.mqtt.service.impl.MqttListen; +import lombok.extern.slf4j.Slf4j; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +/** + * @ProjectName: Default (Template) Project + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ +@EnableCustomConfig +@EnableCustomSwagger2 +@EnableMyFeignClients +@SpringBootApplication +public class LyhMqttxApplatcaion { + public static void main(String[] args) { + SpringApplication.run(LyhMqttxApplatcaion.class, args); + System.out.println("获取报文模块启动成功"); + } +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java new file mode 100644 index 0000000..11f75ca --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/controller/Test.java @@ -0,0 +1,51 @@ +package com.couplet.mqtt.controller; + +import org.eclipse.paho.client.mqttv3.*; +import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ + +public class Test { + public static void main(String[] args) { + String broker = "tcp://115.159.47.13:1883"; + String clientId = "JavaMqttSubscriber"; + String topic = "test"; // 替换成您要订阅的主题 + + try { + MqttClient client = new MqttClient(broker, clientId, new MemoryPersistence()); + MqttConnectOptions connOpts = new MqttConnectOptions(); + connOpts.setCleanSession(true); + + System.out.println("Connecting to broker: " + broker); + client.connect(connOpts); + System.out.println("Connected"); + + client.setCallback(new MqttCallback() { + @Override + public void connectionLost(Throwable cause) { + System.out.println("Connection lost"); + } + + @Override + public void messageArrived(String topic, MqttMessage message) throws Exception { + System.out.println("Received message: " + new String(message.getPayload())); + } + + @Override + public void deliveryComplete(IMqttDeliveryToken token) { + } + }); + + client.subscribe(topic); + System.out.println("Subscribed to topic: " + topic); + } catch (MqttException e) { + e.printStackTrace(); + } + } +} + diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java new file mode 100644 index 0000000..c9c07e3 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/mapper/MqttMapper.java @@ -0,0 +1,15 @@ +package com.couplet.mqtt.mapper; + +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Component; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ +@Component +@Mapper +public interface MqttMapper { +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java new file mode 100644 index 0000000..68277a7 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/MqttService.java @@ -0,0 +1,12 @@ +package com.couplet.mqtt.service; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ + +public interface MqttService { + +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java new file mode 100644 index 0000000..b519726 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttListen.java @@ -0,0 +1,108 @@ +package com.couplet.mqtt.service.impl; + +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/3/28 + * @Description: mqtt客户端 + */ +@Component +@Slf4j +public class MqttListen { + /* + * 路径 + * */ + @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() { + System.out.println("监听者启动"); + try { + + MqttClient client = new MqttClient(BROKER, CLIENTID, new MemoryPersistence()); + MqttConnectOptions options = new MqttConnectOptions(); + options.setUserName(USERNAME); + options.setPassword(PASSWORD.toCharArray()); + + //连接超时 + options.setConnectionTimeout(60); + + //心跳 + options.setKeepAliveInterval(60); + + log.info("连接到："+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 message) throws Exception { + log.info("消息到达"); + log.info("接收消息主题：" + topic); + log.info("接收消息Qos：" + message.getQos()); + log.info("接收消息内容：" + new String(message.getPayload())); + + } + + @Override + public void deliveryComplete(IMqttDeliveryToken token) { + log.info("消息发送成功----------" + token.isComplete()); + } + }); + client.subscribe(TOPIC, QOS); + + + } catch (MqttException e) { + throw new RuntimeException(e); + } + + } +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java new file mode 100644 index 0000000..d1372ef --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/java/com/couplet/mqtt/service/impl/MqttServiceImpl.java @@ -0,0 +1,16 @@ +package com.couplet.mqtt.service.impl; + +import com.couplet.mqtt.service.MqttService; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +/** + * @ProjectName: five-groups-couplet + * @Author: LiuYunHu + * @CreateTime: 2024/3/28 + * @Description: + */ +@Service +@Slf4j +public class MqttServiceImpl implements MqttService { +} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt b/couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml new file mode 100644 index 0000000..d74e389 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/resources/bootstrap.yml @@ -0,0 +1,40 @@ +# Tomcat +server: + port: 9616 + +# Spring +spring: + application: + # 应用名称 + name: couplet-mqtt + profiles: + # 环境配置 + active: dev + cloud: + nacos: + discovery: + # 服务注册地址 + server-addr: 121.89.211.230:8848 + namespace: 172469 + config: + # 配置中心地址 + server-addr: 121.89.211.230:8848 + namespace: 172469 + # 配置文件格式 + file-extension: yml + # 共享配置 + shared-configs: + - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} +logging: + level: + com.couplet.system.mapper: DEBUG + +# 订阅端配置 +mqtt: + server: + broker: tcp://115.159.47.13:1883 + username: + password: + clientid: mqttx + qos: 0 + topic: test diff --git a/couplet-modules/couplet-modules-mqtt/src/main/resources/logback.xml b/couplet-modules/couplet-modules-mqtt/src/main/resources/logback.xml new file mode 100644 index 0000000..4940ee0 --- /dev/null +++ b/couplet-modules/couplet-modules-mqtt/src/main/resources/logback.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml b/couplet-modules/couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml similarity index 73% rename from couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml rename to couplet-modules/couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml index 99ffce9..5a70a2c 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/resources/mapper/vehicle/LyhVehicleMapper.xml +++ b/couplet-modules/couplet-modules-mqtt/src/main/resources/mapper/mqtt/MqttMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/CoupletVehicleApplication.java similarity index 77% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/CoupletVehicleApplication.java index 19937ef..813555c 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/LyhVehicleApplication.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/CoupletVehicleApplication.java @@ -16,8 +16,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication -public class LyhVehicleApplication { +public class CoupletVehicleApplication { public static void main(String[] args) { - SpringApplication.run(LyhVehicleApplication.class, args); + SpringApplication.run(CoupletVehicleApplication.class, args); + System.out.println("车辆管理模块启动成功"); } } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java similarity index 83% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java index f7900b8..284175a 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/LyhVehicleController.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/controller/VehicleController.java @@ -5,9 +5,9 @@ import com.couplet.common.core.web.controller.BaseController; import com.couplet.common.log.annotation.Log; import com.couplet.common.log.enums.BusinessType; import com.couplet.vehicle.domain.LyhVehicle; -import com.couplet.vehicle.domain.req.LyhVehicleEditParams; -import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; -import com.couplet.vehicle.domain.req.LyhVehicleListParams; +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.LyhVehicleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -22,7 +22,7 @@ import java.util.List; */ @RestController @RequestMapping("/vehicle") -public class LyhVehicleController extends BaseController { +public class VehicleController extends BaseController { @Autowired private LyhVehicleService lyhVehicleService; @@ -35,7 +35,7 @@ public class LyhVehicleController extends BaseController { **/ @PostMapping("/list") @Log(title = "车辆列表") - public Result list(@RequestBody LyhVehicleListParams listParams) { + public Result list(@RequestBody VehicleListParams listParams) { List List = lyhVehicleService.list(listParams); @@ -67,7 +67,7 @@ public class LyhVehicleController extends BaseController { **/ @PostMapping("/editById") @Log(title = "编辑车辆", businessType = BusinessType.UPDATE) - public Result editById(@RequestBody LyhVehicleEditParams editParams) { + public Result editById(@RequestBody VehicleEditParams editParams) { String result = lyhVehicleService.editById(editParams); @@ -83,7 +83,7 @@ public class LyhVehicleController extends BaseController { **/ @PostMapping("/insert") @Log(title = "新增车辆", businessType = BusinessType.INSERT) - public Result insert(@RequestBody LyhVehicleInsertParams insertParams) { + public Result insert(@RequestBody VehicleInsertParams insertParams) { String result = lyhVehicleService.insert(insertParams); diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java similarity index 95% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java index 7a99349..75f8c05 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleEditParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleEditParams.java @@ -16,7 +16,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class LyhVehicleEditParams { +public class VehicleEditParams { /* *车辆id * */ diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java similarity index 96% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java index 587a1fd..047c15b 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleInsertParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleInsertParams.java @@ -19,7 +19,7 @@ import javax.validation.constraints.NotNull; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class LyhVehicleInsertParams { +public class VehicleInsertParams { /* *车辆类型 diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java similarity index 93% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java index 382e5b6..7568e72 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/LyhVehicleListParams.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/domain/req/VehicleListParams.java @@ -15,7 +15,7 @@ import lombok.experimental.SuperBuilder; @SuperBuilder @AllArgsConstructor @NoArgsConstructor -public class LyhVehicleListParams { +public class VehicleListParams { /* *车辆类型 * */ diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java similarity index 84% rename from couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java rename to couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java index 2d2d712..adeb7bf 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/LyhVehicleMapper.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/mapper/VehicleMapper.java @@ -13,5 +13,5 @@ import org.springframework.stereotype.Component; */ @Mapper @Component -public interface LyhVehicleMapper extends BaseMapper { +public interface VehicleMapper extends BaseMapper { } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java index b230bd6..f5096e4 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/LyhVehicleService.java @@ -2,9 +2,9 @@ package com.couplet.vehicle.service; import com.baomidou.mybatisplus.extension.service.IService; import com.couplet.vehicle.domain.LyhVehicle; -import com.couplet.vehicle.domain.req.LyhVehicleEditParams; -import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; -import com.couplet.vehicle.domain.req.LyhVehicleListParams; +import com.couplet.vehicle.domain.req.VehicleEditParams; +import com.couplet.vehicle.domain.req.VehicleInsertParams; +import com.couplet.vehicle.domain.req.VehicleListParams; import java.util.List; @@ -16,11 +16,11 @@ import java.util.List; */ public interface LyhVehicleService extends IService { - List list(LyhVehicleListParams listParams); + List list(VehicleListParams listParams); String deleteById(Long vehicleId); - String editById(LyhVehicleEditParams editParams); + String editById(VehicleEditParams editParams); - String insert(LyhVehicleInsertParams insertParams); + String insert(VehicleInsertParams insertParams); } diff --git a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java index 14953f9..f401960 100644 --- a/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java +++ b/couplet-modules/couplet-modules-vehicle/src/main/java/com/couplet/vehicle/service/impl/LyhVehicleServiceImpl.java @@ -5,10 +5,10 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.couplet.common.core.utils.StringUtils; import com.couplet.vehicle.domain.LyhVehicle; -import com.couplet.vehicle.domain.req.LyhVehicleEditParams; -import com.couplet.vehicle.domain.req.LyhVehicleInsertParams; -import com.couplet.vehicle.domain.req.LyhVehicleListParams; -import com.couplet.vehicle.mapper.LyhVehicleMapper; +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.LyhVehicleService; import com.couplet.vehicle.utils.SnowflakeIdGenerator; import lombok.extern.slf4j.Slf4j; @@ -26,9 +26,9 @@ import java.util.List; @Service @Slf4j -public class LyhVehicleServiceImpl extends ServiceImpl implements LyhVehicleService { +public class LyhVehicleServiceImpl extends ServiceImpl implements LyhVehicleService { @Autowired - private LyhVehicleMapper lyhVehicleMapper; + private VehicleMapper lyhVehicleMapper; /* * @Author: LiuYunHu @@ -38,7 +38,7 @@ public class LyhVehicleServiceImpl extends ServiceImpl **/ @Override - public List list(LyhVehicleListParams listParams) { + public List list(VehicleListParams listParams) { // 创建查询条件包装器 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -95,7 +95,7 @@ public class LyhVehicleServiceImpl extends ServiceImpl updateWrapper = new UpdateWrapper<>(); @@ -140,7 +140,7 @@ public class LyhVehicleServiceImpl extends ServiceImpl + + + + + diff --git a/couplet-modules/pom.xml b/couplet-modules/pom.xml index 6b3c03b..272c64c 100644 --- a/couplet-modules/pom.xml +++ b/couplet-modules/pom.xml @@ -16,6 +16,7 @@ couplet-trouble couplet-electronic-fence couplet-modules-vehicle + couplet-modules-mqtt couplet-modules