Merge branch 'dev' of https://gitea.qinmian.online/six-vehicle/cloud-server into dev.vehicleGateway

# Conflicts:
#	pom.xml
dev.vehicleGateway
liuyibo 2024-09-30 19:06:12 +08:00
commit b9529234e9
252 changed files with 10850 additions and 690 deletions

View File

@ -1,7 +1,7 @@
package com.muyu.auth.controller;
import com.muyu.auth.form.LoginBody;
import com.muyu.auth.form.RegisterBody;
import com.muyu.common.system.domain.form.LoginBody;
import com.muyu.common.system.domain.form.RegisterBody;
import com.muyu.auth.service.SysLoginService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.JwtUtils;
@ -66,7 +66,7 @@ public class TokenController {
@PostMapping("register")
public Result<?> register (@RequestBody RegisterBody registerBody) {
// 用户注册
sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
sysLoginService.register(registerBody);
return Result.success();
}
}

View File

@ -1,10 +0,0 @@
package com.muyu.auth.form;
/**
*
*
* @author muyu
*/
public class RegisterBody extends LoginBody {
}

View File

@ -1,5 +1,6 @@
package com.muyu.auth.service;
import com.muyu.common.system.domain.form.RegisterBody;
import com.muyu.common.core.constant.CacheConstants;
import com.muyu.common.core.constant.Constants;
import com.muyu.common.core.constant.SecurityConstants;
@ -98,7 +99,22 @@ public class SysLoginService {
/**
*
*/
public void register (String username, String password) {
public void register (RegisterBody registerBody) {
//获取用户名密码
String username = registerBody.getUsername();
String password = registerBody.getPassword();
if(StringUtils.isEmpty(registerBody.getEntName())) {
throw new ServiceException("企业名称不能为空");
}
if(StringUtils.isEmpty(registerBody.getLeader())) {
throw new ServiceException("负责人不能为空");
}
if(StringUtils.isBlank(registerBody.getPhone())) {
throw new ServiceException("手机号不能为空");
}
if(StringUtils.isBlank(registerBody.getEmail())) {
throw new ServiceException("邮箱不能为空");
}
// 用户名或密码为空 错误
if (StringUtils.isAnyBlank(username, password)) {
throw new ServiceException("用户/密码必须填写");
@ -117,7 +133,7 @@ public class SysLoginService {
sysUser.setUserName(username);
sysUser.setNickName(username);
sysUser.setPassword(SecurityUtils.encryptPassword(password));
Result<?> registerResult = remoteUserService.registerUserInfo(sysUser, SecurityConstants.INNER);
Result<?> registerResult = remoteUserService.registerUserInfo(registerBody, SecurityConstants.INNER);
if (Result.FAIL == registerResult.getCode()) {
throw new ServiceException(registerResult.getMsg());

View File

@ -7,7 +7,7 @@ nacos:
addr: 106.15.136.7:8848
user-name: nacos
password: nacos
namespace: lyb
namespace: dev
# Spring
spring:
application:

View File

@ -0,0 +1,19 @@
package com.muyu.common.core.constant;
/**
* kafka
* @Author
* @Packagecom.muyu.common.core.constant
* @Projectcloud-server
* @nameKafkaConstants
* @Date2024/9/29 16:41
*/
public class KafkaConstants {
/**
* ()
*/
public final static String MESSAGE_PARSING = "MessageParsing";
}

View File

@ -0,0 +1,17 @@
package com.muyu.common.core.constant;
/**
* redis
* @Author
* @Packagecom.muyu.common.core.constant
* @Projectcloud-server
* @nameRedisConstants
* @Date2024/9/29 17:28
*/
public class RedisConstants {
/**
* redisKey()
*/
public final static String MESSAGE_TEMPLATE = "messageTemplate";
}

View File

@ -20,4 +20,8 @@ public class ServiceNameConstants {
* serviceid
*/
public static final String FILE_SERVICE = "cloud-file";
/**
* serviceid
*/
public static final String ENTERPRISE_SERVICE = "cloud-enterprise";
}

View File

@ -45,7 +45,7 @@ public class BaseEntity implements Serializable {
*/
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String createTime;
private Date createTime;
/**
*
@ -58,7 +58,7 @@ public class BaseEntity implements Serializable {
*/
@TableField(fill = FieldFill.UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private String updateTime;
private Date updateTime;
/**
*

View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="UTF-8"?>
<project 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">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>com.muyu</groupId>
<artifactId>cloud-common</artifactId>
<version>3.6.3</version>
</parent>
<artifactId>cloud-common-kafka</artifactId>
<description>
cloud-common-kafka
</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>
<!-- 项目公共核心模块 -->
<dependency>
<groupId>com.muyu</groupId>
<artifactId>cloud-common-core</artifactId>
</dependency>
<!-- kafka客户端 -->
<dependency>
<groupId>org.apache.kafka</groupId>
<artifactId>kafka-clients</artifactId>
</dependency>
</dependencies>
</project>

View File

@ -0,0 +1,102 @@
package com.muyu.common.kafka.config;
import com.muyu.common.core.text.StrFormatter;
import com.muyu.common.kafka.constant.KafkaConfigConstants;
import org.apache.kafka.clients.consumer.KafkaConsumer;
import org.apache.kafka.common.serialization.Deserializer;
import org.apache.kafka.common.serialization.StringDeserializer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.HashMap;
/**
* @Author: zi run
* @Date 2024/9/28 20:32
* @Description Kafka
*/
@Configuration
public class KafkaConsumerConfig {
/**
* IP
*/
@Value("${kafka.consumer.bootstrap-servers-ip}")
private String bootstrapServersIP;
/**
*
*/
@Value("${kafka.consumer.bootstrap-servers-port}")
private String bootstrapServersPort;
/**
*
*/
@Value("${kafka.consumer.enable-auto-commit}")
private Boolean enableAutoCommit;
/**
*
*/
@Value("${kafka.consumer.auto-commit-interval}")
private Integer autoCommitInterval;
/**
*
*/
@Value("${kafka.consumer.auto-offset-reset}")
private String autoOffsetReset;
/**
*
*/
@Value("${kafka.consumer.fetch-max-wait}")
private Integer fetchMaxWait;
/**
*
*/
@Value("${kafka.consumer.fetch-min-size}")
private Integer fetchMinSize;
/**
*
*/
@Value("${kafka.consumer.heartbeat-interval}")
private Integer heartbeatInterval;
/**
* poll
*/
@Value("${kafka.consumer.max-poll-records}")
private Integer maxPollRecords;
/**
*
*/
@Value("${kafka.consumer.group-id}")
private String groupId;
/**
* Kafka
* @return Kafka
*/
@Bean
public KafkaConsumer<String, String> kafkaConsumer() {
HashMap<String, Object> configs = new HashMap<>();
configs.put(KafkaConfigConstants.BOOTSTRAP_SERVERS,
StrFormatter.format("{}:{}", bootstrapServersIP, bootstrapServersPort));
configs.put(KafkaConfigConstants.ENABLE_AUTO_COMMIT, enableAutoCommit);
configs.put(KafkaConfigConstants.AUTO_COMMIT_INTERVAL, autoCommitInterval);
configs.put(KafkaConfigConstants.AUTO_OFFSET_RESET, autoOffsetReset);
configs.put(KafkaConfigConstants.FETCH_MAX_WAIT, fetchMaxWait);
configs.put(KafkaConfigConstants.FETCH_MIN_SIZE, fetchMinSize);
configs.put(KafkaConfigConstants.HEARTBEAT_INTERVAL, heartbeatInterval);
configs.put(KafkaConfigConstants.MAX_POLL_RECORDS, maxPollRecords);
configs.put(KafkaConfigConstants.GROUP_ID, groupId);
Deserializer<String> keyDeserializer = new StringDeserializer();
Deserializer<String> valueDeserializer = new StringDeserializer();
return new KafkaConsumer<>(configs, keyDeserializer, valueDeserializer);
}
}

View File

@ -0,0 +1,74 @@
package com.muyu.common.kafka.config;
import com.muyu.common.core.text.StrFormatter;
import com.muyu.common.kafka.constant.KafkaConfigConstants;
import org.apache.kafka.clients.producer.KafkaProducer;
import org.apache.kafka.common.serialization.Serializer;
import org.apache.kafka.common.serialization.StringSerializer;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import java.util.HashMap;
/**
* @Author: zi run
* @Date 2024/9/28 16:35
* @Description Kafka
*/
@Configuration
public class KafkaProducerConfig {
/**
* IP
*/
@Value("${kafka.producer.bootstrap-servers-ip}")
private String bootstrapServersIP;
/**
*
*/
@Value("${kafka.producer.bootstrap-servers-port}")
private String bootstrapServersPort;
/**
*
*/
@Value("${kafka.producer.retries}")
private Integer retries;
/**
*
*/
@Value("${kafka.producer.batch-size}")
private Integer batchSize;
/**
*
*/
@Value("${kafka.producer.buffer-memory}")
private Integer bufferMemory;
/**
*
*/
@Value("${kafka.producer.acks}")
private String acks;
/**
* Kafka
* @return kafka
*/
@Bean
public KafkaProducer<String, String> kafkaProducer() {
HashMap<String, Object> configs = new HashMap<>();
configs.put(KafkaConfigConstants.BOOTSTRAP_SERVERS,
StrFormatter.format("{}:{}", bootstrapServersIP, bootstrapServersPort));
configs.put(KafkaConfigConstants.RETRIES, retries);
configs.put(KafkaConfigConstants.BATCH_SIZE, batchSize);
configs.put(KafkaConfigConstants.BUFFER_MEMORY, bufferMemory);
configs.put(KafkaConfigConstants.ACKS, acks);
Serializer<String> keySerializer = new StringSerializer();
Serializer<String> valueSerializer = new StringSerializer();
return new KafkaProducer<>(configs, keySerializer, valueSerializer);
}
}

View File

@ -0,0 +1,74 @@
package com.muyu.common.kafka.constant;
/**
* @Author: zi run
* @Date 2024/9/28 20:07
* @Description Kafka
*/
public class KafkaConfigConstants {
/**
* ip+
*/
public static final String BOOTSTRAP_SERVERS = "bootstrap.servers";
/**
*
*/
public static final String RETRIES = "retries";
/**
*
*/
public static final String BATCH_SIZE = "batch.size";
/**
*
*/
public static final String BUFFER_MEMORY = "buffer-memory";
/**
*
*/
public static final String ACKS = "acks";
/**
*
*/
public static final String ENABLE_AUTO_COMMIT = "enable.auto.commit";
/**
*
*/
public static final String AUTO_COMMIT_INTERVAL = "auto.commit.interval";
/**
*
*/
public static final String AUTO_OFFSET_RESET = "auto.offset.reset";
/**
*
*/
public static final String FETCH_MAX_WAIT = "fetch.max.wait";
/**
*
*/
public static final String FETCH_MIN_SIZE = "fetch.min.size";
/**
*
*/
public static final String HEARTBEAT_INTERVAL = "heartbeat-interval";
/**
* poll
*/
public static final String MAX_POLL_RECORDS = "max.poll.records";
/**
*
*/
public static final String GROUP_ID = "group.id";
}

View File

@ -0,0 +1,2 @@
com.muyu.common.kafka.config.KafkaProducerConfig
com.muyu.common.kafka.config.KafkaConsumerConfig

View File

@ -64,6 +64,11 @@ public class SysDept extends BaseEntity {
*/
private String email;
/**
* ID
*/
private Long entId;
/**
* :0,1
*/

View File

@ -11,6 +11,7 @@ import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
*
* @Author: zi run
* @Date 2024/9/25 22:38
* @Description
@ -19,7 +20,7 @@ import lombok.experimental.SuperBuilder;
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "sys_ent")
@TableName(value = "sys_ent", autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
public class SysEnt extends BaseEntity {
@ -40,9 +41,9 @@ public class SysEnt extends BaseEntity {
private String leader;
/**
*
*
*/
private String phoneNumber;
private String phone;
/**
*
@ -53,4 +54,8 @@ public class SysEnt extends BaseEntity {
*
*/
private String entCode;
/**
*
*/
private Integer entStatus;
}

View File

@ -1,4 +1,4 @@
package com.muyu.auth.form;
package com.muyu.common.system.domain.form;
/**
*

View File

@ -0,0 +1,36 @@
package com.muyu.common.system.domain.form;
import lombok.*;
/**
*
*
* @author muyu
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
public class RegisterBody extends LoginBody {
/**
*
*/
private String entName;
/**
*
*/
private String leader;
/**
*
*/
private String phone;
/**
*
*/
private String email;
}

View File

@ -4,6 +4,7 @@ import com.muyu.common.core.constant.SecurityConstants;
import com.muyu.common.core.constant.ServiceNameConstants;
import com.muyu.common.core.domain.Result;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.form.RegisterBody;
import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory;
import com.muyu.common.system.domain.LoginUser;
import org.springframework.cloud.openfeign.FeignClient;
@ -38,7 +39,7 @@ public interface RemoteUserService {
* @return
*/
@PostMapping("/user/register")
public Result<Boolean> registerUserInfo (@RequestBody SysUser sysUser, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
public Result<Boolean> registerUserInfo (@RequestBody RegisterBody registerBody, @RequestHeader(SecurityConstants.FROM_SOURCE) String source);
/**
*

View File

@ -1,6 +1,7 @@
package com.muyu.common.system.remote.factory;
import com.muyu.common.core.domain.Result;
import com.muyu.common.system.domain.form.RegisterBody;
import com.muyu.common.system.remote.RemoteUserService;
import com.muyu.common.system.domain.SysUser;
import com.muyu.common.system.domain.LoginUser;
@ -30,7 +31,7 @@ public class RemoteUserFallbackFactory implements FallbackFactory<RemoteUserServ
}
@Override
public Result<Boolean> registerUserInfo (SysUser sysUser, String source) {
public Result<Boolean> registerUserInfo (RegisterBody registerBody, String source) {
return Result.error("注册用户失败:" + throwable.getMessage());
}

View File

@ -21,6 +21,7 @@
<module>cloud-common-system</module>
<module>cloud-common-xxl</module>
<module>cloud-common-rabbit</module>
<module>cloud-common-kafka</module>
</modules>
<artifactId>cloud-common</artifactId>

View File

@ -7,7 +7,7 @@ nacos:
addr: 106.15.136.7:8848
user-name: nacos
password: nacos
namespace: lyb
namespace: dev
# Spring
spring:

View File

@ -24,10 +24,22 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-common-core</artifactId>
</dependency>
<!--swagger3maven依赖-->
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations-jakarta</artifactId>
</dependency>
<!--mqttv3依赖-->
<dependency>
<groupId>org.eclipse.paho</groupId>
<artifactId>org.eclipse.paho.client.mqttv3</artifactId>
<version>1.2.2</version>
</dependency>
<!--mqtt依赖-->
<dependency>
<groupId>org.springframework.integration</groupId>
<artifactId>spring-integration-mqtt</artifactId>
<version>6.2.5</version>
</dependency>
</dependencies>
</project>

View File

@ -3,16 +3,24 @@ package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* --
* @ClassName CarCompany
* @Description
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@TableName(value = "t_company")
@TableName(value = "car_company")
@Tag(name = "企业表")
public class CarCompany {
/**
*

View File

@ -0,0 +1,48 @@
package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* --
* @ClassName CarConfig
* @Description
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Tag(name = "车辆配置表")
@TableName(value = "car_config")
public class CarConfig {
/**
*
*/
@TableId(value = "config_id",type = IdType.AUTO)
private Long configId;
/**
* 1. 2. 3.
*/
private String configName;
/**
*
*/
private String energyType;
/**
* 1. 2.
*/
private Integer gearType;
/**
* id
*/
private Integer companyId;
}

View File

@ -5,19 +5,27 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* --
* @ClassName CarManage
* @Description
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "车辆表")
@Builder
@TableName(value = "t_car")
public class SysCar {
@TableName(value = "car_manage",autoResultMap = true)
public class CarManage {
/**
*
*/
@ -30,7 +38,7 @@ public class SysCar {
/**
*
*/
private String carCoed;
private String carCode;
/**
* 1. 2.绿 3. 4. 5.
*/
@ -40,21 +48,13 @@ public class SysCar {
*/
private String carVin;
/**
*
*
*/
private Long userId;
private long userId;
/**
*
*/
private Long typeId;
/** 车辆品牌 */
@Excel(name = "车辆品牌")
private String carBrand;
/** 车辆型号 */
@Excel(name = "车辆型号")
private String carModel;
private long configId;
/**
*
*/
@ -73,7 +73,7 @@ public class SysCar {
/**
* 线 1. 2. 3.
*/
private Integer carStatus;
private Integer carStayus;
/**
*
*/
@ -83,16 +83,32 @@ public class SysCar {
*
*/
private Integer carGears;
/**
*
*/
private String carModel;
/**
*
*/
private String cardDrand;
/** 最后一次连线时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后一次连线时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "最后一次连线时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date carLastJoinTime;
/** 最后一次离线时间 */
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "最后一次离线时间", width = 30, dateFormat = "yyyy-MM-dd")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@Excel(name = "最后一次离线时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
private Date carLastOfflineTime;
/**
* id
*/
private Long companyId;
/**
* 1.轿 2. 3. 4. 5. 6.
*/
private Integer carType;
}

View File

@ -1,5 +1,7 @@
package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
@ -8,22 +10,24 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* --
* @ClassName CarMessage
* @Description
* @Author YiBo.Liu
* @Date 2024/9/22 22:24
* @Description
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name = "报文表")
@TableName(value = "t_car_message")
@TableName(value = "car_message")
public class CarMessage {
/**
*
*/
@TableId(value = "message_id" ,type = IdType.AUTO)
private Long messageId;
/**
*

View File

@ -3,16 +3,24 @@ package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* --
* @ClassName CarMessageType
* @Description
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@TableName(value = "t_message_type")
@TableName(value = "car_message_type")
@Tag(name = "报文类型表")
public class CarMessageType {
/**
*

View File

@ -3,16 +3,24 @@ package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* --
* @ClassName CarTemplate
* @Description
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@TableName(value = "t_template")
@TableName(value = "car_template")
@Tag(name = "报文模版表")
public class CarTemplate {
/**

View File

@ -1,5 +1,7 @@
package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
@ -8,22 +10,24 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
* --
* @ClassName CarType
* @Description
* @Author YiBo.Liu
* @Date 2024/9/22 16:53
* @Description
* @author YiBo.Liu
* @Date 2024/9/28 16:52
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name = "车辆类型表")
@TableName(value = "t_car_type")
@TableName(value = "car_type")
public class CarType {
/**
* id
*/
@TableId(value = "car_type_id",type = IdType.AUTO)
private Integer carTypeId;
/**

View File

@ -1,24 +1,32 @@
package com.muyu.enterprise.domain;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
*
* @Author: chenruijia
* @Date 2024/9/28 12.23
* @Description FaultLog:
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "fault_log",autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@Tag(name = "故障日志")
public class FaultLog extends BaseEntity {
/**
* ID

View File

@ -3,8 +3,8 @@ package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@ -13,11 +13,18 @@ import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
/**
*
* @Author: chenruijia
* @Date 2024/9/28 12.23
* @Description FaultMessage:
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "fault_message",autoResultMap = true)
@Tag(name = "站内信")
public class FaultMessage {
/**
* ID

View File

@ -1,34 +0,0 @@
package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "fault_notify",autoResultMap = true)
public class FaultNotify {
/**
* ID
*/
@TableId(value = "fault_notify_id", type= IdType.AUTO)
@Schema(defaultValue = "ID",type = "Long",description = "ID")
private Long faultNotifyId;
/**
*
*/
@Schema(defaultValue = "通知方",type = "String",description = "通知方")
private String faultNotifyParty;
/**
*
*/
@Schema(defaultValue = "联系方式",type = "String",description = "联系方式")
private String faultNotifyManner;
}

View File

@ -5,17 +5,23 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
*
* @Author: chenruijia
* @Date 2024/9/28 12.23
* @Description FaultSeverity:
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "fault_severity",autoResultMap = true)
@Tag(name = "故障等级")
public class FaultSeverity extends BaseEntity {
/**
* ID

View File

@ -3,18 +3,24 @@ package com.muyu.enterprise.domain;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
*
* @Author: chenruijia
* @Date 2024/9/28 12.23
* @Description FaultType:
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "fault_type",autoResultMap = true)
@Tag(name = "故障类型")
public class FaultType{
/**
* ID

View File

@ -5,15 +5,22 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.*;
import lombok.experimental.SuperBuilder;
/**
*
* @Author: chenruijia
* @Date 2024/9/28 12.23
* @Description FaultrRule:
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "fault_rule",autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@Tag(name = "故障规则")
public class FaultrRule extends BaseEntity {
/**
* ID

View File

@ -5,15 +5,26 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotNull;
import lombok.*;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
*
* @Author: chenruijia
* @Date 2024/9/28 12.23
* @Description SysCarFault:
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "sys_car_fault", autoResultMap = true)
@EqualsAndHashCode(callSuper = true)
@Tag(name = "故障表")
public class SysCarFault extends BaseEntity {
/**
*

View File

@ -7,6 +7,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @ClassName Template
* @Description
* @Author YiBo.Liu

View File

@ -9,6 +9,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author: zi run
* @Date 2024/9/21 0:07
* @Description

View File

@ -0,0 +1,59 @@
package com.muyu.enterprise.domain.car;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.enterprise.domain.req.car.MessageTemplateAddReq;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
*
* @Author
* @Packagecom.muyu.car.domain
* @Projectcloud-server
* @nameMessageTemplate
* @Date2024/9/26 20:27
* @Description:
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "message_template", autoResultMap = true)
public class MessageTemplate extends BaseEntity
{
/**
*
*/
@TableId(value = "message_template_id", type = IdType.AUTO)
private String messageTemplateId;
/**
*
*/
private String messageTemplateName;
/**
*
*/
private String messageTemplateDescribe;
/**
*
* @param messageTemplateAddReq
* @return
*/
public static MessageTemplate addBuild(MessageTemplateAddReq messageTemplateAddReq){
return MessageTemplate.builder()
.messageTemplateName(messageTemplateAddReq.getMessageTemplateName())
.messageTemplateDescribe(messageTemplateAddReq.getMessageTemplateDescribe())
.build();
}
}

View File

@ -0,0 +1,83 @@
package com.muyu.enterprise.domain.car;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.enterprise.domain.req.car.MessageValueAddReq;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
* @Author
* @Packagecom.muyu.car.domain
* @Projectcloud-server
* @nameMessageValue
* @Date2024/9/26 20:29
*
* message_type
*
*/
/**
*
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "message_value", autoResultMap = true)
public class MessageValue extends BaseEntity
{
/**
*
*/
@TableId(value = "message_id", type = IdType.AUTO)
private Long messageId;
/**
*
*/
private Long templateId;
/**
*
*/
private String messageType;
/**
*
*/
private String messageCode;
/**
*
*/
private String messageLabel;
/**
*
*/
private Integer messageStartIndex;
/**
*
*/
private Integer messageEndIndex;
public static MessageValue addBuild(MessageValueAddReq messageValueAddReq){
return MessageValue.builder()
.templateId(messageValueAddReq.getTemplateId())
.messageType(messageValueAddReq.getMessageType())
.messageCode(messageValueAddReq.getMessageCode())
.messageLabel(messageValueAddReq.getMessageLabel())
.messageStartIndex(messageValueAddReq.getMessageStartIndex())
.messageEndIndex(messageValueAddReq.getMessageEndIndex())
.build();
}
}

View File

@ -0,0 +1,145 @@
package com.muyu.enterprise.domain.car;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.annotation.Excel.ColumnType;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.enterprise.domain.req.car.VehicleAddReq;
import com.muyu.enterprise.domain.req.car.VehicleUpdReq;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.Date;
import java.util.function.Supplier;
/**
*
* @Author
* @Packagecom.muyu.car.domain
* @Projectcloud-server
* @nameVehicle
* @Date2024/9/26 20:30
* @Description:
*/
@Data
@SuperBuilder
@NoArgsConstructor
@AllArgsConstructor
@EqualsAndHashCode(callSuper = true)
@TableName(value = "vehicle", autoResultMap = true)
public class Vehicle extends BaseEntity
{
/**
*
*/
@Excel(name = "车辆主键", cellType = ColumnType.NUMERIC)
@TableId(value = "vehicle_id", type = IdType.AUTO)
private Long vehicleId;
/**
*
*/
@Excel(name = "车牌号")
private String licenceNumber;
/**
*
*/
@Excel(name = "车辆颜色")
private String vehicleColor;
/**
* VIN
*/
@Excel(name = "车辆VIN")
private String vehicleVin;
/**
*
*/
@Excel(name = "车辆类型外键")
private Long vehicleTypeId;
/**
*
*/
@Excel(name = "车辆品牌")
private String vehicleBrand;
/**
*
*/
@Excel(name = "车辆型号")
private String vehicleModel;
/**
*
*/
@Excel(name = "车辆行驶证")
private String vehicleLicense;
/**
*
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date vehicleLicenseDueDate;
/**
*
*/
@Excel(name = "车辆状态")
private String vehicleStatus;
/**
*
*/
private Long companyId;
/**
*
*/
private Integer fenceGroupId;
public static Vehicle addBuild(VehicleAddReq vehicleAddReq){
return Vehicle.builder()
.licenceNumber(vehicleAddReq.getLicenceNumber())
.vehicleColor(vehicleAddReq.getVehicleColor())
.vehicleVin(vehicleAddReq.getVehicleVin())
.vehicleTypeId(vehicleAddReq.getVehicleTypeId())
.vehicleBrand(vehicleAddReq.getVehicleBrand())
.vehicleModel(vehicleAddReq.getVehicleModel())
.vehicleLicense(vehicleAddReq.getVehicleLicense())
.vehicleLicenseDueDate(vehicleAddReq.getVehicleLicenseDueDate())
.vehicleStatus(vehicleAddReq.getVehicleStatus())
.companyId(vehicleAddReq.getCompanyId())
.fenceGroupId(vehicleAddReq.getFenceGroupId())
.build();
}
public static Vehicle updBuild(VehicleUpdReq vehicleUpdReq, Supplier<Long> idSupplier){
return Vehicle.builder()
.vehicleId(idSupplier.get())
.licenceNumber(vehicleUpdReq.getLicenceNumber())
.vehicleColor(vehicleUpdReq.getVehicleColor())
.vehicleVin(vehicleUpdReq.getVehicleVin())
.vehicleTypeId(vehicleUpdReq.getVehicleTypeId())
.vehicleBrand(vehicleUpdReq.getVehicleBrand())
.vehicleModel(vehicleUpdReq.getVehicleModel())
.vehicleLicense(vehicleUpdReq.getVehicleLicense())
.vehicleLicenseDueDate(vehicleUpdReq.getVehicleLicenseDueDate())
.vehicleStatus(vehicleUpdReq.getVehicleStatus())
.companyId(vehicleUpdReq.getCompanyId())
.fenceGroupId(vehicleUpdReq.getFenceGroupId())
.build();
}
}

View File

@ -0,0 +1,50 @@
package com.muyu.enterprise.domain.car;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel;
import com.muyu.common.core.annotation.Excel.ColumnType;
import com.muyu.common.core.web.domain.BaseEntity;
import lombok.*;
import lombok.experimental.SuperBuilder;
import java.util.Date;
/**
*
* @Author
* @Packagecom.muyu.car.domain
* @Projectcloud-server
* @nameVehicleType
* @Date2024/9/26 20:31
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@TableName(value = "vehicle_type", autoResultMap = true)
public class VehicleType
{
/**
*
*/
@TableId(value = "vehicle_type_id", type = IdType.AUTO)
private Long vehicleTypeId;
/**
*
*/
private String vehicleTypeName;
/**
*
*/
private Long messageTemplateId;
}

View File

@ -0,0 +1,127 @@
package com.muyu.enterprise.domain.dateBase;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.enterprise.domain.req.ElectroicFenceAddReq;
import com.muyu.enterprise.domain.req.ElectroicFenceUpdReq;
import com.muyu.enterprise.domain.resp.ElectronicFenceResp;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.function.Supplier;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameElectronicFence
* @Date2024/9/17 16:34
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@EqualsAndHashCode(callSuper = true)
@SuperBuilder
@TableName(value = "electronic_fence",autoResultMap = true)
public class ElectronicFence extends BaseEntity {
/**
* id
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
*
*/
private String name;
/**
*
*/
private String fenceType;
/**
*
*/
private String longitudeLatitude;
/**
*
*/
private String status;
// /**
// * 电子围栏的开始时间
// */
//
// private Date startTime;
// /**
// * 电子围栏的结束时间
// */
// private Date endTime;
/**
*
*/
private String fenceDesc;
public static ElectronicFenceResp bullerResp(ElectronicFence electronicFence){
return ElectronicFenceResp.builder()
.id(electronicFence.getId())
.name(electronicFence.getName())
.status(electronicFence.getStatus())
.fenceType(electronicFence.getFenceType())
.longitudeLatitude(electronicFence.getLongitudeLatitude())
.desc(electronicFence.getFenceDesc())
.build();
}
public static ElectronicFence buildElectroicAdd(ElectroicFenceAddReq electroicFenceAddReq){
return ElectronicFence.builder()
.name(electroicFenceAddReq.getName())
.fenceDesc(electroicFenceAddReq.getFenceDesc())
.status(electroicFenceAddReq.getStatus())
.longitudeLatitude(electroicFenceAddReq.getLongitudeLatitude())
.fenceType(electroicFenceAddReq.getFenceType())
.build();
}
public static ElectronicFence buildByElectronicUpd(ElectroicFenceUpdReq electroicFenceUpdReq, Supplier<Long> longSupplier){
return ElectronicFence.builder()
.id(longSupplier.get())
.name(electroicFenceUpdReq.getName())
.status(electroicFenceUpdReq.getStatus())
.fenceDesc(electroicFenceUpdReq.getFenceDesc())
.longitudeLatitude(electroicFenceUpdReq.getLongitudeLatitude())
.build();
}
}

View File

@ -0,0 +1,118 @@
package com.muyu.enterprise.domain.dateBase;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.muyu.common.core.web.domain.BaseEntity;
import com.muyu.enterprise.domain.req.ElectronicFenceGroupAddReq;
import com.muyu.enterprise.domain.req.ElectronicFenceGroupUpdReq;
import com.muyu.enterprise.domain.resp.ElectronicFenceGroupResp;
import com.muyu.enterprise.domain.resp.GroupFenceListresp;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
import java.util.function.Supplier;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameElectronicFenceGroup
* @Date2024/9/18 11:14
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@SuperBuilder
@TableName(value = "electronic_fence_group",autoResultMap = true)
public class ElectronicFenceGroup extends BaseEntity {
/**
*
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
*
*/
private Integer priority;
/**
*
*/
private String groupName;
/**
*
*/
private String groupType;
/**
*
*/
private String status;
public static GroupFenceListresp buildGroupFence(ElectronicFenceGroup electronicFenceGroup){
return GroupFenceListresp.builder()
.id(electronicFenceGroup.getId())
.groupName(electronicFenceGroup.groupName)
.priority(electronicFenceGroup.getPriority())
.status(electronicFenceGroup.getStatus())
.groupType(electronicFenceGroup.groupType)
.build();
}
public static ElectronicFenceGroupResp buildElectronicFenceGroupResp (ElectronicFenceGroup electronicFenceGroup){
return ElectronicFenceGroupResp.builder()
.id(electronicFenceGroup.getId())
.groupName(electronicFenceGroup.groupName)
.priority(electronicFenceGroup.getPriority())
.status(electronicFenceGroup.getStatus())
.groupType(electronicFenceGroup.groupType)
.build();
}
public static ElectronicFenceGroup buildByAdd(ElectronicFenceGroupAddReq addReq){
return ElectronicFenceGroup.builder()
.groupName(addReq.getGroupName())
.groupType(addReq.getGroupType())
.status(addReq.getStatus())
.priority(addReq.getPriority())
.build();
}
public static ElectronicFenceGroup buildByUpd(ElectronicFenceGroupUpdReq updReq, Supplier<Long> ids){
return ElectronicFenceGroup.builder()
.id(ids.get())
.groupName(updReq.getGroupName())
.groupType(updReq.getGroupType())
.status(updReq.getStatus())
.priority(updReq.getPriority())
.build();
}
}

View File

@ -0,0 +1,36 @@
package com.muyu.enterprise.domain.dateBase;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameFenceGroupMid
* @Date2024/9/19 21:01
*/
/**
*
*/
@Tag(name = "围栏组连接表")
@Data
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "fence_group_mid",autoResultMap = true)
public class FenceGroupMid {
/**
*
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
private Long groupId;
private Long fenceId;
}

View File

@ -0,0 +1,78 @@
package com.muyu.enterprise.domain.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameElectroicAdd
* @Date2024/9/17 20:53
*/
/**
*
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ElectroicFenceAddReq {
/**
* id
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
*
*/
private String name;
/**
*
*/
private String fenceType;
/**
*
*/
private String longitudeLatitude;
/**
*
*/
private String status;
/**
*
*/
private String fenceDesc;
/**
*
*/
private Date startTime;
/**
*
*/
private Date endTime;
}

View File

@ -0,0 +1,68 @@
package com.muyu.enterprise.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameElectroicFenceReq
* @Date2024/9/17 20:04
*/
/**
*
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ElectroicFenceListReq {
/**
*
*/
private String name;
/**
*
*/
private String fenceType;
/**
*
*/
private String longitudeLatitude;
/**
*
*/
private String status;
/**
*
*/
private Date startTime;
/**
*
*/
private Date endTime;
}

View File

@ -0,0 +1,73 @@
package com.muyu.enterprise.domain.req;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameElectroicFenceUpdReq
* @Date2024/9/17 21:03
*/
/**
*
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ElectroicFenceUpdReq {
/**
* id
*/
private Long id;
/**
*
*/
private String name;
/**
*
*/
private String fenceType;
/**
*
*/
private String longitudeLatitude;
/**
*
*/
private String status;
/**
*
*/
private String fenceDesc;
}

View File

@ -0,0 +1,64 @@
package com.muyu.enterprise.domain.req;
import com.muyu.enterprise.domain.resp.ElectronicFenceResp;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameElectronicFenceGroupAddReq
* @Date2024/9/20 19:14
*/
/**
*
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ElectronicFenceGroupAddReq {
/**
*
*/
private Integer priority;
/**
*
*/
private String groupName;
/**
*
*/
private String groupType;
/**
*
*/
private String status;
/**
*
*/
List<ElectronicFenceResp> electronicFenceRespList;
}

View File

@ -0,0 +1,59 @@
package com.muyu.enterprise.domain.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameElectronicFenceGroupListReq
* @Date2024/9/20 16:06
*/
/**
*
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ElectronicFenceGroupListReq {
/**
*
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
*
*/
private Integer priority;
/**
*
*/
private String groupName;
/**
*
*/
private String groupType;
/**
*
*/
private String status;
}

View File

@ -0,0 +1,69 @@
package com.muyu.enterprise.domain.req;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.muyu.enterprise.domain.resp.ElectronicFenceResp;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameElectronicFenceGroupAddReq
* @Date2024/9/20 19:14
*/
/**
*
*/
@Data
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class ElectronicFenceGroupUpdReq {
/**
*
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
*
*/
private Integer priority;
/**
*
*/
private String groupName;
/**
*
*/
private String groupType;
/**
*
*/
private String status;
/**
*
*/
List<ElectronicFenceResp> electronicFenceRespList;
}

View File

@ -0,0 +1,39 @@
package com.muyu.enterprise.domain.req;
import com.muyu.enterprise.domain.resp.ElectronicFenceResp;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameFenceAndGroupBoundReq
* @Date2024/9/21 9:05
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Tag(name = "用于绑定围栏和围栏组的请求")
public class FenceAndGroupBoundReq {
/**
*
*/
private Long id;
/**
*
*/
private List<ElectronicFenceResp> electronicFenceRespList;
}

View File

@ -0,0 +1,24 @@
package com.muyu.enterprise.domain.req;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameFenceWay
* @Date2024/9/20 9:27
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class FenceWayReq {
private Long id;
private String longitudeLatitude;
}

View File

@ -0,0 +1,35 @@
package com.muyu.enterprise.domain.req.car;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author
* @Packagecom.muyu.car.domain.req
* @Projectcloud-server
* @nameMessageTemplateAddReq
* @Date2024/9/26 20:34
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "新增报文模版请求参数", description = "根据入参进行报文模版的添加")
public class MessageTemplateAddReq
{
/**
*
*/
private String messageTemplateName;
/**
*
*/
private String messageTemplateDescribe;
}

View File

@ -0,0 +1,55 @@
package com.muyu.enterprise.domain.req.car;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author
* @Packagecom.muyu.car.domain.req
* @Projectcloud-server
* @nameMessageValueAddReq
* @Date2024/9/26 20:35
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "新增报文数据请求参数", description = "根据入参进行报文数据的添加")
public class MessageValueAddReq
{
/**
*
*/
private Long templateId;
/**
*
*/
private String messageType;
/**
*
*/
private String messageCode;
/**
*
*/
private String messageLabel;
/**
*
*/
private Integer messageStartIndex;
/**
*
*/
private Integer messageEndIndex;
}

View File

@ -0,0 +1,37 @@
package com.muyu.enterprise.domain.req.car;
import com.muyu.common.core.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author
* @Packagecom.muyu.car.domain.req
* @Projectcloud-server
* @nameMessageValueReq
* @Date2024/9/26 20:39
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "报文数据请求参数", description = "根据入参进行报文数据的查询")
public class MessageValueReq
{
/** 报文模版主键 */
@Schema(title = "报文模版主键", type = "Long", defaultValue = "1", description = "报文模版主键")
private Long messageTemplateId;
/** 报文分类 */
@Schema(title = "报文分类", type = "String", defaultValue = "basics", description = "报文分类")
private String messageType;
}

View File

@ -0,0 +1,101 @@
package com.muyu.enterprise.domain.req.car;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
*
* @Author
* @Packagecom.muyu.car.domain.req
* @Projectcloud-server
* @nameVehicleAddReq
* @Date2024/9/26 20:39
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "录入车辆请求参数", description = "根据入参进行车辆管理的添加")
public class VehicleAddReq
{
/**
*
*/
@NotEmpty(message = "车牌号不可为空")
@Schema(title = "车牌号", type = "String", defaultValue = "冀A93827", description = "车牌号")
private String licenceNumber;
/**
*
*/
@Schema(title = "车辆颜色", type = "String", defaultValue = "RED", description = "车牌颜色")
private String vehicleColor;
/**
* VIN
*/
@Schema(title = "车辆VIN", type = "String", defaultValue = "LDC913L2240606423", description = "车辆VIN")
private String vehicleVin;
/**
*
*/
@Schema(title = "车辆类型", type = "BigInt", defaultValue = "1", description = "车辆类型")
private Long vehicleTypeId;
/**
*
*/
@Schema(title = "车辆品牌", type = "String", defaultValue = "1", description = "车辆品牌")
private String vehicleBrand;
/**
*
*/
@Schema(title = "车辆型号", type = "String", defaultValue = "1", description = "车辆型号")
private String vehicleModel;
/**
*
*/
@Schema(title = "车辆行驶证", type = "String", defaultValue = "111111", description = "车辆行驶证")
private String vehicleLicense;
/**
*
*/
@Schema(title = "行驶证到期日期", type = "Date", defaultValue = "2024-01-01 00:00:00", description = "行驶证到期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date vehicleLicenseDueDate;
/**
*
*/
@Schema(title = "车辆状态", type = "String", defaultValue = "OFFLINE", description = "车辆状态")
private String vehicleStatus;
/**
*
*/
@Schema(title = "车辆所属企业外键", type = "BigInt", defaultValue = "1", description = "车辆所属企业外键")
private Long companyId;
/**
*
*/
@Schema(title = "电子围栏外键", type = "Integer", defaultValue = "1", description = "电子围栏外键")
private Integer fenceGroupId;
}

View File

@ -0,0 +1,45 @@
package com.muyu.enterprise.domain.req.car;
//import com.muyu.common.core.domain.req.PageReq;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author
* @Packagecom.muyu.car.domain.req
* @Projectcloud-server
* @nameVehicleManageReq
* @Date2024/9/26 20:41
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "车辆管理查询条件", description = "负责车辆查询条件的实体类")
public class VehicleManageReq
{
/**
*
*/
@Schema(type = "String", defaultValue = "冀A93827", description = "车牌号")
private String licenceNumber;
/**
* VIN
*/
@Schema(type = "String", defaultValue = "LDC913L2240606423", description = "车辆VIN")
private String vehicleVin;
/**
*
*/
@Schema(type = "String", defaultValue = "", description = "车辆状态")
private String vehicleStatus;
}

View File

@ -0,0 +1,100 @@
package com.muyu.enterprise.domain.req.car;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.muyu.common.core.annotation.Excel;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.constraints.NotEmpty;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
*
* @Author
* @Packagecom.muyu.car.domain.req
* @Projectcloud-server
* @nameVehicleUpdReq
* @Date2024/9/26 20:57
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "修改车辆信息参数", description = "根据入参信息修改车辆信息")
public class VehicleUpdReq
{
/**
*
*/
@NotEmpty(message = "车牌号不可为空")
@Schema(title = "车牌号", type = "String", defaultValue = "冀A93827", description = "车牌号")
private String licenceNumber;
/**
*
*/
@Schema(title = "车牌颜色", type = "String", defaultValue = "RED", description = "车牌颜色")
private String vehicleColor;
/**
* VIN
*/
@Schema(title = "车辆VIN", type = "String", defaultValue = "LDC913L2240606423", description = "车辆VIN")
private String vehicleVin;
/**
*
*/
@Schema(title = "车辆类型", type = "BigInt", defaultValue = "1", description = "车辆类型")
private Long vehicleTypeId;
/**
*
*/
@Schema(title = "车辆品牌", type = "String", defaultValue = "1", description = "车辆品牌")
private String vehicleBrand;
/**
*
*/
@Schema(title = "车辆型号", type = "String", defaultValue = "1", description = "车辆型号")
private String vehicleModel;
/**
*
*/
@Schema(title = "车辆行驶证", type = "String", defaultValue = "111111", description = "车辆行驶证")
private String vehicleLicense;
/**
*
*/
@Schema(title = "行驶证到期日期", type = "Date", defaultValue = "2024-01-01 00:00:00", description = "行驶证到期日期")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date vehicleLicenseDueDate;
/**
*
*/
@Schema(title = "车辆状态", type = "String", defaultValue = "OFFLINE", description = "车辆状态")
private String vehicleStatus;
/**
*
*/
@Schema(title = "车辆所属企业外键", type = "BigInt", defaultValue = "1", description = "车辆所属企业外键")
private Long companyId;
/**
*
*/
@Schema(title = "电子围栏外键", type = "Integer", defaultValue = "1", description = "电子围栏外键")
private Integer fenceGroupId;
}

View File

@ -0,0 +1,64 @@
package com.muyu.enterprise.domain.resp;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
/**
* @Author
* @Packagecom.muyu.fence.domain.resp
* @Projectcloud-server
* @nameElectronicFenceGroupResp
* @Date2024/9/22 10:22
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name = "回显围栏组及绑定的电子围栏")
public class ElectronicFenceGroupResp {
/**
*
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
*
*/
private Integer priority;
/**
*
*/
private String groupName;
/**
*
*/
private String groupType;
/**
*
*/
private String status;
/**
*
*/
List<ElectronicFenceResp> electronicFenceRespList;
}

View File

@ -0,0 +1,71 @@
package com.muyu.enterprise.domain.resp;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameElectronicFence
* @Date2024/9/17 16:34
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ElectronicFenceResp {
/**
* id
*/
private Long id;
/**
*
*/
private String name;
/**
*
*/
private String fenceType;
/**
*
*/
private String longitudeLatitude;
/**
*
*/
private String status;
/**
*
*/
private String desc;
//private String groupType;
//
//private int priority;
}

View File

@ -0,0 +1,57 @@
package com.muyu.enterprise.domain.resp;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
* @Author
* @Packagecom.muyu.fence.domain.req
* @Projectcloud-server
* @nameGroupFenceListresp
* @Date2024/9/20 9:04
*
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@Tag(name = "围栏组列表")
public class GroupFenceListresp {
/**
*
*/
@TableId(value = "id",type = IdType.AUTO)
private Long id;
/**
*
*/
private Integer priority;
/**
*
*/
private String groupName;
/**
*
*/
private String groupType;
/**
*
*/
private String status;
}

View File

@ -0,0 +1,56 @@
package com.muyu.enterprise.domain.resp.car;
import com.muyu.enterprise.domain.car.MessageTemplate;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author
* @Packagecom.muyu.car.domain.resp
* @Projectcloud-server
* @nameMessageTemplateListResp
* @Date2024/9/26 20:32
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "报文模版列表", description = "负责报文模版管理列表的相应数据")
public class MessageTemplateListResp
{
/**
*
*/
private String messageTemplateId;
/**
*
*/
private String messageTemplateName;
/**
*
*/
private String messageTemplateDescribe;
/**
*
* @param messageTemplate
* @return
*/
public static MessageTemplateListResp messageTemplateBuild(MessageTemplate messageTemplate) {
return MessageTemplateListResp.builder()
.messageTemplateId(messageTemplate.getMessageTemplateId())
.messageTemplateName(messageTemplate.getMessageTemplateName())
.messageTemplateDescribe(messageTemplate.getMessageTemplateDescribe())
.build();
}
}

View File

@ -0,0 +1,68 @@
package com.muyu.enterprise.domain.resp.car;
import com.muyu.enterprise.domain.car.MessageValue;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author
* @Packagecom.muyu.car.domain.resp
* @Projectcloud-server
* @nameMessageValueListResp
* @Date2024/9/26 20:33
* @Description:
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
@Tag(name = "报文数据列表", description = "负责报文数据管理列表的相应数据")
public class MessageValueListResp
{
/**
*
*/
private Long messageId;
/**
*
*/
private String messageType;
/**
*
*/
private String messageCode;
/**
*
*/
private String messageLabel;
/**
*
*/
private Integer messageStartIndex;
/**
*
*/
private Integer messageEndIndex;
public static MessageValueListResp valueBuild(MessageValue messageValue){
return MessageValueListResp.builder()
.messageId(messageValue.getMessageId())
.messageType(messageValue.getMessageType())
.messageCode(messageValue.getMessageCode())
.messageLabel(messageValue.getMessageLabel())
.messageStartIndex(messageValue.getMessageStartIndex())
.messageEndIndex(messageValue.getMessageEndIndex())
.build();
}
}

View File

@ -0,0 +1,75 @@
package com.muyu.enterprise.domain.resp.car;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
* @Author
* @Packagecom.muyu.car.domain.resp
* @Projectcloud-server
* @nameVehicleManageResp
* @Date2024/9/26 20:33
*
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Tag(name = "车辆管理列表",description = "负责车辆管理列表的相应数据")
public class VehicleManageResp
{
/**
*
*/
@Schema(type = "Long",defaultValue = "1",description = "车辆主键")
private Long vehicleId;
/**
*
*/
@Schema(type = "String", defaultValue = "冀A93827", description = "车牌号")
private String licenceNumber;
/**
*
*/
@Schema(type = "String", defaultValue = "", description = "车辆颜色")
private String vehicleColor;
/**
* VIN
*/
@Schema(type = "String", defaultValue = "LDC913L2240606423", description = "车辆VIN")
private String vehicleVin;
/**
*
*/
@Schema(type = "Long", defaultValue = "新能源", description = "车辆类型")
private String vehicleTypeName;
/**
*
*/
@Schema(title = "车辆品牌", type = "String", defaultValue = "1", description = "车辆品牌")
private String vehicleBrand;
/**
*
*/
@Schema(title = "车辆型号", type = "String", defaultValue = "1", description = "车辆型号")
private String vehicleModel;
/**
*
*/
@Schema(type = "String", defaultValue = "", description = "车辆状态")
private String vehicleStatus;
}

View File

@ -0,0 +1,75 @@
package com.muyu.enterprise.domain.utils;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameElectricFenceModel
* @Date2024/9/17 17:27
*/
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ElectricFenceModel implements Comparable<ElectricFenceModel> {
//车架号
private String vin = "";
//电子围栏结果表UUID
private Long uuid = -999999L;
//上次状态 0 里面 1 外面
private int lastStatus = -999999;
//当前状态 0 里面 1 外面
private int nowStatus = -999999;
//位置时间 yyyy-MM-dd HH:mm:ss
private String gpsTime = "";
//位置纬度--
private Double lat = -999999D;
//位置经度--
private Double lng = -999999D;
//电子围栏ID
private int eleId = -999999;
//电子围栏名称
private String eleName = "";
//中心点地址
private String address = "";
//中心点纬度
private Double latitude;
//中心点经度
private Double longitude = -999999D;
//电子围栏半径
private Float radius = -999999F;
//出围栏时间
private String outEleTime = null;
//进围栏时间
private String inEleTime = null;
//是否在mysql结果表中
private Boolean inMysql = false;
//状态报警 0出围栏 1进围栏
private int statusAlarm = -999999;
//报警信息
private String statusAlarmMsg = "";
//终端时间
private String terminalTime = "";
// 扩展字段 终端时间
private Long terminalTimestamp = -999999L;
@Override
public int compareTo(ElectricFenceModel o) {
if(this.getTerminalTimestamp() > o.getTerminalTimestamp()){
return 1;
}
else if(this.getTerminalTimestamp() < o.getTerminalTimestamp()){
return -1;
}else{
return 0;
}
}
}

View File

@ -0,0 +1,53 @@
package com.muyu.enterprise.domain.utils;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameElectricFenceResultTmp
* @Date2024/9/17 17:57
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
public class ElectricFenceResultTmp {
//电子围栏id
private int id;
//电子围栏名称
private String name;
//电子围栏中心地址
private String address;
//电子围栏半径
private float radius;
//电子围栏中心点的经度
private double longitude;
//电子围栏中心点的维度
private double latitude;
//电子围栏的开始时间
private Date startTime;
//电子围栏的结束时间
private Date endTime;
@Override
public String toString() {
return "ElectricFenceResultTmp{" +
"id=" + id +
", name='" + name + '\'' +
", address='" + address + '\'' +
", radius=" + radius +
", longitude=" + longitude +
", latitude=" + latitude +
", startTime=" + startTime +
", endTime=" + endTime +
'}';
}
}

View File

@ -0,0 +1,54 @@
package com.muyu.enterprise.domain.utils;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.Date;
/**
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameElectronicFenceResult
* @Date2024/9/17 17:43
*/
/**
*
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
public class ElectronicFenceResult {
/**
*
*/
private Long id;
/**
*
*/
private String vin;
/**
*
*/
private String inTime;
private String outTime;
/**
* gps
*/
private Date gpsTime;
private Double lat;
private Double lng;
private Integer eleId;
private String eleName;
private String address;
private Double latitude;
private Double longitude;
private Double radius;
private String terminalTime;
private Date processTime;
}

View File

@ -0,0 +1,63 @@
package com.muyu.enterprise.domain.utils;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;
/**
*
* @Author
* @Packagecom.muyu.fence.domain
* @Projectcloud-server
* @nameElectronicFenceSetting
* @Date2024/9/17 16:47
*/
@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
@TableName(value = "electronic_fence_setting",autoResultMap = true)
public class ElectronicFenceSetting {
/**
* id
*/
@TableId(value = "id",type = IdType.AUTO)
private String id;
/**
*
*/
private String name;
/**
*
*/
private String address;
/**
*
*/
private String radius;
/**
*
*/
private String longitude;
/**
*
*/
private String latitude;
/**
*
*/
private String startTime;
/**
*
*/
private String endTime;
/**
* (,)
*/
private String status;
}

View File

@ -0,0 +1,28 @@
package com.muyu.enterprise.domain.utils;
/**
*
* @Author
* @Packagecom.muyu.car.utils
* @Projectcloud-server
* @nameVehicleConstant
* @Date2024/9/26 20:26
*/
public class VehicleConstant
{
/**
*
*/
public static final String DATA_PACK_SEPARATOR = "#$&";
/**
*
*/
public static final String MSG_START = "7E";
/**
*
*/
public static final String MSG_END = "7E";
}

View File

@ -22,6 +22,12 @@
</description>
<dependencies>
<!-- mybatis-plus-join依赖 -->
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join-boot-starter</artifactId>
<version>1.4.11</version>
</dependency>
<!-- SpringCloud Alibaba Nacos -->
<dependency>
@ -110,6 +116,13 @@
<groupId>com.muyu</groupId>
<artifactId>cloud-modules-enterprise-common</artifactId>
</dependency>
<!-- MyBatisPlus - 依赖包 -->
<dependency>
<groupId>com.github.yulichang</groupId>
<artifactId>mybatis-plus-join</artifactId>
<version>1.4.13</version>
</dependency>
</dependencies>
<build>

View File

@ -6,7 +6,7 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
/**
*
*
*
* @author muyu
*/
@ -16,5 +16,26 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
public class CloudEnterpriseApplication {
public static void main (String[] args) {
SpringApplication.run(CloudEnterpriseApplication.class, args);
}
System.out.println(" _ooOoo_\n" +
" o8888888o\n" +
" 88\" . \"88\n" +
" (| -_- |)\n" +
" O\\ = /O\n" +
" ____/`---'\\____\n" +
" .' \\\\| |// `.\n" +
" / \\\\||| : |||// \\\n" +
" / _||||| -:- |||||- \\\n" +
" | | \\\\\\ - /// | |\n" +
" | \\_| ''\\---/'' | |\n" +
" \\ .-\\__ `-` ___/-. /\n" +
" ___`. .' /--.--\\ `. . __\n" +
" .\"\" '< `.___\\_<|>_/___.' >'\"\".\n" +
" | | : `- \\`.;`\\ _ /`;.`/ - ` : | |\n" +
" \\ \\ `-. \\_ __\\ /__ _/ .-` / /\n" +
" ======`-.____`-.___\\_____/___.-`____.-'======\n" +
" `=---='\n" +
" ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
" // 佛祖保佑 永不宕机 永无BUG //");
}
}

View File

@ -0,0 +1,74 @@
package com.muyu.enterprise.MQTT;
import com.alibaba.nacos.api.remote.PushCallBack;
import org.eclipse.paho.client.mqttv3.MqttClient;
import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
import org.eclipse.paho.client.mqttv3.MqttTopic;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
/**
*
* @Author
* @Packagecom.muyu.enterprise.MQTT
* @Projectcloud-server
* @nameClientMQTT
* @Date2024/9/28 12:11
*/
public class ClientMQTT {
//String topic = "vehicle";
// String content = "Message from MqttPublishSample";
// int qos = 2;
// String broker = "tcp://106.15.136.7:1883";
// String clientId = "JavaSample";
//MQTT代理服务器地址
public static final String HOST="tcp://106.15.136.7:1883";
public static final String TOPIC1="pos_message_all";
private static final String clientId="12345678";
private MqttClient client;
private MqttConnectOptions options;
private String userName="mqtt"; //非必须
private String passWord="mqtt"; //非必须
private void start(){
try{
// host为主机名clientid即连接MQTT的客户端ID一般以唯一标识符表示MemoryPersistence设置clientid的保存形式默认为以内存保存
client= new MqttClient(HOST,clientId,new MemoryPersistence());
// MQTT的连接设置
options=new MqttConnectOptions();
// 设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录设置为true表示每次连接到服务器都以新的身份连接
options.setCleanSession(false);
// 设置连接的用户名
options.setUserName(userName);
// 设置连接的密码
options.setPassword(passWord.toCharArray());
// 设置超时时间 单位为秒
options.setConnectionTimeout(10);
// 设置会话心跳时间 单位为秒 服务器会每隔1.5*20秒的时间向客户端发送个消息判断客户端是否在线但这个方法并没有重连的机制
options.setKeepAliveInterval(20);
//设置断开后重新连接
options.setAutomaticReconnect(true);
// 设置回调
client.setCallback(new PushCallback());
MqttTopic topic = client.getTopic(TOPIC1);
//setWill方法如果项目中需要知道客户端是否掉线可以调用该方法。设置最终端口的通知消息
//遗嘱
options.setWill(topic,"close".getBytes(),1,true);
client.connect(options);
//订阅消息
int[] Qos = {1} ; //0最多一次 、1最少一次 、2只有一次
String[] topics1 = {TOPIC1};
client.subscribe(topics1,Qos);
} catch (Exception e) {
throw new RuntimeException(e);
}
}
public static void main(String[] args){
ClientMQTT clientMQTT = new ClientMQTT();
clientMQTT.start();
}
}

View File

@ -0,0 +1,69 @@
package com.muyu.enterprise.MQTT;
/**
* @Author
* @Packagecom.muyu.enterprise.MQTT
* @Projectcloud-server
* @nameMQTTReceiveCallback
* @Date2024/9/27 22:21
*/
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttCallback;
import org.eclipse.paho.client.mqttv3.MqttMessage;
/**
*
*
* MqttCallbackCallBack MqttCallBack
*
*
*
*
* (1):public void messageArrived(MqttTopic topic, MqttMessage message)
*
* (2):public void connectionLost(Throwable cause)
*
* (3):public void deliveryComplete(MqttDeliveryToken token))
* QoS 1 QoS 2
* MqttClient.connect
*
*/
public class MQTTReceiveCallback implements MqttCallback {
// @Override
// public void connectionLost(Throwable throwable) {
// //连接丢失后,一般在这里面进行重连
// System.out.println("连接断开,可以做重连");
// }
//
// @Override
// public void messageArrived(String topic, MqttMessage message) throws Exception {
// //subscribe后得到的消息会执行到这里面
// System.out.println("接收消息主题:"+topic);
// System.out.println("接收消息Qos"+message.getQos());
// System.out.println("接收消息内容:"+new String(message.getPayload()));
// }
//
// @Override
// public void deliveryComplete(IMqttDeliveryToken token) {
// System.out.println("deliveryComplete----------"+token.isComplete());
// }
@Override
public void connectionLost(Throwable throwable){
//连接丢失后,一般在这里面进行重连
System.out.println("连接断开,可以做重连");
}
@Override
public void messageArrived(String topic, MqttMessage mqttMessage) throws Exception {
//subscribe后得到的消息会执行到这面
System.out.println("接收消息主题:"+topic);
System.out.println("接收消息Qos"+mqttMessage.getQos());
System.out.println("接收消息内容:"+new String(mqttMessage.getPayload()));
}
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
System.out.println("deliveryComplete---------"+iMqttDeliveryToken.isComplete());
}
}

View File

@ -0,0 +1,187 @@
package com.muyu.enterprise.MQTT;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
/**
*
* @Author
* @Packagecom.muyu.enterprise.mqtt
* @Projectcloud-server
* @nameMyMqttClient
* @Date2024/9/27 22:20
*/
public class MyMqttClient {
public static MqttClient mqttClient =null;
private static MemoryPersistence memoryPersistence=null;
private static MqttConnectOptions mqttConectOptions=null;
private static String ClinentName=""; //待填 将在服务端出现的名字
private static String IP=""; //待填 服务器IP
public static void main(String[] args) {
start(ClinentName);
}
public static void start(String clientId){
//初始化连接设置对象
mqttConectOptions=new MqttConnectOptions();
//设置是否清空session,这里如果设置为false表示服务器会保留客户端的连接记录
//这里设置为true表示每次连接到服务器都以新的身份连接
mqttConectOptions.setCleanSession(true);
//设置连接超时时间,单位是秒
mqttConectOptions.setConnectionTimeout(10);
//设置持久化方式
memoryPersistence=new MemoryPersistence();
if(null!=clientId){
try{
mqttClient =new MqttClient("tcp://"+IP+":1883", clientId,memoryPersistence);
} catch (Exception e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}
System.out.println("连接状态:"+mqttClient.isConnected());
//设置连接和回调
if(null!=mqttClient){
if(!mqttClient.isConnected()){
//创建回调函数对象
MQTTReceiveCallback MQTTReceiveCallback = new MQTTReceiveCallback();
//客户端添加回调函数
mqttClient.setCallback(MQTTReceiveCallback);
//创建连接
try{
System.out.println("创建连接");
mqttClient.connect(mqttConectOptions);
} catch (Exception e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}
}else {
System.out.println("mqttClient为空");
}
System.out.println("连接状态"+mqttClient.isConnected());
}
// 关闭连接
public void closeConnect(){
//关闭储存方式
if(null!=memoryPersistence){
try{
memoryPersistence.close();
} catch (Exception e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}else {
System.out.println("memoryPersistence为空");
}
if(null!=mqttClient){
if(mqttClient.isConnected()){
try{
mqttClient.disconnect();
mqttClient.close();
} catch (Exception e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}else {
System.out.println("mqttClient未连接");
}
}else {
System.out.println("mqttClient为空");
}
}
//发布消息
public static void publishMessage(String pubTopic,String message,int qos){
if(null!=mqttClient && mqttClient.isConnected()){
System.out.println("发布消息"+mqttClient.isConnected());
System.out.println("id"+mqttClient.isConnected());
MqttMessage mqttMessage = new MqttMessage();
mqttMessage.setQos(qos);
MqttTopic topic = mqttClient.getTopic(pubTopic);
if(null!=topic){
try{
MqttDeliveryToken publish = topic.publish(mqttMessage);
if(!publish.isComplete()){
System.out.println("消息发布成功");
}
} catch (Exception e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}
}
}
//重新连接
public static void reConnect(){
if(null!=mqttClient&&mqttClient.isConnected()){
if(!mqttClient.isConnected()){
if(null!=mqttConectOptions){
try{
mqttClient.connect(mqttConectOptions);
} catch (Exception e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}else {
System.out.println("mqttConnectOptions为空");
}
}else {
System.out.println("mqttClient为空或已连接");
}
}else {
start(ClinentName);
}
}
//订阅主题
public static void suvTopic(String topic){
if(null!=mqttClient && mqttClient.isConnected()){
try{
mqttClient.subscribe(topic,1);
} catch (MqttException e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}else {
System.out.println("mqttClient出错");
}
}
//清空主题
public void cleanTopic(String topic){
if(null!=mqttClient && mqttClient.isConnected()){
try{
mqttClient.subscribe(topic);
} catch (Exception e) {
// TODO 自动生成的捕获块
throw new RuntimeException(e);
}
}else {
System.out.println("mqttClient出错");
}
}
}

View File

@ -0,0 +1,52 @@
package com.muyu.enterprise.MQTT;
/**
*
* @Author
* @Packagecom.muyu.enterprise.MQTT
* @Projectcloud-server
* @namePushCallback
* @Date2024/9/28 14:35
*/
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttCallback;
import org.eclipse.paho.client.mqttv3.MqttMessage;
/**
*
*
* MqttCallbackCallBack MqttCallBack
*
*
*
*
* public void messageArrived(MqttTopic topic, MqttMessage message)
*
* public void connectionLost(Throwable cause)
*
* public void deliveryComplete(MqttDeliveryToken token))
* QoS 1 QoS 2
* MqttClient.connect
*
*/
public class PushCallback implements MqttCallback {
@Override
public void connectionLost(Throwable throwable) {
// 连接丢失后,一般在这里面进行重连
System.out.println("连接断开,可以做重连");
}
@Override
public void messageArrived(String topic, MqttMessage mqttMessage) throws Exception {
// subscribe后得到的消息会执行到这里面
System.out.println("接收消息主题 : " + topic);
System.out.println("接收消息Qos : " + mqttMessage.getQos());
System.out.println("接收消息内容 : " + new String(mqttMessage.getPayload()));
}
@Override
public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {
System.out.println("deliveryComplete---------" + iMqttDeliveryToken.isComplete());
}
}

View File

@ -0,0 +1,113 @@
package com.muyu.enterprise.MQTT;
import lombok.extern.log4j.Log4j2;
import org.eclipse.paho.client.mqttv3.*;
import org.eclipse.paho.client.mqttv3.persist.MemoryPersistence;
/**
*
*
* @Author
* @Packagecom.muyu.enterprise.MQTT
* @Projectcloud-server
* @nameServerMQTT
* @Date2024/9/28 14:32
*/
@Log4j2
public class ServerMQTT {
//tcp://MQTT安装的服务器地址:MQTT定义的端口号
public static final String HOST = "tcp://127.0.0.1:1883";
//定义一个主题
public static final String TOPIC = "pos_message_all";
//定义MQTT的ID可以在MQTT服务配置中指定
private static final String clientId = "server11";
private MqttClient client;
private static MqttTopic topic11;
// private String userName = "mqtt"; //非必须
// private String passWord = "mqtt"; //非必须
private static MqttMessage message;
/**
*
* @throws MqttException
*/
public ServerMQTT() throws MqttException {
// MemoryPersistence设置clientid的保存形式默认为以内存保存
client=new MqttClient(HOST, clientId,new MemoryPersistence());
connect();
}
/**
*
*/
private void connect()
{
MqttConnectOptions options = new MqttConnectOptions();
options.setCleanSession(false);
// options.setUserName(userName);
// options.setPassword(passWord.toCharArray());
// 设置超时时间
options.setConnectionTimeout(10);
// 设置会话心跳时间
options.setKeepAliveInterval(20);
try{
client.setCallback(new PushCallback());
client.connect(options);
topic11 = client.getTopic(TOPIC);
} catch (Exception e) {
e.printStackTrace();
}
}
/**
*
* @param topic
* @param message
* @throws MqttException
*/
public static void publish(MqttTopic topic , MqttMessage message) throws MqttPersistenceException,MqttException{
MqttDeliveryToken token= topic.publish(message);
token.waitForCompletion();
System.out.println("消息已完全发布!"+token.isComplete());
log.info("消息已完全发布!"+token.isComplete());
}
/**
*
* @param clieId
* @param msg
* @throws Exception
*/
public static void sendMessage(String clieId,String msg)throws Exception{
ServerMQTT server = new ServerMQTT();
server.message = new MqttMessage();
server.message.setQos(1); //保证消息能到达一次
server.message.setRetained(true);
String str="{\"clienId\":\""+clieId+"\",\"msg\":\""+msg+"\"}";
try{
publish(server.topic11 , server.message);
//断开连接
// server.client.disconnect();
}catch (Exception e){
e.printStackTrace();
}
}
public static void main(String[] args) throws Exception {
sendMessage("123444","哈哈哈");
}
}

View File

@ -0,0 +1,44 @@
package com.muyu.enterprise.controller;
import com.muyu.enterprise.domain.CarCompany;
import com.muyu.enterprise.service.CarCompanyService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* --
* @ClassName CarCompanyController
* @Description Controller
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@RestController
@RequestMapping("/company")
@Tag(name = "CarCompanyController", description = "企业表")
public class CarCompanyController extends BaseController {
@Autowired
private CarCompanyService sysCarCompanyService;
/**
*
*/
@PostMapping("selectCompany")
public Result<List<CarCompany>> selectCompany(){
return Result.success(sysCarCompanyService.list());
}
/**
* ID
*/
@PostMapping("selectCompanyByCompanyId")
public Result<CarCompany> selectCompanyByCompanyId(@RequestParam("companyId") Long companyId){
return Result.success(sysCarCompanyService.getById(companyId));
}
}

View File

@ -1,10 +1,13 @@
package com.muyu.enterprise.controller;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.RandomUtil;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.enterprise.domain.CarManage;
import com.muyu.enterprise.domain.dto.CarDTO;
import com.muyu.enterprise.domain.vo.CarVO;
import com.muyu.enterprise.service.SysCarCompanyService;
import com.muyu.enterprise.service.SysCarService;
import com.muyu.enterprise.service.CarCompanyService;
import com.muyu.enterprise.service.CarManageService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.core.web.page.TableDataInfo;
@ -17,19 +20,22 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
*
* @author muyu
* --
* @ClassName CarManageController
* @Description Controller
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@RestController
@RequestMapping("/manage")
@Tag(name = "SysCarController", description = "系统参数配置")
public class SysCarController extends BaseController {
@RequestMapping("/carManage")
@Tag(name = "CarManageController", description = "车辆管理")
public class CarManageController extends BaseController {
@Autowired
private SysCarCompanyService sysCarCompanyService;
private CarCompanyService sysCarCompanyService;
@Autowired
private SysCarService sysCarService;
private CarManageService sysCarService;
/**
* 2
@ -37,7 +43,7 @@ public class SysCarController extends BaseController {
* @return
*/
@PostMapping("CarListShow")
public Result<List<CarVO>> CarListShow(@RequestBody CarDTO carDTO){
public Result<List<CarManage>> CarListShow(@RequestBody CarDTO carDTO){
return Result.success(sysCarService.CarListShow(carDTO));
}
@ -46,22 +52,22 @@ public class SysCarController extends BaseController {
* @param carId
* @return
*/
@PostMapping("CarListShowByCarId")
public Result<List<CarVO>> CarListShowByCarId(@RequestParam("carId") Long carId){
return Result.success(sysCarService.CarListShowByCarId(carId));
@PostMapping("CarManageShowByCarId")
public Result CarManageShowByCarId(@RequestParam("carId") Long carId){
return Result.success(sysCarService.getById(carId));
}
/**
* 1
* @param carVO
* @return
*/
@PostMapping("CarList")
@Operation(summary = "查询列表",description = "车辆管理列表")
public Result<TableDataInfo<CarVO>> CarList(@RequestBody CarVO carVO){
startPage();
return getDataTable(sysCarService.carList(carVO));
}
// /**
// * 车辆列表1
// * @param carVO
// * @return
// */
// @PostMapping("CarList")
// @Operation(summary = "查询列表",description = "车辆管理列表")
// public Result<TableDataInfo<CarManage>> CarList(@RequestBody CarVO carVO){
// startPage();
// return getDataTable(sysCarService.carList(carVO));
// }
/**
@ -70,14 +76,14 @@ public class SysCarController extends BaseController {
* @return
*/
@PostMapping("insertCar")
public Result insertCar(@RequestBody CarVO carVO){
public Result insertCar(@RequestBody CarManage carVO){
String key = RandomUtil.randomNumbers(9);
// 随机生成车架号
carVO.setCarFrame(key);
// 随机生成VIN码
String key2 = RandomUtil.randomNumbers(17);
carVO.setCarVin(key2);
sysCarService.insertCar(carVO);
sysCarService.save(carVO);
return Result.success("车辆添加成功");
}
@ -88,7 +94,7 @@ public class SysCarController extends BaseController {
* @return
*/
@PostMapping("updataCar")
public Result updataCar(@RequestBody CarVO carVO){
public Result updataCar(@RequestBody CarManage carVO){
//
carVO.setUserId(SecurityUtils.getUserId());
sysCarService.updateById(carVO);
@ -102,7 +108,7 @@ public class SysCarController extends BaseController {
*/
@PostMapping("deleteCar")
public Result deleteCar(@RequestParam("ids") List<Long> ids){
sysCarService.deleteCar(ids);
sysCarService.removeBatchByIds(ids);
return Result.success("车辆删除成功");
}

View File

@ -2,28 +2,37 @@ package com.muyu.enterprise.controller;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.enterprise.domain.CarMessage;
import com.muyu.enterprise.service.CarMessageService;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* @ClassName CarMessageController
* @Description
* @Author YiBo.Liu
* @Date 2024/9/22 22:28
* --
* @ClassName carMessageController
* @Description Controller
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@RestController
@RequestMapping("/carMessage")
public class CarMessageController {
@Tag(name = "报文",description = "报文模块")
public class CarMessageController extends BaseController {
@Autowired
private CarMessageService carMessageService;
private CarMessageService sysCarMessageService;
/**
*
* @return
*/
@PostMapping("selectMessageShow")
public List<CarMessage> selectMessageShow(@RequestParam("templateId") Long templateId){
return sysCarMessageService.selectMessageShow(templateId);
}
/**
* id
@ -32,8 +41,46 @@ public class CarMessageController {
*/
@GetMapping("/selectByTemplateId")
private Result<List<CarMessage>> selectByTemplateId(@RequestParam("templateId") Integer templateId) {
return Result.success(carMessageService.list
(new LambdaQueryWrapper<CarMessage>().eq(CarMessage::getTemplateId, templateId)));
return Result.success(sysCarMessageService.list
(new LambdaQueryWrapper<CarMessage>().eq(CarMessage::getTemplateId, templateId)));
}
/**
* id
* @return
*/
@PostMapping("selectMessageByMessageId")
public CarMessage selectMessageByMessageId(@RequestParam("messageId") Long messageId){
return sysCarMessageService.selectMessageByMessageId(messageId);
}
/**
*
* @return carMessage
*/
@PostMapping("insertMessage")
public Result insertMessage(@RequestBody CarMessage carMessage){
sysCarMessageService.save(carMessage);
return Result.success("添加成功");
}
/**
*
* @return carMessage
*/
@PostMapping("updataMessage")
public Result updataMessage(@RequestBody CarMessage carMessage){
sysCarMessageService.updateById(carMessage);
return Result.success("修改成功");
}
/**
*
* @return carMessage
*/
@PostMapping("deleteMessage")
public Result deleteMessage(@RequestParam("ids") List<Long> ids){
sysCarMessageService.removeBatchByIds(ids);
return Result.success("删除成功");
}
}

View File

@ -0,0 +1,91 @@
package com.muyu.enterprise.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.utils.StringUtils;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.common.security.utils.SecurityUtils;
import com.muyu.enterprise.domain.CarMessageType;
import com.muyu.enterprise.service.CarMessageTypeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* --
* @ClassName CarMessageTypeController
* @Description Controller
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@RestController
@RequestMapping("carMessageType")
@Tag(name = "报文类型" ,description = "报文类型")
public class CarMessageTypeController extends BaseController {
@Autowired
private CarMessageTypeService sysCarMessageTypeService;
/**
*
* @return
*/
@PostMapping("messageTypeList")
public Result messageTypeList(){
sysCarMessageTypeService.messageTypeList();
List<CarMessageType> list = sysCarMessageTypeService.list();
return Result.success(list);
}
@PostMapping("inserMessageType")
public Result inserMessageType(@RequestBody CarMessageType carMessageType){
/** id 检验 */
if(carMessageType.getMessageTypeId()>0){
return Result.error("添加要什么id");
}
/** token 检验 */
if(SecurityUtils.getToken().isEmpty()){
return Result.error("token不为空");
}
/** 报文类型 */
if(StringUtils.isEmpty(carMessageType.getMessageType())){
return Result.error("报文类型不能为空");
}
/** 报文 */
if(StringUtils.isEmpty(carMessageType.getMessageName())){
return Result.error("报文不能为空");
}
/** 报文编码 */
if(StringUtils.isEmpty(carMessageType.getMessageCode())){
return Result.error("报文编码不能为空");
}
/** 报文字段类型 */
if(StringUtils.isEmpty(carMessageType.getMessageClass())){
return Result.error("报文字段类型不能为空");
}
sysCarMessageTypeService.save(carMessageType);
return Result.success("添加成功");
}
/**
*
* @param carMessageType
* @return
*/
@PostMapping("updateMessageType")
public Result updateMessageType(@RequestBody CarMessageType carMessageType){
/** id */
if(carMessageType.getMessageTypeId() < 0 ){
return Result.error("修改需要id");
}
/** 报文编号 */
if(StringUtils.isEmpty(carMessageType.getMessageCode())){
return Result.error("");
}
sysCarMessageTypeService.updateById(carMessageType);
return Result.success("修改成功");
}
}

View File

@ -1,7 +1,7 @@
package com.muyu.enterprise.controller;
import com.muyu.enterprise.domain.CarTemplate;
import com.muyu.enterprise.service.SysCarTemplateService;
import com.muyu.enterprise.service.CarTemplateService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import io.swagger.v3.oas.annotations.tags.Tag;
@ -9,13 +9,19 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* --
* @ClassName CarTemplateController
* @Description Controller
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@RestController
@RequestMapping("/template") // 报文
@RequestMapping("/carTemplate") // 报文模版
@Tag(name = "模版模块",description = "报文模版模块")
public class SysCarTemplateController extends BaseController {
public class CarTemplateController extends BaseController {
@Autowired
private SysCarTemplateService sysCarTemplateService;
private CarTemplateService sysCarTemplateService;
/**
*

View File

@ -3,12 +3,14 @@ package com.muyu.enterprise.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.enterprise.domain.CarType;
import com.muyu.enterprise.service.CarTypeService;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* @ClassName CarController
* @Description Controller
* @Author YiBo.Liu
@ -16,6 +18,7 @@ import java.util.List;
*/
@RestController
@RequestMapping("/carType")
@Tag(name = "CarTypeController",description = "车辆类型")
public class CarTypeController {
@Autowired

View File

@ -0,0 +1,145 @@
package com.muyu.enterprise.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.enterprise.domain.dateBase.ElectronicFence;
import com.muyu.enterprise.domain.req.ElectroicFenceAddReq;
import com.muyu.enterprise.domain.req.ElectroicFenceListReq;
import com.muyu.enterprise.domain.req.ElectroicFenceUpdReq;
import com.muyu.enterprise.domain.req.FenceWayReq;
import com.muyu.enterprise.domain.resp.ElectronicFenceResp;
import com.muyu.enterprise.service.ElectronicFenceService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
* @Author
* @Packagecom.muyu.fence.controller
* @Projectcloud-server
* @nameFenceEtlController
* @Date2024/9/17 16:28
*/
/**
*
*/
@Log4j2
@Tag(name = "电子围栏控制层")
@RestController
@RequestMapping("/fence")
@RequiredArgsConstructor
public class ElectronicFenceController {
/**
*
*/
@Resource
private ElectronicFenceService electronicFenceService;
@PostMapping("/fenceArray")
@Operation(description = "查询所有可用的围栏")
public Result<List<ElectronicFenceResp>> fenceArray() {
System.out.println("=====>" + "hgfvhgjy");
return Result.success(electronicFenceService.fenceArray());
}
@PostMapping("/fenceselectList")
@Operation(description = "列表")
public Result<List<ElectronicFenceResp>> fenceselectList(@RequestBody ElectroicFenceListReq electroicFenceListReq) {
System.out.println("=====>" + "hgfvhgjy");
return Result.success(electronicFenceService.fenceselectList(electroicFenceListReq));
}
@PostMapping("/add")
@Operation(description = "添加")
public Result AddFence(@RequestBody ElectroicFenceAddReq electroicFenceAddReq) {
electronicFenceService.unquireFence(electroicFenceAddReq.getName());
electronicFenceService.AddFence(electroicFenceAddReq);
return Result.success();
}
@PostMapping("/upd/{id}")
@Operation(description = "修改")
public Result UpdFence(@PathVariable("id") Long id, @RequestBody ElectroicFenceUpdReq electroicFenceUpdReq) {
electronicFenceService.updateById(ElectronicFence.buildByElectronicUpd(electroicFenceUpdReq, () -> id));
return Result.success();
}
@PostMapping("/findElectronicByid/{id}")
@Operation(description = "通过id回显围栏信息")
public Result<ElectronicFence> findElectronicByid(@PathVariable("id") Long id) {
ElectronicFence electronicFence= electronicFenceService.findElectronicByid(id);
return Result.success(electronicFence);
}
// @PostMapping("/delElectronById/{id}")
// @Operation(description = "通过id删除围栏")
// public Result delElectronById(@PathVariable("id") Long id) {
//
// electronicFenceService.delElectronById(id);
//
// return Result.success();
// }
/**
*
* @param electronicFenceId
* @return
*/
@DeleteMapping("/{electronicFenceId}")
@Operation(summary = "电子围栏表信息表删除",
description = "通过ID删除电子围栏表信息")
public Result<String> remove(@PathVariable("electronicFenceId") Long electronicFenceId)
{
boolean b = electronicFenceService.removeById(electronicFenceId);
return Result.success(null, "操作成功");
}
@PostMapping("/open/{id}")
@Operation(description = "开启围栏")
public Result openFence(@PathVariable("id") Long id) {
electronicFenceService.openFence(id);
return Result.success();
}
@PostMapping("/close/{id}")
@Operation(description = "关闭围栏")
public Result closeFence(@PathVariable("id") Long id) {
electronicFenceService.closeFence(id);
return Result.success();
}
@PostMapping("/setFenceWay")
@Operation(description = "设置电子围栏的位置")
public Result setFenceWay(@RequestBody FenceWayReq fenceWayReq) {
Long id = fenceWayReq.getId();
String longitudeLatitude = fenceWayReq.getLongitudeLatitude();
log.info("接收到的数据,:{}" + id + "====" + longitudeLatitude);
electronicFenceService.setFenceWay(id, longitudeLatitude);
return Result.success();
}
}

View File

@ -0,0 +1,132 @@
package com.muyu.enterprise.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.enterprise.domain.dateBase.ElectronicFenceGroup;
import com.muyu.enterprise.domain.req.ElectronicFenceGroupAddReq;
import com.muyu.enterprise.domain.req.ElectronicFenceGroupListReq;
import com.muyu.enterprise.domain.req.ElectronicFenceGroupUpdReq;
import com.muyu.enterprise.domain.resp.ElectronicFenceGroupResp;
import com.muyu.enterprise.domain.resp.GroupFenceListresp;
import com.muyu.enterprise.service.ElectronicFenceGroupService;
import com.muyu.enterprise.service.FenceGroupMidService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* @Author
* @Packagecom.muyu.fence.controller
* @Projectcloud-server
* @nameFenceGroupController
* @Date2024/9/18 15:15
*/
/**
*
*/
@Log4j2
@RestController
@RequestMapping("/group")
@Tag(name = "围栏组控制层")
public class ElectronicFenceGroupController {
/**
*
*/
@Autowired
private ElectronicFenceGroupService electronicFenceGroupService;
@Autowired
private FenceGroupMidService fenceGroupMidService;
@PostMapping("/selectGroupList")
public Result<List<GroupFenceListresp>> selectGroupList(@RequestBody ElectronicFenceGroupListReq req) {
//查询所有的围栏组
List<ElectronicFenceGroup> fenceListList = electronicFenceGroupService.selectGroupList(req);
List<GroupFenceListresp> list = fenceListList.stream().map(ElectronicFenceGroup::buildGroupFence).toList();
return Result.success(list);
}
@Transactional
@PostMapping("/addGroup")
public Result addGroup(@RequestBody ElectronicFenceGroupAddReq addReq) {
ElectronicFenceGroup electronicFenceGroup = ElectronicFenceGroup.buildByAdd(addReq);
//添加围栏组返回添加后的主键自增id
electronicFenceGroupService.save(electronicFenceGroup);
Long id = electronicFenceGroup.getId();
//添加中间表
fenceGroupMidService.addGroupAndFenceMid(id, addReq.getElectronicFenceRespList());
return Result.success();
}
@PostMapping("/findGroupByid/{id}")
@Operation(description = "通过id回显围栏组信息")
public Result<ElectronicFenceGroupResp> findGroupByid(@PathVariable("id") Long id) {
ElectronicFenceGroupResp fenceGroupResp = electronicFenceGroupService.findGroupByid(id);
return Result.success(fenceGroupResp);
}
@Transactional
@PostMapping("/updGroup/{id}")
@Operation(description = "修改")
public Result UpdFence(@PathVariable("id") Long id, @RequestBody ElectronicFenceGroupUpdReq req) {
electronicFenceGroupService.updateById(ElectronicFenceGroup.buildByUpd(req, () -> id));
if (!CollectionUtils.isEmpty(req.getElectronicFenceRespList())) {
//删除中间表
fenceGroupMidService.deliteMid(id);
//增加中间表
fenceGroupMidService.addGroupAndFenceMid(id, req.getElectronicFenceRespList());
}
return Result.success();
}
/**
*
* @param findGroupId
* @return
*/
@DeleteMapping("/{findGroupId}")
@Operation(summary = "围栏组表信息表删除",
description = "通过ID删除围栏组表信息")
public Result<String> remove(@PathVariable("findGroupId") Long findGroupId)
{
boolean b = electronicFenceGroupService.removeById(findGroupId);
return Result.success(null, "操作成功");
}
/**
*
* @param findId
* @return
*/
@DeleteMapping("/findId/{findId}")
@Operation(summary = "围栏链信息表删除",
description = "通过ID删除围栏链表信息")
public Result<String> findId(@PathVariable("findId") Long findId)
{
boolean b = fenceGroupMidService.removeById(findId);
return Result.success(null, "操作成功");
}
}

View File

@ -11,6 +11,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
/**
*
* @author chenruijia
* @Date 2024/9/28 11:58
* @Description FaultLogController:
*/
@RestController
@RequestMapping("/log")
@Tag(name = "故障日志",description = "对故障记录日志")

View File

@ -10,7 +10,12 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* @author chenruijia
* @Date 2024/9/28 11:58
* @Description FaultMessageController:
*/
@RestController
@RequestMapping("/fault-message")
@Tag(name = "站内信的管理",description = "对站内信息的处理与查看")

View File

@ -9,6 +9,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* @author chenruijia
* @Date 2024/9/28 11:58
* @Description FaultTypeController:
*/
@RestController
@RequestMapping("/type")
@Tag(name = "故障类型",description = "对故障类型的定义")
@ -58,4 +64,15 @@ public class FaultTypeController {
return Result.success(faultTypeService.removeById(faultTypeId));
}
/**
*
* @param faultTypeId
* @return
*/
@RequestMapping(value = "/typeDetailOne/{faultTypeId}",method = RequestMethod.POST)
public Result<List<FaultType>> typeDetailOne(@PathVariable Long faultTypeId){
return Result.success(faultTypeService.typeDatailOne(faultTypeId));
}
}

View File

@ -10,7 +10,12 @@ import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
import java.util.List;
/**
*
* @author chenruijia
* @Date 2024/9/28 11:58
* @Description FaultrRuleController:
*/
@RestController
@RequestMapping("/rule")
@Tag(name = "故障的规则",description = "对故障数据规则的判断")

View File

@ -1,31 +0,0 @@
package com.muyu.enterprise.controller;
import com.muyu.enterprise.service.SysCarCompanyService;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
/**
*
*
* @author muyu
*/
@RestController
@RequestMapping("/company")
@Tag(name = "SysCarCompanyController", description = "系统参数配置")
public class SysCarCompanyController extends BaseController {
@Autowired
private SysCarCompanyService sysCarCompanyService;
/**
*
*/
@PostMapping("selectCompany")
public Result selectCompany(){
return Result.success(sysCarCompanyService.list());
}
}

View File

@ -20,6 +20,12 @@ import java.util.Arrays;
import java.util.List;
import java.util.Random;
/**
*
* @author chenruijia
* @Date 2024/9/28 11:58
* @Description SysCarFaultController:
*/
@RestController
@RequestMapping("/faultInfo")
@Tag(name = "故障管理",description = "故障的管理与查看")

View File

@ -1,66 +0,0 @@
package com.muyu.enterprise.controller;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.enterprise.domain.CarMessage;
import com.muyu.enterprise.service.SysCarMessageService;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@RequestMapping("/car-message")
@Tag(name = "报文",description = "报文模块")
public class SysCarMessageController extends BaseController {
@Autowired
private SysCarMessageService sysCarMessageService;
/**
*
* @return
*/
@PostMapping("selectMessageShow")
public List<CarMessage> selectMessageShow(@RequestParam("templateId") Long templateId){
return sysCarMessageService.selectMessageShow(templateId);
}
/**
* id
* @return
*/
@PostMapping("selectMessageByMessageId")
public CarMessage selectMessageByMessageId(@RequestParam("messageId") Long messageId){
return sysCarMessageService.selectMessageByMessageId(messageId);
}
/**
*
* @return carMessage
*/
@PostMapping("insertMessage")
public Result insertMessage(@RequestBody CarMessage carMessage){
sysCarMessageService.save(carMessage);
return Result.success("添加成功");
}
/**
*
* @return carMessage
*/
@PostMapping("updataMessage")
public Result updataMessage(@RequestBody CarMessage carMessage){
sysCarMessageService.updateById(carMessage);
return Result.success("修改成功");
}
/**
*
* @return carMessage
*/
@PostMapping("deleteMessage")
public Result deleteMessage(@RequestParam("ids") List<Long> ids){
sysCarMessageService.removeBatchByIds(ids);
return Result.success("删除成功");
}
}

View File

@ -0,0 +1,85 @@
package com.muyu.enterprise.controller.car;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.enterprise.domain.car.MessageTemplate;
import com.muyu.enterprise.domain.req.car.MessageTemplateAddReq;
import com.muyu.enterprise.domain.resp.car.MessageTemplateListResp;
import com.muyu.enterprise.service.car.MessageTemplateService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import java.util.List;
/**
*
* @Author
* @Packagecom.muyu.car.controller
* @Projectcloud-server
* @nameMessageTemplateController
* @Date2024/9/26 22:08
* @Description:
*/
@Log4j2
@RestController
@RequestMapping("messageTemplate")
@Tag(name = "报文模版控制层", description = "进行报文模版操作")
public class MessageTemplateController extends BaseController
{
@Autowired
private MessageTemplateService messageTemplateService;
/**
*
* @return
*/
@RequestMapping(value = "/list", method = RequestMethod.POST)
@Operation(summary = "报文模版列表查询", description = "报文模版列表查询")
public Result<List<MessageTemplateListResp>> findAll() {
List<MessageTemplate> list = messageTemplateService.list();
List<MessageTemplateListResp> messageTemplateListRespList = list.stream()
.map(template -> MessageTemplateListResp.messageTemplateBuild(
template
)
)
.toList();
return Result.success(messageTemplateListRespList);
}
/**
*
* @param messageTemplateAddReq
* @return
*/
@Transactional
@PostMapping("/")
@Operation(summary = "新增添加报文模版", description = "新增添加报文模版")
public Result<String> save(@RequestBody MessageTemplateAddReq messageTemplateAddReq) {
messageTemplateService.save(MessageTemplate.addBuild(messageTemplateAddReq));
return Result.success("添加成功");
}
/**
*
* @param messageTemplateId
* @return
*/
@Transactional
@DeleteMapping("/{messageTemplateId}")
@Operation(summary = "删除报文模版", description = "删除报文模版")
public Result<String> delete(@PathVariable("messageTemplateId") Long messageTemplateId) {
messageTemplateService.removeById(messageTemplateId);
return Result.success("删除成功");
}
}

View File

@ -0,0 +1,121 @@
package com.muyu.enterprise.controller.car;
import cn.hutool.json.JSONObject;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.enterprise.domain.car.MessageValue;
import com.muyu.enterprise.domain.req.car.MessageValueAddReq;
import com.muyu.enterprise.domain.req.car.MessageValueReq;
import com.muyu.enterprise.domain.resp.car.MessageValueListResp;
import com.muyu.enterprise.service.car.MessageValueService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
import java.nio.charset.StandardCharsets;
import java.util.List;
/**
*
* @Author
* @Packagecom.muyu.car.controller
* @Projectcloud-server
* @nameMessageValueController
* @Date2024/9/26 22:11
* @Description:
*/
@Log4j2
@RestController
@RequestMapping("/messageValue")
@Tag(name = "报文数据控制层", description = "进行报文数据操作")
public class MessageValueController extends BaseController
{
@Autowired
private MessageValueService messageValueService;
/**
*
* @param messageValueReq
* @return
*/
@RequestMapping(value = "/list", method = RequestMethod.POST)
@Operation(summary = "报文数据列表", description = "根据报文类别, 报文模版筛选报文数据")
public Result<List<MessageValueListResp>> findAll(@RequestBody MessageValueReq messageValueReq) {
List<MessageValueListResp> list = messageValueService.findAll(messageValueReq);
return Result.success(list);
}
/**
* 使
* @return
*/
@GetMapping("/allList")
@Operation(summary = "报文数据下拉框", description = "全部报文数据下拉框")
public Result<List<MessageValueListResp>> findAllList() {
List<MessageValueListResp> list = messageValueService.list().stream().map(
value -> MessageValueListResp.valueBuild(
value
)
).toList();
return Result.success(list);
}
/**
*
* @param messageValueAddReq
* @return
*/
@Transactional
@PostMapping("/add")
@Operation(summary = "添加报文数据", description = "新增报文数据")
public Result<String> save(@RequestBody MessageValueAddReq messageValueAddReq) {
messageValueService.save(MessageValue.addBuild(messageValueAddReq));
return Result.success("添加成功");
}
/**
* id
* @param messageId
* @return
*/
@DeleteMapping("/{messageId}")
@Operation(summary = "删除报文数据", description = "删除报文数据")
public Result<String> delete(@PathVariable Long messageId) {
messageValueService.removeById(messageId);
return Result.success("删除成功");
}
//7E 56 49 4e 31 32 33 34 35 36 37 38 39 31 32 33 34 35 32 33 35 36 37 38 39 31 32 33 34 35 31 31 36 2e 36 36 34 30 35 33 30 33 39 2e 35 33 31 37 39 31 30 32 30 30 2e 30 30 35 38 36 37 38 33 37 2e 33 32 34 36 33 35 2e 31 32 33 39 2e 34 39 31 36 38 37 39 38 2e 35 36 50 30 39 30 38 31 39 2e 39 39 39 39 2e 38 36 30 39 39 39 39 39 31 30 30 30 31 33 39 2e 34 36 31 34 2e 36 38 31 31 33 36 39 2e 38 39 31 30 30 2e 30 30 31 30 30 2e 30 30 31 30 30 2e 30 30 31 33 31 34 2e 36 35 33 36 30 2e 35 38 34 2e 35 36 33 2e 32 35 31 30 30 2e 30 30 39 38 2e 32 33 30 33 36 2e 32 36 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 76 7E
/**
*
* @param testStr
* @return
*/
@PostMapping("/analysis/{testStr}")
@Operation(summary = "测试解析报文", description = "解析报文测试")
public Result<JSONObject> analysis(@PathVariable("testStr") String testStr){
JSONObject messageValue = messageValueService.analysis(testStr);
return Result.success(messageValue);
}
/**
* id
* @param templateId
* @return
*/
@GetMapping("/findByTemplateId/{templateId}")
@Operation(summary = "根据报文模版id查询报文数据", description = "根据报文模版id查询报文数据")
public Result<List<MessageValueListResp>> findByTemplateId(@PathVariable("templateId") Long templateId){
List<MessageValueListResp> list = messageValueService.findByTemplateId(templateId);
return Result.success(list);
}
}

View File

@ -0,0 +1,142 @@
package com.muyu.enterprise.controller.car;
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.log.annotation.Log;
import com.muyu.enterprise.domain.car.Vehicle;
import com.muyu.enterprise.domain.req.car.VehicleAddReq;
import com.muyu.enterprise.domain.req.car.VehicleManageReq;
import com.muyu.enterprise.domain.req.car.VehicleUpdReq;
import com.muyu.enterprise.domain.resp.car.VehicleManageResp;
import com.muyu.enterprise.service.car.VehicleService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.servlet.http.HttpServletResponse;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
*
* @Author
* @Packagecom.muyu.car.controller
* @Projectcloud-server
* @nameVehicleController
* @Date2024/9/26 22:17
* @Description:
*/
@Log4j2
@RestController
@RequestMapping("/vehicleManage")
@Tag(name = "车辆管理控制层", description = "进行车辆管理操作")
public class VehicleController extends BaseController
{
@Autowired
private VehicleService vehicleService;
/**
*
* @param vehicleManageReq
* @return
*/
@RequestMapping(path = "/list", method = RequestMethod.POST)
@Operation(summary = "车辆管理列表", description = "根据车牌号、VIN码、车辆状态筛选车辆")
public Result<TableDataInfo<VehicleManageResp>> getVehicleList(@RequestBody VehicleManageReq vehicleManageReq) {
startPage();
List<VehicleManageResp> list = vehicleService.getVehicleList(vehicleManageReq);
return getDataTable(list);
}
/**
*
* @param vehicleAddReq
* @return
*/
@PostMapping("/")
@Operation(summary = "新增车辆", description = "录入车辆信息")
public Result<String> save(@RequestBody VehicleAddReq vehicleAddReq) {
vehicleService.save(Vehicle.addBuild(vehicleAddReq));
return Result.success("录入成功");
}
/**
* id
* @param vehicleId
* @return
*/
@GetMapping("/{vehicleId}")
@Operation(summary = "通过id查询车辆信息", description = "通过id查询车辆信息")
public Result<Vehicle> findById(@PathVariable("vehicleId") Long vehicleId) {
return Result.success(vehicleService.getById(vehicleId));
}
/**
*
* @param vehicleId
* @param vehicleUpdReq
* @return
*/
@PutMapping("/{vehicleId}")
@Operation(summary = "修改车辆信息", description = "修改车辆信息")
public Result<String> update(
@PathVariable("vehicleId") Long vehicleId,
@RequestBody @Validated VehicleUpdReq vehicleUpdReq) {
vehicleService.updateById(Vehicle.updBuild(vehicleUpdReq, () -> vehicleId));
return Result.success("修改成功");
}
/**
* id
* @param vehicleId
* @return
*/
@DeleteMapping("/{vehicleId}")
@Operation(summary = "通过车辆id删除车辆信息", description = "通过车辆id删除车辆信息")
public Result<String> delete(@PathVariable("vehicleId") Long vehicleId) {
vehicleService.removeById(vehicleId);
return Result.success("删除成功");
}
/**
*
* @param vehicleIds
* @return
*/
@DeleteMapping("/batchDelete")
@Operation(summary = "批量删除车辆")
public Result<String> batchDelete(@RequestBody List<Long> vehicleIds) {
vehicleService.removeBatchByIds(vehicleIds);
return Result.success("批量删除成功");
}
/**
*
* @param response
*/
@PostMapping("/export")
public void export(HttpServletResponse response) {
List<Vehicle> list = vehicleService.list();
ExcelUtil<Vehicle> util = new ExcelUtil<>(Vehicle.class);
util.exportExcel(response, list, "车辆数据");
}
/**
* vinid
* @param vehicleVin
* @return
*/
@GetMapping("/findByVehicleVin/{vehicleVin}")
@Operation(description = "通过车辆vin码查询模板id")
public Result<Long> findByVehicleVin(@PathVariable("vehicleVin") String vehicleVin) {
Long byVehicleVin = vehicleService.findByVehicleVin(vehicleVin);
return Result.success(byVehicleVin);
}
}

View File

@ -0,0 +1,48 @@
package com.muyu.enterprise.controller.car;
import com.muyu.common.core.domain.Result;
import com.muyu.common.core.web.controller.BaseController;
import com.muyu.enterprise.domain.car.VehicleType;
import com.muyu.enterprise.service.car.VehicleTypeService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.extern.log4j.Log4j2;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
*
* @Author
* @Packagecom.muyu.car.controller
* @Projectcloud-server
* @nameVehicleTypeController
* @Date2024/9/26 22:23
* @Description:
*/
@Log4j2
@RestController
@RequestMapping("/vehicleType")
@Tag(name = "车辆类型控制层", description = "车辆类型控制层")
public class VehicleTypeController extends BaseController
{
@Autowired
private VehicleTypeService vehicleTypeService;
/**
*
* @return
*/
@RequestMapping(path = "/", method = RequestMethod.POST)
@Operation(summary = "车辆类型列表",description = "车辆类型列表")
public Result<List<VehicleType>> findAll(){
return Result.success(vehicleTypeService.list());
}
}

View File

@ -0,0 +1,16 @@
package com.muyu.enterprise.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.enterprise.domain.CarCompany;
/**
* --
* @ClassName CarCompanyMapper
* @Description Mapper
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
public interface CarCompanyMapper extends BaseMapper<CarCompany> {
}

View File

@ -2,19 +2,22 @@ package com.muyu.enterprise.mapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.enterprise.domain.CarManage;
import com.muyu.enterprise.domain.dto.CarDTO;
import com.muyu.enterprise.domain.vo.CarVO;
import org.apache.ibatis.annotations.Param;
import java.util.List;
/**
* @author zmw
* @description: mybatis
* @Date 2023-11-13 10:05
* --
* @ClassName CarManageMapper
* @Description Mapper
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
public interface SysCarMapper extends BaseMapper<CarVO> {
public interface CarManageMapper extends BaseMapper<CarManage> {
/**
*
* @param queryWrapper

View File

@ -4,6 +4,20 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.enterprise.domain.CarMessage;
import org.apache.ibatis.annotations.Mapper;
import java.util.List;
/**
* --
* @ClassName CarMessageMapper
* @Description Mapper
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Mapper
public interface CarMessageMapper extends BaseMapper<CarMessage> {
/**
*
* @param templateId
* @return
*/
List<CarMessage> selectMessageShow(Long templateId);
}

View File

@ -0,0 +1,15 @@
package com.muyu.enterprise.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.muyu.enterprise.domain.CarMessageType;
import org.apache.ibatis.annotations.Mapper;
/**
* --
* @ClassName CarMessageTypeMapper
* @Description Mapper
* @author MingWei.Zong
* @Date 2024/9/28 16:52
*/
@Mapper
public interface CarMessageTypeMapper extends BaseMapper<CarMessageType> {
}

Some files were not shown because too many files have changed in this diff Show More