diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java index 8f55852..f62f385 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/SysCarController.java @@ -32,7 +32,7 @@ public class SysCarController { return Result.success(sysCarService.addSysCar(sysCar)); } - @PutMapping("/updateSysCar") + @PostMapping("/updateSysCar") public Result updateSysCar(@RequestBody SysCar sysCar){ return Result.success(sysCarService.updateSysCar(sysCar)); } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java index 46c9ec6..773276c 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/domain/CarType.java @@ -15,6 +15,6 @@ public class CarType { @TableId(value = "id",type = IdType.AUTO) private Long id; private String typeName; - private Long messageId; + private Long templateId; } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java index 722606d..b40228b 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnRuleController.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import javax.annotation.Resource; +import com.muyu.domain.resp.WarnRuleResp; import com.muyu.service.WarnRuleService; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -33,11 +34,10 @@ public class WarnRuleController extends BaseController /** * 查询预警规则列表 */ - @GetMapping("/list") - public Result list(@RequestBody WarnRule warnRule) + @GetMapping("/selectWarnRuleResplist") + public Result selectWarnRuleResplist() { - List list = warnRuleService.selectWarnRuleList(warnRule); - return getDataTable(list); + return Result.success(warnRuleService.selectWarnRuleResplist()); } /** @@ -65,8 +65,8 @@ public class WarnRuleController extends BaseController * 修改预警规则 */ - @PutMapping - public Result updWarnRule(@RequestBody WarnRule warnRule) + @PostMapping("/updWarnRule") + public Result updWarnRule(@RequestBody WarnRule warnRule) { int i = warnRuleService.updWarnRule(warnRule); return i>0?Result.success():Result.error(); @@ -76,9 +76,17 @@ public class WarnRuleController extends BaseController * 删除预警规则 */ @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) + public Result remove(@PathVariable("ids") Long[] ids) { warnRuleService.removeBatchByIds(Arrays.asList(ids)); return success(); } + + + + //根据策略ID查规则 + @GetMapping("/selectListByStrategyId/{strategyId}") + public Result selectListByStrategyId(@PathVariable("strategyId") Long strategyId){ + return Result.success(warnRuleService.selectListByStrategyId(strategyId)); + } } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnStrategyController.java index 95ff34c..af6660b 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/WarnStrategyController.java @@ -4,6 +4,7 @@ import java.util.Arrays; import java.util.List; import com.muyu.domain.req.WarnStrategyReq; +import com.muyu.domain.resp.WarnStrategyResp; import com.muyu.service.WarnStrategyService; import jakarta.servlet.http.HttpServletResponse; import javax.annotation.Resource; @@ -38,12 +39,10 @@ public class WarnStrategyController extends BaseController /** * 查询预警策略列表 */ - @GetMapping("/list") - public Result> list(@RequestBody WarnStrategyReq warnStrategyReq) + @GetMapping("/selectWarnStrategyList") + public Result selectWarnStrategyList(@RequestBody WarnStrategyReq warnStrategyReq) { - startPage(); - List list = warnStrategyService.selectWarnStrategyList(warnStrategyReq); - return getDataTable(list); + return Result.success(warnStrategyService.selectWarnStrategyList(warnStrategyReq)); } @@ -63,10 +62,7 @@ public class WarnStrategyController extends BaseController public Result addWarnStrategy(@RequestBody WarnStrategy warnStrategy) { Integer i = warnStrategyService.addWarnStrategy(warnStrategy); - if (i>0){ - return Result.success("修改成功"); - } - return Result.error("修改失败"); + return i>0?Result.success():Result.error(); } /** @@ -76,19 +72,26 @@ public class WarnStrategyController extends BaseController public Result updWarnStrategy(@RequestBody WarnStrategy warnStrategy) { Integer i = warnStrategyService.updWarnStrategy(warnStrategy); - if (i>0){ - return Result.success("修改成功"); - } - return Result.error("修改失败"); + return i>0?Result.success():Result.error(); } /** * 删除预警策略 */ - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) + @DeleteMapping("deleteWarnStrategy/{id}") + public Result deleteWarnStrategy(@PathVariable("id") Long id) { - warnStrategyService.removeBatchByIds(Arrays.asList(ids)); - return success(); + Integer i = warnStrategyService.deleteWarnStrategy(id); + return i>0?Result.success():Result.error(); + } + + + + /** + * 根据车辆类型ID查询策略 + */ + @GetMapping("/selectListByCarType/{carTypeId}") + public Result selectListByCarType(@PathVariable("carTypeId") Long carTypeId) { + return Result.success(warnStrategyService.selectListByCarType(carTypeId)); } } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnLogs.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnLogs.java index 3196667..cd009cf 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnLogs.java @@ -1,16 +1,15 @@ package com.muyu.domain; -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; /** * 预警日志对象 warn_logs diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java index cd16342..666ff35 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnRule.java @@ -1,14 +1,12 @@ package com.muyu.domain; -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 预警规则对象 warn_rule diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnStrategy.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnStrategy.java index c0f56bd..2690755 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/WarnStrategy.java @@ -1,10 +1,12 @@ package com.muyu.domain; -import com.muyu.common.core.annotation.Excel; -import lombok.*; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; +import com.muyu.common.core.annotation.Excel; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; /** * 预警策略对象 warn_strategy @@ -34,7 +36,7 @@ public class WarnStrategy { /** 报文模版id */ @Excel(name = "报文模版id") - private Long msgId; + private Long templateId; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/req/WarnStrategyReq.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/req/WarnStrategyReq.java index f753d52..f849f1e 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/req/WarnStrategyReq.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/req/WarnStrategyReq.java @@ -1,8 +1,5 @@ package com.muyu.domain.req; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import lombok.AllArgsConstructor; import lombok.Data; @@ -31,7 +28,7 @@ public class WarnStrategyReq { /** 报文模版id */ @Excel(name = "报文模版id") - private Long msgId; + private Long templateId; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnLogsResq.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnLogsResq.java new file mode 100644 index 0000000..844852f --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnLogsResq.java @@ -0,0 +1,17 @@ +package com.muyu.domain.resp; + + +import com.muyu.common.core.annotation.Excel; +import com.muyu.domain.WarnLogs; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WarnLogsResq extends WarnLogs { + /** 规则名称 */ + @Excel(name = "规则名称") + private String ruleName; +} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnRuleResp.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnRuleResp.java new file mode 100644 index 0000000..ae582f6 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnRuleResp.java @@ -0,0 +1,15 @@ +package com.muyu.domain.resp; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.domain.WarnRule; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WarnRuleResp extends WarnRule { + @Excel(name = "策略名称") + private String strategyName; +} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnStrategyResp.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnStrategyResp.java new file mode 100644 index 0000000..ceb6db3 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/resp/WarnStrategyResp.java @@ -0,0 +1,24 @@ +package com.muyu.domain.resp; + + +import com.muyu.common.core.annotation.Excel; +import com.muyu.domain.WarnStrategy; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class WarnStrategyResp extends WarnStrategy { + /** 车辆类型名称 */ + private String typeName; + + /** 策略名称 */ + @Excel(name = "策略名称") + private String strategyName; + + /** 报文模版id */ + @Excel(name = "报文模版名称") + private String templateName; +} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java index d739cff..6a55569 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnRuleMapper.java @@ -3,7 +3,9 @@ package com.muyu.mapper; import java.util.List; import com.muyu.domain.WarnRule ; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.resp.WarnRuleResp; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 预警规则Mapper接口 @@ -14,4 +16,10 @@ import org.apache.ibatis.annotations.Mapper; @Mapper public interface WarnRuleMapper extends BaseMapper{ + //规则列表 + List selectWarnRuleResplist(); + + //根据策略ID查规则 + List selectListByStrategyId(@Param("strategyId")Long strategyId); + } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnStrategyMapper.java index 152a315..dc461ef 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/WarnStrategyMapper.java @@ -2,7 +2,12 @@ package com.muyu.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.WarnStrategy; +import com.muyu.domain.req.WarnStrategyReq; +import com.muyu.domain.resp.WarnStrategyResp; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; /** * 预警策略Mapper接口 @@ -12,5 +17,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface WarnStrategyMapper extends BaseMapper { + //列表 + List selectWarnStrategyList(WarnStrategyReq warnStrategyReq); + + //根据车辆类型查询策略 + List selectListByCarType(@Param("carTypeId")Long carTypeId); } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java index da252e6..9ab98b8 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnRuleService.java @@ -3,6 +3,8 @@ package com.muyu.service; import java.util.List; import com.muyu.domain.WarnRule; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.resp.WarnRuleResp; +import org.apache.ibatis.annotations.Param; /** * 预警规则Service接口 @@ -21,11 +23,9 @@ public interface WarnRuleService extends IService { /** * 查询预警规则列表 - * - * @param warnRule 预警规则 * @return 预警规则集合 */ - public List selectWarnRuleList(WarnRule warnRule); + List selectWarnRuleResplist(); /** @@ -39,4 +39,7 @@ public interface WarnRuleService extends IService { */ Integer updWarnRule(WarnRule warnRule); + //根据策略ID查规则 + List selectListByStrategyId(Long strategyId); + } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnStrategyService.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnStrategyService.java index a347cf2..80e38b9 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnStrategyService.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/WarnStrategyService.java @@ -4,6 +4,8 @@ import java.util.List; import com.muyu.domain.WarnStrategy; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.req.WarnStrategyReq; +import com.muyu.domain.resp.WarnStrategyResp; +import org.apache.ibatis.annotations.Param; /** * 预警策略Service接口 @@ -23,10 +25,15 @@ public interface WarnStrategyService extends IService { /** * 查询预警策略列表 * - * @param warnStrategy 预警策略 + * @param warnStrategyReq 预警策略 * @return 预警策略集合 */ - public List selectWarnStrategyList(WarnStrategyReq warnStrategyReq); + public List selectWarnStrategyList(WarnStrategyReq warnStrategyReq); + + /** + * 删除 + */ + public Integer deleteWarnStrategy(Long id); @@ -40,4 +47,9 @@ public interface WarnStrategyService extends IService { */ Integer addWarnStrategy(WarnStrategy warnStrategy); + /** + * 根据车辆类型ID查询策略 + */ + List selectListByCarType(Long carTypeId); + } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java index 8878136..9fe146e 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java @@ -2,6 +2,7 @@ package com.muyu.service.impl; import java.util.List; +import com.muyu.domain.resp.WarnRuleResp; import com.muyu.mapper.WarnRuleMapper; import com.muyu.service.WarnRuleService; import org.springframework.beans.factory.annotation.Autowired; @@ -40,14 +41,13 @@ public class WarnRuleServiceImpl /** * 查询预警规则列表 * - * @param warnRule 预警规则 + * @param * @return 预警规则 */ @Override - public List selectWarnRuleList(WarnRule warnRule) + public List selectWarnRuleResplist() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - return warnRuleMapper.selectList(queryWrapper); + return warnRuleMapper.selectWarnRuleResplist(); } @Override @@ -61,5 +61,10 @@ public class WarnRuleServiceImpl return warnRuleMapper.update(queryWrapper); } + @Override + public List selectListByStrategyId(Long strategyId) { + return warnRuleMapper.selectListByStrategyId(strategyId); + } + } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java index 1099c69..c86da55 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.muyu.domain.WarnStrategy; import com.muyu.domain.req.WarnStrategyReq; +import com.muyu.domain.resp.WarnStrategyResp; import com.muyu.mapper.WarnLogsMapper; import com.muyu.mapper.WarnStrategyMapper; import com.muyu.service.WarnStrategyService; @@ -49,21 +50,15 @@ public class WarnStrategyServiceImpl * @return 预警策略 */ @Override - public List selectWarnStrategyList(WarnStrategyReq warnStrategyReq) + public List selectWarnStrategyList(WarnStrategyReq warnStrategyReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (warnStrategyReq.getCarTypeId()!=null){ - queryWrapper.eq(WarnStrategy::getCarTypeId, warnStrategyReq.getCarTypeId()); - } - if (StringUtils.isNotEmpty(warnStrategyReq.getStrategyName())){ - queryWrapper.like(WarnStrategy::getStrategyName, warnStrategyReq.getStrategyName()); - } - if (warnStrategyReq.getMsgId()!=null){ - queryWrapper.eq(WarnStrategy::getMsgId, warnStrategyReq.getMsgId()); - } - return this.list(queryWrapper); + return warnStrategyMapper.selectWarnStrategyList(warnStrategyReq); } + @Override + public Integer deleteWarnStrategy(Long id) { + return warnStrategyMapper.deleteById(id); + } /** @@ -82,4 +77,14 @@ public class WarnStrategyServiceImpl } + + /** + * 根据车辆类型ID查询策略 + */ + @Override + public List selectListByCarType(Long carTypeId) { + return warnStrategyMapper.selectListByCarType(carTypeId); + } + + } diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/banner.txt b/cloud-modules/cloud-modules-warn/src/main/resources/banner.txt new file mode 100644 index 0000000..0dd5eee --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/resources/banner.txt @@ -0,0 +1,2 @@ +Spring Boot Version: ${spring-boot.version} +Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml new file mode 100644 index 0000000..6e01746 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml @@ -0,0 +1,19 @@ + + + + + + + + diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnStrategyMapper.xml new file mode 100644 index 0000000..ed25a70 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnStrategyMapper.xml @@ -0,0 +1,35 @@ + + + + + + +