diff --git a/cloud-common/cloud-electronic-common/pom.xml b/cloud-common/cloud-electronic-common/pom.xml deleted file mode 100644 index 01caf71..0000000 --- a/cloud-common/cloud-electronic-common/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-common - 3.6.3 - - - cloud-electronic-common - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-common-core - - - - io.swagger.core.v3 - swagger-annotations-jakarta - 2.2.8 - compile - - - diff --git a/cloud-faultmanage/.gitignore b/cloud-faultmanage/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/cloud-faultmanage/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -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-faultmanage/cloud-faultmanage-client/.gitignore b/cloud-faultmanage/cloud-faultmanage-client/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/cloud-faultmanage/cloud-faultmanage-client/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -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-faultmanage/cloud-faultmanage-client/src/main/java/com/muyu/Main.java b/cloud-faultmanage/cloud-faultmanage-client/src/main/java/com/muyu/Main.java deleted file mode 100644 index 3d25b01..0000000 --- a/cloud-faultmanage/cloud-faultmanage-client/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu; - -/** - * @Author:weiran - * @Package:com.muyu - * @Project:Default (Template) Project - * @name:${NAME} - * @Date:2024/9/17 23:27 - */ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/cloud-faultmanage/cloud-faultmanage-common/.gitignore b/cloud-faultmanage/cloud-faultmanage-common/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/cloud-faultmanage/cloud-faultmanage-common/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -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-faultmanage/cloud-faultmanage-common/pom.xml b/cloud-faultmanage/cloud-faultmanage-common/pom.xml deleted file mode 100644 index eb72bc3..0000000 --- a/cloud-faultmanage/cloud-faultmanage-common/pom.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-faultmanage - 3.6.3 - - - cloud-faultmanage-common - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-common-core - - - io.swagger.core.v3 - swagger-annotations-jakarta - 2.2.8 - - - - diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/annotate/FaultField.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/annotate/FaultField.java deleted file mode 100644 index 0dc4fb0..0000000 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/annotate/FaultField.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.cloud.annotate; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * @Author:weiran - * @Package:com.muyu.cloud.annotate - * @Project:cloud-server-8 - * @name:FaultField - * @Date:2024/9/24 9:16 - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.FIELD) -public @interface FaultField { - String name(); //假设FaultCondition中有一个相同名字的字段或可以映射到它的字段 -} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarInformation.java b/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarInformation.java deleted file mode 100644 index f3fb4df..0000000 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarInformation.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.muyu.cloud.faultmanage.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * @Author:weiran - * @Package:com.muyu.cloud.faultmanage.domain - * @Project:cloud-server-8 - * @name:CarInformation - * @Date:2024/9/23 22:29 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "企业车辆管理实体类",autoResultMap = true) -public class CarInformation { - - /** - * 车辆Id - */ - private Long carInformationId; - /** - * 车辆唯一VIN固定(不可修改) - */ - private String carInformationVIN; - /** - * 车牌号 - */ - private String carInformationLicensePlate; - - /** - * 车辆品牌 - */ - private String carInformationBrand; - - /** - * 车辆颜色 - */ - private String carInformationColor; - - /** - * 车辆驾驶员 - */ - private String carInformationDriver; - - /** - * 车检到期日期 - * 固定(不可修改) - */ - @DateTimeFormat(pattern = "yyyy-MM-dd") - @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") - private Date carInformationExamineEnddata; - - /** - * 车辆电机厂商 - */ - private String carInformationMotorManufacturer; - - /** - * 车辆电机型号 - */ - private String carInformationMotorModel; - - /** - * 车辆电池厂商 - */ - private String carInformationBatteryManufacturer; - - /** - * 车辆电池型号 - */ - private String carInformationBatteryModel; - - /** - * 车辆电子围栏外键ID - */ - private Integer carInformationFence; - - /** - * 车辆类型外键ID - */ - private Integer carInformationType; - - /** - * 是否重点车辆 (0否默认 1是 ) - */ - private Integer carInformationFocus; - - /** - * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) - */ - private Integer carInformationState; - - - //车辆类型表 - /** - * 车辆类型ID - */ - private Integer carTypeId; - /** - * 车辆类型名 - */ - private String carTypeName; - - //电子围栏 - /** - *电子围栏ID - */ - private Integer fenceid; - - /** - * 电子围栏名 - */ - private String fencename; -} diff --git a/cloud-faultmanage/cloud-faultmanage-remote/.gitignore b/cloud-faultmanage/cloud-faultmanage-remote/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/cloud-faultmanage/cloud-faultmanage-remote/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -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-faultmanage/cloud-faultmanage-remote/src/main/java/com/muyu/Main.java b/cloud-faultmanage/cloud-faultmanage-remote/src/main/java/com/muyu/Main.java deleted file mode 100644 index b8e034d..0000000 --- a/cloud-faultmanage/cloud-faultmanage-remote/src/main/java/com/muyu/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu; - -/** - * @Author:weiran - * @Package:com.muyu - * @Project:Default (Template) Project - * @name:${NAME} - * @Date:2024/9/17 23:28 - */ -public class Main { - public static void main(String[] args) { - System.out.println("Hello world!"); - } -} diff --git a/cloud-faultmanage/cloud-faultmanage-server/.gitignore b/cloud-faultmanage/cloud-faultmanage-server/.gitignore deleted file mode 100644 index 5ff6309..0000000 --- a/cloud-faultmanage/cloud-faultmanage-server/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -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-faultmanage/cloud-faultmanage-server/pom.xml b/cloud-faultmanage/cloud-faultmanage-server/pom.xml deleted file mode 100644 index 7e626b1..0000000 --- a/cloud-faultmanage/cloud-faultmanage-server/pom.xml +++ /dev/null @@ -1,159 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-faultmanage - 3.6.3 - - - cloud-faultmanage-server - - - 17 - 17 - UTF-8 - - - - - - com.muyu - cloud-faultmanage-common - 3.6.3 - - - - - - com.aliyun.oss - aliyun-sdk-oss - 3.16.3 - - - - - org.springframework.boot - spring-boot-starter-mail - - - - - 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-api-doc - - - - - com.muyu - cloud-common-xxl - - - - - com.muyu - cloud-common-rabbit - - - - - - - - - org.apache.httpcomponents - httpmime - 4.5.14 - - - - - com.alibaba - fastjson - 1.2.41 - - - - - - cloud-faultmanage - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - org.apache.maven.plugins - maven-deploy-plugin - - true - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - - -parameters - - - - - - - diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/MuYuFaultManageApplication.java b/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/MuYuFaultManageApplication.java deleted file mode 100644 index ffa9190..0000000 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/MuYuFaultManageApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.cloud.faultmanage; - -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @Author:weiran - * @Package:com.muyu.cloud.faultmanage - * @Project:cloud-faultmanage - * @name:MuYuFaultManageApplication - * @Date:2024/9/16 21:16 - */ -@SpringBootApplication -public class MuYuFaultManageApplication { - public static void main(String[] args) { - SpringApplication.run(MuYuFaultManageApplication.class, args); - } -} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/dev.xml b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/dev.xml deleted file mode 100644 index 1b52238..0000000 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/prod.xml b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/prod.xml deleted file mode 100644 index 89a567d..0000000 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/test.xml b/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/test.xml deleted file mode 100644 index 89a567d..0000000 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-faultmanage/pom.xml b/cloud-faultmanage/pom.xml deleted file mode 100644 index d4d1734..0000000 --- a/cloud-faultmanage/pom.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-server - 3.6.3 - - - cloud-faultmanage - pom - - cloud-faultmanage-server - cloud-faultmanage-client - cloud-faultmanage-remote - cloud-faultmanage-common - - - - 17 - 17 - UTF-8 - - - diff --git a/cloud-faultmanage/cloud-faultmanage-remote/pom.xml b/cloud-modules/cloud-Saas-Service/pom.xml similarity index 66% rename from cloud-faultmanage/cloud-faultmanage-remote/pom.xml rename to cloud-modules/cloud-Saas-Service/pom.xml index 18ed723..342a15b 100644 --- a/cloud-faultmanage/cloud-faultmanage-remote/pom.xml +++ b/cloud-modules/cloud-Saas-Service/pom.xml @@ -5,15 +5,16 @@ 4.0.0 com.muyu - cloud-faultmanage + cloud-server 3.6.3 + ../../pom.xml - cloud-faultmanage-remote + cloud-Saas-Service - 17 - 17 + 21 + 21 UTF-8 diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/banner.txt b/cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt similarity index 100% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/resources/banner.txt rename to cloud-modules/cloud-Saas-Service/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml b/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml index 1cdb12c..b68ce33 100644 --- a/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/bootstrap.yml @@ -1,6 +1,6 @@ # Tomcat server: - port: 9500 + port: 92111 # nacos线上地址 nacos: @@ -8,11 +8,14 @@ nacos: user-name: nacos password: nacos namespace: eight + # Spring spring: + main: + allow-bean-definition-overriding: true application: # 应用名称 - name: cloud-auth + name: cloud-gen profiles: # 环境配置 active: dev @@ -44,4 +47,5 @@ spring: - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} # 系统环境Config共享配置 - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - + # xxl-job 配置文件 + - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml new file mode 100644 index 0000000..0b3964c --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/dev.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + ${log.pattern} + + + + + + ${log.path}/info.log + + + + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + INFO + + ACCEPT + + DENY + + + + + ${log.path}/error.log + + + + ${log.path}/error.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + + + ERROR + + ACCEPT + + DENY + + + + + + + + + + + + + + + + + + diff --git a/cloud-modules/cloud-electronic/src/main/resources/logback/prod.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml similarity index 59% rename from cloud-modules/cloud-electronic/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml index 9f04f11..4a9d602 100644 --- a/cloud-modules/cloud-electronic/src/main/resources/logback/prod.xml +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/prod.xml @@ -1,30 +1,32 @@ - - - + + + - - - ${log.sky.pattern} - - + + + ${log.pattern} + + - - ${log.path}/info.log + + ${log.path}/info.log - + - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + INFO @@ -32,24 +34,26 @@ DENY - + - ${log.path}/error.log + ${log.path}/error.log ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 60 - + + ${log.pattern} + ERROR - + ACCEPT - + DENY @@ -63,19 +67,22 @@ - - - - - - - + + + + + + + + + + - - + + diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml similarity index 59% rename from cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml rename to cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml index dfafbd9..4a9d602 100644 --- a/cloud-modules/cloud-modules-car/src/main/resources/logback/test.xml +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/logback/test.xml @@ -1,30 +1,32 @@ - - - + + + - - - ${log.sky.pattern} - - + + + ${log.pattern} + + - - ${log.path}/info.log + + ${log.path}/info.log - + - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - + ${log.path}/info.%d{yyyy-MM-dd}.log + + 60 + + + ${log.pattern} + + INFO @@ -32,24 +34,26 @@ DENY - + - ${log.path}/error.log + ${log.path}/error.log ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 + + 60 - + + ${log.pattern} + ERROR - + ACCEPT - + DENY @@ -63,19 +67,22 @@ - - - - - - - + + + + + + + + + + - - + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableColumnMapper.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableColumnMapper.xml new file mode 100644 index 0000000..fb9800e --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableColumnMapper.xml @@ -0,0 +1,157 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select column_id, + table_id, + column_name, + column_comment, + column_type, + java_type, + java_field, + is_pk, + is_increment, + is_required, + is_insert, + is_edit, + is_list, + is_query, + query_type, + html_type, + dict_type, + sort, + create_by, + create_time, + update_by, + update_time + from gen_table_column + + + + + + + + insert into gen_table_column ( + table_id, + column_name, + column_comment, + column_type, + java_type, + java_field, + is_pk, + is_increment, + is_required, + is_insert, + is_edit, + is_list, + is_query, + query_type, + html_type, + dict_type, + sort, + create_by, + create_time + )values( + #{tableId}, + #{columnName}, + #{columnComment}, + #{columnType}, + #{javaType}, + #{javaField}, + #{isPk}, + #{isIncrement}, + #{isRequired}, + #{isInsert}, + #{isEdit}, + #{isList}, + #{isQuery}, + #{queryType}, + #{htmlType}, + #{dictType}, + #{sort}, + #{createBy}, + sysdate() + ) + + + + update gen_table_column + + column_comment = #{columnComment}, + java_type = #{javaType}, + java_field = #{javaField}, + is_insert = #{isInsert}, + is_edit = #{isEdit}, + is_list = #{isList}, + is_query = #{isQuery}, + is_required = #{isRequired}, + query_type = #{queryType}, + html_type = #{htmlType}, + dict_type = #{dictType}, + sort = #{sort}, + update_by = #{updateBy}, + update_time = sysdate() + + where column_id = #{columnId} + + + + delete from gen_table_column where table_id in + + #{tableId} + + + + + delete from gen_table_column where column_id in + + #{item.columnId} + + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableMapper.xml b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableMapper.xml new file mode 100644 index 0000000..42ab2cf --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/mapper/generator/GenTableMapper.xml @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + select table_id, + table_name, + table_comment, + sub_table_name, + sub_table_fk_name, + class_name, + tpl_category, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + gen_path, + options, + create_by, + create_time, + update_by, + update_time, + remark + from gen_table + + + + + + + + + + + + + + + + + + insert into gen_table ( + table_name, + table_comment, + class_name, + tpl_category, + package_name, + module_name, + business_name, + function_name, + function_author, + gen_type, + gen_path, + remark, + create_by, + create_time + )values( + #{tableName}, + #{tableComment}, + #{className}, + #{tplCategory}, + #{packageName}, + #{moduleName}, + #{businessName}, + #{functionName}, + #{functionAuthor}, + #{genType}, + #{genPath}, + #{remark}, + #{createBy}, + sysdate() + ) + + + + update gen_table + + table_name = #{tableName}, + table_comment = #{tableComment}, + sub_table_name = #{subTableName}, + sub_table_fk_name = #{subTableFkName}, + class_name = #{className}, + function_author = #{functionAuthor}, + gen_type = #{genType}, + gen_path = #{genPath}, + tpl_category = #{tplCategory}, + package_name = #{packageName}, + module_name = #{moduleName}, + business_name = #{businessName}, + function_name = #{functionName}, + options = #{options}, + update_by = #{updateBy}, + remark = #{remark}, + update_time = sysdate() + + where table_id = #{tableId} + + + + delete from gen_table where table_id in + + #{tableId} + + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/controller.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/controller.java.vm new file mode 100644 index 0000000..1df5be0 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/controller.java.vm @@ -0,0 +1,116 @@ +package ${packageName}.controller; + +import java.util.List; +import java.io.IOException; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import com.muyu.common.log.annotation.Log; +import com.muyu.common.log.enums.BusinessType; +import com.muyu.common.security.annotation.RequiresPermissions; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; +import com.muyu.common.core.web.controller.BaseController; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.poi.ExcelUtil; +#if($table.crud || $table.sub) +import com.muyu.common.core.web.page.TableDataInfo; +#elseif($table.tree) +#end + +/** + * ${functionName}Controller + * + * @author ${author} + * @date ${datetime} + */ +@RestController +@RequestMapping("/${businessName}") +public class ${ClassName}Controller extends BaseController +{ + @Autowired + private I${ClassName}Service ${className}Service; + + /** + * 查询${functionName}列表 + */ + @RequiresPermissions("${permissionPrefix}:list") + @GetMapping("/list") +#if($table.crud || $table.sub) + public Result list(${ClassName} ${className}) + { + startPage(); + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return getDataTable(list); + } +#elseif($table.tree) + public Result list(${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + return success(list); + } +#end + + /** + * 导出${functionName}列表 + */ + @RequiresPermissions("${permissionPrefix}:export") + @Log(title = "${functionName}", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(HttpServletResponse response, ${ClassName} ${className}) + { + List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); + ExcelUtil<${ClassName}> util = new ExcelUtil<${ClassName}>(${ClassName}.class); + util.exportExcel(response, list, "${functionName}数据"); + } + + /** + * 获取${functionName}详细信息 + */ + @RequiresPermissions("${permissionPrefix}:query") + @GetMapping(value = "/{${pkColumn.javaField}}") + public Result getInfo(@PathVariable("${pkColumn.javaField}") ${pkColumn.javaType} ${pkColumn.javaField}) + { + return success(${className}Service.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField})); + } + + /** + * 新增${functionName} + */ + @RequiresPermissions("${permissionPrefix}:add") + @Log(title = "${functionName}", businessType = BusinessType.INSERT) + @PostMapping + public Result add(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.insert${ClassName}(${className})); + } + + /** + * 修改${functionName} + */ + @RequiresPermissions("${permissionPrefix}:edit") + @Log(title = "${functionName}", businessType = BusinessType.UPDATE) + @PutMapping + public Result edit(@RequestBody ${ClassName} ${className}) + { + return toAjax(${className}Service.update${ClassName}(${className})); + } + + /** + * 删除${functionName} + */ + @RequiresPermissions("${permissionPrefix}:remove") + @Log(title = "${functionName}", businessType = BusinessType.DELETE) + @DeleteMapping("/{${pkColumn.javaField}s}") + public Result remove(@PathVariable("${pkColumn.javaField}s") ${pkColumn.javaType}[] ${pkColumn.javaField}s) + { + return toAjax(${className}Service.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s)); + } +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/domain.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/domain.java.vm new file mode 100644 index 0000000..1292991 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/domain.java.vm @@ -0,0 +1,103 @@ +package ${packageName}.domain; + +#foreach ($import in $importList) +import ${import}; +#end +import com.muyu.common.core.annotation.Excel; +#if($table.crud || $table.sub) +import com.muyu.common.core.web.domain.BaseEntity; +#elseif($table.tree) +import com.muyu.common.core.web.domain.TreeEntity; +#end + +/** + * ${functionName}对象 ${tableName} + * + * @author ${author} + * @date ${datetime} + */ +#if($table.crud || $table.sub) +#set($Entity="BaseEntity") +#elseif($table.tree) +#set($Entity="TreeEntity") +#end +public class ${ClassName} extends ${Entity} +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("(")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#if($table.sub) + /** $table.subTable.functionName信息 */ + private List<${subClassName}> ${subclassName}List; + +#end +#foreach ($column in $columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + +#if($table.sub) + public List<${subClassName}> get${subClassName}List() + { + return ${subclassName}List; + } + + public void set${subClassName}List(List<${subClassName}> ${subclassName}List) + { + this.${subclassName}List = ${subclassName}List; + } + +#end + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end +#if($table.sub) + .append("${subclassName}List", get${subClassName}List()) +#end + .toString(); + } +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/mapper.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/mapper.java.vm new file mode 100644 index 0000000..7e7d7c2 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/mapper.java.vm @@ -0,0 +1,91 @@ +package ${packageName}.mapper; + +import java.util.List; +import ${packageName}.domain.${ClassName}; +#if($table.sub) +import ${packageName}.domain.${subClassName}; +#end + +/** + * ${functionName}Mapper接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface ${ClassName}Mapper +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 删除${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); +#if($table.sub) + + /** + * 批量删除${subTable.functionName} + * + * @param ${pkColumn.javaField}s 需要删除的数据主键集合 + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 批量新增${subTable.functionName} + * + * @param ${subclassName}List ${subTable.functionName}列表 + * @return 结果 + */ + public int batch${subClassName}(List<${subClassName}> ${subclassName}List); + + + /** + * 通过${functionName}主键删除${subTable.functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}ID + * @return 结果 + */ + public int delete${subClassName}By${subTableFkClassName}(${pkColumn.javaType} ${pkColumn.javaField}); +#end +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/service.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/service.java.vm new file mode 100644 index 0000000..264882b --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/service.java.vm @@ -0,0 +1,61 @@ +package ${packageName}.service; + +import java.util.List; +import ${packageName}.domain.${ClassName}; + +/** + * ${functionName}Service接口 + * + * @author ${author} + * @date ${datetime} + */ +public interface I${ClassName}Service +{ + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName}集合 + */ + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}); + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int insert${ClassName}(${ClassName} ${className}); + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ + public int update${ClassName}(${ClassName} ${className}); + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s); + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}); +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/serviceImpl.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/serviceImpl.java.vm new file mode 100644 index 0000000..3904af5 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/serviceImpl.java.vm @@ -0,0 +1,169 @@ +package ${packageName}.service.impl; + +import java.util.List; +#foreach ($column in $columns) +#if($column.javaField == 'createTime' || $column.javaField == 'updateTime') +import com.muyu.common.core.utils.DateUtils; +#break +#end +#end +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +#if($table.sub) +import java.util.ArrayList; +import com.muyu.common.core.utils.StringUtils; +import org.springframework.transaction.annotation.Transactional; +import ${packageName}.domain.${subClassName}; +#end +import ${packageName}.mapper.${ClassName}Mapper; +import ${packageName}.domain.${ClassName}; +import ${packageName}.service.I${ClassName}Service; + +/** + * ${functionName}Service业务层处理 + * + * @author ${author} + * @date ${datetime} + */ +@Service +public class ${ClassName}ServiceImpl implements I${ClassName}Service +{ + @Autowired + private ${ClassName}Mapper ${className}Mapper; + + /** + * 查询${functionName} + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return ${functionName} + */ + @Override + public ${ClassName} select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { + return ${className}Mapper.select${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } + + /** + * 查询${functionName}列表 + * + * @param ${className} ${functionName} + * @return ${functionName} + */ + @Override + public List<${ClassName}> select${ClassName}List(${ClassName} ${className}) + { + return ${className}Mapper.select${ClassName}List(${className}); + } + + /** + * 新增${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int insert${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'createTime') + ${className}.setCreateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + int rows = ${className}Mapper.insert${ClassName}(${className}); + insert${subClassName}(${className}); + return rows; +#else + return ${className}Mapper.insert${ClassName}(${className}); +#end + } + + /** + * 修改${functionName} + * + * @param ${className} ${functionName} + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int update${ClassName}(${ClassName} ${className}) + { +#foreach ($column in $columns) +#if($column.javaField == 'updateTime') + ${className}.setUpdateTime(DateUtils.getNowDate()); +#end +#end +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${className}.get${pkColumn.capJavaField}()); + insert${subClassName}(${className}); +#end + return ${className}Mapper.update${ClassName}(${className}); + } + + /** + * 批量删除${functionName} + * + * @param ${pkColumn.javaField}s 需要删除的${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaType}[] ${pkColumn.javaField}s) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}s(${pkColumn.javaField}s); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}s(${pkColumn.javaField}s); + } + + /** + * 删除${functionName}信息 + * + * @param ${pkColumn.javaField} ${functionName}主键 + * @return 结果 + */ +#if($table.sub) + @Transactional +#end + @Override + public int delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaType} ${pkColumn.javaField}) + { +#if($table.sub) + ${className}Mapper.delete${subClassName}By${subTableFkClassName}(${pkColumn.javaField}); +#end + return ${className}Mapper.delete${ClassName}By${pkColumn.capJavaField}(${pkColumn.javaField}); + } +#if($table.sub) + + /** + * 新增${subTable.functionName}信息 + * + * @param ${className} ${functionName}对象 + */ + public void insert${subClassName}(${ClassName} ${className}) + { + List<${subClassName}> ${subclassName}List = ${className}.get${subClassName}List(); + ${pkColumn.javaType} ${pkColumn.javaField} = ${className}.get${pkColumn.capJavaField}(); + if (StringUtils.isNotNull(${subclassName}List)) + { + List<${subClassName}> list = new ArrayList<${subClassName}>(); + for (${subClassName} ${subclassName} : ${subclassName}List) + { + ${subclassName}.set${subTableFkClassName}(${pkColumn.javaField}); + list.add(${subclassName}); + } + if (list.size() > 0) + { + ${className}Mapper.batch${subClassName}(list); + } + } + } +#end +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/sub-domain.java.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/sub-domain.java.vm new file mode 100644 index 0000000..a5c170c --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/java/sub-domain.java.vm @@ -0,0 +1,79 @@ +package ${packageName}.domain; + +#foreach ($import in $subImportList) +import ${import}; +#end +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.domain.BaseEntity; + +/** + * ${subTable.functionName}对象 ${subTableName} + * + * @author ${author} + * @date ${datetime} + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class ${subClassName} extends BaseEntity +{ + private static final long serialVersionUID = 1L; + +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) + /** $column.columnComment */ +#if($column.list) +#set($parentheseIndex=$column.columnComment.indexOf("(")) +#if($parentheseIndex != -1) +#set($comment=$column.columnComment.substring(0, $parentheseIndex)) +#else +#set($comment=$column.columnComment) +#end +#if($parentheseIndex != -1) + @Excel(name = "${comment}", readConverterExp = "$column.readConverterExp()") +#elseif($column.javaType == 'Date') + @JsonFormat(pattern = "yyyy-MM-dd") + @Excel(name = "${comment}", width = 30, dateFormat = "yyyy-MM-dd") +#else + @Excel(name = "${comment}") +#end +#end + private $column.javaType $column.javaField; + +#end +#end +#foreach ($column in $subTable.columns) +#if(!$table.isSuperColumn($column.javaField)) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + public void set${AttrName}($column.javaType $column.javaField) + { + this.$column.javaField = $column.javaField; + } + + public $column.javaType get${AttrName}() + { + return $column.javaField; + } +#end +#end + + @Override + public String toString() { + return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) +#foreach ($column in $subTable.columns) +#if($column.javaField.length() > 2 && $column.javaField.substring(1,2).matches("[A-Z]")) +#set($AttrName=$column.javaField) +#else +#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)}) +#end + .append("${column.javaField}", get${AttrName}()) +#end + .toString(); + } +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/js/api.js.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/js/api.js.vm new file mode 100644 index 0000000..9295524 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/js/api.js.vm @@ -0,0 +1,44 @@ +import request from '@/utils/request' + +// 查询${functionName}列表 +export function list${BusinessName}(query) { + return request({ + url: '/${moduleName}/${businessName}/list', + method: 'get', + params: query + }) +} + +// 查询${functionName}详细 +export function get${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'get' + }) +} + +// 新增${functionName} +export function add${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'post', + data: data + }) +} + +// 修改${functionName} +export function update${BusinessName}(data) { + return request({ + url: '/${moduleName}/${businessName}', + method: 'put', + data: data + }) +} + +// 删除${functionName} +export function del${BusinessName}(${pkColumn.javaField}) { + return request({ + url: '/${moduleName}/${businessName}/' + ${pkColumn.javaField}, + method: 'delete' + }) +} diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/sql/sql.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/sql/sql.vm new file mode 100644 index 0000000..0575583 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/sql/sql.vm @@ -0,0 +1,22 @@ +-- 菜单 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单'); + +-- 按钮父菜单ID +SELECT @parentId := LAST_INSERT_ID(); + +-- 按钮 SQL +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}查询', @parentId, '1', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}新增', @parentId, '2', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}修改', @parentId, '3', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}删除', @parentId, '4', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', '#', 'admin', sysdate(), '', null, ''); + +insert into sys_menu (menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark) +values('${functionName}导出', @parentId, '5', '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', '#', 'admin', sysdate(), '', null, ''); \ No newline at end of file diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index-tree.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index-tree.vue.vm new file mode 100644 index 0000000..a4c64a0 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index-tree.vue.vm @@ -0,0 +1,505 @@ + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index.vue.vm new file mode 100644 index 0000000..6296014 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/index.vue.vm @@ -0,0 +1,602 @@ + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index-tree.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index-tree.vue.vm new file mode 100644 index 0000000..7bbd2fc --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -0,0 +1,474 @@ + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index.vue.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index.vue.vm new file mode 100644 index 0000000..8b25665 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/index.vue.vm @@ -0,0 +1,590 @@ + + + diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/readme.txt b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/readme.txt new file mode 100644 index 0000000..9f60284 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/vue/v3/readme.txt @@ -0,0 +1 @@ +���ʹ�õ���cloud-Cloud-Vue3ǰ�ˣ���ô��Ҫ����һ�´�Ŀ¼��ģ��index.vue.vm��index-tree.vue.vm�ļ����ϼ�vueĿ¼�� diff --git a/cloud-modules/cloud-Saas-Service/src/main/resources/vm/xml/mapper.xml.vm b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/xml/mapper.xml.vm new file mode 100644 index 0000000..0ceb3d8 --- /dev/null +++ b/cloud-modules/cloud-Saas-Service/src/main/resources/vm/xml/mapper.xml.vm @@ -0,0 +1,135 @@ + + + + + +#foreach ($column in $columns) + +#end + +#if($table.sub) + + + + + + +#foreach ($column in $subTable.columns) + +#end + +#end + + + select#foreach($column in $columns) $column.columnName#if($foreach.count != $columns.size()),#end#end from ${tableName} + + + + + + + + insert into ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + $column.columnName, +#end +#end + + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName || !$pkColumn.increment) + #{$column.javaField}, +#end +#end + + + + + update ${tableName} + +#foreach($column in $columns) +#if($column.columnName != $pkColumn.columnName) + $column.columnName = #{$column.javaField}, +#end +#end + + where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} = #{${pkColumn.javaField}} + + + + delete from ${tableName} where ${pkColumn.columnName} in + + #{${pkColumn.javaField}} + + +#if($table.sub) + + + delete from ${subTableName} where ${subTableFkName} in + + #{${subTableFkclassName}} + + + + + delete from ${subTableName} where ${subTableFkName} = #{${subTableFkclassName}} + + + + insert into ${subTableName}(#foreach($column in $subTable.columns) $column.columnName#if($foreach.count != $subTable.columns.size()),#end#end) values + + (#foreach($column in $subTable.columns) #{item.$column.javaField}#if($foreach.count != $subTable.columns.size()),#end#end) + + +#end + \ No newline at end of file diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/java/com/muyu/vehicle/VehicleSimulationApplication.java b/cloud-modules/cloud-Vehicle-Simulation/src/main/java/com/muyu/vehicle/VehicleSimulationApplication.java deleted file mode 100644 index 4c91838..0000000 --- a/cloud-modules/cloud-Vehicle-Simulation/src/main/java/com/muyu/vehicle/VehicleSimulationApplication.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.vehicle; - -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @Author:杨闪闪 - * @Package:com.muyu.server.integration - * @Project:cloud-integration - * @name:Integration - * @Date:2024/9/17 下午9:56 - */ -@EnableMyFeignClients -@SpringBootApplication -public class VehicleSimulationApplication { - public static void main(String[] args) { - SpringApplication.run(VehicleSimulationApplication.class, args); - } -} diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml b/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml deleted file mode 100644 index de2d5ca..0000000 --- a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Tomcat -server: - port: 9101 - -# nacos线上地址 -nacos: - addr: 159.75.188.178:8848 - user-name: nacos - password: nacos - namespace: eight - -# Spring -spring: - application: - # 应用名称 - name: cloud-monitor - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-electronic/pom.xml b/cloud-modules/cloud-electronic/pom.xml deleted file mode 100644 index 75429f7..0000000 --- a/cloud-modules/cloud-electronic/pom.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-server - 3.6.3 - ../../pom.xml - - - com.muyu.server - cloud-electronic - - - 21 - 21 - UTF-8 - - - - - - - - - - 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-electronic-common - 3.6.3 - - - com.github.pagehelper - pagehelper - 6.0.0 - - - - cloud-electronic - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-electronic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-electronic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8b13789..0000000 --- a/cloud-modules/cloud-electronic/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ - diff --git a/cloud-modules/cloud-electronic/src/main/resources/banner.txt b/cloud-modules/cloud-electronic/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-electronic/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-electronic/src/main/resources/bootstrap.yml b/cloud-modules/cloud-electronic/src/main/resources/bootstrap.yml deleted file mode 100644 index eea96e5..0000000 --- a/cloud-modules/cloud-electronic/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,47 +0,0 @@ -# Tomcat -server: - port: 9111 - -# nacos线上地址 -nacos: - addr: 127.0.0.1:8848 - user-name: nacos - password: nacos - namespace: psr - -# Spring -spring: - application: - # 应用名称 - name: cloud-electronic - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} diff --git a/cloud-modules/cloud-electronic/src/main/resources/logback/dev.xml b/cloud-modules/cloud-electronic/src/main/resources/logback/dev.xml deleted file mode 100644 index 187e473..0000000 --- a/cloud-modules/cloud-electronic/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-electronic/src/main/resources/logback/test.xml b/cloud-modules/cloud-electronic/src/main/resources/logback/test.xml deleted file mode 100644 index 9f04f11..0000000 --- a/cloud-modules/cloud-electronic/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-electronic/src/main/resources/mapper/CarMiddleGroupMapper.xml b/cloud-modules/cloud-electronic/src/main/resources/mapper/CarMiddleGroupMapper.xml deleted file mode 100644 index e95c1a4..0000000 --- a/cloud-modules/cloud-electronic/src/main/resources/mapper/CarMiddleGroupMapper.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - diff --git a/cloud-modules/cloud-modules-car/pom.xml b/cloud-modules/cloud-modules-car/pom.xml deleted file mode 100644 index c7be081..0000000 --- a/cloud-modules/cloud-modules-car/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-car - - - 17 - 17 - UTF-8 - - - - - - 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-xxl - - - - com.muyu - cloud-common-rabbit - - - - - com.muyu - cloud-common-system - - - - - 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/car/CarApplication.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/CarApplication.java deleted file mode 100644 index 75f209c..0000000 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/CarApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.car; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import lombok.extern.log4j.Log4j2; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class CarApplication { - public static void main(String[] args){ - SpringApplication.run(CarApplication.class,args); - } - - -} diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/resp/CarReq.java b/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/resp/CarReq.java deleted file mode 100644 index f54a4c0..0000000 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/resp/CarReq.java +++ /dev/null @@ -1,99 +0,0 @@ -package com.muyu.car.domain.resp; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class CarReq { - - private String EatImagtion; - private String imgTion; - private String EatIma6ion; - private String EatImagtFformion; - private String EatTailImagtion; - private String EatImagertion; - private String EatImagtodoion; - private String EatasImagtion; - private String EatImageartion; - private String imagtionId; - private String Eagtion; - private String EatImag; - private String tImag; - private String agtizyRon; - private String EatImagcdtion; - private String agtigagtion; - private String EatImfhgdfagtion; - private String EffatImagtion; - private String EatImadfggtion; - private String EatImagfgtion; - private String EatImaggdtion; - private String EatImagdfgtion; - private String EatImfdgadfggtion; - private String EatIfdgmagtion; - private String EatIfdgfgmagtion; - private String EatImagdffggtion; - private String EatImaggfdtion; - private String EatImagtigon; - private String EatImagtbjion; - private String EatImagt_fdgion; - private String EatrgImagtion; - private String EatIdgmagtion; - private String EatImafggtion; - private String EgatImgagtion; - private String EatImggagtion; - private String EatImagfdgtion; - private String EatdfgImadfggtion; - private String EatIgdmagtion; - private String EatImagd; - private String EatdfgImagtion; - private String EatIgfgmagtion; - private String EatIsdmagtion; - private String EatfImagtion; - private String EadatImagtion; - private String EatdgImagtion; - private String EatdImagtion; - private String EatIafmagtion; - private String EatIagffmagtion; - private String EatgsImagtion; - private String EatasdImagtion; - private String EatIadmagtion; - private String EatadImagtion; - private String EatIcvmagtion; - private String EatImagtfion; - private String EatImagation; - private String EatImfagtion; - private String EatImagyution; - private Integer other; - private Integer othjjer; - private Integer otmkdowedher; - private Integer desother; -private Integer otsmkeher; -private Integer othsmer; -private Integer oedednjihyther; -private Integer othhuer; -private Integer othmkjoer; -private Integer othnjiu8er; -private Integer othhubhyer; -private Integer othejkihjur; - - - - - - - - - - - - - - - - -} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/banner.txt b/cloud-modules/cloud-modules-car/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml deleted file mode 100644 index 91799f9..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Tomcat -server: - port: 9701 - -# nacos线上地址 -nacos: - addr: 159.75.188.178:8848 - user-name: nacos - password: nacos - namespace: eight -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-system - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml deleted file mode 100644 index bb11ed5..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml deleted file mode 100644 index dfafbd9..0000000 --- a/cloud-modules/cloud-modules-car/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - 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..b5e1bb6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml @@ -0,0 +1,59 @@ + + + 4.0.0 + + com.muyu + cloud-server + 3.6.3 + ../../../pom.xml + + + cloud-modules-enterprise-common + 3.6.3 + + cloud-modules-enterprise-common 企业业务common + + + 21 + 21 + UTF-8 + + + + + com.muyu + cloud-common-core + + + + io.swagger.core.v3 + swagger-annotations-jakarta + 2.2.8 + compile + + + org.dom4j + dom4j + 2.1.3 + compile + + + com.thoughtworks.xstream + xstream + 1.4.20 + compile + + + com.squareup.okhttp3 + okhttp + 4.9.3 + + + com.alibaba + fastjson + 1.2.83 + + + diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/AccessToken.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/AccessToken.java new file mode 100644 index 0000000..9fd2940 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/AccessToken.java @@ -0,0 +1,23 @@ +package com.muyu.common.wechat.domain; + +import lombok.Data; + +/** + * @author 24415 + */ +@Data +public class AccessToken { + + private String access_token; + + private Long expires_in; + + public void setExpiresTime(Long expiresIn) { + this.expires_in = System.currentTimeMillis()+expiresIn*1000; + } + + public boolean isExpired(Long expiresIn){ + long now = System.currentTimeMillis(); + return now>expiresIn; + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Articles.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Articles.java new file mode 100644 index 0000000..7464399 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Articles.java @@ -0,0 +1,38 @@ +package com.muyu.common.wechat.domain; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author:蓬叁 + * @Package:com.muyu.wxapplication.massage + * @Project:WXApplication + * @name:Articles + * @Date:2024/9/18 下午10:14 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@XStreamAlias("item") +public class Articles { +// +// +// <![CDATA[title1]]> +// +// +// +// +// + + @XStreamAlias("Title") + private String title ; + @XStreamAlias("Description") + private String description ; + @XStreamAlias("PicUrl") + private String picUrl ; + @XStreamAlias("Url") + private String url ; + +} diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarFaultRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFaultRule.java similarity index 99% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarFaultRule.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFaultRule.java index 90cffdf..2080a84 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarFaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFaultRule.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; /** * @Author:weiran diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFence.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFence.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFence.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFence.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFenceClazz.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceClazz.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFenceClazz.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceClazz.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFenceGroup.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceGroup.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFenceGroup.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceGroup.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFenceType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceType.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarFenceType.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarFenceType.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarInformation.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java similarity index 74% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarInformation.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java index 174f2b4..9efc569 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarInformation.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarInformation.java @@ -25,7 +25,7 @@ import java.util.Date; @AllArgsConstructor @NoArgsConstructor @Builder -@Tag(name = "车辆表") +@Tag(name = "企业车辆管理实体类") @TableName(value = "car_information",autoResultMap = true) public class CarInformation { @@ -38,6 +38,7 @@ public class CarInformation { * 车辆唯一VIN */ // @TableName(value = "car_information_VIN") + @TableField(value = "car_information_VIN") private String carInformationVin; /** * 车牌号 @@ -58,8 +59,8 @@ public class CarInformation { /** * 车检到期日期 */ - @DateTimeFormat(fallbackPatterns = "yyyy/MM/dd hh:mm:ss") - @JsonFormat(pattern = "yyyy/MM/dd hh:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") private Date carInformationExamineEnddata; /** * 车辆类型外键ID @@ -74,6 +75,31 @@ public class CarInformation { */ private Integer carInformationFocus; + /** + * 车辆电机厂商 + */ + private String carInformationMotorManufacturer; + + /** + * 车辆电机型号 + */ + private String carInformationMotorModel; + + /** + * 车辆电池厂商 + */ + private String carInformationBatteryManufacturer; + + /** + * 车辆电池型号 + */ + private String carInformationBatteryModel; + + /** + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + */ + private Integer carInformationState; + public static CarInformation carInformationBuilder(CarInformation carInformation) { return CarInformation.builder() .carInformationId(carInformation.getCarInformationId()) diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessage.java similarity index 95% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessage.java index 551156d..6f07a3c 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarMessage.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessage.java @@ -1,7 +1,6 @@ -package com.muyu.car.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.TableName; -import io.swagger.v3.oas.models.security.SecurityScheme; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CarMessageType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessageType.java similarity index 94% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CarMessageType.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessageType.java index be27361..bb4b800 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CarMessageType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMessageType.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain.car; +package com.muyu.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddle.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMiddle.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddle.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMiddle.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddleGroup.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMiddleGroup.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/CarMiddleGroup.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarMiddleGroup.java diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarType.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarType.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarType.java index 38ef7f5..02882eb 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/CarType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/CarType.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCode.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCode.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java index 44a2d9b..2eeb7ee 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCode.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCode.java @@ -1,9 +1,9 @@ -package com.muyu.cloud.faultmanage.domain; +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.cloud.faultmanage.domain.req.FaultCodeAddReq; +import com.muyu.domain.req.FaultCodeAddReq; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -19,6 +19,7 @@ import lombok.experimental.SuperBuilder; */ /** * 故障码 + * @author 17353 */ @Data @AllArgsConstructor diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCondition.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java similarity index 93% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCondition.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java index a379e9f..f0e0d0f 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultCondition.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultCondition.java @@ -1,10 +1,10 @@ -package com.muyu.cloud.faultmanage.domain; +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.cloud.faultmanage.domain.req.FaultConditionAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionUpdReq; +import com.muyu.domain.req.FaultConditionAddReq; +import com.muyu.domain.req.FaultConditionUpdReq; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java similarity index 95% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLabel.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java index a3d5740..ed8f7c3 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLabel.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLabel.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java similarity index 97% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLog.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java index 6a24003..a65c8e2 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultLog.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultReport.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultReport.java similarity index 91% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultReport.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultReport.java index 2658ead..1d6f581 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultReport.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultReport.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultRule.java similarity index 96% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultRule.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultRule.java index 9e1c6c1..5a03844 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultRule.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultType.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultType.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultType.java index 5207532..695b56b 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/FaultType.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/NewsMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/NewsMessage.java new file mode 100644 index 0000000..9824e8e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/NewsMessage.java @@ -0,0 +1,51 @@ +package com.muyu.domain ; + +import com.muyu.common.wechat.domain.Articles; +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * @Author:蓬叁 + * @Package:com.muyu.wxapplication.massage + * @Project:WXApplication + * @name:ImageText + * @Date:2024/9/18 下午9:27 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@XStreamAlias("xml") +public class NewsMessage { +// +// +// 12345678 +// +// 1 +// +// +// <![CDATA[title1]]> +// +// +// +// +// + + @XStreamAlias("ToUserName") + private String toUserName ; + @XStreamAlias("FromUserName") + private String fromUserName ; + @XStreamAlias("CreateTime") + private long createTime ; + @XStreamAlias("MsgType") + private String msgType ; + @XStreamAlias("ArticleCount") + private Integer articleCount ; + @XStreamAlias("Articles") + private List articles ; + + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/TextMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/TextMessage.java new file mode 100644 index 0000000..1877430 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/TextMessage.java @@ -0,0 +1,40 @@ +package com.muyu.common.wechat.domain; + +import com.thoughtworks.xstream.annotations.XStreamAlias; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @Author:蓬叁 + * @Package:com.muyu.wxapplication.massage + * @Project:WXApplication + * @name:TextMessage + * @Date:2024/9/18 上午11:33 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@XStreamAlias("xml") +public class TextMessage { + + //起一个别名 因为我们微信返回信息与java代码格式规范发生冲突 + //微信格式 ToUserName + //JAVA格式 toUserName + @XStreamAlias("ToUserName") + private String toUserName; + @XStreamAlias("FromUserName") + private String fromUserName; + @XStreamAlias("CreateTime") + private long createTime; + @XStreamAlias("MsgType") + private String msgType; + @XStreamAlias("Content") + private String content; + +} +// +// +// 12345678 +// +// diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/Vehicle.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Vehicle.java similarity index 92% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/Vehicle.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Vehicle.java index c149473..72e448d 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/Vehicle.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/Vehicle.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain; +package com.muyu.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnLogs.java similarity index 98% rename from cloud-modules/cloud-modules-warn/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/domain/WarnLogs.java index 46bfcb2..56324c7 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnLogs.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnRule.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnRule.java similarity index 97% rename from cloud-modules/cloud-modules-warn/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/domain/WarnRule.java index 8649708..d8a96ce 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnRule.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnStrategy.java similarity index 97% rename from cloud-modules/cloud-modules-warn/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/domain/WarnStrategy.java index 0028376..02b48b1 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/WarnStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain; +package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/Message.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java similarity index 96% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/Message.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java index e619074..52831fb 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/Message.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/Message.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.message; +package com.muyu.domain.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/MessageReq.java similarity index 90% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/MessageReq.java index eecc393..bd74df0 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/MessageReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.message; +package com.muyu.domain.message; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageSendReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java index 290f3b7..2889890 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/MessageSendReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.message; +package com.muyu.domain.message; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/User.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/User.java similarity index 89% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/User.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/User.java index 19c7a35..1328252 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/message/User.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/message/User.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.message; +package com.muyu.domain.message; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceGroupReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarFenceGroupReq.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceGroupReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarFenceGroupReq.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarFenceReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarGroupIdReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarGroupIdReq.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarGroupIdReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarGroupIdReq.java diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarGroupReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarGroupReq.java similarity index 100% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/CarGroupReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarGroupReq.java diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationAddReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java similarity index 97% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationAddReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java index 3d97a36..cc2ed1a 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationAddReq.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain.req; +package com.muyu.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationListReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationListReq.java similarity index 98% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationListReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationListReq.java index 6dc3a49..a101eb2 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationListReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationListReq.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain.req; +package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationUpdReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationUpdReq.java similarity index 98% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationUpdReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationUpdReq.java index e846045..a172575 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/req/CarInformationUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/CarInformationUpdReq.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain.req; +package com.muyu.domain.req; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeAddReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java similarity index 96% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeAddReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java index e15db16..c20b978 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.req; +package com.muyu.domain.req; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeListReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java similarity index 93% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeListReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java index 0a37c55..3a4ced0 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeListReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.req; +package com.muyu.domain.req; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeUpdReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java similarity index 96% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeUpdReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java index 2b3a4b5..dbb6c34 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultCodeUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.req; +package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionAddReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionAddReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java index 5e41668..dbeaf42 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.req; +package com.muyu.domain.req; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionListReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionListReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java index c45393e..1732d8d 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionListReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.req; +package com.muyu.domain.req; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionUpdReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionUpdReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java index 80e198d..68f67d9 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultConditionUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.req; +package com.muyu.domain.req; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultLogListReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java similarity index 96% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultLogListReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java index 42bec54..60775a5 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/req/FaultLogListReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.req; +package com.muyu.domain.req; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/FenceGroupReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FenceGroupReq.java similarity index 94% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/FenceGroupReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FenceGroupReq.java index f721463..feca6c0 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/req/FenceGroupReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/FenceGroupReq.java @@ -2,7 +2,6 @@ package com.muyu.domain.req; import com.muyu.domain.CarFence; import com.muyu.domain.CarFenceGroup; -import com.muyu.domain.CarInformation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/req/WarnStrategyReq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/WarnStrategyReq.java similarity index 94% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/req/WarnStrategyReq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/WarnStrategyReq.java index 32f37e7..7f079d3 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/req/WarnStrategyReq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/req/WarnStrategyReq.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain.req; +package com.muyu.domain.req; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupResq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceGroupResp.java similarity index 95% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupResq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceGroupResp.java index 81c5f48..ad6899a 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupResq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceGroupResp.java @@ -1,4 +1,4 @@ -package com.muyu.domain.resq; +package com.muyu.domain.resp; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; @@ -13,6 +13,7 @@ import java.util.Date; import java.util.List; /** + * 车辆电子围栏类 * @Author:yang * @Package:com.muyu.domain.resq * @Project:cloud-server-8 @@ -23,7 +24,7 @@ import java.util.List; @AllArgsConstructor @NoArgsConstructor @Tag(name = "车辆电子围栏类") -public class CarFenceGroupResq { +public class CarFenceGroupResp { /** * 围栏主键 */ diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupsResq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceGroupsResp.java similarity index 93% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupsResq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceGroupsResp.java index 211b2f7..7f92289 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceGroupsResq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceGroupsResp.java @@ -1,4 +1,4 @@ -package com.muyu.domain.resq; +package com.muyu.domain.resp; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; @@ -18,7 +18,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @Tag(name = "车辆电子围栏类") -public class CarFenceGroupsResq { +public class CarFenceGroupsResp { /** * 围栏组ID diff --git a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceResq.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceResp.java similarity index 89% rename from cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceResq.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceResp.java index 1b2045d..293c077 100644 --- a/cloud-common/cloud-electronic-common/src/main/java/com/muyu/domain/resq/CarFenceResq.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarFenceResp.java @@ -1,9 +1,8 @@ -package com.muyu.domain.resq; +package com.muyu.domain.resp; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.muyu.domain.CarFence; -import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -26,7 +25,7 @@ import java.util.Date; @Builder @Tag(name = "车辆电子围栏类") @TableName(value = "car_fence",autoResultMap = true) -public class CarFenceResq { +public class CarFenceResp { /** * 围栏主键 @@ -63,8 +62,8 @@ public class CarFenceResq { @JsonFormat(pattern = "yyyy/MM/dd hh:mm:ss") private Date fenceCreate; - public static CarFenceResq carFenceResqListBuilder(CarFence etlDataScore) { - return CarFenceResq.builder() + public static CarFenceResp carFenceResqListBuilder(CarFence etlDataScore) { + return CarFenceResp.builder() .id(etlDataScore.getId()) .name(etlDataScore.getName()) .clazzName(etlDataScore.getClazzName()) diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarInformation.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarInformationResp.java similarity index 66% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarInformation.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarInformationResp.java index 2427db7..290fdd0 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/domain/CarInformation.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarInformationResp.java @@ -1,62 +1,67 @@ -package com.muyu.car.domain; +package com.muyu.domain.resp; -import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; import com.fasterxml.jackson.annotation.JsonFormat; -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; -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "企业车辆管理实体类",autoResultMap = true) -public class CarInformation { +/** + * @Author:yang + * @Package:com.muyu.domain.resq + * @Project:cloud-server-8 + * @name:CarInformationResp + * @Date:2024/9/28 12:08 + */ +public class CarInformationResp { /** * 车辆ID */ - private Long carInformationId; - + @TableId(value = "car_information_id",type = IdType.AUTO) + private Integer carInformationId; /** * 车辆唯一VIN - * 固定(不可修改) */ - private String carInformationVIN; - +// @TableName(value = "car_information_VIN") + @TableField(value = "car_information_VIN") + private String carInformationVin; /** * 车牌号 - * 固定(不可修改) */ private String carInformationLicensePlate; - - /** - * 车辆品牌 - */ - private String carInformationBrand; - /** * 车辆颜色 */ private String carInformationColor; - /** * 车辆驾驶员 */ private String carInformationDriver; - + /** + * 车辆电子围栏外键ID + */ + private String carInformationFence; /** * 车检到期日期 - * 固定(不可修改) */ @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(locale="zh", timezone="GMT+8", pattern="yyyy-MM-dd") private Date carInformationExamineEnddata; + /** + * 车辆类型外键ID + */ + private Integer carInformationType; + /** + * 车辆品牌外键ID + */ + private Integer carInformationBrand; + /** + * 是否重点车辆 (0否默认 1是 ) + */ + private Integer carInformationFocus; /** * 车辆电机厂商 @@ -78,36 +83,26 @@ public class CarInformation { */ private String carInformationBatteryModel; - /** - * 车辆电子围栏外键ID - */ - private Integer carInformationFence; - - /** - * 车辆类型外键ID - */ - private Integer carInformationType; - - /** - * 是否重点车辆 (0否默认 1是 ) - */ - private Integer carInformationFocus; - /** * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) */ private Integer carInformationState; - //车辆类型表 /** * 车辆类型ID */ + @TableField(value = "car_information_type") private Integer carTypeId; /** * 车辆类型名 */ + @TableField(exist = false) private String carTypeName; + /** + * 车辆规则外键ID + */ + private long carTypeRules; //电子围栏 /** @@ -119,5 +114,4 @@ public class CarInformation { * 电子围栏名 */ private String fencename; - } diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/resp/CarMessageResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarMessageResp.java similarity index 96% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/resp/CarMessageResp.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarMessageResp.java index 3699372..d75ad43 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/resp/CarMessageResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/CarMessageResp.java @@ -1,4 +1,4 @@ -package com.muyu.warn.domain.car.resp; +package com.muyu.domain.resp; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java similarity index 95% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeListResp.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java index c0b79b8..21ea9b9 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java @@ -1,7 +1,7 @@ -package com.muyu.cloud.faultmanage.domain.resp; +package com.muyu.domain.resp; -import com.muyu.cloud.faultmanage.domain.vo.FaultCodeVO; +import com.muyu.domain.vo.FaultCodeVO; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeTotalListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java similarity index 93% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java index b728747..634e4d7 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultCodeTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.resp; +package com.muyu.domain.resp; import io.swagger.v3.oas.annotations.tags.Tag; @@ -24,6 +24,9 @@ import java.util.List; public class FaultCodeTotalListResp { + /** + * 故障码信息集合 + */ private List faultCodeListRespList; private long total; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java similarity index 94% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionListResp.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java index bdbcef0..efa88b4 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java @@ -1,6 +1,6 @@ -package com.muyu.cloud.faultmanage.domain.resp; +package com.muyu.domain.resp; -import com.muyu.cloud.faultmanage.domain.FaultCondition; +import com.muyu.domain.FaultCondition; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionTotalListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java similarity index 81% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java index fe96e27..0727c61 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultConditionTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.resp; +package com.muyu.domain.resp; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -9,6 +9,7 @@ import lombok.experimental.SuperBuilder; import java.util.List; /** + * 故障规则数据总数列表 * @Author:weiran * @Package:com.muyu.cloud.faultmanage.domain.resp * @Project:cloud-server-8 @@ -23,10 +24,22 @@ import java.util.List; @Tag(name="故障规则数据总数列表",description = "数据和总数的响应") public class FaultConditionTotalListResp { + /** + * 故障规则信息集合 + */ private List faultConditionListRespList; + /** + * 总数量 + */ private long total; + /** + * + * @param faultConditionListRespList + * @param total + * @return + */ public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,long total){ FaultConditionTotalListResp faultConditionTotalListResp = new FaultConditionTotalListResp(); faultConditionTotalListResp.setFaultConditionListRespList(faultConditionListRespList); diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultLogListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java similarity index 95% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultLogListResp.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java index 767f087..276bf2d 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultLogListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java @@ -1,7 +1,7 @@ -package com.muyu.cloud.faultmanage.domain.resp; +package com.muyu.domain.resp; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.cloud.faultmanage.domain.FaultLog; +import com.muyu.domain.FaultLog; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultLogTotalListResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java similarity index 95% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultLogTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java index e35fd3e..5dd057b 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/resp/FaultLogTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.domain.resp; +package com.muyu.domain.resp; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; diff --git a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/vo/FaultCodeVO.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/vo/FaultCodeVO.java similarity index 88% rename from cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/vo/FaultCodeVO.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/vo/FaultCodeVO.java index a0f5a15..6793004 100644 --- a/cloud-faultmanage/cloud-faultmanage-common/src/main/java/com/muyu/cloud/faultmanage/domain/vo/FaultCodeVO.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/domain/vo/FaultCodeVO.java @@ -1,6 +1,6 @@ -package com.muyu.cloud.faultmanage.domain.vo; +package com.muyu.domain.vo; -import com.muyu.cloud.faultmanage.domain.FaultCode; +import com.muyu.domain.FaultCode; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/cloud-modules/cloud-Vehicle-Simulation/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml similarity index 93% rename from cloud-modules/cloud-Vehicle-Simulation/pom.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml index eff5a9b..e864e8d 100644 --- a/cloud-modules/cloud-Vehicle-Simulation/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml @@ -7,11 +7,13 @@ com.muyu cloud-server 3.6.3 - ../../pom.xml + ../../../pom.xml - com.muyu.server - cloud-Vehicle-Simulation + cloud-modules-enterprise-server + + cloud-modules-enterprise-server 企业业务服务 + 21 21 @@ -69,7 +71,7 @@ com.muyu - cloud-electronic-common + cloud-modules-enterprise-common 3.6.3 diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/IntegrationApplication.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/IntegrationApplication.java similarity index 86% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/IntegrationApplication.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/IntegrationApplication.java index 3cb378a..028e84a 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/IntegrationApplication.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/IntegrationApplication.java @@ -1,6 +1,7 @@ package com.muyu.server; import com.muyu.common.security.annotation.EnableMyFeignClients; +import org.mybatis.spring.annotation.MapperScan; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -13,6 +14,7 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; */ @EnableMyFeignClients @SpringBootApplication +@MapperScan("com.muyu.server.mapper") public class IntegrationApplication { public static void main(String[] args) { SpringApplication.run(IntegrationApplication.class, args); diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceClazzController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceClazzController.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java similarity index 88% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java index a15dcf2..bcd761c 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceController.java @@ -4,9 +4,9 @@ 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.*; -import com.muyu.domain.resq.CarFenceGroupResq; -import com.muyu.domain.resq.CarFenceGroupsResq; -import com.muyu.domain.resq.CarFenceResq; +import com.muyu.domain.resp.CarFenceGroupResp; +import com.muyu.domain.resp.CarFenceGroupsResp; +import com.muyu.domain.resp.CarFenceResp; import com.muyu.server.service.CarFenceService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -38,10 +38,10 @@ public class CarFenceController { */ @PostMapping("/selectConnect") @Operation(summary = "查询数据",description = "查询数据") - public Result> selectConnect( + public Result> selectConnect( @Validated @RequestBody CarFenceReq req ){ - Page connects = carFenceService.selectCarFence(req); + Page connects = carFenceService.selectCarFence(req); return Result.success( connects, "操作成功" ); @@ -100,10 +100,10 @@ public class CarFenceController { */ @PostMapping("/selectCarFenceGroupList") @Operation(summary = "查询数据",description = "查询数据") - public Result> selectCarFenceGroupList( + public Result> selectCarFenceGroupList( @Validated @RequestBody Integer id ){ - List list = carFenceService.selectCarFenceGroupList(id); + List list = carFenceService.selectCarFenceGroupList(id); return list.size()!=0?Result.success( list, "操作成功" ):Result.success( @@ -131,8 +131,8 @@ public class CarFenceController { */ @PostMapping("/carGroupList") @Operation(summary = "查询车辆围栏组数据",description = "查询车辆围栏组信息") - public Result> carGroupList(@RequestBody CarFenceGroupReq req){ - List connects = carFenceService.carGroupList(req); + public Result> carGroupList(@RequestBody CarFenceGroupReq req){ + List connects = carFenceService.carGroupList(req); return Result.success( connects, "操作成功" ); diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceGroupController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceGroupController.java similarity index 79% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceGroupController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceGroupController.java index faed306..a0f36cb 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceGroupController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceGroupController.java @@ -1,18 +1,12 @@ package com.muyu.server.controller; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFenceGroup; -import com.muyu.domain.req.CarFenceGroupReq; -import com.muyu.domain.req.CarFenceReq; -import com.muyu.domain.resq.CarFenceResq; -import com.muyu.server.service.CarFenceGroupService; import com.muyu.server.service.CarMiddleGroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.extern.log4j.Log4j2; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarFenceTypeController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarFenceTypeController.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarInformationController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformation1Controller.java similarity index 87% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarInformationController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformation1Controller.java index 8c5c7dc..696e122 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarInformationController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformation1Controller.java @@ -1,9 +1,8 @@ package com.muyu.server.controller; import com.muyu.common.core.domain.Result; -import com.muyu.domain.CarFenceType; import com.muyu.domain.CarInformation; -import com.muyu.server.service.CarInformationService; +import com.muyu.server.service.CarInformation1Service; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -26,9 +25,9 @@ import java.util.List; @AllArgsConstructor @Tag(name = "查询数据",description = "从围栏信息表中查询数据") @Log4j2 -public class CarInformationController { +public class CarInformation1Controller { - private final CarInformationService carInformationService; + private final CarInformation1Service carInformationService; /** * 查询围栏业务信息 diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java similarity index 80% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java index eaa8be8..d886d22 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarInformationController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarInformationController.java @@ -1,19 +1,19 @@ -package com.muyu.car.controller; +package com.muyu.server.controller; import com.github.pagehelper.PageInfo; -import com.muyu.car.domain.CarInformation; -import com.muyu.car.domain.req.CarInformationAddReq; -import com.muyu.car.domain.req.CarInformationListReq; -import com.muyu.car.domain.req.CarInformationUpdReq; -import com.muyu.car.service.CarInformationService; + import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarInformation; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.req.CarInformationListReq; +import com.muyu.domain.req.CarInformationUpdReq; +import com.muyu.domain.resp.CarInformationResp; +import com.muyu.server.service.CarInformationService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; -import org.springframework.stereotype.Controller; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import org.springframework.web.context.annotation.RequestScope; import javax.annotation.Resource; import java.util.List; @@ -47,8 +47,8 @@ public class CarInformationController { */ @PostMapping("/selectCarInformationList") @Operation(summary = "企业车辆管理列表") - public Result> selectCarInformationList(@Validated @RequestBody CarInformationListReq carInformationListReq) { - PageInfo pageInfo = carInformationService.selectCarInformationList(carInformationListReq); + public Result> selectCarInformationList(@Validated @RequestBody CarInformationListReq carInformationListReq) { + PageInfo pageInfo = carInformationService.selectCarInformationList(carInformationListReq); log.info("企业车辆管理列表查询",carInformationListReq,pageInfo); return Result.success(pageInfo); @@ -104,8 +104,8 @@ public class CarInformationController { */ @GetMapping("/selectCarInformationIdAndLicensePlate") @Operation(summary = "查询企业车辆 carInformationID 和 carInformationLicensePlate") - public Result> selectCarInformationIdAndLicensePlate(){ - List carInformations = carInformationService.selectBycarInformationIDAndLicensePlate(); + public Result> selectCarInformationIdAndLicensePlate(){ + List carInformations = carInformationService.selectBycarInformationIDAndLicensePlate(); return Result.success(carInformations); } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java similarity index 97% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java index 097ed49..d801b61 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/controller/CarMessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMessageController.java @@ -1,8 +1,9 @@ -package com.muyu.car.controller; +package com.muyu.server.controller; + -import com.muyu.car.domain.CarMessage; -import com.muyu.car.service.CarMessageService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarMessage; +import com.muyu.server.service.CarMessageService; 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-electronic/src/main/java/com/muyu/server/controller/CarMiddleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java similarity index 90% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarMiddleController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java index 6a27f3a..45587ca 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/controller/CarMiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarMiddleController.java @@ -1,10 +1,7 @@ package com.muyu.server.controller; import com.muyu.common.core.domain.Result; -import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarMiddle; -import com.muyu.domain.req.CarFenceGroupReq; -import com.muyu.domain.resq.CarFenceGroupsResq; import com.muyu.server.service.CarMiddleSerivce; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -16,8 +13,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.util.List; - /** * @Author:yang * @Package:com.muyu.server.controller diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java similarity index 89% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/CarTypeController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java index 807c671..42525a8 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/CarTypeController.java @@ -1,7 +1,8 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; + -import com.muyu.cloud.faultmanage.service.CarTypeService; import com.muyu.common.core.domain.Result; +import com.muyu.server.service.CarTypeService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java similarity index 88% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultCodeController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java index 49a06cd..ddef110 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultCodeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultCodeController.java @@ -1,12 +1,13 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; + -import com.muyu.cloud.faultmanage.domain.req.FaultCodeAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeListReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeUpdReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultCodeTotalListResp; -import com.muyu.cloud.faultmanage.service.FaultCodeService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.req.FaultCodeAddReq; +import com.muyu.domain.req.FaultCodeListReq; +import com.muyu.domain.req.FaultCodeUpdReq; +import com.muyu.domain.resp.FaultCodeTotalListResp; +import com.muyu.server.service.FaultCodeService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java similarity index 85% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultConditionController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java index 146dd9d..95008e8 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultConditionController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultConditionController.java @@ -1,13 +1,12 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; + -import com.muyu.cloud.faultmanage.domain.FaultCondition; -import com.muyu.cloud.faultmanage.domain.FaultRule; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionUpdReq; -import com.muyu.cloud.faultmanage.service.FaultConditionService; -import com.muyu.cloud.faultmanage.service.FaultRuleService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.FaultCondition; +import com.muyu.domain.req.FaultConditionAddReq; +import com.muyu.domain.req.FaultConditionListReq; +import com.muyu.domain.req.FaultConditionUpdReq; +import com.muyu.server.service.FaultConditionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Schema; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultDetectionStrategyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultDetectionStrategyController.java similarity index 89% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultDetectionStrategyController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultDetectionStrategyController.java index af20a62..1509267 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultDetectionStrategyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultDetectionStrategyController.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultLabelController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultLabelController.java similarity index 84% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultLabelController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultLabelController.java index c2a55c3..cf1d646 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultLabelController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultLabelController.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; /** * @Author:weiran @@ -8,9 +8,8 @@ package com.muyu.cloud.faultmanage.controller; * @Date:2024/9/18 20:58 */ -import com.muyu.cloud.faultmanage.service.FaultLabelService; -import com.muyu.cloud.faultmanage.service.FaultTypeService; import com.muyu.common.core.domain.Result; +import com.muyu.server.service.FaultLabelService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultLogController.java similarity index 83% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultLogController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultLogController.java index 9fba3bd..bb7a972 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultLogController.java @@ -1,9 +1,9 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; + -import com.muyu.cloud.faultmanage.domain.FaultLog; -import com.muyu.cloud.faultmanage.domain.req.FaultLogListReq; -import com.muyu.cloud.faultmanage.service.FaultLogService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.req.FaultLogListReq; +import com.muyu.server.service.FaultLogService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultRuleController.java similarity index 76% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultRuleController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultRuleController.java index c78fa90..c4107a5 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultRuleController.java @@ -1,12 +1,9 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; -import com.muyu.cloud.faultmanage.domain.CarFaultRule; -import com.muyu.cloud.faultmanage.domain.FaultCondition; -import com.muyu.cloud.faultmanage.domain.FaultRule; -import com.muyu.cloud.faultmanage.domain.Vehicle; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; -import com.muyu.cloud.faultmanage.service.FaultRuleService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.Vehicle; +import com.muyu.server.service.FaultRuleService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultTypeController.java similarity index 89% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultTypeController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultTypeController.java index 09a5fd4..0941939 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/FaultTypeController.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; /** * @Author:weiran @@ -8,8 +8,8 @@ package com.muyu.cloud.faultmanage.controller; * @Date:2024/9/18 20:58 */ -import com.muyu.cloud.faultmanage.service.FaultTypeService; import com.muyu.common.core.domain.Result; +import com.muyu.server.service.FaultTypeService; import io.swagger.v3.oas.annotations.Operation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/MessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/MessageController.java similarity index 88% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/MessageController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/MessageController.java index 45ece78..3c8e499 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/controller/MessageController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/MessageController.java @@ -1,10 +1,10 @@ -package com.muyu.cloud.faultmanage.controller; +package com.muyu.server.controller; -import com.muyu.cloud.faultmanage.domain.message.Message; -import com.muyu.cloud.faultmanage.domain.message.MessageReq; -import com.muyu.cloud.faultmanage.domain.message.MessageSendReq; -import com.muyu.cloud.faultmanage.service.MessageService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.message.Message; +import com.muyu.domain.message.MessageReq; +import com.muyu.domain.message.MessageSendReq; +import com.muyu.server.service.MessageService; import io.swagger.v3.oas.annotations.Operation; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/controller/WXController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WXController.java similarity index 98% rename from cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/controller/WXController.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WXController.java index 95d33f4..4c9d559 100644 --- a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/controller/WXController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WXController.java @@ -1,9 +1,9 @@ -package com.muyu.wechat.controller; +package com.muyu.server.controller; import com.muyu.common.wechat.domain.Articles; -import com.muyu.common.wechat.domain.NewsMessage; import com.muyu.common.wechat.domain.TextMessage; -import com.muyu.wechat.util.WordUtil; +import com.muyu.domain.NewsMessage; +import com.muyu.server.util.WordUtil; import com.thoughtworks.xstream.XStream; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; @@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; - import java.io.IOException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WarnLogsController.java similarity index 95% rename from cloud-modules/cloud-modules-warn/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/server/controller/WarnLogsController.java index 754f916..3f84e7d 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WarnLogsController.java @@ -1,4 +1,4 @@ -package com.muyu.warn.controller; +package com.muyu.server.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -6,9 +6,8 @@ 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.warn.domain.WarnLogs; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.service.WarnLogsService; +import com.muyu.domain.WarnLogs; +import com.muyu.server.service.WarnLogsService; import jakarta.servlet.http.HttpServletResponse; import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WarnRuleController.java similarity index 93% rename from cloud-modules/cloud-modules-warn/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/server/controller/WarnRuleController.java index 061b7d0..7678dd4 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WarnRuleController.java @@ -1,14 +1,13 @@ -package com.muyu.warn.controller; +package com.muyu.server.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.WarnRule; -import com.muyu.warn.domain.car.CarMessageType; -import com.muyu.warn.domain.car.resp.CarMessageResp; -import com.muyu.warn.service.WarnRuleService; +import com.muyu.domain.WarnRule; +import com.muyu.domain.resp.CarMessageResp; +import com.muyu.server.service.WarnRuleService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java similarity index 93% rename from cloud-modules/cloud-modules-warn/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/server/controller/WarnStrategyController.java index 72f6bd9..b932843 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/controller/WarnStrategyController.java @@ -1,14 +1,14 @@ -package com.muyu.warn.controller; +package com.muyu.server.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.car.CartType; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.domain.req.WarnStrategyReq; -import com.muyu.warn.service.WarnStrategyService; +import com.muyu.domain.CarType; +import com.muyu.domain.WarnStrategy; +import com.muyu.domain.req.WarnStrategyReq; +import com.muyu.server.service.WarnStrategyService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -107,7 +107,7 @@ public class WarnStrategyController extends BaseController @RequiresPermissions("platform:strategy:cartype") @PostMapping("/findByCarType") - public Result> findByCarType(){ + public Result> findByCarType(){ return Result.success(warnStrategyService.findByCarType()); } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceClazzMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceClazzMapper.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceClazzMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceClazzMapper.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceGroupMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceGroupMapper.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceGroupMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceGroupMapper.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceMapper.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceMapper.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceTypeMapper.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarFenceTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarFenceTypeMapper.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarInformationMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformation1Mapper.java similarity index 81% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarInformationMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformation1Mapper.java index f4ee33b..d0faca8 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarInformationMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformation1Mapper.java @@ -12,5 +12,5 @@ import org.apache.ibatis.annotations.Mapper; * @Date:2024/9/22 22:24 */ @Mapper -public interface CarInformationMapper extends BaseMapper { +public interface CarInformation1Mapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformationMapper.java similarity index 76% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformationMapper.java index 0954456..d02ce85 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarInformationMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarInformationMapper.java @@ -1,14 +1,18 @@ -package com.muyu.car.mapper; +package com.muyu.server.mapper; -import com.muyu.car.domain.CarInformation; -import com.muyu.car.domain.req.CarInformationAddReq; -import com.muyu.car.domain.req.CarInformationListReq; -import com.muyu.car.domain.req.CarInformationUpdReq; +import com.muyu.domain.CarInformation; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.req.CarInformationListReq; +import com.muyu.domain.req.CarInformationUpdReq; +import com.muyu.domain.resp.CarInformationResp; import org.apache.ibatis.annotations.Mapper; import java.util.List; +/** + * @author 17353 + */ @Mapper public interface CarInformationMapper { /** @@ -28,7 +32,7 @@ public interface CarInformationMapper { * @param carInformationListReq * @return */ - List selectCarInformationList(CarInformationListReq carInformationListReq); + List selectCarInformationList(CarInformationListReq carInformationListReq); /** * 企业车辆添加管理 @@ -58,7 +62,7 @@ public interface CarInformationMapper { * 无参 * @return */ - List selectBycarInformationIDAndLicensePlate(); + List selectBycarInformationIDAndLicensePlate(); diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageMapper.java similarity index 89% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarMessageMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageMapper.java index 7e4d846..5bb6fdb 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/mapper/CarMessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMessageMapper.java @@ -1,6 +1,6 @@ -package com.muyu.car.mapper; +package com.muyu.server.mapper; -import com.muyu.car.domain.CarMessage; +import com.muyu.domain.CarMessage; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleGroupMapper.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarMiddleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleMapper.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/mapper/CarMiddleMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarMiddleMapper.java diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarTypeMapper.java similarity index 78% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/CarTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarTypeMapper.java index 0f9b4b5..e21ac0c 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/CarTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/CarTypeMapper.java @@ -1,7 +1,7 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.CarType; +import com.muyu.domain.CarType; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultCodeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java similarity index 73% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultCodeMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java index e395eae..b5aed13 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultCodeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultCodeMapper.java @@ -1,12 +1,13 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.FaultCode; -import com.muyu.cloud.faultmanage.domain.FaultLabel; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeListReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeUpdReq; -import com.muyu.cloud.faultmanage.domain.vo.FaultCodeVO; + +import com.muyu.domain.FaultCode; +import com.muyu.domain.FaultLabel; +import com.muyu.domain.req.FaultCodeAddReq; +import com.muyu.domain.req.FaultCodeListReq; +import com.muyu.domain.req.FaultCodeUpdReq; +import com.muyu.domain.vo.FaultCodeVO; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultConditionMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java similarity index 66% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultConditionMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java index 6a4a19d..393f49d 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultConditionMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultConditionMapper.java @@ -1,10 +1,9 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.FaultCondition; -import com.muyu.cloud.faultmanage.domain.FaultRule; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; +import com.muyu.domain.FaultCondition; +import com.muyu.domain.req.FaultConditionAddReq; +import com.muyu.domain.req.FaultConditionListReq; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultLabelMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLabelMapper.java similarity index 69% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultLabelMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLabelMapper.java index b7ff314..69f3059 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultLabelMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLabelMapper.java @@ -1,8 +1,7 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.FaultLabel; -import com.muyu.cloud.faultmanage.domain.FaultType; +import com.muyu.domain.FaultLabel; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLogMapper.java similarity index 66% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLogMapper.java index 33f731a..2ea165a 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultLogMapper.java @@ -1,9 +1,9 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.FaultLog; -import com.muyu.cloud.faultmanage.domain.req.FaultLogListReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultLogListResp; + +import com.muyu.domain.FaultLog; +import com.muyu.domain.req.FaultLogListReq; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultRuleMapper.java similarity index 72% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultRuleMapper.java index ebf3141..a458025 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultRuleMapper.java @@ -1,9 +1,9 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.CarFaultRule; -import com.muyu.cloud.faultmanage.domain.CarInformation; -import com.muyu.cloud.faultmanage.domain.FaultCondition; +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.CarInformation; +import com.muyu.domain.FaultCondition; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultTypeMapper.java similarity index 78% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultTypeMapper.java index 6b965ce..f9dba12 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/FaultTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/FaultTypeMapper.java @@ -1,7 +1,7 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.FaultType; +import com.muyu.domain.FaultType; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/MessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/MessageMapper.java similarity index 80% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/MessageMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/MessageMapper.java index adfe32d..e53e40d 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/mapper/MessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/MessageMapper.java @@ -1,7 +1,7 @@ -package com.muyu.cloud.faultmanage.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.cloud.faultmanage.domain.message.Message; +import com.muyu.domain.message.Message; import org.apache.ibatis.annotations.Mapper; import java.util.List; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnLogsMapper.java similarity index 82% rename from cloud-modules/cloud-modules-warn/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/server/mapper/WarnLogsMapper.java index 7ed3e6b..6df3c35 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnLogsMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnLogsMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warn.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.WarnLogs; +import com.muyu.domain.WarnLogs; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java similarity index 73% rename from cloud-modules/cloud-modules-warn/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/server/mapper/WarnRuleMapper.java index ca41119..5a2f1a1 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnRuleMapper.java @@ -1,9 +1,8 @@ -package com.muyu.warn.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.WarnRule; -import com.muyu.warn.domain.car.CarMessageType; -import com.muyu.warn.domain.car.resp.CarMessageResp; +import com.muyu.domain.WarnRule; +import com.muyu.domain.resp.CarMessageResp; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java similarity index 70% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java index 0a4eecb..1c14ec2 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/mapper/WarnStrategyMapper.java @@ -1,9 +1,9 @@ -package com.muyu.warn.mapper; +package com.muyu.server.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.warn.domain.car.CartType; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.domain.req.WarnStrategyReq; +import com.muyu.domain.CarType; +import com.muyu.domain.WarnStrategy; +import com.muyu.domain.req.WarnStrategyReq; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -19,7 +19,7 @@ import java.util.List; @Mapper public interface WarnStrategyMapper extends BaseMapper { - List findByCarType(); + List findByCarType(); List selectStrategyType(@Param("ids") Long ids); } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceClazzService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceClazzService.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceClazzService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceClazzService.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceGroupService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceGroupService.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceGroupService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceGroupService.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceService.java similarity index 68% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceService.java index 2a3b5e6..8b262b3 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceService.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarFence; import com.muyu.domain.req.*; -import com.muyu.domain.resq.CarFenceGroupResq; -import com.muyu.domain.resq.CarFenceGroupsResq; -import com.muyu.domain.resq.CarFenceResq; +import com.muyu.domain.resp.CarFenceGroupResp; +import com.muyu.domain.resp.CarFenceGroupsResp; +import com.muyu.domain.resp.CarFenceResp; import java.util.List; @@ -21,7 +21,7 @@ public interface CarFenceService extends IService { /** * 查询围栏信息 */ - public Page selectCarFence(CarFenceReq req); + public Page selectCarFence(CarFenceReq req); Boolean addCarFence(CarFence carFence); @@ -29,9 +29,9 @@ public interface CarFenceService extends IService { Boolean addFenceGroup(FenceGroupReq req); - List selectCarFenceGroupList(Integer id); + List selectCarFenceGroupList(Integer id); Boolean carFenceGroupDel(CarGroupIdReq carGroupIdReq); - List carGroupList(CarFenceGroupReq req); + List carGroupList(CarFenceGroupReq req); } diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceTypeService.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarFenceTypeService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarFenceTypeService.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarInformationService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformation1Service.java similarity index 79% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarInformationService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformation1Service.java index ea50c7f..d1676ee 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarInformationService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformation1Service.java @@ -10,5 +10,5 @@ import com.muyu.domain.CarInformation; * @name:CarInformationService * @Date:2024/9/22 22:22 */ -public interface CarInformationService extends IService { +public interface CarInformation1Service extends IService { } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarInformationService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformationService.java similarity index 78% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarInformationService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformationService.java index 62e733b..8dda66c 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarInformationService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarInformationService.java @@ -1,11 +1,13 @@ -package com.muyu.car.service; +package com.muyu.server.service; import com.github.pagehelper.PageInfo; -import com.muyu.car.domain.CarInformation; -import com.muyu.car.domain.req.CarInformationAddReq; -import com.muyu.car.domain.req.CarInformationListReq; -import com.muyu.car.domain.req.CarInformationUpdReq; + import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarInformation; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.req.CarInformationListReq; +import com.muyu.domain.req.CarInformationUpdReq; +import com.muyu.domain.resp.CarInformationResp; import java.util.List; @@ -27,7 +29,7 @@ public interface CarInformationService { * @param carInformationListReq * @return */ - PageInfo selectCarInformationList(CarInformationListReq carInformationListReq); + PageInfo selectCarInformationList(CarInformationListReq carInformationListReq); /** @@ -59,6 +61,6 @@ public interface CarInformationService { * 无参 * @return */ - List selectBycarInformationIDAndLicensePlate(); + List selectBycarInformationIDAndLicensePlate(); } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMessageService.java similarity index 90% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMessageService.java index 056dc8c..4b45d84 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/CarMessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMessageService.java @@ -1,7 +1,7 @@ -package com.muyu.car.service; +package com.muyu.server.service; -import com.muyu.car.domain.CarMessage; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarMessage; import java.util.List; diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleGroupService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMiddleGroupService.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleGroupService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMiddleGroupService.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleSerivce.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMiddleSerivce.java similarity index 69% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleSerivce.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMiddleSerivce.java index 7365dbd..c247268 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/CarMiddleSerivce.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarMiddleSerivce.java @@ -1,12 +1,7 @@ package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarMiddle; -import com.muyu.domain.req.CarFenceGroupReq; -import com.muyu.domain.resq.CarFenceGroupsResq; - -import java.util.List; /** * @Author:yang diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/CarTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarTypeService.java similarity index 80% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/CarTypeService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarTypeService.java index bf7cd66..9456747 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/CarTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/CarTypeService.java @@ -1,7 +1,7 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.CarType; +import com.muyu.domain.CarType; import java.util.List; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultCodeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java similarity index 74% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultCodeService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java index e0055e4..836fab7 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultCodeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultCodeService.java @@ -1,12 +1,12 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeListReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeUpdReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultCodeTotalListResp; -import com.muyu.cloud.faultmanage.domain.vo.FaultCodeVO; +import com.muyu.domain.req.FaultCodeAddReq; +import com.muyu.domain.req.FaultCodeListReq; +import com.muyu.domain.req.FaultCodeUpdReq; +import com.muyu.domain.resp.FaultCodeTotalListResp; +import com.muyu.domain.vo.FaultCodeVO; /** diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultConditionService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java similarity index 65% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultConditionService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java index 3bbd6fc..a57af93 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultConditionService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultConditionService.java @@ -1,11 +1,10 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.FaultCondition; -import com.muyu.cloud.faultmanage.domain.FaultRule; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultConditionTotalListResp; +import com.muyu.domain.FaultCondition; +import com.muyu.domain.req.FaultConditionAddReq; +import com.muyu.domain.req.FaultConditionListReq; +import com.muyu.domain.resp.FaultConditionTotalListResp; import java.util.List; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultDetectionStrategy.java similarity index 60% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultDetectionStrategy.java index d629283..cbb2202 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultDetectionStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultDetectionStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; /** * @Author:weiran @@ -8,9 +8,8 @@ package com.muyu.cloud.faultmanage.service; * @Date:2024/9/20 19:40 */ -import com.muyu.cloud.faultmanage.domain.CarFaultRule; -import com.muyu.cloud.faultmanage.domain.FaultReport; -import com.muyu.cloud.faultmanage.domain.Vehicle; +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.FaultReport; /** * 故障检测策略的接口 diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java similarity index 72% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultLabelService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java index eab9fe2..69e5107 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultLabelService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLabelService.java @@ -1,8 +1,8 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.FaultLabel; -import com.muyu.cloud.faultmanage.domain.FaultType; +import com.muyu.domain.FaultLabel; + import java.util.List; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLogService.java similarity index 58% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultLogService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLogService.java index 6f87645..8051b98 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultLogService.java @@ -1,12 +1,9 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.FaultLog; -import com.muyu.cloud.faultmanage.domain.req.FaultLogListReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultLogListResp; -import com.muyu.cloud.faultmanage.domain.resp.FaultLogTotalListResp; - -import java.util.List; +import com.muyu.domain.FaultLog; +import com.muyu.domain.req.FaultLogListReq; +import com.muyu.domain.resp.FaultLogTotalListResp; /** * @Author:weiran diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultRuleService.java similarity index 70% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultRuleService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultRuleService.java index fafc81f..ebd212e 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultRuleService.java @@ -1,9 +1,9 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.CarFaultRule; -import com.muyu.cloud.faultmanage.domain.FaultRule; -import com.muyu.cloud.faultmanage.domain.Vehicle; +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.Vehicle; + import java.util.List; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultTypeService.java similarity index 80% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultTypeService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultTypeService.java index 1b41530..b04a5df 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/FaultTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/FaultTypeService.java @@ -1,7 +1,7 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.FaultType; +import com.muyu.domain.FaultType; import java.util.List; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/MessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/MessageService.java similarity index 78% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/MessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/MessageService.java index 5372609..871446b 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/MessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/MessageService.java @@ -1,9 +1,9 @@ -package com.muyu.cloud.faultmanage.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.cloud.faultmanage.domain.message.Message; -import com.muyu.cloud.faultmanage.domain.message.MessageReq; -import com.muyu.cloud.faultmanage.domain.message.MessageSendReq; +import com.muyu.domain.message.Message; +import com.muyu.domain.message.MessageReq; +import com.muyu.domain.message.MessageSendReq; import jakarta.servlet.http.HttpServletRequest; import java.util.List; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnLogsService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnLogsService.java similarity index 92% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnLogsService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnLogsService.java index 12a0248..b19c138 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnLogsService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnLogsService.java @@ -1,7 +1,7 @@ -package com.muyu.warn.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.WarnLogs; +import com.muyu.domain.WarnLogs; import java.util.List; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnRuleService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnRuleService.java similarity index 84% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnRuleService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnRuleService.java index e75fefd..cdb8447 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnRuleService.java @@ -1,9 +1,8 @@ -package com.muyu.warn.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.WarnRule; -import com.muyu.warn.domain.car.CarMessageType; -import com.muyu.warn.domain.car.resp.CarMessageResp; +import com.muyu.domain.WarnRule; +import com.muyu.domain.resp.CarMessageResp; import java.util.List; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnStrategyService.java similarity index 82% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnStrategyService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnStrategyService.java index c80d97d..a29a961 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/WarnStrategyService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/WarnStrategyService.java @@ -1,9 +1,9 @@ -package com.muyu.warn.service; +package com.muyu.server.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.warn.domain.car.CartType; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.domain.req.WarnStrategyReq; +import com.muyu.domain.CarType; +import com.muyu.domain.WarnStrategy; +import com.muyu.domain.req.WarnStrategyReq; import java.util.List; @@ -38,7 +38,7 @@ public interface WarnStrategyService extends IService { */ Boolean checkIdUnique(WarnStrategy warnStrategy); - List findByCarType(); + List findByCarType(); List selectStrategyType(Long ids); } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java similarity index 84% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java index 245b5d7..068fa92 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.cloud.faultmanage.service.impl.faultDetectionStrategy; +package com.muyu.server.service.faultDetectionStrategy; import org.springframework.stereotype.Service; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java similarity index 95% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java index da95878..e6d7b4e 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java @@ -1,8 +1,8 @@ -package com.muyu.cloud.faultmanage.service.impl.faultDetectionStrategy; +package com.muyu.server.service.faultDetectionStrategy; -import com.muyu.cloud.faultmanage.domain.CarFaultRule; -import com.muyu.cloud.faultmanage.domain.FaultReport; -import com.muyu.cloud.faultmanage.service.FaultDetectionStrategy; +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.FaultReport; +import com.muyu.server.service.FaultDetectionStrategy; import org.springframework.stereotype.Service; /** diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceClazzServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceClazzServiceImpl.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceClazzServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceClazzServiceImpl.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceGroupServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceGroupServiceImpl.java similarity index 92% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceGroupServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceGroupServiceImpl.java index af040a9..faf9f70 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceGroupServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceGroupServiceImpl.java @@ -3,7 +3,6 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.CarFenceClazz; import com.muyu.domain.CarFenceGroup; -import com.muyu.server.mapper.CarFenceClazzMapper; import com.muyu.server.mapper.CarFenceGroupMapper; import com.muyu.server.service.CarFenceGroupService; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java similarity index 83% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java index 3b10fea..e186118 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceServiceImpl.java @@ -6,9 +6,9 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.*; import com.muyu.domain.req.*; -import com.muyu.domain.resq.CarFenceGroupResq; -import com.muyu.domain.resq.CarFenceGroupsResq; -import com.muyu.domain.resq.CarFenceResq; +import com.muyu.domain.resp.CarFenceGroupResp; +import com.muyu.domain.resp.CarFenceGroupsResp; +import com.muyu.domain.resp.CarFenceResp; import com.muyu.server.mapper.CarFenceMapper; import com.muyu.server.service.*; import lombok.extern.log4j.Log4j2; @@ -42,12 +42,12 @@ public class CarFenceServiceImpl @Autowired private CarMiddleSerivce carMiddleSerivce; @Autowired - private CarInformationService carInformationService; + private CarInformation1Service carInformationService; /** * 查询围栏信息 */ @Override - public Page selectCarFence(CarFenceReq req) { + public Page selectCarFence(CarFenceReq req) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); //数据来源类型 @@ -85,9 +85,9 @@ public class CarFenceServiceImpl //构建一个新的分页响应对象 return new Page<>() {{ //从查询结果中获取记录,并使用流式处理将每条记录转换为EtlDataScoreResp对象 - List etlDataScoreRespList = carFencePage.getRecords().stream() + List etlDataScoreRespList = carFencePage.getRecords().stream() //使用map操作将EtlDataScore对象转换为EtlDataScoreResp对象 - .map(CarFenceResq::carFenceResqListBuilder) + .map(CarFenceResp::carFenceResqListBuilder) //收集流中的元素到列表中 .toList(); //设置分页响应中的记录列表 @@ -150,18 +150,18 @@ public class CarFenceServiceImpl } @Override - public List selectCarFenceGroupList(Integer id) { + public List selectCarFenceGroupList(Integer id) { List list = carMiddleGroupService.list( new LambdaQueryWrapper() .eq(CarMiddleGroup::getFenceGroupId,id)) .stream() .map(CarMiddleGroup::carMiddleGroupBuilder) .toList(); - List carFenceGroupResqs = new ArrayList<>(); + List carFenceGroupResps = new ArrayList<>(); list.forEach(carMiddleGroup -> { - this.carMiddleList(carMiddleGroup, carFenceGroupResqs); + this.carMiddleList(carMiddleGroup, carFenceGroupResps); }); - return carFenceGroupResqs; + return carFenceGroupResps; } @Override @@ -177,7 +177,7 @@ public class CarFenceServiceImpl return carMiddleGroupService.removeBatchByIds(list); } - private void carMiddleList(CarMiddleGroup carMiddleGroup, List carFenceGroupResqs) { + private void carMiddleList(CarMiddleGroup carMiddleGroup, List carFenceGroupResps) { Integer carFenceId = carMiddleGroup.getCarFenceId(); Integer fenceGroupId = carMiddleGroup.getFenceGroupId(); List carFenceList = this.list( @@ -193,23 +193,23 @@ public class CarFenceServiceImpl .map(CarFenceGroup::carFenceBuild) .toList(); carFenceList.forEach(carFence -> { - CarFenceGroupResq carFenceGroupResq = new CarFenceGroupResq(); - carFenceGroupResq.setId(carFence.getId()); - carFenceGroupResq.setName(carFence.getName()); - carFenceGroupResq.setClazzId(carFence.getClazzId()); - carFenceGroupResq.setTypeId(carFence.getTypeId()); - carFenceGroupResq.setFenceText(carFence.getFenceText()); - carFenceGroupResq.setFenceStart(carFence.getFenceStart()); - carFenceGroupResq.setFenceEnd(carFence.getFenceEnd()); - carFenceGroupResq.setFenceCreate(carFence.getFenceCreate()); + CarFenceGroupResp carFenceGroupResp = new CarFenceGroupResp(); + carFenceGroupResp.setId(carFence.getId()); + carFenceGroupResp.setName(carFence.getName()); + carFenceGroupResp.setClazzId(carFence.getClazzId()); + carFenceGroupResp.setTypeId(carFence.getTypeId()); + carFenceGroupResp.setFenceText(carFence.getFenceText()); + carFenceGroupResp.setFenceStart(carFence.getFenceStart()); + carFenceGroupResp.setFenceEnd(carFence.getFenceEnd()); + carFenceGroupResp.setFenceCreate(carFence.getFenceCreate()); - carFenceGroupResqs.add(carFenceGroupResq); + carFenceGroupResps.add(carFenceGroupResp); }); carFenceGroupsList.forEach(carFenceGroup -> { - carFenceGroupResqs.forEach(carFenceGroupResq -> { - carFenceGroupResq.setPriority(carFenceGroup.getPriority()); - carFenceGroupResq.setStatus(carFenceGroup.getStatus()); - carFenceGroupResq.setGroupType(carFenceGroup.getGroupType()); + carFenceGroupResps.forEach(carFenceGroupResp -> { + carFenceGroupResp.setPriority(carFenceGroup.getPriority()); + carFenceGroupResp.setStatus(carFenceGroup.getStatus()); + carFenceGroupResp.setGroupType(carFenceGroup.getGroupType()); }); }); } @@ -243,10 +243,10 @@ public class CarFenceServiceImpl }); } @Override - public List carGroupList(CarFenceGroupReq req) { + public List carGroupList(CarFenceGroupReq req) { - List fenceGroupList = new ArrayList<>(); - CarFenceGroupsResq carFenceGroupsResq = new CarFenceGroupsResq(); + List fenceGroupList = new ArrayList<>(); + CarFenceGroupsResp carFenceGroupsResp = new CarFenceGroupsResp(); List list = carMiddleGroupService.list( new LambdaQueryWrapper() @@ -280,20 +280,20 @@ public class CarFenceServiceImpl .toList(); carFenceList.forEach(carFence -> { - carFenceGroupsResq.setFenceText(carFence.getFenceText()); + carFenceGroupsResp.setFenceText(carFence.getFenceText()); }); carFenceGroupList.forEach(carFenceGroup -> { - carFenceGroupsResq.setId(carFenceGroup.getId()); - carFenceGroupsResq.setStatus(carFenceGroup.getStatus()); - carFenceGroupsResq.setPriority(carFenceGroup.getPriority()); - carFenceGroupsResq.setGroupType(carFenceGroup.getGroupType()); + carFenceGroupsResp.setId(carFenceGroup.getId()); + carFenceGroupsResp.setStatus(carFenceGroup.getStatus()); + carFenceGroupsResp.setPriority(carFenceGroup.getPriority()); + carFenceGroupsResp.setGroupType(carFenceGroup.getGroupType()); }); carInformationList.forEach(carInformation -> { - carFenceGroupsResq.setCarInformationLicensePlate(carInformation.getCarInformationLicensePlate()); + carFenceGroupsResp.setCarInformationLicensePlate(carInformation.getCarInformationLicensePlate()); }); - fenceGroupList.add(carFenceGroupsResq); + fenceGroupList.add(carFenceGroupsResp); }); }); return fenceGroupList; diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceTypeServiceImpl.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarFenceTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarFenceTypeServiceImpl.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformation1ServiceImpl.java similarity index 51% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformation1ServiceImpl.java index f6a95a9..ec2335f 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformation1ServiceImpl.java @@ -1,11 +1,9 @@ package com.muyu.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.CarFenceType; import com.muyu.domain.CarInformation; -import com.muyu.server.mapper.CarFenceTypeMapper; -import com.muyu.server.mapper.CarInformationMapper; -import com.muyu.server.service.CarInformationService; +import com.muyu.server.mapper.CarInformation1Mapper; +import com.muyu.server.service.CarInformation1Service; import org.springframework.stereotype.Service; /** @@ -16,7 +14,7 @@ import org.springframework.stereotype.Service; * @Date:2024/9/22 22:22 */ @Service -public class CarInformationServiceImpl - extends ServiceImpl - implements CarInformationService { +public class CarInformation1ServiceImpl + extends ServiceImpl + implements CarInformation1Service { } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java similarity index 71% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java index 71e7337..2a1e02f 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarInformationServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarInformationServiceImpl.java @@ -1,15 +1,15 @@ -package com.muyu.car.service.Impl; +package com.muyu.server.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.muyu.car.domain.CarInformation; -import com.muyu.car.domain.CarMessage; -import com.muyu.car.domain.req.CarInformationAddReq; -import com.muyu.car.domain.req.CarInformationListReq; -import com.muyu.car.domain.req.CarInformationUpdReq; -import com.muyu.car.mapper.CarInformationMapper; -import com.muyu.car.service.CarInformationService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarInformation; +import com.muyu.domain.req.CarInformationAddReq; +import com.muyu.domain.req.CarInformationListReq; +import com.muyu.domain.req.CarInformationUpdReq; +import com.muyu.domain.resp.CarInformationResp; +import com.muyu.server.mapper.CarInformationMapper; +import com.muyu.server.service.CarInformationService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -26,10 +26,10 @@ public class CarInformationServiceImpl implements CarInformationService { @Override - public PageInfo selectCarInformationList(CarInformationListReq carInformationListReq) { + public PageInfo selectCarInformationList(CarInformationListReq carInformationListReq) { PageHelper.startPage(carInformationListReq.getPageNum(),carInformationListReq.getPageSize()); - List carInformations = carInformationMapper.selectCarInformationList(carInformationListReq); - PageInfo pageInfo = new PageInfo<>(carInformations); + List carInformations = carInformationMapper.selectCarInformationList(carInformationListReq); + PageInfo pageInfo = new PageInfo<>(carInformations); return pageInfo; } @@ -64,7 +64,7 @@ public class CarInformationServiceImpl implements CarInformationService { @Override - public List selectBycarInformationIDAndLicensePlate() { + public List selectBycarInformationIDAndLicensePlate() { return carInformationMapper.selectBycarInformationIDAndLicensePlate(); } } diff --git a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarMessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java similarity index 88% rename from cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarMessageServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java index 830252f..9ec3513 100644 --- a/cloud-modules/cloud-modules-car/src/main/java/com/muyu/car/service/Impl/CarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMessageServiceImpl.java @@ -1,9 +1,9 @@ -package com.muyu.car.service.Impl; +package com.muyu.server.service.impl; -import com.muyu.car.domain.CarMessage; -import com.muyu.car.mapper.CarMessageMapper; -import com.muyu.car.service.CarMessageService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarMessage; +import com.muyu.server.mapper.CarMessageMapper; +import com.muyu.server.service.CarMessageService; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java similarity index 90% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java index ceaa905..03978cb 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleGroupServiceImpl.java @@ -6,15 +6,12 @@ import com.muyu.domain.CarFenceGroup; import com.muyu.domain.CarFenceType; import com.muyu.domain.CarMiddleGroup; import com.muyu.domain.req.CarFenceGroupReq; -import com.muyu.server.mapper.CarFenceTypeMapper; import com.muyu.server.mapper.CarMiddleGroupMapper; import com.muyu.server.service.CarFenceGroupService; -import com.muyu.server.service.CarFenceTypeService; import com.muyu.server.service.CarMiddleGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.ArrayList; import java.util.List; /** diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java similarity index 73% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java index 976532c..e5e56be 100644 --- a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarMiddleSerivceImpl.java @@ -1,18 +1,12 @@ package com.muyu.server.service.impl; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.*; -import com.muyu.domain.req.CarFenceGroupReq; -import com.muyu.domain.resq.CarFenceGroupsResq; import com.muyu.server.mapper.CarMiddleMapper; import com.muyu.server.service.*; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; -import java.util.ArrayList; -import java.util.List; - /** * @Author:yang * @Package:com.muyu.server.service.impl diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java similarity index 81% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/CarTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java index d00cc4f..e7e3e28 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/CarTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/CarTypeServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.faultmanage.domain.CarType; -import com.muyu.cloud.faultmanage.mapper.CarTypeMapper; -import com.muyu.cloud.faultmanage.service.CarTypeService; +import com.muyu.domain.CarType; +import com.muyu.server.mapper.CarTypeMapper; +import com.muyu.server.service.CarTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java similarity index 85% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultCodeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java index d8ff4cc..30ee1f2 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultCodeServiceImpl.java @@ -1,20 +1,18 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.muyu.cloud.faultmanage.domain.FaultCode; -import com.muyu.cloud.faultmanage.domain.FaultLabel; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeListReq; -import com.muyu.cloud.faultmanage.domain.req.FaultCodeUpdReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultCodeListResp; -import com.muyu.cloud.faultmanage.domain.resp.FaultCodeTotalListResp; -import com.muyu.cloud.faultmanage.domain.vo.FaultCodeVO; -import com.muyu.cloud.faultmanage.mapper.FaultCodeMapper; -import com.muyu.cloud.faultmanage.service.FaultCodeService; import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.FaultCode; +import com.muyu.domain.FaultLabel; +import com.muyu.domain.req.FaultCodeAddReq; +import com.muyu.domain.req.FaultCodeListReq; +import com.muyu.domain.req.FaultCodeUpdReq; +import com.muyu.domain.resp.FaultCodeListResp; +import com.muyu.domain.resp.FaultCodeTotalListResp; +import com.muyu.domain.vo.FaultCodeVO; +import com.muyu.server.mapper.FaultCodeMapper; +import com.muyu.server.service.FaultCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java similarity index 68% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultConditionServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java index 34ee065..c380ef6 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultConditionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultConditionServiceImpl.java @@ -1,21 +1,14 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.faultmanage.domain.FaultCondition; -import com.muyu.cloud.faultmanage.domain.FaultRule; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionAddReq; -import com.muyu.cloud.faultmanage.domain.req.FaultConditionListReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultCodeListResp; -import com.muyu.cloud.faultmanage.domain.resp.FaultCodeTotalListResp; -import com.muyu.cloud.faultmanage.domain.resp.FaultConditionListResp; -import com.muyu.cloud.faultmanage.domain.resp.FaultConditionTotalListResp; -import com.muyu.cloud.faultmanage.domain.vo.FaultCodeVO; -import com.muyu.cloud.faultmanage.mapper.FaultConditionMapper; -import com.muyu.cloud.faultmanage.mapper.FaultRuleMapper; -import com.muyu.cloud.faultmanage.service.FaultConditionService; -import com.muyu.cloud.faultmanage.service.FaultRuleService; -import com.muyu.common.core.utils.StringUtils; +import com.muyu.domain.FaultCondition; +import com.muyu.domain.req.FaultConditionAddReq; +import com.muyu.domain.req.FaultConditionListReq; +import com.muyu.domain.resp.FaultConditionListResp; +import com.muyu.domain.resp.FaultConditionTotalListResp; +import com.muyu.server.mapper.FaultConditionMapper; +import com.muyu.server.service.FaultConditionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java similarity index 70% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultLabelServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java index 40f2fed..3b309de 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLabelServiceImpl.java @@ -1,13 +1,10 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.faultmanage.domain.FaultLabel; -import com.muyu.cloud.faultmanage.domain.FaultType; -import com.muyu.cloud.faultmanage.mapper.FaultLabelMapper; -import com.muyu.cloud.faultmanage.mapper.FaultTypeMapper; -import com.muyu.cloud.faultmanage.service.FaultLabelService; -import com.muyu.cloud.faultmanage.service.FaultTypeService; +import com.muyu.domain.FaultLabel; +import com.muyu.server.mapper.FaultLabelMapper; +import com.muyu.server.service.FaultLabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java similarity index 77% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultLogServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java index b996d74..a9eadcc 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultLogServiceImpl.java @@ -1,13 +1,13 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.faultmanage.domain.FaultLog; -import com.muyu.cloud.faultmanage.domain.req.FaultLogListReq; -import com.muyu.cloud.faultmanage.domain.resp.FaultLogListResp; -import com.muyu.cloud.faultmanage.domain.resp.FaultLogTotalListResp; -import com.muyu.cloud.faultmanage.mapper.FaultLogMapper; -import com.muyu.cloud.faultmanage.service.FaultLogService; +import com.muyu.domain.FaultLog; +import com.muyu.domain.req.FaultLogListReq; +import com.muyu.domain.resp.FaultLogListResp; +import com.muyu.domain.resp.FaultLogTotalListResp; +import com.muyu.server.mapper.FaultLogMapper; +import com.muyu.server.service.FaultLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java similarity index 95% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java index 8863ec7..79c8c23 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultRuleServiceImpl.java @@ -1,10 +1,12 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.faultmanage.domain.*; -import com.muyu.cloud.faultmanage.mapper.FaultRuleMapper; -import com.muyu.cloud.faultmanage.service.FaultRuleService; -import org.apache.poi.ss.formula.functions.Intercept; +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.CarInformation; +import com.muyu.domain.FaultCondition; +import com.muyu.domain.Vehicle; +import com.muyu.server.mapper.FaultRuleMapper; +import com.muyu.server.service.FaultRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.lang.reflect.Field; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultTypeServiceImpl.java similarity index 80% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultTypeServiceImpl.java index 8bd58ec..e303ff1 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/FaultTypeServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.faultmanage.domain.FaultType; -import com.muyu.cloud.faultmanage.mapper.FaultTypeMapper; -import com.muyu.cloud.faultmanage.service.FaultTypeService; +import com.muyu.domain.FaultType; +import com.muyu.server.mapper.FaultTypeMapper; +import com.muyu.server.service.FaultTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/MessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/MessageServiceImpl.java similarity index 91% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/MessageServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/MessageServiceImpl.java index 1759d72..c0a8128 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/impl/MessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/MessageServiceImpl.java @@ -1,16 +1,15 @@ -package com.muyu.cloud.faultmanage.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.cloud.faultmanage.domain.message.Message; -import com.muyu.cloud.faultmanage.domain.message.MessageReq; -import com.muyu.cloud.faultmanage.domain.message.MessageSendReq; -import com.muyu.cloud.faultmanage.mapper.MessageMapper; -import com.muyu.cloud.faultmanage.service.MessageService; -import com.muyu.common.core.utils.StringUtils; import com.muyu.common.security.service.TokenService; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.LoginUser; +import com.muyu.domain.message.Message; +import com.muyu.domain.message.MessageReq; +import com.muyu.domain.message.MessageSendReq; +import com.muyu.server.mapper.MessageMapper; +import com.muyu.server.service.MessageService; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnLogsServiceImpl.java similarity index 95% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnLogsServiceImpl.java index 5e98ccb..8f093d4 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnLogsServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnLogsServiceImpl.java @@ -1,12 +1,12 @@ -package com.muyu.warn.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Assert; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; -import com.muyu.warn.domain.WarnLogs; -import com.muyu.warn.mapper.WarnLogsMapper; -import com.muyu.warn.service.WarnLogsService; +import com.muyu.domain.WarnLogs; +import com.muyu.server.mapper.WarnLogsMapper; +import com.muyu.server.service.WarnLogsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java similarity index 91% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java index ce9fa76..a6ba993 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnRuleServiceImpl.java @@ -1,13 +1,12 @@ -package com.muyu.warn.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; -import com.muyu.warn.domain.WarnRule; -import com.muyu.warn.domain.car.CarMessageType; -import com.muyu.warn.domain.car.resp.CarMessageResp; -import com.muyu.warn.mapper.WarnRuleMapper; -import com.muyu.warn.service.WarnRuleService; +import com.muyu.domain.WarnRule; +import com.muyu.domain.resp.CarMessageResp; +import com.muyu.server.mapper.WarnRuleMapper; +import com.muyu.server.service.WarnRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java similarity index 89% rename from cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java index 6c5ce23..d6937e9 100644 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/impl/WarnStrategyServiceImpl.java @@ -1,13 +1,13 @@ -package com.muyu.warn.service.impl; +package com.muyu.server.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; -import com.muyu.warn.domain.car.CartType; -import com.muyu.warn.domain.WarnStrategy; -import com.muyu.warn.domain.req.WarnStrategyReq; -import com.muyu.warn.mapper.WarnStrategyMapper; -import com.muyu.warn.service.WarnStrategyService; +import com.muyu.domain.CarType; +import com.muyu.domain.WarnStrategy; +import com.muyu.domain.req.WarnStrategyReq; +import com.muyu.server.mapper.WarnStrategyMapper; +import com.muyu.server.service.WarnStrategyService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -79,7 +79,7 @@ public class WarnStrategyServiceImpl } @Override - public List findByCarType() { + public List findByCarType() { return warnStrategyMapper.findByCarType(); } diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/message/MessageDao.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/message/MessageDao.java similarity index 90% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/message/MessageDao.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/message/MessageDao.java index 7b22a36..c644b2b 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/message/MessageDao.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/message/MessageDao.java @@ -1,6 +1,7 @@ -package com.muyu.cloud.faultmanage.service.message; +package com.muyu.server.service.message; -import com.muyu.cloud.faultmanage.domain.message.Message; + +import com.muyu.domain.message.Message; import java.sql.Connection; import java.sql.PreparedStatement; diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/message/MessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/message/MessageService.java similarity index 93% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/message/MessageService.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/message/MessageService.java index 41bb18b..1b7f078 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/java/com/muyu/cloud/faultmanage/service/message/MessageService.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/service/message/MessageService.java @@ -1,6 +1,7 @@ -package com.muyu.cloud.faultmanage.service.message; +package com.muyu.server.service.message; -import com.muyu.cloud.faultmanage.domain.message.Message; + +import com.muyu.domain.message.Message; import java.time.LocalDateTime; import java.time.ZoneId; diff --git a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/token/TokenUtil.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/token/TokenUtil.java similarity index 95% rename from cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/token/TokenUtil.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/token/TokenUtil.java index 643267e..08998c8 100644 --- a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/token/TokenUtil.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/token/TokenUtil.java @@ -1,8 +1,8 @@ -package com.muyu.wechat.token; +package com.muyu.server.token; import com.alibaba.fastjson.JSON; import com.muyu.common.wechat.domain.AccessToken; -import com.muyu.wechat.util.OkHttpUtils; +import com.muyu.server.util.OkHttpUtils; import org.springframework.stereotype.Component; @Component diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/util/JdbcHelper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/JdbcHelper.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/util/JdbcHelper.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/JdbcHelper.java diff --git a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/util/OkHttpUtils.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/OkHttpUtils.java similarity index 95% rename from cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/util/OkHttpUtils.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/OkHttpUtils.java index 8b6e2dd..3410826 100644 --- a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/util/OkHttpUtils.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/OkHttpUtils.java @@ -1,9 +1,12 @@ -package com.muyu.wechat.util; +package com.muyu.server.util; import okhttp3.*; import java.io.IOException; +/** + * @author 17353 + */ public class OkHttpUtils { private static final OkHttpClient client = new OkHttpClient(); diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/util/PaginationInterceptor.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/PaginationInterceptor.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/util/PaginationInterceptor.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/PaginationInterceptor.java diff --git a/cloud-modules/cloud-electronic/src/main/java/com/muyu/server/util/Thread.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/Thread.java similarity index 100% rename from cloud-modules/cloud-electronic/src/main/java/com/muyu/server/util/Thread.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/Thread.java diff --git a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/util/WordUtil.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/WordUtil.java similarity index 98% rename from cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/util/WordUtil.java rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/WordUtil.java index 4d86e2e..c98c60e 100644 --- a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/util/WordUtil.java +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/server/util/WordUtil.java @@ -1,4 +1,4 @@ -package com.muyu.wechat.util; +package com.muyu.server.util; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports similarity index 100% rename from cloud-modules/cloud-Vehicle-Simulation/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/banner.txt b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-Vehicle-Simulation/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml similarity index 100% rename from cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml similarity index 100% rename from cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml similarity index 100% rename from cloud-modules/cloud-Vehicle-Simulation/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarInformationMapper.xml similarity index 94% rename from cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarInformationMapper.xml index 53b02e0..6060630 100644 --- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarInformationMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarInformationMapper.xml @@ -5,11 +5,11 @@ - + - + - + @@ -63,7 +63,7 @@ ON `car_information`.car_information_fence = `car_fence`.id - AND `car_information`.car_information_VIN = #{carInformationVIN} + AND `car_information`.car_information_VIN = #{carInformationVin} @@ -97,7 +97,7 @@ - SELECT car_information_id , car_information_license_plate @@ -107,7 +107,7 @@ INSERT INTO `car_information` ( - car_information_VIN, + car_information_VIN, car_information_license_plate, car_information_brand, car_information_color, @@ -120,7 +120,7 @@ car_information_fence, car_information_type ) VALUES ( - #{carInformationVIN}, + #{carInformationVin}, #{carInformationLicensePlate}, #{carInformationBrand} , #{carInformationColor}, @@ -137,8 +137,8 @@ UPDATE `car_information` SET - - ` car_information_VIN` = #{carInformationVIN}, + + ` car_information_VIN` = #{carInformationVin}, ` car_information_license_plate ` = #{carInformationLicensePlate}, diff --git a/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarMessageMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMessageMapper.xml similarity index 96% rename from cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarMessageMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMessageMapper.xml index 1c5e4e5..cbed4ec 100644 --- a/cloud-modules/cloud-modules-car/src/main/resources/mapper/car/CarMessageMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMessageMapper.xml @@ -5,8 +5,8 @@ - - + + diff --git a/cloud-modules/cloud-Vehicle-Simulation/src/main/resources/mapper/CarMiddleGroupMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMiddleGroupMapper.xml similarity index 100% rename from cloud-modules/cloud-Vehicle-Simulation/src/main/resources/mapper/CarMiddleGroupMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/CarMiddleGroupMapper.xml diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultCodeMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultCodeMapper.xml similarity index 90% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultCodeMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultCodeMapper.xml index 10c94a9..2dd107e 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultCodeMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultCodeMapper.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -51,10 +51,10 @@ - select * from car_fault_label where message_type_name=#{messageTypeName} - select * from car_faultcode where faultcode_number=#{faultcodeNumber} @@ -90,7 +90,7 @@ - select * from car_faultcode where faultcode_id=#{faultcodeId} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultConditionMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultConditionMapper.xml similarity index 83% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultConditionMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultConditionMapper.xml index 4b9cd4b..b6a09f0 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultConditionMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultConditionMapper.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -28,7 +28,7 @@ - @@ -41,7 +41,7 @@ limit #{pageNum},#{pageSize} - SELECT car_fault_condition.* FROM diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultLogMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultLogMapper.xml similarity index 87% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultLogMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultLogMapper.xml index f637de2..803748f 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultLogMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultLogMapper.xml @@ -3,8 +3,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + @@ -27,7 +27,7 @@ - diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultRuleMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultRuleMapper.xml similarity index 85% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultRuleMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultRuleMapper.xml index 00f01a2..03ac61c 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/FaultRuleMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/FaultRuleMapper.xml @@ -3,10 +3,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + - + @@ -21,7 +21,7 @@ - + @@ -54,14 +54,14 @@ - and car_information.car_information_VIN=#{vin} - and car_fault_condition.car_type_id=#{carInformationType} diff --git a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/MessageMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/MessageMapper.xml similarity index 69% rename from cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/MessageMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/MessageMapper.xml index 25866ef..b636a5d 100644 --- a/cloud-faultmanage/cloud-faultmanage-server/src/main/resources/mapper/faultcode/MessageMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/MessageMapper.xml @@ -3,9 +3,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + - select * from car_fault_message where status=0 diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnRuleMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnRuleMapper.xml similarity index 82% rename from cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnRuleMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnRuleMapper.xml index 8ff36c0..2063a3c 100644 --- a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnRuleMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnRuleMapper.xml @@ -2,8 +2,8 @@ - - SELECT cm.car_message_id, cm.car_message_cartype, diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnStrategyMapper.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnStrategyMapper.xml similarity index 68% rename from cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnStrategyMapper.xml rename to cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnStrategyMapper.xml index 5cca314..5945787 100644 --- a/cloud-modules/cloud-modules-warn/src/main/resources/mapper/warn/WarnStrategyMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/mapper/WarnStrategyMapper.xml @@ -2,8 +2,8 @@ - - select car_type_id, car_type_name, @@ -11,7 +11,7 @@ from car_type - select id, car_type_id, diff --git a/cloud-faultmanage/cloud-faultmanage-client/pom.xml b/cloud-modules/cloud-modules-enterprise/pom.xml similarity index 63% rename from cloud-faultmanage/cloud-faultmanage-client/pom.xml rename to cloud-modules/cloud-modules-enterprise/pom.xml index 9f2f44f..3bedb42 100644 --- a/cloud-faultmanage/cloud-faultmanage-client/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/pom.xml @@ -5,15 +5,16 @@ 4.0.0 com.muyu - cloud-faultmanage + cloud-server 3.6.3 + ../../pom.xml - cloud-faultmanage-client - + cloud-modules-enterprise + pom - 17 - 17 + 21 + 21 UTF-8 diff --git a/cloud-modules/cloud-modules-enterprise/web/WEB-INF/web.xml b/cloud-modules/cloud-modules-enterprise/web/WEB-INF/web.xml new file mode 100644 index 0000000..d80081d --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/web/WEB-INF/web.xml @@ -0,0 +1,6 @@ + + + \ No newline at end of file diff --git a/cloud-modules/cloud-modules-warn/pom.xml b/cloud-modules/cloud-modules-warn/pom.xml deleted file mode 100644 index 61995bf..0000000 --- a/cloud-modules/cloud-modules-warn/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-warn - jar - - cloud-modules-warn - http://maven.apache.org - - - UTF-8 - - - - - - - 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 - - - - com.muyu - cloud-common-rabbit - - - - junit - junit - 3.8.1 - test - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/CloudWarnApplication.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/CloudWarnApplication.java deleted file mode 100644 index e744a01..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/CloudWarnApplication.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.warn; - -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; - -/** - * @Author:蓬叁 - * @Package:com.muyu.warn - * @Project:cloud-server-8 - * @name:CloudWarnApplication - * @Date:2024/9/20 下午8:33 - */ -@EnableCustomConfig -//@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class CloudWarnApplication { - public static void main(String[] args) { - SpringApplication.run(CloudWarnApplication.class, args); - } -} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CarMessage.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CarMessage.java deleted file mode 100644 index 37e2e0d..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CarMessage.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.muyu.warn.domain.car; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author:蓬叁 - * @Package:com.muyu.warn.domain.car - * @Project:cloud-server-8 - * @name:CarMessageType - * @Date:2024/9/22 下午3:08 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CarMessage { - - /** - * 自增主键 - */ - private Integer carMessageId ; - /** - * 车辆类型外键 - */ - private Integer carMessageCarype ; - /** - * 车辆报文外键 - */ - private Integer carMessageType ; - /** - * 开始位下标 - */ - private Integer carMessageStartIndex ; - /** - * 结束位下标 - */ - private Integer carMessageEndIndex ; - /** - * 报文数据类型 (固定值 区间随机值) - */ - private String messageTypeClass ; - /** - * 报文是否开启故障检测(0默认未开启 1开启) - */ - private Integer carMessageState ; - -} diff --git a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CartType.java b/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CartType.java deleted file mode 100644 index c1dd738..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/java/com/muyu/warn/domain/car/CartType.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.warn.domain.car; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author:蓬叁 - * @Package:com.muyu.warn.domain - * @Project:cloud-server-8 - * @name:CartType - * @Date:2024/9/21 下午7:38 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -public class CartType { - - /** - * 车辆类型ID - */ - private String carTypeId ; - /** - * 车辆类型名 - */ - private String carTypeName ; - /** - * 车辆规则外键ID - */ - private String carTypeRules ; - -} diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/banner.txt b/cloud-modules/cloud-modules-warn/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-warn/src/main/resources/bootstrap.yml deleted file mode 100644 index a06d101..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Tomcat -server: - port: 10004 - -# nacos线上地址 -nacos: - addr: 159.75.188.178:8848 - user-name: nacos - password: nacos - namespace: psr -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-warn - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-warn/src/main/resources/logback/dev.xml deleted file mode 100644 index 2fd61ae..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-warn/src/main/resources/logback/prod.xml deleted file mode 100644 index 8f5aff5..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-warn/src/main/resources/logback/test.xml deleted file mode 100644 index 8f5aff5..0000000 --- a/cloud-modules/cloud-modules-warn/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/src/test/java/com/muyu/AppTest.java b/cloud-modules/cloud-modules-warn/src/test/java/com/muyu/AppTest.java deleted file mode 100644 index 34d0e0a..0000000 --- a/cloud-modules/cloud-modules-warn/src/test/java/com/muyu/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/cloud-modules/cloud-modules-wechat/pom.xml b/cloud-modules/cloud-modules-wechat/pom.xml deleted file mode 100644 index a6e67f8..0000000 --- a/cloud-modules/cloud-modules-wechat/pom.xml +++ /dev/null @@ -1,120 +0,0 @@ - - 4.0.0 - - com.muyu - cloud-server - 3.6.3 - ../../pom.xml - - - cloud-modules-wechat - jar - - cloud-modules-wechat - http://maven.apache.org - - - UTF-8 - - - - - - - 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 - - - - com.muyu - cloud-common-rabbit - - - - junit - junit - 3.8.1 - test - - - - com.muyu - cloud-common-wechat - 3.6.3 - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/WeChatApplication.java b/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/WeChatApplication.java deleted file mode 100644 index 806d21e..0000000 --- a/cloud-modules/cloud-modules-wechat/src/main/java/com/muyu/wechat/WeChatApplication.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.wechat; - -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -@SpringBootApplication -@EnableMyFeignClients -public class WeChatApplication { - - public static void main(String[] args) { - SpringApplication.run(WeChatApplication.class, args); - } - -} diff --git a/cloud-modules/cloud-modules-wechat/src/main/resources/banner.txt b/cloud-modules/cloud-modules-wechat/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-wechat/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-wechat/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-wechat/src/main/resources/bootstrap.yml deleted file mode 100644 index 030843a..0000000 --- a/cloud-modules/cloud-modules-wechat/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,60 +0,0 @@ -# Tomcat -server: - port: 10003 - -# nacos线上地址 -nacos: - addr: 159.75.188.178:8848 - user-name: nacos - password: nacos - namespace: psr -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-wechat - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-wechat/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-wechat/src/main/resources/logback/dev.xml deleted file mode 100644 index 2fd61ae..0000000 --- a/cloud-modules/cloud-modules-wechat/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-wechat/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-wechat/src/main/resources/logback/prod.xml deleted file mode 100644 index 8f5aff5..0000000 --- a/cloud-modules/cloud-modules-wechat/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-wechat/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-wechat/src/main/resources/logback/test.xml deleted file mode 100644 index 8f5aff5..0000000 --- a/cloud-modules/cloud-modules-wechat/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-wechat/src/test/java/com/muyu/AppTest.java b/cloud-modules/cloud-modules-wechat/src/test/java/com/muyu/AppTest.java deleted file mode 100644 index 34d0e0a..0000000 --- a/cloud-modules/cloud-modules-wechat/src/test/java/com/muyu/AppTest.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -/** - * Unit test for simple App. - */ -public class AppTest - extends TestCase -{ - /** - * Create the test case - * - * @param testName name of the test case - */ - public AppTest( String testName ) - { - super( testName ); - } - - /** - * @return the suite of tests being tested - */ - public static Test suite() - { - return new TestSuite( AppTest.class ); - } - - /** - * Rigourous Test :-) - */ - public void testApp() - { - assertTrue( true ); - } -} diff --git a/cloud-modules/cloud-test/pom.xml b/cloud-modules/cloud-test/pom.xml deleted file mode 100644 index f0418c2..0000000 --- a/cloud-modules/cloud-test/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-test - - - 17 - 17 - UTF-8 - - - - - - - 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 - - - diff --git a/cloud-modules/cloud-test/src/main/java/com/muyu/test/TestApplication.java b/cloud-modules/cloud-test/src/main/java/com/muyu/test/TestApplication.java deleted file mode 100644 index fbd6752..0000000 --- a/cloud-modules/cloud-test/src/main/java/com/muyu/test/TestApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.test; - -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.cloud.openfeign.EnableFeignClients; - -/** - * @Author:张腾 - * @Package:com.muyu.test - * @Project:cloud-server-8 - * @name:TestApplication - * @Date:2024/9/20 19:16 - */ -@SpringBootApplication -@EnableMyFeignClients -public class TestApplication { - - public static void main(String[] args) { - SpringApplication.run(TestApplication.class,args); - } -} diff --git a/cloud-modules/cloud-test/src/main/java/com/muyu/test/controller/UserController.java b/cloud-modules/cloud-test/src/main/java/com/muyu/test/controller/UserController.java deleted file mode 100644 index 8486e2c..0000000 --- a/cloud-modules/cloud-test/src/main/java/com/muyu/test/controller/UserController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.test.controller; - -import com.muyu.common.core.domain.Result; -import com.muyu.test.domain.User; -import com.muyu.test.service.UserService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -import java.util.List; - -/** - * @Author:张腾 - * @Package:com.muyu.test.controller - * @Project:cloud-server-8 - * @name:UserController - * @Date:2024/9/20 19:14 - */ -@RestController("/admin") -public class UserController { - - @Autowired - private UserService userService; - - @GetMapping("/selectAll") - public Result> selectAll(){ - List list = userService.list(); - list.forEach(System.out::println); - return Result.success(list); - } - -} diff --git a/cloud-modules/cloud-test/src/main/java/com/muyu/test/domain/User.java b/cloud-modules/cloud-test/src/main/java/com/muyu/test/domain/User.java deleted file mode 100644 index 723ce88..0000000 --- a/cloud-modules/cloud-test/src/main/java/com/muyu/test/domain/User.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.test.domain; - -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @Author:张腾 - * @Package:com.muyu.test.domain - * @Project:cloud-server-8 - * @name:User - * @Date:2024/9/20 19:11 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@TableName(value = "user",autoResultMap = true) -public class User { - - @TableId(value = "user_id") - private Integer userId; - - private String userName; -} diff --git a/cloud-modules/cloud-test/src/main/java/com/muyu/test/mapper/UserMapper.java b/cloud-modules/cloud-test/src/main/java/com/muyu/test/mapper/UserMapper.java deleted file mode 100644 index 04d55ec..0000000 --- a/cloud-modules/cloud-test/src/main/java/com/muyu/test/mapper/UserMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.test.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.test.domain.User; -import org.apache.ibatis.annotations.Mapper; - -/** - * @Author:张腾 - * @Package:com.muyu.test.mapper - * @Project:cloud-server-8 - * @name:UserMapper - * @Date:2024/9/20 19:13 - */ -@Mapper -public interface UserMapper extends BaseMapper { -} diff --git a/cloud-modules/cloud-test/src/main/java/com/muyu/test/service/UserService.java b/cloud-modules/cloud-test/src/main/java/com/muyu/test/service/UserService.java deleted file mode 100644 index c717ced..0000000 --- a/cloud-modules/cloud-test/src/main/java/com/muyu/test/service/UserService.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.muyu.test.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.test.domain.User; - -/** - * @Author:张腾 - * @Package:com.muyu.test.service - * @Project:cloud-server-8 - * @name:UserService - * @Date:2024/9/20 19:13 - */ -public interface UserService extends IService { -} diff --git a/cloud-modules/cloud-test/src/main/java/com/muyu/test/service/impl/UserServiceImpl.java b/cloud-modules/cloud-test/src/main/java/com/muyu/test/service/impl/UserServiceImpl.java deleted file mode 100644 index 44c0d83..0000000 --- a/cloud-modules/cloud-test/src/main/java/com/muyu/test/service/impl/UserServiceImpl.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.muyu.test.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.test.domain.User; -import com.muyu.test.mapper.UserMapper; -import com.muyu.test.service.UserService; -import org.springframework.stereotype.Service; - -/** - * @Author:张腾 - * @Package:com.muyu.test.service.impl - * @Project:cloud-server-8 - * @name:UserServiceImpl - * @Date:2024/9/20 19:14 - */ -@Service -public class UserServiceImpl - extends ServiceImpl implements UserService { - - -} diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index aac4a6f..7627a64 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -9,14 +9,11 @@ 4.0.0 - cloud-electronic + cloud-modules-enterprise cloud-modules-system cloud-modules-gen cloud-modules-file - cloud-modules-car - cloud-modules-warn - cloud-modules-car - cloud-test + cloud-Saas-Service cloud-modules diff --git a/pom.xml b/pom.xml index 8060afb..7053527 100644 --- a/pom.xml +++ b/pom.xml @@ -282,9 +282,10 @@ cloud-visual cloud-modules cloud-common - cloud-modules/cloud-electronic - cloud-modules/cloud-Vehicle-Simulation - cloud-modules/cloud-modules-wechat + cloud-modules/cloud-modules-enterprise + cloud-modules/cloud-Saas-Service + cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common + cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server pom