From 69fb2a92b1a399205c7d8a66a6fa12e0ddb342be Mon Sep 17 00:00:00 2001 From: rouchen <3133657697@qq.com> Date: Tue, 18 Jun 2024 15:55:48 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E5=AE=8C=E5=96=84=E8=B4=9F=E8=BD=BD?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/car/config/InitConnectWeight.java | 16 +++++----------- .../com/car/controller/ConnectController.java | 9 +++------ .../{loadenter => car}/LoadEnterNumber.java | 2 +- .../com/car/demos/{loadenter => car}/Node.java | 2 +- src/main/java/com/car/mapper/ConnerMapper.java | 4 ++-- .../java/com/car/service/ConnectService.java | 4 ++-- .../com/car/service/impl/ConnectServiceImpl.java | 4 ++-- src/main/resources/application.yml | 10 +++++----- src/main/resources/mapper/ConnerMapper.xml | 4 ++-- 9 files changed, 23 insertions(+), 32 deletions(-) rename src/main/java/com/car/demos/{loadenter => car}/LoadEnterNumber.java (95%) rename src/main/java/com/car/demos/{loadenter => car}/Node.java (94%) diff --git a/src/main/java/com/car/config/InitConnectWeight.java b/src/main/java/com/car/config/InitConnectWeight.java index bd6a7b6..f34468d 100644 --- a/src/main/java/com/car/config/InitConnectWeight.java +++ b/src/main/java/com/car/config/InitConnectWeight.java @@ -9,18 +9,10 @@ import com.aliyun.ecs20140526.models.DescribeInstancesResponse; import com.aliyun.tea.TeaException; import com.aliyun.teautil.models.RuntimeOptions; import com.car.demos.ConnectWeight; -import com.car.demos.loadenter.Auth; -import com.car.demos.loadenter.Content; -import com.car.demos.loadenter.LoadEnterNumber; -import com.car.demos.loadenter.Node; +import com.car.demos.car.LoadEnterNumber; +import com.car.demos.car.Node; import com.car.service.impl.ConnectServiceImpl; import lombok.extern.slf4j.Slf4j; -import org.apache.http.HttpResponse; -import org.apache.http.client.HttpClient; -import org.apache.http.client.methods.CloseableHttpResponse; -import org.apache.http.client.methods.HttpPost; -import org.apache.http.impl.client.HttpClients; -import org.apache.http.util.EntityUtils; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.ApplicationArguments; @@ -29,7 +21,7 @@ import org.springframework.data.redis.core.RedisTemplate; import org.springframework.http.*; import org.springframework.stereotype.Component; import org.springframework.web.client.RestTemplate; -import java.io.IOException; + import java.math.BigDecimal; import java.math.RoundingMode; import java.util.*; @@ -55,6 +47,8 @@ public class InitConnectWeight implements ApplicationRunner { @Autowired private RabbitTemplate rabbitTemplate; + + @Override public void run(ApplicationArguments args) { connectService.loadCenterDel(); diff --git a/src/main/java/com/car/controller/ConnectController.java b/src/main/java/com/car/controller/ConnectController.java index 7947f11..dcf0d7f 100644 --- a/src/main/java/com/car/controller/ConnectController.java +++ b/src/main/java/com/car/controller/ConnectController.java @@ -1,13 +1,10 @@ package com.car.controller; -import com.alibaba.fastjson.JSONObject; import com.car.demos.MqttServerModel; import com.car.demos.Result; import com.car.demos.car.Car; -import com.car.demos.car.CarReq; -import com.car.demos.loadenter.LoadEnterNumber; -import com.car.demos.loadenter.Node; -import com.car.demos.loadenter.NodeReq; +import com.car.demos.car.LoadEnterNumber; +import com.car.demos.car.Node; import com.car.demos.req.VehicleConnectionReq; import com.car.service.ConnectService; import lombok.extern.log4j.Log4j2; @@ -32,7 +29,7 @@ public class ConnectController { @Autowired private ConnectService connectService; - @PostMapping("/getConnect") + @PostMapping("/connect") public ResultgetConnect(@RequestBody VehicleConnectionReq vehicleConnectionReq){ Result connect = connectService.getConnect(vehicleConnectionReq); log.info("车辆上线的返回值:{}",connect); diff --git a/src/main/java/com/car/demos/loadenter/LoadEnterNumber.java b/src/main/java/com/car/demos/car/LoadEnterNumber.java similarity index 95% rename from src/main/java/com/car/demos/loadenter/LoadEnterNumber.java rename to src/main/java/com/car/demos/car/LoadEnterNumber.java index 89eb6f6..3d2c69d 100644 --- a/src/main/java/com/car/demos/loadenter/LoadEnterNumber.java +++ b/src/main/java/com/car/demos/car/LoadEnterNumber.java @@ -1,4 +1,4 @@ -package com.car.demos.loadenter; +package com.car.demos.car; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/car/demos/loadenter/Node.java b/src/main/java/com/car/demos/car/Node.java similarity index 94% rename from src/main/java/com/car/demos/loadenter/Node.java rename to src/main/java/com/car/demos/car/Node.java index 7186a43..e51ecd1 100644 --- a/src/main/java/com/car/demos/loadenter/Node.java +++ b/src/main/java/com/car/demos/car/Node.java @@ -1,4 +1,4 @@ -package com.car.demos.loadenter; +package com.car.demos.car; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/com/car/mapper/ConnerMapper.java b/src/main/java/com/car/mapper/ConnerMapper.java index 9c7a4c9..5bddb90 100644 --- a/src/main/java/com/car/mapper/ConnerMapper.java +++ b/src/main/java/com/car/mapper/ConnerMapper.java @@ -1,8 +1,8 @@ package com.car.mapper; import com.car.demos.car.Car; -import com.car.demos.loadenter.LoadEnterNumber; -import com.car.demos.loadenter.Node; +import com.car.demos.car.LoadEnterNumber; +import com.car.demos.car.Node; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/src/main/java/com/car/service/ConnectService.java b/src/main/java/com/car/service/ConnectService.java index 67a9c1e..8891211 100644 --- a/src/main/java/com/car/service/ConnectService.java +++ b/src/main/java/com/car/service/ConnectService.java @@ -3,8 +3,8 @@ package com.car.service; import com.car.demos.MqttServerModel; import com.car.demos.Result; import com.car.demos.car.Car; -import com.car.demos.loadenter.LoadEnterNumber; -import com.car.demos.loadenter.Node; +import com.car.demos.car.LoadEnterNumber; +import com.car.demos.car.Node; import com.car.demos.req.VehicleConnectionReq; import java.util.List; diff --git a/src/main/java/com/car/service/impl/ConnectServiceImpl.java b/src/main/java/com/car/service/impl/ConnectServiceImpl.java index 4b7db34..80a3119 100644 --- a/src/main/java/com/car/service/impl/ConnectServiceImpl.java +++ b/src/main/java/com/car/service/impl/ConnectServiceImpl.java @@ -6,8 +6,8 @@ import com.car.demos.MqttServerModel; import com.car.demos.Result; import com.car.demos.car.Car; -import com.car.demos.loadenter.LoadEnterNumber; -import com.car.demos.loadenter.Node; +import com.car.demos.car.LoadEnterNumber; +import com.car.demos.car.Node; import com.car.demos.req.VehicleConnectionReq; import com.car.mapper.ConnerMapper; import com.car.service.ConnectService; diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 3f27b93..7c3abb9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,7 +4,7 @@ server: spring: rabbitmq: - host: 115.159.211.196 + host: 101.34.243.166 port: 5672 username: guest password: guest @@ -14,15 +14,15 @@ spring: matching-strategy: ant_path_matcher datasource: driver-class-name: com.mysql.cj.jdbc.Driver - url: jdbc:mysql://115.159.211.196:3306/zncar?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&useSSL=false + url: jdbc:mysql://101.34.243.166:3306/zncar?useUnicode=true&characterEncoding=utf8&allowMultiQueries=true&useSSL=false username: root - password: yl@123 + password: wan@123 application: name: shop-server redis: - host: 115.159.211.196 + host: 101.34.243.166 port: 6379 - password: yl030509 +# password: yl030509 # mybatis mybatis: diff --git a/src/main/resources/mapper/ConnerMapper.xml b/src/main/resources/mapper/ConnerMapper.xml index 4727c50..41b17a7 100644 --- a/src/main/resources/mapper/ConnerMapper.xml +++ b/src/main/resources/mapper/ConnerMapper.xml @@ -23,7 +23,7 @@ DELETE FROM `zncar`.`node` - select * from load_enter_number - select * from node order by node_weights desc