fix(): 修复项目冲突、异常、Bug

cloud-modules/cloud-modules-warm/pom.xml

@@ -5,11 +5,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>com.muyu</groupId>
-        <artifactId>cloud-server</artifactId>
+        <artifactId>cloud-modules</artifactId>
         <version>3.6.3</version>
     </parent>
 
-    <artifactId>cloud-warn</artifactId>
+    <artifactId>cloud-modules-warm</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -74,23 +74,4 @@
         </dependency>
 
     </dependencies>
-
-    <build>
-        <finalName>${project.artifactId}</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-
-
-</project>
+</project>

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 {

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;

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;

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

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

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

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;

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

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 描述

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;

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

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

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

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> {
+
     CarType findById(@Param("catTypeId") Integer catTypeId);
 
 }

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;
 
 /**

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;
 
 /**

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;

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接口

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接口

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接口

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业务层处理
  *

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业务层处理
  *

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业务层处理
  *

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:

cloud-modules/pom.xml

@@ -15,6 +15,7 @@
         <module>cloud-modules-fault</module>
         <module>cloud-modules-car</module>
         <module>cloud-modules-many-datasource</module>
+        <module>cloud-modules-warm</module>
     </modules>
 
     <artifactId>cloud-modules</artifactId>

pom.xml

@@ -283,7 +283,6 @@
         <module>cloud-modules</module>
         <module>cloud-common</module>
         <module>cloud-weixin-mp</module>
-        <module>cloud-warn</module>
     </modules>
     <packaging>pom</packaging>