diff --git a/cloud-modules/cloud-module-enterprise/.gitignore b/cloud-modules/cloud-modules-enterprise/.gitignore similarity index 100% rename from cloud-modules/cloud-module-enterprise/.gitignore rename to cloud-modules/cloud-modules-enterprise/.gitignore diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-client/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-client/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-client/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-client/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-client/pom.xml new file mode 100644 index 0000000..edb81d9 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-client/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + com.muyu + cloud-server + 3.6.3 + ../../../pom.xml + + + enterpise-client + + + 17 + 17 + UTF-8 + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-client/src/main/java/com/muyu/Main.java b/cloud-modules/cloud-modules-enterprise/enterpise-client/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..efc3142 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-client/src/main/java/com/muyu/Main.java @@ -0,0 +1,14 @@ +package com.muyu; + +/** + * @Author:yan + * @Package:com.muyu + * @Project:Default (Template) Project + * @name:${NAME} + * @Date:2024/9/29 09:56 + */ +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml new file mode 100644 index 0000000..4e34120 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml @@ -0,0 +1,101 @@ + + + 4.0.0 + + com.muyu + cloud-server + 3.6.3 + ../../../pom.xml + + + enterpise-common + + + 17 + 17 + UTF-8 + + + + + com.muyu + cloud-common + 3.6.3 + + + + com.muyu + enterpise-common + ${muyu.version} + + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-discovery + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-nacos-config + + + + + com.alibaba.cloud + spring-cloud-starter-alibaba-sentinel + + + + + org.springframework.boot + spring-boot-starter-actuator + + + + + com.mysql + mysql-connector-j + + + + + com.muyu + cloud-common-datasource + + + + + com.muyu + cloud-common-datascope + + + + + com.muyu + cloud-common-log + + + + + com.muyu + cloud-common-api-doc + + + + + com.muyu + cloud-common-xxl + + + + diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java index 2dda0a3..cd51cd7 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java @@ -4,7 +4,6 @@ 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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java similarity index 99% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java index 7c5503d..8e40ee3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java @@ -2,7 +2,6 @@ package com.muyu.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.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java index db08cf6..5206a83 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java @@ -3,7 +3,6 @@ package com.muyu.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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java index 71f32bf..1ba7a36 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarInformation.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java @@ -3,13 +3,11 @@ package com.muyu.domain; 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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java index b6beba6..213ae51 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java @@ -3,7 +3,6 @@ package com.muyu.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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java index c5e436f..d66ec14 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java @@ -3,7 +3,6 @@ package com.muyu.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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java similarity index 98% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java index a16b485..0926e99 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java @@ -3,7 +3,6 @@ package com.muyu.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.domain.req.FaultCodeAddReq; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java index b426308..cd68c1d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java @@ -4,8 +4,6 @@ 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.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java index 620161d..993fecd 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java @@ -3,7 +3,6 @@ package com.muyu.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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java index 22d51d5..132b031 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java @@ -3,7 +3,6 @@ package com.muyu.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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java index a88e533..14049f0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java @@ -3,7 +3,6 @@ package com.muyu.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.domain.message.Message; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java index f3d2ff3..46da1d1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java @@ -3,9 +3,8 @@ package com.muyu.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.domain.req.MessageTemplateAddReq; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.domain.req.MessageTemplateAddReq; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java index 390dbcc..88f16ed 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java @@ -3,8 +3,8 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.domain.req.MessageValueAddReq; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.domain.req.MessageValueAddReq; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java index d696513..e0c8a27 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java @@ -4,19 +4,16 @@ 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.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java similarity index 98% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java index d572703..f33ea7a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java @@ -3,17 +3,16 @@ package com.muyu.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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 预警规则对象 warn_rule * @author muyu diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java index 4d656a6..5f2ae59 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java @@ -4,11 +4,9 @@ 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 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 lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java similarity index 89% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java index 18fae8f..f26367d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java @@ -3,12 +3,9 @@ package com.muyu.domain.message; 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.annotation.Excel; 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 lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java similarity index 94% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java index 97f03a2..ca0cfe1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java @@ -4,8 +4,6 @@ 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.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java similarity index 93% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java index 25bb6cb..dd42b75 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java @@ -3,11 +3,9 @@ package com.muyu.domain.message; 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 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 lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java similarity index 93% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java index afef867..73aacc9 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java @@ -3,11 +3,9 @@ package com.muyu.domain.message.message; 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 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 lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java similarity index 85% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java index d4c0122..eb3a62c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java @@ -1,18 +1,13 @@ package com.muyu.domain.message.message; -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.annotation.Excel; 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 lombok.experimental.SuperBuilder; import java.util.Date; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java similarity index 91% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java index 2e7ade4..144bdd2 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java @@ -3,14 +3,12 @@ package com.muyu.domain.message.message; 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 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 lombok.experimental.SuperBuilder; /** * 用户实体类 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java index eaef938..8fc5d98 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java @@ -5,14 +5,12 @@ import com.baomidou.mybatisplus.annotation.TableField; 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 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 lombok.experimental.SuperBuilder; import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java index 12451bd..1f5177e 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java @@ -4,11 +4,9 @@ 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 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 lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java index 88f7de4..418286f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java @@ -1,7 +1,6 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java index 8285aae..aae17c6 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java @@ -3,7 +3,6 @@ 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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java similarity index 94% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java index 6095883..b14c797 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java @@ -1,11 +1,9 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; 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 lombok.experimental.SuperBuilder; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java index e17e311..2fd7703 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java @@ -3,7 +3,6 @@ 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 io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java similarity index 94% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java index beb3a9a..6d123ef 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java @@ -3,14 +3,12 @@ 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 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 lombok.experimental.SuperBuilder; import java.math.BigDecimal; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java similarity index 93% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java index 284a2ee..6b50599 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java @@ -3,14 +3,12 @@ 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 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 lombok.experimental.SuperBuilder; /** * @className: FaultLog ️✈️ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java similarity index 91% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java index 377c32f..67e7c8a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java @@ -3,15 +3,12 @@ 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 com.muyu.common.core.annotation.Excel; 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 lombok.experimental.SuperBuilder; import java.math.BigDecimal; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java similarity index 92% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java index 37edf81..447dc88 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java @@ -4,15 +4,12 @@ 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.annotation.Excel; 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 lombok.experimental.SuperBuilder; import java.util.Date; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java similarity index 91% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java index 993c202..fb78dc3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java @@ -1,14 +1,12 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; 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 lombok.experimental.SuperBuilder; /** * @ClassName MessageTemplateAddReq diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java similarity index 94% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java index 546fb59..8d7917d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java @@ -3,14 +3,12 @@ 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 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 lombok.experimental.SuperBuilder; /** * @ClassName MessageValueAddReq diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java similarity index 92% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java index 3f8ed65..e51e0d9 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java @@ -1,14 +1,12 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; 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 lombok.experimental.SuperBuilder; /** * @ClassName MessageValueReq diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java index feef684..e15a912 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCar.java @@ -6,7 +6,10 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.*; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java similarity index 98% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java index c307a7b..c086202 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java @@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.domain.FaultLog; -import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml new file mode 100644 index 0000000..959ac52 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml @@ -0,0 +1,21 @@ + + + 4.0.0 + + com.muyu + cloud-server + 3.6.3 + ../../../pom.xml + + + enterpise-remote + + + 17 + 17 + UTF-8 + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/Main.java b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/Main.java new file mode 100644 index 0000000..07a7a1d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/Main.java @@ -0,0 +1,14 @@ +package com.muyu; + +/** + * @Author:yan + * @Package:com.muyu + * @Project:Default (Template) Project + * @name:${NAME} + * @Date:2024/9/29 09:55 + */ +public class Main { + public static void main(String[] args) { + System.out.println("Hello world!"); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-service/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-module-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml similarity index 90% rename from cloud-modules/cloud-module-enterprise/pom.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index 2cdd714..330c114 100644 --- a/cloud-modules/cloud-module-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -5,15 +5,12 @@ 4.0.0 com.muyu - cloud-modules + cloud-server 3.6.3 + ../../../pom.xml - cloud-module-enterprise - - - cloud-modules-enterprise - + enterpise-service 17 @@ -23,6 +20,12 @@ + + com.muyu + enterpise-common + ${muyu.version} + + org.eclipse.paho org.eclipse.paho.client.mqttv3 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/CloudWarnApplication.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/CloudEnterpiseApplication.java similarity index 81% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/CloudWarnApplication.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/CloudEnterpiseApplication.java index bea20be..5aca16c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/CloudWarnApplication.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/CloudEnterpiseApplication.java @@ -15,8 +15,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; //@EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication -public class CloudWarnApplication { +public class CloudEnterpiseApplication { public static void main(String[] args) { - SpringApplication.run(CloudWarnApplication.class, args); + SpringApplication.run(CloudEnterpiseApplication.class, args); } } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceClazzController.java similarity index 99% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceClazzController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceClazzController.java index abede98..43f27ea 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceClazzController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceClazzController.java @@ -1,8 +1,9 @@ package com.muyu.controller; +import com.muyu.common.core.domain.Result; + import com.muyu.domain.CarFenceClazz; import com.muyu.service.CarFenceClazzService; -import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceController.java index 7bdebe3..e323d6c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceController.java @@ -1,12 +1,12 @@ package com.muyu.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFence; import com.muyu.domain.req.CarFenceReq; import com.muyu.domain.resp.CarFenceResq; import com.muyu.service.CarFenceService; import com.muyu.service.CarFenceServiceMybaits; -import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceTypeController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceTypeController.java index 9b3dd38..2b3024b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarFenceTypeController.java @@ -1,8 +1,8 @@ package com.muyu.controller; +import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFenceType; import com.muyu.service.CarFenceTypeService; -import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarTypeController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/CarTypeController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultCodeController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultCodeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultCodeController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultConditionController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultConditionController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultConditionController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLabelController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLabelController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLabelController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLabelController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLogController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLogController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultLogController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultRuleController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultRuleController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultTypeController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FaultTypeController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FenceGroupController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FenceGroupController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FenceGroupController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FenceGroupController.java index 987185d..3678693 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FenceGroupController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/FenceGroupController.java @@ -1,8 +1,8 @@ package com.muyu.controller; +import com.muyu.common.core.domain.Result; import com.muyu.domain.FenceGroup; import com.muyu.service.FenceGroupService; -import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageTemplateController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageTemplateController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageTemplateController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageTemplateController.java index b63db09..148e9e1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageTemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageTemplateController.java @@ -1,10 +1,10 @@ package com.muyu.controller; +import com.muyu.common.core.domain.Result; import com.muyu.domain.MessageTemplate; import com.muyu.domain.req.MessageTemplateAddReq; import com.muyu.domain.resp.MessageTemplateListResp; import com.muyu.service.MessageTemplateService; -import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageValueController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageValueController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageValueController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageValueController.java index 868b80d..fb28d64 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageValueController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MessageValueController.java @@ -1,12 +1,12 @@ package com.muyu.controller; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.domain.MessageValue; import com.muyu.domain.req.MessageValueAddReq; import com.muyu.domain.req.MessageValueReq; import com.muyu.domain.resp.MessageValueListResp; import com.muyu.service.MessageValueService; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.controller.BaseController; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MiddleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MiddleController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MiddleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MiddleController.java index 610e7a7..7e6de8c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/MiddleController.java @@ -1,10 +1,10 @@ package com.muyu.controller; +import com.muyu.common.core.domain.Result; import com.muyu.domain.FenceGroup; import com.muyu.domain.req.CarFenceAdd; import com.muyu.service.CarFenceServiceMybaits; import com.muyu.service.MiddleService; -import com.muyu.common.core.domain.Result; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarController.java index 4b8a189..d6a7af7 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarController.java @@ -1,13 +1,13 @@ package com.muyu.controller; -import com.muyu.domain.SysCar; -import com.muyu.domain.resp.SysCarResp; -import com.muyu.service.SysCarService; import com.muyu.common.core.domain.Result; 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.common.security.utils.SecurityUtils; +import com.muyu.domain.SysCar; +import com.muyu.domain.resp.SysCarResp; +import com.muyu.service.SysCarService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarFaultController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysCarFaultController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysTypeController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysTypeController.java index e9b2b90..7eb5abe 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/SysTypeController.java @@ -1,10 +1,10 @@ package com.muyu.controller; -import com.muyu.domain.SysCarType; -import com.muyu.service.SysTypeService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.domain.SysCarType; +import com.muyu.service.SysTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnLogsController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnLogsController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnRuleController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnRuleController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnStrategyController.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/controller/WarnStrategyController.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarTypeMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/CarTypeMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultCodeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultCodeMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultCodeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultCodeMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultConditionMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultConditionMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultConditionMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultConditionMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLabelMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLabelMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLabelMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLabelMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLogMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultLogMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultRuleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultRuleMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultRuleMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultTypeMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FaultTypeMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FenceGroupMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FenceGroupMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FenceGroupMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/FenceGroupMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageTemplateMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageTemplateMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageTemplateMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageTemplateMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageValueMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageValueMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageValueMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MessageValueMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MiddleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MiddleMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MiddleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/MiddleMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarFaultMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarFaultMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarFaultMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysCarMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysTypeMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/SysTypeMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnLogsMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnLogsMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnRuleMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnRuleMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnStrategyMapper.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/mapper/WarnStrategyMapper.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceClazzService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceClazzService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceClazzService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceClazzService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceServiceMybaits.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceServiceMybaits.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceServiceMybaits.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceServiceMybaits.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceTypeService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarFenceTypeService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarTypeService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/CarTypeService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultCodeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultCodeService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultCodeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultCodeService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultConditionService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultConditionService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultConditionService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultConditionService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategy.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategy.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategyService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategyService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategyService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultDetectionStrategyService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLabelService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLabelService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLabelService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLogService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLogService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultLogService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultRuleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultRuleService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultRuleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultRuleService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultTypeService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FaultTypeService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FenceGroupService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/FenceGroupService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/ISysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/ISysCarFaultService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/ISysCarFaultService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/ISysCarFaultService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnLogsService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnLogsService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnLogsService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnRuleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnRuleService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnRuleService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnStrategyService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnStrategyService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/IWarnStrategyService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageTemplateService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageTemplateService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageTemplateService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageTemplateService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageValueService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MessageValueService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MiddleService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/MiddleService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysCarService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysCarService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysCarService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysCarService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysTypeService.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/SysTypeService.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java index 3b08532..c855522 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java @@ -3,6 +3,7 @@ package com.muyu.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.CarFence; import com.muyu.domain.CarFenceClazz; import com.muyu.domain.CarFenceType; @@ -12,7 +13,6 @@ import com.muyu.mapper.CarFenceMapper; import com.muyu.service.CarFenceClazzService; import com.muyu.service.CarFenceService; import com.muyu.service.CarFenceTypeService; -import com.muyu.common.core.utils.StringUtils; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java index c9c19cb..d371ae7 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java @@ -3,12 +3,12 @@ package com.muyu.service.impl; import cn.hutool.json.JSONObject; 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.domain.MessageValue; import com.muyu.domain.req.MessageValueReq; import com.muyu.domain.resp.MessageValueListResp; import com.muyu.mapper.MessageValueMapper; import com.muyu.service.MessageValueService; -import com.muyu.common.core.utils.StringUtils; import org.springframework.stereotype.Service; import java.util.List; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/banner.txt b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/dev.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/dev.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/prod.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/prod.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/test.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/test.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultCodeMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultCodeMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultConditionMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultConditionMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultLogMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultLogMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/MessageMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/MessageMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/MiddleMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MiddleMapper.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/MiddleMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MiddleMapper.xml diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml new file mode 100644 index 0000000..6d368cd --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + com.muyu + cloud-modules + 3.6.3 + + + cloud-modules-enterprise + + pom + + cloud-modules-enterprise + + + + 17 + 17 + UTF-8 + + + + enterpise-client + enterpise-common + enterpise-remote + enterpise-service + + + + diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 5b518d1..93290d2 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -13,6 +13,7 @@ cloud-modules-gen cloud-modules-file cloud-vx + cloud-modules-enterprise cloud-modules diff --git a/pom.xml b/pom.xml index 7422784..b30f0df 100644 --- a/pom.xml +++ b/pom.xml @@ -275,7 +275,6 @@ cloud-visual cloud-modules cloud-common - cloud-modules/cloud-module-enterprise pom