Merge remote-tracking branch 'origin/dev.business' into dev

# Conflicts:
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/CarType.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/DataType.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplate.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/MessageTemplateType.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCar.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/SysCarLog.java
#	cloud-modules/saas/saas-common/src/main/java/com/muyu/common/domain/Template.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/config/MqttConfigure.java
#	cloud-modules/saas/saas-server/src/main/java/com/muyu/server/service/impl/SysCarServiceImpl.java
dev.event
袁子龙 2024-09-30 11:00:49 +08:00
commit f93af8b4a6
98 changed files with 345 additions and 123 deletions

View File

@ -0,0 +1,24 @@
package com.muyu.auth.form;
import lombok.Data;
/**
*
* @author
* @package com.muyu.auth.form
* @name Enterprise
* @date 2024/9/30 10:30
*/
@Data
public class Enterprise {
/**
*
*/
private String firmName;
/**
*
*/
private String databaseName;
}

View File

@ -7,7 +7,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# Spring # Spring
spring: spring:
application: application:

View File

@ -1,23 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" <project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent> <parent>
<groupId>com.muyu</groupId> <groupId>com.muyu</groupId>
<artifactId>cloud-common</artifactId> <artifactId>cloud-common</artifactId>
<version>3.6.3</version> <version>3.6.3</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <groupId>com.bwie</groupId>
<artifactId>cloud-common-swagger</artifactId> <artifactId>cloud-common-swagger</artifactId>
<description> <description>
cloud-common-swagger swagger2文档聚合 cloud-common-swagger系统接口
</description> </description>
<properties>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies> <dependencies>
<!-- SpringBoot Web --> <!-- SpringBoot Web -->
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>

View File

@ -1,10 +1,21 @@
package com.muyu.common.swagger.annotation; package com.muyu.common.swagger.annotation;
import com.muyu.common.swagger.config.SwaggerAutoConfiguration;
import org.springframework.context.annotation.Import;
import java.lang.annotation.*;
/** /**
* @author * @author
* @packagecom.muyu.common.swagger.annotation * @packagecom.muyu.common.swagger.annotation
* @nameEnableCustomSwagger2 * @nameEnableCustomSwagger2
* @date2024/9/29 10:01 * @date2024/9/29 10:01
*/ */
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@Documented
@Inherited
@Import({SwaggerAutoConfiguration.class})
public @interface EnableCustomSwagger2 { public @interface EnableCustomSwagger2 {
} }

View File

@ -12,6 +12,7 @@ import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
/** /**
* springboot 2.6.x
* @author * @author
* @packagecom.muyu.common.swagger.config * @packagecom.muyu.common.swagger.config
* @nameSwaggerBeanPostProcessor * @nameSwaggerBeanPostProcessor

View File

@ -300,4 +300,3 @@ public class SwaggerProperties {
} }
} }
} }

View File

@ -7,7 +7,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# Spring # Spring
spring: spring:

View File

@ -6,7 +6,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring # Spring
amqp: amqp:

View File

@ -7,7 +7,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# Spring # Spring
spring: spring:

View File

@ -9,7 +9,7 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* *
* *
* @author ruoyi * @author ruoyi
*/ */

View File

@ -40,7 +40,7 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
/** /**
* *
* *
* @author ruoyi * @author ruoyi
*/ */

View File

@ -7,7 +7,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring # Spring
spring: spring:

View File

@ -7,7 +7,7 @@ import com.muyu.system.domain.vo.TreeSelect;
import java.util.List; import java.util.List;
/** /**
* *
* *
* @author muyu * @author muyu
*/ */

View File

@ -7,7 +7,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring # Spring
spring: spring:

View File

@ -7,7 +7,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# Spring # Spring
spring: spring:

View File

@ -7,12 +7,11 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* *
* @Authorliuxinyue * @author sx
* @Packagecom.sheep.message.domain * @package com.muyu.common.domain
* @Projectcloud-server-c * @name CarType
* @nameMessageTemplateType * @date 2024/9/22 14:36
* @Date2024/9/18 21:01
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor

View File

@ -10,8 +10,8 @@ import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.io.Serializable; import java.io.Serializable;
/** /**
* *
* @Authorliuxinyue * @author liuxinyue
* @Packagecom.sheep.message.domain * @Packagecom.sheep.message.domain
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameDataType * @nameDataType
@ -29,10 +29,10 @@ public class DataType implements Serializable{
* ID * ID
*/ */
@TableId(value = "data_type_id",type = IdType.AUTO) @TableId(value = "data_type_id",type = IdType.AUTO)
private Integer dataTypeId; private Integer DataTypeId;
/** /**
* *
*/ */
private String dataTypeName; private String DataTypeName;
} }

View File

@ -1,11 +1,13 @@
package com.muyu.common.domain; package com.muyu.common.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @Author YuPing *
* @author yuping
* @Description * @Description
* @Version 1.0 * @Version 1.0
* @Data 2024-09-26 20:22:04 * @Data 2024-09-26 20:22:04
@ -13,6 +15,7 @@ import lombok.NoArgsConstructor;
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor
@TableName("enterprise")
public class Enterprise { public class Enterprise {
/** /**
* *

View File

@ -1,5 +1,6 @@
package com.muyu.common.domain; package com.muyu.common.domain;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
@ -9,8 +10,8 @@ import lombok.experimental.SuperBuilder;
import java.sql.Date; import java.sql.Date;
/** /**
* *
* @Authorliuxinyue * @author liuxinyue
* @Packagecom.template.domain * @Packagecom.template.domain
* @Projectcloud-server * @Projectcloud-server
* @nameMessageTemplate * @nameMessageTemplate
@ -21,6 +22,7 @@ import java.sql.Date;
@NoArgsConstructor @NoArgsConstructor
@SuperBuilder @SuperBuilder
@Tag(name = "报文") @Tag(name = "报文")
@TableName("message_template")
public class MessageTemplate { public class MessageTemplate {
/** /**

View File

@ -1,6 +1,5 @@
package com.muyu.common.domain; package com.muyu.common.domain;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag; import io.swagger.v3.oas.annotations.tags.Tag;
@ -8,9 +7,10 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
import java.io.Serializable; import java.io.Serializable;
/** /**
*
* @Authorliuxinyue * @Authorliuxinyue
* @Packagecom.sheep.message.domain * @Packagecom.sheep.message.domain
* @Projectcloud-server-c * @Projectcloud-server-c
@ -24,6 +24,7 @@ import java.io.Serializable;
@Tag(name = "报文模版表") @Tag(name = "报文模版表")
@TableName(value = "message_template_type",autoResultMap = true) @TableName(value = "message_template_type",autoResultMap = true)
public class MessageTemplateType implements Serializable { public class MessageTemplateType implements Serializable {
/** /**
* *
*/ */
@ -56,7 +57,6 @@ public class MessageTemplateType implements Serializable {
/** /**
* *
*/ */
@TableField(exist = false)
private String dataTypeName; private String dataTypeName;
/** /**
* *

View File

@ -10,12 +10,11 @@ import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* *
* @Authorliuxinyue * @author sx
* @Packagecom.sheep.message.domain * @package com.muyu.common.domain
* @Projectcloud-server-c * @name SysCar
* @nameMessageTemplateType * @date 2024-09-29 14:39:33
* @Date2024/9/18 21:01
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@ -23,7 +22,6 @@ import lombok.NoArgsConstructor;
@EqualsAndHashCode(callSuper = true) @EqualsAndHashCode(callSuper = true)
@TableName(value = "sys_car",autoResultMap = true) @TableName(value = "sys_car",autoResultMap = true)
public class SysCar extends BaseEntity { public class SysCar extends BaseEntity {
@TableId(value = "id",type = IdType.AUTO) @TableId(value = "id",type = IdType.AUTO)
private Long id; private Long id;
private String carVin; private String carVin;

View File

@ -11,12 +11,11 @@ import lombok.NoArgsConstructor;
import java.util.Date; import java.util.Date;
/** /**
* * 线
* @Authorliuxinyue * @author sx
* @Packagecom.sheep.message.domain * @package com.muyu.common.domain
* @Projectcloud-server-c * @name SysCarLog
* @nameMessageTemplateType * @date 2024-09-29 14:34:15
* @Date2024/9/18 21:01
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor

View File

@ -12,13 +12,14 @@ import lombok.experimental.SuperBuilder;
import java.util.Date; import java.util.Date;
/** /**
* *
* @Authorliuxinyue * @author liuxinyue
* @Packagecom.template.domain * @Packagecom.template.domain
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameTemplate * @nameTemplate
* @Date2024/9/20 12:04 * @Date2024/9/20 12:04
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor

View File

@ -14,7 +14,7 @@ import java.util.Date;
/** /**
* warn_logs * warn_logs
* *
* @author muyu * @author sx
* @date 2024-09-20 * @date 2024-09-20
*/ */

View File

@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
/** /**
* warn_rule * warn_rule
* *
* @author muyu * @author sx
* @date 2024-09-20 * @date 2024-09-20
*/ */

View File

@ -11,7 +11,7 @@ import lombok.NoArgsConstructor;
/** /**
* warn_strategy * warn_strategy
* *
* @author muyu * @author sx
* @date 2024-09-20 * @date 2024-09-20
*/ */

View File

@ -16,7 +16,8 @@ import lombok.experimental.SuperBuilder;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain * @Packagecom.muyu.fence.domain
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFence * @nameElectronicFence

View File

@ -16,7 +16,8 @@ import lombok.experimental.SuperBuilder;
import java.util.function.Supplier; import java.util.function.Supplier;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain * @Packagecom.muyu.fence.domain
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceGroup * @nameElectronicFenceGroup

View File

@ -9,7 +9,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain * @Packagecom.muyu.fence.domain
* @Projectcloud-server * @Projectcloud-server
* @nameFenceGroupMid * @nameFenceGroupMid

View File

@ -10,7 +10,8 @@ import lombok.NoArgsConstructor;
import java.util.Date; import java.util.Date;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameElectroicAdd * @nameElectroicAdd

View File

@ -8,7 +8,8 @@ import lombok.NoArgsConstructor;
import java.util.Date; import java.util.Date;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameElectroicFenceReq * @nameElectroicFenceReq

View File

@ -6,7 +6,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameElectroicFenceUpdReq * @nameElectroicFenceUpdReq

View File

@ -9,7 +9,8 @@ import lombok.NoArgsConstructor;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceGroupAddReq * @nameElectronicFenceGroupAddReq

View File

@ -8,7 +8,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceGroupListReq * @nameElectronicFenceGroupListReq

View File

@ -11,7 +11,8 @@ import lombok.NoArgsConstructor;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceGroupAddReq * @nameElectronicFenceGroupAddReq

View File

@ -9,7 +9,8 @@ import lombok.NoArgsConstructor;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameFenceAndGroupBoundReq * @nameFenceAndGroupBoundReq

View File

@ -5,7 +5,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain * @Packagecom.muyu.fence.domain
* @Projectcloud-server * @Projectcloud-server
* @nameFenceWay * @nameFenceWay

View File

@ -5,6 +5,13 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/**
*
* @author sx
* @package com.muyu.common.domain.req
* @name SysCarReq
* @date 2024/9/22 14:36
*/
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor

View File

@ -8,7 +8,7 @@ import lombok.NoArgsConstructor;
/** /**
* warn_strategy * warn_strategy
* *
* @author muyu * @author sx
* @date 2024-09-20 * @date 2024-09-20
*/ */

View File

@ -8,6 +8,13 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/**
*
* @author sx
* @package com.muyu.common.domain.resp
* @name CarTypeResp
* @date 2024/9/22 14:36
*/
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor

View File

@ -10,12 +10,13 @@ import lombok.NoArgsConstructor;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @Packagecom.muyu.fence.domain.resp * @author yuping
* @Projectcloud-server * @package com.muyu.fence.domain.resp
* @nameElectronicFenceGroupResp * @name ElectronicFenceGroupResp
* @Date2024/9/22 10:22 * @date 2024/9/22 14:36
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor

View File

@ -7,12 +7,14 @@ import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain * @Packagecom.muyu.fence.domain
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFence * @nameElectronicFence
* @Date2024/9/17 16:34 * @Date2024/9/17 16:34
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor

View File

@ -9,7 +9,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain.req * @Packagecom.muyu.fence.domain.req
* @Projectcloud-server * @Projectcloud-server
* @nameGroupFenceListresp * @nameGroupFenceListresp

View File

@ -6,7 +6,8 @@ import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.muyu.domain.resp * @Packagecom.muyu.domain.resp
* @Projectcloud-server * @Projectcloud-server
* @nameSysCarFaultLogVo * @nameSysCarFaultLogVo

View File

@ -7,6 +7,13 @@ import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/**
*
* @author sx
* @package com.muyu.common.domain.resp
* @name SysCarVo
* @date 2024/9/22 14:36
*/
@Data @Data
@AllArgsConstructor @AllArgsConstructor
@NoArgsConstructor @NoArgsConstructor

View File

@ -7,6 +7,13 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/**
*
* @author sx
* @package com.muyu.common.domain.resp
* @name WarnLogsResp
* @date 2024/9/22 14:36
*/
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor

View File

@ -6,6 +6,13 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/**
*
* @author sx
* @package com.muyu.common.domain.resp
* @name WarnRuleResp
* @date 2024/9/22 14:36
*/
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor

View File

@ -7,6 +7,13 @@ import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
/**
*
* @author sx
* @package com.muyu.common.domain.resp
* @anme WarnStrategyResp
* @date 2024/9/22 14:36
*/
@Data @Data
@NoArgsConstructor @NoArgsConstructor
@AllArgsConstructor @AllArgsConstructor

View File

@ -14,6 +14,10 @@ import lombok.NoArgsConstructor;
/** /**
* *
* @author yuping
* @package com.muyu.fence.domain
* @name ElectricFenceModel
* @date 2024/9/22 14:36
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor

View File

@ -15,6 +15,10 @@ import java.util.Date;
*/ */
/** /**
* *
* @author yuping
* @package com.muyu.fence.domain.utils
* @name ElectricFenceResultTmp
* @date 2024/9/22 14:36
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor

View File

@ -18,6 +18,10 @@ import java.util.Date;
/** /**
* *
* @author yuping
* @package com.muyu.fence.domain
* @name ElectronicFenceResult
* @date 2024/9/22 14:36
*/ */
@Data @Data
@AllArgsConstructor @AllArgsConstructor

View File

@ -10,7 +10,8 @@ import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder; import lombok.experimental.SuperBuilder;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.domain * @Packagecom.muyu.fence.domain
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceSetting * @nameElectronicFenceSetting

View File

@ -5,7 +5,8 @@ import lombok.Data;
import java.util.List; import java.util.List;
/** /**
* @Author mengyu *
* @author sx
* @Description * @Description
* @Version 1.0 * @Version 1.0
* @Data 2024-09-08 14:58:59 * @Data 2024-09-08 14:58:59

View File

@ -5,7 +5,8 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
/** /**
* @Author YuPing * saas
* @author YuPing
* @Description saas * @Description saas
* @Version 1.0 * @Version 1.0
* @Data 2024-09-28 17:34:31 * @Data 2024-09-28 17:34:31

View File

@ -10,7 +10,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* *Kafka
* @author liuxinyue * @author liuxinyue
* @Packagecom.muyu.mqtt.configure * @Packagecom.muyu.mqtt.configure
* @Projectcloud-server * @Projectcloud-server

View File

@ -10,7 +10,7 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
/** /**
* * Kafka
* @author liuxinyue * @author liuxinyue
* @Packagecom.muyu.mqtt.configure * @Packagecom.muyu.mqtt.configure
* @Projectcloud-server * @Projectcloud-server

View File

@ -10,7 +10,8 @@ import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct; import javax.annotation.PostConstruct;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.muyu.mqtt.configure * @Packagecom.muyu.mqtt.configure
* @Projectcloud-server * @Projectcloud-server
* @nameMqttConfigure * @nameMqttConfigure
@ -29,7 +30,7 @@ public class MqttConfigure {
String topic = "vehicle"; String topic = "vehicle";
int qos = 2; int qos = 2;
String broker = "tcp://47.101.53.251:1883"; String broker = "tcp://47.101.53.251:1883";
String clientId = "hhhhhh"; String clientId = "测试mqtt";
try { try {
MqttClient sampleClient = new MqttClient(broker, clientId); MqttClient sampleClient = new MqttClient(broker, clientId);
MqttConnectOptions connOpts = new MqttConnectOptions(); MqttConnectOptions connOpts = new MqttConnectOptions();

View File

@ -5,7 +5,8 @@ import com.muyu.common.domain.DataType;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
* @Authorliuxinyue * Mapper
* @author liuxinyue
* @Packagecom.sheep.mapper * @Packagecom.sheep.mapper
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameDataTypeMapper * @nameDataTypeMapper

View File

@ -5,7 +5,8 @@ import com.muyu.common.domain.database.ElectronicFenceGroup;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
* @Authoryuping * Mapper
* @author yuping
* @Packagecom.muyu.fence.mapper * @Packagecom.muyu.fence.mapper
* @Projectcloud-server * @Projectcloud-server
* @nameFenceGroupMapper * @nameFenceGroupMapper

View File

@ -5,7 +5,8 @@ import com.muyu.common.domain.database.ElectronicFence;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
* @Authoryuping * Mapper
* @author yuping
* @Packagecom.muyu.fence.mapper * @Packagecom.muyu.fence.mapper
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceMapper * @nameElectronicFenceMapper

View File

@ -7,6 +7,13 @@ import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/**
* Mapper
* @author yupnig
* @package com.muyu.server.mapper
* @name EnterpriseDao
* @date 2024-09-29 14:31:06
*/
@Mapper @Mapper
public interface EnterpriseDao { public interface EnterpriseDao {
// 查询分页信息 // 查询分页信息

View File

@ -5,7 +5,8 @@ import com.muyu.common.domain.database.FenceGroupMid;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
* @Authoryuping * Mapper
* @author yuping
* @Packagecom.muyu.fence.mapper * @Packagecom.muyu.fence.mapper
* @Projectcloud-server * @Projectcloud-server
* @nameFenceGroupMidMapper * @nameFenceGroupMidMapper

View File

@ -5,7 +5,8 @@ import com.muyu.common.domain.MessageTemplateType;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/** /**
* @Authorliuxinyue * Mapper
* @author liuxinyue
* @Packagecom.sheep.message.mapper * @Packagecom.sheep.message.mapper
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameMessageTemplateTypeMapper * @nameMessageTemplateTypeMapper

View File

@ -4,6 +4,13 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.common.domain.SysCarLog; import com.muyu.common.domain.SysCarLog;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
/**
* 线 Mapper
* @author sx
* @package com.muyu.server.mapper
* @name SysCarLogMapper
* @date 2024-09-29 14:37:11
*/
@Mapper @Mapper
public interface SysCarLogMapper extends BaseMapper<SysCarLog> { public interface SysCarLogMapper extends BaseMapper<SysCarLog> {
} }

View File

@ -10,6 +10,13 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
/**
* Mapper
* @author sx
* @package com.muyu.server.mapper
* @name SysCarMapper
* @date 2024-09-29 14:38:40
*/
@Mapper @Mapper
public interface SysCarMapper extends BaseMapper<SysCar> { public interface SysCarMapper extends BaseMapper<SysCar> {
List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq); List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq);

View File

@ -9,7 +9,8 @@ import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.template.mapper * @Packagecom.template.mapper
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameTemplateMapper * @nameTemplateMapper

View File

@ -5,6 +5,14 @@ import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import java.util.List; import java.util.List;
/**
* Mapper
* @author liuyinyue
* @package com.muyu.server.mapper
* @name TemplateNeedMapper
* @date 2024-09-29 14:44:57
*/
@Mapper @Mapper
public interface TemplateNeedMapper { public interface TemplateNeedMapper {
List<MessageTemplateType> selectByTemplateId(@Param("templateId")Long templateId); List<MessageTemplateType> selectByTemplateId(@Param("templateId")Long templateId);

View File

@ -6,6 +6,14 @@ import com.muyu.common.domain.resp.CarTypeResp;
import java.util.List; import java.util.List;
/**
*
* @author sx
* @package com.muyu.server.service
* @name CarTypeService
* @date 2024-09-29 15:16:17
*/
public interface CarTypeService extends IService<CarType> { public interface CarTypeService extends IService<CarType> {
List<CarType> selectCarTypeList(); List<CarType> selectCarTypeList();

View File

@ -4,7 +4,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
import com.muyu.common.domain.DataType; import com.muyu.common.domain.DataType;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.sheep.service * @Packagecom.sheep.service
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameDataTypeService * @nameDataTypeService

View File

@ -8,7 +8,8 @@ import com.muyu.common.domain.resp.ElectronicFenceGroupResp;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.service * @Packagecom.muyu.fence.service
* @Projectcloud-server * @Projectcloud-server
* @nameFenceGroupController * @nameFenceGroupController

View File

@ -11,7 +11,8 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.service * @Packagecom.muyu.fence.service
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceService * @nameElectronicFenceService

View File

@ -6,6 +6,14 @@ import com.muyu.common.util.PageUtils;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
/**
*
* @author yuping
* @package com.muyu.server.service
* @name EnterpriseService
* @date 2024-09-29 15:26:06
*/
public interface EnterpriseService { public interface EnterpriseService {
// 分页查询企业信息 // 分页查询企业信息
public PageUtils selectEnterprise(Map param); public PageUtils selectEnterprise(Map param);

View File

@ -7,7 +7,8 @@ import com.muyu.common.domain.resp.ElectronicFenceResp;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.service * @Packagecom.muyu.fence.service
* @Projectcloud-server * @Projectcloud-server
* @nameFenceGroupMidService * @nameFenceGroupMidService

View File

@ -6,7 +6,8 @@ import com.muyu.common.domain.MessageTemplateType;
import java.util.List; import java.util.List;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.sheep.message.service * @Packagecom.sheep.message.service
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameMessageTemplateTypeService * @nameMessageTemplateTypeService

View File

@ -6,7 +6,7 @@ import com.muyu.common.domain.SysCarFaultLog;
import java.util.List; import java.util.List;
/** /**
* *
* @author * @author
* @package: com.muyu.breakdown.service * @package: com.muyu.breakdown.service
* @name: SysCarFaultLogService * @name: SysCarFaultLogService

View File

@ -4,6 +4,13 @@ package com.muyu.server.service;
import com.muyu.common.domain.SysCarLog; import com.muyu.common.domain.SysCarLog;
import java.util.List; import java.util.List;
/**
* 线
* @author sx
* @package com.muyu.server.service
* @name : SysCarLogService
* @date 2024-09-29 15:05:08
*/
public interface SysCarLogService { public interface SysCarLogService {

View File

@ -7,6 +7,13 @@ import com.muyu.common.domain.resp.SysCarVo;
import java.util.List; import java.util.List;
/**
*
* @author sx
* @package com.muyu.server.service
* @name SysCarService
* @date 2024-09-29 15:02:55
*/
public interface SysCarService { public interface SysCarService {
List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq); List<SysCarVo> selectSysCarVoList(SysCarReq sysCarReq);

View File

@ -4,6 +4,14 @@ import com.muyu.common.domain.MessageTemplateType;
import java.util.List; import java.util.List;
/**
*
* @author liuxinyue
* @package com.muyu.server.service
* @name TemplateNeedService
* @date 2024-09-29 15:31:55
*/
public interface TemplateNeedService { public interface TemplateNeedService {
List<MessageTemplateType> selectByTemplateId(Long templateId); List<MessageTemplateType> selectByTemplateId(Long templateId);
} }

View File

@ -9,7 +9,8 @@ import java.sql.SQLException;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.template.service * @Packagecom.template.service
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameTemplateService * @nameTemplateService

View File

@ -7,9 +7,9 @@ import com.muyu.common.domain.resp.WarnLogsResp;
import java.util.List; import java.util.List;
/** /**
* Service *
* *
* @author muyu * @author sx
* @date 2024-09-20 * @date 2024-09-20
*/ */
public interface WarnLogsService extends IService<WarnLogs> { public interface WarnLogsService extends IService<WarnLogs> {

View File

@ -7,9 +7,9 @@ import com.muyu.common.domain.resp.WarnRuleResp;
import java.util.List; import java.util.List;
/** /**
* Service *
* *
* @author muyu * @author sx
* @date 2024-09-20 * @date 2024-09-20
*/ */
public interface WarnRuleService extends IService<WarnRule> { public interface WarnRuleService extends IService<WarnRule> {

View File

@ -9,9 +9,9 @@ import com.muyu.common.domain.resp.WarnStrategyResp;
import java.util.List; import java.util.List;
/** /**
* Service *
* *
* @author muyu * @author sx
* @date 2024-09-20 * @date 2024-09-20
*/ */
public interface WarnStrategyService extends IService<WarnStrategy> { public interface WarnStrategyService extends IService<WarnStrategy> {

View File

@ -11,6 +11,13 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/**
*
* @author sx
* @package com.muyu.server.service.impl
* @name CarTypeServiceImpl
* @date 2024-09-29 16:06:22
*/
@Service @Service
public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> implements CarTypeService{ public class CarTypeServiceImpl extends ServiceImpl<CarTypeMapper, CarType> implements CarTypeService{
@Autowired @Autowired

View File

@ -8,7 +8,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.sheep.service.impl * @Packagecom.sheep.service.impl
* @Projectcloud-server-c * @Projectcloud-server-c
* @nameDataTypeServiceImpl * @nameDataTypeServiceImpl

View File

@ -20,7 +20,8 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.service.impl * @Packagecom.muyu.fence.service.impl
* @Projectcloud-server * @Projectcloud-server
* @nameFenceGroupServiceImpl * @nameFenceGroupServiceImpl

View File

@ -19,7 +19,8 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.service.impl * @Packagecom.muyu.fence.service.impl
* @Projectcloud-server * @Projectcloud-server
* @nameElectronicFenceServiceImpl * @nameElectronicFenceServiceImpl

View File

@ -12,9 +12,10 @@ import org.springframework.stereotype.Service;
import java.util.*; import java.util.*;
/** /**
* @Author YuPing *
* @Description * @author yuping
* @Version 1.0 * @package com.muyu.server.service.impl
* @name EnterpriseServiceImpl
* @Data 2024-09-26 20:23:21 * @Data 2024-09-26 20:23:21
*/ */
@Service @Service

View File

@ -12,7 +12,8 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* @Authoryuping *
* @author yuping
* @Packagecom.muyu.fence.service.impl * @Packagecom.muyu.fence.service.impl
* @Projectcloud-server * @Projectcloud-server
* @nameFenceGroupMidServiceImpl * @nameFenceGroupMidServiceImpl

View File

@ -8,9 +8,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.sheep.message.service.impl * @Packagecom.sheep.message.service.impl
* @Projectcloud-server-c
* @nameMessageTemplateTypeServiceImpl * @nameMessageTemplateTypeServiceImpl
* @Date2024/9/19 14:34 * @Date2024/9/19 14:34
*/ */

View File

@ -10,7 +10,7 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* *
* @author * @author
* @package: com.muyu.breakdown.service.impl * @package: com.muyu.breakdown.service.impl
* @name: sysCarFaultLogServiceImpl * @name: sysCarFaultLogServiceImpl

View File

@ -13,7 +13,7 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/** /**
* *
* @author * @author
* @package: com.muyu.breakdown.service.impl * @package: com.muyu.breakdown.service.impl
* @name: SysCarFaultMessageServiceImpl * @name: SysCarFaultMessageServiceImpl

View File

@ -14,7 +14,7 @@ import org.springframework.util.Assert;
import java.util.List; import java.util.List;
/** /**
* *
* @author * @author
* @package: com.muyu.breakdown.service.impl * @package: com.muyu.breakdown.service.impl
* @name: SysCarFaultServiceImpl * @name: SysCarFaultServiceImpl

View File

@ -10,6 +10,13 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/**
* 线
* @author sx
* @package com.muyu.server.service.impl
* @name SysCarLogServiceImpl
* @date 2024/9/22 14:36
*/
@Service @Service
public class SysCarLogServiceImpl extends ServiceImpl<SysCarLogMapper, SysCarLog> implements SysCarLogService { public class SysCarLogServiceImpl extends ServiceImpl<SysCarLogMapper, SysCarLog> implements SysCarLogService {
@Autowired @Autowired

View File

@ -1,6 +1,5 @@
package com.muyu.server.service.impl; package com.muyu.server.service.impl;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.muyu.common.domain.SysCar; import com.muyu.common.domain.SysCar;
@ -13,8 +12,13 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/**
@DS("lizzDB") *
* @author sx
* @package com.muyu.server.service.impl
* @name SysCarServiceImpl
* @date 2024/9/22 14:36
*/
@Service @Service
public class SysCarServiceImpl extends ServiceImpl<SysCarMapper, SysCar> implements SysCarService { public class SysCarServiceImpl extends ServiceImpl<SysCarMapper, SysCar> implements SysCarService {
@Autowired @Autowired
@ -53,8 +57,7 @@ public class SysCarServiceImpl extends ServiceImpl<SysCarMapper, SysCar> impleme
public SysCar findCarByVin(String carVin) { public SysCar findCarByVin(String carVin) {
QueryWrapper<SysCar> sysCarQueryWrapper = new QueryWrapper<>(); QueryWrapper<SysCar> sysCarQueryWrapper = new QueryWrapper<>();
sysCarQueryWrapper.eq("car_vin", carVin); sysCarQueryWrapper.eq("car_vin", carVin);
List<SysCar> sysCars = sysCarMapper.selectList(sysCarQueryWrapper); SysCar sysCar = sysCarMapper.selectOne(sysCarQueryWrapper);
return sysCars.isEmpty() ? null : sysCars.get(0); return sysCar;
} }
} }

View File

@ -8,6 +8,13 @@ import org.springframework.stereotype.Service;
import java.util.List; import java.util.List;
/**
*
* @author liuxinyue
* @package com.muyu.server.service.impl
* @name TemplateNeedServiceImpl
* @date 2024/9/22 14:36
*/
@Service @Service
public class TemplateNeedServiceImpl implements TemplateNeedService { public class TemplateNeedServiceImpl implements TemplateNeedService {

View File

@ -22,9 +22,9 @@ import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
/** /**
* @Authorliuxinyue *
* @author liuxinyue
* @Packagecom.template.service.impl * @Packagecom.template.service.impl
* @Projectcloud-server-c
* @nameTemplateServiceImp * @nameTemplateServiceImp
* @Date2024/9/20 12:12 * @Date2024/9/20 12:12
*/ */

View File

@ -7,7 +7,7 @@ nacos:
addr: 47.101.53.251:8848 addr: 47.101.53.251:8848
user-name: nacos user-name: nacos
password: nacos password: nacos
namespace: four namespace: yzl
# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all
# Spring # Spring
spring: spring: