From 6e4b268730b4f176e98c504664a3a4a90db9b664 Mon Sep 17 00:00:00 2001 From: Yueng <14617246+YuengMeYuuer@user.noreply.gitee.com> Date: Sun, 6 Oct 2024 10:57:28 +0800 Subject: [PATCH] =?UTF-8?q?fine()=E6=B7=BB=E5=8A=A0=E8=BD=A6=E8=BE=86?= =?UTF-8?q?=E7=BC=93=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- cloud-common/cloud-common-cache/pom.xml | 31 ++++++ .../com/muyu/common/cache/CacheAbsBasic.java | 33 ++++++ .../com/muyu/common/cache/CacheBasic.java | 18 +++ .../muyu/common/cache/PrimaryKeyBasic.java | 34 ++++++ cloud-common/pom.xml | 1 - .../src/main/resources/bootstrap.yml | 2 +- cloud-modules/cloud-Saas-Service/pom.xml | 4 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-enterprise-cache/pom.xml | 39 +++++++ .../VehicleCacheCarInformationAddService.java | 27 +++++ ...leCacheCarInformationFenceRespService.java | 27 +++++ ...VehicleCacheCarInformationRespService.java | 28 +++++ .../VehicleCacheCarInformationService.java | 27 +++++ .../VehicleCacheCarInformationUpdService.java | 25 +++++ ...ot.autoconfigure.AutoConfiguration.imports | 5 + .../cloud-modules-enterprise-common/pom.xml | 4 +- .../cloud-modules-enterprise-server/pom.xml | 18 +-- .../controller/CarFenceClazzController.java | 2 +- .../server/controller/CarFenceController.java | 7 +- .../controller/CarFenceTypeController.java | 2 + .../controller/CarInformationController.java | 48 +++++++- .../controller/CarMessageController.java | 7 +- .../controller/CarMiddleController.java | 2 + .../server/controller/CarTypeController.java | 8 +- .../controller/FaultCodeController.java | 3 +- .../controller/FaultConditionController.java | 6 +- .../main/java/com/muyu/server/mqtt/Demo.java | 105 ------------------ .../com/muyu/server/util/ObtainRootLogin.java | 32 ++++++ .../src/main/resources/bootstrap.yml | 2 +- .../cloud-modules-enterprise/pom.xml | 5 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- pom.xml | 2 - 37 files changed, 427 insertions(+), 141 deletions(-) create mode 100644 cloud-common/cloud-common-cache/pom.xml create mode 100644 cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java create mode 100644 cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java create mode 100644 cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/ObtainRootLogin.java diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 1cdb12c..9a56e49 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml new file mode 100644 index 0000000..7cc9002 --- /dev/null +++ b/cloud-common/cloud-common-cache/pom.xml @@ -0,0 +1,31 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + cloud-common-cache + + + cloud-modules-cache 缓存基准 + + + + 17 + 17 + UTF-8 + + + + + + com.muyu + cloud-common-redis + + + diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java new file mode 100644 index 0000000..edda01c --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java @@ -0,0 +1,33 @@ +package com.muyu.common.cache; + +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; + +/** + * 抽象缓存层 + * @Author：yang + * @Package：com.muyu.common + * @Project：cloud-server-8 + * @name：CacheAbsBacis + * @Date：2024/9/30 11:19 + */ +public abstract class CacheAbsBasic implements CacheBasic{ + + @Autowired + private RedisService redisService; + + @Override + public void put(K key, V value) { + redisService.setCacheObject(encode(key),value); + } + + @Override + public V get(K key) { + return redisService.getCacheObject(encode(key)); + } + + @Override + public void remove(K key) { + redisService.deleteObject(encode(key)); + } +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java new file mode 100644 index 0000000..e4a5fc5 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java @@ -0,0 +1,18 @@ +package com.muyu.common.cache; + +/** + * 缓存基础 + * @Author：yang + * @Package：com.muyu.common.cache + * @Project：cloud-server-8 + * @name：CacheBasic + * @Date：2024/9/30 11:41 + */ +public interface CacheBasic extends PrimaryKeyBasic{ + + void put(K key,V value); + + V get(K key); + + void remove(K key); +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java new file mode 100644 index 0000000..1b60e9e --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java @@ -0,0 +1,34 @@ +package com.muyu.common.cache; + +/** + * 主键基础 + * @Author：yang + * @Package：com.muyu.common.cache + * @Project：cloud-server-8 + * @name：PrimaryKeyBasic + * @Date：2024/9/30 11:35 + */ +public interface PrimaryKeyBasic { + + /** + * key 前缀 + * @return 前缀 + */ + public String keyPre(); + /** + * 编码 + * @param key 缓存键 + * @return 装修键 + */ + public default String encode(K key){ + return key.toString(); + } + + /** + * 解码key + * @param key 编码Key + * @return 解码后的Key + */ + public K decode(String key); + +} diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index eead750..79c42b6 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -22,7 +22,6 @@ cloud-common-rabbit cloud-common-saas cloud-common-wechat - cloud-common-kafka cloud-common diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index 7f67420..a9335ac 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-Saas-Service/pom.xml b/cloud-modules/cloud-Saas-Service/pom.xml index b94e474..4f22a33 100644 --- a/cloud-modules/cloud-Saas-Service/pom.xml +++ b/cloud-modules/cloud-Saas-Service/pom.xml @@ -13,8 +13,8 @@ cloud-Saas-Service - 21 - 21 + 17 + 17 UTF-8 diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml b/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml index dec3bd6..2fd8826 100644 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml index 8bc6afd..d373a24 100644 --- a/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-carData/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml new file mode 100644 index 0000000..b1476a0 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/pom.xml @@ -0,0 +1,39 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + cloud-modules-enterprise-cache + + cloud-modules-enterprise-cache 缓存模块 + + + 17 + 17 + UTF-8 + + + + + com.muyu + cloud-common-cache + 3.6.3 + + + com.muyu + cloud-modules-enterprise-common + 1.0.0 + + + com.muyu + cloud-auth + 3.6.3 + + + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java new file mode 100644 index 0000000..92b94de --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationAddService.java @@ -0,0 +1,27 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarInformation; +import com.muyu.domain.req.CarInformationAddReq; + +import java.util.List; + +/** + * 添加车辆信息 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationAddService extends CacheAbsBasic { + @Override + public String keyPre() { + return "CarInformationAddReq:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java new file mode 100644 index 0000000..db77ce6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationFenceRespService.java @@ -0,0 +1,27 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.resp.CarInformationResp; + +import java.util.List; + +/** + * 车辆基础信息列表缓存 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationFenceRespService extends CacheAbsBasic> { + @Override + public String keyPre() { + return "CarInformationFenceResp:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java new file mode 100644 index 0000000..5611b12 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationRespService.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.cache.car; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarInformation; +import com.muyu.domain.resp.CarInformationResp; + +import java.util.List; + +/** + * 分页查询车辆信息 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationRespService extends CacheAbsBasic> { + @Override + public String keyPre() { + return "CarInformationResp:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java new file mode 100644 index 0000000..0e56672 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationService.java @@ -0,0 +1,27 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.CarInformation; +import com.muyu.domain.resp.CarFenceGroupResp; + +import java.util.List; + +/** + * 查询车辆 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationService extends CacheAbsBasic> { + @Override + public String keyPre() { + return "CarInformation:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java new file mode 100644 index 0000000..9a155ee --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/car/VehicleCacheCarInformationUpdService.java @@ -0,0 +1,25 @@ +package com.muyu.enterprise.cache.car; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.req.CarInformationUpdReq; + +/** + * 修改车辆信息 + * @Author：yang + * @Package：com.muyu.cache + * @Project：cloud-server-8 + * @name：VehicleCacheService + * @Date：2024/9/30 11:50 + */ +public class VehicleCacheCarInformationUpdService extends CacheAbsBasic { + @Override + public String keyPre() { + return "CarInformationUpdReq:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicle:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..c366f55 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,5 @@ +com.muyu.enterprise.cache.car.VehicleCacheCarInformationService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationRespService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationAddService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationUpdService +com.muyu.enterprise.cache.car.VehicleCacheCarInformationFenceRespService diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml index 68857c5..1759aec 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml @@ -15,8 +15,8 @@ cloud-modules-enterprise-common 企业业务common - 21 - 21 + 17 + 17 UTF-8 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index b7bfbc8..facada6 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -14,8 +14,8 @@ cloud-modules-enterprise-server 企业业务服务 - 21 - 21 + 17 + 17 UTF-8 @@ -33,10 +33,10 @@ com.alibaba.cloud spring-cloud-starter-alibaba-nacos-config - - org.apache.kafka - kafka-clients + com.muyu + cloud-modules-carData + 3.6.3 @@ -101,9 +101,13 @@ com.muyu - cloud-common-kafka + cloud-modules-carData + 3.6.3 + + + com.muyu + cloud-modules-enterprise-cache 3.6.3 - compile diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java index 67609f3..26560ce 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java @@ -36,10 +36,10 @@ public class CarFenceClazzController { @PostMapping("/selectClazz") @Operation(summary = "查询数据",description = "查询数据") public Result> selectConnect(){ + List connects = carFenceClazzService.list(); log.info("查询数据成功"); return Result.success( - connects, "操作成功" ); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java index eb25bc3..ae9e158 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java @@ -44,6 +44,7 @@ public class CarFenceController { ){ Page connects = carFenceService.selectCarFence(req); log.info("查询数据："+ connects); + return Result.success( connects, "操作成功" ); @@ -58,13 +59,13 @@ public class CarFenceController { @Validated @RequestBody CarFence carFence ){ Boolean connects = carFenceService.addCarFence(carFence); - log.info("shd"); + + log.info("shd"); return connects?Result.success( null, "操作成功" ):Result.success( null, "操作失败" ); - } /** @@ -94,6 +95,7 @@ public class CarFenceController { @Validated @RequestBody FenceGroupReq req ){ Boolean connects = carFenceService.addFenceGroup(req); + return connects?Result.success( null, "操作成功" ):Result.success( @@ -138,6 +140,7 @@ public class CarFenceController { @PostMapping("/carGroupList") @Operation(summary = "查询车辆围栏组数据",description = "查询车辆围栏组信息") public Result> carGroupList(@RequestBody CarFenceGroupReq req){ + List connects = carFenceService.carGroupList(req); return Result.success( connects, "操作成功" diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java index 0568280..1a4f6d1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java @@ -36,7 +36,9 @@ public class CarFenceTypeController { @PostMapping("/selectType") @Operation(summary = "查询数据",description = "查询数据") public Result> selectConnect(){ + List connects = carFenceTypeService.list(); + return Result.success( connects, "操作成功" ); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java index 180af3d..785bdb2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java @@ -4,15 +4,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.github.pagehelper.PageInfo; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarFenceType; import com.muyu.domain.CarInformation; import com.muyu.domain.req.CarInformationAddReq; import com.muyu.domain.req.CarInformationListReq; import com.muyu.domain.req.CarInformationUpdReq; import com.muyu.domain.resp.CarInformationResp; +import com.muyu.enterprise.cache.car.*; import com.muyu.server.service.CarInformationService; +import com.muyu.server.util.ObtainRootLogin; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; +import org.springframework.util.CollectionUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,6 +34,11 @@ import java.util.List; public class CarInformationController { @Resource private CarInformationService carInformationService; + private VehicleCacheCarInformationService vehicleCacheCarInformationService; + private VehicleCacheCarInformationRespService vehicleCacheCarInformationRespService; + private VehicleCacheCarInformationAddService vehicleCacheCarInformationAddService; + private VehicleCacheCarInformationUpdService vehicleCacheCarInformationUpdService; + private VehicleCacheCarInformationFenceRespService vehicleCacheCarInformationFenceRespService; /** @@ -38,10 +47,20 @@ public class CarInformationController { @PostMapping("/selectCarInformation") @Operation(summary = "查询数据",description = "查询数据") public Result> selectConnect(){ + List carFenceRespPage = vehicleCacheCarInformationService + .get(vehicleCacheCarInformationService + .keyPre()+ ObtainRootLogin + .obtain()); + if (CollectionUtils.isEmpty(carFenceRespPage)) { + return Result.success(carFenceRespPage); + } List connects = carInformationService.list() .stream() .map(CarInformation::carInformationBuilder) .toList(); + vehicleCacheCarInformationService.put( + vehicleCacheCarInformationService.keyPre()+ObtainRootLogin.obtain() + ,connects); return Result.success( connects, "操作成功" ); @@ -68,8 +87,19 @@ public class CarInformationController { @PostMapping("/selectCarInformationList") @Operation(summary = "企业车辆管理列表") public Result> selectCarInformationList(@Validated @RequestBody CarInformationListReq carInformationListReq) { + + Page carFenceRespPage = vehicleCacheCarInformationRespService + .get(vehicleCacheCarInformationRespService + .keyPre()+ ObtainRootLogin + .obtain()); + if (CollectionUtils.isEmpty(carFenceRespPage.getRecords())) { + return Result.success(carFenceRespPage); + } Page pageInfo = carInformationService.selectCarInformationList(carInformationListReq); log.info("企业车辆管理列表查询",carInformationListReq,pageInfo); + vehicleCacheCarInformationRespService.put( + vehicleCacheCarInformationRespService.keyPre()+ObtainRootLogin.obtain() + ,pageInfo); return Result.success(pageInfo); } @@ -83,6 +113,10 @@ public class CarInformationController { @PostMapping("/addCarInformation") @Operation(summary = "企业车辆添加管理") public Result addCarInformation(@Validated @RequestBody CarInformationAddReq carInformationAddReq){ + + vehicleCacheCarInformationAddService.put( + vehicleCacheCarInformationAddService + .keyPre()+ObtainRootLogin.obtain(), carInformationAddReq); return carInformationService.addCarInformation(carInformationAddReq) ?Result.success("添加车辆成功") :Result.error(402,"添加车辆失败"); @@ -114,7 +148,9 @@ public class CarInformationController { public Result updateCarMessage(@Validated @RequestBody CarInformationUpdReq carInformationUpdReq){ boolean updatecarInformation = carInformationService.updatecarInformation(carInformationUpdReq); log.info(updatecarInformation); - System.out.println("我在这个里:"+updatecarInformation); + vehicleCacheCarInformationUpdService.put( + vehicleCacheCarInformationUpdService + .keyPre()+ObtainRootLogin.obtain(), carInformationUpdReq); if(updatecarInformation) { return Result.success(carInformationUpdReq,"修改成功"); @@ -133,7 +169,17 @@ public class CarInformationController { @GetMapping("/selectCarInformationIdAndLicensePlate") @Operation(summary = "查询企业车辆 carInformationID 和 carInformationLicensePlate") public Result> selectCarInformationIdAndLicensePlate(){ + List carFenceRespPage = vehicleCacheCarInformationFenceRespService + .get(vehicleCacheCarInformationFenceRespService + .keyPre()+ ObtainRootLogin + .obtain()); + if (CollectionUtils.isEmpty(carFenceRespPage)) { + return Result.success(carFenceRespPage); + } List carInformations = carInformationService.selectBycarInformationIDAndLicensePlate(); + vehicleCacheCarInformationFenceRespService.put( + vehicleCacheCarInformationFenceRespService.keyPre()+ObtainRootLogin.obtain() + ,carInformations); return Result.success(carInformations); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java index 8700799..b6ccdad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java @@ -31,6 +31,7 @@ public class CarMessageController { @PostMapping("/selectCarMessageList") @Operation(summary = "报文模板展示列表") public Result> selectCarMessageList(){ + List carMessages = carMessageService.selectCarMessageList(); return Result.success(carMessages); } @@ -42,10 +43,8 @@ public class CarMessageController { @PostMapping("/insertCarMessage") @Operation(summary = "添加报文信息") public Result insertCarMessage(@Validated @RequestBody CarMessage carMessage){ + int inserted = carMessageService.insertCarMessage(carMessage); - if (inserted>0){ - return Result.success(200,"添加成功"); - } return Result.error(402,"添加失败"); } @@ -57,6 +56,7 @@ public class CarMessageController { @Operation(summary = "删除报文信息") public Result delectByCarMessageId(@RequestParam(name = "carMessageId") Integer carMessageId){ int deleteByCarMessageId = carMessageService.delectByCarMessageId(carMessageId); + if (deleteByCarMessageId>0){ return Result.success(200,"删除成功"); } @@ -69,6 +69,7 @@ public class CarMessageController { @PostMapping("/updateCarMessage") @Operation(summary = "修改报文信息") public Result updateCarMessage(@Validated @RequestBody CarMessage carMessage){ + int updateCarMessage = carMessageService.updateCarMessage(carMessage); if(updateCarMessage>0) { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java index 834fb02..c2217bb 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java @@ -13,6 +13,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 车辆电子围栏添加中间表控制层 * @Author：yang diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java index 30a5745..8a48892 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java @@ -2,6 +2,7 @@ package com.muyu.server.controller; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarType; import com.muyu.server.service.CarTypeService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; @@ -9,6 +10,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + /** * 车辆类型控制层 * @Author：weiran @@ -33,6 +36,9 @@ public class CarTypeController { @PostMapping("/list") @Operation(summary = "车辆类型",description = "车辆类型信息") public Result carTypeList(){ - return Result.success(carTypeService.selectcarType()); + + List data = carTypeService.selectcarType(); + + return Result.success(data); } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java index 9d550d9..bd9db4c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java @@ -38,7 +38,8 @@ public class FaultCodeController { @PostMapping("/faultcodelist") @Operation(summary = "故障码列表(多)",description = "展示故障码信息") public Result selectfaultcodelist(@Validated @RequestBody FaultCodeListReq faultCodeListReq){ - return Result.success(faultCodeService.selectfaultcodelist(faultCodeListReq)); + FaultCodeTotalListResp selectfaultcodelist = faultCodeService.selectfaultcodelist(faultCodeListReq); + return Result.success(selectfaultcodelist,"操作成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java index d83011f..a779600 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java @@ -6,9 +6,9 @@ import com.muyu.domain.FaultCondition; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; import com.muyu.domain.req.FaultConditionUpdReq; +import com.muyu.domain.resp.FaultConditionTotalListResp; import com.muyu.server.service.FaultConditionService; import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -40,7 +40,9 @@ public class FaultConditionController { @PostMapping("/list") @Operation(summary = "故障规则列表展示",description = "故障规则列表展示") public Result getfaultrulelist(@RequestBody @Validated FaultConditionListReq faultConditionListReq){ - return Result.success(faultConditionService.getfaultrulelist(faultConditionListReq)); + + FaultConditionTotalListResp getfaultrulelist = faultConditionService.getfaultrulelist(faultConditionListReq); + return Result.success(getfaultrulelist,"操作成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java deleted file mode 100644 index 007c82e..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mqtt/Demo.java +++ /dev/null @@ -1,105 +0,0 @@ -package com.muyu.server.mqtt; - -import com.alibaba.fastjson.JSONObject; - -import com.muyu.common.kafka.constants.KafkaConstants; -import com.muyu.domain.CarMessage; -import com.muyu.server.service.CarMessageService; -import jakarta.annotation.PostConstruct; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.eclipse.paho.client.mqttv3.*; -import org.springframework.stereotype.Component; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CompletableFuture; - - -@Component -public class Demo { - @Resource - private CarMessageService service; - @Resource - private KafkaProducer kafkaProducer; - @PostConstruct - public void test() { - - String topic = "vehicle"; - String content = "Message from MqttPublishSample"; - int qos = 2; - String broker = "tcp://106.15.136.7:1883"; - String clientId = "JavaSample"; - - try { - // 第三个参数为空，默认持久化策略 - MqttClient sampleClient = new MqttClient(broker, clientId); - MqttConnectOptions connOpts = new MqttConnectOptions(); - connOpts.setCleanSession(true); - System.out.println("Connecting to broker: "+broker); - sampleClient.connect(connOpts); - sampleClient.subscribe(topic,0); - sampleClient.setCallback(new MqttCallback() { - // 连接丢失 - @Override - public void connectionLost(Throwable throwable) { - - } - // 连接成功 - @Override - public void messageArrived(String s, MqttMessage mqttMessage) throws Exception { - - List list= service.selectCarMessageList(1,2); - String str = new String( mqttMessage.getPayload() ); - System.out.println(str); - String[] test = str.split(" "); - String[] results = new String[list.size()]; - List> futures = new ArrayList<>(); - for (CarMessage carmsg : list) { - futures.add(CompletableFuture.supplyAsync(() -> { - int startIndex = Integer.parseInt(String.valueOf(carmsg.getCarMessageStartIndex())) - 1; - int endIndex = Integer.parseInt(String.valueOf(carmsg.getCarMessageEndIndex())); - StringBuilder hexBuilder = new StringBuilder(); - for (int j = startIndex; j < endIndex; j++) { - hexBuilder.append(test[j]); - } - // 创建16进制的对象 - String hex = hexBuilder.toString(); - // 转橙字符数组 - char[] result = new char[hex.length() / 2]; - for (int x = 0; x < hex.length(); x += 2) { - // 先转十进制 - int high = Character.digit(hex.charAt(x), 16); - // 转二进制 - int low = Character.digit(hex.charAt(x + 1), 16); - // 转字符 - result[x / 2] = (char) ((high << 4) + low); - } - return new String(result); - })); - } - for (int i = 0; i < futures.size(); i++) { - results[i] = futures.get(i).get(); - } - String jsonString = JSONObject.toJSONString( results ); - ProducerRecord producerRecord = new ProducerRecord<>( KafkaConstants.KafkaTopic, jsonString); - kafkaProducer.send(producerRecord); - } - // 接收信息 - @Override - public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { - - } - }); - } catch(MqttException me) { - System.out.println("reason "+me.getReasonCode()); - System.out.println("msg "+me.getMessage()); - System.out.println("loc "+me.getLocalizedMessage()); - System.out.println("cause "+me.getCause()); - System.out.println("excep "+me); - me.printStackTrace(); - } - } - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/ObtainRootLogin.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/ObtainRootLogin.java new file mode 100644 index 0000000..e961ac7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/ObtainRootLogin.java @@ -0,0 +1,32 @@ +package com.muyu.server.util; + +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; +import com.muyu.common.system.domain.SysUser; +import com.muyu.domain.CarFenceClazz; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * + * @Author：yang + * @Package：com.muyu.server.util + * @Project：cloud-server-8 + * @name：ObtainRootLogin + * @Date：2024/10/2 16:46 + */ +public class ObtainRootLogin { + + public static String obtain(){ + LoginUser loginUser = SecurityUtils.getLoginUser(); + + SysUser sysUser = loginUser.getSysUser(); + + return sysUser.getDatabaseName(); + }; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml index 0616949..574393e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml index f6897ed..5b59763 100644 --- a/cloud-modules/cloud-modules-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -16,13 +16,14 @@ cloud-modules-enterprise-common cloud-modules-enterprise-server + cloud-modules-enterprise-cache cloud-modules-enterprise pom - 21 - 21 + 17 + 17 UTF-8 diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index a02fcfb..2863945 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 4663d03..5735ae2 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index 91799f9..a0052fd 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index ae51cac..10e7fb8 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -4,7 +4,7 @@ server: # nacos线上地址 nacos: - addr: 159.75.188.178:8848 + addr: 127.0.0.1:8848 user-name: nacos password: nacos namespace: eight diff --git a/pom.xml b/pom.xml index 7594852..c71200f 100644 --- a/pom.xml +++ b/pom.xml @@ -282,8 +282,6 @@ cloud-visual cloud-modules cloud-common - cloud-modules/cloud-electronic - cloud-modules/cloud-Vehicle-Simulation pom