diff --git a/cloud-common/cloud-common-cache/pom.xml b/cloud-common/cloud-common-cache/pom.xml new file mode 100644 index 0000000..488b785 --- /dev/null +++ b/cloud-common/cloud-common-cache/pom.xml @@ -0,0 +1,32 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + + cloud-common-cache 缓存基准 + + + cloud-common-cache + + + 23 + 23 + UTF-8 + + + + + + com.muyu + cloud-common-redis + + + + diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java new file mode 100644 index 0000000..7d54ada --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheAbsBasic.java @@ -0,0 +1,63 @@ +package com.muyu.common.cache; + +import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.redis.service.RedisService; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.concurrent.TimeUnit; + +/** + * 抽象缓存层 + * * @className: CacheAbsBasic ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/29 16:08 ⏰ + * * @Version: 1.0 + * * @description: + */ +public abstract class CacheAbsBasic implements CacheBasic{ + + @Autowired + private RedisService redisService; + + @Override + public void put(K key, V value) { + + try { + redisService.setCacheObject(encode(key), value,30L,TimeUnit.MINUTES); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + } + + @Override + public V get(K key) { + + try { + return redisService.getCacheObject(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + } + + @Override + public void remove(K key) { + + try { + redisService.deleteObject(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + } + + @Override + public boolean hashKey(K key){ + Boolean b = false; + + try { + b = redisService.hasKey(encode(key)); + } catch (Exception e) { + throw new RuntimeException("运行时异常，异常信息为：{}"+e.getMessage()); + } + return b; + } +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java new file mode 100644 index 0000000..0971ac2 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CacheBasic.java @@ -0,0 +1,24 @@ +package com.muyu.common.cache; + +import org.springframework.data.redis.core.TimeoutUtils; + +import java.util.Date; +import java.util.concurrent.TimeUnit; + +/** + * 缓存基础 + * * @className: CacheBasic ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/29 16:08 ⏰ + * * @Version: 1.0 + * * @description: + */ +public interface CacheBasic extends PrimaryKeyBasic{ + void put(K key, V value); + + V get(K key); + + void remove(K key); + + boolean hashKey(K key); +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java new file mode 100644 index 0000000..50f2341 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/PrimaryKeyBasic.java @@ -0,0 +1,36 @@ +package com.muyu.common.cache; + +/** + * 主键基础 + * * @className: PrimaryKeyBasic ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/29 16:08 ⏰ + * * @Version: 1.0 + * * @description: + */ +public interface PrimaryKeyBasic { + + /** + * 主键前缀 + * @return + */ + public String keyPre(); + + /** + * 主键编码 + * @param key 缓存建 + * @return 装修建 + */ + public default String encode(K key){ + return keyPre() + key.toString(); + } + + /** + * 主键解码 + * @param key 缓存建 + * @return 装修建 + */ + public default K decode(String key) { + return (K) key.substring(keyPre().length()); + } +} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java index bb59b70..c2a492f 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/constant/ServiceNameConstants.java @@ -20,4 +20,10 @@ public class ServiceNameConstants { * 文件服务的serviceid */ public static final String FILE_SERVICE = "cloud-file"; + + /** + * 车辆服务的serviceid + */ + public static final String ENTERPRISE_SERVICE = "cloud-saas"; + } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java index 3789a82..26313b2 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java @@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo; import com.muyu.common.core.utils.DateUtils; import com.muyu.common.core.utils.PageUtils; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.web.page.TableDataInfo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -19,7 +20,7 @@ import java.util.List; * * @author muyu */ -public class BaseController { +public class BaseController { protected final Logger logger = LoggerFactory.getLogger(this.getClass()); /** diff --git a/cloud-common/cloud-common-kafka/pom.xml b/cloud-common/cloud-common-kafka/pom.xml new file mode 100644 index 0000000..1d7e765 --- /dev/null +++ b/cloud-common/cloud-common-kafka/pom.xml @@ -0,0 +1,34 @@ + + + 4.0.0 + + com.muyu + cloud-common + 3.6.3 + + + cloud-common-kafka + + + 8 + 8 + UTF-8 + + + + + + com.muyu + cloud-common-core + + + + + org.apache.kafka + kafka-clients + + + + diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java new file mode 100644 index 0000000..2a75122 --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaConsumerConfig.java @@ -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: wangXin + * @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 kafkaConsumer() { + HashMap 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 keyDeserializer = new StringDeserializer(); + Deserializer valueDeserializer = new StringDeserializer(); + return new KafkaConsumer<>(configs, keyDeserializer, valueDeserializer); + } +} diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProducerConfig.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProducerConfig.java new file mode 100644 index 0000000..51162de --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/config/KafkaProducerConfig.java @@ -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: wangXin + * @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 kafkaProducer() { + HashMap 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 keySerializer = new StringSerializer(); + Serializer valueSerializer = new StringSerializer(); + return new KafkaProducer<>(configs, keySerializer, valueSerializer); + } +} diff --git a/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constant/KafkaConfigConstants.java b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constant/KafkaConfigConstants.java new file mode 100644 index 0000000..0bd1f73 --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/java/com/muyu/common/kafka/constant/KafkaConfigConstants.java @@ -0,0 +1,74 @@ +package com.muyu.common.kafka.constant; + +/** + * @Author: wangXin + * @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"; +} diff --git a/cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..1d39066 --- /dev/null +++ b/cloud-common/cloud-common-kafka/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.muyu.common.kafka.config.KafkaProducerConfig +com.muyu.common.kafka.config.KafkaConsumerConfig diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index d00dfc6..eb626f1 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -20,6 +20,8 @@ cloud-common-system cloud-common-xxl cloud-common-rabbit + cloud-common-cache + cloud-common-kafka cloud-common diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/SysCarFaultApplication.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/SysCarFaultApplication.java deleted file mode 100644 index c18a353..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/SysCarFaultApplication.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu; - -import cn.hutool.core.date.DateTime; -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -import javax.xml.crypto.Data; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Calendar; -import java.util.Date; -import java.util.Random; -import java.util.TimeZone; - -/** - * @className: SysCarFaultApplication ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/21 11:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication -public class SysCarFaultApplication { - public static void main (String[] args) throws ParseException { - SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+08")); - String format = simpleDateFormat.format(new Date()); - System.out.println("故障模块启动成功"+format); - SpringApplication.run(SysCarFaultApplication.class, args); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/CarTypeController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/CarTypeController.java deleted file mode 100644 index 680da12..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/CarTypeController.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.service.CarTypeService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: CarTypeController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ -@RequestMapping("/cartype") -@RestController -public class CarTypeController { - - @Autowired - private CarTypeService carTypeService; - - /** - * 车辆类型 - * @return - */ - @PostMapping("/list") - @Operation(summary = "车辆类型",description = "车辆类型信息") - public Result carTypeList(){ - return Result.success(carTypeService.selectcarType()); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultCodeController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultCodeController.java deleted file mode 100644 index 381a12e..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultCodeController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.muyu.fault.controller; - - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.resp.FaultCodeTotalListResp; -import com.muyu.fault.service.FaultCodeService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -/** - * @className: CarTypeController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障码 - */ - -@RestController -@RequestMapping("/faultcode") -public class FaultCodeController { - - @Autowired - private FaultCodeService faultCodeService; - - /** - * 故障码展示(仅故障码单表) - * @param faultCodeListReq - * @return - */ - @PostMapping(path = "/list") - @Operation(summary = "故障码列表(单)",description = "展示故障码信息") - public Result selectlist(@Validated @RequestBody FaultCodeListReq faultCodeListReq){ - return Result.success(faultCodeService.selectlist(faultCodeListReq)); - } - - - /** - * 故障码展示(故障码联查) - * @param faultCodeListReq - * @return - */ - @PostMapping("/faultcodelist") - @Operation(summary = "故障码列表(多)",description = "展示故障码信息") - public Result selectfaultcodelist(@Validated @RequestBody FaultCodeListReq faultCodeListReq){ - return Result.success(faultCodeService.selectfaultcodelist(faultCodeListReq)); - } - - - /** - * 新增故障码 - * @param faultCodeAddReq - * @return - */ - @PostMapping("/faultcodeadd") - @Operation(summary = "新增故障码",description = "新增故障码信息") - public Result insertfaultcode(@Validated @RequestBody FaultCodeAddReq faultCodeAddReq){ - faultCodeService.insert(faultCodeAddReq); - return Result.success(null,"新增成功"); - } - - /** - * 修改故障码 - * @param faultCodeUpdReq - * @return - */ - @PostMapping("/faultcodeupd") - @Operation(summary = "修改故障码",description = "修改故障码信息") - public Result updfaultcode(@Validated @RequestBody FaultCodeUpdReq faultCodeUpdReq){ - faultCodeService.upd(faultCodeUpdReq); - return Result.success(null,"修改成功"); - } - - /** - * 删除故障码 - * @param messageTypeId - * @return - */ - @PostMapping("/faultcodedel/{messageTypeId}") - @Operation(summary = "删除故障码",description = "删除故障码信息") - public Result delfaultcode(@PathVariable("messageTypeId") Integer messageTypeId){ - faultCodeService.del(messageTypeId); - return Result.success(null,"删除成功"); - } - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultConditionController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultConditionController.java deleted file mode 100644 index 8648deb..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultConditionController.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.muyu.fault.controller; - - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import com.muyu.fault.domain.req.FaultConditionUpdReq; -import com.muyu.fault.service.FaultConditionService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import java.util.List; - -/** - * @className: CarTypeController ️✈️ -* @author: Yang 鹏 🦅 -* @date: 2024/9/23 22:06 ⏰ -* @Version: 1.0 -* @description: 故障检测 -*/ - -@RestController -@RequestMapping("/faultcondition") -public class FaultConditionController { - - @Autowired - private FaultConditionService faultConditionService; - - - /** - * 故障规则 - * @param faultConditionListReq - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障规则列表展示",description = "故障规则列表展示") - public Result getfaultrulelist(@RequestBody @Validated FaultConditionListReq faultConditionListReq){ - return Result.success(faultConditionService.getfaultrulelist(faultConditionListReq)); - } - - - /** - * 故障规则添加 - * @param faultConditionAddReq - * @return - */ - @PostMapping("/faultconditionadd") - @Operation(summary = "添加规则",description = "添加故障规则") - public Result faultconditionadd(@RequestBody FaultConditionAddReq faultConditionAddReq){ - //判断车辆类型是否已存在所对应的故障规则 - List faultConditionList = faultConditionService.selectBytypeAndlabel(faultConditionAddReq); - if (faultConditionList.size()>0){ - return Result.error("此车辆类型已存在所对应的故障规则,无需重新制定，可在原规则上进行修改"); - } - faultConditionService.save(FaultCondition.faultConditionadd(faultConditionAddReq)); - return Result.success(null,"规则制定成功"); - } - - /** - * 故障规则修改 - * @param - * @param faultConditionUpdReq - * @return - */ - @PostMapping("/faultconditionupd") - @Operation(summary = "修改规则",description = "修改故障规则") - public Result faultconditionupd( - @RequestBody @Validated FaultConditionUpdReq faultConditionUpdReq){ - faultConditionService.updateById(FaultCondition.faultConditionupd(faultConditionUpdReq,()->faultConditionUpdReq.getCarconditionId())); - return Result.success(null,"规则修改成功"); - } - - - /** - * 故障规则删除 - * @param carconditionId - * @return - */ - @PostMapping("/faultconditiondel/{carconditionId}") - @Operation(summary = "删除规则",description = "删除故障规则") - public Result faultconditiondel(@PathVariable("carconditionId") long carconditionId){ - faultConditionService.removeById(carconditionId); - return Result.success(null,"规则删除成功"); - } - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultDetectionStrategyController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultDetectionStrategyController.java deleted file mode 100644 index 0f23788..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultDetectionStrategyController.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.fault.controller; - -import com.muyu.fault.service.FaultDetectionStrategyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultDetectionStrategyController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障码 - */ -@RestController -@RequestMapping("/faultdetectionstrategy") -public class FaultDetectionStrategyController { - - @Autowired - private FaultDetectionStrategyService faultDetectionStrategyService; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLabelController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLabelController.java deleted file mode 100644 index 8bc5e50..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLabelController.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.fault.controller; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.service.FaultLabelService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 故障码分类 - */ -@RestController -@RequestMapping("/faultlabel") -public class FaultLabelController { - - @Autowired - private FaultLabelService faultLabelService; - - - /** - * 故障名称 - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障名称查询",description = "故障名称信息") - public Result findfaulttype(){ - return Result.success(faultLabelService.select()); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java deleted file mode 100644 index 2440f9f..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultLogController.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.controller; -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.req.FaultLogListReq; -import com.muyu.fault.service.FaultLogService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ -@RestController -@RequestMapping("/faultlog") -public class FaultLogController { - @Autowired - private FaultLogService faultLogService; - - - /** - * 故障日志列表 - * @param faultLogListReq - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障日志列表",description = "故障日志列表展示") - public Result selectfaultlog(@Validated @RequestBody FaultLogListReq faultLogListReq){ - return Result.success(faultLogService.selectfaultlog(faultLogListReq)); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultRuleController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultRuleController.java deleted file mode 100644 index a60905b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultRuleController.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.CarFaultRule; -import com.muyu.fault.domain.FaultRule; -import com.muyu.fault.service.FaultRuleService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@RestController -@RequestMapping("/faultrule") -public class FaultRuleController { - - @Autowired - private FaultRuleService faultRuleService; - - - /** - * 车辆故障检测 - * @return - */ - @PostMapping("/check-faults") - @Operation(summary = "检查故障",description = "进行故障检查") - public Result checkfault(@Validated FaultRule faultRule){ - String checkfaults = faultRuleService.checkfaults(faultRule); - return Result.success(checkfaults); - } - - - @PostMapping("/cheakfaults") - @Operation(summary = "故障参数匹配检查",description = "获取报文数据与故障参数进行比较") - public Result cheakfaults(@Validated @RequestBody CarFaultRule carFaultRule){ -// faultRuleService.checkfaults(carFaultRule); - return null; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java deleted file mode 100644 index 30ebfc5..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/FaultTypeController.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.fault.controller; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -import com.muyu.common.core.domain.Result; -import com.muyu.fault.service.FaultTypeService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * 故障码分类 - */ -@RestController -@RequestMapping("/faulttype") -public class FaultTypeController { - - @Autowired - private FaultTypeService faultTypeService; - - - /** - * 故障码分类查询 - * @return - */ - @PostMapping("/list") - @Operation(summary = "故障码分类查询",description = "故障码分类信息") - public Result findfaulttype(){ - return Result.success(faultTypeService.select()); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/MessageController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/MessageController.java deleted file mode 100644 index ee0aa0e..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/MessageController.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.muyu.fault.controller; - - -import com.muyu.common.core.domain.Result; -import com.muyu.fault.domain.message.Message; -import com.muyu.fault.domain.message.MessageReq; -import com.muyu.fault.domain.message.MessageSendReq; -import com.muyu.fault.service.MessageService; -import io.swagger.v3.oas.annotations.Operation; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@RestController -@RequestMapping("/message") -public class MessageController { - - @Autowired - private MessageService messageService; - - /** - * 消息发送 - * @param messageSendReq - * @return - */ - @PostMapping("/sendmessage") - @Operation(summary = "发送消息",description = "站内信消息发送") - public Result sendmessage(@Validated MessageSendReq messageSendReq){ - messageService.sendmessage(messageSendReq); - return Result.success(null,"发送成功"); - } - - /** - * 消息查看 - * @param messageReq - * @param - * @return - */ - @PostMapping("/messagelist") - @Operation(summary = "消息查看(能根据登录人新的信息查看当前登录人的消息栏)",description = "消息查看") - public Result selectmessage(@Validated @RequestBody MessageReq messageReq){ - return Result.success(messageService.selectmessage(messageReq)); - } - - /** - * 查看消息改变状态 - * @param message - * @return - */ - @PostMapping("/changestatus") - @Operation(summary = "状态改变",description = "状态改变") - public Result changestatus(@RequestBody Message message){ - messageService.changestatus(message); - return Result.success(null,"成功"); - } - - - /** - * 查看未读的消息 - * @return - */ - @PostMapping("/unread") - @Operation(summary = "查看未读的消息",description = "查看未读的消息") - public Result unread(){ - return Result.success(messageService.unread()); - } - - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java deleted file mode 100644 index 10728a1..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/controller/SysCarFaultController.java +++ /dev/null @@ -1,112 +0,0 @@ -package com.muyu.fault.controller; - -import java.util.Arrays; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.fault.domain.SysCarFault; -import com.muyu.fault.service.ISysCarFaultService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.security.utils.SecurityUtils; -import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; - -/** - * 车辆故障Controller - * - * @author Yang鹏 - * @date 2024-09-18 - */ -@RestController -@RequestMapping("/fault") -public class SysCarFaultController extends BaseController -{ - @Resource - private ISysCarFaultService sysCarFaultService; - - /** - * 查询车辆故障列表 - */ - - @GetMapping("/list") - public Result> list(SysCarFault sysCarFault) - { - startPage(); - List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); - return getDataTable(list); - } - - /** - * 导出车辆故障列表 - */ - @RequiresPermissions("syscarfault:fault:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysCarFault sysCarFault) - { - List list = sysCarFaultService.selectSysCarFaultList(sysCarFault); - ExcelUtil util = new ExcelUtil(SysCarFault.class); - util.exportExcel(response, list, "车辆故障数据"); - } - - /** - * 获取车辆故障详细信息 - */ - @RequiresPermissions("syscarfault:fault:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { - return success(sysCarFaultService.selectSysCarFaultById(id)); - } - - /** - * 新增车辆故障 - */ - @RequiresPermissions("syscarfault:fault:add") - @PostMapping - public Result add( - @Validated @RequestBody SysCarFault sysCarFault) - { - if (sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("新增 车辆故障 '" + sysCarFault + "'失败，车辆故障已存在"); - } - sysCarFault.setCreateBy(SecurityUtils.getUsername()); - return toAjax(sysCarFaultService.save(sysCarFault)); - } - - /** - * 修改车辆故障 - */ - @RequiresPermissions("syscarfault:fault:edit") - @PutMapping - public Result edit( - @Validated @RequestBody SysCarFault sysCarFault) - { - if (!sysCarFaultService.checkIdUnique(sysCarFault)) { - return error("修改 车辆故障 '" + sysCarFault + "'失败，车辆故障不存在"); - } - sysCarFault.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(sysCarFaultService.updateById(sysCarFault)); - } - - /** - * 删除车辆故障 - */ - @RequiresPermissions("syscarfault:fault:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { - sysCarFaultService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarFaultRule.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarFaultRule.java deleted file mode 100644 index d6c1daf..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarFaultRule.java +++ /dev/null @@ -1,206 +0,0 @@ -package com.muyu.fault.domain; - -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class CarFaultRule {/** - * VIN码VIN码VIN码 - */ -private String vin; - /** - * 时间戳时间戳时间戳 - */ - private long timestamp; - /** - * 经度经度经度 - */ - private double longitude; - /** - * 纬度纬度纬度 - */ - private double latitude; - /** - * 车速车速车速 - */ - private double speed; - /** - * 总里程总里程总里程 - */ - private long TM; - /** - * 总电压总电压总电压 - */ - private double TV; - /** - * 总电流总电流总电流 - */ - private double CC; - /** - * 绝缘电阻绝缘电阻绝缘电阻 - */ - private double IR; - /** - * 档位档位档位 - */ - private String GP; - /** - * 加速踏板行程值加速踏板行程值加速踏板行程值 - */ - private double APTV; - /** - * 制动踏板行程值制动踏板行程值制动踏板行程值 - */ - private double BPTV; - /** - * 燃料消耗率燃料消耗率燃料消耗率 - */ - private double SFC; - /** - * 电机控制器温度电机控制器温度电机控制器温度 - */ - private double MCT; - /** - * 电机转速电机转速电机转速 - */ - private int MS; - /** - * 电机转矩电机转矩电机转矩 - */ - private double MTO; - /** - * 电机温度电机温度电机温度 - */ - private double MTE; - /** - * 电机电压电机电压电机电压 - */ - private double MV; - /** - * 电机电流电机电流电机电流 - */ - private double MC; - /** - * 动力电池剩余电量SOC动力电池剩余电量SOC动力电池剩余电量SOC - */ - private double PBRSOC; - /** - * 当前状态允许的最大反馈功率当前状态允许的最大反馈功率当前状态允许的最大反馈功率 - */ - private double MACSFP; - /** - * 当前状态允许最大放电功率当前状态允许最大放电功率当前状态允许最大放电功率 - */ - private double CSATMDP; - /** - * BMS自检计数器BMS自检计数器BMS自检计数器 - */ - private int BMS; - /** - * 动力电池充放电电流动力电池充放电电流动力电池充放电电流 - */ - private double CADC; - /** - * 动力电池负载端总电压V3动力电池负载端总电压V3动力电池负载端总电压V3 - */ - private double PBLETVV3; - /** - * 单次最大电压单次最大电压单次最大电压 - */ - private double SMV; - /** - * 单体电池最低电压单体电池最低电压单体电池最低电压 - */ - private double MVOAB; - /** - * 单体电池最高温度单体电池最高温度单体电池最高温度 - */ - private double MAXBT; - /** - * 单体电池最低温度单体电池最低温度单体电池最低温度 - */ - private double MINBT; - /** - * 动力电池可用容量动力电池可用容量动力电池可用容量 - */ - private double PBAC; - /** - * 车辆状态车辆状态车辆状态 - */ - private String VS; - /** - * 充电状态充电状态充电状态 - */ - private String CS; - /** - * 运行状态运行状态运行状态 - */ - private String RS; - /** - * SOCSOCSOC - */ - private double SOC; - /** - * 可充电储能装置工作状态可充电储能装置工作状态可充电储能装置工作状态 - */ - private String RESDWC; - /** - * EASEASEAS - */ - private String EAS; - /** - * PTCPTCPTC - */ - private String PTC; - /** - * EPSEPSEPS - */ - private String EPS; - /** - * ABSABSABS - */ - private String ABS; - /** - * MCUMCUMCU - */ - private String MCU; - /** - * 动力电池加热状态动力电池加热状态动力电池加热状态 - */ - private String PBHS; - /** - * 动力电池当前状态动力电池当前状态动力电池当前状态 - */ - private String PBCS; - /** - * 动力电池保温状态动力电池保温状态动力电池保温状态 - */ - private String PBIS; - /** - * DCDCDCDCDCDC - */ - private String DCDC; - /** - * CHGCHGCHG - */ - private String CHG; - /** - * 校验位校验位校验位 - */ - private byte CHB; - /** - * 截止位截止位截止位 - */ - private byte CUB; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarType.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarType.java deleted file mode 100644 index f5f1c35..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/CarType.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: CarType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:01 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_type",autoResultMap = true) -public class CarType { - /** - * 车辆类型ID - */ - private long carTypeId; - /** - * 车辆类型名 - */ - private String carTypeName; - /** - * 车辆规则外键ID - */ - private long carTypeRules; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCode.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCode.java deleted file mode 100644 index 9ae4b02..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCode.java +++ /dev/null @@ -1,71 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultCode ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:21 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_faultcode", autoResultMap = true) -public class FaultCode { - /** - * 故障码Id - */ - @TableId(value = "faultcode_id", type = IdType.AUTO) - private long faultcodeId; - /** - * 故障名称Id - */ - private long messageTypeId; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 故障组 - */ - private String faultGroup; - /** - * 故障位 - */ - private String faultBit; - /** - * 故障值 - */ - private String faultValue; - /** - * 是否警告 - */ - private Integer isWarning; - - private String faulttypeName; - private String messageTypeName; - private String messageTypeCode; - private String messageTypeBelongs; - - public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq) { - return FaultCode.builder() - .faultcodeId(0) - .messageTypeId(faultCodeAddReq.getMessageTypeId()) - .faultcodeNumber(faultCodeAddReq.getFaultcodeNumber()) - .faultGroup(faultCodeAddReq.getFaultGroup()) - .faultBit(faultCodeAddReq.getFaultBit()) - .faultValue(faultCodeAddReq.getFaultValue()) - .isWarning(faultCodeAddReq.getIsWarning()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCondition.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCondition.java deleted file mode 100644 index 1e5c926..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultCondition.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionUpdReq; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; -import java.util.function.Supplier; - -/** - * @className: FaultCondition ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_condition",autoResultMap = true) -public class FaultCondition { - /** - * 故障规则表Id - */ - @TableId(value = "carcondition_id",type = IdType.AUTO) - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; - /** - * 车辆类型名称 - */ - private String carTypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - - - public static FaultCondition faultConditionadd(FaultConditionAddReq faultConditionAddReq){ - return FaultCondition.builder() - .carTypeId(faultConditionAddReq.getCarTypeId()) - .messageTypeId(faultConditionAddReq.getMessageTypeId()) - .faultconditionIdentification(faultConditionAddReq.getFaultconditionIdentification()) - .faultconditionParameter(faultConditionAddReq.getFaultconditionParameter()) - .build(); - } - - public static FaultCondition faultConditionupd(FaultConditionUpdReq faultConditionUpdReq, Supplier idSupplier){ - return FaultCondition.builder() - .carconditionId(faultConditionUpdReq.getCarconditionId()) - .carTypeId(faultConditionUpdReq.getCarTypeId()) - .messageTypeId(faultConditionUpdReq.getMessageTypeId()) - .faultconditionIdentification(faultConditionUpdReq.getFaultconditionIdentification()) - .faultconditionParameter(faultConditionUpdReq.getFaultconditionParameter()) - .build(); - } - - - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLabel.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLabel.java deleted file mode 100644 index 3211a6b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLabel.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.muyu.fault.domain; - -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; - -/** - * @className: FaultLabel ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_label",autoResultMap = true) -public class FaultLabel { - - /** - *自增主键 - */ - @TableId(value = "message_type_id",type = IdType.AUTO) - private String messageTypeId; - /** - *报文编码 - */ - private String messageTypeCode; - /** - *报文名称 - */ - private String messageTypeName; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java deleted file mode 100644 index f3269f2..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultLog.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.muyu.fault.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 lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.Date; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_log",autoResultMap = true) -public class FaultLog { - - /** - * 故障日志Id - */ - @TableId(value = "log_id",type = IdType.AUTO) - private long logId; - /** - * 故障码Id - */ - private long faultcodeId; - /** - * 车辆Id - */ - private long carInformationId; - /** - * 车辆VIN - */ - private String carVin; - /** - * 开始报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date startwarningTime; - /** - * 结束报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date endwarningTime; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 车辆vin - */ - private String carInformationVIN; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultReport.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultReport.java deleted file mode 100644 index bd26bce..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultReport.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.fault.domain; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultReport ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class FaultReport { - private String VehicleType; - private String FaultDescription; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultRule.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultRule.java deleted file mode 100644 index d081ac2..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultRule.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.muyu.fault.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.math.BigDecimal; - -/** - * @className: FaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_condition",autoResultMap = true) -public class FaultRule { - /** - * 触发条件Id - */ - private long conditionId; - - /** - * 故障码Id - */ - private long faultcodeId; - - /** - * 触发条件描述 - */ - private String conditionContent; - - /** - * 单个参数的阈值 - */ - private BigDecimal singleThreshold; - - /** - * 区间参数的阈值的最小值 - */ - private BigDecimal minThreshold; - - /** - * 区间参数的阈值的最大值 - */ - private BigDecimal maxThreshold; - - /** - * 触发条件是否激活 - */ - private Integer isActive; - - /** - * 车辆数据值 - */ - private BigDecimal Threshold; - - - -} - diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultType.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultType.java deleted file mode 100644 index 613f366..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/FaultType.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.fault.domain; - -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; - -/** - * @className: FaultType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:04 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_type",autoResultMap = true) -public class FaultType { - /** - *故障类型Id - */ - @TableId(value = "faulttype_id",type = IdType.AUTO) - private long faulttypeId; - /** - *故障类型名称 - */ - private String faulttypeName; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageDao.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageDao.java deleted file mode 100644 index 0d19cbd..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageDao.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.domain; - -import com.muyu.fault.domain.message.Message; -import lombok.Data; - -import java.sql.Connection; -import java.sql.PreparedStatement; - -/** - * @className: MessageDao ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:58 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -public class MessageDao { - private Connection connection; - - public MessageDao(Connection connection){ - this.connection=connection; - } - - public void sendMessage(Message message) throws Exception{ - String sql="INSERT INTO `eight`.`car_fault_message` (`id`, `sender`, `receiver`, `content`, `status`, `create_time`, `user_id`) " + - "VALUES (NULL, NULL, NULL, NULL, NULL, NULL, NULL)"; - try(PreparedStatement pstmt=connection.prepareStatement(sql)){ - pstmt.setString(1, message.getContent()); - pstmt.setString(2, message.getSender()); - pstmt.setString(3, message.getReceiver()); - pstmt.setObject(4, message.getCreateTime()); - pstmt.executeUpdate(); - } - - - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageService.java deleted file mode 100644 index 70dea96..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/MessageService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.muyu.fault.domain; - -import com.muyu.fault.domain.message.Message; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; - -/** - * @className: MessageService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:01 ⏰ - * @Version: 1.0 - * @description: 业务逻辑层将负责实现消息的发送逻辑 - */ - -public class MessageService { - private MessageDao messageDao; - - public MessageService(MessageDao messageDao){ - this.messageDao=messageDao; - } - - public void sendMessage(String content,String sender,String receiver){ - - // 定义一个DateTimeFormatter对象，用于格式化日期时间为yyyy-MM-dd HH:mm:ss - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 获取当前日期和时间 - LocalDateTime now = LocalDateTime.now(); - // 使用formatter格式化当前日期和时间 - String formattedDateTime = now.format(formatter); - // 使用formatter将字符串解析回LocalDateTime - LocalDateTime parsedDateTime = LocalDateTime.parse(formattedDateTime, formatter); - // 然后按照上面的步骤将LocalDateTime转换为Date - ZonedDateTime zdt = parsedDateTime.atZone(ZoneId.systemDefault()); - Date date = Date.from(zdt.toInstant()); - - - Message message = new Message(); - message.setContent(content); - message.setSender(sender); - message.setReceiver(receiver); - message.setCreateTime(date); - - try { - messageDao.sendMessage(message); - } catch (Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/SysCarFault.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/SysCarFault.java deleted file mode 100644 index e05d86b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/SysCarFault.java +++ /dev/null @@ -1,102 +0,0 @@ -package com.muyu.fault.domain; - -import com.muyu.common.core.annotation.Excel; -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.IdType; - -/** - * 车辆故障对象 sys_car_fault - * - * @author Yang鹏 - * @date 2024-09-18 - */ - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("sys_car_fault") -public class SysCarFault extends BaseEntity{ - private static final long serialVersionUID = 1L; - - /** 自增主键 */ - @TableId( type = IdType.AUTO) - private Long id; - - /** 车辆故障编码; */ - @Excel(name = "车辆故障编码;") - private String faultCode; - - /** 车辆故障名称 */ - @Excel(name = "车辆故障名称") - private String faultName; - - /** 车辆故障类型 */ - @Excel(name = "车辆故障类型") - private String faultType; - - /** 故障VIN编码 */ - @Excel(name = "故障VIN编码") - private String carVin; - - /** 车辆故障标签 */ - @Excel(name = "车辆故障标签") - private String faultLabel; - - /** 车辆故障位 */ - @Excel(name = "车辆故障位") - private String faultBit; - - /** 车辆故障值 */ - @Excel(name = "车辆故障值") - private String faultValue; - - /** 故障级别; */ - @Excel(name = "故障级别;") - private String faultWarn; - - /** 报警状态（Y.是，N.否） */ - @Excel(name = "报警状态", readConverterExp = "Y=.是，N.否") - private String warnStatus; - - /** 故障描述信息 */ - @Excel(name = "故障描述信息") - private String faultDesc; - - /** 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) */ - @Excel(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") - private String state; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("faultCode", getFaultCode()) - .append("faultName", getFaultName()) - .append("faultType", getFaultType()) - .append("carVin", getCarVin()) - .append("faultLabel", getFaultLabel()) - .append("faultBit", getFaultBit()) - .append("faultValue", getFaultValue()) - .append("faultWarn", getFaultWarn()) - .append("warnStatus", getWarnStatus()) - .append("faultDesc", getFaultDesc()) - .append("state", getState()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/WarnLevel.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/WarnLevel.java deleted file mode 100644 index bd25d39..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/WarnLevel.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.muyu.fault.domain; - -public enum WarnLevel { - LOW, MEDIUM, HIGH -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java deleted file mode 100644 index b7028e0..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/Message.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.Date; - -/** - * @className: Message ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_message",autoResultMap = true) -public class Message { - /** - * id - */ - @TableId(value = "id",type = IdType.AUTO) - private long id; - - /** - * 发送者 - */ - private String sender; - - /** - * 接收者 - */ - private String receiver; - - /** - * 消息内容 - */ - private String content; - - /** - * 消息状态 - */ - private Integer status; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date createTime; - /** - * 登录人Id - */ - private long userId; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageReq.java deleted file mode 100644 index 0d18799..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageReq.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: MessageReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:59 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class MessageReq { - /** - * 消息状态 - */ - @TableId(type = IdType.AUTO,value = "status") - private Integer status; - /** - * 登录人Id - */ - @Excel(name = "登录人Id") - private long userId; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java deleted file mode 100644 index d310016..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/MessageSendReq.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @className: MessageSendReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:00 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class MessageSendReq { - /** - * 发送者 - */ - @TableId(type = IdType.AUTO,value = "id") - private String sender; - /** - * 接收者 - */ - @Excel(name = "接收者") - private String receiver; - - /** - * 消息内容 - */ - @Excel(name = "消息内容") - private String content; - /** - * 登录人Id - */ - @Excel(name = "登录人Id") - private long userId; - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "String") - private Date createTime; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/User.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/User.java deleted file mode 100644 index 4fc85cc..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/message/User.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.fault.domain.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: User ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:56 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class User { - /** - * 用户id - */ - @TableId(value = "id", type = IdType.AUTO) - private Integer id; - /** - * 用户名 - */ - @Excel(name = "用户名") - private String username; - /** - * 邮箱 - */ - @Excel(name="邮箱") - private String email; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeAddReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeAddReq.java deleted file mode 100644 index 37d61a1..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeAddReq.java +++ /dev/null @@ -1,69 +0,0 @@ -package com.muyu.fault.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultCodeAddReq { - - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 故障分类Id - */ - private long faulttypeId; - /** - * 是否产生报警 - */ - private Integer isWarning; - /** - * 故障描述 - */ - private String faultContent; - /** - *故障组 - */ - private String faultGroup; - /** - *故障位 - */ - private String faultBit; - /** - *故障值 - */ - private String faultValue; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeListReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeListReq.java deleted file mode 100644 index 0c7907a..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeListReq.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.muyu.fault.domain.req; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - -@Tag(name = "故障码列表请求对象") -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultCodeListReq { - /** - *故障码 - */ - private String faultcodeNumber; - /** - *故障位 - */ - private String faultBit; - /** - * 页码，从1开始 - */ - private Integer pageNum=1; - /** - * 每页大小 - */ - private Integer pageSize=10; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionAddReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionAddReq.java deleted file mode 100644 index bfd372b..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionAddReq.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.muyu.fault.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultConditionAddReq { - /** - * 故障规则表Id - */ - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionListReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionListReq.java deleted file mode 100644 index 279e996..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionListReq.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.muyu.fault.domain.req; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Tag(name = "故障规则列表请求对象") -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultConditionListReq { - - - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 页码，从1开始 - */ - private Integer pageNum=1; - /** - * 每页大小 - */ - private Integer pageSize=10; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionUpdReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionUpdReq.java deleted file mode 100644 index 615cbe7..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultConditionUpdReq.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.muyu.fault.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultConditionUpdReq { - - /** - * 故障规则表Id - */ - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java deleted file mode 100644 index aa5fba9..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultLogListReq.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.fault.domain.req; - -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.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.Date; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Tag(name = "故障日志列表请求对象") -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultLogListReq { - - /** - * 故障码Id - */ - private long faultcodeId; - /** - * 车辆VIN - */ - private String carVin; - /** - * 开始报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date startwarningTime; - /** - * 结束报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date endwarningTime; - - /** - * 页码，从1开始 - */ - private Integer pageNum=1; - /** - * 每页大小 - */ - private Integer pageSize=10; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeListResp.java deleted file mode 100644 index ae9e049..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeListResp.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.muyu.fault.domain.resp; - -import com.muyu.fault.domain.vo.FaultCodeVo; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@Builder -@AllArgsConstructor -@Tag(name="故障码信息响应对象",description = "故障码查询的响应结果") -public class FaultCodeListResp { - - /** - *故障码Id - */ - private long faultcodeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - *故障码 - */ - private String faultcodeNumber; - /** - *故障组 - */ - private String faultGroup; - /** - *故障位 - */ - private String faultBit; - /** - *故障值 - */ - private String faultValue; - /** - *是否警告 - */ - private Integer isWarning; - /** - *故障类型名称 - */ - private String faulttypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - /** - * 数据库对象构建为返回结果对象 - * @param faultCodeVO - * @return - */ - public static FaultCodeListResp faultCodeListResp(FaultCodeVo faultCodeVO){ - return FaultCodeListResp.builder() - .faultcodeId(faultCodeVO.getFaultcodeId()) - .messageTypeId(faultCodeVO.getMessageTypeId()) - .faultcodeNumber(faultCodeVO.getFaultcodeNumber()) - .faultGroup(faultCodeVO.getFaultGroup()) - .faultBit(faultCodeVO.getFaultBit()) - .faultValue(faultCodeVO.getFaultValue()) - .isWarning(faultCodeVO.getIsWarning()) - .faulttypeName(faultCodeVO.getFaulttypeName()) - .messageTypeName(faultCodeVO.getMessageTypeName()) - .messageTypeCode(faultCodeVO.getMessageTypeCode()) - .messageTypeBelongs(faultCodeVO.getMessageTypeBelongs()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeTotalListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeTotalListResp.java deleted file mode 100644 index bfa9107..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultCodeTotalListResp.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.fault.domain.resp; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@Tag(name="数据总数列表",description = "数据和总数的响应") -public class FaultCodeTotalListResp { - - - private List faultCodeListRespList; - - private long total; - - public static FaultCodeTotalListResp faultCodeTotalListResp(List faultCodeListRespList,long total){ - FaultCodeTotalListResp faultCodeTotalListResp = new FaultCodeTotalListResp(); - faultCodeTotalListResp.setFaultCodeListRespList(faultCodeListRespList); - faultCodeTotalListResp.setTotal(total); - return faultCodeTotalListResp; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionListResp.java deleted file mode 100644 index 0af43ed..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionListResp.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.muyu.fault.domain.resp; - - -import com.muyu.fault.domain.FaultCondition; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; - -import java.math.BigDecimal; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@Builder -@AllArgsConstructor -@Tag(name="故障规则信息响应对象",description = "故障规则查询的响应结果") -public class FaultConditionListResp { - - /** - * 故障规则表Id - */ - private long carconditionId; - /** - * 车辆类型Id - */ - private long carTypeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障条件 - */ - private String faultconditionIdentification; - /** - * 故障规则参数 - */ - private BigDecimal faultconditionParameter; - /** - * 车辆类型名称 - */ - private String carTypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - - /** - * 数据库对象构建为返回结果对象 - * @param faultCondition - * @return - */ - public static FaultConditionListResp faultConditionListResp(FaultCondition faultCondition){ - return FaultConditionListResp.builder() - .carconditionId(faultCondition.getCarconditionId()) - .carTypeId(faultCondition.getCarTypeId()) - .messageTypeId(faultCondition.getMessageTypeId()) - .faultconditionParameter(faultCondition.getFaultconditionParameter()) - .faultconditionIdentification(faultCondition.getFaultconditionIdentification()) - .carTypeName(faultCondition.getCarTypeName()) - .messageTypeName(faultCondition.getMessageTypeName()) - .messageTypeCode(faultCondition.getMessageTypeCode()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionTotalListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionTotalListResp.java deleted file mode 100644 index 1968d71..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultConditionTotalListResp.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.fault.domain.resp; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@Tag(name="故障规则数据总数列表",description = "数据和总数的响应") -public class FaultConditionTotalListResp { - - private List faultConditionListRespList; - - private long total; - - public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,long total){ - FaultConditionTotalListResp faultConditionTotalListResp = new FaultConditionTotalListResp(); - faultConditionTotalListResp.setFaultConditionListRespList(faultConditionListRespList); - faultConditionTotalListResp.setTotal(total); - return faultConditionTotalListResp; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java deleted file mode 100644 index 84057b7..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogListResp.java +++ /dev/null @@ -1,83 +0,0 @@ -package com.muyu.fault.domain.resp; - -import com.fasterxml.jackson.annotation.JsonFormat; - -import com.muyu.fault.domain.FaultLog; -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 java.util.Date; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@Builder -@AllArgsConstructor -@Tag(name="故障日志信息响应对象",description = "故障日志的响应结果") -public class FaultLogListResp { - - - /** - * 故障日志Id - */ - private long logId; - /** - * 故障码Id - */ - private long faultcodeId; - /** - * 车辆Id - */ - private long carInformationId; - /** - * 车辆VIN - */ - private String carVin; - /** - * 开始报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "开始报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date startwarningTime; - /** - * 结束报警时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "结束报警时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date endwarningTime; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 车辆vin - */ - private String carInformationVIN; - - - /** - * 数据库对象构建为返回结果对象 - * @param faultLog - * @return - */ - public static FaultLogListResp faultLogListResp(FaultLog faultLog){ - return FaultLogListResp.builder() - .logId(faultLog.getLogId()) - .faultcodeId(faultLog.getFaultcodeId()) - .carInformationId(faultLog.getCarInformationId()) - .carVin(faultLog.getCarVin()) - .startwarningTime(faultLog.getStartwarningTime()) - .endwarningTime(faultLog.getEndwarningTime()) - .faultcodeNumber(faultLog.getFaultcodeNumber()) - .carInformationVIN(faultLog.getCarInformationVIN()) - .build(); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogTotalListResp.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogTotalListResp.java deleted file mode 100644 index b77392d..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/resp/FaultLogTotalListResp.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.fault.domain.resp; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.List; - -/** - * @className: Messages ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@SuperBuilder -@AllArgsConstructor -@NoArgsConstructor -@Tag(name="故障日志数据总数列表",description = "数据和总数的响应") -public class FaultLogTotalListResp { - - private List faultLogListRespList; - - private long total; - - public static FaultLogTotalListResp faultLogTotalListResp(List faultLogListRespList,long total){ - FaultLogTotalListResp faultLogTotalListResp = new FaultLogTotalListResp(); - faultLogTotalListResp.setFaultLogListRespList(faultLogListRespList); - faultLogTotalListResp.setTotal(total); - return faultLogTotalListResp; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/vo/FaultCodeVo.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/vo/FaultCodeVo.java deleted file mode 100644 index 56f3c00..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/vo/FaultCodeVo.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.muyu.fault.domain.vo; - -import com.muyu.fault.domain.FaultCode; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; -/** - * @className: FaultCodeVo ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:18 ⏰ - * @Version: 1.0 - * @description: - */ -@EqualsAndHashCode(callSuper = true) -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class FaultCodeVo extends FaultCode { - /** - *故障类型名称 - */ - private String faulttypeName; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/CarTypeMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/CarTypeMapper.java deleted file mode 100644 index 2460a6a..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/CarTypeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.domain.CarType; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: CarTypeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface CarTypeMapper extends BaseMapper { - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultCodeMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultCodeMapper.java deleted file mode 100644 index bb36881..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultCodeMapper.java +++ /dev/null @@ -1,45 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultCode; - -import com.muyu.fault.domain.FaultLabel; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.vo.FaultCodeVo; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; - -import java.util.List; - -/** - * @className: FaultCodeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultCodeMapper extends BaseMapper { - - List selectfaultcodelist(FaultCodeListReq faultCodeListReq); - - - - //新增故障码 - FaultLabel selectfaultName(@Param("messageTypeName") String messageTypeName); - FaultCode selectfaultCode(@Param("faultcodeNumber") String faultcodeNumber); - Integer insertfaultlabel(FaultCodeAddReq faultCodeAddReq); - Integer insertfaultcode(FaultCodeAddReq faultCodeAddReq); - - //修改故障码 - Integer updfaultlabel(FaultCodeUpdReq faultCodeUpdReq); - Integer updfaultcode(FaultCodeUpdReq faultCodeUpdReq); - - - - Integer delfaultcode(@Param("messageTypeId") long messageTypeId); - Integer delfaultlabel(@Param("messageTypeId") long messageTypeId); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultConditionMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultConditionMapper.java deleted file mode 100644 index 006db23..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultConditionMapper.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @className: FaultConditionMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultConditionMapper extends BaseMapper { - - List selectfaultconditionlist(FaultConditionListReq faultConditionListReq); - - - List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultDetectionStrategyMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultDetectionStrategyMapper.java deleted file mode 100644 index 1164673..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultDetectionStrategyMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.muyu.fault.mapper; - -/** - * @className: FaultDetectionStrategyMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 23:59 ⏰ - * @Version: 1.0 - * @description: - */ -public interface FaultDetectionStrategyMapper { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLabelMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLabelMapper.java deleted file mode 100644 index c463cd4..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLabelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.domain.FaultLabel; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultLabelMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultLabelMapper extends BaseMapper { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java deleted file mode 100644 index e21d993..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultLogMapper.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultLog; -import com.muyu.fault.domain.req.FaultLogListReq; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultLogMapper extends BaseMapper { - - - List selectfaultLogMapper(FaultLogListReq faultLogListReq); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultRuleMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultRuleMapper.java deleted file mode 100644 index aa31e05..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultRuleMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.fault.domain.FaultRule; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultRuleMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultRuleMapper extends BaseMapper { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java deleted file mode 100644 index f2a0305..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/FaultTypeMapper.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.FaultType; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultTypeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultTypeMapper extends BaseMapper { - Integer add(FaultType faultType); - - Integer update(FaultType faultType); - - Integer delete(Integer id); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/MessageMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/MessageMapper.java deleted file mode 100644 index 6ed2bd3..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/MessageMapper.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.fault.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.fault.domain.message.Message; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * @className: MessageMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ -@Mapper -public interface MessageMapper extends BaseMapper { - void changestatus(Message message); - - List unread(); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java deleted file mode 100644 index 0bde603..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/mapper/SysCarFaultMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.fault.mapper; - -import com.muyu.fault.domain.SysCarFault; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: MessageMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024-09-18 21:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障Mapper接口 - */ -@Mapper -public interface SysCarFaultMapper extends BaseMapper{ - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/CarTypeService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/CarTypeService.java deleted file mode 100644 index 33aad1c..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/CarTypeService.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.CarType; - - -import java.util.List; - -/** - * @className: CarTypeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ -public interface CarTypeService extends IService { - - /** - * 车辆类型 - * @return - */ - List selectcarType(); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultCodeService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultCodeService.java deleted file mode 100644 index 1d5fd57..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultCodeService.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.fault.service; - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.resp.FaultCodeTotalListResp; -import com.muyu.fault.domain.vo.FaultCodeVo; - -/** - * @className: FaultCodeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -public interface FaultCodeService extends IService { - - /** - * 故障码展示 - * @param faultCodeListReq - * @return - */ - FaultCodeTotalListResp selectlist(FaultCodeListReq faultCodeListReq); - - /** - * 故障码展示(故障码联查) - * @param faultCodeListReq - * @return - */ - FaultCodeTotalListResp selectfaultcodelist(FaultCodeListReq faultCodeListReq); - - /** - * 新增故障码 - * @param faultCodeAddReq - * @return - */ - void insert(FaultCodeAddReq faultCodeAddReq); - - - /** - * 修改故障码 - * @param faultCodeUpdReq - * @return - */ - void upd(FaultCodeUpdReq faultCodeUpdReq); - - - /** - * 删除故障码 - * @param messageTypeId - * @return - */ - void del(Integer messageTypeId); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultConditionService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultConditionService.java deleted file mode 100644 index 3c8e815..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultConditionService.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import com.muyu.fault.domain.resp.FaultConditionTotalListResp; - - -import java.util.List; - -/** - * @className: FaultConditionService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -public interface FaultConditionService extends IService { - - - /** - * 故障规则 - * @param faultConditionListReq - * @return - */ - FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq); - - /** - * 故障规则添加 - * @param faultConditionAddReq - * @return - */ - List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategy.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategy.java deleted file mode 100644 index 2d4cc55..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategy.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.fault.service; - -import com.muyu.fault.domain.CarFaultRule; -import com.muyu.fault.domain.FaultReport; -/** - * @className: FaultDetectionStrategy ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -public interface FaultDetectionStrategy { - - FaultReport detectFaults(CarFaultRule carFaultRule); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategyService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategyService.java deleted file mode 100644 index 805cf15..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultDetectionStrategyService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.muyu.fault.service; - -public interface FaultDetectionStrategyService { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLabelService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLabelService.java deleted file mode 100644 index ec9b278..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLabelService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultLabel; - - -import java.util.List; - -/** - * @className: FaultLabelService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultLabelService extends IService { - /** - * 故障名称 - * @return - */ - List select(); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java deleted file mode 100644 index fa5f126..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultLogService.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultLog; -import com.muyu.fault.domain.req.FaultLogListReq; -import com.muyu.fault.domain.resp.FaultLogTotalListResp; - - -import java.util.List; - -/** - * @className: FaultLogService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultLogService extends IService { - - /** - * 故障日志列表 - * @param faultLogListReq - * @return - */ - FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultRuleService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultRuleService.java deleted file mode 100644 index 1569c52..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultRuleService.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultRule; - - -/** - * @className: FaultRuleService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultRuleService extends IService { - - /** - * 车辆故障检测 - * @return - */ - String checkfaults(FaultRule faultRule); - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java deleted file mode 100644 index 01868e6..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/FaultTypeService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.FaultType; - -import java.util.List; - -/** - * @className: FaultTypeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultTypeService extends IService { - - /** - * 故障码分类查询 - * @return - */ - List select(); - - Integer add(FaultType faultType); - - Integer update(FaultType faultType); - - Integer delete(Integer id); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/ISysCarFaultService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/ISysCarFaultService.java deleted file mode 100644 index dc6b566..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/ISysCarFaultService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.service; - -import java.util.List; -import com.muyu.fault.domain.SysCarFault; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 车辆故障Service接口 - * - * @author Yang鹏 - * @date 2024-09-18 - */ -public interface ISysCarFaultService extends IService { - /** - * 精确查询车辆故障 - * - * @param id 车辆故障主键 - * @return 车辆故障 - */ - public SysCarFault selectSysCarFaultById(Long id); - - /** - * 查询车辆故障列表 - * - * @param sysCarFault 车辆故障 - * @return 车辆故障集合 - */ - public List selectSysCarFaultList(SysCarFault sysCarFault); - - /** - * 判断 车辆故障 id是否唯一 - * @param sysCarFault 车辆故障 - * @return 结果 - */ - Boolean checkIdUnique(SysCarFault sysCarFault); - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/MessageService.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/MessageService.java deleted file mode 100644 index 1d0cbe3..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/MessageService.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.muyu.fault.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.fault.domain.message.Message; -import com.muyu.fault.domain.message.MessageReq; -import com.muyu.fault.domain.message.MessageSendReq; - - -import java.util.List; - -/** - * @className: MessageService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface MessageService extends IService { - - /** - * 消息发送 - * @param messageSendReq - * @return - */ - void sendmessage(MessageSendReq messageSendReq); - - /** - * 消息查看 - * @param messageReq - * @param - * @return - */ - List selectmessage(MessageReq messageReq); - - - /** - * 查看消息改变状态 - * @param message - * @return - */ - void changestatus(Message message); - - - /** - * 查看未读的消息 - * @return - */ - List unread(); -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/CarTypeServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/CarTypeServiceImpl.java deleted file mode 100644 index 6f9b99d..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/CarTypeServiceImpl.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.CarType; -import com.muyu.fault.mapper.CarTypeMapper; -import com.muyu.fault.service.CarTypeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ -@Service -public class CarTypeServiceImpl extends ServiceImpl implements CarTypeService { - - @Autowired - private CarTypeMapper carTypeMapper; - - /** - * 车辆类型 - * @return - */ - @Override - public List selectcarType() { - LambdaQueryWrapper carTypeLambdaQueryWrapper = new LambdaQueryWrapper<>(); - List list = this.list(carTypeLambdaQueryWrapper); - return list; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultCodeServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultCodeServiceImpl.java deleted file mode 100644 index 9754afa..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultCodeServiceImpl.java +++ /dev/null @@ -1,122 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.fault.domain.FaultCode; -import com.muyu.fault.domain.FaultLabel; -import com.muyu.fault.domain.req.FaultCodeAddReq; -import com.muyu.fault.domain.req.FaultCodeListReq; -import com.muyu.fault.domain.req.FaultCodeUpdReq; -import com.muyu.fault.domain.resp.FaultCodeListResp; -import com.muyu.fault.domain.resp.FaultCodeTotalListResp; -import com.muyu.fault.domain.vo.FaultCodeVo; -import com.muyu.fault.mapper.FaultCodeMapper; -import com.muyu.fault.service.FaultCodeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultCodeServiceImpl extends ServiceImpl implements FaultCodeService { - @Autowired - private FaultCodeMapper faultCodeMapper; - - /** - * 故障码展示 - * @param faultCodeListReq - * @return - */ - @Override - public FaultCodeTotalListResp selectlist(FaultCodeListReq faultCodeListReq) { - Integer pageNum = faultCodeListReq.getPageNum(); - Integer pageSize = faultCodeListReq.getPageSize(); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultcodeNumber()), - FaultCodeVo::getFaultcodeNumber,faultCodeListReq.getFaultcodeNumber()); - queryWrapper.eq(StringUtils.isNotEmpty(faultCodeListReq.getFaultBit()), - FaultCodeVo::getFaultBit,faultCodeListReq.getFaultBit()); - long count = this.count(queryWrapper); - queryWrapper.last("LIMIT "+ ((pageNum-1)*pageSize)+", "+pageSize); - List faultCodeVOList = this.list(queryWrapper); - List faultCodeListRespList = faultCodeVOList.stream() - .map(FaultCodeListResp::faultCodeListResp) - .toList(); - return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListRespList,count); - } - - - /** - * 故障码展示(故障码联查) - * @param faultCodeListReq - * @return - */ - @Override - public FaultCodeTotalListResp selectfaultcodelist(FaultCodeListReq faultCodeListReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultCodeListReq.getPageNum() - 1) * faultCodeListReq.getPageSize(); - faultCodeListReq.setPageNum(offset); - List selectfaultcodelist = faultCodeMapper.selectfaultcodelist(faultCodeListReq); - List faultCodeListRespList = selectfaultcodelist.stream() - .map(FaultCodeListResp::faultCodeListResp) - .toList(); - return FaultCodeTotalListResp.faultCodeTotalListResp(faultCodeListRespList,count); - } - - /** - * 新增故障码 - * @param faultCodeAddReq - * @return - */ - @Override - public void insert(FaultCodeAddReq faultCodeAddReq) { - //判断故障名称或故障码是否存在,若都不存在先添加故障名称表，在添加故障码表 - //1.判断故障名称是否存在 - String messageTypeName = faultCodeAddReq.getMessageTypeName(); - FaultLabel faultLabel = faultCodeMapper.selectfaultName(messageTypeName); - //2.判断故障码是否存在 - String faultcodeNumber = faultCodeAddReq.getFaultcodeNumber(); - FaultCode faultCode = faultCodeMapper.selectfaultCode(faultcodeNumber); - if (faultLabel==null && faultCode==null){ - faultCodeMapper.insertfaultlabel(faultCodeAddReq); - faultCodeMapper.insertfaultcode(faultCodeAddReq); - } - } - - - /** - * 修改故障码 - * @param faultCodeUpdReq - * @return - */ - @Override - public void upd(FaultCodeUpdReq faultCodeUpdReq) { - //修改故障名称表信息和故障码表信息 -// faultCodeMapper.updfaultlabel(faultCodeUpdReq); - faultCodeMapper.updfaultcode(faultCodeUpdReq); - } - - - /** - * 删除故障码 - * @param messageTypeId - * @return - */ - @Override - public void del(Integer messageTypeId) { - - //删除故障码表信息 - faultCodeMapper.delfaultcode(messageTypeId); - //删除对应的故障名称表信息 - faultCodeMapper.delfaultlabel(messageTypeId); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultConditionServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultConditionServiceImpl.java deleted file mode 100644 index 2332018..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultConditionServiceImpl.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.fault.domain.FaultCondition; -import com.muyu.fault.domain.req.FaultConditionAddReq; -import com.muyu.fault.domain.req.FaultConditionListReq; -import com.muyu.fault.domain.resp.FaultConditionListResp; -import com.muyu.fault.domain.resp.FaultConditionTotalListResp; -import com.muyu.fault.mapper.FaultConditionMapper; -import com.muyu.fault.service.FaultConditionService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultConditionServiceImpl extends ServiceImpl implements FaultConditionService { - - @Autowired - private FaultConditionMapper faultConditionMapper; - - - - /** - * 故障规则 - * @param faultConditionListReq - * @return - */ - @Override - public FaultConditionTotalListResp getfaultrulelist(FaultConditionListReq faultConditionListReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultConditionListReq.getPageNum() - 1) * faultConditionListReq.getPageSize(); - faultConditionListReq.setPageNum(offset); - - List selectfaultconditionlist = faultConditionMapper.selectfaultconditionlist(faultConditionListReq); - List faultConditionListRespList = selectfaultconditionlist.stream() - .map(FaultConditionListResp::faultConditionListResp) - .toList(); - return FaultConditionTotalListResp.faultConditionTotalListResp(faultConditionListRespList,count); - } - - - /** - * 故障规则添加 判断故障规则是否存在 - * @param faultConditionAddReq - * @return - */ - @Override - public List selectBytypeAndlabel(FaultConditionAddReq faultConditionAddReq) { - List faultConditionList = faultConditionMapper.selectBytypeAndlabel(faultConditionAddReq); - return faultConditionList; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultDetectionStrategyServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultDetectionStrategyServiceImpl.java deleted file mode 100644 index aa77e83..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultDetectionStrategyServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.muyu.fault.mapper.FaultDetectionStrategyMapper; -import com.muyu.fault.service.FaultDetectionStrategyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @className: FaultDetectionStrategyServiceImpl ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 23:58 ⏰ - * @Version: 1.0 - * @description: - */ -@Service -public class FaultDetectionStrategyServiceImpl implements FaultDetectionStrategyService { - - @Autowired - private FaultDetectionStrategyMapper faultDetectionStrategyMapper; -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLabelServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLabelServiceImpl.java deleted file mode 100644 index ceff5c6..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLabelServiceImpl.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultLabel; -import com.muyu.fault.mapper.FaultLabelMapper; -import com.muyu.fault.service.FaultLabelService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultLabelServiceImpl extends ServiceImpl implements FaultLabelService { - @Autowired - private FaultLabelMapper faultLabelMapper; - - - /** - * 故障信息查询 - * @return - */ - @Override - public List select() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List list = this.list(queryWrapper); - return list; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java deleted file mode 100644 index 1eecb65..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultLogServiceImpl.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultLog; -import com.muyu.fault.domain.req.FaultLogListReq; -import com.muyu.fault.domain.resp.FaultLogListResp; -import com.muyu.fault.domain.resp.FaultLogTotalListResp; -import com.muyu.fault.mapper.FaultLogMapper; -import com.muyu.fault.service.FaultLogService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { - @Autowired - private FaultLogMapper faultLogMapper; - - /** - * 故障日志列表 - * @param faultLogListReq - * @return - */ - @Override - public FaultLogTotalListResp selectfaultlog(FaultLogListReq faultLogListReq) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - long count = this.count(queryWrapper); - int offset = (faultLogListReq.getPageNum() - 1) * faultLogListReq.getPageSize(); - faultLogListReq.setPageNum(offset); - List faultLogListResps = faultLogMapper.selectfaultLogMapper(faultLogListReq); - List faultLogListRespList = faultLogListResps.stream() - .map(FaultLogListResp::faultLogListResp) - .toList(); - return FaultLogTotalListResp.faultLogTotalListResp(faultLogListRespList,count); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultRuleServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultRuleServiceImpl.java deleted file mode 100644 index ff37c01..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultRuleServiceImpl.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultRule; -import com.muyu.fault.mapper.FaultRuleMapper; -import com.muyu.fault.service.FaultRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.math.BigDecimal; -import java.util.Collections; -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultRuleServiceImpl extends ServiceImpl implements FaultRuleService { - - @Autowired - private FaultRuleMapper faultRuleMapper; - - /** - * 车辆故障检测 - * @return - */ - @Override - public String checkfaults(FaultRule faultRule) { - //获取触发条件 - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (Long.valueOf(faultRule.getFaultcodeId())!=null && faultRule.getFaultcodeId()!=0){ - queryWrapper.eq(FaultRule::getFaultcodeId, faultRule.getFaultcodeId()); - } - List faultRuleList = this.list(queryWrapper); - for (FaultRule rule : faultRuleList) { - //单个值比较 - if (faultRule.getSingleThreshold()!=null && faultRule.getMaxThreshold()==null && faultRule.getMinThreshold()==null){ - //大于阈值 - if (faultRule.getConditionContent().contains(">") || faultRule.getConditionContent().contains("大于")){ - if (faultRule.getThreshold().compareTo(rule.getSingleThreshold())>0){ - return "数据超过阈值，出现异常"; - } - } - //小于阈值 - if (faultRule.getConditionContent().contains("<") || faultRule.getConditionContent().contains("小于")){ - if (faultRule.getThreshold().compareTo(rule.getSingleThreshold())<0){ - return "数据过低，出现异常"; - } - } - }else { //区间值比较 - if (faultRule.getThreshold().compareTo(rule.getMinThreshold())<0 || faultRule.getThreshold().compareTo(rule.getMaxThreshold())>0){ - return "数据不在可控范围内，出现异常"; - } - } - } - return "判断出现异常"; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java deleted file mode 100644 index 3c67125..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/FaultTypeServiceImpl.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; - -import com.muyu.fault.domain.FaultType; -import com.muyu.fault.mapper.FaultTypeMapper; -import com.muyu.fault.service.FaultTypeService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { - @Autowired - private FaultTypeMapper faultTypeMapper; - /** - * 故障码分类查询 - * @return - */ - @Override - public List select() { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - List list = this.list(queryWrapper); - return list; - } - - @Override - public Integer add(FaultType faultType) { - return faultTypeMapper.add(faultType); - } - - @Override - public Integer update(FaultType faultType) { - return faultTypeMapper.update(faultType); - } - - @Override - public Integer delete(Integer id) { - return faultTypeMapper.delete(id); - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/MessageServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/MessageServiceImpl.java deleted file mode 100644 index eea14a6..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/MessageServiceImpl.java +++ /dev/null @@ -1,126 +0,0 @@ -package com.muyu.fault.service.impl; - - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.security.service.TokenService; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.common.system.domain.LoginUser; -import com.muyu.fault.domain.message.Message; -import com.muyu.fault.domain.message.MessageReq; -import com.muyu.fault.domain.message.MessageSendReq; -import com.muyu.fault.mapper.MessageMapper; -import com.muyu.fault.service.MessageService; -import jakarta.servlet.http.HttpServletRequest; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; -import java.util.List; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -@Service -public class MessageServiceImpl extends ServiceImpl implements MessageService { - @Autowired - private TokenService tokenService; - @Autowired - private HttpServletRequest request; - @Autowired - private MessageMapper messageMapper; - /** - * 消息发送 - * @param messageSendReq - * @return - */ - @Override - public void sendmessage(MessageSendReq messageSendReq) { - String token = SecurityUtils.getToken();// 获取当前Token - LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户 - if (loginUser == null) { - throw new RuntimeException("用户未登录或Token无效"); - } - Long userid = loginUser.getUserid(); - messageSendReq.setUserId(userid); - - // 定义一个DateTimeFormatter对象，用于格式化日期时间为yyyy-MM-dd HH:mm:ss - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 获取当前日期和时间 - LocalDateTime now = LocalDateTime.now(); - // 使用formatter格式化当前日期和时间 - String formattedDateTime = now.format(formatter); - // 使用formatter将字符串解析回LocalDateTime - LocalDateTime parsedDateTime = LocalDateTime.parse(formattedDateTime, formatter); - // 然后按照上面的步骤将LocalDateTime转换为Date - ZonedDateTime zdt = parsedDateTime.atZone(ZoneId.systemDefault()); - Date date = Date.from(zdt.toInstant()); - // 现在date是一个包含了字符串中日期和时间的Date对象 - messageSendReq.setCreateTime(date); - - - - } - - - /** - * 消息查看 - * @param messageReq - * @param - * @return - */ - @Override - public List selectmessage(MessageReq messageReq) { - String token = SecurityUtils.getToken();// 获取当前Token - LoginUser loginUser = tokenService.getLoginUser(token); // 获取当前登录用户 - if (loginUser == null) { - throw new RuntimeException("用户未登录或Token无效"); - } - Long userid = loginUser.getUserid(); - messageReq.setUserId(userid); - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(messageReq.getStatus())), -// Message::getStatus,messageReq.getStatus()); -// queryWrapper.eq(StringUtils.isNotEmpty(String.valueOf(messageReq.getUserId())), -// Message::getUserId,messageReq.getUserId()); - if (messageReq.getStatus() != null) { - queryWrapper.eq(Message::getStatus, messageReq.getStatus()); - } - queryWrapper.eq(Message::getUserId, messageReq.getUserId()); - List list = this.list(queryWrapper); - return list; - } - - /** - * 查看消息改变状态 - * @param message - * @return - */ - @Override - public void changestatus(Message message) { - messageMapper.changestatus(message); - } - - /** - * 查看未读的消息 - * @return - */ - @Override - public List unread() { -// return messageMapper.unread(); - return null; - } - - - - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java deleted file mode 100644 index c219241..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/SysCarFaultServiceImpl.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.muyu.fault.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import com.muyu.fault.domain.SysCarFault; -import com.muyu.fault.mapper.SysCarFaultMapper; -import com.muyu.fault.service.ISysCarFaultService; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.List; - -/** - * 车辆故障Service业务层处理 - * - * @author Yang鹏 - * @date 2024-09-18 - */ -@Service -public class SysCarFaultServiceImpl - extends ServiceImpl - implements ISysCarFaultService { - - /** - * 精确查询车辆故障 - * - * @param id 车辆故障主键 - * @return 车辆故障 - */ - @Override - public SysCarFault selectSysCarFaultById(Long id) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(SysCarFault::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询车辆故障列表 - * - * @param sysCarFault 车辆故障 - * @return 车辆故障 - */ - @Override - public List selectSysCarFaultList(SysCarFault sysCarFault) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarFault.getFaultCode())){ - queryWrapper.eq(SysCarFault::getFaultCode, sysCarFault.getFaultCode()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultName())){ - queryWrapper.like(SysCarFault::getFaultName, sysCarFault.getFaultName()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultType())){ - queryWrapper.eq(SysCarFault::getFaultType, sysCarFault.getFaultType()); - } - if (StringUtils.isNotEmpty(sysCarFault.getCarVin())){ - queryWrapper.eq(SysCarFault::getCarVin, sysCarFault.getCarVin()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultLabel())){ - queryWrapper.eq(SysCarFault::getFaultLabel, sysCarFault.getFaultLabel()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultBit())){ - queryWrapper.eq(SysCarFault::getFaultBit, sysCarFault.getFaultBit()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultValue())){ - queryWrapper.eq(SysCarFault::getFaultValue, sysCarFault.getFaultValue()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultWarn())){ - queryWrapper.eq(SysCarFault::getFaultWarn, sysCarFault.getFaultWarn()); - } - if (StringUtils.isNotEmpty(sysCarFault.getWarnStatus())){ - queryWrapper.eq(SysCarFault::getWarnStatus, sysCarFault.getWarnStatus()); - } - if (StringUtils.isNotEmpty(sysCarFault.getFaultDesc())){ - queryWrapper.eq(SysCarFault::getFaultDesc, sysCarFault.getFaultDesc()); - } - if (StringUtils.isNotEmpty(sysCarFault.getState())){ - queryWrapper.eq(SysCarFault::getState, sysCarFault.getState()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param sysCarFault 车辆故障 - * @return 车辆故障 - */ - @Override - public Boolean checkIdUnique(SysCarFault sysCarFault) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarFault::getId, sysCarFault.getId()); - return this.count(queryWrapper) > 0; - } - - -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java deleted file mode 100644 index fcac7ac..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.fault.service.impl.faultDetectionStrategy; - -import org.springframework.stereotype.Service; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ - - -/** - * 针对燃油车的故障检测逻辑 - */ -@Service(value = "FuelVehicleCar") -public class FuelVehicleCarFaultDetectionStrategy { -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java deleted file mode 100644 index 6321250..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.muyu.fault.service.impl.faultDetectionStrategy; - - -import com.muyu.fault.domain.CarFaultRule; -import com.muyu.fault.domain.FaultReport; -import com.muyu.fault.service.FaultDetectionStrategy; -import org.springframework.stereotype.Service; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ - -/** - * 针对纯电车的故障检测逻辑 - */ -@Service(value = "PureElectricCar") -public class PureElectricCarFaultDetectionStrategy implements FaultDetectionStrategy { - - - - @Override - public FaultReport detectFaults(CarFaultRule carFaultRule) { - - - //检测车速是否处于正常范围 - if (carFaultRule.getSpeed()>200 || carFaultRule.getSpeed()<0){ - return new FaultReport("纯电车","车速不在正常范围内,请注意"); - } - //检测总里程数是否超过正常数 - if (carFaultRule.getTM()>5000000){ - return new FaultReport("纯电车","总里程数已超标,请注意"); - } - //检测总电压是否正常 - if (carFaultRule.getTV()>650){ - return new FaultReport("纯电车","总电压过高,请注意"); - } - //检测电流是否超标 - if (carFaultRule.getCC()>50){ - return new FaultReport("纯电车","电流过高,请注意"); - } - //检测绝缘电阻 - if (carFaultRule.getIR()>100000){ - return new FaultReport("纯电车","绝缘电阻过高,请注意"); - } -// //检测加速踏板行程值 -// if (carFaultRule.getAPTV()){ -// -// } -// //检测制动踏板行程值 -// if (carFaultRule.getBPTV()){ -// -// } -// //检测燃料消耗率 -// if (carFaultRule.getSFC()){ -// -// } -// //检测电机控制器温度 -// if (carFaultRule.getMCT()){ -// -// } -// //检测电机转速 -// if (carFaultRule.getMS()){ -// -// } -// //检测电机转矩 -// if (carFaultRule.getMTO()){ -// -// } -// //检测电机温度 -// if (carFaultRule.getMTE()){ -// -// } -// //检测电机电压 -// if (carFaultRule.getMV()){ -// -// } -// //检测电机电流 -// if (carFaultRule.getMC()){ -// -// } -// //检测动力电池剩余电量SOC -// if (carFaultRule.getPBRSOC()){ -// -// } -// //检测当前状态允许的最大反馈功率 -// if (carFaultRule.getMACSFP()){ -// -// } -// //检测当前状态允许最大放电功率 -// if (carFaultRule.getCSATMDP()) { -// -// } -// //检测BMS自检计数器 -// if (carFaultRule.getBMS()) { -// -// } -// //检测动力电池充放电电流 -// if (carFaultRule.getCADC()) { -// -// } -// //检测动力电池负载端总电压V3 -// if (carFaultRule.getPBLETVV3()) { -// -// } -// //检测单次最大电压 -// if (carFaultRule.getSMV()) { -// -// } -// //检测单体电池最低电压 -// if (carFaultRule.getMVOAB()) { -// -// } -// //检测单体电池最高温度 -// if (carFaultRule.getMAXBT()) { -// -// } -// //检测单体电池最低温度 -// if (carFaultRule.getMINBT()) { -// -// } -// //检测动力电池可用容量 -// if (carFaultRule.getPBAC()) { -// -// } -// //检测车辆状态 -// if (carFaultRule.getVS()) { -// -// } -// //检测充电状态 -// if (carFaultRule.getCS()) { -// -// } -// //检测运行状态 -// if (carFaultRule.getRS()) { -// -// } -// //检测SOC -// if (carFaultRule.getSOC()) { -// -// } -// //检测可充电储能装置工作状态 -// if (carFaultRule.getRESDWC()) { -// -// } -// //检测驱动电机状态 -// if (carFaultRule.getEAS()) { -// -// } -// //检测定位是否有效 -// if (carFaultRule.getPTC()) { -// -// } -// //检测EAS -// if (carFaultRule.getEPS()) { -// -// } -// //检测PTC -// if (carFaultRule.getABS()) { -// -// } -// //检测EPS -// if (carFaultRule.getMCU()) { -// -// } -// //检测ABS -// if (carFaultRule.getPBHS()) { -// -// } -// //检测MCU -// if (carFaultRule.getPBCS()) { -// -// } -// //检测动力电池加热状态 -// if (carFaultRule.getPBIS()) { -// -// } -// //检测动力电池当前状态 -// if (carFaultRule.getDCDC()) { -// -// } -// //检测动力电池保温状态 -// if (carFaultRule.getCHG()) { -// -// } -// //检测DCDC -// if (carFaultRule.getCHB()) { -// -// } -// //检测CHG -// if (carFaultRule.getCUB()) { -// -// } - return null; - } -} diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultCodeMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultCodeMapper.xml deleted file mode 100644 index cf47a98..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultCodeMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - - SELECT - car_faultcode.faultcode_id, - car_faultcode.message_type_id, - car_fault_label.message_type_code, - car_faultcode.faultcode_number, - car_faultcode.fault_group, - car_faultcode.fault_bit, - car_faultcode.fault_value, - car_fault_label.message_type_name, - car_faultcode.is_warning - FROM - car_faultcode - LEFT JOIN car_fault_label ON car_faultcode.message_type_id = car_fault_label.message_type_id - - - - - - - - - - - - INSERT INTO `eight`.`car_fault_label` - (`message_type_id`, `message_type_code`, `message_type_name`, `message_type_belongs`) VALUES - (0, #{messageTypeCode}, #{messageTypeName}, '车辆基础'); - - - INSERT INTO `eight`.`car_faultcode` - (`faultcode_id`, `message_type_id`, `faultcode_number`, `fault_group`, `fault_bit`, `fault_value`, `is_warning`) VALUES - (0, #{messageTypeId}, #{faultcodeNumber}, #{faultGroup}, #{faultBit}, #{faultValue}, #{isWarning}); - - - - - - - UPDATE `eight`.`car_fault_label` - SET `message_type_code` = #{messageTypeCode}, - `message_type_name` = #{messageTypeName}, - `message_type_belongs` =#{messageTypeBelongs} - WHERE `message_type_id` = #{messageTypeId}; - - - UPDATE `eight`.`car_faultcode` - SET `message_type_id` = #{messageTypeId}, - `faultcode_number` = #{faultcodeNumber}, - `fault_group` = #{faultGroup}, - `fault_bit` = #{faultBit}, - `fault_value` = #{faultValue}, - `is_warning` = #{isWarning} - WHERE `faultcode_id` = #{faultcodeId}; - - - - - - delete from car_faultcode where message_type_id=#{messageTypeId} - - - delete from car_fault_label where message_type_id=#{messageTypeId} - - diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultConditionMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultConditionMapper.xml deleted file mode 100644 index 6ae69b4..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultConditionMapper.xml +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT - car_fault_condition.*, - car_type.car_type_name, - car_fault_label.message_type_name, - car_fault_label.message_type_code - FROM - car_fault_condition - LEFT JOIN car_type ON car_fault_condition.car_type_id = car_type.car_type_id - LEFT JOIN car_fault_label ON car_fault_condition.message_type_id = car_fault_label.message_type_id - - - - - - - - - diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultLogMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultLogMapper.xml deleted file mode 100644 index 62e8af8..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/FaultLogMapper.xml +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - - - - - - - - - - SELECT - car_fault_log.*, - car_faultcode.faultcode_number, - car_information.car_information_VIN - FROM - car_fault_log - LEFT JOIN car_faultcode ON car_fault_log.faultcode_id = car_faultcode.faultcode_id - LEFT JOIN car_information ON car_fault_log.car_information_id = car_information.car_information_id - - - - - diff --git a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/MessageMapper.xml b/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/MessageMapper.xml deleted file mode 100644 index a635225..0000000 --- a/cloud-gateway/cloud-modules-fault/src/main/resources/mapper/faultcode/MessageMapper.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - update car_fault_message set status=1 where id=#{id} - - - diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultDetectionStrategyController.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultDetectionStrategyController.java deleted file mode 100644 index 95fce45..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultDetectionStrategyController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.controller; - -import com.muyu.service.FaultDetectionStrategyService; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -/** - * @className: FaultDetectionStrategyController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障码 - */ -@RestController -@RequestMapping("/faultdetectionstrategy") -@Tag(name = "车辆故障码",description = "车辆故障码") -public class FaultDetectionStrategyController { - - @Autowired - private FaultDetectionStrategyService faultDetectionStrategyService; - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java deleted file mode 100644 index 1f323c0..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultMessage.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; - -import java.util.Date; - -/** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：plues - * @name：CarFaultMessage - * @Date：2024/9/25 23:45 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Tag(name = "bioa") -@TableName(value = "car_fault_message",autoResultMap = true) -public class CarFaultMessage { - private Integer id; - private String sender; - private String receiver; - private String content; - private Integer status; - @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") - @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") - private Date createTime; - private Integer userId; - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java deleted file mode 100644 index 3c90e1a..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarType.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: CarType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:01 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_type",autoResultMap = true) -public class CarType { - /** - * 车辆类型ID - */ - private long carTypeId; - /** - * 车辆类型名 - */ - private String carTypeName; - /** - * 车辆规则外键ID - */ - private long carTypeRules; -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java deleted file mode 100644 index 094f9af..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultReport.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.domain; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @className: FaultReport ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -public class FaultReport { - private String VehicleType; - private String FaultDescription; -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageService.java deleted file mode 100644 index 5c98e0c..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageService.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.muyu.domain; - -import com.muyu.domain.message.Message; - -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; - -/** - * @className: MessageService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:01 ⏰ - * @Version: 1.0 - * @description: 业务逻辑层将负责实现消息的发送逻辑 - */ - -public class MessageService { - private MessageDao messageDao; - - public MessageService(MessageDao messageDao){ - this.messageDao=messageDao; - } - - public void sendMessage(String content,String sender,String receiver){ - - // 定义一个DateTimeFormatter对象，用于格式化日期时间为yyyy-MM-dd HH:mm:ss - DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); - // 获取当前日期和时间 - LocalDateTime now = LocalDateTime.now(); - // 使用formatter格式化当前日期和时间 - String formattedDateTime = now.format(formatter); - // 使用formatter将字符串解析回LocalDateTime - LocalDateTime parsedDateTime = LocalDateTime.parse(formattedDateTime, formatter); - // 然后按照上面的步骤将LocalDateTime转换为Date - ZonedDateTime zdt = parsedDateTime.atZone(ZoneId.systemDefault()); - Date date = Date.from(zdt.toInstant()); - - - Message message = new Message(); - message.setContent(content); - message.setSender(sender); - message.setReceiver(receiver); - message.setCreateTime(date); - - try { - messageDao.sendMessage(message); - } catch (Exception e) { - e.printStackTrace(); - } - - } -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java deleted file mode 100644 index 6c6a42a..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLevel.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.muyu.domain; - -public enum WarnLevel { - LOW, MEDIUM, HIGH -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/Message.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/Message.java deleted file mode 100644 index 7463295..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/Message.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.muyu.domain.message.message; - -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.fasterxml.jackson.annotation.JsonFormat; -import io.swagger.v3.oas.annotations.media.Schema; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -import java.util.Date; - -/** - * @className: Message ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName(value = "car_fault_message",autoResultMap = true) -public class Message { - /** - * id - */ - @TableId(value = "id",type = IdType.AUTO) - private long id; - - /** - * 发送者 - */ - private String sender; - - /** - * 接收者 - */ - private String receiver; - - /** - * 消息内容 - */ - private String content; - - /** - * 消息状态 - */ - private Integer status; - - /** - * 创建时间 - */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - @Schema(description = "消息创建时间",defaultValue = "2024-8-9 10:47:57",type = "Date") - private Date createTime; - /** - * 登录人Id - */ - private long userId; - - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java deleted file mode 100644 index 5c9234a..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.muyu.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class FaultCodeUpdReq { - - /** - *故障码Id - */ - private long faultcodeId; - /** - *故障名称Id - */ - private long messageTypeId; - /** - * 故障名称 - */ - private String messageTypeName; - /** - * 报文编码 - */ - private String messageTypeCode; - /** - * 故障码 - */ - private String faultcodeNumber; - /** - * 故障分类Id - */ - private long faulttypeId; - /** - * 是否产生报警 - */ - private Integer isWarning; - /** - * 故障描述 - */ - private String faultContent; - /** - *故障状态 - */ - private Integer faultStatus; - /** - *故障组 - */ - private String faultGroup; - /** - *故障位 - */ - private String faultBit; - /** - *故障值 - */ - private String faultValue; - /** - *报文所属类别 - */ - private String messageTypeBelongs; - - - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java deleted file mode 100644 index cdd2c0b..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/SysCarResp.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.muyu.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; - -/** - * @ClassName SysCarResp - * @Description TODO - * @Author Li HD - * @Date 2024/9/25 20:14 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -@Tag(name = "车辆类型信息", description = "车辆类型") -public class SysCarResp { - - /** - * 自增主键 - */ - @TableId(type = IdType.AUTO) - private Long id; - - /** - * 车辆VIN码 - */ - private String carVin; - - /** - * 车辆车牌号 - */ - private String carPlate; - - /** - * 车辆品牌 - */ - private String carBrand; - - /** - * 车辆型号 - */ - private String carModel; - - /** - * 车辆类型 - */ - private Integer carType; - - /** - * 车辆类型名称 - */ - private String sysTypeName; - - /** - * 策略ID - */ - private Integer warnStrategy; - - /** - * 围栏组编码 - */ - private String groupCode; - - /** - * 启用状态 - */ - private Integer state; - - @Override - public String toString() { - return "SysCarResp{" + - "id=" + id + - ", carVin='" + carVin + '\'' + - ", carPlate='" + carPlate + '\'' + - ", carBrand='" + carBrand + '\'' + - ", carModel='" + carModel + '\'' + - ", carType=" + carType + - ", sysTypeName='" + sysTypeName + '\'' + - ", warnStrategy=" + warnStrategy + - ", groupCode='" + groupCode + '\'' + - ", state=" + state + - '}'; - } -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarTypeMapper.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarTypeMapper.java deleted file mode 100644 index 9f654a8..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarTypeMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.domain.CarType; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: CarTypeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface CarTypeMapper extends BaseMapper { - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultDetectionStrategyMapper.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultDetectionStrategyMapper.java deleted file mode 100644 index 5e20f5e..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultDetectionStrategyMapper.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.muyu.mapper; - -/** - * @className: FaultDetectionStrategyMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 23:59 ⏰ - * @Version: 1.0 - * @description: - */ -public interface FaultDetectionStrategyMapper { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLabelMapper.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLabelMapper.java deleted file mode 100644 index c6c3f88..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLabelMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.domain.FaultLabel; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultLabelMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultLabelMapper extends BaseMapper { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultRuleMapper.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultRuleMapper.java deleted file mode 100644 index b091d9e..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultRuleMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.domain.FaultRule; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: FaultRuleMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -@Mapper -public interface FaultRuleMapper extends BaseMapper { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageValueMapper.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageValueMapper.java deleted file mode 100644 index 8ad4820..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageValueMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.domain.MessageValue; -import org.apache.ibatis.annotations.Mapper; - -/** - * @ClassName MessageValueMapper - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 - */ -@Mapper -public interface MessageValueMapper extends BaseMapper { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarFaultMapper.java deleted file mode 100644 index 4ce5b27..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarFaultMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.domain.SysCarFault; -import org.apache.ibatis.annotations.Mapper; - -/** - * @className: MessageMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024-09-18 21:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障Mapper接口 - */ -@Mapper -public interface SysCarFaultMapper extends BaseMapper{ - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceClazzService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceClazzService.java deleted file mode 100644 index 20ad33c..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceClazzService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.CarFenceClazz; - - -/** - * @Author：yang - * @Package：com.muyu.server.service - * @Project：cloud-electronic - * @name：CarFenceClazzService - * @Date：2024/9/17 17:33 - */ -public interface CarFenceClazzService extends IService{ -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceTypeService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceTypeService.java deleted file mode 100644 index 4e86090..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceTypeService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.CarFenceType; - - -/** - * @Author：yang - * @Package：com.muyu.server.service - * @Project：cloud-electronic - * @name：CarFenceTypeService - * @Date：2024/9/17 17:29 - */ -public interface CarFenceTypeService extends IService{ -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategy.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategy.java deleted file mode 100644 index f2003ee..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategy.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.service; - -import com.muyu.domain.CarFaultRule; -import com.muyu.domain.FaultReport; -/** - * @className: FaultDetectionStrategy ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 - */ -public interface FaultDetectionStrategy { - - FaultReport detectFaults(CarFaultRule carFaultRule); - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategyService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategyService.java deleted file mode 100644 index bae7897..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultDetectionStrategyService.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.muyu.service; - -public interface FaultDetectionStrategyService { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java deleted file mode 100644 index 348869d..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultTypeService.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.FaultType; - -import java.util.List; - -/** - * @className: FaultTypeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ -public interface FaultTypeService extends IService { - - /** - * 故障码分类查询 - * @return - */ - List select(); - - Integer add(FaultType faultType); - - Integer update(FaultType faultType); - - Integer delete(Integer id); -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java deleted file mode 100644 index 70093db..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FenceGroupService.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.FenceGroup; - -import java.util.List; - -/** - * @Author：yan - * @Package：com.muyu.car.service - * @Project：cars - * @name：FenceGroupService - * @Date：2024/9/21 20:53 - */ -public interface FenceGroupService extends IService { - List fenceGroupList(); -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java deleted file mode 100644 index 706ec87..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysTypeService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.domain.SysCarType; - -import java.util.List; - -/** - * @version 1.0 - * @Author xie ya ru - * @Date 2024/9/22 9:32 - * @注释 - */ -public interface SysTypeService extends IService { - - List selectSysTypeList(); - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java deleted file mode 100644 index 9d2bfe7..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceClazzServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.CarFenceClazz; -import com.muyu.mapper.CarFenceClazzMapper; -import com.muyu.service.CarFenceClazzService; -import org.springframework.stereotype.Service; - -/** - * @Author：yang - * @Package：com.muyu.server.service.impl - * @Project：cloud-electronic - * @name：CarFenceClazzServiceImpl - * @Date：2024/9/17 17:33 - */ -@Service -public class CarFenceClazzServiceImpl - extends ServiceImpl - implements CarFenceClazzService { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java deleted file mode 100644 index edf174c..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceTypeServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.service.impl; - -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.CarFenceType; -import com.muyu.mapper.CarFenceTypeMapper; -import com.muyu.service.CarFenceTypeService; -import org.springframework.stereotype.Service; - -/** - * @Author：yang - * @Package：com.muyu.server.service.impl - * @Project：cloud-electronic - * @name：CarFenceTypeServiceImpl - * @Date：2024/9/17 17:30 - */ -@Service -public class CarFenceTypeServiceImpl - extends ServiceImpl - implements CarFenceTypeService { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultDetectionStrategyServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultDetectionStrategyServiceImpl.java deleted file mode 100644 index e127213..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultDetectionStrategyServiceImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.service.impl; - -import com.muyu.mapper.FaultDetectionStrategyMapper; -import com.muyu.service.FaultDetectionStrategyService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -/** - * @className: FaultDetectionStrategyServiceImpl ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 23:58 ⏰ - * @Version: 1.0 - * @description: - */ -@Service -public class FaultDetectionStrategyServiceImpl implements FaultDetectionStrategyService { - - @Autowired - private FaultDetectionStrategyMapper faultDetectionStrategyMapper; -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java deleted file mode 100644 index fdd6c4a..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarServiceImpl.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.muyu.service.impl; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.domain.SysCar; -import com.muyu.domain.resp.SysCarResp; -import com.muyu.mapper.SysCarMapper; -import com.muyu.service.SysCarService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.List; - -/** - * 车辆基础信息Service业务层处理 - * - * @author Li HD - * @date 2024-09-18 - */ -@Service -public class SysCarServiceImpl - extends ServiceImpl - implements SysCarService { - - @Autowired - private SysCarMapper sysCarMapper; - - /** - * 精确查询车辆基础信息 - * - * @param id 车辆基础信息主键 - * @return 车辆基础信息 - */ - @Override - public SysCar selectSysCarById(Long id) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(SysCar::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询车辆基础信息列表 - * - * @param sysCar 车辆基础信息 - * @return 车辆基础信息 - */ - @Override - public List selectSysCarList(SysCar sysCar) - { - return sysCarMapper.selectSysCarList(sysCar); -// LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); -// if (StringUtils.isNotEmpty(sysCar.getCarVin())){ -// queryWrapper.like(SysCarResp::getCarVin, sysCar.getCarVin()); -// } -// if (StringUtils.isNotEmpty(sysCar.getCarPlate())){ -// queryWrapper.like(SysCarResp::getCarPlate, sysCar.getCarPlate()); -// } -// if (StringUtils.isNotEmpty(sysCar.getCarBrand())){ -// queryWrapper.eq(SysCarResp::getCarBrand, sysCar.getCarBrand()); -// } -// if (StringUtils.isNotEmpty(sysCar.getCarModel())){ -// queryWrapper.eq(SysCarResp::getCarModel, sysCar.getCarModel()); -// } -// if (StringUtils.isNotEmpty(String.valueOf(sysCar.getCarType()))){ -// queryWrapper.eq(SysCarResp::getCarType, sysCar.getCarType()); -// } -// if (StringUtils.isNotEmpty(String.valueOf(sysCar.getState()))){ -// queryWrapper.eq(SysCarResp::getState, sysCar.getState()); -// } -// return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param sysCar 车辆基础信息 - * @return 车辆基础信息 - */ - @Override - public Boolean checkIdUnique(SysCar sysCar) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCar::getId, sysCar.getId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java deleted file mode 100644 index 4eaa106..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.service.impl.faultDetectionStrategy; - -import org.springframework.stereotype.Service; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ - - -/** - * 针对燃油车的故障检测逻辑 - */ -@Service(value = "FuelVehicleCar") -public class FuelVehicleCarFaultDetectionStrategy { -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java deleted file mode 100644 index 1170ee7..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.muyu.service.impl.faultDetectionStrategy; - - -import com.muyu.domain.CarFaultRule; -import com.muyu.domain.FaultReport; -import com.muyu.service.FaultDetectionStrategy; -import org.springframework.stereotype.Service; - -/** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: - */ - -/** - * 针对纯电车的故障检测逻辑 - */ -@Service(value = "PureElectricCar") -public class PureElectricCarFaultDetectionStrategy implements FaultDetectionStrategy { - - - - @Override - public FaultReport detectFaults(CarFaultRule carFaultRule) { - - - //检测车速是否处于正常范围 - if (carFaultRule.getSpeed()>200 || carFaultRule.getSpeed()<0){ - return new FaultReport("纯电车","车速不在正常范围内,请注意"); - } - //检测总里程数是否超过正常数 - if (carFaultRule.getTM()>5000000){ - return new FaultReport("纯电车","总里程数已超标,请注意"); - } - //检测总电压是否正常 - if (carFaultRule.getTV()>650){ - return new FaultReport("纯电车","总电压过高,请注意"); - } - //检测电流是否超标 - if (carFaultRule.getCC()>50){ - return new FaultReport("纯电车","电流过高,请注意"); - } - //检测绝缘电阻 - if (carFaultRule.getIR()>100000){ - return new FaultReport("纯电车","绝缘电阻过高,请注意"); - } -// //检测加速踏板行程值 -// if (carFaultRule.getAPTV()){ -// -// } -// //检测制动踏板行程值 -// if (carFaultRule.getBPTV()){ -// -// } -// //检测燃料消耗率 -// if (carFaultRule.getSFC()){ -// -// } -// //检测电机控制器温度 -// if (carFaultRule.getMCT()){ -// -// } -// //检测电机转速 -// if (carFaultRule.getMS()){ -// -// } -// //检测电机转矩 -// if (carFaultRule.getMTO()){ -// -// } -// //检测电机温度 -// if (carFaultRule.getMTE()){ -// -// } -// //检测电机电压 -// if (carFaultRule.getMV()){ -// -// } -// //检测电机电流 -// if (carFaultRule.getMC()){ -// -// } -// //检测动力电池剩余电量SOC -// if (carFaultRule.getPBRSOC()){ -// -// } -// //检测当前状态允许的最大反馈功率 -// if (carFaultRule.getMACSFP()){ -// -// } -// //检测当前状态允许最大放电功率 -// if (carFaultRule.getCSATMDP()) { -// -// } -// //检测BMS自检计数器 -// if (carFaultRule.getBMS()) { -// -// } -// //检测动力电池充放电电流 -// if (carFaultRule.getCADC()) { -// -// } -// //检测动力电池负载端总电压V3 -// if (carFaultRule.getPBLETVV3()) { -// -// } -// //检测单次最大电压 -// if (carFaultRule.getSMV()) { -// -// } -// //检测单体电池最低电压 -// if (carFaultRule.getMVOAB()) { -// -// } -// //检测单体电池最高温度 -// if (carFaultRule.getMAXBT()) { -// -// } -// //检测单体电池最低温度 -// if (carFaultRule.getMINBT()) { -// -// } -// //检测动力电池可用容量 -// if (carFaultRule.getPBAC()) { -// -// } -// //检测车辆状态 -// if (carFaultRule.getVS()) { -// -// } -// //检测充电状态 -// if (carFaultRule.getCS()) { -// -// } -// //检测运行状态 -// if (carFaultRule.getRS()) { -// -// } -// //检测SOC -// if (carFaultRule.getSOC()) { -// -// } -// //检测可充电储能装置工作状态 -// if (carFaultRule.getRESDWC()) { -// -// } -// //检测驱动电机状态 -// if (carFaultRule.getEAS()) { -// -// } -// //检测定位是否有效 -// if (carFaultRule.getPTC()) { -// -// } -// //检测EAS -// if (carFaultRule.getEPS()) { -// -// } -// //检测PTC -// if (carFaultRule.getABS()) { -// -// } -// //检测EPS -// if (carFaultRule.getMCU()) { -// -// } -// //检测ABS -// if (carFaultRule.getPBHS()) { -// -// } -// //检测MCU -// if (carFaultRule.getPBCS()) { -// -// } -// //检测动力电池加热状态 -// if (carFaultRule.getPBIS()) { -// -// } -// //检测动力电池当前状态 -// if (carFaultRule.getDCDC()) { -// -// } -// //检测动力电池保温状态 -// if (carFaultRule.getCHG()) { -// -// } -// //检测DCDC -// if (carFaultRule.getCHB()) { -// -// } -// //检测CHG -// if (carFaultRule.getCUB()) { -// -// } - return null; - } -} diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml b/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml deleted file mode 100644 index ee1f8c8..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnLogsMapper.xml +++ /dev/null @@ -1,102 +0,0 @@ - - - - - - - - - - - - - - - - - - - select id, vin, warn_rule_id, start_time, end_time, max_value, min_value, avg_value, median_value, status from warn_logs - - - - - - - - insert into warn_logs - - vin, - warn_rule_id, - start_time, - end_time, - max_value, - min_value, - avg_value, - median_value, - status, - create_by, - create_time, - - - #{vin}, - #{warnRuleId}, - #{startTime}, - #{endTime}, - #{maxValue}, - #{minValue}, - #{avgValue}, - #{medianValue}, - #{status}, - #{createBy}, - #{createTime}, - - - - - update warn_logs - - vin = #{vin}, - warn_rule_id = #{warnRuleId}, - start_time = #{startTime}, - end_time = #{endTime}, - max_value = #{maxValue}, - min_value = #{minValue}, - avg_value = #{avgValue}, - median_value = #{medianValue}, - status = #{status}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from warn_logs where id = #{id} - - - - delete from warn_logs where id in - - #{id} - - - diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml b/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml deleted file mode 100644 index b4af870..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnRuleMapper.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - select id, rule_name, strategy_id, msg_type_id, slide_time, slide_frequency, max_value, min_value from warn_rule - - - - - - - - insert into warn_rule - - rule_name, - strategy_id, - msg_type_id, - slide_time, - slide_frequency, - max_value, - min_value, - create_by, - create_time, - - - #{ruleName}, - #{strategyId}, - #{msgTypeId}, - #{slideTime}, - #{slideFrequency}, - #{maxValue}, - #{minValue}, - #{createBy}, - #{createTime}, - - - - - update warn_rule - - rule_name = #{ruleName}, - strategy_id = #{strategyId}, - msg_type_id = #{msgTypeId}, - slide_time = #{slideTime}, - slide_frequency = #{slideFrequency}, - max_value = #{maxValue}, - min_value = #{minValue}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from warn_rule where id = #{id} - - - - delete from warn_rule where id in - - #{id} - - - diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml b/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml deleted file mode 100644 index 556e161..0000000 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/WarnStrategyMapper.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - select id, sys_type_id, strategy_name, msg_id from warn_strategy - - - - - - - - insert into warn_strategy - - sys_type_id, - strategy_name, - msg_id, - create_by, - create_time, - - - #{sysTypeId}, - #{strategyName}, - #{msgId}, - #{createBy}, - #{createTime}, - - - - - update warn_strategy - - sys_type_id = #{sysTypeId}, - strategy_name = #{strategyName}, - msg_id = #{msgId}, - update_by = #{updateBy}, - update_time = #{updateTime}, - - where id = #{id} - - - - delete from warn_strategy where id = #{id} - - - - delete from warn_strategy where id in - - #{id} - - - diff --git a/cloud-modules/cloud-module-enterprise/.gitignore b/cloud-modules/cloud-modules-enterprise/.gitignore similarity index 100% rename from cloud-modules/cloud-module-enterprise/.gitignore rename to cloud-modules/cloud-modules-enterprise/.gitignore diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml new file mode 100644 index 0000000..54111f7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/pom.xml @@ -0,0 +1,36 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + enterpise-cache + + + 17 + 17 + UTF-8 + + + + + + + + com.muyu + cloud-common-cache + ${muyu.version} + + + + com.muyu + enterpise-common + + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/EnterpiseCacheService.java b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/EnterpiseCacheService.java new file mode 100644 index 0000000..575a974 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/java/com/muyu/enterpise/cache/EnterpiseCacheService.java @@ -0,0 +1,42 @@ +package com.muyu.enterpise.cache; + +import com.muyu.common.cache.CacheAbsBasic; +import com.muyu.common.cache.CacheBasic; +import com.muyu.domain.MessageValue; +import org.springframework.stereotype.Component; + +/** + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/29 20:04 + * @注释 + */ +@Component +public class EnterpiseCacheService extends CacheAbsBasic { + + /** + * 前缀 + * @return + */ + @Override + public String keyPre() { + return"messageValue:info:"; + } + + + @Override + public String encode(String key) { + return super.encode(key); + } + + + /** + * 解密 + * @param key 缓存建 + * @return + */ + @Override + public String decode(String key) { + return key.replace("messageValue:info:",""); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..6fd26a8 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.enterpise.cache.EnterpiseCacheService diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml new file mode 100644 index 0000000..eafa13e --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/pom.xml @@ -0,0 +1,45 @@ + + + 4.0.0 + + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + enterpise-common + + + 17 + 17 + UTF-8 + + + + + + com.muyu + cloud-common-core + + + + com.muyu + cloud-common-security + + + + + com.muyu + cloud-common-api-doc + + + + io.swagger.core.v3 + swagger-annotations-jakarta + + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java new file mode 100644 index 0000000..cd51cd7 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultMessage.java @@ -0,0 +1,69 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + * 车辆故障信息实体类 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：plues + * * @name：CarFaultMessage + * * @Date：2024/9/25 23:45 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@Builder +@Tag(name = "车辆故障信息实体类",description = "车辆故障信息实体类") +@TableName(value = "car_fault_message",autoResultMap = true) +public class CarFaultMessage { + @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "id") + /** + * id + */ + private Integer id; + @Schema(name = "sender") + /** + * 发送者 + */ + private String sender; + @Schema(name = "receiver") + /** + * 接收者 + */ + private String receiver; + @Schema(name = "content") + /** + * 消息内容 + */ + private String content; + @Schema(name = "status") + /** + * 消息状态 + */ + private Integer status; + @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + /** + * 创建时间 + */ + private Date createTime; + @Schema(name = "userId") + /** + * 登录人Id + */ + private Integer userId; +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java similarity index 65% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java index dfdaf05..8e40ee3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFaultRule.java @@ -1,206 +1,266 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: + + */ +/** + * 车辆故障规则实体类 + * * @className: CarFaultRule ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder -public class CarFaultRule {/** - * VIN码VIN码VIN码 - */ -private String vin; +@TableName(value = "car_fault_rule",autoResultMap = true) +@Tag(name = "车辆故障规则") +public class CarFaultRule { + /** + * VIN码VIN码VIN码 + */ + @TableId(value = "规则Id",type = IdType.AUTO) + @Schema(name = "车辆VIN码") + private Long vin; /** * 时间戳时间戳时间戳 */ + @Schema(name = "车辆类型Id") private long timestamp; /** * 经度经度经度 */ + @Schema(name = "车速") private double longitude; /** * 纬度纬度纬度 */ + @Schema(name = "总电流") private double latitude; /** * 车速车速车速 */ + @Schema(name = "绝缘电阻") private double speed; /** * 总里程总里程总里程 */ + @Schema(name = "加速踏板行程值") private long TM; /** * 总电压总电压总电压 */ + @Schema(name = "制动踏板行程值") private double TV; /** * 总电流总电流总电流 */ + @Schema(name = "燃料消耗率") private double CC; /** * 绝缘电阻绝缘电阻绝缘电阻 */ + @Schema(name = "电机控制器温度") private double IR; /** * 档位档位档位 */ + @Schema(name = "电机转速") private String GP; /** * 加速踏板行程值加速踏板行程值加速踏板行程值 */ + @Schema(name = "电机转矩") private double APTV; /** * 制动踏板行程值制动踏板行程值制动踏板行程值 */ + @Schema(name = "电机温度") private double BPTV; /** * 燃料消耗率燃料消耗率燃料消耗率 */ + @Schema(name = "电机电压") private double SFC; /** * 电机控制器温度电机控制器温度电机控制器温度 */ + @Schema(name = "电机电流") private double MCT; /** * 电机转速电机转速电机转速 */ + @Schema(name = "动力电池剩余电量SOC") private int MS; /** * 电机转矩电机转矩电机转矩 */ + @Schema(name = "当前状态允许的最大反馈功率") private double MTO; /** * 电机温度电机温度电机温度 */ + @Schema(name = "当前状态允许最大放电功率") private double MTE; /** * 电机电压电机电压电机电压 */ + @Schema(name = "BMS自检计数器") private double MV; /** * 电机电流电机电流电机电流 */ + @Schema(name = "动力电池充放电电流") private double MC; /** * 动力电池剩余电量SOC动力电池剩余电量SOC动力电池剩余电量SOC */ + @Schema(name = "动力电池负载端总电压V3") private double PBRSOC; /** * 当前状态允许的最大反馈功率当前状态允许的最大反馈功率当前状态允许的最大反馈功率 */ + @Schema(name = "单次最大电压") private double MACSFP; /** * 当前状态允许最大放电功率当前状态允许最大放电功率当前状态允许最大放电功率 */ + @Schema(name = "单体电池最低电压") private double CSATMDP; /** * BMS自检计数器BMS自检计数器BMS自检计数器 */ + @Schema(name = "单体电池最高温度") private int BMS; /** * 动力电池充放电电流动力电池充放电电流动力电池充放电电流 */ + @Schema(name = "单体电池最低温度") private double CADC; /** * 动力电池负载端总电压V3动力电池负载端总电压V3动力电池负载端总电压V3 */ + @Schema(name = "动力电池可用容量") private double PBLETVV3; /** * 单次最大电压单次最大电压单次最大电压 */ + @Schema(name = "总里程") private double SMV; /** * 单体电池最低电压单体电池最低电压单体电池最低电压 */ + @Schema(name = "总电压") private double MVOAB; /** * 单体电池最高温度单体电池最高温度单体电池最高温度 */ + @Schema(name = "车辆状态") private double MAXBT; /** * 单体电池最低温度单体电池最低温度单体电池最低温度 */ + @Schema(name = "充电状态") private double MINBT; /** * 动力电池可用容量动力电池可用容量动力电池可用容量 */ + @Schema(name = "运行状态") private double PBAC; /** * 车辆状态车辆状态车辆状态 */ + @Schema(name = "SOC") private String VS; /** * 充电状态充电状态充电状态 */ + @Schema(name = "可充电储能装置工作状态") private String CS; /** * 运行状态运行状态运行状态 */ + @Schema(name = "EAS") private String RS; /** * SOCSOCSOC */ + @Schema(name = "PTC") private double SOC; /** * 可充电储能装置工作状态可充电储能装置工作状态可充电储能装置工作状态 */ + @Schema(name = "EPS") private String RESDWC; /** * EASEASEAS */ + @Schema(name = "ABS") private String EAS; /** * PTCPTCPTC */ + @Schema(name = "MCU") private String PTC; /** * EPSEPSEPS */ + @Schema(name = "动力电池加热状态") private String EPS; /** * ABSABSABS */ + @Schema(name = "动力电池当前状态") private String ABS; /** * MCUMCUMCU */ + @Schema(name = "动力电池保温状态") private String MCU; /** * 动力电池加热状态动力电池加热状态动力电池加热状态 */ + @Schema(name = "DCDC") private String PBHS; /** * 动力电池当前状态动力电池当前状态动力电池当前状态 */ + @Schema(name = "CHG") private String PBCS; /** * 动力电池保温状态动力电池保温状态动力电池保温状态 */ + @Schema(name = "校验位") private String PBIS; /** * DCDCDCDCDCDC */ + @Schema(name = "截止位") private String DCDC; /** * CHGCHGCHG */ + @Schema(name = "") private String CHG; /** * 校验位校验位校验位 */ + @Schema(name = "") private byte CHB; /** * 截止位截止位截止位 */ + @Schema(name = "") private byte CUB; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java similarity index 83% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java index 31ed980..e7e22c3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFence.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFence.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -15,11 +16,12 @@ import org.springframework.format.annotation.DateTimeFormat; import java.util.Date; /** - * @Author：yang - * @Package：com.muyu.domain - * @Project：cloud-electronic - * @name：CarFence - * @Date：2024/9/17 16:08 + * 车辆电子围栏类 + * * @Author：yang + * * @Package：com.muyu.domain + * * @Project：cloud-electronic + * * @name：CarFence + * * @Date：2024/9/17 16:08 */ @Data @AllArgsConstructor @@ -37,28 +39,34 @@ public class CarFence { /** * 围栏名称 */ + @Schema(name = "围栏名称") private String name; /** * 业务类型ID */ + @Schema(name = "业务类型ID") private Integer clazzId; /** * 业务类型名称 */ + @Schema(name = "业务类型名称") @TableField(exist = false) private String clazzName; /** * 围栏类型ID */ + @Schema(name = "围栏类型ID") private Integer typeId; /** * 围栏类型名称 */ + @Schema(name = "围栏类型名称") @TableField(exist = false) private String typeName; /** * 围栏经纬度 */ + @Schema(name = "围栏经纬度") private String fenceText; /** * 围栏开始时间 @@ -81,6 +89,7 @@ public class CarFence { /** * 中间表ID */ + @Schema(name = "中间表ID") private Integer middleId; public static CarFence carFenceBuild(CarFence carFence) { return CarFence.builder() diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java similarity index 64% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java index 8532b11..110d565 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceClazz.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceClazz.java @@ -1,6 +1,9 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,11 +11,12 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：yang - * @Package：com.muyu.domain - * @Project：cloud-electronic - * @name：CarFenceClazz - * @Date：2024/9/17 16:41 + * 车辆电子围栏业务类型 + * * @Author：yang + * * @Package：com.muyu.domain + * * @Project：cloud-electronic + * * @name：CarFenceClazz + * * @Date：2024/9/17 16:41 */ @Data @AllArgsConstructor @@ -24,10 +28,13 @@ public class CarFenceClazz { /** * 业务类型ID */ + @TableId(value = "clazz_id",type = IdType.AUTO) + @Schema(name = "业务类型ID") private Integer clazzId; /** * 业务类型名称 */ + @Schema(name = "业务类型名称") private String clazzName; public static CarFenceClazz carFenceClazzBuild(CarFenceClazz carFenceClazz) { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java similarity index 64% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java index 1cbf546..5206a83 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarFenceType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarFenceType.java @@ -1,6 +1,9 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,11 +11,12 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：yang - * @Package：com.muyu.domain - * @Project：cloud-electronic - * @name：Type - * @Date：2024/9/17 16:40 + * 车辆电子围栏类型 + * * @Author：yang + * * @Package：com.muyu.domain + * * @Project：cloud-electronic + * * @name：Type + * * @Date：2024/9/17 16:40 */ @Data @AllArgsConstructor @@ -24,10 +28,13 @@ public class CarFenceType { /** * 围栏类型ID */ + @TableId(value = "type_id" ,type = IdType.AUTO) + @Schema(name = "围栏类型ID") private Integer typeId; /** * 围栏类型名称 */ + @Schema(name = "围栏类型名称") private String typeName; public static CarFenceType carFenceTypeBuild(CarFenceType carFenceType) { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java new file mode 100644 index 0000000..1ba7a36 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarInformation.java @@ -0,0 +1,114 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.Date; + +/** + * 车辆信息实体类 + * * @className: CarInformation ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/30 12:40 ⏰ + * * @Version: 1.0 + * * @description: + */ + +@Data +@AllArgsConstructor +@NoArgsConstructor +@Tag(name = "车辆信息") +@TableName("car_information") +public class CarInformation { + /** + * 车辆ID + */ + @TableId(value = "car_information_id" , type = IdType.AUTO) + @Schema(name = "车辆ID") + private Long carInformationId; + /** + * 车辆唯一VIN + */ + @Schema(name = "车辆唯一VIN") + private String CarInformationVIN; + /** + * 车牌号 + */ + @Schema(name = "车牌号") + private String carInformationLicensePlate; + /** + * 车辆品牌 + */ + @Schema(name = "车辆品牌") + private String carInformationBrand; + /** + * 车辆颜色 + */ + @Schema(name = "车辆颜色") + private String carInformationColor; + /** + * 车辆驾驶员 + */ + @Schema(name = "车辆驾驶员") + private String carInformationDriver; + /** + * 车检到期日期 + */ +// @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") +// @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") +// @Schema(name = "车检到期日期") + private Date carInformationExamineEnddata; + /** + * 车辆电机厂商 + */ + @Schema(name = "车辆电机厂商") + private String carInformationMotorManufacturer; + /** + * 车辆电机型号 + */ + @Schema(name = "车辆电机型号") + private String carInformationMotorModel; + /** + * 车辆电池厂商 + */ + @Schema(name = "车辆电池厂商") + private String carInformationBatteryManufacturer; + /** + * 车辆电池型号 + */ + @Schema(name = "车辆电池型号") + private String carInformationBatteryModel; + /** + * 车辆电子围栏外键ID + */ + @Schema(name = "车辆电子围栏外键ID") + private Long carInformationFence; + /** + * 车辆类型外键ID + */ + @Schema(name = "车辆类型外键ID") + private Long carInformationType; + /** + * 是否重点车辆 (0否默认 1是 ) + */ + @Schema(name = "是否重点车辆 (0否默认 1是 )") + private Long carInformationFocus; + /** + * 车辆策略id + */ + @Schema(name = "车辆策略id") + private Long carStrategyId; + /** + * 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) + */ + @Schema(name = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)") + private Long carInformationState; + + +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java similarity index 58% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java index 300a0e0..213ae51 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/CarMiddle.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarMiddle.java @@ -1,6 +1,9 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -8,12 +11,13 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：plues - * @name：CarMiddle - * @Date：2024/9/25 20:25 * 围栏组和围栏中间表 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：plues + * * @name：CarMiddle + * * @Date：2024/9/25 20:25 + * * 围栏组和围栏中间表 */ @Data @AllArgsConstructor @@ -25,14 +29,18 @@ public class CarMiddle { /** * 主键 */ + @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "主键") private Integer id; /** * 围栏id */ + @Schema(name = "围栏id") private Integer carFenceId; /** * 围栏组id */ + @Schema(name = "围栏组id") private Integer carGroupId; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java new file mode 100644 index 0000000..d66ec14 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/CarType.java @@ -0,0 +1,44 @@ +package com.muyu.domain; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 车辆类型实体类 + * * @className: CarType ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:01 ⏰ + * * @Version: 1.0 + * * @description: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName(value = "car_type",autoResultMap = true) +@Tag(name = "车辆类型管理") +public class CarType { + /** + * 车辆类型ID + */ + @TableId(value = "car_type_id",type = IdType.AUTO) + @Schema(name = "车辆类型ID") + private long carTypeId; + /** + * 车辆类型名 + */ + @Schema(name = "车辆类型名") + private String carTypeName; + /** + * 车辆规则外键ID + */ + @Schema(name = "车辆规则外键ID") + private long carTypeRules; +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java similarity index 66% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java index dce83ce..0926e99 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCode.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCode.java @@ -4,57 +4,88 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.req.FaultCodeAddReq; +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; /** - * @className: FaultCode ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:21 ⏰ - * @Version: 1.0 - * @description: + + */ + +/** + * 故障码实体类 + * * @className: FaultCode ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:21 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_faultcode", autoResultMap = true) +@Tag(name = "故障码管理") public class FaultCode { /** * 故障码Id */ @TableId(value = "faultcode_id", type = IdType.AUTO) + @Schema(name = "故障码Id") private long faultcodeId; /** * 故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 故障组 */ + @Schema(name = "故障组") private String faultGroup; /** * 故障位 */ + @Schema(name = "故障位") private String faultBit; /** * 故障值 */ + @Schema(name = "故障值") private String faultValue; /** * 是否警告 */ + @Schema(name = "是否警告") private Integer isWarning; + /** + * 故障类型名称 + */ + @Schema(name = "故障类型名称") private String faulttypeName; + /** + * 故障类型编码 + */ + @Schema(name = "故障类型编码") private String messageTypeName; + /** + * 故障类型所属 + */ + @Schema(name = "故障类型所属") private String messageTypeCode; + /** + * 故障类型所属 + */ + @Schema(name = "故障类型所属") private String messageTypeBelongs; public static FaultCode addfaultcode(FaultCodeAddReq faultCodeAddReq) { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java similarity index 80% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java index 807f9d9..3ca99a1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultCondition.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultCondition.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionUpdReq; +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; @@ -14,50 +16,60 @@ import java.math.BigDecimal; import java.util.function.Supplier; /** - * @className: FaultCondition ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: + * 故障规则表 + * * @className: FaultCondition ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:07 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_condition",autoResultMap = true) +@Tag(name = "故障规则管理") public class FaultCondition { /** * 故障规则表Id */ @TableId(value = "carcondition_id",type = IdType.AUTO) + @Schema(name = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(name = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(name = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(name = "故障规则参数") private BigDecimal faultconditionParameter; /** * 车辆类型名称 */ + @Schema(name = "车辆类型名称") private String carTypeName; /** * 故障名称 */ + @Schema(name = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageTypeCode; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java similarity index 65% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java index 65f0c74..3c59288 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLabel.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLabel.java @@ -3,41 +3,49 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @className: FaultLabel ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:07 ⏰ - * @Version: 1.0 - * @description: + * 报文标签 + * * @className: FaultLabel ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:07 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_label",autoResultMap = true) +@Tag(name = "报文标签管理") public class FaultLabel { /** *自增主键 */ @TableId(value = "message_type_id",type = IdType.AUTO) + @Schema(name = "自增主键") private String messageTypeId; /** *报文编码 */ + @Schema(name = "报文编码") private String messageTypeCode; /** *报文名称 */ + @Schema(name = "报文名称") private String messageTypeName; /** *报文所属类别 */ + @Schema(name = "报文所属类别") private String messageTypeBelongs; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java similarity index 74% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java index 8c41688..cd68c1d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultLog.java @@ -5,6 +5,7 @@ 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,17 +14,18 @@ import lombok.experimental.SuperBuilder; import java.util.Date; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: + * 故障日志实体类 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障日志实体类 */ - @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@Tag(name = "故障日志实体类",description = "故障日志实体类") @TableName(value = "car_fault_log",autoResultMap = true) public class FaultLog { @@ -31,18 +33,22 @@ public class FaultLog { * 故障日志Id */ @TableId(value = "log_id",type = IdType.AUTO) + @Schema(name = "故障日志Id") private long logId; /** * 故障码Id */ + @Schema(name = "故障码Id") private long faultcodeId; /** * 车辆Id */ + @Schema(name = "车辆Id") private long carInformationId; /** * 车辆VIN */ + @Schema(name = "车辆VIN") private String carVin; /** * 开始报警时间 @@ -59,10 +65,12 @@ public class FaultLog { /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 车辆vin */ + @Schema(name = "车辆vin") private String carInformationVIN; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java new file mode 100644 index 0000000..4d59e6b --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultReport.java @@ -0,0 +1,27 @@ +package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 车辆故障报告 + * * @className: FaultReport ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:05 ⏰ + * * @Version: 1.0 + * * @description: + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder +@TableName("fault_report") +@Tag(name = "车辆故障报告") +public class FaultReport { + + private String VehicleType; + private String FaultDescription; +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java similarity index 56% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java index 3607366..3ce7cd2 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultRule.java @@ -1,6 +1,10 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -9,56 +13,67 @@ import lombok.experimental.SuperBuilder; import java.math.BigDecimal; /** - * @className: FaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:05 ⏰ - * @Version: 1.0 - * @description: + * 故障触发条件 + * * @className: FaultRule ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:05 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_condition",autoResultMap = true) +@Tag(name = "故障触发条件") public class FaultRule { /** * 触发条件Id */ + @TableId(value = "condition_id",type = IdType.AUTO) + @Schema(name = "触发条件Id") private long conditionId; /** * 故障码Id */ + @Schema(name = "故障码Id") private long faultcodeId; /** * 触发条件描述 */ + @Schema(name = "触发条件描述") private String conditionContent; /** * 单个参数的阈值 */ + @Schema(name = "单个参数的阈值") private BigDecimal singleThreshold; /** * 区间参数的阈值的最小值 */ + @Schema(name = "区间参数的阈值的最小值") private BigDecimal minThreshold; /** * 区间参数的阈值的最大值 */ + @Schema(name = "区间参数的阈值的最大值") private BigDecimal maxThreshold; /** * 触发条件是否激活 */ + @Schema(name = "触发条件是否激活") private Integer isActive; /** * 车辆数据值 */ + @Schema(name = "车辆数据值") private BigDecimal Threshold; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java similarity index 63% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java index 602208e..993fecd 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FaultType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FaultType.java @@ -3,31 +3,37 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @className: FaultType ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:04 ⏰ - * @Version: 1.0 - * @description: + * 故障类型实体类 + * * @className: FaultType ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:04 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_type",autoResultMap = true) +@Tag(name = "故障类型管理") public class FaultType { /** *故障类型Id */ @TableId(value = "faulttype_id",type = IdType.AUTO) + @Schema(name = "故障类型Id") private long faulttypeId; /** *故障类型名称 */ + @Schema(name = "故障类型名称") private String faulttypeName; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java similarity index 70% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java index bc6665f..d3add19 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceAndGroupMiddle.java @@ -3,6 +3,7 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,11 +11,12 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：plues - * @name：FenceAndGroupMiddle - * @Date：2024/9/22 09:59 + * 车辆电子围栏中间表 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：plues + * * @name：FenceAndGroupMiddle + * * @Date：2024/9/22 09:59 */ @Data @AllArgsConstructor @@ -27,14 +29,17 @@ public class FenceAndGroupMiddle { * id */ @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "id") private Integer id; /** * 围栏id */ + @Schema(name = "围栏id") private Integer carId; /** * 围栏组id */ + @Schema(name = "围栏组id") private Integer groupId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java similarity index 71% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java index 2ff4b69..132b031 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/FenceGroup.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/FenceGroup.java @@ -3,6 +3,7 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,11 +11,12 @@ import lombok.Data; import lombok.NoArgsConstructor; /** - * @Author：yan - * @Package：com.muyu.car.domain - * @Project：cars - * @name：FenceGroup - * @Date：2024/9/21 20:45 + * 围栏组实体类 + * * @Author：yan + * * @Package：com.muyu.car.domain + * * @Project：cars + * * @name：FenceGroup + * * @Date：2024/9/21 20:45 */ @Data @AllArgsConstructor @@ -27,14 +29,17 @@ public class FenceGroup { * id */ @TableId(value = "group_id",type = IdType.AUTO) + @Schema(name = "围栏组id") private Integer groupId; /** * 围栏组名称 */ + @Schema(name = "围栏组名称") private String groupName; /** * 围栏组状态 */ + @Schema(name = "围栏组状态") private Integer groupStates; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java similarity index 56% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java index 974d969..14049f0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageDao.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageDao.java @@ -1,20 +1,36 @@ package com.muyu.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.message.Message; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.sql.Connection; import java.sql.PreparedStatement; /** - * @className: MessageDao ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:58 ⏰ - * @Version: 1.0 - * @description: + * 消息dao + * * @className: MessageDao ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 20:58 ⏰ + * * @Version: 1.0 + * * @description:消息dao */ +@TableName(value = "car_fault_message" , autoResultMap = true) +@SuperBuilder +@Builder +@NoArgsConstructor @Data +@Tag(name = "消息模块") public class MessageDao { + @TableId(value = "id", type = IdType.AUTO) + @Schema(name = "消息id") private Connection connection; public MessageDao(Connection connection){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java similarity index 76% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java index a6d9dd4..7f9c810 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageTemplate.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageTemplate.java @@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.req.MessageTemplateAddReq; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.domain.req.MessageTemplateAddReq; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,10 +15,11 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @ClassName MessageTemplate - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 报文模版实体类 + * * @ClassName MessageTemplate + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Data @SuperBuilder @@ -23,22 +27,26 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "message_template", autoResultMap = true) +@Tag(name = "报文模版管理") public class MessageTemplate extends BaseEntity { /** * 报文模版主键 */ @TableId(value = "message_template_id", type = IdType.AUTO) + @Schema(title = "报文模版主键") private String messageTemplateId; /** * 报文模版名称 */ + @Schema(name = "报文模版名称") private String messageTemplateName; /** * 报文模版描述 */ + @Schema(name = "报文模版描述") private String messageTemplateDescribe; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java similarity index 61% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java index 8411791..3395bda 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/MessageValue.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/MessageValue.java @@ -3,8 +3,11 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.domain.req.MessageValueAddReq; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.domain.req.MessageValueAddReq; +import com.muyu.domain.resp.MessageValueListResp; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -12,10 +15,11 @@ import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; /** - * @ClassName MessageValue - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 报文数据 + * * @ClassName MessageValue + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Data @SuperBuilder @@ -23,42 +27,50 @@ import lombok.experimental.SuperBuilder; @AllArgsConstructor @EqualsAndHashCode(callSuper = true) @TableName(value = "message_value", autoResultMap = true) +@Tag(name = "报文数据") public class MessageValue extends BaseEntity { /** * 报文数据主键 */ @TableId(value = "message_id", type = IdType.AUTO) + @Schema(title = "报文数据主键") private Long messageId; /** * 模版主键 */ + @Schema(name = "模版主键") private Long templateId; /** * 报文类别 */ + @Schema(name = "报文类别") private String messageType; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageCode; /** * 报文标签 */ + @Schema(name = "报文标签") private String messageLabel; /** * 起始下标 */ + @Schema(name = "起始下标") private Integer messageStartIndex; /** * 终止下标 */ + @Schema(name = "终止下标") private Integer messageEndIndex; public static MessageValue addBuild(MessageValueAddReq messageValueAddReq){ @@ -71,4 +83,14 @@ public class MessageValue extends BaseEntity { .messageEndIndex(messageValueAddReq.getMessageEndIndex()) .build(); } + public static MessageValue addRollback(MessageValueListResp messageValueListResp){ + return MessageValue.builder() + .templateId(messageValueListResp.getMessageId()) + .messageType(messageValueListResp.getMessageType()) + .messageCode(messageValueListResp.getMessageCode()) + .messageLabel(messageValueListResp.getMessageLabel()) + .messageStartIndex(messageValueListResp.getMessageStartIndex()) + .messageEndIndex(messageValueListResp.getMessageEndIndex()) + .build(); + } } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java similarity index 81% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java index 6b1e2c9..63b0a42 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCar.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCar.java @@ -4,6 +4,8 @@ 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.EqualsAndHashCode; @@ -15,7 +17,7 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 车辆基础信息对象 sys_car * - * @author Li HD + * @author LiHD * @date 2024-09-18 */ @@ -25,34 +27,43 @@ import org.apache.commons.lang3.builder.ToStringStyle; @NoArgsConstructor @AllArgsConstructor @TableName(value = "sys_car", autoResultMap = true) +@Tag(name = "车辆基础信息") public class SysCar extends BaseEntity{ /** 自增主键 */ - @TableId( type = IdType.AUTO) + @TableId( type = IdType.AUTO , value = "id" ) private Long id; /** 车辆VIN码 */ + @Schema(name = "车辆VIN码") private String carVin; /** 车辆车牌号 */ + @Schema(name = "车辆车牌号") private String carPlate; /** 车辆品牌 */ + @Schema(name = "车辆品牌") private String carBrand; /** 车辆型号 */ + @Schema(name = "车辆型号") private String carModel; /** 车辆类型 */ + @Schema(name = "车辆类型") private Integer carType; /** 策略ID */ + @Schema(name = "策略ID") private Integer warnStrategy; /** 围栏组编码 */ + @Schema(name = "围栏组编码") private String groupCode; /** 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) */ + @Schema(name = "启用状态") private Integer state; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java similarity index 76% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java index 3344565..78a0987 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarFault.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarFault.java @@ -3,8 +3,9 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; @@ -12,7 +13,6 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 车辆故障对象 sys_car_fault - * * @author Yang鹏 * @date 2024-09-18 */ @@ -23,56 +23,58 @@ import org.apache.commons.lang3.builder.ToStringStyle; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@TableName("sys_car_fault") +@TableName(value = "sys_car_fault", autoResultMap = true) +@Tag(name = "车辆故障对象") public class SysCarFault extends BaseEntity{ private static final long serialVersionUID = 1L; /** 自增主键 */ - @TableId( type = IdType.AUTO) + @TableId( type = IdType.AUTO,value = "id") + @Schema(name = "自增主键") private Long id; /** 车辆故障编码; */ - @Excel(name = "车辆故障编码;") + @Schema(name = "车辆故障编码;") private String faultCode; /** 车辆故障名称 */ - @Excel(name = "车辆故障名称") + @Schema(name = "车辆故障名称") private String faultName; /** 车辆故障类型 */ - @Excel(name = "车辆故障类型") + @Schema(name = "车辆故障类型") private String faultType; /** 故障VIN编码 */ - @Excel(name = "故障VIN编码") + @Schema(name = "故障VIN编码") private String carVin; /** 车辆故障标签 */ - @Excel(name = "车辆故障标签") + @Schema(name = "车辆故障标签") private String faultLabel; /** 车辆故障位 */ - @Excel(name = "车辆故障位") + @Schema(name = "车辆故障位") private String faultBit; /** 车辆故障值 */ - @Excel(name = "车辆故障值") + @Schema(name = "车辆故障值") private String faultValue; /** 故障级别; */ - @Excel(name = "故障级别;") + @Schema(name = "故障级别;") private String faultWarn; /** 报警状态（Y.是，N.否） */ - @Excel(name = "报警状态", readConverterExp = "Y=.是，N.否") + @Schema(name = "报警状态") private String warnStatus; /** 故障描述信息 */ - @Excel(name = "故障描述信息") + @Schema(name = "故障描述信息") private String faultDesc; /** 启用状态(1.待处理 2.处理中 3.已处理 4.忽略) */ - @Excel(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") + @Schema(name = "启用状态(1.待处理 2.处理中 3.已处理 4.忽略)") private String state; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java similarity index 79% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java index 1e52356..28e9c00 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/SysCarType.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/SysCarType.java @@ -4,8 +4,10 @@ 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 lombok.AllArgsConstructor; import lombok.Data; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; @@ -22,20 +24,24 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @AllArgsConstructor @TableName(value = "sys_car_type", autoResultMap = true) +@Tag(name = "车辆类型管理") public class SysCarType extends BaseEntity { /** * 车辆类型主键 */ @TableId(value = "id", type = IdType.AUTO) + @Schema(name = "车辆类型主键") private String id; /** * 车辆类型名称 */ + @Schema(name = "车辆类型名称") private String sysTypeName; /** * 报文模版外键 */ + @Schema(name = "报文模版外键") private String messageTemplateId; } diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java new file mode 100644 index 0000000..2dd6a8a --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLevel.java @@ -0,0 +1,12 @@ +package com.muyu.domain; + +/** + * WarnLevel枚举类 + * *@ClassName WarnLevel + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/22 15:48 + */ +public enum WarnLevel { + LOW, MEDIUM, HIGH +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java similarity index 73% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java index 9976bc9..e0c8a27 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnLogs.java @@ -4,21 +4,22 @@ 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.web.domain.BaseEntity; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - +import io.swagger.v3.oas.annotations.media.Schema; +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.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; +import org.springframework.format.annotation.DateTimeFormat; + import java.util.Date; /** * 预警日志对象 warn_logs - * * @author muyu * @date 2024-09-20 */ @@ -29,49 +30,53 @@ import java.util.Date; @NoArgsConstructor @AllArgsConstructor @TableName("warn_logs") +@Tag(name = "预警日志管理") public class WarnLogs extends BaseEntity{ private static final long serialVersionUID = 1L; /** 预警日志id */ @TableId( type = IdType.AUTO) + @Schema(name = "id") private Long id; /** 车辆vin码 */ - @Excel(name = "车辆vin码") + @Schema(name = "车辆vin码") private String vin; /** 规则id */ - @Excel(name = "规则id") + @Schema(name = "规则id") private Long warnRuleId; /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") + @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Schema(name = "开始时间") private Date startTime; /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") + @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") + @Schema(name = "结束时间") private Date endTime; /** 最大值 */ - @Excel(name = "最大值") + @Schema(name = "最大值") private Long maxValue; /** 最小值 */ - @Excel(name = "最小值") + @Schema(name = "最小值") private Long minValue; /** 平均值 */ - @Excel(name = "平均值") + @Schema(name = "平均值") private Long avgValue; /** 中位数 */ - @Excel(name = "中位数") + @Schema(name = "中位数") private Long medianValue; /** 是否发送预警 */ - @Excel(name = "是否发送预警") + @Schema(name = "是否发送预警") private Long status; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java similarity index 80% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java index fda51f9..f33ea7a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnRule.java @@ -3,18 +3,18 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; +import io.swagger.v3.oas.annotations.media.Schema; +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.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; /** * 预警规则对象 warn_rule - * * @author muyu * @date 2024-09-20 */ @@ -26,42 +26,44 @@ import lombok.NoArgsConstructor; @NoArgsConstructor @AllArgsConstructor @TableName("warn_rule") +@Tag(name = "预警规则管理") public class WarnRule extends BaseEntity{ private static final long serialVersionUID = 1L; /** 规则id */ @TableId( type = IdType.AUTO) + @Schema(name = "规则id") private Long id; /** 规则名称 */ - @Excel(name = "规则名称") + @Schema(name = "规则名称") private String ruleName; /** 策略id */ - @Excel(name = "策略id") + @Schema(name = "策略id") private Long strategyId; /** 报文数据类型id */ - @Excel(name = "报文数据类型id") + @Schema(name = "报文数据类型id") private String msgTypeId; /** 滑窗时间 */ - @Excel(name = "滑窗时间") + @Schema(name = "滑窗时间") private Long slideTime; /** 滑窗频率 */ - @Excel(name = "滑窗频率") + @Schema(name = "滑窗频率") private String slideFrequency; /** 数据频率名称 */ - @Excel(name = "数据频率名称") + @Schema(name = "数据频率名称") private String slideData; /** 最大值 */ - @Excel(name = "数据频率最大值") + @Schema(name = "数据频率最大值") private Long slideMaxNum; /** 最小值 */ - @Excel(name = "数据频率最小值") + @Schema(name = "数据频率最小值") private Long slideMinNum; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java similarity index 83% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java index d246c83..def2c90 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/WarnStrategy.java @@ -3,8 +3,9 @@ package com.muyu.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; -import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -26,27 +27,27 @@ import org.apache.commons.lang3.builder.ToStringStyle; @NoArgsConstructor @AllArgsConstructor @TableName("warn_strategy") +@Tag(name = "预警策略管理") public class WarnStrategy extends BaseEntity{ private static final long serialVersionUID = 1L; /** 策略id */ @TableId( type = IdType.AUTO) + @Schema(title = "策略id") private Long id; /** 车辆类型id */ - @Excel(name = "车辆类型id") + @Schema(name = "车辆类型id") private Long sysTypeId; /** 策略名称 */ - @Excel(name = "策略名称") + @Schema(name = "策略名称") private String strategyName; /** 报文模版id */ - @Excel(name = "报文模版id") + @Schema(name = "报文模版id") private Long msgId; - - @Override public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java similarity index 66% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java index b4c933c..5f2ae59 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/Message.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/Message.java @@ -5,6 +5,7 @@ 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,17 +14,23 @@ import lombok.experimental.SuperBuilder; import java.util.Date; /** - * @className: Message ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/22 10:55 ⏰ - * @Version: 1.0 - * @description: + + */ + +/** + * 消息实体类 + * * @className: Message ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/22 10:55 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder @TableName(value = "car_fault_message",autoResultMap = true) +@Tag(name = "消息管理") public class Message { /** * id @@ -34,21 +41,25 @@ public class Message { /** * 发送者 */ + @Schema(description = "消息发送者",defaultValue = "admin",type = "String") private String sender; /** * 接收者 */ + @Schema(description = "消息接收者",defaultValue = "admin",type = "String") private String receiver; /** * 消息内容 */ + @Schema(description = "消息内容",defaultValue = "你好，我是admin",type = "String") private String content; /** * 消息状态 */ + @Schema(description = "消息状态",defaultValue = "0",type = "Integer") private Integer status; /** @@ -60,6 +71,7 @@ public class Message { /** * 登录人Id */ + @Schema(description = "登录人Id",defaultValue = "1",type = "Long") private long userId; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java similarity index 51% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java index 98b31de..f26367d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageReq.java @@ -2,32 +2,42 @@ package com.muyu.domain.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableName; +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; /** - * @className: MessageReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:59 ⏰ - * @Version: 1.0 - * @description: + + */ + +/** + * 消息请求参数 + * * @className: MessageReq ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 20:59 ⏰ + * * @Version: 1.0 + * * @description: MessageReq */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "message_req" ,autoResultMap = true) +@Tag(name = "消息请求参数") public class MessageReq { /** * 消息状态 */ @TableId(type = IdType.AUTO,value = "status") + @Schema(name = "消息状态") private Integer status; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java similarity index 65% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java index 39b309d..ca0cfe1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/MessageSendReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/MessageSendReq.java @@ -2,9 +2,10 @@ package com.muyu.domain.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,37 +14,41 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @className: MessageSendReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:00 ⏰ - * @Version: 1.0 - * @description: + * 发送消息请求参数 + * * @className: MessageSendReq ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:00 ⏰ + * * @Version: 1.0 + * * @description: MessageSendReq */ @Data @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "message_send_req" ,autoResultMap = true) +@Tag(name = "消息发送请求参数") public class MessageSendReq { /** * 发送者 */ @TableId(type = IdType.AUTO,value = "id") + @Schema(name = "发送者") private String sender; /** * 接收者 */ - @Excel(name = "接收者") + @Schema(name = "接收者") private String receiver; /** * 消息内容 */ - @Excel(name = "消息内容") + @Schema(name = "消息内容") private String content; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; /** * 创建时间 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java similarity index 53% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java index ff4380e..dd42b75 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/User.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/User.java @@ -2,37 +2,46 @@ package com.muyu.domain.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableName; +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; /** - * @className: User ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:56 ⏰ - * @Version: 1.0 - * @description: + + */ +/** + * 用户实体类 + * * @className: User ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 20:56 ⏰ + * * @Version: 1.0 + * * @description: 用户实体类 */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "user", autoResultMap = true) +@Tag(name = "用户") public class User { /** * 用户id */ @TableId(value = "id", type = IdType.AUTO) + @Schema(title = "用户id") private Integer id; /** * 用户名 */ - @Excel(name = "用户名") + @Schema(name = "用户名") private String username; /** * 邮箱 */ - @Excel(name="邮箱") + @Schema(name="邮箱") private String email; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java similarity index 53% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java index 1003180..73aacc9 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageReq.java @@ -2,32 +2,38 @@ package com.muyu.domain.message.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableName; +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; /** - * @className: MessageReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:59 ⏰ - * @Version: 1.0 - * @description: + * 消息请求参数 + * * @className: MessageReq ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 20:59 ⏰ + * * @Version: 1.0 + * * @description: */ @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "message_req",autoResultMap = true) +@Tag(name = "消息请求参数") public class MessageReq { /** * 消息状态 */ @TableId(type = IdType.AUTO,value = "status") + @Schema(name = "消息状态") private Integer status; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java similarity index 61% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java index 99af8e9..eb3a62c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/MessageSendReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/MessageSendReq.java @@ -1,10 +1,9 @@ package com.muyu.domain.message.message; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -13,37 +12,40 @@ import lombok.NoArgsConstructor; import java.util.Date; /** - * @className: MessageSendReq ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:00 ⏰ - * @Version: 1.0 - * @description: + * 消息发送请求参数 + * * @className: MessageSendReq ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:00 ⏰ + * * @Version: 1.0 + * * @description:消息发送请求参数 */ @Data @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "message_send_req",autoResultMap = true) +@Tag(name = "消息发送请求参数") public class MessageSendReq { /** * 发送者 */ - @TableId(type = IdType.AUTO,value = "id") + @Schema(name = "发送者") private String sender; /** * 接收者 */ - @Excel(name = "接收者") + @Schema(name = "接收者") private String receiver; /** * 消息内容 */ - @Excel(name = "消息内容") + @Schema(name = "消息内容") private String content; /** * 登录人Id */ - @Excel(name = "登录人Id") + @Schema(name = "登录人Id") private long userId; /** * 创建时间 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java similarity index 53% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java index 652ef35..144bdd2 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/message/message/User.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/message/message/User.java @@ -2,23 +2,28 @@ package com.muyu.domain.message.message; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; -import com.muyu.common.core.annotation.Excel; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; +import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; /** - * @className: User ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 20:56 ⏰ - * @Version: 1.0 - * @description: + * 用户实体类 + * * @className: User ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 20:56 ⏰ + * * @Version: 1.0 + * * @description: 用户实体类 */ @Data @AllArgsConstructor @NoArgsConstructor -@SuperBuilder +@Tag(name = "用户实体类") +@TableName("user") +@Builder public class User { /** * 用户id @@ -28,11 +33,11 @@ public class User { /** * 用户名 */ - @Excel(name = "用户名") + @Schema(name = "用户名") private String username; /** * 邮箱 */ - @Excel(name="邮箱") + @Schema(name="邮箱") private String email; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java similarity index 74% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java index f8f4a5b..8fc5d98 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceAdd.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceAdd.java @@ -3,8 +3,12 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; +import 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 org.springframework.format.annotation.DateTimeFormat; @@ -18,41 +22,54 @@ import java.util.Date; * @name：CarFenceAdd * @Date：2024/9/23 23:57 */ +/** + * 围栏添加实体类 + */ @Data @AllArgsConstructor @NoArgsConstructor +@Builder +@TableName(value = "car_fence_add", autoResultMap = true) +@Tag(name = "围栏添加") public class CarFenceAdd { /** * 围栏主键 */ @TableId(value = "id",type = IdType.AUTO) + @Schema(title = "围栏主键") private Integer id; /** * 围栏名称 */ + @Schema(name = "围栏名称") private String name; /** * 业务类型ID */ + @Schema(name = "业务类型ID") private Integer clazzId; /** * 业务类型名称 */ + @Schema(name = "业务类型名称") @TableField(exist = false) private String clazzName; /** * 围栏类型ID */ + @Schema(name = "围栏类型ID") private Integer typeId; /** * 围栏类型名称 */ + @Schema(name = "围栏类型名称") @TableField(exist = false) private String typeName; /** * 围栏经纬度 */ + @Schema(name = "围栏经纬度") private String fenceText; /** * 围栏开始时间 @@ -75,5 +92,6 @@ public class CarFenceAdd { /** * 中间表ID */ + @Schema(name = "中间表ID") private Integer middleId; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java similarity index 85% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java index 835a382..1f5177e 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceGroup.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceGroup.java @@ -2,12 +2,14 @@ package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.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.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; import java.util.Date; @@ -18,17 +20,22 @@ import java.util.Date; * @name：CarFence * @Date：2024/9/17 16:08 */ +/** + * 围栏组实体类 + */ @Data @AllArgsConstructor @NoArgsConstructor -@Builder - +@SuperBuilder +@TableName(value = "car_fence_group", autoResultMap = true) +@Tag(name = "围栏组") public class CarFenceGroup { /** * 围栏主键 */ @TableId(value = "id",type = IdType.AUTO) + @Schema(name = "围栏主键", type = "Integer", defaultValue = "0", description = "围栏主键") private Integer id; /** * 围栏名称 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java similarity index 71% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java index 90b63de..418286f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/CarFenceReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/CarFenceReq.java @@ -1,5 +1,6 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -13,23 +14,31 @@ import lombok.NoArgsConstructor; * @name：CarFenceReq * @Date：2024/9/17 16:26 */ + +/** + * 车辆电子围栏请求参数 + */ @Data @AllArgsConstructor @NoArgsConstructor @Tag(name = "车辆电子围栏响应参数") +@TableName(value = "car_fence_group", autoResultMap = true) public class CarFenceReq { /** * 围栏名称 */ + @Schema(title = "围栏名称", type = "String", description = "围栏名称") private String name; /** * 业务类型ID */ + @Schema(title = "业务类型ID", type = "String", description = "业务类型ID") private String clazzId; /** * 围栏类型ID */ + @Schema(title = "围栏类型ID", type = "String", description = "围栏类型ID") private String typeName; /** * 当前页 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java similarity index 56% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java index 2ca0430..aae17c6 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeAddReq.java @@ -1,5 +1,10 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -12,56 +17,73 @@ import lombok.NoArgsConstructor; * @Version: 1.0 * @description: 故障检测 */ +/** + * 故障检测 + */ @Data @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_code_add_req", autoResultMap = true) +@Tag(name = "故障检测") public class FaultCodeAddReq { /** *故障名称Id */ + @Schema(description = "故障名称Id") + @TableId(value = "message_type_id", type = IdType.AUTO) private long messageTypeId; /** * 故障名称 */ + @Schema(description = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码") private String messageTypeCode; /** * 故障码 */ + @Schema(description = "故障码") private String faultcodeNumber; /** * 故障分类Id */ + @Schema(description = "故障分类Id") private long faulttypeId; /** * 是否产生报警 */ + @Schema(description = "是否产生报警") private Integer isWarning; /** * 故障描述 */ + @Schema(description = "故障描述") private String faultContent; /** *故障组 */ + @Schema(description = "故障组") private String faultGroup; /** *故障位 */ + @Schema(description = "故障位") private String faultBit; /** *故障值 */ + @Schema(name = "故障值") private String faultValue; /** *报文所属类别 */ + @Schema(name = "报文所属类别") private String messageTypeBelongs; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java similarity index 61% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java index dbc482a..b14c797 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultCodeListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeListReq.java @@ -1,10 +1,12 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @className: FaultLog ️✈️ @@ -14,27 +16,36 @@ import lombok.NoArgsConstructor; * @description: */ +/** + * 故障码列表请求对象 + */ @Tag(name = "故障码列表请求对象") @Data @AllArgsConstructor @NoArgsConstructor -@Builder +@SuperBuilder +@TableName(value = "fault_code_add_req", autoResultMap = true) +@Tag(name = "故障码列表请求对象") public class FaultCodeListReq { /** *故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** *故障位 */ + @Schema(name = "故障位") private String faultBit; /** * 页码，从1开始 */ + @Schema(name = "页码") private Integer pageNum=1; /** * 每页大小 */ + @Schema(name = "每页大小") private Integer pageSize=10; diff --git a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeUpdReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java similarity index 59% rename from cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeUpdReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java index c1ed026..2fd7703 100644 --- a/cloud-gateway/cloud-modules-fault/src/main/java/com/muyu/fault/domain/req/FaultCodeUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultCodeUpdReq.java @@ -1,11 +1,14 @@ -package com.muyu.fault.domain.req; +package com.muyu.domain.req; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; -import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * @className: FaultLog ️✈️ @@ -14,63 +17,83 @@ import lombok.NoArgsConstructor; * @Version: 1.0 * @description: 故障检测策略的接口 */ + +/** + * 更新故障码的请求参数 + */ @Data @AllArgsConstructor @NoArgsConstructor -@Builder +@SuperBuilder +@TableName(value = "fault_code_upd_req", autoResultMap = true) +@Tag(name = "故障码更新请求参数") public class FaultCodeUpdReq { /** *故障码Id */ + @TableId(value = "faultcode_id", type = IdType.AUTO) + @Schema(title = "故障码Id") private long faultcodeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障名称 */ + @Schema(name = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageTypeCode; /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 故障分类Id */ + @Schema(name = "故障分类Id") private long faulttypeId; /** * 是否产生报警 */ + @Schema(name = "是否产生报警") private Integer isWarning; /** * 故障描述 */ + @Schema(name = "故障描述") private String faultContent; /** *故障状态 */ + @Schema(name = "故障状态") private Integer faultStatus; /** *故障组 */ + @Schema(name = "故障组") private String faultGroup; /** *故障位 */ + @Schema(name = "故障位") private String faultBit; /** *故障值 */ + @Schema(name = "故障值") private String faultValue; /** *报文所属类别 */ + @Schema(name = "报文所属类别") private String messageTypeBelongs; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java similarity index 56% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java index 6b616dd..6d123ef 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionAddReq.java @@ -1,5 +1,10 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,30 +19,42 @@ import java.math.BigDecimal; * @Version: 1.0 * @description: 故障检测策略的接口 */ + +/** + * 故障规则表Id + */ @Data @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_condition", autoResultMap = true) +@Tag(name = "故障规则添加请求对象") public class FaultConditionAddReq { /** * 故障规则表Id */ + @TableId(value = "id", type = IdType.AUTO) + @Schema(title = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(name = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(name = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(name = "故障规则参数") private BigDecimal faultconditionParameter; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java similarity index 57% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java index e42c4ae..6b50599 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionListReq.java @@ -1,5 +1,9 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -13,28 +17,38 @@ import lombok.NoArgsConstructor; * @Version: 1.0 * @description: 故障检测策略的接口 */ +/** + * 故障规则列表请求对象 + */ @Tag(name = "故障规则列表请求对象") @Data @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_code_add_req", autoResultMap = true) +@Tag(name = "故障规则列表请求对象") public class FaultConditionListReq { /** * 车辆类型Id */ + @TableId(value = "car_type_id", type = IdType.INPUT) + @Schema (description = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 页码，从1开始 */ + @Schema(name = "页码") private Integer pageNum=1; /** * 每页大小 */ + @Schema(name = "每页大小") private Integer pageSize=10; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java similarity index 54% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java index f554e18..67e7c8a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultConditionUpdReq.java @@ -1,5 +1,10 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,30 +19,41 @@ import java.math.BigDecimal; * @Version: 1.0 * @description: 故障检测策略的接口 */ +/** + * 故障检测策略的接口 + */ @Data @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_condition", autoResultMap = true) +@Tag(name = "故障规则修改请求对象") public class FaultConditionUpdReq { /** * 故障规则表Id */ + @TableId(value = "carcondition_id", type = IdType.ASSIGN_ID) + @Schema(name = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(name = "车辆类型Id") private long carTypeId; - /** + /** *故障名称Id */ + @Schema(name = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(name = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(name = "故障规则参数") private BigDecimal faultconditionParameter; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java similarity index 77% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java index a53dbad..447dc88 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/FaultLogListReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/FaultLogListReq.java @@ -1,5 +1,8 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; @@ -17,20 +20,28 @@ import java.util.Date; * @Version: 1.0 * @description: 故障检测策略的接口 */ + +/** + * 故障日志列表请求对象 + */ @Tag(name = "故障日志列表请求对象") @Data @AllArgsConstructor @NoArgsConstructor @Builder +@TableName(value = "fault_log",autoResultMap = true) public class FaultLogListReq { /** * 故障码Id */ + @TableId(value = "type", type = IdType.AUTO) + @Schema(description = "故障码Id",example = "1") private long faultcodeId; /** * 车辆VIN */ + @Schema(name = "车辆VIN") private String carVin; /** * 开始报警时间 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java similarity index 69% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java index 778d94a..f340141 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageTemplateAddReq.java @@ -1,5 +1,7 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,23 +11,30 @@ import lombok.NoArgsConstructor; /** * @ClassName MessageTemplateAddReq * @Description TODO - * @Author Li HD + * @Author LiHD * @Date 2024/9/19 */ + +/** + * 新增报文模版请求参数 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor @Tag(name = "新增报文模版请求参数", description = "根据入参进行报文模版的添加") +@TableName("message_template") public class MessageTemplateAddReq { /** * 报文模版名称 */ + @Schema(name = "报文模版名称") private String messageTemplateName; /** * 报文模版描述 */ + @Schema(name = "报文模版描述") private String messageTemplateDescribe; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java similarity index 59% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java index d18a96f..e23d47b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueAddReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueAddReq.java @@ -1,5 +1,9 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -9,43 +13,55 @@ import lombok.NoArgsConstructor; /** * @ClassName MessageValueAddReq * @Description TODO - * @Author Li HD + * @Author LiHD * @Date 2024/9/19 */ + +/** + * 新增报文数据请求参数 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor @Tag(name = "新增报文数据请求参数", description = "根据入参进行报文数据的添加") +@TableName(value = "message_value", autoResultMap = true) public class MessageValueAddReq { /** * 模版主键 */ + @TableId(value = "template_id",type = IdType.INPUT) + @Schema(description = "模版主键") private Long templateId; /** * 报文类别 */ + @Schema(name = "报文类别") private String messageType; /** * 报文编码 */ + @Schema(name = "报文编码") private String messageCode; /** * 报文标签 */ + @Schema(name = "报文标签") private String messageLabel; /** * 起始下标 */ + @Schema(name = "起始下标") private Integer messageStartIndex; /** * 终止下标 */ + @Schema(name = "终止下标") private Integer messageEndIndex; } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java similarity index 83% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java index 43bbc85..51854dc 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/MessageValueReq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/MessageValueReq.java @@ -1,5 +1,6 @@ package com.muyu.domain.req; +import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -10,14 +11,19 @@ import lombok.NoArgsConstructor; /** * @ClassName MessageValueReq * @Description TODO - * @Author Li HD + * @Author LiHD * @Date 2024/9/19 */ + +/** + * 报文数据请求参数 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor @Tag(name = "报文数据请求参数", description = "根据入参进行报文数据的查询") +@TableName(value = "message_value_req",autoResultMap = true) public class MessageValueReq { /** 报文模版主键 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCarReq.java similarity index 52% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCarReq.java index 6d1e819..0da2dea 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/req/SysCar.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/req/SysCarReq.java @@ -4,10 +4,9 @@ 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 lombok.AllArgsConstructor; -import lombok.Data; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.*; import lombok.experimental.SuperBuilder; import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringStyle; @@ -15,65 +14,54 @@ import org.apache.commons.lang3.builder.ToStringStyle; /** * 车辆基础信息对象 sys_car * - * @author Li HD + * @author LiHD * @date 2024-09-18 */ -@EqualsAndHashCode(callSuper = true) @Data -@SuperBuilder +@Builder @NoArgsConstructor @AllArgsConstructor @TableName(value = "sys_car", autoResultMap = true) -public class SysCar extends BaseEntity{ +@Tag(name = "车辆基础信息对象") +public class SysCarReq { /** 自增主键 */ @TableId( type = IdType.AUTO) + @Schema(title = "自增主键") private Long id; /** 车辆VIN码 */ + @Schema(title = "车辆VIN码") private String carVin; /** 车辆车牌号 */ + @Schema(title = "车辆车牌号") private String carPlate; /** 车辆品牌 */ + @Schema(title = "车辆品牌") private String carBrand; /** 车辆型号 */ + @Schema(title = "车辆型号") private String carModel; /** 车辆类型 */ + @Schema(title = "车辆类型") private Integer carType; /** 策略ID */ + @Schema(title = "策略ID") private Integer warnStrategy; /** 围栏组编码 */ + @Schema(title = "围栏组编码") private String groupCode; /** 启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中) */ +@Schema(title = "启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中)") private Integer state; - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("carVin", getCarVin()) - .append("carPlate", getCarPlate()) - .append("carBrand", getCarBrand()) - .append("carModel", getCarModel()) - .append("carType", getCarType()) - .append("warnStrategy", getWarnStrategy()) - .append("groupCode", getGroupCode()) - .append("state", getState()) - .append("createBy", getCreateBy()) - .append("createTime", getCreateTime()) - .append("updateBy", getUpdateBy()) - .append("updateTime", getUpdateTime()) - .append("remark", getRemark()) - .toString(); - } } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java similarity index 78% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java index 26742b3..aa0a866 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/CarFenceResq.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/CarFenceResq.java @@ -1,8 +1,11 @@ package com.muyu.domain.resp; +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.domain.CarFence; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -19,6 +22,10 @@ import java.util.Date; * @name：CarFenceResq * @Date：2024/9/17 16:35 */ + +/** + * 车辆电子围栏类 + */ @Data @AllArgsConstructor @NoArgsConstructor @@ -30,34 +37,42 @@ public class CarFenceResq { /** * 围栏主键 */ + @TableId(value = "id",type = IdType.AUTO) + @Schema(description = "围栏主键") private Integer id; /** * 围栏名称 */ + @Schema(description = "围栏名称") private String name; /** * 业务类型名 */ + @Schema(description = "业务类型名") private String clazzName; /** * 围栏类型名 */ + @Schema(description = "围栏类型名") private String typeName; /** * 围栏开始时间 */ + @Schema(description = "围栏开始时间") @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date fenceStart; /** * 围栏结束时间 */ + @Schema(description = "围栏结束时间") @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date fenceEnd; /** * 创建时间 */ + @Schema(description = "创建时间") @DateTimeFormat(fallbackPatterns = "yyyy-MM-dd hh:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd hh:mm:ss") private Date fenceCreate; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java similarity index 68% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java index 13220d6..c11bae5 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeListResp.java @@ -1,6 +1,10 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.vo.FaultCodeVo; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -14,55 +18,71 @@ import lombok.Data; * @description: */ +/** + * 故障码信息响应对象 + */ @Data @Builder @AllArgsConstructor @Tag(name="故障码信息响应对象",description = "故障码查询的响应结果") +@TableName(value = "fault_code_list_resp", autoResultMap = true) public class FaultCodeListResp { /** *故障码Id */ + @TableId(value = "faultcode_id", type = IdType.AUTO) + @Schema(description = "故障码Id",example = "1") private long faultcodeId; /** *故障名称Id */ + @Schema(description = "故障名称Id",example = "1") private long messageTypeId; /** *故障码 */ + @Schema(description = "故障码",example = "P0001") private String faultcodeNumber; /** *故障组 */ + @Schema(description = "故障组",example = "1") private String faultGroup; /** *故障位 */ + @Schema(description = "故障位",example = "1") private String faultBit; /** *故障值 */ + @Schema(description = "故障值",example = "1") private String faultValue; /** *是否警告 */ + @Schema(description = "是否警告",example = "1") private Integer isWarning; /** *故障类型名称 */ + @Schema(description = "故障类型名称",example = "1") private String faulttypeName; /** * 故障名称 */ + @Schema(description = "故障名称",example = "1") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码",example = "1") private String messageTypeCode; /** *报文所属类别 */ + @Schema(description = "报文所属类别",example = "1") private String messageTypeBelongs; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java similarity index 78% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java index 372cd7f..c286fd8 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultCodeTotalListResp.java @@ -1,5 +1,7 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -15,16 +17,24 @@ import java.util.List; * @Version: 1.0 * @description: */ +/** + * 数据总数列表 + */ @Data @SuperBuilder @AllArgsConstructor @NoArgsConstructor @Tag(name="数据总数列表",description = "数据和总数的响应") +@TableName(value = "fault_code",autoResultMap = true) public class FaultCodeTotalListResp { - + @Schema(name = "数据列表") private List faultCodeListRespList; + /** + * 总数 + */ + @Schema(name = "总数") private long total; public static FaultCodeTotalListResp faultCodeTotalListResp(List faultCodeListRespList,long total){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java similarity index 71% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java index 035518d..646259c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionListResp.java @@ -1,11 +1,16 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.FaultCondition; +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 java.math.BigDecimal; @@ -16,44 +21,57 @@ import java.math.BigDecimal; * @Version: 1.0 * @description: */ - +/** + * 故障规则信息响应对象 + */ @Data @Builder @AllArgsConstructor @Tag(name="故障规则信息响应对象",description = "故障规则查询的响应结果") +@NoArgsConstructor +@TableName(value = "car_fault_condition",autoResultMap = true) public class FaultConditionListResp { /** * 故障规则表Id */ + @TableId(value = "carcondition_id",type = IdType.AUTO) + @Schema(description = "故障规则表Id") private long carconditionId; /** * 车辆类型Id */ + @Schema(description = "车辆类型Id") private long carTypeId; /** *故障名称Id */ + @Schema(description = "故障名称Id") private long messageTypeId; /** * 故障条件 */ + @Schema(description = "故障条件") private String faultconditionIdentification; /** * 故障规则参数 */ + @Schema(description = "故障规则参数") private BigDecimal faultconditionParameter; /** * 车辆类型名称 */ + @Schema(description = "车辆类型名称") private String carTypeName; /** * 故障名称 */ + @Schema(description = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码") private String messageTypeCode; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java similarity index 78% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java index 31dc2d6..cd5d162 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultConditionTotalListResp.java @@ -1,5 +1,7 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -15,15 +17,22 @@ import java.util.List; * @Version: 1.0 * @description: 故障检测策略的接口 */ + +/** + * 故障规则数据总数列表 + */ @Data @SuperBuilder @AllArgsConstructor @NoArgsConstructor @Tag(name="故障规则数据总数列表",description = "数据和总数的响应") +@TableName(value = "fault_condition",autoResultMap = true) public class FaultConditionTotalListResp { + @Schema(description = "故障规则数据列表") private List faultConditionListRespList; + @Schema(description = "故障规则数据总数") private long total; public static FaultConditionTotalListResp faultConditionTotalListResp(List faultConditionListRespList,long total){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java similarity index 78% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java index 1006907..c086202 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogListResp.java @@ -1,5 +1,8 @@ package com.muyu.domain.resp; +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.domain.FaultLog; import io.swagger.v3.oas.annotations.media.Schema; @@ -7,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; import java.util.Date; @@ -17,28 +21,39 @@ import java.util.Date; * @Version: 1.0 * @description: */ + +/** + * 故障日志信息响应对象 + */ @Data @Builder @AllArgsConstructor @Tag(name="故障日志信息响应对象",description = "故障日志的响应结果") +@NoArgsConstructor +@TableName(value = "car_fault_log",autoResultMap = true) public class FaultLogListResp { /** * 故障日志Id */ + @TableId(value = "log_id",type = IdType.AUTO) + @Schema(description = "故障日志Id",example = "1") private long logId; /** * 故障码Id */ + @Schema(name = "故障码Id") private long faultcodeId; /** * 车辆Id */ + @Schema(name = "车辆Id") private long carInformationId; /** * 车辆VIN */ + @Schema(name = "车辆VIN") private String carVin; /** * 开始报警时间 @@ -55,10 +70,12 @@ public class FaultLogListResp { /** * 故障码 */ + @Schema(name = "故障码") private String faultcodeNumber; /** * 车辆vin */ + @Schema(name = "车辆vin") private String carInformationVIN; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java similarity index 77% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java index afd8004..0626794 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/FaultLogTotalListResp.java @@ -1,5 +1,7 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.TableName; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; @@ -16,15 +18,21 @@ import java.util.List; * @description: */ +/** + * 故障日志数据总数列表 + */ @Data @SuperBuilder @AllArgsConstructor @NoArgsConstructor @Tag(name="故障日志数据总数列表",description = "数据和总数的响应") +@TableName(value = "fault_log",autoResultMap = true) public class FaultLogTotalListResp { + @Schema(description = "故障日志列表") private List faultLogListRespList; + @Schema(description = "总数") private long total; public static FaultLogTotalListResp faultLogTotalListResp(List faultLogListRespList,long total){ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java similarity index 70% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java index cb4f672..0145f2a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageTemplateListResp.java @@ -1,6 +1,10 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.MessageTemplate; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,29 +14,38 @@ import lombok.NoArgsConstructor; /** * @ClassName MessageTemplateListResp * @Description TODO - * @Author Li HD + * @Author LiHD * @Date 2024/9/19 */ + +/** + * 报文模版列表响应数据 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor @Tag(name = "报文模版列表", description = "负责报文模版管理列表的相应数据") +@TableName(value = "message_template", autoResultMap = true) public class MessageTemplateListResp { /** * 报文模版主键 */ + @Schema(description = "报文模版主键") + @TableId(value = "message_template_id", type = IdType.AUTO) private String messageTemplateId; /** * 报文模版名称 */ + @Schema(description = "报文模版名称") private String messageTemplateName; /** * 报文模版描述 */ + @Schema(description = "报文模版描述") private String messageTemplateDescribe; /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java similarity index 66% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java index 8c77c70..ca09dc6 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/resp/MessageValueListResp.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/MessageValueListResp.java @@ -1,6 +1,10 @@ package com.muyu.domain.resp; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.MessageValue; +import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,44 +14,56 @@ import lombok.NoArgsConstructor; /** * @ClassName MessageValueListResp * @Description TODO - * @Author Li HD + * @Author LiHD * @Date 2024/9/19 */ + +/** + * 报文数据列表的相应数据 + */ @Data @Builder @NoArgsConstructor @AllArgsConstructor @Tag(name = "报文数据列表", description = "负责报文数据管理列表的相应数据") +@TableName(value = "message_value", autoResultMap = true) public class MessageValueListResp { /** * 报文数据主键 */ + @TableId(value = "message_id", type = IdType.AUTO) + @Schema(description = "报文数据主键",example = "1") private Long messageId; /** * 报文类别 */ + @Schema(description = "报文类别",example = "1") private String messageType; /** * 报文编码 */ + @Schema(description = "报文编码",example = "1") private String messageCode; /** * 报文标签 */ + @Schema(description = "报文标签",example = "1") private String messageLabel; /** * 起始下标 */ + @Schema(description = "起始下标",example = "1") private Integer messageStartIndex; /** * 终止下标 */ + @Schema(description = "终止下标",example = "1") private Integer messageEndIndex; public static MessageValueListResp valueBuild(MessageValue messageValue){ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java new file mode 100644 index 0000000..b85b6b2 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/resp/SysCarResp.java @@ -0,0 +1,108 @@ +package com.muyu.domain.resp; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.muyu.domain.SysCar; +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; + +/** + * @ClassName SysCarResp + * @Description TODO + * @Author LiHD + * @Date 2024/9/25 20:14 + */ + +/** + * 车辆类型信息 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Tag(name = "车辆类型信息", description = "车辆类型") +@TableName(value = "sys_car", autoResultMap = true) +public class SysCarResp { + + /** + * 自增主键 + */ + @Schema(description = "自增主键") + @TableId(value = "id", type = IdType.AUTO) + private Long id; + + /** + * 车辆VIN码 + */ + @Schema(description = "车辆VIN码") + private String carVin; + + /** + * 车辆车牌号 + */ + @Schema(description = "车辆车牌号") + private String carPlate; + + /** + * 车辆品牌 + */ + @Schema(description = "车辆品牌") + private String carBrand; + + /** + * 车辆型号 + */ + @Schema(description = "车辆型号") + private String carModel; + + /** + * 车辆类型 + */ + @Schema(description = "车辆类型") + private Integer carType; + + /** + * 车辆类型名称 + */ + @Schema(description = "车辆类型名称") + private String sysTypeName; + + /** + * 策略ID + */ + @Schema(description = "策略ID") + private Integer warnStrategy; + + /** + * 围栏组编码 + */ + @Schema(description = "围栏组编码") + private String groupCode; + + /** + * 启用状态 + */ + @Schema(description = "启用状态") + private Integer state; + + + public static SysCarResp reverseResp(SysCar sysCar){ + return SysCarResp.builder() + .id(sysCar.getId()) + .carVin(sysCar.getCarVin()) + .carPlate(sysCar.getCarPlate()) + .carBrand(sysCar.getCarBrand()) + .carModel(sysCar.getCarModel()) + .carType(sysCar.getCarType()) + .warnStrategy(sysCar.getWarnStrategy()) + .groupCode(sysCar.getGroupCode()) + .state(sysCar.getState()) + .build(); + + } +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java similarity index 53% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java rename to cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java index 82de595..b668cb7 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/domain/vo/FaultCodeVo.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-common/src/main/java/com/muyu/domain/vo/FaultCodeVo.java @@ -1,40 +1,49 @@ package com.muyu.domain.vo; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.domain.FaultCode; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; - /** - * @className: FaultCodeVo ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:18 ⏰ - * @Version: 1.0 - * @description: + * 故障代码VO + * * @className: FaultCodeVo ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:18 ⏰ + * * @Version: 1.0 + * * @description: */ @EqualsAndHashCode(callSuper = true) @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder +@TableName(value = "car_faultcode", autoResultMap = true) +@Tag(name = "故障代码") public class FaultCodeVo extends FaultCode { /** *故障类型名称 */ + @Schema(description = "故障类型名称") private String faulttypeName; /** * 故障名称 */ + @Schema(description = "故障名称") private String messageTypeName; /** * 报文编码 */ + @Schema(description = "报文编码") private String messageTypeCode; /** *报文所属类别 */ + @Schema(description = "报文所属类别") private String messageTypeBelongs; diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml new file mode 100644 index 0000000..d9fd4f6 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/pom.xml @@ -0,0 +1,26 @@ + + + 4.0.0 + + com.muyu + cloud-modules-enterprise + 3.6.3 + + + enterpise-remote + + + 17 + 17 + UTF-8 + + + + + com.muyu + enterpise-common + + + diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteMessageValueService.java b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteMessageValueService.java new file mode 100644 index 0000000..c2a4641 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/RemoteMessageValueService.java @@ -0,0 +1,30 @@ +package com.muyu.remote; + +import com.muyu.common.core.constant.ServiceNameConstants; +import com.muyu.common.core.domain.Result; +import com.muyu.domain.req.MessageValueReq; +import com.muyu.domain.resp.MessageValueListResp; +import com.muyu.remote.factory.RemoteMessageValueFallbackFactory; +import io.swagger.v3.oas.annotations.Operation; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/28 21:00 + * @注释 vin查询报文模版类型 + */ +@FeignClient(contextId = "remoteMessageValueService", value = ServiceNameConstants.ENTERPRISE_SERVICE, fallbackFactory = RemoteMessageValueFallbackFactory.class,path = "messageValue") +public interface RemoteMessageValueService { + + @PostMapping("/findByTemplateId/{stringVin}") + @Operation(summary = "根据车辆类型查询报文模版ID",description = "根据车辆类型查询报文模版ID") + Result findByTemplateId(@PathVariable("stringVin") String stringVin); + + @RequestMapping(value = "/list", method = RequestMethod.POST) + Result> findAll(@RequestBody MessageValueReq messageValueReq); + +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteMessageValueFallbackFactory.java b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteMessageValueFallbackFactory.java new file mode 100644 index 0000000..7a41d23 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/java/com/muyu/remote/factory/RemoteMessageValueFallbackFactory.java @@ -0,0 +1,35 @@ +package com.muyu.remote.factory; + +import com.muyu.common.core.domain.Result; +import com.muyu.domain.req.MessageValueReq; +import com.muyu.domain.resp.MessageValueListResp; +import com.muyu.remote.RemoteMessageValueService; +import lombok.extern.log4j.Log4j2; +import org.springframework.cloud.openfeign.FallbackFactory; + +import java.util.List; + +/** + * @version 1.0 + * @Author xie ya ru + * @Date 2024/9/28 21:04 + * @注释 + */ +@Log4j2 +public class RemoteMessageValueFallbackFactory implements FallbackFactory { + @Override + public RemoteMessageValueService create(Throwable cause) { + log.error("文件服务调用失败：{}",cause.getMessage()); + return new RemoteMessageValueService() { + @Override + public Result> findAll(MessageValueReq messageValueReq) { + return Result.error("查询数据失败："+cause.getMessage()); + } + + @Override + public Result findByTemplateId(String stringVin) { + return Result.error("查询数据失败："+cause.getMessage()); + } + }; + } +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f47b915 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-remote/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1 @@ +com.muyu.remote.factory.RemoteMessageValueFallbackFactory diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/.gitignore b/cloud-modules/cloud-modules-enterprise/enterpise-service/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/.gitignore @@ -0,0 +1,38 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-module-enterprise/pom.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml similarity index 88% rename from cloud-modules/cloud-module-enterprise/pom.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml index 2cdd714..56b5964 100644 --- a/cloud-modules/cloud-module-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/pom.xml @@ -5,15 +5,11 @@ 4.0.0 com.muyu - cloud-modules + cloud-modules-enterprise 3.6.3 - cloud-module-enterprise - - - cloud-modules-enterprise - + enterpise-service 17 @@ -24,9 +20,8 @@ - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.2.5 + com.muyu + enterpise-common @@ -89,6 +84,13 @@ cloud-common-xxl + + + com.muyu + enterpise-cache + ${muyu.version} + + diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/CloudWarnApplication.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/CloudEnterpiseApplication.java similarity index 81% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/CloudWarnApplication.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/CloudEnterpiseApplication.java index bea20be..5aca16c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/CloudWarnApplication.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/CloudEnterpiseApplication.java @@ -15,8 +15,8 @@ import org.springframework.boot.autoconfigure.SpringBootApplication; //@EnableCustomSwagger2 @EnableMyFeignClients @SpringBootApplication -public class CloudWarnApplication { +public class CloudEnterpiseApplication { public static void main(String[] args) { - SpringApplication.run(CloudWarnApplication.class, args); + SpringApplication.run(CloudEnterpiseApplication.class, args); } } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceClazzController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceClazzController.java similarity index 73% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceClazzController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceClazzController.java index d9bbe93..8440cb4 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceClazzController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceClazzController.java @@ -1,8 +1,9 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; + +import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFenceClazz; -import com.muyu.service.CarFenceClazzService; -import com.muyu.common.core.domain.Result; +import com.muyu.enterpise.service.CarFenceClazzService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -14,11 +15,14 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Author：yang - * @Package：com.muyu.server.controller - * @Project：cloud-electronic - * @name：CarFenceClazzController - * @Date：2024/9/20 14:31 + * 从围栏信息表中查询数据 + * * @Author：yang + * * @Package：com.muyu.server.controller + * * @ClassName：CarFenceClazzController + * * @Project：cloud-electronic + * * @name：CarFenceClazzController + * * @Date：2024/9/20 14:31 + * * @Description：从围栏信息表中查询数据 */ @RequestMapping("/carFenceClazz") @RestController diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceController.java similarity index 81% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceController.java index 65e8a54..b1b6563 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceController.java @@ -1,12 +1,12 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFence; import com.muyu.domain.req.CarFenceReq; import com.muyu.domain.resp.CarFenceResq; -import com.muyu.service.CarFenceService; -import com.muyu.service.CarFenceServiceMybaits; -import com.muyu.common.core.domain.Result; +import com.muyu.enterpise.service.CarFenceService; +import com.muyu.enterpise.service.CarFenceServiceMybaits; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -18,11 +18,13 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @Author：yang - * @Package：com.muyu.server.controller - * @Project：cloud-electronic - * @name：CarFenceController - * @Date：2024/9/17 16:46 + * 从围栏信息表中查询数据 + * * @Author：yang + * * @Package：com.muyu.server.controller + * * @Project：cloud-electronic + * * @name：CarFenceController + * * @Date：2024/9/17 16:46 + * * @Description：从围栏信息表中查询数据 */ @RequestMapping("/carFence") @RestController diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceTypeController.java similarity index 75% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceTypeController.java index ecdf14a..c47d09a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarFenceTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarFenceTypeController.java @@ -1,8 +1,8 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; -import com.muyu.domain.CarFenceType; -import com.muyu.service.CarFenceTypeService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.CarFenceType; +import com.muyu.enterpise.service.CarFenceTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -14,11 +14,13 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Author：yang - * @Package：com.muyu.server.controller - * @Project：cloud-electronic - * @name：CarFenceClazzController - * @Date：2024/9/20 14:31 + * 从围栏信息表中查询数据 + * * @Author：yang + * * @Package：com.muyu.server.controller + * * @Project：cloud-electronic + * * @name：CarFenceClazzController + * * @Date：2024/9/20 14:31 + * * @Description：从围栏信息表中查询数据 */ @RequestMapping("/carFenceType") @RestController diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarTypeController.java similarity index 75% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarTypeController.java index 571fa82..85dcd97 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/CarTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/CarTypeController.java @@ -1,8 +1,8 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.service.CarTypeService; +import com.muyu.enterpise.service.CarTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -11,11 +11,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @className: CarTypeController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: + * 车辆类型控制器 + * * @className: CarTypeController ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description:车辆类型控制器 */ @RequestMapping("/cartype") @RestController diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultCodeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultCodeController.java similarity index 90% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultCodeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultCodeController.java index f9c862a..8c1df61 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultCodeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultCodeController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; @@ -7,7 +7,7 @@ import com.muyu.domain.req.FaultCodeAddReq; import com.muyu.domain.req.FaultCodeListReq; import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeTotalListResp; -import com.muyu.service.FaultCodeService; +import com.muyu.enterpise.service.FaultCodeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -15,13 +15,13 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; /** - * @className: CarTypeController ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: 车辆故障码 + * 车辆故障码 + * * @className: FaultCodeController ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description: 车辆故障码 */ - @RestController @RequestMapping("/faultcode") @Tag(name = "故障模块" ,description = "故障模块") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultConditionController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java similarity index 91% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultConditionController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java index 00dd6b6..703d222 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultConditionController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultConditionController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; @@ -7,7 +7,7 @@ import com.muyu.domain.FaultCondition; import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; import com.muyu.domain.req.FaultConditionUpdReq; -import com.muyu.service.FaultConditionService; +import com.muyu.enterpise.service.FaultConditionService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -17,13 +17,13 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @className: CarTypeController ️✈️ -* @author: Yang 鹏 🦅 -* @date: 2024/9/23 22:06 ⏰ -* @Version: 1.0 -* @description: 故障检测 -*/ - + * 故障检测策略 + * * @className: FaultConditionController ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略 + */ @RestController @RequestMapping("/faultcondition") @Tag(name = "故障规则模块",description = "故障规则模块") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLabelController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLabelController.java similarity index 79% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLabelController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLabelController.java index c7eef0a..3ec1325 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLabelController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLabelController.java @@ -1,16 +1,6 @@ -package com.muyu.controller; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: - */ - - +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.service.FaultLabelService; +import com.muyu.enterpise.service.FaultLabelService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -20,6 +10,11 @@ import org.springframework.web.bind.annotation.RestController; /** * 故障码分类 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: */ @RestController @RequestMapping("/faultlabel") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLogController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLogController.java similarity index 81% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLogController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLogController.java index b639f5f..c67767c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultLogController.java @@ -1,7 +1,7 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.req.FaultLogListReq; -import com.muyu.service.FaultLogService; +import com.muyu.enterpise.service.FaultLogService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -12,11 +12,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: + * 故障日志 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description:故障日志 */ @RestController @RequestMapping("/faultlog") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultRuleController.java similarity index 79% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultRuleController.java index 2e7b1d6..bcac91c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultRuleController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.CarFaultRule; import com.muyu.domain.FaultRule; -import com.muyu.service.FaultRuleService; +import com.muyu.enterpise.service.FaultRuleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -15,11 +15,12 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 车辆故障检测 + * * @className: FaultRuleController ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @RestController @RequestMapping("/faultrule") @@ -41,6 +42,12 @@ public class FaultRuleController { return Result.success(checkfaults); } + /** + * 故障参数匹配检查 + * + * @param carFaultRule + * @return + */ @PostMapping("/cheakfaults") @Operation(summary = "故障参数匹配检查",description = "获取报文数据与故障参数进行比较") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultTypeController.java similarity index 78% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultTypeController.java index 22db22f..97b373b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FaultTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FaultTypeController.java @@ -1,14 +1,6 @@ -package com.muyu.controller; - -/** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 - */ +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; -import com.muyu.service.FaultTypeService; +import com.muyu.enterpise.service.FaultTypeService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -18,6 +10,11 @@ import org.springframework.web.bind.annotation.RestController; /** * 故障码分类 + * * @className: FaultTypeController ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @RestController @RequestMapping("/faulttype") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FenceGroupController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FenceGroupController.java similarity index 84% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FenceGroupController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FenceGroupController.java index e3d5d25..1b4c76a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/FenceGroupController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/FenceGroupController.java @@ -1,8 +1,8 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; -import com.muyu.domain.FenceGroup; -import com.muyu.service.FenceGroupService; import com.muyu.common.core.domain.Result; +import com.muyu.domain.FenceGroup; +import com.muyu.enterpise.service.FenceGroupService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -16,11 +16,13 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * @Author：yan - * @Package：com.muyu.car.controller - * @Project：cars - * @name：FenceGroupController - * @Date：2024/9/21 20:49 + * 围栏组查询 + * * 围栏组查询 + * * @Author：yan + * * @Package：com.muyu.car.controller + * * @Project：cars + * * @name：FenceGroupController + * * @Date：2024/9/21 20:49 */ @RequestMapping("/fenceGroup") @RestController diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageController.java similarity index 89% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageController.java index 805af42..0bcd21a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageController.java @@ -1,11 +1,11 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.domain.message.Message; import com.muyu.domain.message.MessageReq; import com.muyu.domain.message.MessageSendReq; -import com.muyu.service.MessageService; +import com.muyu.enterpise.service.MessageService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.beans.factory.annotation.Autowired; @@ -14,13 +14,13 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; - /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 站内信 + * * @className: MessageController ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 站内信 */ @RestController @RequestMapping("/message") diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageTemplateController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageTemplateController.java similarity index 88% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageTemplateController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageTemplateController.java index 9e53e6e..75edf5c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageTemplateController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageTemplateController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; +import com.muyu.common.core.domain.Result; import com.muyu.domain.MessageTemplate; import com.muyu.domain.req.MessageTemplateAddReq; import com.muyu.domain.resp.MessageTemplateListResp; -import com.muyu.service.MessageTemplateService; -import com.muyu.common.core.domain.Result; +import com.muyu.enterpise.service.MessageTemplateService; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; @@ -13,10 +13,12 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @ClassName MessageTemplateController - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 报文模版控制层 + * * @ClassName MessageTemplateController + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 + * * @Version 1.0 */ @Log4j2 @RestController diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageValueController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java similarity index 69% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageValueController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java index fb082d2..6b3e7d7 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MessageValueController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MessageValueController.java @@ -1,25 +1,29 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; +import com.muyu.common.core.domain.Result; +import com.muyu.common.core.web.controller.BaseController; import com.muyu.domain.MessageValue; import com.muyu.domain.req.MessageValueAddReq; import com.muyu.domain.req.MessageValueReq; import com.muyu.domain.resp.MessageValueListResp; -import com.muyu.service.MessageValueService; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.controller.BaseController; +import com.muyu.enterpise.cache.EnterpiseCacheService; +import com.muyu.enterpise.service.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.data.redis.core.RedisTemplate; import org.springframework.web.bind.annotation.*; +import javax.annotation.Resource; import java.util.List; /** - * @ClassName MessageValueController - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 报文数据控制层 + * * @ClassName MessageValueController + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Log4j2 @RestController @@ -30,6 +34,9 @@ public class MessageValueController extends BaseController { @Autowired private MessageValueService messageValueService; + @Autowired + private EnterpiseCacheService enterpiseCacheService; + /** * 报文数据列表查询 * @param messageValueReq @@ -51,6 +58,7 @@ public class MessageValueController extends BaseController { @Operation(summary = "添加报文数据", description = "新增报文数据") public Result save(@RequestBody MessageValueAddReq messageValueAddReq){ messageValueService.save(MessageValue.addBuild(messageValueAddReq)); + enterpiseCacheService.put(String.valueOf(messageValueAddReq.getTemplateId()),MessageValue.addBuild(messageValueAddReq)); return Result.success("添加成功"); } @@ -73,4 +81,14 @@ public class MessageValueController extends BaseController { public void test(String str){ messageValueService.test(str); } + + + @PostMapping({"/findByTemplateId/{stringVin}"}) + @Operation( + summary = "根据车辆类型查询报文模版ID", + description = "根据车辆类型查询报文模版ID" + ) + public Result findByTemplateId(@PathVariable("stringVin") String stringVin) { + return Result.success(this.messageValueService.findByTemplateId(stringVin), "查询成功"); + } } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MiddleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java similarity index 91% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MiddleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java index 82b59b3..348561b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/MiddleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/MiddleController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; +import com.muyu.common.core.domain.Result; import com.muyu.domain.FenceGroup; import com.muyu.domain.req.CarFenceAdd; -import com.muyu.service.CarFenceServiceMybaits; -import com.muyu.service.MiddleService; -import com.muyu.common.core.domain.Result; +import com.muyu.enterpise.service.CarFenceServiceMybaits; +import com.muyu.enterpise.service.MiddleService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.AllArgsConstructor; @@ -15,11 +15,12 @@ import org.springframework.web.bind.annotation.*; import java.util.List; /** - * @Author：yan - * @Package：com.muyu.car.controller - * @Project：plues - * @name：MiddleController - * @Date：2024/9/22 10:06 + * 中间表添加 + * * @Author：yan + * * @Package：com.muyu.car.controller + * * @Project：plues + * * @name：MiddleController + * * @Date：2024/9/22 10:06 */ @RequestMapping("/middle") @RestController diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarController.java similarity index 92% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarController.java index f23feb9..d398b9d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarController.java @@ -1,13 +1,14 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; -import com.muyu.domain.SysCar; -import com.muyu.domain.resp.SysCarResp; -import com.muyu.service.SysCarService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.domain.SysCar; +import com.muyu.domain.req.SysCarReq; +import com.muyu.domain.resp.SysCarResp; +import com.muyu.enterpise.service.SysCarService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -18,8 +19,7 @@ import java.util.List; /** * 车辆基础信息Controller - * - * @author Li HD + * @author LiHD * @date 2024-09-18 */ @RestController @@ -35,10 +35,10 @@ public class SysCarController extends BaseController */ @RequiresPermissions("car:car:list") @GetMapping("/list") - public Result> list(SysCar sysCar) + public Result> list(SysCarReq sysCarReq) { startPage(); - List list = sysCarService.selectSysCarList(sysCar); + List list = sysCarService.selectSysCarList(sysCarReq); return getDataTable(list); } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarFaultController.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarFaultController.java index cc34ad7..6e73975 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysCarFaultController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysCarFaultController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -7,7 +7,7 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.SysCarFault; -import com.muyu.service.ISysCarFaultService; +import com.muyu.enterpise.service.ISysCarFaultService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; @@ -19,7 +19,6 @@ import java.util.List; /** * 车辆故障Controller - * * @author Yang鹏 * @date 2024-09-18 */ @@ -34,7 +33,6 @@ public class SysCarFaultController extends BaseController /** * 查询车辆故障列表 */ - @GetMapping("/list") public Result> list(SysCarFault sysCarFault) { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java similarity index 83% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java index 1ae049e..a2ad3b3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/SysTypeController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/SysTypeController.java @@ -1,10 +1,10 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; -import com.muyu.domain.SysCarType; -import com.muyu.service.SysTypeService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.domain.SysCarType; +import com.muyu.enterpise.service.SysTypeService; import io.swagger.v3.oas.annotations.tags.Tag; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -19,6 +19,9 @@ import java.util.List; * @Date 2024/9/22 9:36 * @注释 */ +/** + * 车辆类型信息表(SysCarType)表控制层 + */ @RestController @RequestMapping("/sysType") @Tag(name = "查询车辆类型模块",description = "查询车辆类型模块") @@ -27,6 +30,9 @@ public class SysTypeController extends BaseController { private SysTypeService sysTypeService; + /** + * 查询车辆类型列表 + */ @GetMapping("/list") public Result> list() { startPage(); diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnLogsController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnLogsController.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnLogsController.java index 6c642a1..225af02 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnLogsController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.WarnLogs; -import com.muyu.service.IWarnLogsService; +import com.muyu.enterpise.service.IWarnLogsService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; @@ -18,7 +18,6 @@ import java.util.List; /** * 预警日志Controller - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnRuleController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnRuleController.java similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnRuleController.java index 6aaf99f..17680c4 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnRuleController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.WarnRule; -import com.muyu.service.IWarnRuleService; +import com.muyu.enterpise.service.IWarnRuleService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; @@ -18,7 +18,6 @@ import java.util.List; /** * 预警规则Controller - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnStrategyController.java similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnStrategyController.java index f0e9103..7f3b24f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/controller/WarnStrategyController.java @@ -1,4 +1,4 @@ -package com.muyu.controller; +package com.muyu.enterpise.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; @@ -6,7 +6,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.domain.WarnStrategy; -import com.muyu.service.IWarnStrategyService; +import com.muyu.enterpise.service.IWarnStrategyService; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; @@ -18,7 +18,6 @@ import java.util.List; /** * 预警策略Controller - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceClazzMapper.java similarity index 51% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceClazzMapper.java index 8ae3eeb..ba6acb1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceClazzMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceClazzMapper.java @@ -1,15 +1,16 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarFenceClazz; import org.apache.ibatis.annotations.Mapper; /** - * @Author：yang - * @Package：com.muyu.server.mapper - * @Project：cloud-electronic - * @name：CarFenceClazzMapper - * @Date：2024/9/17 17:34 + * 车辆围栏分组Mapper + * * @Author：yang + * * @Package：com.muyu.server.mapper + * * @Project：cloud-electronic + * * @name：CarFenceClazzMapper + * * @Date：2024/9/17 17:34 */ @Mapper public interface CarFenceClazzMapper extends BaseMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceMapper.java similarity index 50% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceMapper.java index 6dbf2ec..451261d 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceMapper.java @@ -1,15 +1,16 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarFence; import org.apache.ibatis.annotations.Mapper; /** - * @Author：yang - * @Package：com.muyu.server.mysql - * @Project：cloud-electronic - * @name：CarFenceServiceMapper - * @Date：2024/9/17 17:13 + * 车辆围栏Mapper + * * @Author：yang + * * @Package：com.muyu.server.mysql + * * @Project：cloud-electronic + * * @name：CarFenceServiceMapper + * * @Date：2024/9/17 17:13 */ @Mapper public interface CarFenceMapper extends BaseMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceServiceMybaitsMapper.java similarity index 89% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceServiceMybaitsMapper.java index dfbe9e4..7503a27 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceServiceMybaitsMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceServiceMybaitsMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.muyu.domain.CarFence; import com.muyu.domain.CarMiddle; @@ -11,11 +11,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @Author：yan - * @Package：com.muyu.car.mapper - * @Project：plues - * @name：CarFenceServiceMybaitsMapper - * @Date：2024/9/22 19:25 + * 围栏服务Mybatis映射器 + * * @Author：yan + * * @Package：com.muyu.car.mapper + * * @Project：plues + * * @name：CarFenceServiceMybaitsMapper + * * @Date：2024/9/22 19:25 */ @Mapper public interface CarFenceServiceMybaitsMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceTypeMapper.java similarity index 50% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceTypeMapper.java index b8a048d..4b4d9ba 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/CarFenceTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarFenceTypeMapper.java @@ -1,15 +1,16 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.CarFenceType; import org.apache.ibatis.annotations.Mapper; /** - * @Author：yang - * @Package：com.muyu.server.mapper - * @Project：cloud-electronic - * @name：CarFenceTypeMapper - * @Date：2024/9/17 17:32 + * 车辆围栏类型Mapper + * * @Author：yang + * * @Package：com.muyu.server.mapper + * * @Project：cloud-electronic + * * @name：CarFenceTypeMapper + * * @Date：2024/9/17 17:32 */ @Mapper public interface CarFenceTypeMapper extends BaseMapper { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarTypeMapper.java new file mode 100644 index 0000000..829e92a --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/CarTypeMapper.java @@ -0,0 +1,22 @@ +package com.muyu.enterpise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.CarType; +import org.apache.ibatis.annotations.Mapper; + +/** + + */ + +/** + * 故障检测策略的接口 + * * @className: CarTypeMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 + */ +@Mapper +public interface CarTypeMapper extends BaseMapper { + +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultCodeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java similarity index 83% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultCodeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java index 18d8199..0461600 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultCodeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultCodeMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultCode; @@ -13,11 +13,12 @@ import org.apache.ibatis.annotations.Param; import java.util.List; /** - * @className: FaultCodeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 + * 故障码管理接口 + * * @className: FaultCodeMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 */ @Mapper public interface FaultCodeMapper extends BaseMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultConditionMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultConditionMapper.java similarity index 68% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultConditionMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultConditionMapper.java index c52dbfc..9068d18 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultConditionMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultConditionMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultCondition; @@ -9,11 +9,12 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * @className: FaultConditionMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 + * 故障检测策略的接口 + * * @className: FaultConditionMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 */ @Mapper public interface FaultConditionMapper extends BaseMapper { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLabelMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLabelMapper.java new file mode 100644 index 0000000..4b29d39 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLabelMapper.java @@ -0,0 +1,17 @@ +package com.muyu.enterpise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.FaultLabel; +import org.apache.ibatis.annotations.Mapper; + +/** + * 故障检测策略的接口 + * * @className: FaultLabelMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 + */ +@Mapper +public interface FaultLabelMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLogMapper.java similarity index 60% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLogMapper.java index 0b467fb..3d13bd8 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultLogMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultLog; @@ -8,11 +8,12 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 + * 故障检测策略的接口 + * * @className: FaultLogMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 */ @Mapper public interface FaultLogMapper extends BaseMapper { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultRuleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultRuleMapper.java new file mode 100644 index 0000000..86a42cd --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultRuleMapper.java @@ -0,0 +1,17 @@ +package com.muyu.enterpise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.FaultRule; +import org.apache.ibatis.annotations.Mapper; + +/** + * 故障检测策略的接口 + * * @className: FaultRuleMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 + */ +@Mapper +public interface FaultRuleMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultTypeMapper.java similarity index 58% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultTypeMapper.java index c6e8609..542f13c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FaultTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FaultTypeMapper.java @@ -1,15 +1,17 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FaultType; import org.apache.ibatis.annotations.Mapper; + /** - * @className: FaultTypeMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 + * 故障检测策略 + * * @className: FaultTypeMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 */ @Mapper public interface FaultTypeMapper extends BaseMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FenceGroupMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FenceGroupMapper.java similarity index 53% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FenceGroupMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FenceGroupMapper.java index 8c79cc7..c663ba1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/FenceGroupMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/FenceGroupMapper.java @@ -1,15 +1,16 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.FenceGroup; import org.apache.ibatis.annotations.Mapper; /** - * @Author：yan - * @Package：com.muyu.car.mapper - * @Project：cars - * @name：FenceGroupMapper - * @Date：2024/9/21 20:54 + * 围栏分组Mapper + * * @Author：yan + * * @Package：com.muyu.car.mapper + * * @Project：cars + * * @name：FenceGroupMapper + * * @Date：2024/9/21 20:54 */ @Mapper public interface FenceGroupMapper extends BaseMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageMapper.java similarity index 58% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageMapper.java index 716810a..417753a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.message.Message; @@ -7,11 +7,12 @@ import org.apache.ibatis.annotations.Mapper; import java.util.List; /** - * @className: MessageMapper ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: + * 消息表(Message)表数据库访问层 + * * @className: MessageMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: */ @Mapper public interface MessageMapper extends BaseMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageTemplateMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageTemplateMapper.java similarity index 59% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageTemplateMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageTemplateMapper.java index ec99c23..85d4d52 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MessageTemplateMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageTemplateMapper.java @@ -1,14 +1,15 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.MessageTemplate; import org.apache.ibatis.annotations.Mapper; /** - * @ClassName MessageTemplateMapper - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 消息模板Mapper + * * @ClassName MessageTemplateMapper + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Mapper public interface MessageTemplateMapper extends BaseMapper { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageValueMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageValueMapper.java new file mode 100644 index 0000000..233d11f --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MessageValueMapper.java @@ -0,0 +1,19 @@ +package com.muyu.enterpise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.MessageValue; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +/** + * 消息值表(MessageValue)表数据库访问层 + * * @ClassName MessageValueMapper + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 + */ +@Mapper +public interface MessageValueMapper extends BaseMapper { + @Select({"SELECT sct.message_template_id FROM sys_car sc LEFT JOIN sys_car_type sct on sct.id = sc.car_type WHERE sc.car_vin = ${stringVin}"}) + Long findByTemplateId(String stringVin); +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MiddleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MiddleMapper.java similarity index 63% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MiddleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MiddleMapper.java index dbbfcb2..9d1b8a2 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/MiddleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/MiddleMapper.java @@ -1,14 +1,15 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** - * @Author：yan - * @Package：com.muyu.car.mapper - * @Project：plues - * @name：MiddleMapper - * @Date：2024/9/22 10:20 + * 围栏和围栏组的中间表 + * * @Author：yan + * * @Package：com.muyu.car.mapper + * * @Project：plues + * * @name：MiddleMapper + * * @Date：2024/9/22 10:20 */ @Mapper public interface MiddleMapper { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarFaultMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarFaultMapper.java new file mode 100644 index 0000000..deb269b --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarFaultMapper.java @@ -0,0 +1,18 @@ +package com.muyu.enterpise.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.domain.SysCarFault; +import org.apache.ibatis.annotations.Mapper; + +/** + * 车辆故障Mapper接口 + * * @className: SysCarFaultMapper ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024-09-18 21:06 ⏰ + * * @Version: 1.0 + * * @description: 车辆故障Mapper接口 + */ +@Mapper +public interface SysCarFaultMapper extends BaseMapper{ + +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java similarity index 88% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java index d68b982..abd13a3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysCarMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysCarMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.SysCar; @@ -9,8 +9,7 @@ import java.util.List; /** * 车辆基础信息Mapper接口 - * - * @author Li HD + * @author LiHD * @date 2024-09-18 */ @Mapper diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysTypeMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java similarity index 55% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysTypeMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java index e4ecdda..8ca2562 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/SysTypeMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/SysTypeMapper.java @@ -1,15 +1,21 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.SysCarType; import java.util.List; + /** - * @version 1.0 - * @Author xie ya ru - * @Date 2024/9/22 9:30 - * @注释 + + */ + +/** + * 车辆类型表(SysCarType)表数据库访问层 + * * @version 1.0 + * * @Author xie ya ru + * * @Date 2024/9/22 9:30 + * * @注释 */ public interface SysTypeMapper extends BaseMapper { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnLogsMapper.java similarity index 88% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnLogsMapper.java index fc6f246..01288e5 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnLogsMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnLogsMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.domain.WarnLogs; @@ -6,7 +6,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 预警日志Mapper接口 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnRuleMapper.java similarity index 88% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnRuleMapper.java index a2aa592..2e3c1d8 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnRuleMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 预警规则Mapper接口 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnStrategyMapper.java similarity index 89% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnStrategyMapper.java index 3d005f1..892d593 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/mapper/WarnStrategyMapper.java @@ -1,4 +1,4 @@ -package com.muyu.mapper; +package com.muyu.enterpise.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; @@ -7,7 +7,6 @@ import org.apache.ibatis.annotations.Mapper; /** * 预警策略Mapper接口 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceClazzService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceClazzService.java new file mode 100644 index 0000000..086db20 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceClazzService.java @@ -0,0 +1,15 @@ +package com.muyu.enterpise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.CarFenceClazz; + +/** + * 车辆围栏分类 + * * @Author：yang + * * @Package：com.muyu.server.service + * * @Project：cloud-electronic + * * @name：CarFenceClazzService + * * @Date：2024/9/17 17:33 + */ +public interface CarFenceClazzService extends IService{ +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceService.java similarity index 66% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceService.java index 804b9ff..168f749 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; @@ -7,11 +7,12 @@ import com.muyu.domain.req.CarFenceReq; import com.muyu.domain.resp.CarFenceResq; /** - * @Author：yang - * @Package：com.muyu.server.service - * @Project：cloud-electronic - * @name：CarFenceService - * @Date：2024/9/17 16:54 + * 围栏服务接口 + * * @Author：yang + * * @Package：com.muyu.server.service + * * @Project：cloud-electronic + * * @name：CarFenceService + * * @Date：2024/9/17 16:54 */ public interface CarFenceService extends IService { /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceServiceMybaits.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java similarity index 83% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceServiceMybaits.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java index 0b894dd..a2474ff 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarFenceServiceMybaits.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceServiceMybaits.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.muyu.domain.CarFence; import com.muyu.domain.FenceGroup; @@ -7,11 +7,12 @@ import com.muyu.domain.req.CarFenceAdd; import java.util.List; /** - * @Author：yan - * @Package：com.muyu.car.service - * @Project：plues - * @name：CarFenceServiceMybaits - * @Date：2024/9/22 19:24 + * 围栏服务接口 + * * @Author：yan + * * @Package：com.muyu.car.service + * * @Project：plues + * * @name：CarFenceServiceMybaits + * * @Date：2024/9/22 19:24 */ public interface CarFenceServiceMybaits { void add(Integer fenceGroupId, List carFenceId); diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceTypeService.java new file mode 100644 index 0000000..597f415 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarFenceTypeService.java @@ -0,0 +1,16 @@ +package com.muyu.enterpise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.CarFenceType; + + +/** + * 车辆围栏类型 + * * @Author：yang + * * @Package：com.muyu.server.service + * * @Project：cloud-electronic + * * @name：CarFenceTypeService + * * @Date：2024/9/17 17:29 + */ +public interface CarFenceTypeService extends IService{ +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarTypeService.java similarity index 56% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarTypeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarTypeService.java index 4b04c4b..0222e8b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/CarTypeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/CarTypeService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.CarType; @@ -6,11 +6,12 @@ import com.muyu.domain.CarType; import java.util.List; /** - * @className: CarTypeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: + * 车辆类型Service接口 + * * @className: CarTypeService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: */ public interface CarTypeService extends IService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultCodeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultCodeService.java similarity index 82% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultCodeService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultCodeService.java index 22787dc..36369e5 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultCodeService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultCodeService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; @@ -9,11 +9,12 @@ import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.domain.vo.FaultCodeVo; /** - * @className: FaultCodeService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 + * 故障码管理接口 + * * @className: FaultCodeService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 */ public interface FaultCodeService extends IService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultConditionService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultConditionService.java similarity index 74% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultConditionService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultConditionService.java index 1f4f1c1..a429871 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultConditionService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultConditionService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultCondition; @@ -9,11 +9,12 @@ import com.muyu.domain.resp.FaultConditionTotalListResp; import java.util.List; /** - * @className: FaultConditionService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测策略的接口 + * 故障检测策略的接口 + * * @className: FaultConditionService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 */ public interface FaultConditionService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategy.java new file mode 100644 index 0000000..f1ed1c3 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategy.java @@ -0,0 +1,18 @@ +package com.muyu.enterpise.service; + +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.FaultReport; + +/** + * 故障检测策略的接口 + * * @className: FaultDetectionStrategy ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 + */ +public interface FaultDetectionStrategy { + + FaultReport detectFaults(CarFaultRule carFaultRule); + +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategyService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategyService.java new file mode 100644 index 0000000..f6d7575 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultDetectionStrategyService.java @@ -0,0 +1,12 @@ +package com.muyu.enterpise.service; + +/** + * 故障检测策略的接口 + * * @className: FaultDetectionStrategyService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测策略的接口 + */ +public interface FaultDetectionStrategyService { +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLabelService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLabelService.java similarity index 54% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLabelService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLabelService.java index 789a350..c134a55 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLabelService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLabelService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultLabel; @@ -6,11 +6,16 @@ import com.muyu.domain.FaultLabel; import java.util.List; /** - * @className: FaultLabelService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + + */ + +/** + * 故障检测业务接口 + * * @className: FaultLabelService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ public interface FaultLabelService extends IService { /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLogService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLogService.java similarity index 64% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLogService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLogService.java index 382532b..0ffa24c 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultLogService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultLogService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultLog; @@ -6,11 +6,16 @@ import com.muyu.domain.req.FaultLogListReq; import com.muyu.domain.resp.FaultLogTotalListResp; /** - * @className: FaultLogService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + + */ + +/** + * * @className: FaultLogService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 + * 故障日志服务接口 */ public interface FaultLogService extends IService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultRuleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultRuleService.java similarity index 54% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultRuleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultRuleService.java index 3b5dddb..1d3b8ba 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/FaultRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultRuleService.java @@ -1,15 +1,15 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.FaultRule; - /** - * @className: FaultRuleService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 故障检测服务接口 + * * @className: FaultRuleService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ public interface FaultRuleService extends IService { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultTypeService.java new file mode 100644 index 0000000..4f4ecb2 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FaultTypeService.java @@ -0,0 +1,48 @@ +package com.muyu.enterpise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.FaultType; + +import java.util.List; + +/** + + */ + +/** + * 故障类型服务接口 + * * @className: FaultTypeService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 + */ +public interface FaultTypeService extends IService { + + /** + * 故障码分类查询 + * @return + */ + List select(); + + /** + * 故障码分类新增 + * @param faultType + * @return + */ + Integer add(FaultType faultType); + + /** + * 故障码分类修改 + * @param faultType + * @return + */ + Integer update(FaultType faultType); + + /** + * 故障码分类删除 + * @param id + * @return + */ + Integer delete(Integer id); +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FenceGroupService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FenceGroupService.java new file mode 100644 index 0000000..4edcbd2 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/FenceGroupService.java @@ -0,0 +1,22 @@ +package com.muyu.enterpise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.FenceGroup; + +import java.util.List; + +/** + * 围栏组服务接口 + * * @Author：yan + * * @Package：com.muyu.car.service + * * @Project：cars + * * @name：FenceGroupService + * * @Date：2024/9/21 20:53 + */ +public interface FenceGroupService extends IService { + /** + * 围栏组列表 + * @return + */ + List fenceGroupList(); +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/ISysCarFaultService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/ISysCarFaultService.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/ISysCarFaultService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/ISysCarFaultService.java index 21a7e9d..0aa20ed 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/ISysCarFaultService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/ISysCarFaultService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.SysCarFault; @@ -7,7 +7,6 @@ import java.util.List; /** * 车辆故障Service接口 - * * @author Yang鹏 * @date 2024-09-18 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnLogsService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnLogsService.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnLogsService.java index f55d2f8..5a75aad 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnLogsService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnLogsService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnLogs; @@ -7,7 +7,6 @@ import java.util.List; /** * 预警日志Service接口 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnRuleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnRuleService.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnRuleService.java index ea6e7eb..a882960 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnRuleService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnRule; @@ -7,7 +7,6 @@ import java.util.List; /** * 预警规则Service接口 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnStrategyService.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnStrategyService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnStrategyService.java index 50fc093..5a887c1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/IWarnStrategyService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/IWarnStrategyService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.WarnStrategy; @@ -7,7 +7,6 @@ import java.util.List; /** * 预警策略Service接口 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageService.java similarity index 78% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageService.java index 84ad4e4..b5c6604 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.message.Message; @@ -8,11 +8,12 @@ import com.muyu.domain.message.MessageSendReq; import java.util.List; /** - * @className: MessageService ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 消息服务接口 + * * @className: MessageService ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ public interface MessageService extends IService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageTemplateService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageTemplateService.java similarity index 52% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageTemplateService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageTemplateService.java index 24f7c05..d3503ae 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageTemplateService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageTemplateService.java @@ -1,15 +1,15 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.MessageTemplate; /** - * @ClassName MessageTemplateService - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 消息模板服务接口 + * * @ClassName MessageTemplateService + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ - public interface MessageTemplateService extends IService { } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageValueService.java similarity index 53% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageValueService.java index 7b11717..7817ddd 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MessageValueService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MessageValueService.java @@ -1,4 +1,4 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.MessageValue; @@ -8,14 +8,25 @@ import com.muyu.domain.resp.MessageValueListResp; import java.util.List; /** - * @ClassName MessageValueService - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 消息值服务接口 + * * @ClassName MessageValueService + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ public interface MessageValueService extends IService { + /** + * 查询消息值列表 + * @param messageValueReq + * @return + */ List findAll(MessageValueReq messageValueReq); + /** + * 测试 + * @param str + */ void test(String str); + Long findByTemplateId(String stringVin); } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MiddleService.java similarity index 51% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MiddleService.java index 14514fa..95df7c2 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/MiddleService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/MiddleService.java @@ -1,11 +1,12 @@ -package com.muyu.service; +package com.muyu.enterpise.service; /** - * @Author：yan - * @Package：com.muyu.car.service - * @Project：plues - * @name：MiddleService - * @Date：2024/9/22 10:09 + * 中间表服务接口 + * * @Author：yan + * * @Package：com.muyu.car.service + * * @Project：plues + * * @name：MiddleService + * * @Date：2024/9/22 10:09 */ public interface MiddleService { /** diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysCarService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java similarity index 83% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysCarService.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java index f63db54..9e9d0da 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/SysCarService.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysCarService.java @@ -1,15 +1,15 @@ -package com.muyu.service; +package com.muyu.enterpise.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.domain.SysCar; +import com.muyu.domain.req.SysCarReq; import com.muyu.domain.resp.SysCarResp; import java.util.List; /** * 车辆基础信息Service接口 - * - * @author Li HD + * @author LiHD * @date 2024-09-18 */ public interface SysCarService extends IService { @@ -27,7 +27,7 @@ public interface SysCarService extends IService { * @param sysCar 车辆基础信息 * @return 车辆基础信息集合 */ - public List selectSysCarList(SysCar sysCar); + public List selectSysCarList(SysCarReq sysCarReq); /** * 判断 车辆基础信息 id是否唯一 diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysTypeService.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysTypeService.java new file mode 100644 index 0000000..fd21274 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/SysTypeService.java @@ -0,0 +1,27 @@ +package com.muyu.enterpise.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.domain.SysCarType; + +import java.util.List; + +/** + + */ + +/** + * 车辆类型表(SysCarType)表服务接口 + * * @version 1.0 + * * @Author xie ya ru + * * @Date 2024/9/22 9:32 + * * @注释 + */ +public interface SysTypeService extends IService { + + /** + * 查询所有车辆类型 + * @return 车辆类型集合 + */ + List selectSysTypeList(); + +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceClazzServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceClazzServiceImpl.java new file mode 100644 index 0000000..3c832f5 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceClazzServiceImpl.java @@ -0,0 +1,21 @@ +package com.muyu.enterpise.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.domain.CarFenceClazz; +import com.muyu.enterpise.mapper.CarFenceClazzMapper; +import com.muyu.enterpise.service.CarFenceClazzService; +import org.springframework.stereotype.Service; + +/** + * 车辆围栏分类 + * * @Author：yang + * * @Package：com.muyu.server.service.impl + * * @Project：cloud-electronic + * * @name：CarFenceClazzServiceImpl + * * @Date：2024/9/17 17:33 + */ +@Service +public class CarFenceClazzServiceImpl + extends ServiceImpl + implements CarFenceClazzService { +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java similarity index 90% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java index 068b78b..5519cf1 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceImpl.java @@ -1,18 +1,18 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.CarFence; import com.muyu.domain.CarFenceClazz; import com.muyu.domain.CarFenceType; import com.muyu.domain.req.CarFenceReq; import com.muyu.domain.resp.CarFenceResq; -import com.muyu.mapper.CarFenceMapper; -import com.muyu.service.CarFenceClazzService; -import com.muyu.service.CarFenceService; -import com.muyu.service.CarFenceTypeService; -import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterpise.mapper.CarFenceMapper; +import com.muyu.enterpise.service.CarFenceClazzService; +import com.muyu.enterpise.service.CarFenceService; +import com.muyu.enterpise.service.CarFenceTypeService; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -20,11 +20,12 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * @Author：yang - * @Package：com.muyu.server.service.impl - * @Project：cloud-electronic - * @name：CarFenceServiceImpl - * @Date：2024/9/17 16:57 + * 车辆围栏服务实现类 + * * @Author：yang + * * @Package：com.muyu.server.service.impl + * * @Project：cloud-electronic + * * @name：CarFenceServiceImpl + * * @Date：2024/9/17 16:57 */ @Service @Log4j2 diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java similarity index 88% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java index 27e60ba..40023da 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarFenceServiceMybaitsImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceServiceMybaitsImpl.java @@ -1,12 +1,12 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.muyu.domain.CarFence; import com.muyu.domain.CarMiddle; import com.muyu.domain.FenceAndGroupMiddle; import com.muyu.domain.FenceGroup; import com.muyu.domain.req.CarFenceAdd; -import com.muyu.mapper.CarFenceServiceMybaitsMapper; -import com.muyu.service.CarFenceServiceMybaits; +import com.muyu.enterpise.mapper.CarFenceServiceMybaitsMapper; +import com.muyu.enterpise.service.CarFenceServiceMybaits; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -14,11 +14,12 @@ import java.util.ArrayList; import java.util.List; /** - * @Author：yan - * @Package：com.muyu.car.service.impl - * @Project：plues - * @name：CarFenceServiceMybaitsImpl - * @Date：2024/9/22 19:24 + * 围栏组服务实现类 + * * @Author：yan + * * @Package：com.muyu.car.service.impl + * * @Project：plues + * * @name：CarFenceServiceMybaitsImpl + * * @Date：2024/9/22 19:24 */ @Service public class CarFenceServiceMybaitsImpl implements CarFenceServiceMybaits { @@ -26,6 +27,11 @@ public class CarFenceServiceMybaitsImpl implements CarFenceServiceMybaits { private CarFenceServiceMybaitsMapper carFenceServiceMybaitsMapper; + /** + * 添加多对多围栏组 + * @param fenceGroupId + * @param carFenceId + */ @Override public void add(Integer fenceGroupId, List carFenceId) { diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceTypeServiceImpl.java new file mode 100644 index 0000000..c625541 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarFenceTypeServiceImpl.java @@ -0,0 +1,21 @@ +package com.muyu.enterpise.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.domain.CarFenceType; +import com.muyu.enterpise.mapper.CarFenceTypeMapper; +import com.muyu.enterpise.service.CarFenceTypeService; +import org.springframework.stereotype.Service; + +/** + * 车辆围栏类型 + * * @Author：yang + * * @Package：com.muyu.server.service.impl + * * @Project：cloud-electronic + * * @name：CarFenceTypeServiceImpl + * * @Date：2024/9/17 17:30 + */ +@Service +public class CarFenceTypeServiceImpl + extends ServiceImpl + implements CarFenceTypeService { +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarTypeServiceImpl.java similarity index 71% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarTypeServiceImpl.java index c7328b4..2df19ce 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/CarTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/CarTypeServiceImpl.java @@ -1,21 +1,22 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.CarType; -import com.muyu.mapper.CarTypeMapper; -import com.muyu.service.CarTypeService; +import com.muyu.enterpise.mapper.CarTypeMapper; +import com.muyu.enterpise.service.CarTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @className: CarFaultRule ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 22:06 ⏰ - * @Version: 1.0 - * @description: + * 车辆类型 + * * @className: CarTypeServiceImpl ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description: 车辆类型 */ @Service public class CarTypeServiceImpl extends ServiceImpl implements CarTypeService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java similarity index 93% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java index ba42787..2978b89 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultCodeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultCodeServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -11,19 +11,20 @@ import com.muyu.domain.req.FaultCodeUpdReq; import com.muyu.domain.resp.FaultCodeListResp; import com.muyu.domain.resp.FaultCodeTotalListResp; import com.muyu.domain.vo.FaultCodeVo; -import com.muyu.mapper.FaultCodeMapper; -import com.muyu.service.FaultCodeService; +import com.muyu.enterpise.mapper.FaultCodeMapper; +import com.muyu.enterpise.service.FaultCodeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 故障码管理 + * * @className: FaultCodeServiceImpl ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @Service public class FaultCodeServiceImpl extends ServiceImpl implements FaultCodeService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultConditionServiceImpl.java similarity index 86% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultConditionServiceImpl.java index ff31ae8..eaaeeb0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultConditionServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultConditionServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -7,19 +7,24 @@ import com.muyu.domain.req.FaultConditionAddReq; import com.muyu.domain.req.FaultConditionListReq; import com.muyu.domain.resp.FaultConditionListResp; import com.muyu.domain.resp.FaultConditionTotalListResp; -import com.muyu.mapper.FaultConditionMapper; -import com.muyu.service.FaultConditionService; +import com.muyu.enterpise.mapper.FaultConditionMapper; +import com.muyu.enterpise.service.FaultConditionService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + + */ + +/** + * 故障检测 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @Service public class FaultConditionServiceImpl extends ServiceImpl implements FaultConditionService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLabelServiceImpl.java similarity index 71% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLabelServiceImpl.java index 9728604..8af081b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLabelServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLabelServiceImpl.java @@ -1,28 +1,28 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FaultLabel; -import com.muyu.mapper.FaultLabelMapper; -import com.muyu.service.FaultLabelService; +import com.muyu.enterpise.mapper.FaultLabelMapper; +import com.muyu.enterpise.service.FaultLabelService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 故障检测 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @Service public class FaultLabelServiceImpl extends ServiceImpl implements FaultLabelService { @Autowired private FaultLabelMapper faultLabelMapper; - /** * 故障信息查询 * @return diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java similarity index 81% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java index 4b0bda7..ecb4add 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultLogServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -6,19 +6,20 @@ import com.muyu.domain.FaultLog; import com.muyu.domain.req.FaultLogListReq; import com.muyu.domain.resp.FaultLogListResp; import com.muyu.domain.resp.FaultLogTotalListResp; -import com.muyu.mapper.FaultLogMapper; -import com.muyu.service.FaultLogService; +import com.muyu.enterpise.mapper.FaultLogMapper; +import com.muyu.enterpise.service.FaultLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 故障日志列表 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测V */ @Service public class FaultLogServiceImpl extends ServiceImpl implements FaultLogService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultRuleServiceImpl.java similarity index 87% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultRuleServiceImpl.java index fe2f27d..6c7fc4f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultRuleServiceImpl.java @@ -1,21 +1,22 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FaultRule; -import com.muyu.mapper.FaultRuleMapper; -import com.muyu.service.FaultRuleService; +import com.muyu.enterpise.mapper.FaultRuleMapper; +import com.muyu.enterpise.service.FaultRuleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 故障检测 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @Service public class FaultRuleServiceImpl extends ServiceImpl implements FaultRuleService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultTypeServiceImpl.java similarity index 78% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultTypeServiceImpl.java index cfa1a73..8d0abd0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FaultTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FaultTypeServiceImpl.java @@ -1,21 +1,22 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FaultType; -import com.muyu.mapper.FaultTypeMapper; -import com.muyu.service.FaultTypeService; +import com.muyu.enterpise.mapper.FaultTypeMapper; +import com.muyu.enterpise.service.FaultTypeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 故障类型 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @Service public class FaultTypeServiceImpl extends ServiceImpl implements FaultTypeService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FenceGroupServiceImpl.java similarity index 61% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FenceGroupServiceImpl.java index d9fc775..b28fe78 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/FenceGroupServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/FenceGroupServiceImpl.java @@ -1,26 +1,31 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.FenceGroup; -import com.muyu.mapper.FenceGroupMapper; -import com.muyu.service.FenceGroupService; +import com.muyu.enterpise.mapper.FenceGroupMapper; +import com.muyu.enterpise.service.FenceGroupService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; /** - * @Author：yan - * @Package：com.muyu.car.service.impl - * @Project：cars - * @name：FenceGroupServiceImpl - * @Date：2024/9/21 20:54 + * 围栏组 + * * @Author：yan + * * @Package：com.muyu.car.service.impl + * * @Project：cars + * * @name：FenceGroupServiceImpl + * * @Date：2024/9/21 20:54 */ @Service public class FenceGroupServiceImpl extends ServiceImpl implements FenceGroupService { @Autowired private FenceGroupMapper fenceGroupMapper; + /** + * 围栏组列表 + * @return + */ @Override public List fenceGroupList() { List list = this.list(); diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageServiceImpl.java similarity index 92% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageServiceImpl.java index 02867c6..48780b3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageServiceImpl.java @@ -1,4 +1,4 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,8 +9,8 @@ import com.muyu.common.system.domain.LoginUser; import com.muyu.domain.message.Message; import com.muyu.domain.message.MessageReq; import com.muyu.domain.message.MessageSendReq; -import com.muyu.mapper.MessageMapper; -import com.muyu.service.MessageService; +import com.muyu.enterpise.mapper.MessageMapper; +import com.muyu.enterpise.service.MessageService; import jakarta.servlet.http.HttpServletRequest; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -23,11 +23,12 @@ import java.util.Date; import java.util.List; /** - * @className: FaultLog ️✈️ - * @author: Yang 鹏 🦅 - * @date: 2024/9/23 21:06 ⏰ - * @Version: 1.0 - * @description: 故障检测 + * 消息服务实现类 + * * @className: FaultLog ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 21:06 ⏰ + * * @Version: 1.0 + * * @description: 故障检测 */ @Service public class MessageServiceImpl extends ServiceImpl implements MessageService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageTemplateServiceImpl.java similarity index 56% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageTemplateServiceImpl.java index 9bbebe8..9144447 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageTemplateServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageTemplateServiceImpl.java @@ -1,24 +1,28 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.MessageTemplate; -import com.muyu.mapper.MessageTemplateMapper; -import com.muyu.service.MessageTemplateService; +import com.muyu.enterpise.mapper.MessageTemplateMapper; +import com.muyu.enterpise.service.MessageTemplateService; import org.springframework.stereotype.Service; import javax.annotation.Resource; /** - * @ClassName MessageTemplateServiceImpl - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 消息模板服务实现类 + * * @ClassName MessageTemplateServiceImpl + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Service public class MessageTemplateServiceImpl extends ServiceImpl implements MessageTemplateService { + /** + * 注入消息模板Mapper + */ @Resource private MessageTemplateMapper messageTemplateMapper; diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java similarity index 70% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java index ccd29aa..2e3282b 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MessageValueServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MessageValueServiceImpl.java @@ -1,29 +1,42 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import cn.hutool.json.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.MessageValue; import com.muyu.domain.req.MessageValueReq; import com.muyu.domain.resp.MessageValueListResp; -import com.muyu.mapper.MessageValueMapper; -import com.muyu.service.MessageValueService; -import com.muyu.common.core.utils.StringUtils; +import com.muyu.enterpise.mapper.MessageValueMapper; +import com.muyu.enterpise.service.MessageValueService; +import org.springframework.data.redis.core.RedisTemplate; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.List; /** - * @ClassName MessageValueServiceImpl - * @Description TODO - * @Author Li HD - * @Date 2024/9/19 + * 消息值服务实现类 + * * @ClassName MessageValueServiceImpl + * * @Description TODO + * * @Author Li HD + * * @Date 2024/9/19 */ @Service public class MessageValueServiceImpl extends ServiceImpl implements MessageValueService { + @Resource + private MessageValueMapper messageValueMapper; + + + + /** + * 查询所有消息值 + * @param messageValueReq + * @return + */ @Override public List findAll(MessageValueReq messageValueReq) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -40,6 +53,8 @@ public class MessageValueServiceImpl } List list = this.list(queryWrapper); + + return list.stream() .map(messageValue -> MessageValueListResp.valueBuild( messageValue @@ -48,6 +63,10 @@ public class MessageValueServiceImpl .toList(); } + /** + * 测试 + * @param str + */ @Override public void test(String str) { JSONObject entries = new JSONObject(); @@ -58,5 +77,10 @@ public class MessageValueServiceImpl } } + @Override + public Long findByTemplateId(String stringVin) { + return messageValueMapper.findByTemplateId(stringVin); + } + } diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MiddleServiceImpl.java similarity index 64% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MiddleServiceImpl.java index 5e0569f..4bb8d72 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/MiddleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/MiddleServiceImpl.java @@ -1,16 +1,17 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; -import com.muyu.mapper.MiddleMapper; -import com.muyu.service.MiddleService; +import com.muyu.enterpise.mapper.MiddleMapper; +import com.muyu.enterpise.service.MiddleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; /** - * @Author：yan - * @Package：com.muyu.car.service.impl - * @Project：plues - * @name：MiddleServiceImpl - * @Date：2024/9/22 10:18 + * 中间表 + * * @Author：yan + * * @Package：com.muyu.car.service.impl + * * @Project：plues + * * @name：MiddleServiceImpl + * * @Date：2024/9/22 10:18 */ @Service public class MiddleServiceImpl implements MiddleService { diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarFaultServiceImpl.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarFaultServiceImpl.java index 6ce176d..1418161 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysCarFaultServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarFaultServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.SysCarFault; -import com.muyu.mapper.SysCarFaultMapper; -import com.muyu.service.ISysCarFaultService; +import com.muyu.enterpise.mapper.SysCarFaultMapper; +import com.muyu.enterpise.service.ISysCarFaultService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -13,7 +13,6 @@ import java.util.List; /** * 车辆故障Service业务层处理 - * * @author Yang鹏 * @date 2024-09-18 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java new file mode 100644 index 0000000..6dc4e15 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysCarServiceImpl.java @@ -0,0 +1,94 @@ +package com.muyu.enterpise.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.domain.SysCar; +import com.muyu.domain.req.SysCarReq; +import com.muyu.domain.resp.SysCarResp; +import com.muyu.enterpise.mapper.SysCarMapper; +import com.muyu.enterpise.service.SysCarService; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.ArrayList; +import java.util.List; + +/** + * 车辆基础信息Service业务层处理 + * @author LiHD + * @date 2024-09-18 + */ +@Service +public class SysCarServiceImpl + extends ServiceImpl + implements SysCarService { + + @Autowired + private SysCarMapper sysCarMapper; + + /** + * 精确查询车辆基础信息 + * + * @param id 车辆基础信息主键 + * @return 车辆基础信息 + */ + @Override + public SysCar selectSysCarById(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(SysCar::getId, id); + + + return this.getOne(queryWrapper); + } + + + /** + * 查询车辆基础信息列表 + * + * @param sysCarReq 车辆基础信息 + * @return 车辆基础信息 + */ + @Override + public List selectSysCarList(SysCarReq sysCarReq) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotEmpty(sysCarReq.getCarVin())) { + queryWrapper.eq(SysCar::getCarVin,sysCarReq.getCarVin()); + } + if (StringUtils.isNotEmpty(sysCarReq.getCarPlate())) { + queryWrapper.like(SysCar::getCarPlate, sysCarReq.getCarPlate()); + } + if (StringUtils.isNotEmpty(sysCarReq.getCarBrand())) { + queryWrapper.eq(SysCar::getCarBrand, sysCarReq.getCarBrand()); + } + if (StringUtils.isNotEmpty(sysCarReq.getCarModel())) { + queryWrapper.eq(SysCar::getCarModel, sysCarReq.getCarModel()); + } + if (null == sysCarReq.getCarType()) { + queryWrapper.eq(SysCar::getCarType, sysCarReq.getCarType()); + } + if (null == sysCarReq.getState()) { + queryWrapper.eq(SysCar::getState, sysCarReq.getState()); + } + List list = this.list(queryWrapper); + return list.stream() + .map(SysCarResp::reverseResp) + .toList(); + } + + + /** + * 唯一 判断 + * @param sysCar 车辆基础信息 + * @return 车辆基础信息 + */ + @Override + public Boolean checkIdUnique(SysCar sysCar) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(SysCar::getId, sysCar.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java similarity index 61% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java index d091357..e2f8728 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/SysTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/SysTypeServiceImpl.java @@ -1,19 +1,20 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.domain.SysCarType; -import com.muyu.mapper.SysTypeMapper; -import com.muyu.service.SysTypeService; +import com.muyu.enterpise.mapper.SysTypeMapper; +import com.muyu.enterpise.service.SysTypeService; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.List; /** - * @version 1.0 - * @Author xie ya ru - * @Date 2024/9/22 9:34 - * @注释 + * 车辆类型表(SysCarType)表服务实现类 + * * @version 1.0 + * * @Author xie ya ru + * * @Date 2024/9/22 9:34 + * * @注释 */ @Service public class SysTypeServiceImpl @@ -23,6 +24,10 @@ public class SysTypeServiceImpl @Resource private SysTypeMapper sysTypeMapper; + /** + * 查询车辆类型列表 + * @return + */ @Override public List selectSysTypeList() { return sysTypeMapper.selectSysList(); diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnLogsServiceImpl.java similarity index 95% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnLogsServiceImpl.java index 900c807..1d3eef0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnLogsServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnLogsServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.WarnLogs; -import com.muyu.mapper.WarnLogsMapper; -import com.muyu.service.IWarnLogsService; +import com.muyu.enterpise.mapper.WarnLogsMapper; +import com.muyu.enterpise.service.IWarnLogsService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -13,7 +13,6 @@ import java.util.List; /** * 预警日志Service业务层处理 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnRuleServiceImpl.java similarity index 94% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnRuleServiceImpl.java index 5375e2a..762c31f 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnRuleServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnRuleServiceImpl.java @@ -1,18 +1,17 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.WarnRule; -import com.muyu.mapper.WarnRuleMapper; -import com.muyu.service.IWarnRuleService; +import com.muyu.enterpise.mapper.WarnRuleMapper; +import com.muyu.enterpise.service.IWarnRuleService; import org.springframework.stereotype.Service; import java.util.List; /** * 预警规则Service业务层处理 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java similarity index 93% rename from cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java index 1256a9d..a4f1b4e 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/java/com/muyu/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/WarnStrategyServiceImpl.java @@ -1,18 +1,17 @@ -package com.muyu.service.impl; +package com.muyu.enterpise.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.domain.WarnStrategy; -import com.muyu.mapper.WarnStrategyMapper; -import com.muyu.service.IWarnStrategyService; +import com.muyu.enterpise.mapper.WarnStrategyMapper; +import com.muyu.enterpise.service.IWarnStrategyService; import org.springframework.stereotype.Service; import java.util.List; /** * 预警策略Service业务层处理 - * * @author muyu * @date 2024-09-20 */ diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java new file mode 100644 index 0000000..86b4817 --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/FuelVehicleCarFaultDetectionStrategy.java @@ -0,0 +1,15 @@ +package com.muyu.enterpise.service.impl.faultDetectionStrategy; + +import org.springframework.stereotype.Service; + +/** + * 针对燃油车的故障检测逻辑 + * * @className: FuelVehicleCarFaultDetectionStrategy ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description: + */ +@Service(value = "FuelVehicleCar") +public class FuelVehicleCarFaultDetectionStrategy { +} diff --git a/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java new file mode 100644 index 0000000..d9df9af --- /dev/null +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/java/com/muyu/enterpise/service/impl/faultDetectionStrategy/PureElectricCarFaultDetectionStrategy.java @@ -0,0 +1,48 @@ +package com.muyu.enterpise.service.impl.faultDetectionStrategy; + + +import com.muyu.domain.CarFaultRule; +import com.muyu.domain.FaultReport; +import com.muyu.enterpise.service.FaultDetectionStrategy; +import org.springframework.stereotype.Service; + +/** + * 针对纯电车的故障检测逻辑 + * * @className: PureElectricCarFaultDetectionStrategy ️✈️ + * * @author: Yang 鹏 🦅 + * * @date: 2024/9/23 22:06 ⏰ + * * @Version: 1.0 + * * @description: + */ +@Service(value = "PureElectricCar") +public class PureElectricCarFaultDetectionStrategy implements FaultDetectionStrategy { + + + + @Override + public FaultReport detectFaults(CarFaultRule carFaultRule) { + + + //检测车速是否处于正常范围 + if (carFaultRule.getSpeed()>200 || carFaultRule.getSpeed()<0){ + return new FaultReport("纯电车","车速不在正常范围内,请注意"); + } + //检测总里程数是否超过正常数 + if (carFaultRule.getTM()>5000000){ + return new FaultReport("纯电车","总里程数已超标,请注意"); + } + //检测总电压是否正常 + if (carFaultRule.getTV()>650){ + return new FaultReport("纯电车","总电压过高,请注意"); + } + //检测电流是否超标 + if (carFaultRule.getCC()>50){ + return new FaultReport("纯电车","电流过高,请注意"); + } + //检测绝缘电阻 + if (carFaultRule.getIR()>100000){ + return new FaultReport("纯电车","绝缘电阻过高,请注意"); + } + return null; + } +} diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/banner.txt b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/banner.txt similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml similarity index 98% rename from cloud-modules/cloud-module-enterprise/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml index 60732a3..59bb63a 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/bootstrap.yml @@ -7,7 +7,7 @@ nacos: addr: 123.57.152.124:8848 user-name: nacos password: nacos - namespace: yan1 + namespace: xyr # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/dev.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/dev.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/prod.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/prod.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/test.xml similarity index 100% rename from cloud-modules/cloud-module-enterprise/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/logback/test.xml diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml index a822ddd..2f41ac0 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/CarFenceServiceMybaitsMapper.xml @@ -2,7 +2,7 @@ - + insert into car_fence values (0,#{name},#{clazzId},#{typeId},#{fenceText},#{fenceStart},#{fenceEnd},#{fenceCreate},0) diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultCodeMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml similarity index 98% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultCodeMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml index 57f6336..9e5a7b8 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultCodeMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultCodeMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultConditionMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml similarity index 97% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultConditionMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml index 3d1c04b..d8b6622 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultConditionMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultConditionMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultLogMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml similarity index 96% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultLogMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml index 1709abd..1979526 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/FaultLogMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/FaultLogMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/MessageMapper.xml b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml similarity index 87% rename from cloud-modules/cloud-module-enterprise/src/main/resources/mapper/MessageMapper.xml rename to cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml index 5313061..cb4f9e3 100644 --- a/cloud-modules/cloud-module-enterprise/src/main/resources/mapper/MessageMapper.xml +++ b/cloud-modules/cloud-modules-enterprise/enterpise-service/src/main/resources/mapper/MessageMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - +