diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java index 743a608..986bb08 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/controller/CarTypeController.java @@ -6,6 +6,7 @@ import com.muyu.domain.resp.CarTypeResp; import com.muyu.service.CarTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; @@ -25,9 +26,9 @@ public class CarTypeController { } - @GetMapping("/selectCarTypeRespList") - public Result selectCarTypeRespList() { - return Result.success(carTypeService.selectCarTypeRespList()); + @GetMapping("/selectCarTypeRespList/{id}") + public Result selectCarTypeRespList(@PathVariable("id") Long id) { + return Result.success(carTypeService.selectCarTypeRespList(id)); } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java index dff34d2..a773ba5 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/mapper/CarTypeMapper.java @@ -4,10 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarType; import com.muyu.domain.resp.CarTypeResp; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface CarTypeMapper extends BaseMapper { - List selectCarTypeRespList(); + CarTypeResp selectCarTypeRespList(@Param("id")Long id); } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java index a1081c7..3d28a4e 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/CarTypeService.java @@ -11,6 +11,6 @@ import java.util.List; public interface CarTypeService extends IService { List selectCarTypeList(); - List selectCarTypeRespList(); + CarTypeResp selectCarTypeRespList(Long id); } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java index b7c48de..4d08079 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java @@ -22,7 +22,7 @@ private CarTypeMapper carTypeMapper; } @Override - public List selectCarTypeRespList() { - return carTypeMapper.selectCarTypeRespList(); + public CarTypeResp selectCarTypeRespList(Long id) { + return carTypeMapper.selectCarTypeRespList(id); } } diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/CarTypeMapper.xml b/cloud-modules/cloud-modules-car/src/main/resources/mapper/CarTypeMapper.xml index f169743..7b8097d 100644 --- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/CarTypeMapper.xml +++ b/cloud-modules/cloud-modules-car/src/main/resources/mapper/CarTypeMapper.xml @@ -11,5 +11,6 @@ FROM car_type LEFT JOIN t_template ON car_type.template_id = t_template.template_id + where car_type.id=#{id} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/TemplateNeedController.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/TemplateNeedController.java new file mode 100644 index 0000000..1abd1e8 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/controller/TemplateNeedController.java @@ -0,0 +1,23 @@ +package com.muyu.controller; + + +import com.muyu.common.core.domain.Result; +import com.muyu.service.TemplateNeedService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/templateNeed") +public class TemplateNeedController { + @Autowired + private TemplateNeedService templateNeedService; + + + @GetMapping("/selectByTemplateId/{templateId}") + public Result selectByTemplateId(@PathVariable("templateId") Long templateId){ + return Result.success(templateNeedService.selectByTemplateId(templateId)); + } +} 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 af6660b..8597374 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 @@ -39,7 +39,7 @@ public class WarnStrategyController extends BaseController /** * 查询预警策略列表 */ - @GetMapping("/selectWarnStrategyList") + @PostMapping("/selectWarnStrategyList") public Result selectWarnStrategyList(@RequestBody WarnStrategyReq warnStrategyReq) { return Result.success(warnStrategyService.selectWarnStrategyList(warnStrategyReq)); diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/MessageTemplateType.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/MessageTemplateType.java new file mode 100644 index 0000000..6cf37b3 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/domain/MessageTemplateType.java @@ -0,0 +1,67 @@ +package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.io.Serializable; + +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@EqualsAndHashCode(callSuper=false) +@TableName(value = "message_template_type",autoResultMap = true) +public class MessageTemplateType implements Serializable { + + + /** + * 主键 + */ + @TableId(value = "message_template_type_id",type = IdType.AUTO) + private String messageTemplateTypeId; + /** + * 报文类别 + */ + private String messageClass; + /** + * 编码 + */ + private String messageCode; + /** + *标签 + */ + private String messageField; + /** + *起始位 + */ + private Integer startIndex; + /** + *终止位 + */ + private Integer endIndex; + /** + *数据类型ID + */ + private Integer dataTypeId; + /** + * 数据类型名称 + */ + private String dataTypeName; + /** + *最小值 + */ + private String fixedValue; + /** + *最大值 + */ + private String rangeValue; + /** + * 模版ID + */ + private Integer templateId; +} 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 index ae582f6..c52c0e9 100644 --- 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 @@ -12,4 +12,8 @@ import lombok.NoArgsConstructor; public class WarnRuleResp extends WarnRule { @Excel(name = "策略名称") private String strategyName; + + + @Excel(name = "报文数值") + private String messageField; } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/TemplateNeedMapper.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/TemplateNeedMapper.java new file mode 100644 index 0000000..d15c392 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/mapper/TemplateNeedMapper.java @@ -0,0 +1,11 @@ +package com.muyu.mapper; + + +import com.muyu.domain.MessageTemplateType; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface TemplateNeedMapper { + List selectByTemplateId(@Param("templateId")Long templateId); +} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/TemplateNeedService.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/TemplateNeedService.java new file mode 100644 index 0000000..89050c3 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/TemplateNeedService.java @@ -0,0 +1,10 @@ +package com.muyu.service; + +import com.muyu.domain.MessageTemplateType; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +public interface TemplateNeedService { + List selectByTemplateId(Long templateId); +} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/TemplateNeedServiceImpl.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/TemplateNeedServiceImpl.java new file mode 100644 index 0000000..1c9fca5 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/service/impl/TemplateNeedServiceImpl.java @@ -0,0 +1,21 @@ +package com.muyu.service.impl; + +import com.muyu.domain.MessageTemplateType; +import com.muyu.mapper.TemplateNeedMapper; +import com.muyu.service.TemplateNeedService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class TemplateNeedServiceImpl implements TemplateNeedService { + @Autowired + private TemplateNeedMapper templateNeedMapper; + + + @Override + public List selectByTemplateId(Long templateId) { + return templateNeedMapper.selectByTemplateId(templateId); + } +} diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/TemplateNeedMapper.xml b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/TemplateNeedMapper.xml new file mode 100644 index 0000000..58fe6f8 --- /dev/null +++ b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/TemplateNeedMapper.xml @@ -0,0 +1,10 @@ + + + + + + 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 index 6e01746..1487843 100644 --- a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml +++ b/cloud-modules/cloud-modules-warn/src/main/resources/mapper/WarnRuleMapper.xml @@ -6,9 +6,11 @@