From f166853e31816189fe78f773d5f179661a027aa3 Mon Sep 17 00:00:00 2001 From: sy200 <2063514638@qq.com> Date: Tue, 8 Oct 2024 21:42:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:()=E6=B7=BB=E5=8A=A0=E5=AD=98=E5=82=A8?= =?UTF-8?q?=E5=9B=B4=E6=A0=8F=E7=BB=84Redis=E4=BF=A1=E6=81=AF=E6=96=B9?= =?UTF-8?q?=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud-auth/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../cache/AllFenceGroupCahceService.java | 29 ++++++++++++ .../enterprise/cache/FaultCacheService.java | 3 +- .../cache/FenceGroupCahceService.java | 28 ++++++++++++ ...ot.autoconfigure.AutoConfiguration.imports | 2 + .../main/java/com/muyu/domain/Vehicle.java | 9 ++++ .../com/muyu/domain/req/VehicleAddReq.java | 5 +++ .../com/muyu/domain/req/VehicleUpdReq.java | 3 ++ .../com/muyu/domain/resp/BoundFenceGroup.java | 45 +++++++++++++++++++ .../controller/FaultController.java | 7 +-- .../controller/FaultInfoController.java | 9 +++- .../controller/FaultLogController.java | 7 +-- .../controller/MessageTemplateController.java | 7 +-- .../controller/MessageValueController.java | 7 +-- .../controller/MiddleController.java | 3 ++ .../enterprise/controller/RuleController.java | 7 +-- .../controller/VehicleController.java | 32 ++++++++----- .../controller/VehicleTypeController.java | 7 +-- .../controller/WarnLogsController.java | 3 ++ .../controller/WarnRuleController.java | 3 ++ .../controller/WarnStrategyController.java | 3 ++ .../muyu/enterprise/mapper/ElectMapper.java | 3 ++ .../muyu/enterprise/mapper/VehicleMapper.java | 7 ++- .../enterprise/service/VehicleService.java | 8 ++++ .../service/impl/FencegroupServiceImpl.java | 12 +++++ .../service/impl/VehicleServiceImpl.java | 8 ++++ .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- .../src/main/resources/bootstrap.yml | 2 +- 35 files changed, 216 insertions(+), 61 deletions(-) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceGroupCahceService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceGroupCahceService.java create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/BoundFenceGroup.java diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index d8dd0cc..aade9ec 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index c9b97fd..f7aa42d 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # Spring spring: diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceGroupCahceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceGroupCahceService.java new file mode 100644 index 0000000..2118957 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllFenceGroupCahceService.java @@ -0,0 +1,29 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.BoundMiddle; +import com.muyu.domain.resp.BoundFenceGroup; +import com.muyu.domain.resp.FenceResp; + +import java.util.List; + +/** + * 所有电子围栏缓存 + */ +public class AllFenceGroupCahceService extends CacheAbsBacis> { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "AllFenceGroup:info:"; + } + + @Override + public String decode(String key) { + return key.replace("AllFenceGroup:info:", ""); + } + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FaultCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FaultCacheService.java index 4c3f431..2bafae7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FaultCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FaultCacheService.java @@ -1,11 +1,12 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.FaultInfo; /** * 故障缓存服务 */ -public class FaultCacheService extends CacheAbsBacis { +public class FaultCacheService extends CacheAbsBacis { @Override public void clear() { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceGroupCahceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceGroupCahceService.java new file mode 100644 index 0000000..23b378e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceGroupCahceService.java @@ -0,0 +1,28 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.Fence; +import com.muyu.domain.FenceGroup; +import com.muyu.domain.req.BoundFenceGroupReq; +import com.muyu.domain.req.FenceGroupAddReq; + +/** + * 电子围栏缓存 + */ +public class FenceGroupCahceService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "fenceGroup:info:"; + } + + @Override + public String decode(String key) { + return key.replace("fenceGroup: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 index 65df736..98c2aec 100644 --- 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 @@ -1,5 +1,6 @@ com.muyu.enterprise.cache.AllFaultCacheService com.muyu.enterprise.cache.AllFenceCahceService +com.muyu.enterprise.cache.AllFenceGroupCahceService com.muyu.enterprise.cache.AllMessageValueCacheService com.muyu.enterprise.cache.AllVehicleCacheService com.muyu.enterprise.cache.AllVehicleTypeCacheService @@ -8,6 +9,7 @@ com.muyu.enterprise.cache.AllWarnStrategyAndVinCacheService com.muyu.enterprise.cache.AllWarnStrategyCacheService com.muyu.enterprise.cache.FaultCacheService com.muyu.enterprise.cache.FenceCahceService +com.muyu.enterprise.cache.FenceGroupCahceService com.muyu.enterprise.cache.MessageTemplateCacheService com.muyu.enterprise.cache.MessageValueCacheService com.muyu.enterprise.cache.VehicleCacheService diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Vehicle.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Vehicle.java index d58d855..fedca96 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Vehicle.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Vehicle.java @@ -123,6 +123,13 @@ public class Vehicle extends BaseEntity { @Schema(type = "Long",description = "策略id") private Long warnStrategyId; + + /** 故障id */ + @Schema(type = "Long",description = "策略id") + private Long faultId; + + + public static Vehicle addBuild(VehicleAddReq vehicleAddReq){ return Vehicle.builder() .licenceNumber(vehicleAddReq.getLicenceNumber()) @@ -137,6 +144,7 @@ public class Vehicle extends BaseEntity { .companyId(vehicleAddReq.getCompanyId()) .fenceGroupId(vehicleAddReq.getFenceGroupId()) .warnStrategyId(vehicleAddReq.getWarnStrategyId()) + .faultId(vehicleAddReq.getFaultId()) .build(); } @@ -155,6 +163,7 @@ public class Vehicle extends BaseEntity { .companyId(vehicleUpdReq.getCompanyId()) .fenceGroupId(vehicleUpdReq.getFenceGroupId()) .warnStrategyId(vehicleUpdReq.getWarnStrategyId()) + .faultId(vehicleUpdReq.getFaultId()) .build(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleAddReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleAddReq.java index 664a6fa..8812ea4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleAddReq.java @@ -101,4 +101,9 @@ public class VehicleAddReq { @Schema(type = "Long",description = "策略id") @TableId( type = IdType.AUTO) private Long warnStrategyId; + + /** 故障id */ + @Schema(type = "Long",description = "策略id") + private Long faultId; + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleUpdReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleUpdReq.java index 51fcd7e..650611f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/VehicleUpdReq.java @@ -102,5 +102,8 @@ public class VehicleUpdReq { @TableId( type = IdType.AUTO) private Long warnStrategyId; + /** 故障id */ + @Schema(type = "Long",description = "策略id") + private Long faultId; } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/BoundFenceGroup.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/BoundFenceGroup.java new file mode 100644 index 0000000..49dbab6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/BoundFenceGroup.java @@ -0,0 +1,45 @@ +package com.muyu.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "车辆绑定的围栏组", description = "车辆绑定的围栏组") +public class BoundFenceGroup { + + /** + * 主键 + */ + @TableId(value = "fence_group_id" ,type = IdType.AUTO) + @Schema(type = "Long",description = "围栏组id") + private Long fenceGroupId; + + /** + * 优先级 + */ + @Schema(type = "String",description = "优先级") + private String priority; + + /** + * 状态 0:启用 1:禁止 + */ + @Schema(type = "Integer",description = "状态 0:启用 1:禁止") + private Integer status; + + /** + * 围栏组类型 + */ + @Schema(type = "String",description = "围栏组类型") + private String groupType; + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultController.java index 339b885..a9b937c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultController.java @@ -19,12 +19,7 @@ import java.util.Arrays; import java.util.List; /** - * @Author：ChenYan - * @Project：2112-car-cloud-server - * @Package：com.muyu.fault.controller - * @Filename：FaultController - * @Description TODO - * @Date：2024/9/17 11:08 + * 故障管理 */ @Log4j2 diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultInfoController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultInfoController.java index a0b8860..1c203b9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultInfoController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultInfoController.java @@ -1,5 +1,6 @@ package com.muyu.enterprise.controller; +import com.muyu.enterprise.cache.FaultCacheService; import com.muyu.enterprise.service.FaultInfoService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -38,6 +39,8 @@ public class FaultInfoController extends BaseController { @Autowired private FaultInfoService service; + @Autowired + private FaultCacheService faultCacheService; /** * 查询车辆故障管理列表 @@ -80,8 +83,10 @@ public class FaultInfoController extends BaseController { @Log(title = "车辆故障管理", businessType = BusinessType.INSERT) @PostMapping @RequiresPermissions("fault:info:add") - public Result add(@RequestBody FaultInfo fault) { - service.save(fault); + public Result add(@RequestBody FaultInfo faultInfo) { + service.save(faultInfo); + //添加的数据存进缓存 +// faultCacheService.put(faultInfo.); return Result.success(null, "成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java index 717e9a3..70c4cbc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java @@ -20,12 +20,7 @@ import java.util.Arrays; import java.util.List; /** - * @Author：ChenYan - * @Project：2112-car-cloud-server - * @Package：com.muyu.fault.controller - * @Filename：FaultLogController - * @Description TODO - * @Date：2024/9/16 20:20 + * 故障日志 */ @RestController @RequestMapping("/log") diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java index 8da6fd8..62e57b4 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageTemplateController.java @@ -17,12 +17,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * @Author: LiDongJia - * @Package: com.muyu.car.controller - * @Project: 2112-car-cloud-server - * @name: MessageTypeController - * @Date: 2024/9/18 20:18 - * @Description: 报文模版控制层 + * 报文模版控制层 */ @Log4j2 @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java index f262f49..44e6937 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MessageValueController.java @@ -17,12 +17,7 @@ import java.util.List; import java.util.stream.Collectors; /** - * @Author: LiDongJia - * @Package: com.muyu.car.controller - * @Project: 2112-car-cloud-server - * @name: MessageValueController - * @Date: 2024/9/19 15:46 - * @Description: 报文数据控制层 + * 报文数据控制层 */ @Log4j2 @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MiddleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MiddleController.java index 860e435..0f109bf 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/MiddleController.java @@ -12,6 +12,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +/** + * 中间表Controller + */ @Log4j2 @RequestMapping("/middle") @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/RuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/RuleController.java index bb8c77f..b25ed84 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/RuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/RuleController.java @@ -22,12 +22,7 @@ import java.util.Arrays; import java.util.List; /** - * @Author：ChenYan - * @Project：2112-car-cloud-server - * @Package：com.muyu.fault.controller - * @Filename：RuleController - * @Description TODO - * @Date：2024/9/21 18:42 + * 故障规则 */ @Log4j2 @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java index 349d913..2c4296e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleController.java @@ -4,12 +4,10 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.domain.WarnStrategy; import com.muyu.domain.req.BoundFenceGroupReq; +import com.muyu.domain.resp.BoundFenceGroup; import com.muyu.domain.resp.WarnRuleResp; import com.muyu.domain.resp.WarnStrategyAndVinResp; -import com.muyu.enterprise.cache.AllVehicleCacheService; -import com.muyu.enterprise.cache.AllWarnStrategyAndVinCacheService; -import com.muyu.enterprise.cache.VehicleCacheService; -import com.muyu.enterprise.cache.WarnStrategyCacheService; +import com.muyu.enterprise.cache.*; import com.muyu.enterprise.service.VehicleService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -35,12 +33,7 @@ import java.util.Collections; import java.util.List; /** - * @Author: LiDongJia - * @Package: com.muyu.car.controller - * @Project: 2112-car-cloud-server - * @name: VehicleController - * @Date: 2024/9/17 17:35 - * @Description: 车辆管理控制层 + * 车辆管理控制层 */ @Log4j2 @RestController @@ -65,6 +58,12 @@ public class VehicleController extends BaseController { private WarnStrategyService warnStrategyService; @Autowired private WarnStrategyCacheService warnStrategyCacheService; + //添加围栏组缓存信息 + @Autowired + private FenceGroupCahceService fenceGroupCahceService; + //绑定的围栏组信息 + @Autowired + private AllFenceGroupCahceService allFenceGroupCahceService; /** @@ -81,10 +80,17 @@ public class VehicleController extends BaseController { List vehicleList = vehicleService.list(); vehicleList.forEach(vehicle -> { vehicleCacheService.put(vehicle.getVehicleVin(), vehicle); + //根据车辆vin存储策略已经规则信息 if(vehicle.getWarnStrategyId()!=null){ WarnRuleResp respList = warnStrategyService.findByWarnStrategyId(vehicle.getWarnStrategyId()); warnStrategyCacheService.put(vehicle.getVehicleVin(), respList); } + //根据车辆vin存储围栏信息 + if(vehicle.getFenceGroupId()!=null){ + //根据外键查询围栏组信息 + List boundMiddles = vehicleService.findByFenceGroupId(vehicle.getVehicleId()); + allFenceGroupCahceService.put(vehicle.getVehicleVin(), boundMiddles); + } }); return getDataTable(list); } @@ -177,6 +183,12 @@ public class VehicleController extends BaseController { public Result boundFenceGroup( @Validated @RequestBody BoundFenceGroupReq boundFenceGroupReq){ vehicleService.boundFenceGroup(boundFenceGroupReq); + Vehicle byId = vehicleService.getById(boundFenceGroupReq.getVehicleId()); + String vehicleVin = byId.getVehicleVin(); + if(byId!=null){ + //将围栏组信息存入Redis + fenceGroupCahceService.put(vehicleVin, boundFenceGroupReq); + } return Result.success("绑定成功"); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java index 068cd45..6fa8add 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/VehicleTypeController.java @@ -20,12 +20,7 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author: LiDongJia - * @Package: com.muyu.car.controller - * @Project: 2112-car-cloud-server - * @name: VehicleTypeController - * @Date: 2024/9/17 17:08 - * @Description: 车辆类型实体类 + 车辆类型 */ @Log4j2 @RestController diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java index ac73d8b..3c37e6a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java @@ -11,6 +11,9 @@ import org.springframework.web.bind.annotation.*; import java.util.Arrays; import java.util.List; +/** + * 预警日志 + */ @RestController @RequestMapping("/logs") public class WarnLogsController { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java index b1612ec..5c7f8af 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java @@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * 预警规则 + */ @RestController @RequestMapping("/rule") public class WarnRuleController { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java index 705288b..7baccce 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java @@ -19,6 +19,9 @@ import org.springframework.web.bind.annotation.*; import java.util.List; +/** + * 预警策略 + */ @RestController @RequestMapping("/strategy") public class WarnStrategyController { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java index 3c8ecf2..0585e49 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/ElectMapper.java @@ -9,6 +9,9 @@ import org.apache.ibatis.annotations.Update; import java.util.List; +/** + * 电子围栏Mapper + */ @Mapper public interface ElectMapper extends MPJBaseMapper { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java index 1fcbaa5..6a7cc6c 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/VehicleMapper.java @@ -1,10 +1,12 @@ package com.muyu.enterprise.mapper; import com.github.yulichang.base.MPJBaseMapper; +import com.muyu.domain.BoundMiddle; import com.muyu.domain.FenceGroup; import com.muyu.domain.Vehicle; import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; +import com.muyu.domain.resp.BoundFenceGroup; import com.muyu.domain.resp.VehicleManageResp; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; @@ -29,7 +31,7 @@ public interface VehicleMapper extends MPJBaseMapper { * @param vehicleManageReq * @return */ - List findAll(VehicleManageReq vehicleManageReq); +// List findAll(VehicleManageReq vehicleManageReq); /** * 根据车辆vin查询模版id @@ -46,12 +48,13 @@ public interface VehicleMapper extends MPJBaseMapper { // @Insert("INSERT INTO `vehicle-basic`.`bound_middle` (`fence_group_id`,`vehicle_id`) VALUES (#{id},#{vehicleId}) ") @Insert({ "" -// "INSERT INTO `vehicle-basic`.`bound_middle` (fence_group_id, vehicle_id) VALUES (#{id}, #{vehicleId}) " }) void boundFenceGroup(BoundFenceGroupReq boundFenceGroupReq); @Select("SELECT * FROM bound_middle bm LEFT JOIN vehicle v ON bm.vehicle_id=v.vehicle_id WHERE bm.fence_group_id = #{fenceGroupId}") List showBoundFenceGroup(@Param("fenceGroupId") Long fenceGroupId); + @Select("SELECT fence_group.group_type, fence_group.priority,fence_group.`status`,bound_middle.fence_group_id FROM fence_group LEFT JOIN bound_middle ON fence_group.fence_group_id = bound_middle.fence_group_id WHERE bound_middle.vehicle_id = #{vehicleId}") + List findByFenceGroupId(Long vehicleId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java index 940aeda..26e1f5f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/VehicleService.java @@ -1,10 +1,12 @@ package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.BoundMiddle; import com.muyu.domain.FenceGroup; import com.muyu.domain.Vehicle; import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; +import com.muyu.domain.resp.BoundFenceGroup; import com.muyu.domain.resp.VehicleManageResp; import org.apache.ibatis.annotations.Param; @@ -47,4 +49,10 @@ public interface VehicleService extends IService { */ List showBoundFenceGroup(@Param("fenceGroupId") Long fenceGroupId); + /** + * 根据围栏组id查询围栏信息 + * @param vehicleId + */ + List findByFenceGroupId(Long vehicleId); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FencegroupServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FencegroupServiceImpl.java index 4784433..9e0ea70 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FencegroupServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FencegroupServiceImpl.java @@ -1,6 +1,7 @@ package com.muyu.enterprise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.enterprise.cache.FenceGroupCahceService; import com.muyu.enterprise.mapper.FencegroupMapper; import com.muyu.enterprise.service.IFencegroupService; import com.muyu.domain.FenceGroup; @@ -25,6 +26,11 @@ public class FencegroupServiceImpl @Autowired private FencegroupMapper fencegroupMapper; + //围栏组缓存 + @Autowired + private FenceGroupCahceService fenceGroupCahceService; + + @Override public List showGroupList(FenceGroupReq req) { List fenceGroups = fencegroupMapper.showGroupList(req); @@ -37,6 +43,12 @@ public class FencegroupServiceImpl this.save(build); //添加中间表 Long fenceGroupId = build.getFenceGroupId(); +// //添加缓存 +// if(fenceGroupId != null){ +// //获取车辆vin +// +// fenceGroupCahceService.put(); +// } fencegroupMapper.addMiddle(addReq.getFenceIds(),fenceGroupId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java index 321f207..8e727dd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/VehicleServiceImpl.java @@ -3,11 +3,13 @@ package com.muyu.enterprise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.BoundMiddle; import com.muyu.domain.FenceGroup; import com.muyu.domain.Vehicle; import com.muyu.domain.VehicleType; import com.muyu.domain.req.BoundFenceGroupReq; import com.muyu.domain.req.VehicleManageReq; +import com.muyu.domain.resp.BoundFenceGroup; import com.muyu.domain.resp.VehicleManageResp; import com.muyu.enterprise.cache.AllVehicleCacheService; import com.muyu.enterprise.mapper.VehicleMapper; @@ -84,5 +86,11 @@ public class VehicleServiceImpl return fenceGroups; } + @Override + public List findByFenceGroupId(Long vehicleId) { + List list = vehicleMapper.findByFenceGroupId(vehicleId); + return list; + } + } 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 66bc686..632dda5 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 @@ -8,7 +8,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: 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 489071b..a944fad 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # Spring spring: 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 97fb5ad..d017baf 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # Spring spring: diff --git a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml index d0dbae7..cdd514b 100644 --- a/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # Spring spring: diff --git a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml index 619fc26..2c42a42 100644 --- a/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-protocol-parsing/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: 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 b5ea3d8..b452d2d 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml index 303ca8a..2d7dbf9 100644 --- a/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-vehicle-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: 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 8ce1850..f32db20 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 47.101.49.53:8848 user-name: nacos password: nacos - namespace: seven + namespace: fence # Spring spring: