diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceCahceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceCahceService.java index c9cfdca..0555572 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceCahceService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/FenceCahceService.java @@ -2,6 +2,9 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBacis; import com.muyu.domain.Fence; +import com.muyu.domain.resp.FenceResp; + +import java.util.List; /** * 电子围栏缓存 @@ -21,4 +24,5 @@ public class FenceCahceService extends CacheAbsBacis { public String decode(String key) { return key.replace("fence:info:", ""); } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleTypeCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleTypeCacheService.java new file mode 100644 index 0000000..8bdaeb4 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/VehicleTypeCacheService.java @@ -0,0 +1,24 @@ +package com.muyu.enterprise.cache; + +import com.muyu.common.cache.CacheAbsBacis; +import com.muyu.domain.VehicleType; + +/** + * 故障缓存服务 + */ +public class VehicleTypeCacheService extends CacheAbsBacis { + @Override + public void clear() { + + } + + @Override + public String keyPre() { + return "vehicleType:info:"; + } + + @Override + public String decode(String key) { + return key.replace("vehicleType: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 5da48af..1121aa6 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 @@ -3,3 +3,4 @@ com.muyu.enterprise.cache.FaultCacheService com.muyu.enterprise.cache.FenceCahceService com.muyu.enterprise.cache.WarnRuleCacheService com.muyu.enterprise.cache.WarnStrategyCacheService +com.muyu.enterprise.cache.MessageTemplateCacheService diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java index 4833c1d..629720b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/VehicleType.java @@ -3,9 +3,6 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; @@ -46,5 +43,14 @@ public class VehicleType extends BaseEntity { @Schema(type = "Integer",description = "报文模版外键") private Integer messageTemplateId; + /** + * 添加车辆类型 + */ + public static VehicleType addBuilder(VehicleType vehicleType) { + return VehicleType.builder(). + vehicleTypeId(vehicleType.getVehicleTypeId()). + vehicleTypeName(vehicleType.getVehicleTypeName()). + build(); + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java index faacde7..d872f71 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/ElectController.java @@ -54,7 +54,7 @@ public class ElectController extends BaseController { public Result> showList(@RequestBody @Validated FenceReq req) { startPage(); List list = electService.selectFenceList(req); - fenceCahceService.get(String.valueOf(req)); + //将列表存到Redis return getDataTable(list); } 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 a2ee8ce..c0a6cd4 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 @@ -1,15 +1,20 @@ package com.muyu.enterprise.controller; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.LoginUser; +import com.muyu.domain.MessageValue; import com.muyu.domain.VehicleType; +import com.muyu.domain.req.MessageValueAddReq; +import com.muyu.domain.req.VehicleAddReq; +import com.muyu.enterprise.cache.VehicleCacheService; +import com.muyu.enterprise.cache.VehicleTypeCacheService; import com.muyu.enterprise.service.VehicleTypeService; import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -30,6 +35,9 @@ public class VehicleTypeController { @Autowired private VehicleTypeService vehicleTypeService; + @Autowired + private VehicleTypeCacheService vehicleTypeCacheService; + /** * 查询所有车辆类型 * @return @@ -39,4 +47,22 @@ public class VehicleTypeController { public Result> findAll(){ return Result.success(vehicleTypeService.list()); } + + /** + * 添加车辆类型 + * @param vehicleType + * @return + */ + @PostMapping("/add") + @Operation(summary = "添加报文数据", description = "新增报文数据") + public Result save(@RequestBody VehicleType vehicleType) { + boolean save = vehicleTypeService.save(vehicleType); + //获取用户信息 + LoginUser loginUser = SecurityUtils.getLoginUser(); + //获取租户唯一标识 + String databaseName = loginUser.getSysUser().getDatabaseName(); + //存到redis + vehicleTypeCacheService.put(databaseName+vehicleType.getVehicleTypeId(),vehicleType); + return Result.success(save? "添加成功" : "添加失败"); + } } 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 5a986fe..8884b33 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 @@ -40,4 +40,5 @@ public interface VehicleMapper extends MPJBaseMapper { */ @Select("SELECT t.message_template_id FROM vehicle v LEFT JOIN vehicle_type t ON v.vehicle_type_id = t.vehicle_type_id WHERE v.vehicle_vin = #{vehicleVin}") Long findByVehicleVin(String vehicleVin); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFencegroupService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFencegroupService.java index d9c4968..6e12109 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFencegroupService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFencegroupService.java @@ -19,7 +19,5 @@ public interface IFencegroupService extends IService { void addGroup(FenceGroupAddReq addReq); -// List haveFence(HaveFence haveFence); -// } 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 a7f2c89..d07fae9 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 @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.Vehicle; import com.muyu.domain.req.VehicleManageReq; import com.muyu.domain.resp.VehicleManageResp; +import org.apache.ibatis.annotations.Param; import java.util.List; @@ -31,4 +32,10 @@ public interface VehicleService extends IService { * @return */ Long findByVehicleVin(String vehicleVin); + + /** + * 绑定围栏组 + */ + void bindFenceGroup(@Param("fenceGroupIds") Integer[] fenceGroupIds, @Param("vehicleId") Long vehicleId); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java index 5f39ff7..1902ec0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/ElectServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.enterprise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.muyu.enterprise.cache.FenceCahceService; import com.muyu.enterprise.mapper.ElectMapper; import com.muyu.enterprise.mapper.WarnLogsMapper; import com.muyu.enterprise.service.ElectService; @@ -25,6 +26,10 @@ public class ElectServiceImpl @Autowired private WarnLogsMapper warnLogsMapper; + @Autowired + private FenceCahceService fenceCahceService; + + @Override public List selectFenceList(FenceReq req) { @@ -39,6 +44,11 @@ public class ElectServiceImpl req.getFenceName() ); List list = electMapper.selectJoinList(FenceResp.class, wrapper); + + String decode = fenceCahceService.decode(String.valueOf(list)); + + //将获取到的数据存到Redis + fenceCahceService.put(String.valueOf(decode),d); return list; } // 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 98a6e69..4784433 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 @@ -41,10 +41,5 @@ public class FencegroupServiceImpl } -// @Override -// public List haveFence(HaveFence haveFence) { -// return null; -// } - } 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 1c3716b..ad25c1b 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 @@ -69,4 +69,9 @@ public class VehicleServiceImpl return templateId; } + @Override + public void bindFenceGroup(Integer[] fenceGroupIds, Long vehicleId) { + vehicleMapper.bindFenceGroup(fenceGroupIds, vehicleId); + } + } diff --git a/cloud-modules/cloud-modules-processing/pom.xml b/cloud-modules/cloud-modules-processing/pom.xml index f4ed06a..127f05c 100644 --- a/cloud-modules/cloud-modules-processing/pom.xml +++ b/cloud-modules/cloud-modules-processing/pom.xml @@ -100,6 +100,13 @@ cloud-common-kafka + + + com.muyu + cloud-modules-enterprise-cache + 3.6.3 + +