From 2e5cb19f4f9c0405ddc0c940d1b39706168567e1 Mon Sep 17 00:00:00 2001 From: sy200 <2063514638@qq.com> Date: Tue, 8 Oct 2024 09:53:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat:()=E4=BF=AE=E6=94=B9=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=98=E5=82=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AllWarnStrategyAndVinCacheService.java | 2 +- .../controller/VehicleController.java | 22 +++++++++++++++---- .../controller/WarnStrategyController.java | 8 +++---- .../enterprise/mapper/WarnStrategyMapper.java | 2 +- .../service/WarnStrategyService.java | 2 +- .../service/impl/WarnStrategyServiceImpl.java | 4 ++-- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnStrategyAndVinCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnStrategyAndVinCacheService.java index 5ef51f7..3f407ae 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnStrategyAndVinCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/AllWarnStrategyAndVinCacheService.java @@ -9,7 +9,7 @@ import java.util.List; /** * 预警策略缓存服务 */ -public class AllWarnStrategyAndVinCacheService extends CacheAbsBacis> { +public class AllWarnStrategyAndVinCacheService extends CacheAbsBacis { @Override public void clear() { 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 125aaed..6ae4fc5 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 @@ -2,9 +2,13 @@ package com.muyu.enterprise.controller; 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.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.service.VehicleService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -16,6 +20,7 @@ import com.muyu.domain.req.VehicleAddReq; import com.muyu.domain.req.VehicleManageReq; import com.muyu.domain.req.VehicleUpdReq; import com.muyu.domain.resp.VehicleManageResp; +import com.muyu.enterprise.service.WarnStrategyService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; @@ -51,6 +56,14 @@ public class VehicleController extends BaseController { //车辆信息 @Autowired private AllVehicleCacheService allVehicleCacheService; + //缓存策略和vin + @Autowired + private AllWarnStrategyAndVinCacheService allWarnStrategyAndVinCacheService; + //缓存策略 + @Autowired + private WarnStrategyService warnStrategyService; + @Autowired + private WarnStrategyCacheService warnStrategyCacheService; /** @@ -63,13 +76,14 @@ public class VehicleController extends BaseController { public Result> getVehicleList(@RequestBody VehicleManageReq vehicleManageReq) { startPage(); List list = vehicleService.getVehicleList(vehicleManageReq); -// 将车辆信息存到Redis -// for (VehicleManageResp resp : list) { -// allVehicleCacheService.put(resp.getVehicleVin(), resp); -// } + List vehicleList = vehicleService.list(); vehicleList.forEach(vehicle -> { vehicleCacheService.put(vehicle.getVehicleVin(), vehicle); + if(vehicle.getWarnStrategyId()!=null){ + WarnStrategy warnStrategy = warnStrategyService.getById(vehicle.getWarnStrategyId()); + warnStrategyCacheService.put(vehicle.getVehicleVin(),warnStrategy); + } }); return getDataTable(list); } 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 b080f53..b27b013 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 @@ -120,12 +120,12 @@ public class WarnStrategyController { /** * 通过vin缓存策略信息 */ - @RequestMapping(path = "/vinStrategyList/{vehicleId}",method = RequestMethod.POST) + @RequestMapping(path = "/vinStrategyList/{warnStrategyId}",method = RequestMethod.POST) @Operation(summary = "通过vin缓存策略信息", description = "通过vin缓存策略信息") - public Result> vinStrategyList(@PathVariable("vehicleId") Long vehicleId) { - List warnStrategyAndVinResp = warnStrategyService.findById(vehicleId); + public Result> vinStrategyList(@PathVariable("warnStrategyId") Long warnStrategyId) { + List warnStrategyAndVinResp = warnStrategyService.findById(warnStrategyId); for (WarnStrategyAndVinResp strategyAndVinResp : warnStrategyAndVinResp) { - allWarnStrategyAndVinCacheService.put(strategyAndVinResp.getVehicleVin(), warnStrategyAndVinResp); + allWarnStrategyAndVinCacheService.put(strategyAndVinResp.getVehicleVin(), (WarnStrategyAndVinResp) warnStrategyAndVinResp); } return Result.success(warnStrategyAndVinResp); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java index 22d0c2b..f82c21e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java @@ -13,7 +13,7 @@ import java.util.List; public interface WarnStrategyMapper extends MPJBaseMapper { - @Select("SELECT vehicle.vehicle_vin, warn_strategy.warn_strategy_id, warn_strategy.vehicle_type_id, warn_strategy.message_template_id FROM vehicle LEFT JOIN warn_strategy ON vehicle.warn_strategy_id = warn_strategy.warn_strategy_id WHERE vehicle.vehicle_id = #{vehicleId}") + @Select("SELECT vehicle.vehicle_vin, warn_strategy.warn_strategy_id, warn_strategy.vehicle_type_id, warn_strategy.message_template_id FROM vehicle LEFT JOIN warn_strategy ON vehicle.warn_strategy_id = warn_strategy.warn_strategy_id WHERE vehicle.warn_strategy_id = #{warn_strategy_id}") List findById(Long vehicleId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java index a32ba1b..0cd2b2d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java @@ -18,7 +18,7 @@ public interface WarnStrategyService extends IService { List selectList(WarnVehicleReq req); - List findById(Long vehicleId); + List findById(Long warnStrategyId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java index 449ba18..baa3553 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java @@ -43,8 +43,8 @@ public class WarnStrategyServiceImpl extends ServiceImpl findById(Long vehicleId) { - List byId = warnStrategyMapper.findById(vehicleId); + public List findById(Long warnStrategyId) { + List byId = warnStrategyMapper.findById(warnStrategyId); if (byId == null) { return null; } From a1ed677f0f88cc2d04c7817ac33f0743d99a036d Mon Sep 17 00:00:00 2001 From: sy200 <2063514638@qq.com> Date: Tue, 8 Oct 2024 11:50:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat:()=E4=BF=AE=E6=94=B9=E7=AD=96=E7=95=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=AD=98=E5=82=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cache/WarnStrategyCacheService.java | 3 +- .../main/java/com/muyu/domain/WarnRule.java | 7 --- .../com/muyu/domain/resp/WarnRuleResp.java | 58 +++++++++++++++++++ .../controller/VehicleController.java | 5 +- .../controller/WarnRuleController.java | 9 +++ .../controller/WarnStrategyController.java | 38 ++++++------ .../enterprise/mapper/WarnRuleMapper.java | 7 +++ .../enterprise/mapper/WarnStrategyMapper.java | 10 ++++ .../enterprise/service/WarnRuleService.java | 10 ++++ .../service/WarnStrategyService.java | 8 ++- .../service/impl/WarnRuleServiceImpl.java | 14 +++++ .../service/impl/WarnStrategyServiceImpl.java | 22 ++++++- 12 files changed, 159 insertions(+), 32 deletions(-) create mode 100644 cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/WarnRuleResp.java diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacheService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacheService.java index 3ae1855..ee6a0db 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacheService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-cache/src/main/java/com/muyu/enterprise/cache/WarnStrategyCacheService.java @@ -3,11 +3,12 @@ package com.muyu.enterprise.cache; import com.muyu.common.cache.CacheAbsBacis; import com.muyu.domain.WarnRule; import com.muyu.domain.WarnStrategy; +import com.muyu.domain.resp.WarnRuleResp; /** * 预警策略缓存服务 */ -public class WarnStrategyCacheService extends CacheAbsBacis { +public class WarnStrategyCacheService extends CacheAbsBacis { @Override public void clear() { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnRule.java index 29ce6ab..f664f75 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnRule.java @@ -43,11 +43,6 @@ public class WarnRule extends BaseEntity{ @Excel(name = "规则名称") private String ruleName; - /** 策略id */ - @Schema(type = "Integer",description = "策略id") - @Excel(name = "策略id") - private Integer strategyId; - /** 报文数据类型id */ @Schema(type = "Integer",description = "报文数据类型id") @Excel(name = "报文数据类型id") @@ -87,7 +82,6 @@ public class WarnRule extends BaseEntity{ return WarnRule.builder() .warnRuleId(supplier.get()) .ruleName(warnRule.getRuleName()) - .strategyId(warnRule.getStrategyId()) .msgTypeId(warnRule.getMsgTypeId()) .slideTime(warnRule.getSlideTime()) .slideFrequency(warnRule.getSlideFrequency()) @@ -102,7 +96,6 @@ public class WarnRule extends BaseEntity{ return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) .append("id", getWarnRuleId()) .append("ruleName", getRuleName()) - .append("strategyId", getStrategyId()) .append("msgTypeId", getMsgTypeId()) .append("slideTime", getSlideTime()) .append("slideFrequency", getSlideFrequency()) diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/WarnRuleResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/WarnRuleResp.java new file mode 100644 index 0000000..59e4d36 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/WarnRuleResp.java @@ -0,0 +1,58 @@ +package com.muyu.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.muyu.common.core.annotation.Excel; +import com.muyu.domain.WarnRule; +import com.muyu.domain.WarnStrategy; +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; + +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "规则列表", description = "规则列表") +public class WarnRuleResp { + + /** 策略id */ + @Schema(type = "Long",description = "策略id") + @TableId( type = IdType.AUTO) + private Long warnStrategyId; + + /** 策略名称 */ + @Schema(type = "String",description = "策略名称") + @Excel(name = "策略名称") + private String strategyName; + + /** 报文模版id */ + @Schema(type = "Integer",description = "报文模版id") + @Excel(name = "报文模版id") + private Integer messageTemplateId; + + /** 车辆类型id */ + @Schema(type = "Long",description = "车辆类型id") + @Excel(name = "车辆类型id") + private Long vehicleTypeId; + + /** 规则集合 */ + @Schema(type = "List",description = "规则集合") + private List warnRuleList; + + public static WarnRuleResp build(WarnStrategy warnStrategy, List warnRuleList){ + return WarnRuleResp.builder() + .warnStrategyId(warnStrategy.getWarnStrategyId()) + .strategyName(warnStrategy.getStrategyName()) + .messageTemplateId(warnStrategy.getMessageTemplateId()) + .vehicleTypeId(warnStrategy.getVehicleTypeId()) + .warnRuleList(warnRuleList) + .build(); + } + +} 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 6ae4fc5..349d913 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,6 +4,7 @@ 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.WarnRuleResp; import com.muyu.domain.resp.WarnStrategyAndVinResp; import com.muyu.enterprise.cache.AllVehicleCacheService; import com.muyu.enterprise.cache.AllWarnStrategyAndVinCacheService; @@ -81,8 +82,8 @@ public class VehicleController extends BaseController { vehicleList.forEach(vehicle -> { vehicleCacheService.put(vehicle.getVehicleVin(), vehicle); if(vehicle.getWarnStrategyId()!=null){ - WarnStrategy warnStrategy = warnStrategyService.getById(vehicle.getWarnStrategyId()); - warnStrategyCacheService.put(vehicle.getVehicleVin(),warnStrategy); + WarnRuleResp respList = warnStrategyService.findByWarnStrategyId(vehicle.getWarnStrategyId()); + warnStrategyCacheService.put(vehicle.getVehicleVin(), respList); } }); return getDataTable(list); 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 5361a73..b1612ec 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 @@ -92,4 +92,13 @@ public class WarnRuleController { return Result.success(warnRuleService.removeById(id)); } + /** + * 根据外键id查询集合 + */ + @GetMapping("/getWarnStrategyList/{warnStrategyId}") + @Operation(summary = "根据外键id查询集合", description = "根据外键id查询集合") + public Result> findByWarnStrategyId(@PathVariable("warnStrategyId") Long warnStrategyId) { + List list = warnRuleService.findBywarnStrategyId(warnStrategyId); + return Result.success(list); + } } 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 b27b013..705288b 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 @@ -4,6 +4,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; import com.muyu.domain.WarnStrategy; +import com.muyu.domain.resp.WarnRuleResp; import com.muyu.domain.resp.WarnStrategyAndVinResp; import com.muyu.enterprise.cache.AllWarnStrategyAndVinCacheService; import com.muyu.enterprise.cache.AllWarnStrategyCacheService; @@ -64,17 +65,6 @@ public class WarnStrategyController { return Result.success(warnStrategyService.getById(id)); } - /** - * 规则策略双表联查 - * @param warnVehicleReq - * @return - */ -// @RequestMapping(path = "ruleStrategyList",method = RequestMethod.POST) -// @Operation(summary = "策略规则双表联查", description = "获取所有策略规则双表联查") -// public Result> ruleStrategyList(@RequestBody WarnVehicleReq warnVehicleReq){ -// return Result.success(warnStrategyService.ruleStrategyList(warnVehicleReq)); -// } - /** * 添加策略 * @param warnStrategy @@ -85,13 +75,13 @@ public class WarnStrategyController { public Result strategyAdd(@Validated @RequestBody WarnStrategy warnStrategy){ boolean save = warnStrategyService.save(warnStrategy); - //存进Redis - //获取用户信息 - LoginUser loginUser = SecurityUtils.getLoginUser(); - //获取租户唯一标识 - String databaseName = loginUser.getSysUser().getDatabaseName(); - warnStrategyCacheService.put(databaseName+warnStrategy.getWarnStrategyId(),warnStrategy); - return Result.success(); +// //存进Redis +// //获取用户信息 +// LoginUser loginUser = SecurityUtils.getLoginUser(); +// //获取租户唯一标识 +// String databaseName = loginUser.getSysUser().getDatabaseName(); +// warnStrategyCacheService.put(databaseName+warnStrategy.getWarnStrategyId(),warnStrategy); + return Result.success(save); } /** @@ -130,4 +120,16 @@ public class WarnStrategyController { return Result.success(warnStrategyAndVinResp); } + // findbyid resp warnrulelist.set + /** + * 根据resp查询List集合,将rule查询到的集合添加到List集合中 + * @param warnStrategyId + */ + @RequestMapping(path = "/warnRuleRespList",method = RequestMethod.POST) + @Operation(summary = "根据resp查询List集合,将rule查询到的集合添加到List集合中", description = "根据resp查询List集合,将rule查询到的集合添加到List集合中") + public Result respStrategyList(@PathVariable("warnStrategyId") Long warnStrategyId) { + WarnRuleResp warnRuleRespList=warnStrategyService.findByWarnStrategyId(warnStrategyId); + return Result.success(warnRuleRespList); + } + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java index 8d082f3..c1a7a56 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java @@ -3,7 +3,14 @@ package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.WarnRule; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; @Mapper public interface WarnRuleMapper extends BaseMapper { + + @Select("SELECT * FROM warn_rule WHERE warn_strategy_id=#{warnStrategyId}") + List findBywarnStrategyId(Long warnStrategyId); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java index f82c21e..afd3bd8 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java @@ -2,6 +2,7 @@ package com.muyu.enterprise.mapper; import com.github.yulichang.base.MPJBaseMapper; import com.muyu.domain.WarnStrategy; +import com.muyu.domain.resp.WarnRuleResp; import com.muyu.domain.resp.WarnStrategyAndVinResp; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -16,4 +17,13 @@ public interface WarnStrategyMapper extends MPJBaseMapper { @Select("SELECT vehicle.vehicle_vin, warn_strategy.warn_strategy_id, warn_strategy.vehicle_type_id, warn_strategy.message_template_id FROM vehicle LEFT JOIN warn_strategy ON vehicle.warn_strategy_id = warn_strategy.warn_strategy_id WHERE vehicle.warn_strategy_id = #{warn_strategy_id}") List findById(Long vehicleId); + /** + * 查询列表（存Redis） + * @param warnStrategyId + * @return + */ + @Select("select * from warn_strategy where warn_strategy_id = #{warn_strategy_id}") + WarnRuleResp findByWarnStrategyId(Long warnStrategyId); + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnRuleService.java index 77a8bb7..cbdcb57 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnRuleService.java @@ -3,5 +3,15 @@ package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnRule; +import java.util.List; + public interface WarnRuleService extends IService { + + /** + * 根据预警策略ID查询预警规则集合 + * @param warnStrategyId + * @return + */ + List findBywarnStrategyId(Long warnStrategyId); + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java index 0cd2b2d..29a7c70 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/WarnStrategyService.java @@ -3,6 +3,7 @@ package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnStrategy; import com.muyu.domain.req.WarnVehicleReq; +import com.muyu.domain.resp.WarnRuleResp; import com.muyu.domain.resp.WarnStrategyAndVinResp; import com.muyu.domain.resp.WarnVehicleResp; @@ -20,5 +21,10 @@ public interface WarnStrategyService extends IService { List findById(Long warnStrategyId); - + /** + * 查询列表（存Redis） + * @param warnStrategyId + * @return + */ + WarnRuleResp findByWarnStrategyId(Long warnStrategyId); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java index 8280780..5076bcd 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java @@ -1,11 +1,25 @@ package com.muyu.enterprise.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.WarnRule; import com.muyu.enterprise.mapper.WarnRuleMapper; import com.muyu.enterprise.service.WarnRuleService; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Collections; +import java.util.List; + @Service public class WarnRuleServiceImpl extends ServiceImpl implements WarnRuleService { + + @Autowired + private WarnRuleMapper warnRuleMapper; + + @Override + public List findBywarnStrategyId(Long warnStrategyId) { + List warnRules = warnRuleMapper.findBywarnStrategyId(warnStrategyId); + return warnRules; + } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java index baa3553..62f2282 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java @@ -4,8 +4,12 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.yulichang.wrapper.MPJLambdaWrapper; import com.muyu.domain.MessageTemplate; +import com.muyu.domain.WarnRule; +import com.muyu.domain.resp.WarnRuleResp; import com.muyu.domain.resp.WarnStrategyAndVinResp; +import com.muyu.enterprise.controller.WarnRuleController; import com.muyu.enterprise.mapper.WarnStrategyMapper; +import com.muyu.enterprise.service.WarnRuleService; import com.muyu.enterprise.service.WarnStrategyService; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.VehicleType; @@ -17,6 +21,8 @@ import org.springframework.stereotype.Service; import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; + @Service public class WarnStrategyServiceImpl extends ServiceImpl @@ -25,6 +31,9 @@ public class WarnStrategyServiceImpl extends ServiceImpl selectList(WarnVehicleReq req) { @@ -45,10 +54,17 @@ public class WarnStrategyServiceImpl extends ServiceImpl findById(Long warnStrategyId) { List byId = warnStrategyMapper.findById(warnStrategyId); - if (byId == null) { - return null; - } return byId; } + @Override + public WarnRuleResp findByWarnStrategyId(Long warnStrategyId) { + + WarnRuleResp warnRuleResp = warnStrategyMapper.findByWarnStrategyId(warnStrategyId); + List bywarnStrategyId = warnRuleService.findBywarnStrategyId(warnStrategyId); + warnRuleResp.setWarnRuleList(bywarnStrategyId); + return warnRuleResp; + + } + }