From 01c11cea018f4d73cc9c56882762c169c84395a0 Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Mon, 8 Apr 2024 10:02:52 +0800 Subject: [PATCH 1/3] =?UTF-8?q?4.8=E5=A2=9E=E5=8A=A0set=E7=BC=93=E5=AD=98?= =?UTF-8?q?=20=20=E8=BD=A6=E8=BE=86vin=20=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/VehicleServiceImpl.java | 52 +++++++++++-------- 1 file changed, 30 insertions(+), 22 deletions(-) diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java index 5dd54a5..36295a3 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java @@ -22,6 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import java.util.HashSet; import java.util.List; /** @@ -119,6 +120,9 @@ public class VehicleServiceImpl extends ServiceImpl impl Result.error(result); } + //刷新set缓存 + reCache(); + result = "删除成功！"; return result; @@ -175,16 +179,8 @@ public class VehicleServiceImpl extends ServiceImpl impl vehicleAndLogoService.vehicleBindLogo(editParams.getVehicleId(), editParams.getLogoIds()); -// //mq -// List logoList = getBindLogoById(editParams.getVehicleId()); -// if (0 != logoList.size()) { -// String ids = ""; -// for (Long l : logoList) { -// ids = "," + l; -// } -// ids = ids.substring(1); -// remoteFenceService.vehicleQueue(editParams.getVehicleId() + "-" + ids); -// } + //刷新set缓存 + reCache(); result = "编辑成功！"; @@ -254,16 +250,9 @@ public class VehicleServiceImpl extends ServiceImpl impl //执行添加电子围栏 int i = vehicleAndLogoService.vehicleBindLogo(vehicle.getVehicleId(), insertParams.getLogoIds()); -// -// List logoList = getBindLogoById(vehicle.getVehicleId()); -// if (0 != logoList.size()) { -// String ids = ""; -// for (Long l : logoList) { -// ids = "," + l; -// } -// ids = ids.substring(1); -// remoteFenceService.vehicleQueue(vehicle.getVehicleId() + "-" + ids); -// } + + //刷新set缓存 + reCache(); result = "新增成功！"; @@ -337,7 +326,6 @@ public class VehicleServiceImpl extends ServiceImpl impl } - @Scheduled(cron = "0/1 * * * * *") public void aa() { System.out.println("********************************************************"); @@ -362,7 +350,7 @@ public class VehicleServiceImpl extends ServiceImpl impl //执行修改下线状态的方法 // Integer i = this.onOrOutLineByVIN(vehicle.getVin() + "," + 0); - Integer i = this.onOrOutLineByVIN(vehicle.getVin() , 0); + Integer i = this.onOrOutLineByVIN(vehicle.getVin(), 0); if (0 == i) { log.error("下线状态修改失败"); @@ -379,4 +367,24 @@ public class VehicleServiceImpl extends ServiceImpl impl } + /* + * 车辆绑定标识的缓存 + * */ +// @Scheduled(cron = "0/1 * * * * *") + public void reCache() { +//先获取所有车辆的信息 + List list = list(new VehicleListParams()); + + //通过车辆的id获取对应的标识 + list.forEach(vehicle -> { + List bindLogoById = getBindLogoById(vehicle.getVehicleId()); + + bindLogoById.forEach(logoId -> { + HashSet longs = new HashSet<>(); + longs.add(logoId); + redis.setCacheSet("车辆vin和标识:" + vehicle.getVin(), longs); + }); + }); + } + } From e91a4cb6d4e7d1367c8f23abe211f002d3fc3380 Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Mon, 8 Apr 2024 13:21:23 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=20=E5=A2=9E=E5=88=A0=E6=94=B9=EF=BC=8C?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E5=88=B7=E6=96=B0=E7=BC=93=E5=AD=98=EF=BC=9A?= =?UTF-8?q?set=E5=AD=98=E8=BD=A6=E8=BE=86=E5=92=8C=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E7=94=B5=E5=AD=90=E5=9B=B4=E6=A0=8F=E7=9A=84=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- couplet-auth/src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 4 +- .../server/mapper/FenAndLogoMapper.java | 2 + .../server/service/FenAndLogoService.java | 5 +++ .../service/impl/FenAndLogoServiceImpl.java | 10 +++++ .../server/service/impl/FenceServiceImpl.java | 8 ++-- .../service/impl/VehicleServiceImpl.java | 39 ++++++++++++------- .../src/main/resources/bootstrap.yml | 2 + .../mapper/business/FenAndLogoMapper.xml | 28 ++++++++----- .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + .../couplet-modules-onLine/pom.xml | 16 +++----- .../com/couplet/online/utils/MqttMonitor.java | 9 ++--- .../src/main/resources/bootstrap.yml | 10 ++--- .../src/main/resources/bootstrap.yml | 2 + .../src/main/resources/bootstrap.yml | 2 + 19 files changed, 100 insertions(+), 49 deletions(-) diff --git a/couplet-auth/src/main/resources/bootstrap.yml b/couplet-auth/src/main/resources/bootstrap.yml index 427f682..68c3c25 100644 --- a/couplet-auth/src/main/resources/bootstrap.yml +++ b/couplet-auth/src/main/resources/bootstrap.yml @@ -17,9 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-gateway/src/main/resources/bootstrap.yml b/couplet-gateway/src/main/resources/bootstrap.yml index 091e68a..6dc39fe 100644 --- a/couplet-gateway/src/main/resources/bootstrap.yml +++ b/couplet-gateway/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 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 83462d9..183987e 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,16 +15,16 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + 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} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 main: allow-bean-definition-overriding: true rabbitmq: diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenAndLogoMapper.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenAndLogoMapper.java index 219f2d5..2864f4c 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenAndLogoMapper.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/mapper/FenAndLogoMapper.java @@ -28,4 +28,6 @@ public interface FenAndLogoMapper extends BaseMapper { * @param aLong */ List queryByFenceAndLogoIds(FenceAndLogeRequest aLong); + + List findFencesByLogoId(@Param("logoId") Long logoId); } diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenAndLogoService.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenAndLogoService.java index 5fa9e42..a144785 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenAndLogoService.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/FenAndLogoService.java @@ -28,4 +28,9 @@ public interface FenAndLogoService extends IService { */ List queryByFenceAndLogoIds(FenceAndLogeRequest request); + /* + * 通过标识id查询围栏id + * */ + List findFencesByLogoId(Long logoId); + } diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenAndLogoServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenAndLogoServiceImpl.java index 0fba2fe..364e1f3 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenAndLogoServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenAndLogoServiceImpl.java @@ -47,4 +47,14 @@ public class FenAndLogoServiceImpl extends ServiceImpl return fenAndLogoMapper.queryByFenceAndLogoIds(request); } + + /* + * 通过标识id查询围栏信息 + * */ + @Override + public List findFencesByLogoId(Long logoId) { + + + return fenAndLogoMapper.findFencesByLogoId(logoId); + } } diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java index 52bf7a8..d2b8f08 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/FenceServiceImpl.java @@ -11,7 +11,7 @@ import com.couplet.common.domain.request.FenceRequest; import com.couplet.common.domain.request.FenceUpdateRequest; import com.couplet.common.redis.service.RedisService; import com.couplet.common.security.utils.SecurityUtils; -import com.couplet.mq.remote.RemoteFenceService; +//import com.couplet.mq.remote.RemoteFenceService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Service; @@ -47,8 +47,8 @@ public class FenceServiceImpl extends ServiceImpl implements /** * 远程调用队列服务 */ - @Autowired - private RemoteFenceService remoteFenceService; +// @Autowired +// private RemoteFenceService remoteFenceService; @Override public List pageQuery(FenceConfig fenceConfig) { @@ -67,7 +67,7 @@ public class FenceServiceImpl extends ServiceImpl implements */ redisTemplate.opsForValue().set("changeFenceStatus", JSON.toJSONString(fenceUpdateRequest), 10, TimeUnit.MINUTES); - remoteFenceService.fenceQueue(fenceUpdateRequest); +// remoteFenceService.fenceQueue(fenceUpdateRequest); } @Override diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java index ef570f2..6443e4b 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java @@ -4,14 +4,15 @@ 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.FenAndLogoService; import com.couplet.business.server.service.VehicleAndLogoService; import com.couplet.business.server.service.VehicleService; import com.couplet.business.server.service.VehicleTypeService; import com.couplet.common.core.domain.Result; import com.couplet.common.core.utils.StringUtils; import com.couplet.common.core.utils.uuid.UUID; +import com.couplet.common.domain.Fence; 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; @@ -53,6 +54,9 @@ public class VehicleServiceImpl extends ServiceImpl impl @Autowired private VehicleAndLogoService vehicleAndLogoService; + @Autowired + private FenAndLogoService fenAndLogoService; + /* * @Author: LiuYunHu * @Date: 2024/3/26 22:11 @@ -293,7 +297,6 @@ public class VehicleServiceImpl extends ServiceImpl impl } - @Override public List vehicleAll() { return vehicleMapper.vehicleAll(); @@ -309,7 +312,7 @@ public class VehicleServiceImpl extends ServiceImpl impl @Override public Integer addVehicle(Long userId, List vehicleIds) { - return vehicleMapper.addVehicle(userId,vehicleIds); + return vehicleMapper.addVehicle(userId, vehicleIds); } @Override @@ -327,10 +330,10 @@ public class VehicleServiceImpl extends ServiceImpl impl } - @Scheduled(cron = "0/1 * * * * *") - public void aa() { - System.out.println("********************************************************"); - } +// @Scheduled(cron = "0/1 * * * * *") +// public void aa() { +// System.out.println("********************************************************"); +// } //判断车辆是否下线 @Scheduled(cron = "0/1 * * * * *") @@ -343,10 +346,10 @@ public class VehicleServiceImpl extends ServiceImpl impl list.forEach(vehicle -> { try { //只针对已经上线的车辆 - if (redis.hasKey(vehicle.getVin())) { + if (redis.hasKey("已上线的车辆vin:" + vehicle.getVin())) { //如果vin的缓存 时间还剩一秒，则判断为已经下线 - if (redis.getExpire(vehicle.getVin()) <= 3) { + if (redis.getExpire("已上线的车辆vin:" + vehicle.getVin()) <= 3) { log.info(vehicle.getVin() + "的车辆已经下线"); //执行修改下线状态的方法 @@ -371,7 +374,7 @@ public class VehicleServiceImpl extends ServiceImpl impl /* * 车辆绑定标识的缓存 * */ -// @Scheduled(cron = "0/1 * * * * *") + @Scheduled(cron = "0/3 * * * * *") public void reCache() { //先获取所有车辆的信息 List list = list(new VehicleListParams()); @@ -381,9 +384,19 @@ public class VehicleServiceImpl extends ServiceImpl impl List bindLogoById = getBindLogoById(vehicle.getVehicleId()); bindLogoById.forEach(logoId -> { - HashSet longs = new HashSet<>(); - longs.add(logoId); - redis.setCacheSet("车辆vin和标识:" + vehicle.getVin(), longs); + //存标识id + HashSet logos = new HashSet<>(); + logos.add(logoId); + redis.setCacheSet("车辆vin和标识:" + vehicle.getVin(), logos); + + + //存围栏id + List fences = fenAndLogoService.findFencesByLogoId(logoId); + fences.forEach(fence -> { + HashSet fanceSet = new HashSet<>(); + fanceSet.add(fence); + redis.setCacheSet("车辆vin和电子围栏:" + vehicle.getVin(), fanceSet); + }); }); }); } diff --git a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml index d900876..b88e464 100644 --- a/couplet-modules/couplet-business/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-business/src/main/resources/bootstrap.yml @@ -16,9 +16,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml b/couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml index 536b2ab..5953d01 100644 --- a/couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml +++ b/couplet-modules/couplet-business/src/main/resources/mapper/business/FenAndLogoMapper.xml @@ -10,15 +10,15 @@ - - - - - + + + + + - + @@ -36,11 +36,19 @@ fence_longitude_latitude, logo_name FROM couplet_fences_and_logo a - INNER JOIN couplet_fence_info f on a.fences_id=f.fence_id - INNER JOIN couplet_logo_info l on l.logo_id=a.logo_id - left JOIN couplet_vehicle_and_logo c on l.logo_id=c.logo_id - WHERE l.logo_id=#{logoIds} and c.vehicle_id=#{id} + INNER JOIN couplet_fence_info f on a.fences_id = f.fence_id + INNER JOIN couplet_logo_info l on l.logo_id = a.logo_id + left JOIN couplet_vehicle_and_logo c on l.logo_id = c.logo_id + WHERE l.logo_id = #{logoIds} + and c.vehicle_id = #{id} + + diff --git a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml index fa968e9..b0d1d24 100644 --- a/couplet-modules/couplet-file/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-file/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml index e3d77cd..d2113ff 100644 --- a/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-gen/src/main/resources/bootstrap.yml @@ -17,9 +17,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml index bb1f871..41d1fef 100644 --- a/couplet-modules/couplet-job/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-job/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml index 00ac887..7c61da2 100644 --- a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-modules/couplet-modules-onLine/pom.xml b/couplet-modules/couplet-modules-onLine/pom.xml index 44947a4..85f4737 100644 --- a/couplet-modules/couplet-modules-onLine/pom.xml +++ b/couplet-modules/couplet-modules-onLine/pom.xml @@ -11,11 +11,11 @@ couplet-modules-online - - - - - + + + + + couplet-modules-online车辆上线的模块 @@ -91,7 +91,7 @@ 1.2.5 - + com.couplet couplet-common-business @@ -99,10 +99,6 @@ - - - - org.apache.kafka kafka-clients diff --git a/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java b/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java index cd954e7..6f4bfc9 100644 --- a/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java +++ b/couplet-modules/couplet-modules-onLine/src/main/java/com/couplet/online/utils/MqttMonitor.java @@ -11,7 +11,6 @@ import org.eclipse.paho.client.mqttv3.*; import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; -import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.stereotype.Component; import javax.annotation.PostConstruct; @@ -184,7 +183,7 @@ public class MqttMonitor { //调取接口，通过vin查询车辆 List vehicles = remoteVehicleService.findByVIN(start17).getData(); - System.out.println("**************" + vehicles); +// System.out.println("**************" + vehicles); //如果不存在这个车 @@ -198,7 +197,7 @@ public class MqttMonitor { log.info("远程调用查询到的车辆数据：" + vehicle); //上线车辆存入redis 6秒 用于判断车辆是否下线，还要写定时器，定时查询 - redis.setCacheObject(start17, start17, 6L, TimeUnit.SECONDS); + redis.setCacheObject("已上线的车辆vin:"+start17, start17, 6L, TimeUnit.SECONDS); log.info("vin码为" + start17 + "的车辆属于本系统，允许上线！"); @@ -207,7 +206,7 @@ public class MqttMonitor { Integer i = remoteVehicleService.onOrOutLineByVIN(start17 + "," + 1); //上线成功 if (0 != i) { - log.info("上线成功！"); +// log.info("上线成功！"); try { produceMessage(message); } catch (Exception e) { @@ -239,7 +238,7 @@ public class MqttMonitor { //发送消息 kafkaProducer.send(new ProducerRecord<>(TOPIC_NAME, message)); - System.out.println("发送消息：" + message); +// System.out.println("发送消息：" + message); } catch (Exception e) { log.error("消息发送失败：" + e.getMessage()); diff --git a/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml index 16394e6..2d20009 100644 --- a/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-modules-onLine/src/main/resources/bootstrap.yml @@ -15,16 +15,16 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 + 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} - namespace: a439ce3f-2c42-4b4c-9c4d-c8db49933c15 main: allow-bean-definition-overriding: true logging: @@ -35,10 +35,10 @@ logging: mqtt: server: broker: tcp://115.159.47.13:1883 -# broker: mqtt://115.159.47.13:1883 + # broker: mqtt://115.159.47.13:1883 username: password: - clientId: fluxMq + clientId: liuyunhu qos: 0 - topic: test + topic: liuyunhu diff --git a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml index d9315bd..91453d0 100644 --- a/couplet-modules/couplet-system/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-system/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 diff --git a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml index d1064dc..d219500 100644 --- a/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml +++ b/couplet-visual/couplet-monitor/src/main/resources/bootstrap.yml @@ -15,9 +15,11 @@ spring: discovery: # 服务注册地址 server-addr: 121.89.211.230:8848 + namespace: 172469 config: # 配置中心地址 server-addr: 121.89.211.230:8848 + namespace: 172469 # 配置文件格式 file-extension: yml # 共享配置 From be2e99af0c95d3e5d4f539312d1160b237ec5ec2 Mon Sep 17 00:00:00 2001 From: liuyunhu <3286117488@qq.com> Date: Mon, 8 Apr 2024 14:44:03 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=BD=A6=E8=BE=86=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=20=20=E5=8A=A0=E6=B3=A8=E9=87=8A=20=20?= =?UTF-8?q?=E5=A2=9E=E5=88=A0=E6=94=B9=EF=BC=8C=E8=A7=A6=E5=8F=91=E5=88=B7?= =?UTF-8?q?=E6=96=B0=E7=BC=93=E5=AD=98=20=E5=A2=9E=E5=8A=A0=E7=BC=93?= =?UTF-8?q?=E5=AD=98=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../analyze/msg/model/ModelsKafkaMessage.java | 1 + .../service/impl/VehicleServiceImpl.java | 58 ++++++++++++++----- .../src/main/resources/bootstrap.yml | 18 +++--- 3 files changed, 54 insertions(+), 23 deletions(-) diff --git a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java index 1c2c085..79d7dc1 100644 --- a/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java +++ b/couplet-modules/couplet-analyze/couplet-analyze-msg/src/main/java/com/couplet/analyze/msg/model/ModelsKafkaMessage.java @@ -1,5 +1,6 @@ package com.couplet.analyze.msg.model; +import com.couplet.analyze.common.event.AnalyzeEventCache; import com.couplet.analyze.msg.domain.CoupletMsgData; import com.couplet.analyze.msg.service.IncidentService; import com.couplet.common.core.exception.vehicle.VehicleException; diff --git a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java index 6443e4b..6c22945 100644 --- a/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java +++ b/couplet-modules/couplet-business/src/main/java/com/couplet/business/server/service/impl/VehicleServiceImpl.java @@ -22,9 +22,11 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashSet; import java.util.List; +import java.util.concurrent.TimeUnit; /** * @ProjectName: five-groups-couplet @@ -140,6 +142,7 @@ public class VehicleServiceImpl extends ServiceImpl impl * @Return: java.lang.String **/ @Override + @Transactional(rollbackFor = Exception.class) public String editById(VehicleEditParams editParams) { String result = ""; @@ -200,6 +203,7 @@ public class VehicleServiceImpl extends ServiceImpl impl * @Return: java.lang.String **/ @Override + @Transactional(rollbackFor = Exception.class) public String insert(VehicleInsertParams insertParams) { String result = ""; @@ -303,7 +307,13 @@ public class VehicleServiceImpl extends ServiceImpl impl } - //通过vin修改车辆上下线的状态 + /* + * @Author: LiuYunHu + * @Date: 2024/4/8 14:11 + * @Description: 通过vin修改车辆上下线的状态 + * @Param: [vin, status] + * @Return: java.lang.Integer + **/ @Override public Integer onOrOutLineByVIN(String vin, int status) { @@ -315,6 +325,13 @@ public class VehicleServiceImpl extends ServiceImpl impl return vehicleMapper.addVehicle(userId, vehicleIds); } + /* + * @Author: LiuYunHu + * @Date: 2024/4/8 14:11 + * @Description: 通过vin查询车辆，因为是plus，所以是List + * @Param: [vin] + * @Return: java.util.List + **/ @Override public List findByVIN(String vin) { @@ -330,19 +347,19 @@ public class VehicleServiceImpl extends ServiceImpl impl } -// @Scheduled(cron = "0/1 * * * * *") -// public void aa() { -// System.out.println("********************************************************"); -// } - - //判断车辆是否下线 + /* + * @Author: LiuYunHu + * @Date: 2024/4/8 14:12 + * @Description: 定时执行，查询缓存中下线的车辆，修改其状态 + * @Param: [] + * @Return: void + **/ @Scheduled(cron = "0/1 * * * * *") public void downLine() { log.info("定时器启动"); //先查询车辆列表 List list = this.list(new VehicleListParams(null, null, null, null)); - list.forEach(vehicle -> { try { //只针对已经上线的车辆 @@ -372,30 +389,43 @@ public class VehicleServiceImpl extends ServiceImpl impl } /* - * 车辆绑定标识的缓存 - * */ + * @Author: LiuYunHu + * @Date: 2024/4/8 14:14 + * @Description: 刷新缓存中 的数据 车辆绑定标识的缓存 + * @Param: [] + * @Return: void + **/ @Scheduled(cron = "0/3 * * * * *") public void reCache() { -//先获取所有车辆的信息 + //刷新缓存执行开始 + + //先获取所有车辆的信息 List list = list(new VehicleListParams()); - //通过车辆的id获取对应的标识 list.forEach(vehicle -> { + //通过车辆的id获取对应的标识集合 List bindLogoById = getBindLogoById(vehicle.getVehicleId()); + //遍历标识集合 bindLogoById.forEach(logoId -> { - //存标识id + + //存标识id 的set HashSet logos = new HashSet<>(); logos.add(logoId); + //存入redis redis.setCacheSet("车辆vin和标识:" + vehicle.getVin(), logos); + redis.expire("车辆vin和标识:" + vehicle.getVin(), 2, TimeUnit.MINUTES); - //存围栏id + //通过标识id获取标识绑定的电子围栏集合 List fences = fenAndLogoService.findFencesByLogoId(logoId); + //遍历电子围栏集合 fences.forEach(fence -> { HashSet fanceSet = new HashSet<>(); fanceSet.add(fence); + //存入redis redis.setCacheSet("车辆vin和电子围栏:" + vehicle.getVin(), fanceSet); + redis.expire("车辆vin和电子围栏:" + vehicle.getVin(), 2, TimeUnit.MINUTES); }); }); }); diff --git a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml index 7c61da2..cccb96b 100644 --- a/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml +++ b/couplet-modules/couplet-modules-mq/src/main/resources/bootstrap.yml @@ -35,15 +35,15 @@ logging: com.couplet.system.mapper: DEBUG # 订阅端配置 -mqtt: - server: - broker: tcp://8.130.181.16:1883 -# broker: tcp://115.159.47.13:1883 - username: - password: - clientid: mqttx - qos: 0 - topic: test +#mqtt: +# server: +# broker: tcp://8.130.181.16:1883 +## broker: tcp://115.159.47.13:1883 +# username: +# password: +# clientid: mqttx +# qos: 0 +# topic: test # RabbitMQ配置 mq: