diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 8581ac4..eeaceee 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: xzr + namespace: dev # Spring spring: application: diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index b400f5c..7723b63 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 106.15.136.7:8848 user-name: nacos password: nacos - namespace: xzr + namespace: dev # Spring spring: diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml deleted file mode 100644 index ddf9945..0000000 --- a/cloud-modules/cloud-modules-car/pom.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - com.muyu - cloud-modules - 3.6.3 - - 4.0.0 - - cloud-modules-car - - - cloud-modules-car车辆模块 - - - - - - - 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 - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java deleted file mode 100644 index 6242a48..0000000 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/CloudCarApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu; - -import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; -import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * 系统模块 - * - * @author muyu - */ -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class CloudCarApplication { - public static void main (String[] args) { - SpringApplication.run(CloudCarApplication.class, args); - } -} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java deleted file mode 100644 index 5c507fd..0000000 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.car.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -@TableName(value = "t_car_message") -public class CarMessage { - /** - * 报文表 - */ - @TableId(value = "message_id",type = IdType.AUTO) - private Long messageId; - /** - * 车辆报文类别 - */ - private String messageType; - /** - * 开始位下标 - */ - private Integer messageStartIndex; - /** - * 结束位下标 - */ - private Integer messageEndIndex; - - /** - * 模版id - */ - private Long templateId; - /** - * 报文标签 - */ - private String messageLabel; - -} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarCompanyMapper.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarCompanyMapper.java deleted file mode 100644 index 6bd70c1..0000000 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarCompanyMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.car.mapper; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.car.domain.CarCompany; -import com.muyu.car.domain.dto.CarDTO; -import com.muyu.car.domain.vo.CarVO; - -import java.util.List; - - -/** - * @author zmw - * @description: 配置mybatis配置 - * @Date 2023-11-13 上午 10:05 - */ -public interface SysCarCompanyMapper extends BaseMapper { - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml new file mode 100644 index 0000000..ee4cfa9 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + cloud-modules-enterprise-common + + + 17 + 17 + UTF-8 + + + + + + + com.muyu + cloud-common-core + + + + io.swagger.core.v3 + swagger-annotations-jakarta + + + \ No newline at end of file diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarCompany.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java similarity index 94% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarCompany.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java index 40e12f1..0acce79 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarCompany.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarCompany.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java similarity index 96% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarMessage.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java index 4972013..aa1737e 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessage.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessageType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java similarity index 95% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessageType.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java index a51fc70..5674719 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessageType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarMessageType.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarTemplate.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java similarity index 95% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarTemplate.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java index a7bb8cd..8eeeb36 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarTemplate.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarTemplate.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java similarity index 94% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarType.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java index b0a7f65..faf4a53 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/CarType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/CarType.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java similarity index 97% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java index 9953029..c7840d1 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java @@ -1,4 +1,4 @@ -package com.muyu.fault.common; +package com.muyu.enterprise.domain; import cn.hutool.core.date.DateTime; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java similarity index 97% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java index b264b28..704cf9f 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultMessage.java @@ -1,4 +1,4 @@ -package com.muyu.fault.common; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultNotify.java similarity index 96% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultNotify.java index 5ccb6bb..e8e1d3b 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultNotify.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultNotify.java @@ -1,4 +1,4 @@ -package com.muyu.fault.common; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java similarity index 97% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java index 63fa98b..dc5701c 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultSeverity.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultSeverity.java @@ -1,4 +1,4 @@ -package com.muyu.fault.common; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java similarity index 96% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java index 7bae718..ede5526 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultType.java @@ -1,4 +1,4 @@ -package com.muyu.fault.common; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java similarity index 97% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java index 6e649d5..ff73541 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/FaultrRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultrRule.java @@ -1,4 +1,4 @@ -package com.muyu.fault.common; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/SysCar.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java similarity index 98% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/SysCar.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java index 6f0a234..6a05a56 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/SysCar.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java similarity index 98% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java index 690c07e..1c4c0ce 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/common/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarFault.java @@ -1,4 +1,4 @@ -package com.muyu.fault.common; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Template.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Template.java similarity index 94% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Template.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Template.java index 71a73fa..0665578 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Template.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Template.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/TestUser.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/TestUser.java similarity index 94% rename from cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/TestUser.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/TestUser.java index 8aa5df2..9f420e0 100644 --- a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/domain/TestUser.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/TestUser.java @@ -1,4 +1,4 @@ -package com.muyu.many.datasource.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnLogs.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java similarity index 98% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnLogs.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java index 098d44a..0fd85a1 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java similarity index 98% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnRule.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java index 431a733..f345225 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java similarity index 97% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnStrategy.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java index 5b41293..1311233 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.enterprise.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/dto/CarDTO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java similarity index 96% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/dto/CarDTO.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java index e072893..f01dd52 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/dto/CarDTO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/dto/CarDTO.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain.dto; +package com.muyu.enterprise.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/StrategyRule.java similarity index 92% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/StrategyRule.java index 82eedbc..bc16366 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/StrategyRuleList.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/StrategyRule.java @@ -1,9 +1,9 @@ -package com.muyu.warn.domain.Resp; +package com.muyu.enterprise.domain.resp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.muyu.common.core.annotation.Excel; -import com.muyu.warn.domain.WarnRule; +import com.muyu.enterprise.domain.WarnRule; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -23,7 +23,7 @@ import java.util.List; @NoArgsConstructor @Builder @Tag(name = "策略规则一对多") -public class StrategyRuleList { +public class StrategyRule { /** 策略id */ diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/WarnStrategy.java similarity index 93% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/WarnStrategy.java index 6795812..3fccd14 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/domain/Resp/WarnStrategyList.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/resp/WarnStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain.Resp; +package com.muyu.enterprise.domain.resp; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -17,7 +17,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @Builder @Tag(name = "策略规则双表联查") -public class WarnStrategyList { +public class WarnStrategy { /** 策略id */ private Long strategyId; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/vo/CarVO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java similarity index 98% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/vo/CarVO.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java index 7b97e76..3160b35 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/vo/CarVO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/vo/CarVO.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain.vo; +package com.muyu.enterprise.domain.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/cloud-modules/cloud-modules-fault/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml similarity index 85% rename from cloud-modules/cloud-modules-fault/pom.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index 7c603cb..911a9a6 100644 --- a/cloud-modules/cloud-modules-fault/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -5,11 +5,11 @@ 4.0.0 com.muyu - cloud-modules + cloud-modules-enterprise 3.6.3 - cloud-modules-fault + cloud-modules-enterprise-server 17 @@ -17,6 +17,10 @@ UTF-8 + + cloud-modules-enterprise-server企业平台 + + @@ -73,18 +77,10 @@ cloud-common-api-doc + - com.carrotsearch.thirdparty - simple-xml-safe - 2.7.1 - test - - - - org.attoparser - attoparser - 2.0.7.RELEASE - test + com.muyu + cloud-modules-enterprise-common @@ -105,4 +101,4 @@ - + \ No newline at end of file diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/CloudWarnApplication.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java similarity index 74% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/CloudWarnApplication.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java index 6d48c7f..ddd295f 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/CloudWarnApplication.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/CloudEnterpriseApplication.java @@ -1,4 +1,4 @@ -package com.muyu.warn; +package com.muyu.enterprise; import com.muyu.common.security.annotation.EnableCustomConfig; import com.muyu.common.security.annotation.EnableMyFeignClients; @@ -13,8 +13,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; @EnableCustomConfig @EnableMyFeignClients @SpringBootApplication -public class CloudWarnApplication { +public class CloudEnterpriseApplication { public static void main (String[] args) { - SpringApplication.run(CloudWarnApplication.class, args); + SpringApplication.run(CloudEnterpriseApplication.class, args); } } diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java similarity index 88% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarMessageController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java index 77aaac7..d5bfaff 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarMessageController.java @@ -1,9 +1,9 @@ -package com.muyu.warn.controller; +package com.muyu.enterprise.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.warn.domain.CarMessage; -import com.muyu.warn.service.CarMessageService; +import com.muyu.enterprise.domain.CarMessage; +import com.muyu.enterprise.service.CarMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** + * 描述 * @ClassName CarMessageController * @Description 描述 * @Author YiBo.Liu diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java similarity index 88% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarTypeController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java index d24a725..51ab78d 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/CarTypeController.java @@ -1,8 +1,8 @@ -package com.muyu.warn.controller; +package com.muyu.enterprise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.warn.domain.CarType; -import com.muyu.warn.service.CarTypeService; +import com.muyu.enterprise.domain.CarType; +import com.muyu.enterprise.service.CarTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java similarity index 93% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java index 79e79a4..2c9496d 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java @@ -1,9 +1,9 @@ -package com.muyu.fault.controller; +package com.muyu.enterprise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.fault.common.FaultLog; -import com.muyu.fault.service.FaultLogService; +import com.muyu.enterprise.domain.FaultLog; +import com.muyu.enterprise.service.FaultLogService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java similarity index 95% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java index 35bb9fa..1503e96 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultMessageController.java @@ -1,10 +1,10 @@ -package com.muyu.fault.controller; +package com.muyu.enterprise.controller; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.muyu.common.core.domain.Result; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.fault.common.FaultMessage; -import com.muyu.fault.service.FaultMessageService; +import com.muyu.enterprise.domain.FaultMessage; +import com.muyu.enterprise.service.FaultMessageService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java similarity index 86% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java index 342e984..4eb6db0 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultTypeController.java @@ -1,10 +1,8 @@ -package com.muyu.fault.controller; +package com.muyu.enterprise.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.fault.common.FaultType; -import com.muyu.fault.service.FaultTypeService; +import com.muyu.enterprise.domain.FaultType; +import com.muyu.enterprise.service.FaultTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java similarity index 93% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java index e316e3c..99e7a8d 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultrRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultrRuleController.java @@ -1,9 +1,9 @@ -package com.muyu.fault.controller; +package com.muyu.enterprise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.fault.common.FaultrRule; -import com.muyu.fault.service.FaultrRuleService; +import com.muyu.enterprise.domain.FaultrRule; +import com.muyu.enterprise.service.FaultrRuleService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarCompanyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarCompanyController.java similarity index 64% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarCompanyController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarCompanyController.java index ca27cbe..0866ad2 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarCompanyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarCompanyController.java @@ -1,21 +1,12 @@ -package com.muyu.car.controller; +package com.muyu.enterprise.controller; -import cn.hutool.core.util.RandomUtil; -import com.muyu.car.domain.dto.CarDTO; -import com.muyu.car.domain.vo.CarVO; -import com.muyu.car.service.SysCarCompanyService; -import com.muyu.car.service.SysCarService; +import com.muyu.enterprise.service.SysCarCompanyService; 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.utils.SecurityUtils; -import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * 参数配置 信息操作处理 * diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java similarity index 91% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java index dd83625..4813694 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java @@ -1,17 +1,16 @@ -package com.muyu.car.controller; +package com.muyu.enterprise.controller; import cn.hutool.core.util.RandomUtil; -import com.muyu.car.domain.dto.CarDTO; -import com.muyu.car.domain.vo.CarVO; -import com.muyu.car.service.SysCarCompanyService; -import com.muyu.car.service.SysCarService; +import com.muyu.enterprise.domain.dto.CarDTO; +import com.muyu.enterprise.domain.vo.CarVO; +import com.muyu.enterprise.service.SysCarCompanyService; +import com.muyu.enterprise.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.utils.SecurityUtils; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import org.apache.catalina.security.SecurityUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java similarity index 94% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java index a7ee151..0aff974 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarFaultController.java @@ -1,14 +1,14 @@ -package com.muyu.fault.controller; +package com.muyu.enterprise.controller; import cn.hutool.core.date.DateTime; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.fault.common.FaultLog; -import com.muyu.fault.common.SysCarFault; -import com.muyu.fault.service.FaultLogService; -import com.muyu.fault.service.SysCarFaultService; +import com.muyu.enterprise.domain.FaultLog; +import com.muyu.enterprise.domain.SysCarFault; +import com.muyu.enterprise.service.FaultLogService; +import com.muyu.enterprise.service.SysCarFaultService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java similarity index 93% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarMessageController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java index 83829fd..2c81acb 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java @@ -1,9 +1,9 @@ -package com.muyu.car.controller; +package com.muyu.enterprise.controller; -import com.muyu.car.domain.CarMessage; -import com.muyu.car.service.SysCarMessageService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; +import com.muyu.enterprise.domain.CarMessage; +import com.muyu.enterprise.service.SysCarMessageService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarTemplateController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarTemplateController.java similarity index 89% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarTemplateController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarTemplateController.java index 629027f..eb951e5 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/SysCarTemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarTemplateController.java @@ -1,9 +1,7 @@ -package com.muyu.car.controller; +package com.muyu.enterprise.controller; -import com.muyu.car.domain.CarMessage; -import com.muyu.car.domain.CarTemplate; -import com.muyu.car.service.SysCarMessageService; -import com.muyu.car.service.SysCarTemplateService; +import com.muyu.enterprise.domain.CarTemplate; +import com.muyu.enterprise.service.SysCarTemplateService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/TemplateController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/TemplateController.java similarity index 88% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/TemplateController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/TemplateController.java index 74966f7..f0bc001 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/TemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/TemplateController.java @@ -1,9 +1,9 @@ -package com.muyu.warn.controller; +package com.muyu.enterprise.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; -import com.muyu.warn.domain.Template; -import com.muyu.warn.service.TemplateService; +import com.muyu.enterprise.domain.Template; +import com.muyu.enterprise.service.TemplateService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/controller/TestUserController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/TestUserController.java similarity index 86% rename from cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/controller/TestUserController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/TestUserController.java index a3d9651..6603885 100644 --- a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/controller/TestUserController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/TestUserController.java @@ -1,14 +1,15 @@ -package com.muyu.many.datasource.controller; +package com.muyu.enterprise.controller; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.many.datasource.domain.TestUser; -import com.muyu.many.datasource.service.TestUserService; +import com.muyu.enterprise.domain.TestUser; +import com.muyu.enterprise.service.TestUserService; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; + import java.util.List; /** diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java similarity index 95% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java index 5a2d140..43c91e1 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java @@ -1,12 +1,12 @@ -package com.muyu.warn.controller; +package com.muyu.enterprise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.warn.domain.WarnLogs; -import com.muyu.warn.service.IWarnLogsService; +import com.muyu.enterprise.domain.WarnLogs; +import com.muyu.enterprise.service.IWarnLogsService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java similarity index 96% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java index eed553f..3918766 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java @@ -1,4 +1,4 @@ -package com.muyu.warn.controller; +package com.muyu.enterprise.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.muyu.common.core.domain.Result; @@ -6,8 +6,8 @@ import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.warn.domain.WarnRule; -import com.muyu.warn.service.IWarnRuleService; +import com.muyu.enterprise.domain.WarnRule; +import com.muyu.enterprise.service.IWarnRuleService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java similarity index 66% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java index 55771eb..900a267 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java @@ -1,13 +1,12 @@ -package com.muyu.warn.controller; +package com.muyu.enterprise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.warn.domain.Resp.WarnStrategyList; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.service.IWarnStrategyService; +import com.muyu.enterprise.domain.resp.WarnStrategy; +import com.muyu.enterprise.service.IWarnStrategyService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -34,10 +33,10 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warn:strategy:list") @GetMapping("/list") - public Result> list(WarnStrategy warnStrategy) + public Result> list(com.muyu.enterprise.domain.WarnStrategy warnStrategy) { startPage(); - List list = warnStrategyService.selectWarnStrategyList(warnStrategy); + List list = warnStrategyService.selectWarnStrategyList(warnStrategy); return getDataTable(list); } @@ -46,10 +45,10 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warn:strategy:export") @PostMapping("/export") - public void export(HttpServletResponse response, WarnStrategy warnStrategy) + public void export(HttpServletResponse response, com.muyu.enterprise.domain.WarnStrategy warnStrategy) { - List list = warnStrategyService.selectWarnStrategyList(warnStrategy); - ExcelUtil util = new ExcelUtil(WarnStrategy.class); + List list = warnStrategyService.selectWarnStrategyList(warnStrategy); + ExcelUtil util = new ExcelUtil(com.muyu.enterprise.domain.WarnStrategy.class); util.exportExcel(response, list, "预警策略数据"); } @@ -58,7 +57,7 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warn:strategy:query") @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) + public Result> getInfo(@PathVariable("id") Long id) { return success(warnStrategyService.selectWarnStrategyById(id)); } @@ -69,7 +68,7 @@ public class WarnStrategyController extends BaseController @RequiresPermissions("warn:strategy:add") @PostMapping public Result add( - @Validated @RequestBody WarnStrategy warnStrategy) + @Validated @RequestBody com.muyu.enterprise.domain.WarnStrategy warnStrategy) { if (warnStrategyService.checkIdUnique(warnStrategy)) { return error("新增 预警策略 '" + warnStrategy + "'失败，预警策略已存在"); @@ -83,7 +82,7 @@ public class WarnStrategyController extends BaseController @RequiresPermissions("warn:strategy:edit") @PutMapping public Result edit( - @Validated @RequestBody WarnStrategy warnStrategy) + @Validated @RequestBody com.muyu.enterprise.domain.WarnStrategy warnStrategy) { if (!warnStrategyService.checkIdUnique(warnStrategy)) { return error("修改 预警策略 '" + warnStrategy + "'失败，预警策略不存在"); @@ -108,8 +107,8 @@ public class WarnStrategyController extends BaseController * @return */ @PostMapping("/strategyRuleList") - public Result> StrategyRuleList(@RequestBody WarnStrategy warnStrategy){ - List list = warnStrategyService.strategyList(warnStrategy); + public Result> StrategyRuleList(@RequestBody com.muyu.enterprise.domain.WarnStrategy warnStrategy){ + List list = warnStrategyService.strategyList(warnStrategy); return Result.success(list); } } diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java similarity index 68% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarMessageMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java index 34dbb9d..999afec 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarMessageMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warn.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.CarMessage; +import com.muyu.enterprise.domain.CarMessage; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTypeMapper.java similarity index 78% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTypeMapper.java index 12f914a..4642e2d 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/CarTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/CarTypeMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warn.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.CarType; +import com.muyu.enterprise.domain.CarType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java similarity index 68% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java index 5e9fc19..5108162 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java @@ -1,8 +1,8 @@ -package com.muyu.fault.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.common.FaultLog; +import com.muyu.enterprise.domain.FaultLog; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java similarity index 60% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java index 73a3930..f4bdec8 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultMessageMapper.java @@ -1,7 +1,7 @@ -package com.muyu.fault.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.common.FaultMessage; +import com.muyu.enterprise.domain.FaultMessage; public interface FaultMessageMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java similarity index 68% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java index 5265201..1c21de5 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultTypeMapper.java @@ -1,7 +1,7 @@ -package com.muyu.fault.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.common.FaultType; +import com.muyu.enterprise.domain.FaultType; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java similarity index 68% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java index 3fd2169..7630bca 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultrRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultrRuleMapper.java @@ -1,7 +1,7 @@ -package com.muyu.fault.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.common.FaultrRule; +import com.muyu.enterprise.domain.FaultrRule; import org.apache.ibatis.annotations.Mapper; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java new file mode 100644 index 0000000..b2ec077 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarCompanyMapper.java @@ -0,0 +1,14 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterprise.domain.CarCompany; + + +/** + * @author zmw + * @description: 配置mybatis配置 + * @Date 2023-11-13 上午 10:05 + */ +public interface SysCarCompanyMapper extends BaseMapper { + +} diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java similarity index 68% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java index 92ece6a..357d382 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarFaultMapper.java @@ -1,7 +1,7 @@ -package com.muyu.fault.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.common.SysCarFault; +import com.muyu.enterprise.domain.SysCarFault; import org.apache.ibatis.annotations.Mapper; @Mapper public interface SysCarFaultMapper extends BaseMapper{ diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java similarity index 84% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java index 6df0b88..62690ab 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java @@ -1,10 +1,9 @@ -package com.muyu.car.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.car.domain.SysCar; -import com.muyu.car.domain.dto.CarDTO; -import com.muyu.car.domain.vo.CarVO; +import com.muyu.enterprise.domain.dto.CarDTO; +import com.muyu.enterprise.domain.vo.CarVO; import org.apache.ibatis.annotations.Param; import java.util.List; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java similarity index 81% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java index 277a740..a45ef26 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java @@ -1,7 +1,7 @@ -package com.muyu.car.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.car.domain.CarMessage; +import com.muyu.enterprise.domain.CarMessage; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarTemplateMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarTemplateMapper.java similarity index 74% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarTemplateMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarTemplateMapper.java index 08333b5..270e6ab 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/SysCarTemplateMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarTemplateMapper.java @@ -1,8 +1,7 @@ -package com.muyu.car.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.car.domain.CarMessage; -import com.muyu.car.domain.CarTemplate; +import com.muyu.enterprise.domain.CarTemplate; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/TemplateMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/TemplateMapper.java similarity index 68% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/TemplateMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/TemplateMapper.java index b738835..62796f9 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/TemplateMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/TemplateMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warn.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.Template; +import com.muyu.enterprise.domain.Template; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/mapper/TestUserMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/TestUserMapper.java similarity index 74% rename from cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/mapper/TestUserMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/TestUserMapper.java index 9b0cc35..11897e8 100644 --- a/cloud-modules/cloud-modules-many-datasource/src/main/java/com/muyu/many/datasource/mapper/TestUserMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/TestUserMapper.java @@ -1,7 +1,7 @@ -package com.muyu.many.datasource.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.many.datasource.domain.TestUser; +import com.muyu.enterprise.domain.TestUser; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java similarity index 75% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java index 9ca275a..88ddc3f 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warn.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.WarnLogs; +import com.muyu.enterprise.domain.WarnLogs; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java similarity index 75% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java index a129e07..768682e 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warn.mapper; +package com.muyu.enterprise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.WarnRule; +import com.muyu.enterprise.domain.WarnRule; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java new file mode 100644 index 0000000..83ad59c --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java @@ -0,0 +1,19 @@ +package com.muyu.enterprise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.enterprise.domain.resp.WarnStrategy; +import org.apache.ibatis.annotations.Mapper; + +import java.util.List; + +/** + * 预警策略Mapper接口 + * + * @author muyu + * @date 2024-09-20 + */ +@Mapper +public interface WarnStrategyMapper extends BaseMapper{ + + List strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy); +} diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageService.java similarity index 61% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarMessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageService.java index f3ba7d5..8371eb5 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarMessageService.java @@ -1,7 +1,7 @@ -package com.muyu.warn.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.CarMessage; +import com.muyu.enterprise.domain.CarMessage; public interface CarMessageService extends IService { } diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTypeService.java similarity index 67% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarTypeService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTypeService.java index 45d370d..5108262 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/CarTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/CarTypeService.java @@ -1,7 +1,7 @@ -package com.muyu.warn.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.CarType; +import com.muyu.enterprise.domain.CarType; public interface CarTypeService extends IService { CarType findById(Integer catTypeId); diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java similarity index 75% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java index 2af9a14..cc24bf8 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultLogService.java @@ -1,7 +1,7 @@ -package com.muyu.fault.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.FaultLog; +import com.muyu.enterprise.domain.FaultLog; import java.util.List; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java similarity index 77% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java index 89f6b81..491d102 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultMessageService.java @@ -1,7 +1,7 @@ -package com.muyu.fault.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.FaultMessage; +import com.muyu.enterprise.domain.FaultMessage; import java.util.List; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java similarity index 71% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java index e4e6037..2a1c04b 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultTypeService.java @@ -1,7 +1,7 @@ -package com.muyu.fault.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.FaultType; +import com.muyu.enterprise.domain.FaultType; import java.util.List; diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java similarity index 75% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java index 3899aa7..b700cb4 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultrRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/FaultrRuleService.java @@ -1,7 +1,7 @@ -package com.muyu.fault.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.FaultrRule; +import com.muyu.enterprise.domain.FaultrRule; import java.util.List; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnLogsService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java similarity index 90% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java index 5092709..4818172 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnLogsService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java @@ -1,7 +1,7 @@ -package com.muyu.warn.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.WarnLogs; +import com.muyu.enterprise.domain.WarnLogs; import java.util.List; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java similarity index 90% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java index 59e0826..b91f689 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java @@ -1,7 +1,7 @@ -package com.muyu.warn.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.WarnRule; +import com.muyu.enterprise.domain.WarnRule; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java new file mode 100644 index 0000000..93b4c5f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java @@ -0,0 +1,41 @@ +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.resp.WarnStrategy; + +import java.util.List; + +/** + * 预警策略Service接口 + * + * @author muyu + * @date 2024-09-20 + */ +public interface IWarnStrategyService extends IService { + /** + * 精确查询预警策略 + * + * @param id 预警策略主键 + * @return 预警策略 + */ + public com.muyu.enterprise.domain.WarnStrategy selectWarnStrategyById(Long id); + + /** + * 查询预警策略列表 + * + * @param warnStrategy 预警策略 + * @return 预警策略集合 + */ + public List selectWarnStrategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy); + + /** + * 判断 预警策略 id是否唯一 + * @param warnStrategy 预警策略 + * @return 结果 + */ + Boolean checkIdUnique(com.muyu.enterprise.domain.WarnStrategy warnStrategy); + + + List strategyList(com.muyu.enterprise.domain.WarnStrategy warnStrategy); + +} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarCompanyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarCompanyService.java similarity index 65% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarCompanyService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarCompanyService.java index 9cde805..bd2e3a5 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarCompanyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarCompanyService.java @@ -1,10 +1,6 @@ -package com.muyu.car.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.car.domain.CarCompany; -import com.muyu.car.domain.dto.CarDTO; -import com.muyu.car.domain.vo.CarVO; - -import java.util.List; +import com.muyu.enterprise.domain.CarCompany; /** * @author zmw diff --git a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java similarity index 89% rename from cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java index 9afe833..35833cf 100644 --- a/cloud-modules/cloud-modules-fault/src/main/java/com/muyu/fault/service/SysCarFaultService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarFaultService.java @@ -1,8 +1,9 @@ -package com.muyu.fault.service; +package com.muyu.enterprise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.enterprise.domain.SysCarFault; import java.util.List; -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.common.SysCarFault; public interface SysCarFaultService extends IService { /** diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java similarity index 84% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarMessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java index 893f7be..434f04b 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java @@ -1,7 +1,7 @@ -package com.muyu.car.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.car.domain.CarMessage; +import com.muyu.enterprise.domain.CarMessage; import java.util.List; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java similarity index 82% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java index f08bfca..9b0bed9 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarService.java @@ -1,9 +1,7 @@ -package com.muyu.car.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.car.domain.CarCompany; -import com.muyu.car.domain.SysCar; -import com.muyu.car.domain.dto.CarDTO; -import com.muyu.car.domain.vo.CarVO; +import com.muyu.enterprise.domain.dto.CarDTO; +import com.muyu.enterprise.domain.vo.CarVO; import java.util.List; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarTemplateService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarTemplateService.java similarity index 79% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarTemplateService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarTemplateService.java index a313d34..361bf11 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/SysCarTemplateService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarTemplateService.java @@ -1,8 +1,7 @@ -package com.muyu.car.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.car.domain.CarMessage; -import com.muyu.car.domain.CarTemplate; +import com.muyu.enterprise.domain.CarTemplate; import java.util.List; diff --git a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/TemplateService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/TemplateService.java similarity index 60% rename from cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/TemplateService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/TemplateService.java index 3ab0366..1da1982 100644 --- a/cloud-modules/cloud-modules-warm/src/main/java/com/muyu/warn/service/TemplateService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/TemplateService.java @@ -1,7 +1,7 @@ -package com.muyu.warn.service; +package com.muyu.enterprise.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.Template; +import com.muyu.enterprise.domain.Template; public interface TemplateService extends IService