diff --git a/cloud-warn/pom.xml b/cloud-modules/cloud-modules-warm/pom.xml similarity index 79% rename from cloud-warn/pom.xml rename to cloud-modules/cloud-modules-warm/pom.xml index 4b6edda..84f81a8 100644 --- a/cloud-warn/pom.xml +++ b/cloud-modules/cloud-modules-warm/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - cloud-server + cloud-modules 3.6.3 - cloud-warn + cloud-modules-warm 17 @@ -74,23 +74,4 @@ - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - + \ No newline at end of file diff --git a/cloud-warn/src/main/java/com/muyu/warn/CloudWarnApplication.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/CloudWarnApplication.java similarity index 95% rename from cloud-warn/src/main/java/com/muyu/warn/CloudWarnApplication.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/CloudWarnApplication.java index c9a6d4c..6d48c7f 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/CloudWarnApplication.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/CloudWarnApplication.java @@ -11,7 +11,6 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; * @author muyu */ @EnableCustomConfig -//@EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication public class CloudWarnApplication { diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/CarMessageController.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarMessageController.java similarity index 96% rename from cloud-warn/src/main/java/com/muyu/warn/controller/CarMessageController.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarMessageController.java index f65b305..77aaac7 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarMessageController.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; import com.muyu.warn.domain.CarMessage; import com.muyu.warn.service.CarMessageService; -import com.muyu.warn.service.CarTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/CarTypeController.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarTypeController.java similarity index 93% rename from cloud-warn/src/main/java/com/muyu/warn/controller/CarTypeController.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarTypeController.java index a3b82f9..d24a725 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarTypeController.java @@ -1,6 +1,5 @@ package com.muyu.warn.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; import com.muyu.warn.domain.CarType; import com.muyu.warn.service.CarTypeService; diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/TemplateController.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/TemplateController.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/controller/TemplateController.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/TemplateController.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnLogsController.java similarity index 84% rename from cloud-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnLogsController.java index bf68ab5..5a2d140 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnLogsController.java @@ -1,26 +1,19 @@ package com.muyu.warn.controller; -import java.util.Arrays; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.warn.domain.WarnLogs; import com.muyu.warn.service.IWarnLogsService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; /** * 预警日志Controller diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnRuleController.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnRuleController.java similarity index 98% rename from cloud-warn/src/main/java/com/muyu/warn/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnRuleController.java index 1cc320f..eed553f 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnRuleController.java @@ -1,22 +1,20 @@ package com.muyu.warn.controller; -import java.util.Arrays; -import java.util.List; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.*; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.warn.domain.WarnRule; import com.muyu.warn.service.IWarnRuleService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; +import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; /** * 预警规则Controller diff --git a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnStrategyController.java similarity index 86% rename from cloud-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnStrategyController.java index f37fed3..55771eb 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnStrategyController.java @@ -1,28 +1,20 @@ package com.muyu.warn.controller; -import java.util.Arrays; -import java.util.List; - -import com.muyu.warn.domain.Resp.WarnStrategyList; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.service.IWarnStrategyService; -import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; -import org.springframework.validation.annotation.Validated; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.security.annotation.RequiresPermissions; +import com.muyu.warn.domain.Resp.WarnStrategyList; +import com.muyu.warn.domain.WarnStrategy; +import com.muyu.warn.service.IWarnStrategyService; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.Arrays; +import java.util.List; /** * 预警策略Controller diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/CarMessage.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarMessage.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/domain/CarMessage.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarMessage.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/CarType.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarType.java similarity index 87% rename from cloud-warn/src/main/java/com/muyu/warn/domain/CarType.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarType.java index 9352467..b0a7f65 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/domain/CarType.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarType.java @@ -1,7 +1,5 @@ package com.muyu.warn.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java similarity index 95% rename from cloud-warn/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java index 6184ac9..82eedbc 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.muyu.common.core.annotation.Excel; import com.muyu.warn.domain.WarnRule; -import com.muyu.warn.domain.WarnStrategy; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -12,7 +11,6 @@ import lombok.Data; import lombok.NoArgsConstructor; import java.util.List; -import java.util.function.Supplier; /** * @ClassName StrategyRuleList diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java similarity index 81% rename from cloud-warn/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java index 48d70cc..6795812 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java @@ -1,18 +1,11 @@ package com.muyu.warn.domain.Resp; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; -import com.muyu.warn.domain.WarnRule; -import com.muyu.warn.domain.WarnStrategy; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.util.List; - /** * @ClassName WarnStrategyList * @Description 描述 diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/Template.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Template.java similarity index 86% rename from cloud-warn/src/main/java/com/muyu/warn/domain/Template.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Template.java index fbd2592..71a73fa 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/domain/Template.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Template.java @@ -1,7 +1,5 @@ package com.muyu.warn.domain; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnLogs.java similarity index 97% rename from cloud-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnLogs.java index 768a980..098d44a 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnLogs.java @@ -1,16 +1,16 @@ package com.muyu.warn.domain; -import java.util.Date; +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.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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; + +import java.util.Date; /** * 预警日志对象 warn_logs diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/WarnRule.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnRule.java similarity index 97% rename from cloud-warn/src/main/java/com/muyu/warn/domain/WarnRule.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnRule.java index 7a02610..431a733 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnRule.java @@ -1,14 +1,13 @@ package com.muyu.warn.domain; +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 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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; /** * 预警规则对象 warn_rule diff --git a/cloud-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnStrategy.java similarity index 96% rename from cloud-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnStrategy.java index aff6417..5b41293 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnStrategy.java @@ -1,14 +1,13 @@ package com.muyu.warn.domain; +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 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.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; /** * 预警策略对象 warn_strategy diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/CarMessageMapper.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarMessageMapper.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/mapper/CarMessageMapper.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarMessageMapper.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java similarity index 99% rename from cloud-warn/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java index 9648646..12f914a 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java @@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param; @Mapper public interface CarTypeMapper extends BaseMapper { + CarType findById(@Param("catTypeId") Integer catTypeId); } diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/TemplateMapper.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/TemplateMapper.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/mapper/TemplateMapper.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/TemplateMapper.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java index 1046cea..9ca275a 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java @@ -1,7 +1,7 @@ package com.muyu.warn.mapper; -import com.muyu.warn.domain.WarnLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.warn.domain.WarnLogs; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java index 127e420..a129e07 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java @@ -1,7 +1,7 @@ package com.muyu.warn.mapper; -import com.muyu.warn.domain.WarnRule; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.warn.domain.WarnRule; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java index 5a048df..d6b3c2f 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java @@ -1,8 +1,8 @@ package com.muyu.warn.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.warn.domain.Resp.WarnStrategyList; import com.muyu.warn.domain.WarnStrategy; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/CarMessageService.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarMessageService.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/service/CarMessageService.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarMessageService.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/CarTypeService.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarTypeService.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/service/CarTypeService.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarTypeService.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnLogsService.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnLogsService.java similarity index 99% rename from cloud-warn/src/main/java/com/muyu/warn/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnLogsService.java index d642e13..5092709 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnLogsService.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnLogsService.java @@ -1,8 +1,9 @@ package com.muyu.warn.service; -import java.util.List; -import com.muyu.warn.domain.WarnLogs; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.warn.domain.WarnLogs; + +import java.util.List; /** * 预警日志Service接口 diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnRuleService.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnRuleService.java similarity index 99% rename from cloud-warn/src/main/java/com/muyu/warn/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnRuleService.java index 6165f29..59e0826 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnRuleService.java @@ -1,8 +1,9 @@ package com.muyu.warn.service; -import java.util.List; -import com.muyu.warn.domain.WarnRule; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.warn.domain.WarnRule; + +import java.util.List; /** * 预警规则Service接口 diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnStrategyService.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/service/IWarnStrategyService.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnStrategyService.java index 41641d4..bfb7efa 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/IWarnStrategyService.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnStrategyService.java @@ -1,10 +1,10 @@ package com.muyu.warn.service; -import java.util.List; - +import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.warn.domain.Resp.WarnStrategyList; import com.muyu.warn.domain.WarnStrategy; -import com.baomidou.mybatisplus.extension.service.IService; + +import java.util.List; /** * 预警策略Service接口 diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/TemplateService.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/TemplateService.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/service/TemplateService.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/TemplateService.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/CarMessageServiceImpl.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/CarMessageServiceImpl.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/service/impl/CarMessageServiceImpl.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/CarMessageServiceImpl.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/CarTypeTypeServiceImpl.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/CarTypeTypeServiceImpl.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/service/impl/CarTypeTypeServiceImpl.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/CarTypeTypeServiceImpl.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/TemplateServiceImpl.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/TemplateServiceImpl.java similarity index 100% rename from cloud-warn/src/main/java/com/muyu/warn/service/impl/TemplateServiceImpl.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/TemplateServiceImpl.java diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java similarity index 99% rename from cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java index 2780bc4..a5dbf7a 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java @@ -1,15 +1,16 @@ package com.muyu.warn.service.impl; -import java.util.List; -import org.springframework.stereotype.Service; -import com.muyu.warn.mapper.WarnLogsMapper; -import com.muyu.warn.domain.WarnLogs; -import com.muyu.warn.service.IWarnLogsService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; +import com.muyu.warn.domain.WarnLogs; +import com.muyu.warn.mapper.WarnLogsMapper; +import com.muyu.warn.service.IWarnLogsService; +import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import java.util.List; + /** * 预警日志Service业务层处理 * diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java similarity index 99% rename from cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java index b7b0f67..d438bf4 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java @@ -1,15 +1,16 @@ package com.muyu.warn.service.impl; -import java.util.List; -import org.springframework.stereotype.Service; -import com.muyu.warn.mapper.WarnRuleMapper; -import com.muyu.warn.domain.WarnRule; -import com.muyu.warn.service.IWarnRuleService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; +import com.muyu.warn.domain.WarnRule; +import com.muyu.warn.mapper.WarnRuleMapper; +import com.muyu.warn.service.IWarnRuleService; +import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import java.util.List; + /** * 预警规则Service业务层处理 * diff --git a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java similarity index 96% rename from cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java index 12626ca..45bb4e4 100644 --- a/cloud-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java @@ -1,20 +1,18 @@ package com.muyu.warn.service.impl; -import java.util.List; - -import com.muyu.common.core.domain.Result; -import com.muyu.warn.domain.Resp.WarnStrategyList; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.AutoConfigureBefore; -import org.springframework.stereotype.Service; -import com.muyu.warn.mapper.WarnStrategyMapper; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.service.IWarnStrategyService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; +import com.muyu.warn.domain.Resp.WarnStrategyList; +import com.muyu.warn.domain.WarnStrategy; +import com.muyu.warn.mapper.WarnStrategyMapper; +import com.muyu.warn.service.IWarnStrategyService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import java.util.List; + /** * 预警策略Service业务层处理 * diff --git a/cloud-warn/src/main/resources/banner.txt b/cloud-modules/cloud-modules-warm/src/main/resources/banner.txt similarity index 100% rename from cloud-warn/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-warm/src/main/resources/banner.txt diff --git a/cloud-warn/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml similarity index 98% rename from cloud-warn/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml index a6a79fb..5d9d2a1 100644 --- a/cloud-warn/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-warm/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: lyb + namespace: xzr spring: application: diff --git a/cloud-warn/src/main/resources/mapper/CarTypeMapper.xml b/cloud-modules/cloud-modules-warm/src/main/resources/mapper/CarTypeMapper.xml similarity index 100% rename from cloud-warn/src/main/resources/mapper/CarTypeMapper.xml rename to cloud-modules/cloud-modules-warm/src/main/resources/mapper/CarTypeMapper.xml diff --git a/cloud-warn/src/main/resources/mapper/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-warm/src/main/resources/mapper/WarnStrategyMapper.xml similarity index 100% rename from cloud-warn/src/main/resources/mapper/WarnStrategyMapper.xml rename to cloud-modules/cloud-modules-warm/src/main/resources/mapper/WarnStrategyMapper.xml diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 43d126e..5b25533 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -15,6 +15,7 @@ cloud-modules-fault cloud-modules-car cloud-modules-many-datasource + cloud-modules-warm cloud-modules diff --git a/pom.xml b/pom.xml index 1dcf2df..5617650 100644 --- a/pom.xml +++ b/pom.xml @@ -283,7 +283,6 @@ cloud-modules cloud-common cloud-weixin-mp - cloud-warn pom