diff --git a/cloud-auth/src/main/resources/bootstrap.yml b/cloud-auth/src/main/resources/bootstrap.yml index 930ce5a..715bffa 100644 --- a/cloud-auth/src/main/resources/bootstrap.yml +++ b/cloud-auth/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 49.235.136.60:8848 user-name: nacos password: nacos - namespace: one-saas + namespace: wyh # Spring spring: application: @@ -22,18 +22,18 @@ spring: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} config: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} # 配置文件格式 diff --git a/cloud-common/cloud-common-caffeine/pom.xml b/cloud-common/cloud-common-cache/pom.xml similarity index 63% rename from cloud-common/cloud-common-caffeine/pom.xml rename to cloud-common/cloud-common-cache/pom.xml index 286b121..8fb18c6 100644 --- a/cloud-common/cloud-common-caffeine/pom.xml +++ b/cloud-common/cloud-common-cache/pom.xml @@ -9,27 +9,38 @@ 3.6.3 - cloud-common-caffeine + cloud-common-cache - cloud-common-caffeine caffeine缓存模块 + cloud-common-cache 本地换存 17 17 UTF-8 - - com.muyu - cloud-common-redis + com.google.guava + guava + 33.0.0-jre + + logkit + logkit + 1.0.1 + + + + org.projectlombok + lombok + com.github.ben-manes.caffeine caffeine + 2.9.3 - + diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CaffeineTest.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CaffeineTest.java new file mode 100644 index 0000000..7158738 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/CaffeineTest.java @@ -0,0 +1,37 @@ +package com.muyu.common.cache; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import lombok.extern.slf4j.Slf4j; + +import java.util.concurrent.TimeUnit; + +@Slf4j +public class CaffeineTest { + public static void main(String[] args) { + Cache cache = Caffeine.newBuilder() + .initialCapacity(5) + // 超出时淘汰 + .maximumSize(10) + //设置写缓存后n秒钟过期 + .expireAfterWrite(60, TimeUnit.SECONDS) + //设置读写缓存后n秒钟过期,实际很少用到,类似于expireAfterWrite + //.expireAfterAccess(17, TimeUnit.SECONDS) + .build(); + + String orderId = String.valueOf(123456789); + String orderInfo = cache.get(orderId, key -> getInfo(key)); + System.out.println(orderInfo); + } + + private static String getInfo(String orderId) { + String info = ""; + // 先查询redis缓存 + log.info("get data from redis"); + + // 当redis缓存不存在查db + log.info("get data from mysql"); + info = String.format("{orderId=%s}", orderId); + return info; + } +} diff --git a/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/GuavaCacheTest.java b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/GuavaCacheTest.java new file mode 100644 index 0000000..f9dd5d9 --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/java/com/muyu/common/cache/GuavaCacheTest.java @@ -0,0 +1,36 @@ +package com.muyu.common.cache; + +import com.google.common.cache.Cache; +import com.google.common.cache.CacheBuilder; +import lombok.extern.slf4j.Slf4j; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.TimeUnit; + +@Slf4j +public class GuavaCacheTest { + public static void main(String[] args) throws ExecutionException { + Cache cache = CacheBuilder.newBuilder() + .initialCapacity(5) // 初始容量 + .maximumSize(10) // 最大缓存数，超出淘汰 + .expireAfterWrite(60, TimeUnit.SECONDS) // 过期时间 + .build(); + + String orderId = String.valueOf(123456789); + // 获取orderInfo，如果key不存在，callable中调用getInfo方法返回数据 + String orderInfo = cache.get(orderId, () -> getInfo(orderId)); + log.info("orderInfo = {}", orderInfo); + + } + + private static String getInfo(String orderId) { + String info = ""; + // 先查询redis缓存 + log.info("get data from redis"); + + // 当redis缓存不存在查db + log.info("get data from mysql"); + info = String.format("{orderId=%s}", orderId); + return info; + } +} diff --git a/cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports new file mode 100644 index 0000000..f4a1fdb --- /dev/null +++ b/cloud-common/cloud-common-cache/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -0,0 +1,2 @@ +com.muyu.common.kafka.config.KafkaConsumerConfig +com.muyu.common.kafka.config.KafkaProviderConfig diff --git a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/bean/CaffeineManager.java b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/bean/CaffeineManager.java index 8ccc11f..e69de29 100644 --- a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/bean/CaffeineManager.java +++ b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/bean/CaffeineManager.java @@ -1,51 +0,0 @@ -package com.muyu.common.caffeine.bean; - - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import com.github.benmanes.caffeine.cache.Caffeine; -import org.springframework.cache.CacheManager; -import org.springframework.cache.caffeine.CaffeineCache; -import org.springframework.cache.support.SimpleCacheManager; -import org.springframework.context.annotation.Bean; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - - -/** - * Caffeine管理器 - * @Author: 胡杨 - * @Name: CaffeineCacheConfig - * @Description: Caffeine管理器 - * @CreatedDate: 2024/9/26 上午11:52 - * @FilePath: com.muyu.common.caffeine.config - */ - -@Slf4j -@Component -public class CaffeineManager { - - /** - * 创建缓存管理器 - * @return 缓存管理器实例 - */ - @Bean - public SimpleCacheManager simpleCacheManager() { - SimpleCacheManager cacheManager = new SimpleCacheManager(); - List cacheNames = CacheNameEnums.getCodes(); - cacheManager.setCaches(cacheNames.stream() - .map(name -> new CaffeineCache( - name, - Caffeine.newBuilder() - .recordStats() - .build())) - .toList()); - log.info("缓存管理器初始化完成,缓存分区:{}", cacheNames); - return cacheManager; - } - -} diff --git a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/constents/CaffeineContent.java b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/constents/CaffeineContent.java index 251bc9b..e69de29 100644 --- a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/constents/CaffeineContent.java +++ b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/constents/CaffeineContent.java @@ -1,17 +0,0 @@ -package com.muyu.common.caffeine.constents; - -/** - * Caffeine常量 - * @Author: 胡杨 - * @Name: CaffeineContent - * @Description: Caffeine常量 - * @CreatedDate: 2024/9/26 下午12:06 - * @FilePath: com.muyu.common.caffeine.constents - */ - -public class CaffeineContent { - - public static final String CAR_VIN_KEY = "car:vin"; - - public static final String VIN = "vin"; -} diff --git a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/enums/CacheNameEnums.java b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/enums/CacheNameEnums.java index 3d3116b..e69de29 100644 --- a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/enums/CacheNameEnums.java +++ b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/enums/CacheNameEnums.java @@ -1,68 +0,0 @@ -package com.muyu.common.caffeine.enums; - -import lombok.Getter; - -import java.util.Arrays; -import java.util.List; - -/** - * 缓存分区枚举 - * - * @Author: 胡杨 - * @Name: CacheNameEnums - * @Description: 缓存分区枚举 - * @CreatedDate: 2024/10/2 上午9:17 - * @FilePath: com.muyu.common.caffeine.enums - */ - -@Getter -public enum CacheNameEnums { - STORAGE("storage", "持久化"), - FAULT("fault", "故障"), - FENCE("fence", "围栏"), - WARMING("warming", "预警"), - REALTIME("realTime", "实时信息"); - - private final String code; - private final String info; - - CacheNameEnums(String code, String info) { - this.code = code; - this.info = info; - } - - /** - * 鉴别参数是否是枚举的值 - * - * @param code 需鉴别参数 - * @return 如果存在返回结果turn, 否则返回false - */ - public static boolean isCode(String code) { - return Arrays.stream(values()) - .map(CacheNameEnums::getCode) - .anyMatch(c -> c.equals(code)); - } - - /** - * 获取枚举Value - * @param code 编码 - * @return Value - */ - public static String getInfo(String code) { - return Arrays.stream(values()) - .filter(c -> c.getCode().equals(code)) - .map(CacheNameEnums::getInfo) - .findFirst() - .orElse(""); - } - - /** - * 获取所有code - * @return code集合 - */ - public static List getCodes() { - return Arrays.stream(values()) - .map(CacheNameEnums::getCode) - .toList(); - } -} diff --git a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/utils/CaffeineCacheUtils.java b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/utils/CaffeineCacheUtils.java index 9064bf9..e69de29 100644 --- a/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/utils/CaffeineCacheUtils.java +++ b/cloud-common/cloud-common-caffeine/src/main/java/com/muyu/common/caffeine/utils/CaffeineCacheUtils.java @@ -1,97 +0,0 @@ -package com.muyu.common.caffeine.utils; - - -import com.github.benmanes.caffeine.cache.Cache; -import com.github.benmanes.caffeine.cache.Caffeine; -import com.muyu.common.caffeine.constents.CaffeineContent; -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.common.redis.service.RedisService; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.apache.commons.lang3.StringUtils; -import org.springframework.cache.CacheManager; -import org.springframework.cache.caffeine.CaffeineCache; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Component; - -import java.util.ArrayList; -import java.util.Collection; - -/** - * Caffeine缓存工具 - * @Author: 胡杨 - * @Name: CaffeineUtils - * @Description: 缓存工具类 - * @CreatedDate: 2024/9/26 下午2:53 - * @FilePath: com.muyu.common.caffeine - */ -@Slf4j -@Component -public class CaffeineCacheUtils { - @Resource - private CacheManager cacheManager; - @Resource - private RedisTemplate redisTemplate; - - - /** - * 车辆上线 - 新增缓存 - */ - public void addCarCache(String vin) { - // 从Redis中获取缓存信息 - for (String name : CacheNameEnums.getCodes()) { - String value = redisTemplate.opsForValue().get(name+":"+vin); - cacheManager.getCache(name).put(vin, value); - log.info("存储缓存, 缓存分区:[{}], 车辆编码:[{}], 存储值:[{}]", name, vin, value); - } - log.info("车辆编码:{},本地缓存完成...",vin); - } - - /** - * 车辆下线 - 删除缓存 - */ - public void deleteCarCache(String cacheName) { - if (!hasCarVinCache(cacheName,null)) { - log.warn("车辆编码:{},本地缓存不存在该车辆信息...", cacheName); - return; - } - cacheManager.getCache(cacheName).invalidate(); - log.info("车辆编码:{},本地缓存删除完成...", cacheName); - } - - /** - * 获取车辆信息缓存 - */ - public Object getCarCache(String cacheName, String key) { - if (!hasCarVinCache(cacheName, key)){ - log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName); - return null; - } - return cacheManager.getCache(cacheName).get(key).get(); - } - - /** - * 获取车辆信息缓存 - */ - public T getCarCache(String cacheName, String key, Class type) { - if (!hasCarVinCache(cacheName,key)){ - log.warn("车辆编码:{},本地缓存不存在该车辆信息...",cacheName); - return null; - } - return cacheManager.getCache(cacheName).get(key, type); - } - - /** - * 判断缓存存在与否 - */ - public Boolean hasCarVinCache(String cacheName,String key) { - boolean notEmpty = ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName)); - if (notEmpty && StringUtils.isNotEmpty(key)){ - return ObjectUtils.isNotEmpty(cacheManager.getCache(cacheName).get(key).get()); - } - return notEmpty; - - } - -} diff --git a/cloud-common/cloud-common-caffeine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-caffeine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 0b7acd4..e69de29 100644 --- a/cloud-common/cloud-common-caffeine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-common/cloud-common-caffeine/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +0,0 @@ -com.muyu.common.caffeine.utils.CaffeineCacheUtils -com.muyu.common.caffeine.bean.CaffeineManager diff --git a/cloud-common/cloud-common-iotdb/pom.xml b/cloud-common/cloud-common-iotdb/pom.xml deleted file mode 100644 index 0972390..0000000 --- a/cloud-common/cloud-common-iotdb/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-common - 3.6.3 - - - cloud-common-iotdb - - cloud-common-iotdb 时序数据库模块 - - - 17 - 17 - UTF-8 - - - - - - com.muyu - cloud-common-core - - - - org.apache.iotdb - iotdb-session - 1.3.2 - - - - diff --git a/cloud-common/cloud-common-kafka/pom.xml b/cloud-common/cloud-common-kafka/pom.xml deleted file mode 100644 index fca6155..0000000 --- a/cloud-common/cloud-common-kafka/pom.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-common - 3.6.3 - - - cloud-common-kafka - - cloud-common-kafka kafka中间件模块 - - - 17 - 17 - UTF-8 - - - - - - com.muyu - cloud-common-redis - - - - org.apache.kafka - kafka-clients - 3.0.0 - - - - - diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java index 78f2d8a..fda3cc3 100644 --- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java +++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/many/datasource/factory/DruidDataSourceFactory.java @@ -25,6 +25,7 @@ public class DruidDataSourceFactory { DruidDataSource druidDataSource = new DruidDataSource(); druidDataSource.setUrl(dataSourceInfo.getUrl()); druidDataSource.setConnectTimeout(10000); + druidDataSource.setMaxWait(60000); druidDataSource.setUsername(dataSourceInfo.getUserName()); druidDataSource.setPassword(dataSourceInfo.getPassword()); druidDataSource.setBreakAfterAcquireFailure(true); diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java index 0c145d5..87dab28 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysEnt.java @@ -34,4 +34,5 @@ public class SysEnt { private String userName; private String password; + } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java index 0bba83a..d99cd55 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysFirmUser.java @@ -22,4 +22,5 @@ public class SysFirmUser extends SysUser { * 用户数据库 */ private String databaseName; + } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java new file mode 100644 index 0000000..4d79d28 --- /dev/null +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysMember.java @@ -0,0 +1,31 @@ +package com.muyu.common.system.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 lombok.*; +import lombok.experimental.SuperBuilder; + +/** + * 会员表(SysMember)实体类 + * + */ +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_member") +public class SysMember { + @TableId(type = IdType.AUTO) + private Long memberId; + @Excel(name = "会员等级") + private String memberName; + @Excel(name = "可添加车辆数量") + private Integer memberCarNum; + @Excel(name = "可添加报文模板数量") + private Integer memberCarType; +} + diff --git a/cloud-common/pom.xml b/cloud-common/pom.xml index c9cee66..a7a40be 100644 --- a/cloud-common/pom.xml +++ b/cloud-common/pom.xml @@ -21,9 +21,6 @@ cloud-common-xxl cloud-common-rabbit cloud-common-saas - cloud-common-caffeine - cloud-common-kafka - cloud-common-iotdb cloud-common diff --git a/cloud-data-processing/pom.xml b/cloud-data-processing/pom.xml deleted file mode 100644 index 143ac52..0000000 --- a/cloud-data-processing/pom.xml +++ /dev/null @@ -1,112 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-server - 3.6.3 - - - cloud-data-processing - - - cloud-data-processing 数据处理模块 - - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-common-kafka - - - - com.muyu - cloud-common-caffeine - - - - com.muyu - cloud-common-rabbit - - - - com.muyu - cloud-common-iotdb - 3.6.3 - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - org.springframework.boot - spring-boot-starter-tomcat - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datascope - - - - com.muyu - cloud-common-datasource - - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/MyDataApplication.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/MyDataApplication.java deleted file mode 100644 index cc6b152..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/MyDataApplication.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.data.processing; - -import com.muyu.common.kafka.constants.KafkaConstants; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import jakarta.annotation.PostConstruct; -import org.springframework.amqp.rabbit.annotation.EnableRabbit; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; - -/** - * 数据处理模块启动器 - * @Author: 胡杨 - * @Name: MyData - * @Description: 数据处理模块启动器 - * @CreatedDate: 2024/9/26 下午7:31 - * @FilePath: com.muyu.data.processing - */ -@EnableRabbit -@EnableCustomConfig -@EnableMyFeignClients -@SpringBootApplication(scanBasePackages = {"com.muyu"}) -public class MyDataApplication { - public static void main(String[] args) { - SpringApplication.run(MyDataApplication.class, args); - System.out.println(KafkaConstants.KafkaGrop); - System.out.println(KafkaConstants.KafkaTopic); - System.out.println("MyData 模块启动成功!"); - } - -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/controller/DataProcessingController.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/controller/DataProcessingController.java deleted file mode 100644 index 8ab8328..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/controller/DataProcessingController.java +++ /dev/null @@ -1,100 +0,0 @@ -package com.muyu.data.processing.controller; - -import com.muyu.common.core.domain.Result; -import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.data.processing.domain.BasicData; -import com.muyu.data.processing.domain.IotDbData; -import com.muyu.data.processing.service.DataProcessingService; - -import javax.annotation.Resource; - -import org.springframework.web.bind.annotation.*; -import lombok.extern.slf4j.Slf4j; - -import java.util.Date; -import java.util.HashMap; -import java.util.List; - -/** - * 数据处理控制层 - * - * @Author: 胡杨 - * @Name: DataProcessing - * @Description: 数据处理控制层 - * @CreatedDate: 2024/9/28 下午3:53 - * @FilePath: com.muyu.data.processing.controller - */ - -@Slf4j -@RestController -@RequestMapping("/DataProcessing") -public class DataProcessingController { - @Resource - private DataProcessingService service; - - /** - * 查看数据库有多少组 - * - * @return - */ - @GetMapping("/selectStorageGroup") - public Result selectStorageGroup() { - List v = service.selectStorageGroup();if (v.size() > 0) {v.forEach(x -> { - System.out.println("group------------------" + x.toString()); - }); - return Result.success(v); - } else { - return Result.error(false); - } - } - - @GetMapping("/selectCarData") - public Result selectCarData(@RequestParam("vin") String vin) { -// String firmCode = SecurityUtils.getSaasKey(); - String firmCode = "firm01"; - return Result.success(service.selectCarData(firmCode,vin)); - } - - @PostMapping("/addCarData") - public Result addCarData(@RequestBody IotDbData data) { - HashMap hashMap = new HashMap<>(); - hashMap.put("timestamp", BasicData - .builder() - .key("timestamp") - .label("时间戳") - .value(String.valueOf(data.getTimestamp())) - .type("string") - .build()); - hashMap.put("vin", BasicData - .builder() - .key("vin") - .label("VIN码") - .value(data.getVin()) - .type("string") - .build()); - hashMap.put("latitude", BasicData - .builder() - .key("latitude") - .label("纬度") - .value(data.getLatitude()) - .type("long") - .build()); - hashMap.put("longitude", BasicData - .builder() - .key("longitude") - .label("经度") - .value(data.getLongitude()) - .type("long") - .build()); - hashMap.put("firmCode", BasicData - .builder() - .key("firmCode") - .label("企业编码") - .value("firm01") - .type("string") - .build()); - return Result.success(service.addCarData(hashMap)); - } - - -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/controller/TestController.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/controller/TestController.java deleted file mode 100644 index 22a7db5..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/controller/TestController.java +++ /dev/null @@ -1,164 +0,0 @@ -package com.muyu.data.processing.controller; - - -import com.github.benmanes.caffeine.cache.Caffeine; -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.common.core.utils.uuid.UUID; -import com.muyu.common.iotdb.config.IotDBSessionConfig; -import com.muyu.common.kafka.constants.KafkaConstants; -import com.muyu.common.rabbit.constants.RabbitConstants; -import jakarta.annotation.Resource; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.cache.Cache; -import org.springframework.cache.caffeine.CaffeineCache; -import org.springframework.cache.support.SimpleCacheManager; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.web.bind.annotation.*; -import lombok.extern.slf4j.Slf4j; - -import java.util.ArrayList; - -/** - * @Author: 胡杨 - * @Name: Test - * @Description: - * @CreatedDate: 2024/9/27 上午10:54 - * @FilePath: com.muyu.data.processing.controller - */ -@Slf4j -@RestController -@RequestMapping("/Test") -public class TestController { - @Resource - private KafkaProducer kafkaProducer; - @Resource - private RabbitTemplate rabbitTemplate; - @Resource - private IotDBSessionConfig iotDBSessionConfig; - @Resource - private RedisTemplate redisTemplate; -// @Resource -// private CaffeineCacheUtils cacheUtils; - - @Resource - private SimpleCacheManager cacheManager; - - @GetMapping("/testKafka") - public void sendMsg() { - try { - // 测试数据 - String jsonString = """ - [{ - "key": "vin", - "label": "VIN码", - "type": "String", - "value": "vin999999" - },{ - "key": "timestamp", - "label": "时间戳", - "type": "long", - "value": "1727534036893" - },{ - "key": "latitude", - "label": "纬度", - "type": "int", - "value": "66.898" - },{ - "key": "longitude", - "label": "经度", - "type": "int", - "value": "99.12" - }]"""; - ProducerRecord producerRecord = new ProducerRecord<>(KafkaConstants.KafkaTopic, jsonString); - kafkaProducer.send(producerRecord); - System.out.println("同步消息发送成功: " + jsonString); - } catch (Exception e) { - e.printStackTrace(); - System.out.println("同步消息发送失败"); - } - } - - @GetMapping("/testRabbit/GoOnline") - public void testRabbitGoOnline(@RequestParam("msg") String msg) { - rabbitTemplate.convertAndSend(RabbitConstants.GO_ONLINE_QUEUE, msg, message -> { - message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-","")); - return message; - }); - } - - @GetMapping("/testRabbit/Downline") - public void testRabbitDownline(@RequestParam("msg") String msg) { - rabbitTemplate.convertAndSend(RabbitConstants.DOWNLINE_QUEUE, msg, message -> { - message.getMessageProperties().setMessageId(UUID.randomUUID().toString().replace("-","")); - return message; - }); - } - - @GetMapping("/insertData") - public void insertData(@RequestParam("deviceId") String deviceId, @RequestParam("time") long time, @RequestParam("value") double value) throws Exception { - String sql = String.format("insert into root.one.%s(timestamp, temperature) values (%d, %f)", deviceId, time, value); - iotDBSessionConfig.getSessionPool().executeNonQueryStatement(sql); - } - - @GetMapping("/testSetRedis") - public void testSetRedis(@RequestParam("key") String key,@RequestParam("value") String value) { - redisTemplate.opsForValue().set(key,value); - } - - @GetMapping("/testGetCache") - public void testGetCache(@RequestParam("cacheName") String cacheName,@RequestParam("key") String key) { - Cache cache = cacheManager.getCache(cacheName); - if (cache != null) { - String v = cache.get(key,String.class); - log.info("缓存值为: {}",v); - }else { - log.info("无缓存"); - } - } - - @GetMapping("/textSetCache") - public void textSetCache( - @RequestParam("cacheName") String cacheName, - @RequestParam("key") String key, - @RequestParam("value") String value) { - Cache cache = cacheManager.getCache(cacheName); - if (cache != null){ - cache.put(key, value); - log.info("设置缓存成功"); - }else { - log.info("无缓存"); - } - } - - @GetMapping("/testDelCache") - public void testDelCache(@RequestParam("cacheName") String cacheName) { - if (!CacheNameEnums.isCode(cacheName)){ - log.info("缓存分区不存在"); - return; - } - Cache cache = cacheManager.getCache(cacheName); - if (cache != null) { - cache.invalidate(); - log.info("删除缓存成功"); - }else{ - log.info("无缓存"); - } - } - - - @GetMapping("/testAddCache") - public void testAddCache(@RequestParam("vin") String vin) { - ArrayList caches = new ArrayList<>(); - caches.add(new CaffeineCache(vin, Caffeine.newBuilder().recordStats().build())); - cacheManager.setCaches(caches); - log.info("缓存管理器创建新分区: {}", vin); - } - - @GetMapping("/testGetCacheNames") - public void testGetCacheNames() { - cacheManager.initializeCaches(); - log.info("缓存分区列表: {}", cacheManager.getCacheNames()); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/BasicData.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/BasicData.java deleted file mode 100644 index 706b2cf..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/BasicData.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.data.processing.domain; - -import lombok.*; - -import java.io.Serializable; - -/** - * 报文信息 时序实体类 - * - * @Author: 胡杨 - * @Name: DataProcessing - * @Description: 报文信息 时序实体类 - * @CreatedDate: 2024/9/28 下午3:48 - * @FilePath: com.muyu.data.processing.domain - */ - -@Data -@ToString -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class BasicData implements Serializable { - - private String key; - private String label; - private String value; - private String type; - -// public void setValueClass() { -// Class info = ClassType.getInfo(type); -// if (info.isInstance(value)){ -// value = info.cast(value); -// } -// } -} - diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/CarData.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/CarData.java deleted file mode 100644 index c2fdfb9..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/CarData.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.muyu.data.processing.domain; - -import lombok.*; - -/** - * 车辆信息 - * - * @Author: 胡杨 - * @Name: CarData - * @Description: 车辆信息 - * @CreatedDate: 2024/10/2 下午2:34 - * @FilePath: com.muyu.data.processing.domain - */ - -@Data -@Builder -@ToString -@NoArgsConstructor -@AllArgsConstructor -public class CarData { - private String vin; - private long timestamp; - private String latitude; - private String longitude; -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/IotDbData.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/IotDbData.java deleted file mode 100644 index 7353356..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/IotDbData.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.data.processing.domain; - -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - -import java.util.Date; - -/** - * 报文信息 时序实体类 - * - * @Author: 胡杨 - * @Name: DataProcessing - * @Description: 报文信息 时序实体类 - * @CreatedDate: 2024/9/28 下午3:48 - * @FilePath: com.muyu.data.processing.domain - */ - -@EqualsAndHashCode(callSuper = true) -@Data -@ToString -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -public class IotDbData extends BaseEntity { - private long timestamp; - - private String vin; - - private String latitude; - private String longitude; - - -} - diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/KafkaData.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/KafkaData.java deleted file mode 100644 index ecb45f6..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/KafkaData.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.muyu.data.processing.domain; - -import com.muyu.common.core.web.domain.BaseEntity; -import lombok.*; -import lombok.experimental.SuperBuilder; - -import java.io.Serializable; - -/** - * 报文信息 时序实体类 - * - * @Author: 胡杨 - * @Name: DataProcessing - * @Description: 报文信息 时序实体类 - * @CreatedDate: 2024/9/28 下午3:48 - * @FilePath: com.muyu.data.processing.domain - */ - -@Data -@ToString -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class KafkaData implements Serializable { - - private String key; - private String label; - private String value; - private String type; - - -} - diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/StrategyEums.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/StrategyEums.java deleted file mode 100644 index b018e6c..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/StrategyEums.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.muyu.data.processing.domain; - -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.branch.OneBranchStrategy; -import com.muyu.data.processing.strategy.branch.TwoBranchStrategy; -import com.muyu.data.processing.strategy.leaves.FourLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.OneLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.ThreeLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.TwoLeavesStrategy; -import lombok.Getter; - -import java.util.Arrays; - -/** - * 策略选择枚举 - * - * @Author: 胡杨 - * @Name: StrategyEums - * @Description: 策略选择枚举 - * @CreatedDate: 2024/9/28 上午11:59 - * @FilePath: com.muyu.data.processing.domain - */ - -@Getter -public enum StrategyEums { - TEST1("加减法", new OneBranchStrategy()), - TEST2("乘除法", new TwoBranchStrategy()), - TEST1_1("加法", new OneLeavesStrategy()), - TEST1_2("减法", new TwoLeavesStrategy()), - TEST2_1("乘法", new ThreeLeavesStrategy()), - TEST2_2("除法", new FourLeavesStrategy()); - - private final String code; - private final StrategyHandler info; - - StrategyEums(String code, StrategyHandler info) { - this.code = code; - this.info = info; - } - - /** - * 鉴别参数是否是枚举的值 - * - * @param code 需鉴别参数 - * @return 如果存在返回结果turn, 否则返回false - */ - public static boolean isCode(String code) { - return Arrays.stream(values()) - .map(StrategyEums::getCode) - .anyMatch(c -> c.equals(code)); - } - - public static StrategyHandler getStrategy(String code) { - return Arrays.stream(values()) - .filter(c -> c.getCode().equals(code)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("参数错误")) - .getInfo(); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/Temporary2.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/Temporary2.java deleted file mode 100644 index 81a7534..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/Temporary2.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.data.processing.domain; - -import lombok.*; - -/** - * 临时类2 - * - * @Author: 胡杨 - * @Name: Temporary2 - * @Description: 临时类2 - * @CreatedDate: 2024/9/30 下午7:27 - * @FilePath: com.muyu.data.processing.domain - */ - -@Data -@ToString -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class Temporary2 { - private String test; -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/req/TestReq.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/req/TestReq.java deleted file mode 100644 index 7a70bd4..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/req/TestReq.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.data.processing.domain.req; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 测试入参 - * - * @Author: 胡杨 - * @Name: TestReq - * @Description: 测试入参 - * @CreatedDate: 2024/9/28 上午10:40 - * @FilePath: com.muyu.data.processing.domain.req - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class TestReq { - private Integer one; - private Integer two; - - private String type1; - private String type2; -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/resp/TestResp.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/resp/TestResp.java deleted file mode 100644 index 8f743e0..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/domain/resp/TestResp.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.data.processing.domain.resp; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * 测试出参 - * - * @Author: 胡杨 - * @Name: TestResp - * @Description: 测试出参 - * @CreatedDate: 2024/9/28 上午10:40 - * @FilePath: com.muyu.data.processing.domain.req.resp - */ - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class TestResp { - private String resp; -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/kafka/KafkaConsumerService.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/kafka/KafkaConsumerService.java deleted file mode 100644 index d8c4286..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/kafka/KafkaConsumerService.java +++ /dev/null @@ -1,70 +0,0 @@ -package com.muyu.data.processing.kafka; - - -import cn.hutool.core.thread.ThreadUtil; -import cn.hutool.json.JSONUtil; -import com.alibaba.nacos.shaded.com.google.common.collect.Lists; -import com.muyu.common.kafka.constants.KafkaConstants; -import com.muyu.data.processing.domain.BasicData; -import com.muyu.data.processing.strategy.core.StartStrategy; -import jakarta.annotation.Resource; -import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.consumer.ConsumerRecord; -import org.apache.kafka.clients.consumer.ConsumerRecords; -import org.apache.kafka.clients.consumer.KafkaConsumer; -import org.springframework.beans.factory.InitializingBean; -import org.springframework.stereotype.Component; - -import java.time.Duration; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; - -/** - * kafka消费者 - * @Author: 胡杨 - * @Name: KafkaConsumerService - * @Description: kafka消费者 - * @CreatedDate: 2024/9/27 上午9:27 - * @FilePath: com.muyu.data.processing.kafka - */ - -@Slf4j -@Component -public class KafkaConsumerService implements InitializingBean { - @Resource - private KafkaConsumer kafkaConsumer; - @Resource - private StartStrategy startStrategy; - - @Override - public void afterPropertiesSet() throws Exception { - Thread thread = new Thread(() -> { - log.info("启动线程监听Topic: {}", KafkaConstants.KafkaTopic); - ThreadUtil.sleep(1000); - Collection topics = Lists.newArrayList(KafkaConstants.KafkaTopic); - kafkaConsumer.subscribe(topics); - while (true) { - System.out.println("开始消费数据,等待中..."); - ConsumerRecords consumerRecords = kafkaConsumer.poll(Duration.ofMillis(1000)); - for (ConsumerRecord consumerRecord : consumerRecords) { - //1.从ConsumerRecord中获取消费数据 - String originalMsg = (String) consumerRecord.value(); - log.info("从Kafka中消费的原始数据: " + originalMsg); - //2.把消费数据转换为DTO对象 - List dataList = JSONUtil.toList(originalMsg, BasicData.class); - log.info("从Kafka中消费的实体数据: " + dataList); - // 执行策略 - startStrategy.applyStrategy(getDataMap(dataList)); - } - } - }); - thread.start(); - } - - private HashMap getDataMap(List dataList) { - HashMap basicDataHashMap = new HashMap<>(); - dataList.forEach(data -> basicDataHashMap.put(data.getKey(), data)); - return basicDataHashMap; - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/mapper/DataProcessingMapper.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/mapper/DataProcessingMapper.java deleted file mode 100644 index fdd1cfe..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/mapper/DataProcessingMapper.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.muyu.data.processing.mapper; - -import com.muyu.data.processing.domain.CarData; -import com.muyu.data.processing.domain.IotDbData; -import com.muyu.data.processing.domain.BasicData; -import org.apache.ibatis.annotations.Mapper; -import org.apache.ibatis.annotations.Param; -import org.springframework.stereotype.Repository; - -import java.util.List; - -/** - * 数据处理持久层 - * - * @Author: 胡杨 - * @Name: DataPeocessingMapper - * @Description: 数据处理持久层 - * @CreatedDate: 2024/9/28 下午3:47 - * @FilePath: com.muyu.data.processing.mapper - */ - -@Repository -@Mapper -public interface DataProcessingMapper{ - - List selectStorageGroup(); - - Integer insIotDbData(@Param("key") String key, @Param("value") String value); - - void strategyCheck(@Param("dataList") List dataList); - - Integer insIotDbDataVo(IotDbData build); - - List selectCarData(@Param("tableName") String tableName); -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/rebbit/DownlineRabbitConsumer.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/rebbit/DownlineRabbitConsumer.java deleted file mode 100644 index c3a38b6..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/rebbit/DownlineRabbitConsumer.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.muyu.data.processing.rebbit; - - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.common.rabbit.constants.RabbitConstants; -import com.rabbitmq.client.Channel; -import jakarta.annotation.Resource; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.ObjectUtils; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.Queue; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.cache.Cache; -import org.springframework.cache.CacheManager; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.util.HashSet; - -/** - * 下线事件监听 - * @Author: 胡杨 - * @Name: DownlineRabbitConsumer - * @Description: 车辆下线监听器 - * @CreatedDate: 2024/9/26 下午8:21 - * @FilePath: com.muyu.data.processing.rebbit - */ -@Slf4j -@Component -@Setter -public class DownlineRabbitConsumer { - @Resource - private RedisTemplate redisTemplate; - @Resource - private CacheManager cacheManager; - - @RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.DOWNLINE_QUEUE)}) - public void downline(String vin, Message message, Channel channel) { - log.info("车辆 {} 下线, 配置信息准备中。。。",vin); - try { - // 重复性校验 - Long add = redisTemplate.opsForSet().add(RabbitConstants.DOWNLINE_QUEUE, message.getMessageProperties().getMessageId()); - if (add>0) { - deleteCarCache(vin); - log.info("车辆 {} 下线, 消息已确认。。。",vin); - } else { - log.info("车辆 {} 下线, 消息重复消费，已确认。。。",vin); - } - channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); - log.info("车辆 {} 下线, 配置信息已准备完毕。。。",vin); - } catch (IOException e) { - try { - log.warn("车辆 {} 下线, 配置信息准备失败，返回队列，原因：{}", vin, e.getMessage()); - channel.basicAck(message.getMessageProperties().getDeliveryTag(), true); - } catch (IOException ex) { - log.warn("车辆 {} 下线, 消息返回队列失败，原因：{}", vin, ex.getMessage()); - } - } - } - - - /** - * 车辆下线 - 删除缓存 - */ - public void deleteCarCache(String vin) { - Cache cache = cacheManager.getCache(vin); - if (ObjectUtils.isNotEmpty(cache)){ - cache.invalidate(); - } - log.info("车辆编码:{},本地缓存删除完成...", vin); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/rebbit/GoOnlineRabbitConsumer.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/rebbit/GoOnlineRabbitConsumer.java deleted file mode 100644 index 05bae21..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/rebbit/GoOnlineRabbitConsumer.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.muyu.data.processing.rebbit; - - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.common.rabbit.constants.RabbitConstants; -import com.rabbitmq.client.Channel; -import jakarta.annotation.Resource; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.Queue; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.cache.CacheManager; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Component; - -import java.io.IOException; -import java.util.List; - -/** - * 上线事件监听 - * @Author: 胡杨 - * @Name: GoOnlineRabbitConsumer - * @Description: 上线事件 - * @CreatedDate: 2024/9/26 下午7:38 - * @FilePath: com.muyu.data.processing.rebbit - */ -@Slf4j -@Component -@Setter -public class GoOnlineRabbitConsumer { - @Resource - private RedisTemplate redisTemplate; - @Resource - private CacheManager cacheManager; - - @RabbitListener(queuesToDeclare = {@Queue(RabbitConstants.GO_ONLINE_QUEUE)}) - public void goOnline(String vin, Message message, Channel channel){ - log.info("车辆 {} 上线, 配置信息准备中。。。",vin); - try { - // 重复性校验 - Long add = redisTemplate.opsForSet().add(RabbitConstants.GO_ONLINE_QUEUE, message.getMessageProperties().getMessageId()); - if (add>0) { - addCarCache(vin); - log.info("车辆 {} 上线, 消息已确认。。。",vin); - } else { - log.info("车辆 {} 上线, 消息重复消费，已确认。。。",vin); - } - channel.basicAck(message.getMessageProperties().getDeliveryTag(), false); - log.info("车辆 {} 上线, 配置信息已准备完毕。。。",vin); - } catch (IOException e) { - try { - log.warn("车辆 {} 上线, 配置信息准备失败，返回队列，原因：{}", vin, e.getMessage()); - channel.basicAck(message.getMessageProperties().getDeliveryTag(), true); - } catch (IOException ex) { - log.warn("车辆 {} 上线, 消息返回队列失败，原因：{}", vin, ex.getMessage()); - } - } - } - - /** - * 车辆上线 - 新增缓存 - */ - public void addCarCache(String vin) { - // 从Redis中获取缓存信息 - for (String name : CacheNameEnums.getCodes()) { - String value = redisTemplate.opsForValue().get(name+":"+vin); - cacheManager.getCache(name).put(vin, value); - log.info("存储缓存, 缓存分区:[{}], 车辆编码:[{}], 存储值:[{}]", name, vin, value); - } - log.info("车辆编码:{},本地缓存完成...",vin); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/service/DataProcessingService.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/service/DataProcessingService.java deleted file mode 100644 index 67cacf3..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/service/DataProcessingService.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.data.processing.service; - - -import com.muyu.data.processing.domain.BasicData; -import com.muyu.data.processing.domain.CarData; - -import java.util.HashMap; -import java.util.List; - -/** - * 数据处理业务层 - * - * @Author: 胡杨 - * @Name: DataProcessing - * @Description: 数据处理业务层 - * @CreatedDate: 2024/9/28 下午3:52 - * @FilePath: com.muyu.data.processing.server - */ - -public interface DataProcessingService{ - - /** - * 选择存储组 - * - * @return {@link List }<{@link String }> - */ - List selectStorageGroup(); - - void strategyCheck(List dataList); - - Integer insIotDbData(String key, String value); - - List selectCarData(String firmCode, String vin); - - Object addCarData(HashMap hashMap); -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/service/impl/DataProcessingServiceImpl.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/service/impl/DataProcessingServiceImpl.java deleted file mode 100644 index 8d824bb..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/service/impl/DataProcessingServiceImpl.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.muyu.data.processing.service.impl; - - -import javax.annotation.Resource; - -import com.muyu.common.iotdb.config.IotDBSessionConfig; -import com.muyu.data.processing.domain.CarData; -import com.muyu.data.processing.domain.IotDbData; -import com.muyu.data.processing.domain.BasicData; -import org.apache.iotdb.isession.SessionDataSet; -import org.apache.iotdb.isession.pool.SessionDataSetWrapper; -import org.apache.iotdb.rpc.IoTDBConnectionException; -import org.apache.iotdb.rpc.StatementExecutionException; -import org.apache.iotdb.session.pool.SessionPool; -import org.apache.iotdb.tsfile.read.common.Field; -import org.apache.iotdb.tsfile.read.common.RowRecord; -import org.springframework.stereotype.Service; -import lombok.extern.slf4j.Slf4j; -import com.muyu.data.processing.mapper.DataProcessingMapper; -import com.muyu.data.processing.service.DataProcessingService; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - -/** - * 数据处理实现层 - * - * @Author: 胡杨 - * @Name: DataProcessing - * @Description: 数据处理实现层 - * @CreatedDate: 2024/9/28 下午3:52 - * @FilePath: com.muyu.data.processing.server.impl - */ - -@Slf4j -@Service -public class DataProcessingServiceImpl implements DataProcessingService { - @Resource - private DataProcessingMapper mapper; - @Resource - private SessionPool sessionPool; - - - @Override - public List selectStorageGroup() { - return mapper.selectStorageGroup(); - } - - @Override - public void strategyCheck(List dataList) { - HashMap kafkaDataHashMap = new HashMap<>(); - dataList.forEach(data -> kafkaDataHashMap.put(data.getKey(), data)); -// Result result = rootStrategy.applyStrategy(kafkaDataHashMap); -// String[] data = result.getData(); -// insIotDbData(data[0],data[1]); - IotDbData build = IotDbData.builder() - .vin(kafkaDataHashMap.get("vin").getValue()) - .timestamp(Long.parseLong(kafkaDataHashMap.get("timestamp").getValue())) - .latitude(kafkaDataHashMap.get("latitude").getValue()) - .longitude(kafkaDataHashMap.get("longitude").getValue()) - .build(); - mapper.insIotDbDataVo(build); -// dataList.forEach(KafkaData::setValueClass); -// mapper.strategyCheck(dataList); - } - - @Override - public Integer insIotDbData(String key, String value) { - return mapper.insIotDbData(key, value); - } - - @Override - public List selectCarData(String firmCode, String vin) { - ArrayList carDataList = new ArrayList<>(); - String sql = "select * from root.one."+firmCode+"."+vin; - try { - SessionDataSetWrapper dataSetWrapper = sessionPool.executeQueryStatement(sql); - List columnNames = dataSetWrapper.getColumnNames(); - while (dataSetWrapper.hasNext()){ - RowRecord next = dataSetWrapper.next(); - CarData data = getCarData(vin, next, columnNames); - carDataList.add(data); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - return carDataList; - } - - @Override - public Object addCarData(HashMap hashMap) { -// StringBuilder sql = new StringBuilder("insert into root.one."); -// sql.append(hashMap.get("firmCode").getValue()) -// .append(".") -// .append(hashMap.get("vin").getValue()) -// .append("("); -// hashMap.remove("firmCode"); -// hashMap.remove("vin"); -// StringBuilder keys = new StringBuilder(); -// StringBuilder values = new StringBuilder(); -// hashMap.keySet().forEach(key -> { -// if (hashMap.get(key) != null) { -// keys.append(key).append(","); -// if ("String".equals(hashMap.get(key).getType())) { -// values.append("'") -// .append(hashMap.get(key).getValue()) -// .append("'") -// .append(","); -// }else { -// values.append(hashMap.get(key).getValue()) -// .append(","); -// } -// } -// }); -// sql.append(keys.substring(0, keys.length() - 1)) -// .append(") values (") -// .append(values.substring(0, values.length() - 1)) -// .append(")"); -// try { -// sessionPool.executeNonQueryStatement(sql.toString()); -// } catch (StatementExecutionException e) { -// throw new RuntimeException(e); -// } catch (IoTDBConnectionException e) { -// throw new RuntimeException(e); -// } -// log.info("成功执行sql语句: [{}]", sql); -// return sql; - return null; - } - - private static CarData getCarData(String vin, RowRecord next, List columnNames) { - List fields = next.getFields(); - CarData data = new CarData(); - data.setVin(vin); - data.setTimestamp(next.getTimestamp()); - for (int i = 0; i < columnNames.size(); i++) { - if (columnNames.get(i).contains("latitude")) { - data.setLatitude(fields.get(i-1).getStringValue()); - }else if (columnNames.get(i).contains("longitude")) { - data.setLongitude(fields.get(i-1).getStringValue()); - } - } - return data; - } - - -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java deleted file mode 100644 index ee5f3b7..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/StrategyHandler.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.muyu.data.processing.strategy; - -import com.muyu.data.processing.strategy.core.EndStrategy; - -/** - * 策略控制者接口 - * @Author: 胡杨 - * @Name: StrategyHandler - * @Description: 策略控制者接口 - * @CreatedDate: 2024/9/28 上午9:35 - * @FilePath: com.muyu.data.processing.strategy - */ -public interface StrategyHandler { - - @SuppressWarnings("rawtypes") - StrategyHandler DEFAULT = param -> new EndStrategy(); - - /** - * 执行方法 - * @param t 入参 - * @return 返回结果 - */ - R apply(T t); -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/abstractStrategyRouter.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/abstractStrategyRouter.java deleted file mode 100644 index 9da9691..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/abstractStrategyRouter.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.muyu.data.processing.strategy; - -import jakarta.annotation.PostConstruct; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -import java.util.Objects; -/** - * 抽象策略路由 - * @Author: 胡杨 - * @Name: abstractStrategyRouter - * @Description: 抽象策略路由 - * @CreatedDate: 2024/9/28 上午9:26 - * @FilePath: com.muyu.data.processing.strategy - */ -@Slf4j -@Component -public abstract class abstractStrategyRouter { - - /** - * 策略映射器, 指定入参与出参以决定策略处理者 - * @param 策略入参 - * @param 策略出参 - */ - public interface StrategyMapper{ - // 通过入参获取对应策略处理方法,使用Map实现 - StrategyHandler getHandler(T param); - } - - /** - * 选择下级策略 - * @return - */ - protected abstract StrategyMapper registerStrategy(); - - /** - * 默认策略处理者 - */ - @SuppressWarnings("unchecked") - private StrategyHandler defaultStrategyHandler = StrategyHandler.DEFAULT; - - - /** - * 选择策略处理者 - * @param param 入参 - * @return 策略处理结果 - */ - public R applyStrategy(T param) { - StrategyMapper trStrategyMapper = registerStrategy(); - if (trStrategyMapper == null) { - return defaultStrategyHandler.apply(param); - } - final StrategyHandler strategyHandler = trStrategyMapper.getHandler(param); - if (strategyHandler != null) { - return strategyHandler.apply(param); - } - // 使用默认策略处理者 - return defaultStrategyHandler.apply(param); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/DataStorageProcessStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/DataStorageProcessStrategy.java deleted file mode 100644 index 47112da..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/DataStorageProcessStrategy.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; - -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.core.EndStrategy; -import com.muyu.data.processing.strategy.leaves.DataStorageStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 持久化数据处理 - * 数据持久化之前的数据调整 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 数据持久化数据处理 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class DataStorageProcessStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - // 必要参数 - private final static HashMap NECESSARY_PARAM = new HashMap<>(); - static { - NECESSARY_PARAM.put("VIN","VIN码"); - NECESSARY_PARAM.put("timestamp","时间戳"); - NECESSARY_PARAM.put("longitude","经度"); - NECESSARY_PARAM.put("latitude","纬度"); - } - - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> { - // 判断是否存在问题 - if (param.containsKey("DataStorageProcessStrategy")) { - log.error("持久化流程错误，缺少必要参数： {}", param.get("DataStorageProcessStrategy").getKey()); - param.remove("DataStorageProcessStrategy"); - return new EndStrategy(); - } - log.info("持久化数据处理节点已通过。。。"); - return new DataStorageStrategy(); - }; - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("持久化数据处理节点开始处理。。。"); - // 判断是否缺少必要参数,如果有,记录 - NECESSARY_PARAM.keySet().forEach(key->{ - if (!basicDataMap.containsKey(key)) { - basicDataMap.put("DataStorageProcessStrategy", BasicData.builder().key(NECESSARY_PARAM.get(key)).build()); - } - }); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultJudgmentStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultJudgmentStrategy.java deleted file mode 100644 index 25bbacd..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultJudgmentStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.DataStorageStrategy; -import com.muyu.data.processing.strategy.leaves.FaultAlarmStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 故障数据判断 - * 判断是否故障 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 故障数据判断 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class FaultJudgmentStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new FaultAlarmStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("故障判断节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultProcessingStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultProcessingStrategy.java deleted file mode 100644 index 405f2ca..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FaultProcessingStrategy.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.DataStorageStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 故障数据处理 - * 调整故障判断规则 - * @Author: 胡杨 - * @Name: FaultProcessingStrategy - * @Description: 故障参数处理 - * @CreatedDate: 2024/9/30 下午7:47 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class FaultProcessingStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new FaultJudgmentStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("故障数据处理节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceJudgmentStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceJudgmentStrategy.java deleted file mode 100644 index dd73ce0..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceJudgmentStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.FaultAlarmStrategy; -import com.muyu.data.processing.strategy.leaves.FenceAlarmStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 围栏数据判断 - * 判断是否围栏违规 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 围栏数据判断 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class FenceJudgmentStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new FenceAlarmStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("围栏数据判断节点通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceProcessingStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceProcessingStrategy.java deleted file mode 100644 index bb5d7f4..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/FenceProcessingStrategy.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 围栏数据处理 - * 调整围栏判断规则 - * @Author: 胡杨 - * @Name: FaultProcessingStrategy - * @Description: 围栏参数处理 - * @CreatedDate: 2024/9/30 下午7:47 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class FenceProcessingStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new FenceJudgmentStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("围栏数据处理节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/OneBranchStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/OneBranchStrategy.java deleted file mode 100644 index aef6611..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/OneBranchStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.StrategyEums; -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.FourLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.OneLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.ThreeLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.TwoLeavesStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 1号分支策略方法实现 - * - * @Author: 胡杨 - * @Name: OneBranchStrategy - * @Description: 1号叶子策略方法实现 - * @CreatedDate: 2024/9/28 上午11:50 - * @FilePath: com.muyu.data.processing.strategy.impl - */ - -@Slf4j -@Component -public class OneBranchStrategy extends abstractStrategyRouter implements StrategyHandler { - @Override - public TestResp apply(TestReq testReq) { - log.info("1号分支策略方法实现,参数1:{},参数2:{},执行方法:{}", testReq.getOne(), testReq.getTwo(), testReq.getType2()); - return applyStrategy(testReq); - } - - @Override - protected StrategyMapper registerStrategy() { - return param -> StrategyEums.getStrategy(param.getType2()); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java deleted file mode 100644 index f908c0e..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeJudgmentStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.RealTimeAlarmStrategy; -import com.muyu.data.processing.strategy.leaves.WarningAlarmStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 实时数据判断 - * 判断实时数据情况 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 实时数据判断 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class RealTimeJudgmentStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new RealTimeAlarmStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("实时数据判断节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java deleted file mode 100644 index 45ebf07..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/RealTimeProcessingStrategy.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 实时数据处理 - * 调整实时数据 - * @Author: 胡杨 - * @Name: FaultProcessingStrategy - * @Description: 实时数据理 - * @CreatedDate: 2024/9/30 下午7:47 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class RealTimeProcessingStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new RealTimeJudgmentStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("实时数据处理节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/TwoBranchStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/TwoBranchStrategy.java deleted file mode 100644 index eea73af..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/TwoBranchStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.StrategyEums; -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.FourLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.OneLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.ThreeLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.TwoLeavesStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 2号分支策略方法实现 - * - * @Author: 胡杨 - * @Name: TwoBranchStrategy - * @Description: 1号叶子策略方法实现 - * @CreatedDate: 2024/9/28 上午11:50 - * @FilePath: com.muyu.data.processing.strategy.impl - */ - -@Slf4j -@Component -public class TwoBranchStrategy extends abstractStrategyRouter implements StrategyHandler { - @Override - public TestResp apply(TestReq testReq) { - log.info("2号分支策略方法实现,参数1:{},参数2:{},执行方法:{}", testReq.getOne(), testReq.getTwo(), testReq.getType2()); - return applyStrategy(testReq); - } - - @Override - protected StrategyMapper registerStrategy() { - return param -> StrategyEums.getStrategy(param.getType2()); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningJudgmentStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningJudgmentStrategy.java deleted file mode 100644 index 58b6f0c..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningJudgmentStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.leaves.FenceAlarmStrategy; -import com.muyu.data.processing.strategy.leaves.WarningAlarmStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 预警数据判断 - * 判断预警策略 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 预警数据判断 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class WarningJudgmentStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new WarningAlarmStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("预警数据判断节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningProcessingStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningProcessingStrategy.java deleted file mode 100644 index f068e9e..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/branch/WarningProcessingStrategy.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.data.processing.strategy.branch; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 预警数据处理 - * 调整预警使用策略 - * @Author: 胡杨 - * @Name: FaultProcessingStrategy - * @Description: 预警数据处理 - * @CreatedDate: 2024/9/30 下午7:47 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class WarningProcessingStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param-> new WarningJudgmentStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("预警数据处理节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/BasicStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/BasicStrategy.java deleted file mode 100644 index d67112b..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/BasicStrategy.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.muyu.data.processing.strategy.core; - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 基础校验节点 - * 负责基础校验 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 基础校验节点 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class BasicStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> new RoutingStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("开始执行基础校验节点。。。"); - basicDataMap.put(CacheNameEnums.STORAGE.getCode(), null); - basicDataMap.put(CacheNameEnums.FAULT.getCode(), null); - basicDataMap.put(CacheNameEnums.REALTIME.getCode(), null); - log.info("基础校验节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/EndStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/EndStrategy.java deleted file mode 100644 index 410631a..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/EndStrategy.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.muyu.data.processing.strategy.core; - -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 结束节点 - * - * @Author: 胡杨 - * @Name: EndStrategy - * @Description: 策略树 - 结束节点 - * @CreatedDate: 2024/9/30 下午7:13 - * @FilePath: com.muyu.data.processing.strategy.leaves - */ - -@Slf4j -@Component -public class EndStrategy implements StrategyHandler, Temporary2> { - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("结束节点已通过。。。"); - return null; - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java deleted file mode 100644 index ce46f71..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/RoutingStrategy.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.muyu.data.processing.strategy.core; - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap;import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.branch.*; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 路由节点 - * 根据条件重新导向对应节点 - * @Author: 胡杨 - * @Name: RoutingStrategy - * @Description: 路由节点 - * @CreatedDate: 2024/9/30 下午7:37 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class RoutingStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - - private final static HashMap, Temporary2>> map = new HashMap<>(); - static{ - map.put(CacheNameEnums.WARMING.getCode(), new WarningProcessingStrategy()); - map.put(CacheNameEnums.REALTIME.getCode(), new RealTimeProcessingStrategy()); - map.put(CacheNameEnums.FENCE.getCode(), new FenceProcessingStrategy()); - map.put(CacheNameEnums.FAULT.getCode(), new FaultProcessingStrategy()); - map.put(CacheNameEnums.STORAGE.getCode(), new DataStorageProcessStrategy()); - } - - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> { - // 编写路由规则 - List codes = CacheNameEnums.getCodes(); - for (String code : codes) { - if(param.containsKey(code)){ - param.remove(code); - return map.get(code); - } - } - // 默认返回结束节点 - return new EndStrategy(); - }; - }; - - - @Override - public Temporary2 apply(HashMap stringListHashMap) { - log.info("路由节点已通过。。。"); - return applyStrategy(stringListHashMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java deleted file mode 100644 index c451af9..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/core/StartStrategy.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.muyu.data.processing.strategy.core; - - - -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; - -/** - * 开始节点 - * - * @Author: 胡杨 - * @Name: StartStrategy - * @Description: 策略路由实现 - * @CreatedDate: 2024/9/28 上午10:39 - * @FilePath: com.muyu.data.processing.strategy.impl - * 开始节点 - * ↓ - * 基础校验节点 - * ↓ - * 路由节点 ← ← ← ← ← ← - * ↙ ↙ ↓ ↘ ↘ - * 数据处理节点 预警处理节点 故障处理节点 围栏处理节点 实时数据数据处理节点 ↑ - * ↓ ↓ ↓ ↓ ↓ - * 数据持久化处理节点 预警处理节点 故障处理节点 围栏处理节点 实时数据数据处理节点 ↑ - * ↓ ↓ ↓ ↓ ↓ - * ↓ 预警通知节点 故障通知节点 围栏通知节点 实时数据处理节点 ↑ - * ↓ ↘ ↓ ↙ ↙ - * ↓ ↓ ↑ - * → → → 路由节点 → → → → → → - * ↓ - * 结束节点 - */ - -@Slf4j -@Component -public class StartStrategy extends abstractStrategyRouter, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> new BasicStrategy(); - } - -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java deleted file mode 100644 index a57c426..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/DataStorageStrategy.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.common.iotdb.config.IotDBSessionConfig; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.service.DataProcessingService; -import com.muyu.data.processing.service.impl.DataProcessingServiceImpl; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.core.RoutingStrategy; -import jakarta.annotation.Resource; -import lombok.Setter; -import lombok.extern.slf4j.Slf4j; -import org.apache.iotdb.rpc.IoTDBConnectionException; -import org.apache.iotdb.rpc.StatementExecutionException; -import org.apache.iotdb.session.pool.SessionPool; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - -/** - * 数据持久化 - * 车辆数据进行持久化 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 数据持久化 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class DataStorageStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> { - log.info("数据持久化节点已通过。。。"); - return new RoutingStrategy(); - }; - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - // 执行持久化方法 - addCarData(basicDataMap); - return applyStrategy(basicDataMap); - } - - private void addCarData(HashMap hashMap) { - StringBuilder sql = new StringBuilder("insert into root.one."); - sql.append(hashMap.get("firmCode").getValue()) - .append(".") - .append(hashMap.get("VIN").getValue()) - .append("("); - hashMap.remove("firmCode"); - hashMap.remove("VIN"); - StringBuilder keys = new StringBuilder(); - StringBuilder values = new StringBuilder(); - hashMap.keySet().forEach(key -> { - if (hashMap.get(key) != null) { - keys.append(key).append(","); - if ("String".equals(hashMap.get(key).getType())) { - values.append("'") - .append(hashMap.get(key).getValue()) - .append("'") - .append(","); - }else { - values.append(hashMap.get(key).getValue()) - .append(","); - } - } - }); - sql.append(keys.substring(0, keys.length() - 1)) - .append(") values (") - .append(values.substring(0, values.length() - 1)) - .append(")"); - try { - new IotDBSessionConfig().getSessionPool().executeNonQueryStatement(sql.toString()); - } catch (StatementExecutionException e) { - throw new RuntimeException(e); - } catch (IoTDBConnectionException e) { - throw new RuntimeException(e); - } - log.info("成功执行sql语句: [{}]", sql); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java deleted file mode 100644 index 2ebad77..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FaultAlarmStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.core.RoutingStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 故障报警 - * 故障数据记录并报警 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 故障报警 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class FaultAlarmStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> new RoutingStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("故障报警节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java deleted file mode 100644 index 6845011..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FenceAlarmStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.core.RoutingStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 围栏报警 - * 围栏数据记录并报警 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 围栏报警 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class FenceAlarmStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> new RoutingStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("围栏报警节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FourLeavesStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FourLeavesStrategy.java deleted file mode 100644 index 001ec8a..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/FourLeavesStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 4号处理者 - * - * @Author: 胡杨 - * @Name: FourLeavesStrategy - * @Description: 4号处理者 - * @CreatedDate: 2024/9/28 上午11:54 - * @FilePath: com.muyu.data.processing.strategy.leaves - */ - -@Slf4j -@Component -public class FourLeavesStrategy implements StrategyHandler { - @Override - public TestResp apply(TestReq testReq) { - log.info("4号处理者实现,参数1:{},参数2:{},执行方法:{},结果:{}", testReq.getOne(), testReq.getTwo(), testReq.getType2(), (testReq.getOne()*1.0/testReq.getTwo())); - return new TestResp("执行4号处理者-除法"); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/OneLeavesStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/OneLeavesStrategy.java deleted file mode 100644 index 9599332..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/OneLeavesStrategy.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.branch.OneBranchStrategy; -import com.muyu.data.processing.strategy.branch.TwoBranchStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 1号处理者 - * - * @Author: 胡杨 - * @Name: OneLeavesStrategy - * @Description: 1号处理者 - * @CreatedDate: 2024/9/28 上午11:54 - * @FilePath: com.muyu.data.processing.strategy.leaves - */ - -@Slf4j -@Component -public class OneLeavesStrategy implements StrategyHandler { - @Override - public TestResp apply(TestReq testReq) { - log.info("1号处理者实现,参数1:{},参数2:{},执行方法:{},结果:{}", testReq.getOne(), testReq.getTwo(), testReq.getType2(), (testReq.getOne()+testReq.getTwo())); - return new TestResp("执行1号处理者-加法"); - } - -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java deleted file mode 100644 index 0a4cbc3..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/RealTimeAlarmStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.core.RoutingStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 实时数据 - * 处理实时数据事件 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 实时数据 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class RealTimeAlarmStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> new RoutingStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("实时数据处理节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/ThreeLeavesStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/ThreeLeavesStrategy.java deleted file mode 100644 index c28a57b..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/ThreeLeavesStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 3号处理者 - * - * @Author: 胡杨 - * @Name: ThreeLeavesStrategy - * @Description: 3号处理者 - * @CreatedDate: 2024/9/28 上午11:54 - * @FilePath: com.muyu.data.processing.strategy.leaves - */ - -@Slf4j -@Component -public class ThreeLeavesStrategy implements StrategyHandler { - @Override - public TestResp apply(TestReq testReq) { - log.info("3号处理者实现,参数1:{},参数2:{},执行方法:{},结果:{}", testReq.getOne(), testReq.getTwo(), testReq.getType2(), (testReq.getOne()*testReq.getTwo())); - return new TestResp("执行3号处理者-乘法"); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/TwoLeavesStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/TwoLeavesStrategy.java deleted file mode 100644 index 1174ab7..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/TwoLeavesStrategy.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 2号处理者 - * - * @Author: 胡杨 - * @Name: TwoLeavesStrategy - * @Description: 2号处理者 - * @CreatedDate: 2024/9/28 上午11:54 - * @FilePath: com.muyu.data.processing.strategy.leaves - */ - -@Slf4j -@Component -public class TwoLeavesStrategy implements StrategyHandler { - @Override - public TestResp apply(TestReq testReq) { - log.info("2号处理者实现,参数1:{},参数2:{},执行方法:{},结果:{}", testReq.getOne(), testReq.getTwo(), testReq.getType2(), (testReq.getOne()-testReq.getTwo())); - return new TestResp("执行2号处理者-减法"); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java deleted file mode 100644 index 8026940..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/leaves/WarningAlarmStrategy.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.data.processing.strategy.leaves; - -import com.muyu.common.caffeine.enums.CacheNameEnums; -import com.muyu.data.processing.domain.BasicData; -import java.util.HashMap; -import java.util.List; -import com.muyu.data.processing.domain.Temporary2; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.core.RoutingStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 预警报警 - * 预警数据记录并提示 - * @Author: 胡杨 - * @Name: BasicStrategy - * @Description: 责任树 - 预警提示 - * @CreatedDate: 2024/9/30 下午7:24 - * @FilePath: com.muyu.data.processing.strategy.branch - */ - -@Slf4j -@Component -public class WarningAlarmStrategy extends abstractStrategyRouter, Temporary2> - implements StrategyHandler, Temporary2> { - @Override - protected StrategyMapper, Temporary2> registerStrategy() { - return param -> new RoutingStrategy(); - } - - @Override - public Temporary2 apply(HashMap basicDataMap) { - log.info("预警报警节点已通过。。。"); - return applyStrategy(basicDataMap); - } -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/root/RootStrategy.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/root/RootStrategy.java deleted file mode 100644 index 9df6ce2..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/strategy/root/RootStrategy.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.data.processing.strategy.root; - -import com.muyu.common.core.utils.StringUtils; -import com.muyu.data.processing.domain.StrategyEums; -import com.muyu.data.processing.domain.req.TestReq; -import com.muyu.data.processing.domain.resp.TestResp; -import com.muyu.data.processing.strategy.StrategyHandler; -import com.muyu.data.processing.strategy.abstractStrategyRouter; -import com.muyu.data.processing.strategy.branch.OneBranchStrategy; -import com.muyu.data.processing.strategy.branch.TwoBranchStrategy; -import com.muyu.data.processing.strategy.leaves.FourLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.OneLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.ThreeLeavesStrategy; -import com.muyu.data.processing.strategy.leaves.TwoLeavesStrategy; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * 策略路由实现 - * - * @Author: 胡杨 - * @Name: RootStrategy - * @Description: 策略路由实现 - * @CreatedDate: 2024/9/28 上午10:39 - * @FilePath: com.muyu.data.processing.strategy.impl - */ - -@Slf4j -@Component -public class RootStrategy extends abstractStrategyRouter { - @Override - protected StrategyMapper registerStrategy() { - return param -> StrategyEums.getStrategy(param.getType1()); - } - -} diff --git a/cloud-data-processing/src/main/java/com/muyu/data/processing/utils/DataUtils.java b/cloud-data-processing/src/main/java/com/muyu/data/processing/utils/DataUtils.java deleted file mode 100644 index c6e96cf..0000000 --- a/cloud-data-processing/src/main/java/com/muyu/data/processing/utils/DataUtils.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.data.processing.utils; - -import org.springframework.stereotype.Component; - -/** - * 数据处理工具类 - * - * @Author: 胡杨 - * @Name: DataUtils - * @Description: 数据处理工具类 - * @CreatedDate: 2024/9/29 上午10:15 - * @FilePath: com.muyu.data.processing.utils - */ - -@Component -public class DataUtils { - - /** - * 类型转换 - * @param data 转换值 - * @param type 转换类型 - * @return 转换结果 - * @param 返回类型 - */ - public static T convert(Object data, Class type) { - return type.cast(data); - } -} diff --git a/cloud-data-processing/src/main/resources/bootstrap.yml b/cloud-data-processing/src/main/resources/bootstrap.yml deleted file mode 100644 index 4bbeb8f..0000000 --- a/cloud-data-processing/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,70 +0,0 @@ -# Tomcat -server: - port: 9711 - -# nacos线上地址 -nacos: - addr: 47.116.173.119:8848 - user-name: nacos - password: nacos - namespace: one-saas -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - iotdb: - ip: 47.116.173.119 - port: 6667 - user: root - password: root - fetchSize: 10000 - maxActive: 10 - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-data-processing - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # kafka 配置文件 - - application-kafka-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-data-processing/src/main/resources/logback/dev.xml b/cloud-data-processing/src/main/resources/logback/dev.xml deleted file mode 100644 index 8af8bf1..0000000 --- a/cloud-data-processing/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-data-processing/src/main/resources/logback/prod.xml b/cloud-data-processing/src/main/resources/logback/prod.xml deleted file mode 100644 index 35744e3..0000000 --- a/cloud-data-processing/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-data-processing/src/main/resources/logback/test.xml b/cloud-data-processing/src/main/resources/logback/test.xml deleted file mode 100644 index 35744e3..0000000 --- a/cloud-data-processing/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-data-processing/src/main/resources/mapper/processing/DataProcessingMapper.xml b/cloud-data-processing/src/main/resources/mapper/processing/DataProcessingMapper.xml deleted file mode 100644 index 7766db8..0000000 --- a/cloud-data-processing/src/main/resources/mapper/processing/DataProcessingMapper.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - insert into root.one.data(${key}) values(${value}); - - - insert into root.one.data - ( - - ${data.key} - - ) values - ( - - #{data.value} - - ) - - - - insert into - root.one.data - (timestamp, vin, latitude,longitude) - values (#{timestamp}, #{vin}, #{latitude}, #{longitude}) - - - - diff --git a/cloud-gateway/src/main/resources/bootstrap.yml b/cloud-gateway/src/main/resources/bootstrap.yml index fbabcb7..b0be938 100644 --- a/cloud-gateway/src/main/resources/bootstrap.yml +++ b/cloud-gateway/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 49.235.136.60:8848 user-name: nacos password: nacos - namespace: one-saas + namespace: wyh # Spring spring: diff --git a/cloud-modules/cloud-modules-carmanage/pom.xml b/cloud-modules/cloud-modules-carmanage/pom.xml deleted file mode 100644 index e9f29c5..0000000 --- a/cloud-modules/cloud-modules-carmanage/pom.xml +++ /dev/null @@ -1,122 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-carmanage - - - 17 - 17 - UTF-8 - - - 车辆管理 - - - - - org.springframework.integration - spring-integration-mqtt - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - com.muyu - cloud-common-xxl - - - - com.muyu - cloud-common-rabbit - - - - org.bouncycastle - bcpkix-jdk15on - 1.70 - - - com.muyu - cloud-common-kafka - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/CloudCarApplication.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/CloudCarApplication.java deleted file mode 100644 index 69cfea1..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/CloudCarApplication.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.muyu.car; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 系统模块 - * - * @author muyu - */ -@EnableCustomConfig -//@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class CloudCarApplication { - public static void main(String[] args) { - SpringApplication.run(CloudCarApplication.class, args); - } -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarController.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarController.java deleted file mode 100644 index 189e777..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarController.java +++ /dev/null @@ -1,131 +0,0 @@ -package com.muyu.car.controller; - -import java.time.Instant; -import java.time.LocalDateTime; -import java.time.ZoneId; -import java.time.ZonedDateTime; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import jakarta.servlet.http.HttpServletResponse; -import javax.annotation.Resource; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.car.domain.SysCar; -import com.muyu.car.service.ISysCarService; -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 muyu - * @date 2024-09-17 - */ -@RestController -@RequestMapping("/car") -public class SysCarController extends BaseController -{ - @Autowired - private ISysCarService sysCarService; - - - /** - * 查询车辆基础信息列表 - */ - @RequiresPermissions("car:car:list") - @GetMapping("/list") - public Result> list(SysCar sysCar) - { - startPage(); - List list = sysCarService.selectSysCarList(sysCar); - return getDataTable(list); - } - - /** - * 导出车辆基础信息列表 - */ - @RequiresPermissions("car:car:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysCar sysCar) - { - List list = sysCarService.selectSysCarList(sysCar); - ExcelUtil util = new ExcelUtil(SysCar.class); - util.exportExcel(response, list, "车辆基础信息数据"); - } - - /** - * 获取车辆基础信息详细信息 - */ - @RequiresPermissions("car:car:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { - return success(sysCarService.selectSysCarById(id)); - } - - /** - * 新增车辆基础信息 - */ - @RequiresPermissions("car:car:add") - @PostMapping - public Result add( - @Validated @RequestBody SysCar sysCar) - { - // 获取当前时间（没有时区） - LocalDateTime now = LocalDateTime.now(); - // 假设我们使用系统默认时区 - ZoneId zoneId = ZoneId.systemDefault(); - // 将LocalDateTime转换为ZonedDateTime（添加了时区信息） - ZonedDateTime zdt = now.atZone(zoneId); - // 将ZonedDateTime转换为Instant（UTC时间线上的点） - Instant instant = zdt.toInstant(); - // 将Instant转换为Date - Date date = Date.from(instant); - sysCar.setCarLastJoinTime(date); - if (sysCarService.checkIdUnique(sysCar)) { - return error("新增 车辆基础信息 '" + sysCar + "'失败，车辆基础信息已存在"); - } - - return toAjax(sysCarService.save(sysCar)); - } - - /** - * 修改车辆基础信息 - */ - @RequiresPermissions("car:car:edit") - @PutMapping - public Result edit( - @Validated @RequestBody SysCar sysCar) - { - if (!sysCarService.checkIdUnique(sysCar)) { - return error("修改 车辆基础信息 '" + sysCar + "'失败，车辆基础信息不存在"); - } - - return toAjax(sysCarService.updateById(sysCar)); - } - - /** - * 删除车辆基础信息 - */ - @RequiresPermissions("car:car:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { - sysCarService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysMessageTypeController.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysMessageTypeController.java deleted file mode 100644 index a8b69af..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysMessageTypeController.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.muyu.car.controller; - -import java.util.Arrays; -import java.util.List; - -import com.muyu.car.domain.SysMessageType; -import com.muyu.car.service.ISysMessageTypeService; -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.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 muyu - * @date 2024-09-18 - */ -@RestController -@RequestMapping("/messageType") -public class SysMessageTypeController extends BaseController { - @Resource - private ISysMessageTypeService sysMessageTypeService; - - /** - * 查询车辆报文类型列表 - */ - @RequiresPermissions("message:messageType:list") - @GetMapping("/list") - public Result> list(SysMessageType sysMessageType) - { - List list = sysMessageTypeService.selectSysMessageTypeList(sysMessageType); - return Result.success(list); - } - - /** - * 导出车辆报文类型列表 - */ - @RequiresPermissions("message:messageType:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysMessageType sysMessageType) - { - List list = sysMessageTypeService.selectSysMessageTypeList(sysMessageType); - ExcelUtil util = new ExcelUtil(SysMessageType.class); - util.exportExcel(response, list, "车辆报文类型数据"); - } - - /** - * 获取车辆报文类型详细信息 - */ - @RequiresPermissions("message:messageType:query") - @GetMapping(value = "/{messageCode}") - public Result> getInfo(@PathVariable("messageCode") String[] messageCodes) - { - SysMessageType[] list = new SysMessageType[messageCodes.length]; // 确保数组大小 - for (int i = 0; i < messageCodes.length; i++) { - list[i] = sysMessageTypeService.selectSysMessageTypeByMessageCode(messageCodes[i]); - } - return success(list); - } - - /** - * 新增车辆报文类型 - */ - @RequiresPermissions("message:messageType:add") - @PostMapping - public Result add( - @Validated @RequestBody SysMessageType sysMessageType) - { - if (sysMessageTypeService.checkIdUnique(sysMessageType)) { - return error("新增 车辆报文类型 '" + sysMessageType + "'失败，车辆报文类型已存在"); - } - - return toAjax(sysMessageTypeService.save(sysMessageType)); - } - - /** - * 修改车辆报文类型 - */ - @RequiresPermissions("message:messageType:edit") - @PutMapping - public Result edit( - @Validated @RequestBody SysMessageType sysMessageType) - { - if (!sysMessageTypeService.checkIdUnique(sysMessageType)) { - return error("修改 车辆报文类型 '" + sysMessageType + "'失败，车辆报文类型不存在"); - } - - return toAjax(sysMessageTypeService.updateById(sysMessageType)); - } - - /** - * 删除车辆报文类型 - */ - @RequiresPermissions("message:messageType:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { - sysMessageTypeService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/mqtt/MqttProperties.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/mqtt/MqttProperties.java deleted file mode 100644 index 96af628..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/mqtt/MqttProperties.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.car.domain.mqtt; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @ClassName MqttProperties - * @Description Mqtt配置类 - * @Author Chen - * @Date 2024/9/27 20:15 - */ -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class MqttProperties { - /** - * 节点 - */ - private String broker; - /** - * 主题 - */ - private String topic; - - /** - * 用户名 - */ - private String userName; - /** - * 密码 - */ - private String password; - /** - * 节点ID - */ - private String clientId; - /** - * 上报级别 - */ - private int pos = 0; -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/mqtt/MqttServerModel.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/mqtt/MqttServerModel.java deleted file mode 100644 index 4ac70a2..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/mqtt/MqttServerModel.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.car.domain.mqtt; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - - -/** - * @ClassName MqttServerModel - * @Description mqtt服务器模型 - * @Author Chen - * @Date 2024/9/27 21:12 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -public class MqttServerModel { - private static final Logger log = LoggerFactory.getLogger(MqttServerModel.class); - /** - * MQTT服务节点 - */ - private String broker; - - /** - * MQTT订阅主题 - */ - private String topic; - - public String getBroker() { - log.info("broker: {}", broker); - return broker.contains("tcp://") ? broker : "tcp://" + broker + ":1883"; - } -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/resp/SysMessageResp.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/resp/SysMessageResp.java deleted file mode 100644 index f357790..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/resp/SysMessageResp.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.car.domain.resp; - -import lombok.*; - -/** - * 车辆报文类型对象 sys_message_type - * - * @author muyu - * @date 2024-09-18 - */ - -@Data -public class SysMessageResp { - private static final long serialVersionUID = 1L; - private Long id; - private String modelCode; - private String messageTypeCode; - private String messageStartIndex; - private String messageEndIndex; - private String messageType; - private String messageName; -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java deleted file mode 100644 index 8d7dadb..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMessageMapper.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.muyu.car.mapper; - -import java.util.List; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.car.domain.SysCarMessage; -import com.muyu.car.domain.resp.SysMessageResp; -import org.apache.ibatis.annotations.Mapper; - -/** - * 车辆报文记录Mapper接口 - * - * @author muyu - * @date 2024-09-18 - */ -@Mapper -public interface SysCarMessageMapper extends BaseMapper{ - ListdobList(SysMessageResp sysMessageResp); -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mqkafka/CarKafKaProduct.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mqkafka/CarKafKaProduct.java deleted file mode 100644 index 89ddd5a..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mqkafka/CarKafKaProduct.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.muyu.car.mqkafka; - -/** - * kafka - * - * @ClassName CarKafKaProduct - * @Description kafka - * @Author Chen - * @Date 2024/9/28 12:22 - */ - -public class CarKafKaProduct { -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarService.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarService.java deleted file mode 100644 index 3b010ff..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.car.service; - -import java.util.List; -import com.muyu.car.domain.SysCar; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 车辆基础信息Service接口 - * - * @author muyu - * @date 2024-09-17 - */ -public interface ISysCarService extends IService { - /** - * 精确查询车辆基础信息 - * - * @param id 车辆基础信息主键 - * @return 车辆基础信息 - */ - public SysCar selectSysCarById(Long id); - - /** - * 查询车辆基础信息列表 - * - * @param sysCar 车辆基础信息 - * @return 车辆基础信息集合 - */ - public List selectSysCarList(SysCar sysCar); - - /** - * 判断 车辆基础信息 id是否唯一 - * @param sysCar 车辆基础信息 - * @return 结果 - */ - Boolean checkIdUnique(SysCar sysCar); - -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarMessageServiceImpl.java deleted file mode 100644 index 66b325e..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarMessageServiceImpl.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.muyu.car.service.impl; - -import java.util.List; - -import com.muyu.car.domain.SysCar; -import com.muyu.car.domain.SysCarMessage; -import com.muyu.car.domain.SysMessageType; -import com.muyu.car.domain.resp.SysMessageResp; -import com.muyu.car.mapper.SysCarMessageMapper; -import com.muyu.car.service.ISysCarMessageService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.util.Assert; - -/** - * 车辆报文记录Service业务层处理 - * - * @author muyu - * @date 2024-09-18 - */ -@Service -public class SysCarMessageServiceImpl - extends ServiceImpl - implements ISysCarMessageService { - @Autowired - private SysCarMessageMapper mapper; - - @Override - public List dobList(SysMessageResp sysMessageResp) { - return mapper.dobList(sysMessageResp); - } - - /** - * 精确查询车辆报文记录 - * - * @param id 车辆报文记录主键 - * @return 车辆报文记录 - */ - @Override - public SysCarMessage selectSysCarMessageById(Long id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(SysCarMessage::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询车辆报文记录列表 - * - * @param sysCarMessage 车辆报文记录 - * @return 车辆报文记录 - */ - @Override - public List selectSysCarMessageList(SysCarMessage sysCarMessage) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarMessage.getModelCode())) { - queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode()); - } - if (StringUtils.isNotEmpty(sysCarMessage.getMessageType())) { - queryWrapper.eq(SysCarMessage::getMessageType, sysCarMessage.getMessageType()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * - * @param sysCarMessage 车辆报文记录 - * @return 车辆报文记录 - */ - @Override - public Boolean checkIdUnique(SysCarMessage sysCarMessage) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarMessage::getId, sysCarMessage.getId()); - return this.count(queryWrapper) > 0; - } -// -// @Override -// public Boolean checkById(SysMessageType sysMessageType) { -// LambdaQueryWrapper sysCarMessageLambdaQueryWrapper = new LambdaQueryWrapper<>(); -// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); -//// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); -// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::get, sysMessageType); -//// return this.count(sysCarMessageLambdaQueryWrapper) > 0; -// } - -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java deleted file mode 100644 index 309faaf..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysCarServiceImpl.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.muyu.car.service.impl; - -import java.util.List; -import com.muyu.common.core.utils.DateUtils; -import org.springframework.stereotype.Service; -import com.muyu.car.mapper.SysCarMapper; -import com.muyu.car.domain.SysCar; -import com.muyu.car.service.ISysCarService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.util.Assert; - -/** - * 车辆基础信息Service业务层处理 - * - * @author muyu - * @date 2024-09-17 - */ -@Service -public class SysCarServiceImpl - extends ServiceImpl - implements ISysCarService { - - /** - * 精确查询车辆基础信息 - * - * @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) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCar.getCarVin())){ - queryWrapper.eq(SysCar::getCarVin, sysCar.getCarVin()); - } - if (StringUtils.isNotEmpty(sysCar.getCarPlate())){ - queryWrapper.eq(SysCar::getCarPlate, sysCar.getCarPlate()); - } - if (StringUtils.isNotEmpty(sysCar.getCarBrand())){ - queryWrapper.eq(SysCar::getCarBrand, sysCar.getCarBrand()); - } - if (StringUtils.isNotEmpty(sysCar.getCarModel())){ - queryWrapper.eq(SysCar::getCarModel, sysCar.getCarModel()); - } - if (StringUtils.isNotEmpty(sysCar.getCarType())){ - queryWrapper.eq(SysCar::getCarType, sysCar.getCarType()); - } - if (sysCar.getCarLastJoinTime()!= null){ - queryWrapper.eq(SysCar::getCarLastJoinTime, sysCar.getCarLastJoinTime()); - } - if (sysCar.getCarLastOfflineTime()!= null){ - queryWrapper.eq(SysCar::getCarLastOfflineTime, sysCar.getCarLastOfflineTime()); - } - if (StringUtils.isNotEmpty(sysCar.getState())){ - queryWrapper.eq(SysCar::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-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysMessageTypeServiceImpl.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysMessageTypeServiceImpl.java deleted file mode 100644 index 9bf39e5..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/impl/SysMessageTypeServiceImpl.java +++ /dev/null @@ -1,72 +0,0 @@ -package com.muyu.car.service.impl; - -import java.util.List; - -import com.muyu.car.domain.SysMessageType; -import com.muyu.car.mapper.SysMessageTypeMapper; -import com.muyu.car.service.ISysMessageTypeService; -import org.springframework.stereotype.Service; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.util.Assert; - -/** - * 车辆报文类型Service业务层处理 - * - * @author muyu - * @date 2024-09-18 - */ -@Service -public class SysMessageTypeServiceImpl - extends ServiceImpl - implements ISysMessageTypeService { - - /** - * 精确查询车辆报文类型 - * - * @param - * @return 车辆报文类型 - */ - @Override - public SysMessageType selectSysMessageTypeByMessageCode(String messageCode) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(messageCode, "messageCode不可为空"); - queryWrapper.eq(SysMessageType::getMessageCode, messageCode); - return this.getOne(queryWrapper); - } - - - /** - * 查询车辆报文类型列表 - * - * @param sysMessageType 车辆报文类型 - * @return 车辆报文类型 - */ - @Override - public List selectSysMessageTypeList(SysMessageType sysMessageType) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysMessageType.getMessageName())){ - queryWrapper.like(SysMessageType::getMessageName, sysMessageType.getMessageName()); - } - if (StringUtils.isNotEmpty(sysMessageType.getMessageType())){ - queryWrapper.eq(SysMessageType::getMessageType, sysMessageType.getMessageType()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param sysMessageType 车辆报文类型 - * @return 车辆报文类型 - */ - @Override - public Boolean checkIdUnique(SysMessageType sysMessageType) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysMessageType::getId, sysMessageType.getId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/util/SSLUtils.java b/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/util/SSLUtils.java deleted file mode 100644 index 794b2d9..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/util/SSLUtils.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.muyu.car.util; - -import org.bouncycastle.jce.provider.BouncyCastleProvider; -import org.bouncycastle.openssl.PEMKeyPair; -import org.bouncycastle.openssl.PEMParser; -import org.bouncycastle.openssl.jcajce.JcaPEMKeyConverter; - -import javax.net.ssl.KeyManagerFactory; -import javax.net.ssl.SSLContext; -import javax.net.ssl.SSLSocketFactory; -import javax.net.ssl.TrustManagerFactory; -import java.io.BufferedInputStream; -import java.io.FileInputStream; -import java.io.FileReader; -import java.security.KeyPair; -import java.security.KeyStore; -import java.security.Security; -import java.security.cert.CertificateFactory; -import java.security.cert.X509Certificate; - -public class SSLUtils { - public static SSLSocketFactory getSocketFactory(final String caCrtFile, - final String crtFile, final String keyFile, final String password) - throws Exception { - Security.addProvider(new BouncyCastleProvider()); - - // load CA certificate - X509Certificate caCert = null; - - FileInputStream fis = new FileInputStream(caCrtFile); - BufferedInputStream bis = new BufferedInputStream(fis); - CertificateFactory cf = CertificateFactory.getInstance("X.509"); - - while (bis.available() > 0) { - caCert = (X509Certificate) cf.generateCertificate(bis); - } - - // load client certificate - bis = new BufferedInputStream(new FileInputStream(crtFile)); - X509Certificate cert = null; - while (bis.available() > 0) { - cert = (X509Certificate) cf.generateCertificate(bis); - } - - // load client private key - PEMParser pemParser = new PEMParser(new FileReader(keyFile)); - Object object = pemParser.readObject(); - JcaPEMKeyConverter converter = new JcaPEMKeyConverter().setProvider("BC"); - KeyPair key = converter.getKeyPair((PEMKeyPair) object); - pemParser.close(); - - // CA certificate is used to authenticate server - KeyStore caKs = KeyStore.getInstance(KeyStore.getDefaultType()); - caKs.load(null, null); - caKs.setCertificateEntry("ca-certificate", caCert); - TrustManagerFactory tmf = TrustManagerFactory.getInstance("X509"); - tmf.init(caKs); - - // client key and certificates are sent to server so it can authenticate - KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType()); - ks.load(null, null); - ks.setCertificateEntry("certificate", cert); - ks.setKeyEntry("private-key", key.getPrivate(), password.toCharArray(), - new java.security.cert.Certificate[]{cert}); - KeyManagerFactory kmf = KeyManagerFactory.getInstance(KeyManagerFactory - .getDefaultAlgorithm()); - kmf.init(ks, password.toCharArray()); - - // finally, create SSL socket factory - SSLContext context = SSLContext.getInstance("TLSv1.2"); - context.init(kmf.getKeyManagers(), tmf.getTrustManagers(), null); - - return context.getSocketFactory(); - } -} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/banner.txt b/cloud-modules/cloud-modules-carmanage/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/test.xml deleted file mode 100644 index 76a0d8f..0000000 --- a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml deleted file mode 100644 index 31e5868..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/pom.xml +++ /dev/null @@ -1,131 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-enterprise - 3.6.3 - - - cloud-modules-enterprise-common - - - 17 - 17 - UTF-8 - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - com.muyu - cloud-common-xxl - - - - com.muyu - cloud-common-rabbit - - - - com.muyu - cloud-common-core - 3.6.3 - - - - - - com.squareup.okhttp3 - okhttp - 4.9.3 - - - com.thoughtworks.xstream - xstream - 1.4.20 - - - org.projectlombok - lombok - 1.18.34 - - - org.springframework.boot - spring-boot-starter - 3.3.2 - - - org.springframework.boot - spring-boot-starter-web - 3.3.2 - - - - org.dom4j - dom4j - 2.1.3 - - - com.alibaba.fastjson2 - fastjson2 - 2.0.43 - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java deleted file mode 100644 index 2b09b2e..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCar.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.muyu.enterprise.domain; - -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 SysCar - * @Description 描述 - * @Author Chen - * @Date 2024/9/29 16:31 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Tag(name = "sys_car") -public class SysCar { - - private Long id; - private String carVin; - private String carPlate; - private String carBrand; - private String carModel; - private String carType; - private Date carLastJoinTime; - private String carLastOfflineTime; - private String state; - private String createBy; - private String createTime; - private String updateBy; - private String updateTime; - private String remark; -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarMessage.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarMessage.java deleted file mode 100644 index 87e8af3..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCarMessage.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.muyu.enterprise.domain; - -import com.baomidou.mybatisplus.annotation.TableName; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; -import lombok.experimental.SuperBuilder; - -/** - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-20-15:35 - * @ Version：1.0 - * @ Description：报文 - * @author Lenovo - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@SuperBuilder -@TableName("sys_car_message") -public class SysCarMessage { - /** - * id - */ - private Integer id; - /** - * 车辆型号编码 - */ - private String modelCode; - /** - * 车辆报文类型编码 - */ - private String messageTypeCode; - /** - * 开始位下标 - */ - private String messageStartIndex; - /** - * 结束位下标 - */ - private String messageEndIndex; - /** - * - */ - private String messageType; -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysMessageType.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysMessageType.java deleted file mode 100644 index 4f34f9d..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysMessageType.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.enterprise.domain; - -import io.swagger.v3.oas.annotations.tags.Tag; -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @ClassName SysMessageType - * @Description 描述 - * @Author Chen - * @Date 2024/9/29 16:40 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@Tag(name = "sys_message_type") -public class SysMessageType { - private String id; - private String messageCode; - private String messageName; - private String messageType; - private String messageClass; -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/resp/SysMessageResp.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/resp/SysMessageResp.java deleted file mode 100644 index bfd00d6..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/resp/SysMessageResp.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.enterprise.resp; - -import lombok.*; - -/** - * 车辆报文类型对象 sys_message_type - * - * @author muyu - * @date 2024-09-18 - */ - -@Data -public class SysMessageResp { - private static final long serialVersionUID = 1L; - private Long id; - private String modelCode; - private String messageTypeCode; - private String messageStartIndex; - private String messageEndIndex; - private String messageType; - private String messageName; -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/AccessToken.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/AccessToken.java deleted file mode 100644 index 9989dc3..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/AccessToken.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.enterprise.wx; - -import lombok.Data; - -/** - * @author 24415 - */ -@Data -public class AccessToken { - - - private String access_token; - - private Long expires_in; - - public void setExpiresTime(Long expiresIn) { - this.expires_in = System.currentTimeMillis() + expiresIn * 1000; - } - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/Message.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/Message.java deleted file mode 100644 index 70d60a1..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/wx/Message.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.muyu.enterprise.wx; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import lombok.Data; - -/** - * @Author： Chen - * @name：Message - */ -@Data -@XStreamAlias("xml") -public class Message { - @XStreamAlias("ToUserName") - private String toUserName; - - @XStreamAlias("FromUserName") - private String fromUserName; - - @XStreamAlias("CreateTime") - private Long createTime; - - @XStreamAlias("MsgType") - private String msgType; - - @XStreamAlias("Content") - private String content; -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml deleted file mode 100644 index 799d475..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/pom.xml +++ /dev/null @@ -1,107 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-enterprise - 3.6.3 - - - cloud-modules-enterprise-server - - - 17 - 17 - UTF-8 - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - com.muyu - cloud-common-xxl - - - - com.muyu - cloud-common-rabbit - - - - org.bouncycastle - bcpkix-jdk15on - 1.70 - - - com.muyu - cloud-modules-enterprise-common - 3.6.3 - - - - - org.dom4j - dom4j - 2.1.3 - - - com.alibaba.fastjson2 - fastjson2 - 2.0.43 - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/EnterpriseApplication.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/EnterpriseApplication.java deleted file mode 100644 index 755d4dc..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/EnterpriseApplication.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.muyu.enterprise; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @ClassName EnterpriseApplication - * @Description 描述 - * @Author Chen - * @Date 2024/9/29 16:08 - */ -@EnableCustomConfig -//@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class EnterpriseApplication { -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java deleted file mode 100644 index ffa0ea5..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarMessageController.java +++ /dev/null @@ -1,148 +0,0 @@ -package com.muyu.enterprise.controller; - -import com.alibaba.fastjson2.JSONObject; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.enterprise.domain.SysCarMessage; -import com.muyu.enterprise.resp.SysMessageResp; -import com.muyu.enterprise.service.ISysCarMessageService; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.servlet.http.HttpSession; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; - -/** - * 车辆报文记录Controller - * - * @author muyu - * @date 2024-09-18 - */ -@Slf4j -@RestController -@RequestMapping("/messageInfo") -public class SysCarMessageController extends BaseController { - @Resource - private ISysCarMessageService sysCarMessageService; - @Autowired - private HttpSession session; - static String TEST = "56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56"; - - - /** - * 查询车辆报文记录列表 - */ -// @RequiresPermissions("message:message:list") - @Transactional - @GetMapping("/list") - public Result> list(SysCarMessage sysCarMessage) throws ExecutionException, InterruptedException { - List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); - if (list == null || list.isEmpty()) { - return Result.error(); //为空返回错误信息 - } - String[] test = TEST.split(" "); - String[] results = new String[list.size()]; - List> futures = new ArrayList<>(); - - for (SysCarMessage carMessage : list) { - futures.add(CompletableFuture.supplyAsync(() -> { - int start = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; - int end = Integer.parseInt(carMessage.getMessageEndIndex()); - StringBuilder hexBuilder = new StringBuilder(); - for (int i = start; i < end; i++) { - hexBuilder.append(test[i]); - } - String hex = hexBuilder.toString(); - char[] result = new char[hex.length() / 2]; - for (int x = 0; x < hex.length(); x += 2) { - int high = Character.digit(hex.charAt(x), 16); - int low = Character.digit(hex.charAt(x + 1), 16); - result[x / 2] = (char) ((high << 4) + low); - } - return new String(result); - })); - } - for (int i = 0; i < futures.size(); i++) { - results[i] = futures.get(i).get(); - } - String jsonString = JSONObject.toJSONString(results); - - log.info("消息发送成功：{}", jsonString); - return Result.success(list); - } - - @RequiresPermissions("message:message:dobList") - @GetMapping("/dobList") - public Result> dobList(SysMessageResp sysMessageResp) { - List list = sysCarMessageService.dobList(sysMessageResp); - return Result.success(list); - } - - - /** - * 导出车辆报文记录列表 - */ - @RequiresPermissions("message:message:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysCarMessage sysCarMessage) { - List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); - ExcelUtil util = new ExcelUtil(SysCarMessage.class); - util.exportExcel(response, list, "车辆报文记录数据"); - } - - /** - * 获取车辆报文记录详细信息 - */ - @RequiresPermissions("message:message:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) { - return success(sysCarMessageService.selectSysCarMessageById(id)); - } - - /** - * 新增车辆报文记录 - */ - @RequiresPermissions("message:message:add") - @PostMapping - public Result add( - @Validated @RequestBody SysCarMessage sysCarMessage) { - if (sysCarMessageService.checkIdUnique(sysCarMessage)) { - return error("新增 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录已存在"); - } - return toAjax(sysCarMessageService.save(sysCarMessage)); - } - - /** - * 修改车辆报文记录 - */ - @RequiresPermissions("message:message:edit") - @PutMapping - public Result edit( - @Validated @RequestBody SysCarMessage sysCarMessage) { - if (!sysCarMessageService.checkIdUnique(sysCarMessage)) { - return error("修改 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录不存在"); - } - return toAjax(sysCarMessageService.updateById(sysCarMessage)); - } - - /** - * 删除车辆报文记录 - */ - @RequiresPermissions("message:message:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) { - sysCarMessageService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java deleted file mode 100644 index 4854a8b..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMapper.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.enterprise.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.enterprise.domain.SysCar; - - -/** - * 车辆基础信息Mapper接口 - * - * @author muyu - * @date 2024-09-17 - */ -public interface SysCarMapper extends BaseMapper{ - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java deleted file mode 100644 index 4f8b51a..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCarMessageMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.enterprise.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.enterprise.domain.SysCarMessage; -import com.muyu.enterprise.resp.SysMessageResp; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 车辆报文记录Mapper接口 - * - * @author muyu - * @date 2024-09-18 - */ -@Mapper -public interface SysCarMessageMapper extends BaseMapper{ - ListdobList(SysMessageResp sysMessageResp); -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysMessageTypeMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysMessageTypeMapper.java deleted file mode 100644 index 12a9dff..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysMessageTypeMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.enterprise.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.enterprise.domain.SysMessageType; -import org.apache.ibatis.annotations.Mapper; - -/** - * 车辆报文类型Mapper接口 - * - * @author muyu - * @date 2024-09-18 - */ -@Mapper -public interface SysMessageTypeMapper extends BaseMapper { - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java deleted file mode 100644 index 88ddc3f..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnLogsMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.enterprise.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.enterprise.domain.WarnLogs; -import org.apache.ibatis.annotations.Mapper; - -/** - * 预警日志Mapper接口 - * - * @author muyu - * @date 2024-09-20 - */ -@Mapper -public interface WarnLogsMapper extends BaseMapper{ - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java deleted file mode 100644 index 2606073..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnStrategyMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.muyu.enterprise.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.enterprise.domain.WarnStrategy; -import org.apache.ibatis.annotations.Mapper; - -/** - * 预警策略Mapper接口 - * - * @author muyu - * @date 2024-09-20 - */ -@Mapper -public interface WarnStrategyMapper extends BaseMapper{ - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarMessageService.java deleted file mode 100644 index f9e981e..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarMessageService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.enterprise.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.SysCarMessage; -import com.muyu.enterprise.resp.SysMessageResp; - - -import java.util.List; - -/** - * 车辆报文记录Service接口 - * - * @author muyu - * @date 2024-09-18 - */ -public interface ISysCarMessageService extends IService { - - ListdobList(SysMessageResp sysMessageResp); - /** - * 精确查询车辆报文记录 - * - * @param id 车辆报文记录主键 - * @return 车辆报文记录 - */ - public SysCarMessage selectSysCarMessageById(Long id); - - /** - * 查询车辆报文记录列表 - * - * @param sysCarMessage 车辆报文记录 - * @return 车辆报文记录集合 - */ - public List selectSysCarMessageList(SysCarMessage sysCarMessage); - - /** - * 判断 车辆报文记录 id是否唯一 - * @param sysCarMessage 车辆报文记录 - * @return 结果 - */ - Boolean checkIdUnique(SysCarMessage sysCarMessage); - -// Boolean checkById(SysCarMessage sysCarMessage); - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysMessageTypeService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysMessageTypeService.java deleted file mode 100644 index 67d339c..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysMessageTypeService.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.muyu.enterprise.service; - - - - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.SysMessageType; - -import java.util.List; - -/** - * 车辆报文类型Service接口 - * - * @author muyu - * @date 2024-09-18 - */ -public interface ISysMessageTypeService extends IService { - /** - * 精确查询车辆报文类型 - * - * @param messageCode 车辆报文类型主键 - * @return 车辆报文类型 - */ - public SysMessageType selectSysMessageTypeByMessageCode(String messageCode); - - /** - * 查询车辆报文类型列表 - * - * @param sysMessageType 车辆报文类型 - * @return 车辆报文类型集合 - */ - public List selectSysMessageTypeList(SysMessageType sysMessageType); - - /** - * 判断 车辆报文类型 id是否唯一 - * @param sysMessageType 车辆报文类型 - * @return 结果 - */ - Boolean checkIdUnique(SysMessageType sysMessageType); - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java deleted file mode 100644 index a41b4ef..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/SysCarMessageService.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.muyu.enterprise.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.SysCarMessage; - -/** - * @author Lenovo - * @ Tool：IntelliJ IDEA - * @ Author：CHX - * @ Date：2024-09-20-15:42 - * @ Version：1.0 - * @ Description： - */ -public interface SysCarMessageService extends IService { -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java deleted file mode 100644 index 15bd720..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnRuleServiceImpl.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.muyu.enterprise.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.enterprise.domain.WarnRule; -import com.muyu.enterprise.mapper.WarnRuleMapper; -import com.muyu.enterprise.service.IWarnRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.List; - -/** - * 预警规则Service业务层处理 - * - * @author muyu - * @date 2024-09-20 - */ -@Service -public class WarnRuleServiceImpl - extends ServiceImpl - implements IWarnRuleService { - @Autowired - private WarnRuleMapper warnRuleMapper; - - /** - * 精确查询预警规则 - * - * @param id 预警规则主键 - * @return 预警规则 - */ - @Override - public WarnRule selectWarnRuleById(Long id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(WarnRule::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询预警规则列表 - * - * @param warnRule 预警规则 - * @return 预警规则 - */ - @Override - public List selectWarnRuleList(WarnRule warnRule) { - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(warnRule.getRuleName())) { - queryWrapper.like(WarnRule::getRuleName, warnRule.getRuleName()); - } - if (StringUtils.isNotNull(warnRule.getMsgTypeId())) { - queryWrapper.eq(WarnRule::getMsgTypeId, warnRule.getMsgTypeId()); - } - if (StringUtils.isNotNull(warnRule.getSlideTime())) { - queryWrapper.eq(WarnRule::getSlideTime, warnRule.getSlideTime()); - } - if (StringUtils.isNotNull(warnRule.getSlideFrequency())) { - queryWrapper.eq(WarnRule::getSlideFrequency, warnRule.getSlideFrequency()); - } - if (StringUtils.isNotNull(warnRule.getMaxValue())) { - queryWrapper.eq(WarnRule::getMaxValue, warnRule.getMaxValue()); - } - if (StringUtils.isNotNull(warnRule.getMinValue())) { - queryWrapper.eq(WarnRule::getMinValue, warnRule.getMinValue()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * - * @param warnRule 预警规则 - * @return 预警规则 - */ - @Override - public Boolean checkIdUnique(WarnRule warnRule) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WarnRule::getId, warnRule.getId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/TokenUtil.java b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/TokenUtil.java deleted file mode 100644 index 899056b..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/TokenUtil.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.enterprise.util; - -import com.alibaba.fastjson2.JSON; - -import com.muyu.enterprise.wx.AccessToken; -import org.springframework.stereotype.Component; - -/** - * @Author： Chen //redisService.setCacheObject("WECHAT_TOKEN",wechatToken.getAccessToken(),wechatToken.getExpiresIn(), TimeUnit.SECONDS); - * @name：TokenUtil - */ -@Component -public class TokenUtil { - private final static String APP_ID = "wx591e88abd208c297"; - - private final static String APP_SECRET = "64d92a751ef24acc8d37b2e6d7672491"; - - private static AccessToken accessToken = new AccessToken(); - - - public static void getToken() { - String url = String.format("https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=%s&secret=%s", APP_ID, APP_SECRET); - String request = OkHttpUtils.sendGetRequest(url); - AccessToken wechatToken = JSON.parseObject(request, AccessToken.class); - if (wechatToken != null) { - accessToken.setExpiresTime(wechatToken.getExpires_in()); - accessToken.setAccess_token(wechatToken.getAccess_token()); - } - } - - public static String getAccessToken() { - getToken(); - return accessToken.getAccess_token(); - } - -} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/banner.txt b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml deleted file mode 100644 index ed94f02..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,48 +0,0 @@ -# Tomcat -server: - port: 10003 - -# nacos线上地址 -nacos: - addr: 47.116.173.119:8848 - user-name: nacos - password: nacos - namespace: one-saas - -# Spring -spring: - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-warn - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # engine配置 - - engine-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml deleted file mode 100644 index 8b99495..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml deleted file mode 100644 index 0fe8654..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml deleted file mode 100644 index 0fe8654..0000000 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml index a36bd1b..5bd4c8b 100644 --- a/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-file/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 49.235.136.60:8848 user-name: nacos password: nacos - namespace: one-saas + namespace: wyh # Spring spring: @@ -23,18 +23,18 @@ spring: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} config: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} # 配置文件格式 diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml index 47acae2..a707f2e 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-gen/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 49.235.136.60:8848 user-name: nacos password: nacos - namespace: one-saas + namespace: wyh # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -29,18 +29,18 @@ spring: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} config: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} # 配置文件格式 diff --git a/cloud-modules/cloud-modules-carmanage/.gitignore b/cloud-modules/cloud-modules-openbusiness/.gitignore similarity index 97% rename from cloud-modules/cloud-modules-carmanage/.gitignore rename to cloud-modules/cloud-modules-openbusiness/.gitignore index af665ab..5ff6309 100644 --- a/cloud-modules/cloud-modules-carmanage/.gitignore +++ b/cloud-modules/cloud-modules-openbusiness/.gitignore @@ -35,4 +35,4 @@ build/ .vscode/ ### Mac OS ### -.DS_Store +.DS_Store \ No newline at end of file diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/.gitignore b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-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-warn/cloud-warn-server/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/pom.xml similarity index 71% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/pom.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/pom.xml index efd1973..3e0e540 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/pom.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/pom.xml @@ -5,28 +5,30 @@ 4.0.0 com.muyu - cloud-modules-warn + cloud-modules-openbusiness 3.6.3 - cloud-warn-server + cloud-modules-openbusiness-common 17 17 UTF-8 + com.muyu - cloud-warn-common - 3.6.3 + cloud-common-core + - com.github.yulichang - mybatis-plus-join-boot-starter - 1.4.11 + dom4j + dom4j + 1.6.1 + com.squareup.okhttp3 okhttp @@ -52,17 +54,5 @@ spring-boot-starter-web 3.3.2 - - - org.dom4j - dom4j - 2.1.3 - - - com.alibaba.fastjson2 - fastjson2 - 2.0.43 - - diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/DTO/MessageDTO.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/DTO/MessageDTO.java new file mode 100644 index 0000000..3151d95 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/DTO/MessageDTO.java @@ -0,0 +1,93 @@ +package com.muyu.openbusiness.DTO;//package com.muyu.breakdown.DTO; +// +// +//import com.muyu.openbusiness.domain.Messages; +//import org.springframework.beans.factory.annotation.Autowired; +//import org.springframework.stereotype.Component; +// +//import java.sql.*; +//import java.util.*; +// +///** +// * @ Tool：IntelliJ IDEA +// * @ Author：CHX +// * @ Date：2024-09-18-15:00 +// * @ Version：1.0 +// * @ Description：数据库连接层 +// * @author Lenovo +// */ +//@Component +//public class MessageDTO { +// private static final String DB_URL = "jdbc:mysql://106.54.193.225:3306/one"; +// private static final String USER = "root"; +// private static final String PASSWORD = "bawei2112A"; +// +// // 2. 建立数据库连接 +// Connection connection; +// // 构造函数，初始化数据库连接 +// // 保存消息到数据库 +// public void saveMessage(Messages message) { +// String sql = "INSERT INTO sys_messages (sender_id, receiver_id, content) VALUES (?, ?, ?)"; +// try { +// Class.forName("com.mysql.cj.jdbc.Driver"); +// } catch (ClassNotFoundException e) { +// throw new RuntimeException(e); +// } +// try { +// connection = DriverManager.getConnection(DB_URL, USER, PASSWORD); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } +// try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { +// preparedStatement.setInt(1, message.getSenderId()); +// preparedStatement.setInt(2, message.getReceiverId()); +// preparedStatement.setString(3, message.getContent()); +// // 执行添加操作 +// preparedStatement.executeUpdate(); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } +// try { +// connection.close(); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } +// } +// +// // 获取所有消息 +// public List getAllMessages(int receiverId){ +// String sql = "SELECT * FROM sys_messages WHERE receiver_id = ?"; +// try { +// Class.forName("com.mysql.cj.jdbc.Driver"); +// } catch (ClassNotFoundException e) { +// throw new RuntimeException(e); +// } +// List messages = new ArrayList<>(); +// try { +// connection = DriverManager.getConnection(DB_URL, USER, PASSWORD); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } +// try (PreparedStatement preparedStatement = connection.prepareStatement(sql)) { +// preparedStatement.setInt(1, receiverId); +// // 执行查询操作 +// ResultSet rs = preparedStatement.executeQuery(); +// while (rs.next()) { +// Messages message = new Messages(rs.getInt("sender_id"), receiverId, rs.getString("content")); +// +// // 添加到消息列表 +// messages.add(message); +// } +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } +// try { +// connection.close(); +// } catch (SQLException e) { +// throw new RuntimeException(e); +// } +// // 返回消息列表 +// return messages; +// } +// +//} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/BreakDown.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/BreakDown.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/BreakDown.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/BreakDown.java index 4a803fe..336f7f7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/BreakDown.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/BreakDown.java @@ -1,4 +1,5 @@ -package com.muyu.enterprise.domain; + +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/FaultLog.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/FaultLog.java index b3e2ac6..6618e53 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/FaultLog.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/FaultLog.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/MessageMap.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/MessageMap.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/MessageMap.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/MessageMap.java index 265e473..55bb011 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/MessageMap.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/MessageMap.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Messages.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/Messages.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Messages.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/Messages.java index d3f813b..d524fd0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/Messages.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/Messages.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCar.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java similarity index 98% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCar.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java index d7d7efd..c6152d6 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCar.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCar.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.openbusiness.domain; import java.util.Date; import com.fasterxml.jackson.annotation.JsonFormat; diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCarMessage.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java similarity index 97% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCarMessage.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java index 78f0b19..7728066 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysCarMessage.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCarMessage.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.openbusiness.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCorpuscle.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCorpuscle.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCorpuscle.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCorpuscle.java index e00a4d2..524ff71 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysCorpuscle.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysCorpuscle.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysFence.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFence.java similarity index 98% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysFence.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFence.java index 3a76ce9..3ca12bc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/SysFence.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFence.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFenceRail.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFenceRail.java new file mode 100644 index 0000000..4eddb74 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysFenceRail.java @@ -0,0 +1,38 @@ +package com.muyu.openbusiness.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 lombok.*; +import lombok.experimental.SuperBuilder; + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@TableName("sys_corpuscle_fence") +public class SysFenceRail { +private static final long seriaversionUID =1L; +/** 自增主键 */ +@TableId(type = IdType.AUTO) + private Long id; + +/** 围栏编码 */ +@Excel(name="围栏编码") + private String fenceCode; + /**围栏名称**/ + @Excel(name = "围栏名称") + private String fenceName; + + /**围栏类型**/ + @Excel(name = "围栏类型") + private Long fenceType; + + + + + +} diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysMessageType.java similarity index 97% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysMessageType.java index 813f095..20c7303 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/SysMessageType.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/SysMessageType.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.openbusiness.domain; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.web.domain.BaseEntity; diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VehicleMessage.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/VehicleMessage.java similarity index 99% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VehicleMessage.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/VehicleMessage.java index 09b6401..f7bf4e6 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/domain/VehicleMessage.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/VehicleMessage.java @@ -1,4 +1,4 @@ -package com.muyu.car.domain; +package com.muyu.openbusiness.domain; import com.muyu.common.core.web.domain.BaseEntity; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnLogs.java similarity index 98% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnLogs.java index 3b0163d..7aac49a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnLogs.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnLogs.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRule.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRule.java index f345225..90935ee 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnRule.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRule.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRuleDTO.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRuleDTO.java new file mode 100644 index 0000000..ab1ade1 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnRuleDTO.java @@ -0,0 +1,63 @@ +package com.muyu.openbusiness.domain; + +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; + +/** + * @ClassName WarnRule + * @Description 描述 + * @Author Chen + * @Date 2024/9/22 11:53 + */ +@Data +@AllArgsConstructor +@NoArgsConstructor +public class WarnRuleDTO { + /** 规则id */ + @TableId( type = IdType.AUTO) + private Long id; + + /** 规则名称 */ + @Excel(name = "规则名称") + private String ruleName; + + /** 策略id */ + @Excel(name = "策略id") + private Long strategyId; + + /** 报文数据类型id */ + @Excel(name = "报文数据类型id") + private Long msgTypeId; + + /** 滑窗时间 */ + @Excel(name = "滑窗时间") + private Long slideTime; + + /** 滑窗频率 */ + @Excel(name = "滑窗频率") + private Long slideFrequency; + + /** 最大值 */ + @Excel(name = "最大值") + private Long maxValue; + + /** 最小值 */ + @Excel(name = "最小值") + private Long minValue; + + /** 车辆类型id */ + @Excel(name = "车辆类型id") + private Long carTypeId; + + /** 策略名称 */ + @Excel(name = "策略名称") + private String strategyName; + + /** 报文模版id */ + @Excel(name = "报文模版id") + private Long msgId; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnStrategy.java similarity index 97% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnStrategy.java index ff2a87a..cb242b0 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-common/src/main/java/com/muyu/enterprise/domain/WarnStrategy.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/domain/WarnStrategy.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.domain; +package com.muyu.openbusiness.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/AccessToken.java similarity index 89% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/AccessToken.java index f844623..2b142d4 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/AccessToken.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/AccessToken.java @@ -1,4 +1,4 @@ -package com.muyu.warning.wx; +package com.muyu.openbusiness.wx; import lombok.Data; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/Message.java similarity index 93% rename from cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/Message.java index f17130a..34e8035 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/wx/Message.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-common/src/main/java/com/muyu/openbusiness/wx/Message.java @@ -1,4 +1,5 @@ -package com.muyu.warning.wx; +package com.muyu.openbusiness.wx; + import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.Data; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.gitignore b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.gitignore new file mode 100644 index 0000000..5ff6309 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/.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-parsing/pom.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml similarity index 80% rename from cloud-modules/cloud-modules-parsing/pom.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml index 7f2fd25..fe556ac 100644 --- a/cloud-modules/cloud-modules-parsing/pom.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/pom.xml @@ -5,19 +5,18 @@ 4.0.0 com.muyu - cloud-modules + cloud-modules-openbusiness 3.6.3 - cloud-modules-parsing - - cloud-modules-parsing 协议解析模块 - + cloud-modules-openbusiness-server + 17 17 UTF-8 + @@ -89,17 +88,34 @@ bcpkix-jdk15on 1.70 - com.muyu - cloud-common-kafka + cloud-modules-carmanage + 3.6.3 + compile - - org.eclipse.paho - org.eclipse.paho.client.mqttv3 - 1.2.2 + com.muyu + cloud-modules-openbusiness-common + 3.6.3 + compile + + + com.muyu + cloud-common-saas + + + + com.muyu + cloud-common-system + + + + org.springframework.cloud + spring-cloud-starter-openfeign + + @@ -118,4 +134,5 @@ + diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java similarity index 75% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java index 95d43df..c5d8137 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/CloudSystemSaasApplication.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/CloudOpenBusinessApplication.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas; +package com.muyu.openbusiness; import com.alibaba.druid.spring.boot3.autoconfigure.DruidDataSourceAutoConfigure; import com.baomidou.dynamic.datasource.spring.boot.autoconfigure.DynamicDataSourceAutoConfiguration; @@ -7,14 +7,14 @@ import com.muyu.common.security.annotation.EnableMyFeignClients; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; +import org.springframework.cloud.openfeign.EnableFeignClients; /** - * @Author: 胡杨 - * @Name: CloudSystemSaas - * @Description: SaaS系统驱动器 - * @CreatedDate: 2024/9/22 上午10:05 - * @FilePath: com.muyu.system.saas + * 系统模块 + * + * @author muyu */ +//@EnableFeignClients @EnableCustomConfig @EnableMyFeignClients @SpringBootApplication( @@ -24,9 +24,9 @@ import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration; DynamicDataSourceAutoConfiguration.class } ) -public class CloudSystemSaasApplication { +public class CloudOpenBusinessApplication { public static void main(String[] args) { - SpringApplication.run(CloudSystemSaasApplication.class, args); + SpringApplication.run(CloudOpenBusinessApplication.class, args); System.out.println("CloudSystemSaas 模块启动成功!"); } } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/MybatisPlusConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/MybatisPlusConfig.java new file mode 100644 index 0000000..d3e927a --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/MybatisPlusConfig.java @@ -0,0 +1,30 @@ +package com.muyu.openbusiness.config; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-17-15:41 + * @ Version：1.0 + * @ Description：mybatisplus配置类 + * @author Lenovo + */ +//@Configuration +//public class MybatisPlusConfig { +// /** +// * 添加分页插件 +// */ +// @Bean +// public MybatisPlusInterceptor mybatisPlusInterceptor() { +// MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); +// // 如果配置多个插件, 切记分页最后添加 +// interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); +// // 如果有多数据源可以不配具体类型, 否则都建议配上具体的 DbType +// return interceptor; +// } +// @Bean +// public MybatisConfiguration mybatisConfiguration(){ +// MybatisConfiguration configuration = new MybatisConfiguration(); +// return configuration; +// } +// +//} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQConfig.java new file mode 100644 index 0000000..a2519be --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQConfig.java @@ -0,0 +1,56 @@ +package com.muyu.openbusiness.config; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.FanoutExchange; +import org.springframework.amqp.core.Queue; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +/** + * 绑定交换机与队列 + * */ +@Configuration +public class RabbitMQConfig { + + // 1.生命注册fanout模式的交换机 + @Bean + public FanoutExchange fanoutExchange(){ + //1.fanout模式的路由名称 2.是否持久化 3. 是否自动删除 + return new FanoutExchange("fanout",true,false); + } + // 2.生命队列 sms.fanout.queue email.fanout.queue,duanxin.fanout.queue + @Bean + public Queue duanxinQueue(){ + return new Queue("duanxin",true); + } + + + @Bean + public Queue emailQueue(){ + return new Queue("email",false); + } + + @Bean + public Queue smsQueue(){ + return new Queue("sms",false); + } + + // 3.完成绑定关系(队列和交换机完成绑定关系 + @Bean + public Binding duanxinExchange(){ + return BindingBuilder.bind(duanxinQueue()).to(fanoutExchange()); + } + + + @Bean + public Binding emailExchange(){ + return BindingBuilder.bind(emailQueue()).to(fanoutExchange()); + } + + @Bean + public Binding smsExchange(){ + return BindingBuilder.bind(smsQueue()).to(fanoutExchange()); + } + + // 4.生命注册fanout模式的交换机 +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQDirectConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQDirectConfig.java new file mode 100644 index 0000000..d9ae65f --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQDirectConfig.java @@ -0,0 +1,62 @@ +package com.muyu.openbusiness.config; + +import org.springframework.amqp.core.*; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import java.util.HashMap; + +/** + * 绑定交换机与队列 + * */ +@Configuration +public class RabbitMQDirectConfig { + /** + * 与fanout发布订阅模式不同的是 Direct 需要在Binding规定对应的 路由名称 + * */ + // 1.生命注册fanout模式的交换机 + @Bean + public DirectExchange directExchange(){ + //1.fanout模式的路由名称 2.是否持久化 3. 是否自动删除 + return new DirectExchange("direct",true,false); + } + // 2.生命队列 sms.fanout.queue email.fanout.queue,duanxin.fanout.queue + @Bean + public Queue directduanxinQueue(){ + HashMap map = new HashMap<>(); + map.put("x-delayed-letter-exchange","direct"); + map.put("x-delayed-routing-key","directduanxin"); + map.put("x-message-ttl",10000); + return QueueBuilder.durable("directduanxin").withArguments(map).build(); + } + + + @Bean + public Queue directemailQueue(){ + return new Queue("directemail",false); + } + + @Bean + public Queue directsmsQueue(){ + return new Queue("directsms",false); + } + + // 3.完成绑定关系(队列和交换机完成绑定关系 + @Bean + public Binding directduanxinExchange(){ + return BindingBuilder.bind(directduanxinQueue()).to(directExchange()).with("directduanxin"); + } + + + @Bean + public Binding directemailExchange(){ + return BindingBuilder.bind(directemailQueue()).to(directExchange()).with("directemail"); + } + + @Bean + public Binding directsmsExchange(){ + return BindingBuilder.bind(directsmsQueue()).to(directExchange()).with("directsms"); + } + + // 4.生命注册fanout模式的交换机 +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQTopicConfig.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQTopicConfig.java new file mode 100644 index 0000000..95f79e9 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/config/RabbitMQTopicConfig.java @@ -0,0 +1,59 @@ +package com.muyu.openbusiness.config; + +import org.springframework.amqp.core.Binding; +import org.springframework.amqp.core.BindingBuilder; +import org.springframework.amqp.core.Queue; +import org.springframework.amqp.core.TopicExchange; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +/** + * 绑定交换机与队列 + * */ +@Configuration +public class RabbitMQTopicConfig { + /** + * 与fanout发布订阅模式不同的是 Direct 需要在Binding规定对应的 路由名称 + * */ + // 1.生命注册fanout模式的交换机 + @Bean + public TopicExchange topicExchange(){ + //1.fanout模式的路由名称 2.是否持久化 3. 是否自动删除 + return new TopicExchange("topic",true,false); + } + // 2.生命队列 sms.fanout.queue email.fanout.queue,duanxin.fanout.queue + @Bean + public Queue topicduanxinQueue(){ + return new Queue("topicduanxin.test.one",true); + } + + + @Bean + public Queue topicemailQueue(){ + return new Queue("topicemail.test.two",false); + } + + @Bean + public Queue topicsmsQueue(){ + return new Queue("topicsms.test.three",false); + } + + // 3.完成绑定关系(队列和交换机完成绑定关系 + @Bean + public Binding topicduanxinExchange(){ + return BindingBuilder.bind(topicduanxinQueue()).to(topicExchange()).with("topic.#"); + } + + + @Bean + public Binding topicemailExchange(){ + return BindingBuilder.bind(topicemailQueue()).to(topicExchange()).with("topic.*"); + } + + @Bean + public Binding topicsmsExchange(){ + return BindingBuilder.bind(topicsmsQueue()).to(topicExchange()).with("topic.test.#"); + } + + // 4.生命注册fanout模式的交换机 +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/constant/RedisConstant.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/constant/RedisConstant.java new file mode 100644 index 0000000..6d1a167 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/constant/RedisConstant.java @@ -0,0 +1,10 @@ +package com.muyu.openbusiness.constant; + +public class RedisConstant { + + public static final String MESSAGE_DETAIL = "messageDetail"; + + public static final String VEHICLE_ENTERPRISE = "vehicleEnterprise"; + + public static final String INDEX_WARNING = "indexWarning"; +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/BreakDownController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/BreakDownController.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/BreakDownController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/BreakDownController.java index 8db01e0..4309399 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/BreakDownController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/BreakDownController.java @@ -1,14 +1,15 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; + +import com.muyu.openbusiness.domain.BreakDown; +import com.muyu.openbusiness.domain.MessageMap; +import com.muyu.openbusiness.service.BreakDownService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.enterprise.domain.BreakDown; -import com.muyu.enterprise.domain.MessageMap; -import com.muyu.enterprise.service.BreakDownService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/FaultLogController.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/FaultLogController.java index 27e8a00..4c7b7ea 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/FaultLogController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/FaultLogController.java @@ -1,13 +1,14 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; + +import com.muyu.openbusiness.domain.FaultLog; +import com.muyu.openbusiness.service.IFaultLogService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; -import com.muyu.enterprise.domain.FaultLog; -import com.muyu.enterprise.service.IFaultLogService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/StationMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/StationMessageController.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/StationMessageController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/StationMessageController.java index 9ac6713..5698517 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/StationMessageController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/StationMessageController.java @@ -1,10 +1,10 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.muyu.openbusiness.domain.Messages; +import com.muyu.openbusiness.service.StationMessageService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.enterprise.domain.Messages; -import com.muyu.enterprise.service.StationMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java index e206d28..bcc2ae2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCarController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarController.java @@ -1,13 +1,12 @@ -package com.muyu.enterprise.controller; - +package com.muyu.openbusiness.controller; +import com.muyu.openbusiness.domain.SysCar; +import com.muyu.openbusiness.service.ISysCarService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.enterprise.domain.SysCar; -import com.muyu.enterprise.service.ISysCarService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java similarity index 70% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarMessageController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java index a61e4ef..e796a4a 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/controller/SysCarMessageController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCarMessageController.java @@ -1,19 +1,16 @@ -package com.muyu.car.controller; +package com.muyu.openbusiness.controller; -import com.alibaba.fastjson2.JSONObject; -import com.muyu.car.domain.SysCarMessage; -import com.muyu.car.domain.resp.SysMessageResp; -import com.muyu.car.service.ISysCarMessageService; +import com.muyu.common.system.domain.SysUser; +import com.muyu.openbusiness.domain.SysCarMessage; + +import com.muyu.openbusiness.service.ISysCarMessageService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; - import com.muyu.common.security.annotation.RequiresPermissions; import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpSession; -import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -30,73 +27,86 @@ import java.util.concurrent.ExecutionException; * @author muyu * @date 2024-09-18 */ -@Slf4j @RestController @RequestMapping("/messageInfo") -public class SysCarMessageController extends BaseController { +public class SysCarMessageController extends BaseController +{ @Resource private ISysCarMessageService sysCarMessageService; +// @Autowired +// private SystemFeign feign; @Autowired private HttpSession session; - static String TEST = "56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56"; + static String TEST = "7E 56 45 48 49 43 4C 45 5F 4D 53 47 3A 56 49 4E 31 32 B6 A1 C0 F2 B3 E5 D9 A8 C1 B2 E3 F4 A6 D7 C9 F1 E0 A3 B5 C8 D4 E2 A1 F5 B6 C7 E8 D9 A0 E3 B2 C4 F5 D6 A8 C0 E1 F2 B7 D8 A4 E3 C2 B1 A5 D9 F6 C8 E7 A0 B2 C3 D1 F4 E5 A9 3F 2A 7B D9 1E C8 4D A3 6F 5B 9A 0C 3E 7D F2 8B 46 1A 5E 9F 2D 73 8C 4A B1 6C 5D E2 7E C4 39 0B AD 7C 1F 0E 3C 68 92 B4 5A 7F 6E 81 0D 4B A5 E3 F9 2E 8A 37 6D 14 5C 73 8E D2 04 9B 3A 6C F1 70 BF 29 5F 8C 43 61 24 5D 7A 9C 0A D5 1B 3D 6E F4 78 3E 5B"; - /** - * 查询车辆报文记录列表 - */ -// @RequiresPermissions("message:message:list") - @Transactional - @GetMapping("/list") - public Result> list(SysCarMessage sysCarMessage) throws ExecutionException, InterruptedException { - List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); + @RequiresPermissions("message:message:test") + @GetMapping("/test") + public Result test() throws InterruptedException, ExecutionException { + List list = (List) session.getAttribute("list"); + + // 检查 list 是否为空 if (list == null || list.isEmpty()) { - return Result.error(); //为空返回错误信息 + return Result.success(new String[0]); // 或者返回一个适当的错误消息 } + String[] test = TEST.split(" "); String[] results = new String[list.size()]; + List> futures = new ArrayList<>(); for (SysCarMessage carMessage : list) { futures.add(CompletableFuture.supplyAsync(() -> { - int start = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; - int end = Integer.parseInt(carMessage.getMessageEndIndex()); + int startIndex = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; + int endIndex = Integer.parseInt(carMessage.getMessageEndIndex()); StringBuilder hexBuilder = new StringBuilder(); - for (int i = start; i < end; i++) { - hexBuilder.append(test[i]); + + for (int j = startIndex; j < endIndex; j++) { + hexBuilder.append(test[j]); } + String hex = hexBuilder.toString(); char[] result = new char[hex.length() / 2]; + for (int x = 0; x < hex.length(); x += 2) { int high = Character.digit(hex.charAt(x), 16); int low = Character.digit(hex.charAt(x + 1), 16); result[x / 2] = (char) ((high << 4) + low); } + return new String(result); })); } + for (int i = 0; i < futures.size(); i++) { results[i] = futures.get(i).get(); } - String jsonString = JSONObject.toJSONString(results); - log.info("消息发送成功：{}", jsonString); - return Result.success(list); + return Result.success(results); } - @RequiresPermissions("message:message:dobList") - @GetMapping("/dobList") - public Result> dobList(SysMessageResp sysMessageResp) { - List list = sysCarMessageService.dobList(sysMessageResp); + + /** + * 查询车辆报文记录列表 + */ + @RequiresPermissions("message:message:list") + @GetMapping("/list") + public Result> list(SysCarMessage sysCarMessage) + { +// Result info = feign.getInfo(); +// SysUser sysUser = (SysUser) info.getData(); + List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); + session.setAttribute("list", list); return Result.success(list); } - /** * 导出车辆报文记录列表 */ @RequiresPermissions("message:message:export") @PostMapping("/export") - public void export(HttpServletResponse response, SysCarMessage sysCarMessage) { + public void export(HttpServletResponse response, SysCarMessage sysCarMessage) + { List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); ExcelUtil util = new ExcelUtil(SysCarMessage.class); util.exportExcel(response, list, "车辆报文记录数据"); @@ -107,7 +117,8 @@ public class SysCarMessageController extends BaseController { */ @RequiresPermissions("message:message:query") @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) { + public Result> getInfo(@PathVariable("id") Long id) + { return success(sysCarMessageService.selectSysCarMessageById(id)); } @@ -117,7 +128,9 @@ public class SysCarMessageController extends BaseController { @RequiresPermissions("message:message:add") @PostMapping public Result add( - @Validated @RequestBody SysCarMessage sysCarMessage) { + @Validated @RequestBody SysCarMessage sysCarMessage) + { + if (sysCarMessageService.checkIdUnique(sysCarMessage)) { return error("新增 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录已存在"); } @@ -130,7 +143,8 @@ public class SysCarMessageController extends BaseController { @RequiresPermissions("message:message:edit") @PutMapping public Result edit( - @Validated @RequestBody SysCarMessage sysCarMessage) { + @Validated @RequestBody SysCarMessage sysCarMessage) + { if (!sysCarMessageService.checkIdUnique(sysCarMessage)) { return error("修改 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录不存在"); } @@ -142,7 +156,8 @@ public class SysCarMessageController extends BaseController { */ @RequiresPermissions("message:message:remove") @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) { + public Result remove(@PathVariable("ids") Long[] ids) + { sysCarMessageService.removeBatchByIds(Arrays.asList(ids)); return success(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCorpuscleController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java similarity index 81% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCorpuscleController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java index 7b2563f..ec51f82 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysCorpuscleController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysCorpuscleController.java @@ -1,12 +1,11 @@ -package com.muyu.enterprise.controller; - +package com.muyu.openbusiness.controller; +import com.muyu.openbusiness.domain.SysCorpuscle; +import com.muyu.openbusiness.service.ISysCorpuscleService; 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.enterprise.domain.SysCorpuscle; -import com.muyu.enterprise.service.ISysCorpuscleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -22,8 +21,7 @@ import java.util.List; */ @RestController @RequestMapping("/carRail") -public class SysCorpuscleController extends BaseController -{ +public class SysCorpuscleController extends BaseController { @Autowired private ISysCorpuscleService sysCorpuscleService; @@ -32,8 +30,7 @@ public class SysCorpuscleController extends BaseController */ @RequiresPermissions("carRail:carRail:list") @GetMapping("/list") - public Result> list(SysCorpuscle sysCorpuscle) - { + public Result> list(SysCorpuscle sysCorpuscle) { startPage(); List list = sysCorpuscleService.selectSysCorpuscleList(sysCorpuscle); return getDataTable(list); @@ -42,8 +39,7 @@ public class SysCorpuscleController extends BaseController @RequiresPermissions("carRail:corpuscle:add") @PostMapping public Result add( - @Validated @RequestBody SysCorpuscle sysCorpuscle) - { + @Validated @RequestBody SysCorpuscle sysCorpuscle) { return toAjax(sysCorpuscleService.save(sysCorpuscle)); } @@ -54,21 +50,18 @@ public class SysCorpuscleController extends BaseController @RequiresPermissions("carRail:corpuscle:edit") @PutMapping public Result edit( - @Validated @RequestBody SysCorpuscle sysCorpuscle) - { + @Validated @RequestBody SysCorpuscle sysCorpuscle) { return toAjax(sysCorpuscleService.updateById(sysCorpuscle)); } - /** * 删除电子围栏 */ @RequiresPermissions("carRail:corpuscle:remove") @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { + public Result remove(@PathVariable("ids") Long[] ids) { sysCorpuscleService.removeBatchByIds(Arrays.asList(ids)); return success(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysFenceController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysFenceController.java similarity index 94% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysFenceController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysFenceController.java index 92d7b25..31b7718 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysFenceController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysFenceController.java @@ -1,12 +1,12 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; +import com.muyu.openbusiness.domain.SysFence; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.enterprise.domain.SysFence; -import com.muyu.enterprise.service.ISysFenceService; +import com.muyu.openbusiness.service.ISysFenceService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysMessageTypeController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysMessageTypeController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java index 78eaa41..95ad394 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/SysMessageTypeController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysMessageTypeController.java @@ -1,13 +1,11 @@ -package com.muyu.enterprise.controller; - - +package com.muyu.openbusiness.controller; +import com.muyu.openbusiness.domain.SysMessageType; +import com.muyu.openbusiness.service.ISysMessageTypeService; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.enterprise.domain.SysMessageType; -import com.muyu.enterprise.service.ISysMessageTypeService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java similarity index 97% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java index 412f2cf..f34422a 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/SysUserController.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.controller; +package com.muyu.openbusiness.controller; import com.muyu.cloud.common.many.datasource.holder.DynamicDataSourceHolder; import com.muyu.common.core.domain.Result; @@ -13,14 +13,14 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.system.saas.service.SysUserService; - -import javax.annotation.Resource; +import com.muyu.openbusiness.service.SysUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; -import lombok.extern.slf4j.Slf4j; + +import javax.annotation.Resource; /** @@ -101,4 +101,6 @@ public class SysUserController extends BaseController { userService.insertUserRole(user); return remoteUserService.addUser(user); } + + } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java index 3f1c72c..d855362 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnLogsController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnLogsController.java @@ -1,13 +1,12 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; - -import com.muyu.enterprise.domain.WarnLogs; -import com.muyu.enterprise.service.IWarnLogsService; +import com.muyu.openbusiness.domain.WarnLogs; +import com.muyu.openbusiness.service.IWarnLogsService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java similarity index 56% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java index 035f2d4..eef03a2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnRuleController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRuleController.java @@ -1,13 +1,13 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; - -import com.muyu.enterprise.domain.WarnRule; -import com.muyu.enterprise.service.IWarnRuleService; +import com.muyu.openbusiness.domain.WarnRule; +import com.muyu.openbusiness.domain.WarnRuleDTO; +import com.muyu.openbusiness.service.IWarnRuleService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -33,9 +33,14 @@ public class WarnRuleController extends BaseController { */ @RequiresPermissions("warning:list") @GetMapping("/list") - public Result> list(WarnRule warnRule) { + public Result> list(WarnRuleDTO warnRuleDTO) { startPage(); - List list = warnRuleService.selectWarnRuleList(warnRule); + List list = warnRuleService.selectWarnRuleList(warnRuleDTO); +// MPJLambdaQueryWrapper objectMPJLambdaQueryWrapper = new MPJLambdaQueryWrapper<>() +// .selectAll(WarnRule.class) +// .select(WarnStrategy::getStrategyName) +// .leftJoin(WarnStrategy.class, WarnStrategy::getId, WarnRule::getStrategyId) +// .stringQuery(); return getDataTable(list); } @@ -44,9 +49,9 @@ public class WarnRuleController extends BaseController { */ @RequiresPermissions("warning:export") @PostMapping("/export") - public void export(HttpServletResponse response, WarnRule warnRule) { - List list = warnRuleService.selectWarnRuleList(warnRule); - ExcelUtil util = new ExcelUtil(WarnRule.class); + public void export(HttpServletResponse response, WarnRuleDTO warnRuleDTO) { + List list = warnRuleService.selectWarnRuleList(warnRuleDTO); + ExcelUtil util = new ExcelUtil(WarnRuleDTO.class); util.exportExcel(response, list, "预警规则数据"); } @@ -65,11 +70,11 @@ public class WarnRuleController extends BaseController { @RequiresPermissions("warning:add") @PostMapping public Result add( - @Validated @RequestBody WarnRule warnRule) { - if (warnRuleService.checkIdUnique(warnRule)) { - return error("新增 预警规则 '" + warnRule + "'失败，预警规则已存在"); + @Validated @RequestBody WarnRuleDTO warnRuleDTO) { + if (warnRuleService.checkIdUnique(warnRuleDTO)) { + return error("新增 预警规则 '" + warnRuleDTO + "'失败，预警规则已存在"); } - return toAjax(warnRuleService.save(warnRule)); + return toAjax(warnRuleService.save(warnRuleDTO)); } /** @@ -78,11 +83,11 @@ public class WarnRuleController extends BaseController { @RequiresPermissions("warning:edit") @PutMapping public Result edit( - @Validated @RequestBody WarnRule warnRule) { - if (!warnRuleService.checkIdUnique(warnRule)) { - return error("修改 预警规则 '" + warnRule + "'失败，预警规则不存在"); + @Validated @RequestBody WarnRuleDTO warnRuleDTO) { + if (!warnRuleService.checkIdUnique(warnRuleDTO)) { + return error("修改 预警规则 '" + warnRuleDTO + "'失败，预警规则不存在"); } - return toAjax(warnRuleService.updateById(warnRule)); + return toAjax(warnRuleService.updateById(warnRuleDTO)); } /** diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRulesController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRulesController.java new file mode 100644 index 0000000..5bbae15 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnRulesController.java @@ -0,0 +1,47 @@ +package com.muyu.openbusiness.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.openbusiness.domain.WarnRuleDTO; +import com.muyu.openbusiness.service.IWarRulesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +/** + * @ClassName WarnRulesController + * @Description 描述 + * @Author Chen + * @Date 2024/9/23 21:07 + */ +@RestController +@RequestMapping("/rules") +public class WarnRulesController { + @Autowired + private IWarRulesService warnRulesService; + + /** + * 联查策略规则 联查 + */ + + @GetMapping("/list") + public Result> list() { + List list = warnRulesService.selectWarnRulesList(); + return Result.success(list); + } + + /** + * 联查 + * + * @param warnRuleDTO + * @return + */ + @PostMapping("/listAll") + public Result> listAll(WarnRuleDTO warnRuleDTO) { + List list = warnRulesService.selectWarnRulesListAll(warnRuleDTO); + return Result.success(list); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java similarity index 86% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java index 0147dd5..01e38aa 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WarnStrategyController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WarnStrategyController.java @@ -1,13 +1,12 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; - -import com.muyu.enterprise.domain.WarnStrategy; -import com.muyu.enterprise.service.IWarnStrategyService; +import com.muyu.openbusiness.domain.WarnStrategy; +import com.muyu.openbusiness.service.IWarnStrategyService; import jakarta.servlet.http.HttpServletResponse; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -24,8 +23,7 @@ import java.util.List; */ @RestController @RequestMapping("/strategy") -public class WarnStrategyController extends BaseController -{ +public class WarnStrategyController extends BaseController { @Resource private IWarnStrategyService warnStrategyService; @@ -34,8 +32,7 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warning:strategy:list") @GetMapping("/list") - public Result> list(WarnStrategy warnStrategy) - { + public Result> list(WarnStrategy warnStrategy) { startPage(); List list = warnStrategyService.selectWarnStrategyList(warnStrategy); return getDataTable(list); @@ -46,8 +43,7 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warning:strategy:export") @PostMapping("/export") - public void export(HttpServletResponse response, WarnStrategy warnStrategy) - { + public void export(HttpServletResponse response, WarnStrategy warnStrategy) { List list = warnStrategyService.selectWarnStrategyList(warnStrategy); ExcelUtil util = new ExcelUtil(WarnStrategy.class); util.exportExcel(response, list, "预警策略数据"); @@ -58,8 +54,7 @@ public class WarnStrategyController extends BaseController */ @RequiresPermissions("warning:strategy:query") @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { + public Result> getInfo(@PathVariable("id") Long id) { return success(warnStrategyService.selectWarnStrategyById(id)); } @@ -69,8 +64,7 @@ public class WarnStrategyController extends BaseController @RequiresPermissions("warning:strategy:add") @PostMapping public Result add( - @Validated @RequestBody WarnStrategy warnStrategy) - { + @Validated @RequestBody WarnStrategy warnStrategy) { if (warnStrategyService.checkIdUnique(warnStrategy)) { return error("新增 预警策略 '" + warnStrategy + "'失败，预警策略已存在"); } @@ -83,8 +77,7 @@ public class WarnStrategyController extends BaseController @RequiresPermissions("warning:strategy:edit") @PutMapping public Result edit( - @Validated @RequestBody WarnStrategy warnStrategy) - { + @Validated @RequestBody WarnStrategy warnStrategy) { if (!warnStrategyService.checkIdUnique(warnStrategy)) { return error("修改 预警策略 '" + warnStrategy + "'失败，预警策略不存在"); } @@ -95,9 +88,8 @@ public class WarnStrategyController extends BaseController * 删除预警策略 */ @RequiresPermissions("warning:strategy:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { + @DeleteMapping("/{ids}") + public Result remove(@PathVariable("ids") Long[] ids) { warnStrategyService.removeBatchByIds(Arrays.asList(ids)); return success(); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WxTestController.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WxTestController.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WxTestController.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WxTestController.java index 96c49f4..2b38e67 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/controller/WxTestController.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/controller/WxTestController.java @@ -1,15 +1,16 @@ -package com.muyu.enterprise.controller; +package com.muyu.openbusiness.controller; +import com.muyu.openbusiness.message.Article; +import com.muyu.openbusiness.message.NewMessage; +import com.muyu.openbusiness.util.TokenUtil; +import com.muyu.openbusiness.wx.Message; -import com.muyu.enterprise.message.Article; -import com.muyu.enterprise.message.NewMessage; -import com.muyu.enterprise.util.TokenUtil; -import com.muyu.enterprise.wx.Message; import com.thoughtworks.xstream.XStream; import io.micrometer.common.util.StringUtils; import jakarta.servlet.ServletInputStream; import jakarta.servlet.http.HttpServletRequest; + import org.dom4j.Document; import org.dom4j.DocumentException; import org.dom4j.Element; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java new file mode 100644 index 0000000..5910690 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/feign/SystemFeign.java @@ -0,0 +1,12 @@ +//package com.muyu.openbusiness.feign; +// +//import com.muyu.common.core.domain.Result; +//import com.muyu.common.system.remote.factory.RemoteUserFallbackFactory; +//import org.springframework.cloud.openfeign.FeignClient; +//import org.springframework.web.bind.annotation.GetMapping; +// +//@FeignClient(name = "cloud-system",fallbackFactory = RemoteUserFallbackFactory.class) +//public interface SystemFeign { +// @GetMapping("/user/getInfo") +// public Result getInfo (); +//} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/BreakDownMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/BreakDownMapper.java similarity index 79% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/BreakDownMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/BreakDownMapper.java index f420a25..34a710f 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/BreakDownMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/BreakDownMapper.java @@ -1,17 +1,16 @@ -package com.muyu.enterprise.mapper; +package com.muyu.openbusiness.mapper; import com.github.yulichang.base.MPJBaseMapper; - -import com.muyu.enterprise.domain.BreakDown; +import com.muyu.openbusiness.domain.BreakDown; import org.apache.ibatis.annotations.Mapper; /** + * @author Lenovo * @ Tool：IntelliJ IDEA * @ Author：CHX * @ Date：2024-09-17-15:14 * @ Version：1.0 * @ Description：故障管理持久层 - * @author Lenovo */ @Mapper public interface BreakDownMapper extends MPJBaseMapper { diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/FaultLogMapper.java similarity index 74% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/FaultLogMapper.java index 735569a..271fc22 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/FaultLogMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/FaultLogMapper.java @@ -1,7 +1,8 @@ -package com.muyu.enterprise.mapper; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.enterprise.domain.FaultLog; + +import com.muyu.openbusiness.domain.FaultLog; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/StationMessageMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/StationMessageMapper.java similarity index 55% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/StationMessageMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/StationMessageMapper.java index 24f7478..cc31cb7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/StationMessageMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/StationMessageMapper.java @@ -1,8 +1,8 @@ -package com.muyu.enterprise.mapper; +package com.muyu.openbusiness.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.github.yulichang.base.MPJBaseMapper; - -import com.muyu.enterprise.domain.Messages; +import com.muyu.openbusiness.domain.Messages; import org.apache.ibatis.annotations.Mapper; /** @@ -14,5 +14,5 @@ import org.apache.ibatis.annotations.Mapper; * @author Lenovo */ @Mapper -public interface StationMessageMapper extends MPJBaseMapper { +public interface StationMessageMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMapper.java similarity index 73% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMapper.java index 1711c48..78b5bdf 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysCarMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMapper.java @@ -1,8 +1,7 @@ -package com.muyu.car.mapper; +package com.muyu.openbusiness.mapper; -import java.util.List; -import com.muyu.car.domain.SysCar; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.openbusiness.domain.SysCar; import org.apache.ibatis.annotations.Mapper; /** @@ -11,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper; * @author muyu * @date 2024-09-17 */ +@Mapper public interface SysCarMapper extends BaseMapper{ } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMessageMapper.java new file mode 100644 index 0000000..fcd3a4b --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCarMessageMapper.java @@ -0,0 +1,19 @@ +package com.muyu.openbusiness.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.github.yulichang.base.MPJBaseMapper; +import com.muyu.openbusiness.domain.SysCarMessage; +import org.apache.ibatis.annotations.Mapper; + +/** + * @ Tool：IntelliJ IDEA + * @ Author：CHX + * @ Date：2024-09-20-15:54 + * @ Version：1.0 + * @ Description： + * @author Lenovo + */ + +@Mapper +public interface SysCarMessageMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCorpuscleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCorpuscleMapper.java similarity index 71% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCorpuscleMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCorpuscleMapper.java index f38373d..ab2062e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysCorpuscleMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysCorpuscleMapper.java @@ -1,8 +1,11 @@ -package com.muyu.enterprise.mapper; + + + +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.enterprise.domain.SysCorpuscle; - +import com.muyu.openbusiness.domain.SysCorpuscle; +import org.apache.ibatis.annotations.Mapper; import java.util.List; @@ -12,7 +15,7 @@ import java.util.List; * @author muyu * @date 2024-09-17 */ - +@Mapper public interface SysCorpuscleMapper extends BaseMapper{ List selectCarRail(SysCorpuscle sysCorpuscle); diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysFenceMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysFenceMapper.java similarity index 58% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysFenceMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysFenceMapper.java index b5dde69..43cdd56 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/SysFenceMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysFenceMapper.java @@ -1,9 +1,9 @@ -package com.muyu.enterprise.mapper; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.enterprise.domain.SysFence; - +import com.muyu.openbusiness.domain.SysFence; +import org.apache.ibatis.annotations.Mapper; /** * 围栏组Mapper接口 @@ -11,6 +11,7 @@ import com.muyu.enterprise.domain.SysFence; * @author muyu * @date 2024-09-17 */ +@Mapper public interface SysFenceMapper extends BaseMapper{ } diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysMessageTypeMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysMessageTypeMapper.java similarity index 73% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysMessageTypeMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysMessageTypeMapper.java index 2fec6bb..8b23c58 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/mapper/SysMessageTypeMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysMessageTypeMapper.java @@ -1,9 +1,7 @@ -package com.muyu.car.mapper; - -import java.util.List; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.muyu.car.domain.SysMessageType; +import com.muyu.openbusiness.domain.SysMessageType; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java similarity index 93% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java index 62c3965..235d8d5 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserMapper.java @@ -1,10 +1,10 @@ -package com.muyu.system.saas.mapper; +package com.muyu.openbusiness.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUser; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Author: 胡杨 diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java similarity index 96% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java index 806f76d..f2a9e01 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserPostMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserPostMapper.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.mapper; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUserPost; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java similarity index 97% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java index d5c8072..5b3aa11 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/mapper/SysUserRoleMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/SysUserRoleMapper.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.mapper; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.common.system.domain.SysUserRole; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnLogsMapper.java similarity index 74% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnLogsMapper.java index 166720f..5c2899f 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnLogsMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnLogsMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warning.mapper; +package com.muyu.openbusiness.mapper; -import com.muyu.warning.domain.WarnLogs; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.openbusiness.domain.WarnLogs; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRuleMapper.java similarity index 55% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRuleMapper.java index cb89432..2e068fc 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/mapper/WarnRuleMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRuleMapper.java @@ -1,8 +1,7 @@ -package com.muyu.enterprise.mapper; +package com.muyu.openbusiness.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.enterprise.domain.WarnRule; +import com.muyu.openbusiness.domain.WarnRuleDTO; import org.apache.ibatis.annotations.Mapper; /** @@ -12,6 +11,6 @@ import org.apache.ibatis.annotations.Mapper; * @date 2024-09-20 */ @Mapper -public interface WarnRuleMapper extends BaseMapper { +public interface WarnRuleMapper extends BaseMapper { } diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRulesMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRulesMapper.java new file mode 100644 index 0000000..9ae3362 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnRulesMapper.java @@ -0,0 +1,21 @@ +package com.muyu.openbusiness.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.openbusiness.domain.WarnRuleDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * @ClassName WarnRulesMapper + * @Description 描述 + * @Author Chen + * @Date 2024/9/23 21:07 + */ +@Mapper +public interface WarnRulesMapper extends BaseMapper { + @Select("select r.*,s.id,s.strategy_name FROM warn_rule r left join warn_strategy s on r.strategy_id=s.id where r.strategy_id = #{s.id}") + List selectWarnRulesListAll(WarnRuleDTO warnRuleDTO); + +} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnStrategyMapper.java similarity index 74% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnStrategyMapper.java index e9bd988..1d3e625 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnStrategyMapper.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/mapper/WarnStrategyMapper.java @@ -1,7 +1,7 @@ -package com.muyu.warning.mapper; +package com.muyu.openbusiness.mapper; -import com.muyu.warning.domain.WarnStrategy; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.openbusiness.domain.WarnStrategy; import org.apache.ibatis.annotations.Mapper; /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/Article.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/Article.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/Article.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/Article.java index b9ae685..1872201 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/Article.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/Article.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.message; +package com.muyu.openbusiness.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/NewMessage.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/NewMessage.java similarity index 95% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/NewMessage.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/NewMessage.java index 5052cff..5bac5bf 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/message/NewMessage.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/message/NewMessage.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.message; +package com.muyu.openbusiness.message; import com.thoughtworks.xstream.annotations.XStreamAlias; import lombok.AllArgsConstructor; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/redis/RedisInitialize.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/redis/RedisInitialize.java new file mode 100644 index 0000000..4369521 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/redis/RedisInitialize.java @@ -0,0 +1,153 @@ +package com.muyu.openbusiness.redis; + +import com.alibaba.fastjson2.JSON; +import com.muyu.openbusiness.constant.RedisConstant; +import com.muyu.openbusiness.domain.VehicleMessage; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +import javax.annotation.PostConstruct; + +@Component +public class RedisInitialize { + + + @Autowired + private RedisTemplateredisTemplate; + + @PostConstruct + public void a() { + + new Thread(()->{ + try { + Thread.sleep(1000); + }catch (Exception exception){ + throw new RuntimeException(exception); + } + }); + VehicleMessage message1 = new VehicleMessage(); + message1.setStartTime(System.currentTimeMillis()); + message1.setSpeed("50"); + message1.setLongitude("126.397428"); + message1.setLatitude("37.90923"); + message1.setTotalMileage("1010"); + message1.setTotalVoltage("22.5"); + message1.setAcceleratorPedalTravelValue("1.5"); + message1.setBrakePedalTravelValue("1.2"); + message1.setSpecificFuelConsumption("1.8"); + message1.setMotorControllerTemperature("59"); + message1.setMotorSpeed("850"); + message1.setMotorTorque("110"); + message1.setMotorTemperature("53"); + message1.setMotorVoltage("12.5"); + message1.setMotorCurrent("1.1"); + message1.setPowerBatteryRemainingSOC("88"); + message1.setMaximumPower("999"); + message1.setMaximumDischargePower("950"); + message1.setDcdc("2"); + message1.setChg("2"); + message1.setBMSSelfCheckCounter("2"); + message1.setElectricCurrent("2.3"); + message1.setTotalVoltageV3("13.1"); + message1.setSingleMaximumVoltage("14.1"); + message1.setMinimumVoltageOfABattery("12.2"); + message1.setMaximumBatteryTemperature("85"); + message1.setMinimumBatteryTemperature("51"); + message1.setPowerBatteryAvailableCapacity("560"); + message1.setCombinedCurrent("1.1"); + message1.setRunningState("2"); + message1.setWorkStatus("2"); + message1.setDriveMotorCondition("1"); + message1.setVehicleStatus("1"); + message1.setChargingState("1"); + message1.setHeatingState("1"); + message1.setCarVin("1HGCM826X3A004352"); + + redisTemplate.opsForValue().set(RedisConstant.VEHICLE_ENTERPRISE + message1.getCarVin(), JSON.toJSONString(message1)); + } + + @PostConstruct + public void initialize() { + + +// +// new Thread(() -> { +// try { +// Thread.sleep(500); +// } catch (InterruptedException e) { +// throw new RuntimeException(e); +// } +// List vehicleMessageMiddleList = vehicleMessageMiddleService.list(); +// vehicleMessageMiddleList.forEach(vehicleMessageMiddle -> { +// List messageDetailList = messageDetailService.list(new LambdaQueryWrapper<>() {{ +// in(MessageDetail::getId, Arrays.asList(vehicleMessageMiddle.getMessageIds().split(","))); +// }}); +// String jsonString = JSON.toJSONString(messageDetailList); +// redisTemplate.opsForHash().put(RedisConstant.MESSAGE_DETAIL, vehicleMessageMiddle.getCarVin(), jsonString); +// }); +// }); + +// MessageDetail messageDetail = new MessageDetail(); +// messageDetail.setKeyCode("1"); +// messageDetail.setLabel("测试"); +// messageDetail.setStartBit(0); +// messageDetail.setStopBit(8); +// messageDetail.setType("1"); + +// List list = vehicleMessageMiddleService.list(); +// list.forEach(vehicleMessageMiddle -> { +// List messageDetailList = messageDetailService.list(new LambdaQueryWrapper<>() {{ +// in(MessageDetail::getId, Arrays.asList(vehicleMessageMiddle.getMessageIds().split(","))); +// }); +// String jsonString = JSON.toJSONString(messageDetailList); +// redisTemplate.opsForHash().put(RedisConstant.VEHICLE_ENTERPRISE, message1.getCarVin(), String.valueOf(jsonString)); + + new Thread(()->{ + try { + Thread.sleep(500); + }catch (Exception exception){ + throw new RuntimeException(exception); + } + }); + VehicleMessage message1 = new VehicleMessage(); + message1.setStartTime(System.currentTimeMillis()); + message1.setSpeed("50"); + message1.setLongitude("116.397428"); + message1.setLatitude("39.90923"); + message1.setTotalMileage("1000"); + message1.setTotalVoltage("12.5"); + message1.setAcceleratorPedalTravelValue("0.5"); + message1.setBrakePedalTravelValue("0.2"); + message1.setSpecificFuelConsumption("0.8"); + message1.setMotorControllerTemperature("60"); + message1.setMotorSpeed("800"); + message1.setMotorTorque("100"); + message1.setMotorTemperature("70"); + message1.setMotorVoltage("12.6"); + message1.setMotorCurrent("1.2"); + message1.setPowerBatteryRemainingSOC("80"); + message1.setMaximumPower("1000"); + message1.setMaximumDischargePower("900"); + message1.setDcdc("1"); + message1.setChg("1"); + message1.setBMSSelfCheckCounter("1"); + message1.setElectricCurrent("2.5"); + message1.setTotalVoltageV3("13.5"); + message1.setSingleMaximumVoltage("14.5"); + message1.setMinimumVoltageOfABattery("12.0"); + message1.setMaximumBatteryTemperature("80"); + message1.setMinimumBatteryTemperature("50"); + message1.setPowerBatteryAvailableCapacity("800"); + message1.setCombinedCurrent("1.5"); + message1.setRunningState("1"); + message1.setWorkStatus("1"); + message1.setDriveMotorCondition("1"); + message1.setVehicleStatus("1"); + message1.setChargingState("1"); + message1.setHeatingState("1"); + message1.setCarVin("1HGCM826X3A004352"); + + redisTemplate.opsForValue().set(RedisConstant.VEHICLE_ENTERPRISE + message1.getCarVin(), JSON.toJSONString(message1)); + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/BreakDownService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/BreakDownService.java similarity index 87% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/BreakDownService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/BreakDownService.java index 2868b91..aef625a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/BreakDownService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/BreakDownService.java @@ -1,10 +1,8 @@ -package com.muyu.enterprise.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.BreakDown; -import com.muyu.enterprise.domain.MessageMap; - - +import com.muyu.openbusiness.domain.BreakDown; +import com.muyu.openbusiness.domain.MessageMap; import java.util.List; import java.util.Map; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFaultLogService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IFaultLogService.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFaultLogService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IFaultLogService.java index 400d2e7..289b114 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IFaultLogService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IFaultLogService.java @@ -1,8 +1,9 @@ -package com.muyu.enterprise.service; + + +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.FaultLog; - +import com.muyu.openbusiness.domain.FaultLog; import java.util.List; diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java similarity index 78% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarMessageService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java index 95c84e3..e520847 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysCarMessageService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarMessageService.java @@ -1,10 +1,9 @@ -package com.muyu.car.service; - -import java.util.List; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.car.domain.SysCarMessage; -import com.muyu.car.domain.resp.SysMessageResp; +import com.muyu.openbusiness.domain.SysCarMessage; + +import java.util.List; /** * 车辆报文记录Service接口 @@ -13,8 +12,6 @@ import com.muyu.car.domain.resp.SysMessageResp; * @date 2024-09-18 */ public interface ISysCarMessageService extends IService { - - ListdobList(SysMessageResp sysMessageResp); /** * 精确查询车辆报文记录 * @@ -38,6 +35,4 @@ public interface ISysCarMessageService extends IService { */ Boolean checkIdUnique(SysCarMessage sysCarMessage); -// Boolean checkById(SysCarMessage sysCarMessage); - } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarService.java similarity index 90% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarService.java index 8ccfcb7..c5f39cf 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCarService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCarService.java @@ -1,7 +1,7 @@ -package com.muyu.enterprise.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.SysCar; +import com.muyu.openbusiness.domain.SysCar; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCorpuscleService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCorpuscleService.java similarity index 84% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCorpuscleService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCorpuscleService.java index 1201c55..77215ad 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysCorpuscleService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysCorpuscleService.java @@ -1,7 +1,7 @@ -package com.muyu.enterprise.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.SysCorpuscle; +import com.muyu.openbusiness.domain.SysCorpuscle; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysFenceService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysFenceService.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysFenceService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysFenceService.java index 9c50e54..626c197 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/ISysFenceService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysFenceService.java @@ -1,8 +1,7 @@ -package com.muyu.enterprise.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.SysFence; - +import com.muyu.openbusiness.domain.SysFence; import java.util.List; diff --git a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysMessageTypeService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysMessageTypeService.java similarity index 90% rename from cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysMessageTypeService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysMessageTypeService.java index e744241..e7a7db9 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/java/com/muyu/car/service/ISysMessageTypeService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/ISysMessageTypeService.java @@ -1,9 +1,9 @@ -package com.muyu.car.service; - -import java.util.List; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.car.domain.SysMessageType; +import com.muyu.openbusiness.domain.SysMessageType; + +import java.util.List; /** * 车辆报文类型Service接口 diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarRulesService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarRulesService.java new file mode 100644 index 0000000..347d7b0 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarRulesService.java @@ -0,0 +1,13 @@ +package com.muyu.openbusiness.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.openbusiness.domain.WarnRuleDTO; + +import java.util.List; + +public interface IWarRulesService extends IService { + List selectWarnRulesList(); + //联查 + List selectWarnRulesListAll(WarnRuleDTO warnRuleDTO); + +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnLogsService.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnLogsService.java index 4a4ad6f..a0ba984 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnLogsService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnLogsService.java @@ -1,8 +1,7 @@ -package com.muyu.enterprise.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.WarnLogs; - +import com.muyu.openbusiness.domain.WarnLogs; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnRuleService.java similarity index 52% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnRuleService.java index c22f98e..7be076b 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnRuleService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnRuleService.java @@ -1,8 +1,7 @@ -package com.muyu.enterprise.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.WarnRule; - +import com.muyu.openbusiness.domain.WarnRuleDTO; import java.util.List; @@ -12,28 +11,28 @@ import java.util.List; * @author muyu * @date 2024-09-20 */ -public interface IWarnRuleService extends IService { +public interface IWarnRuleService extends IService { /** * 精确查询预警规则 * * @param id 预警规则主键 * @return 预警规则 */ - public WarnRule selectWarnRuleById(Long id); + public WarnRuleDTO selectWarnRuleById(Long id); /** * 查询预警规则列表 * - * @param warnRule 预警规则 + * @param warnRuleDTO 预警规则 * @return 预警规则集合 */ - public List selectWarnRuleList(WarnRule warnRule); + public List selectWarnRuleList(WarnRuleDTO warnRuleDTO); /** * 判断 预警规则 id是否唯一 - * @param warnRule 预警规则 + * @param warnRuleDTO 预警规则 * @return 结果 */ - Boolean checkIdUnique(WarnRule warnRule); + Boolean checkIdUnique(WarnRuleDTO warnRuleDTO); } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnStrategyService.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnStrategyService.java index 93d1b0c..1307ee1 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/IWarnStrategyService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/IWarnStrategyService.java @@ -1,8 +1,7 @@ -package com.muyu.enterprise.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.WarnStrategy; - +import com.muyu.openbusiness.domain.WarnStrategy; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/StationMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/StationMessageService.java similarity index 80% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/StationMessageService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/StationMessageService.java index 9f2030e..a8b68df 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/StationMessageService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/StationMessageService.java @@ -1,7 +1,8 @@ -package com.muyu.enterprise.service; + +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.enterprise.domain.Messages; +import com.muyu.openbusiness.domain.Messages; import java.util.List; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java new file mode 100644 index 0000000..82773fb --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysCarMessageService.java @@ -0,0 +1,15 @@ +//package com.muyu.openbusiness.service; +// +//import com.baomidou.mybatisplus.extension.service.IService; +//import com.muyu.openbusiness.domain.SysCarMessage; +// +///** +// * @ Tool：IntelliJ IDEA +// * @ Author：CHX +// * @ Date：2024-09-20-15:42 +// * @ Version：1.0 +// * @ Description： +// * @author Lenovo +// */ +//public interface SysCarMessageService extends IService { +//} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java similarity index 95% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java index 4ee3d58..1eb66cf 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/SysUserService.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/SysUserService.java @@ -1,4 +1,4 @@ -package com.muyu.system.saas.service; +package com.muyu.openbusiness.service; import com.baomidou.mybatisplus.extension.service.IService; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/BreakDownServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/BreakDownServiceImpl.java similarity index 87% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/BreakDownServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/BreakDownServiceImpl.java index 8e958c5..78e2ac2 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/BreakDownServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/BreakDownServiceImpl.java @@ -1,15 +1,16 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.service.impl; import cn.hutool.core.lang.Assert; 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.enterprise.domain.BreakDown; -import com.muyu.enterprise.domain.MessageMap; -import com.muyu.enterprise.mapper.BreakDownMapper; -import com.muyu.enterprise.service.BreakDownService; -import com.muyu.enterprise.service.SysCarMessageService; + +import com.muyu.openbusiness.domain.BreakDown; +import com.muyu.openbusiness.domain.MessageMap; +import com.muyu.openbusiness.mapper.BreakDownMapper; +import com.muyu.openbusiness.service.BreakDownService; +import com.muyu.openbusiness.service.ISysCarMessageService; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -29,7 +30,7 @@ import java.util.Map; public class BreakDownServiceImpl extends ServiceImpl implements BreakDownService { @Autowired - private SysCarMessageService sysCarMessageService; + private ISysCarMessageService sysCarMessageService; @Autowired private RabbitTemplate rabbitTemplate; /** diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/FaultLogServiceImpl.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/FaultLogServiceImpl.java index 397099f..f92c0d7 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/FaultLogServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/FaultLogServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.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.enterprise.domain.FaultLog; -import com.muyu.enterprise.mapper.FaultLogMapper; -import com.muyu.enterprise.service.IFaultLogService; +import com.muyu.openbusiness.domain.FaultLog; +import com.muyu.openbusiness.mapper.FaultLogMapper; +import com.muyu.openbusiness.service.IFaultLogService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/StationMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/StationMessageServiceImpl.java similarity index 76% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/StationMessageServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/StationMessageServiceImpl.java index 918cb68..e9a13ec 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/StationMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/StationMessageServiceImpl.java @@ -1,9 +1,11 @@ -package com.muyu.enterprise.service.impl; + + +package com.muyu.openbusiness.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.enterprise.domain.Messages; -import com.muyu.enterprise.mapper.StationMessageMapper; -import com.muyu.enterprise.service.StationMessageService; +import com.muyu.openbusiness.domain.Messages; +import com.muyu.openbusiness.mapper.StationMessageMapper; +import com.muyu.openbusiness.service.StationMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java similarity index 61% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarMessageServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java index 7000b06..8739004 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarMessageServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarMessageServiceImpl.java @@ -1,12 +1,11 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.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.enterprise.domain.SysCarMessage; -import com.muyu.enterprise.mapper.SysCarMessageMapper; -import com.muyu.enterprise.resp.SysMessageResp; -import com.muyu.enterprise.service.ISysCarMessageService; +import com.muyu.openbusiness.domain.SysCarMessage; +import com.muyu.openbusiness.mapper.SysCarMessageMapper; +import com.muyu.openbusiness.service.ISysCarMessageService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.util.Assert; @@ -23,13 +22,7 @@ import java.util.List; public class SysCarMessageServiceImpl extends ServiceImpl implements ISysCarMessageService { - @Autowired - private SysCarMessageMapper mapper; - @Override - public List dobList(SysMessageResp sysMessageResp) { - return mapper.dobList(sysMessageResp); - } /** * 精确查询车辆报文记录 @@ -38,7 +31,8 @@ public class SysCarMessageServiceImpl * @return 车辆报文记录 */ @Override - public SysCarMessage selectSysCarMessageById(Long id) { + public SysCarMessage selectSysCarMessageById(Long id) + { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); Assert.notNull(id, "id不可为空"); queryWrapper.eq(SysCarMessage::getId, id); @@ -53,37 +47,29 @@ public class SysCarMessageServiceImpl * @return 车辆报文记录 */ @Override - public List selectSysCarMessageList(SysCarMessage sysCarMessage) { + public List selectSysCarMessageList(SysCarMessage sysCarMessage) + { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarMessage.getModelCode())) { + if (StringUtils.isNotEmpty(sysCarMessage.getModelCode())){ queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode()); } - if (StringUtils.isNotEmpty(sysCarMessage.getMessageType())) { + if (StringUtils.isNotEmpty(sysCarMessage.getMessageType())){ queryWrapper.eq(SysCarMessage::getMessageType, sysCarMessage.getMessageType()); } return this.list(queryWrapper); } /** - * 唯一 判断 - * - * @param sysCarMessage 车辆报文记录 + * 唯一 判断 + * @param sysCarMessage 车辆报文记录 * @return 车辆报文记录 - */ + */ @Override public Boolean checkIdUnique(SysCarMessage sysCarMessage) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarMessage::getId, sysCarMessage.getId()); + queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode()) + .eq(SysCarMessage::getMessageTypeCode, sysCarMessage.getMessageTypeCode()); return this.count(queryWrapper) > 0; } -// -// @Override -// public Boolean checkById(SysMessageType sysMessageType) { -// LambdaQueryWrapper sysCarMessageLambdaQueryWrapper = new LambdaQueryWrapper<>(); -// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); -//// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); -// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::get, sysMessageType); -//// return this.count(sysCarMessageLambdaQueryWrapper) > 0; -// } } diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarServiceImpl.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarServiceImpl.java index 44ec671..75a5e5a 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCarServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCarServiceImpl.java @@ -1,12 +1,11 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.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.enterprise.domain.SysCar; -import com.muyu.enterprise.mapper.SysCarMapper; -import com.muyu.enterprise.service.ISysCarService; +import com.muyu.openbusiness.domain.SysCar; +import com.muyu.openbusiness.mapper.SysCarMapper; +import com.muyu.openbusiness.service.ISysCarService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCorpuscleServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCorpuscleServiceImpl.java similarity index 81% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCorpuscleServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCorpuscleServiceImpl.java index 3328085..b892114 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysCorpuscleServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysCorpuscleServiceImpl.java @@ -1,10 +1,10 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.openbusiness.domain.SysCorpuscle; -import com.muyu.enterprise.domain.SysCorpuscle; -import com.muyu.enterprise.mapper.SysCorpuscleMapper; -import com.muyu.enterprise.service.ISysCorpuscleService; +import com.muyu.openbusiness.mapper.SysCorpuscleMapper; +import com.muyu.openbusiness.service.ISysCorpuscleService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysFenceServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysFenceServiceImpl.java similarity index 89% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysFenceServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysFenceServiceImpl.java index 1a46301..8ea5dd9 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysFenceServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysFenceServiceImpl.java @@ -1,12 +1,12 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.service.impl; import cn.hutool.core.lang.Assert; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.enterprise.domain.SysFence; -import com.muyu.enterprise.mapper.SysFenceMapper; -import com.muyu.enterprise.service.ISysFenceService; +import com.muyu.openbusiness.domain.SysFence; +import com.muyu.openbusiness.mapper.SysFenceMapper; +import com.muyu.openbusiness.service.ISysFenceService; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysMessageTypeServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysMessageTypeServiceImpl.java similarity index 90% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysMessageTypeServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysMessageTypeServiceImpl.java index 60b8bab..04fd24d 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/SysMessageTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysMessageTypeServiceImpl.java @@ -1,12 +1,11 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.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.enterprise.domain.SysMessageType; -import com.muyu.enterprise.mapper.SysMessageTypeMapper; -import com.muyu.enterprise.service.ISysMessageTypeService; +import com.muyu.openbusiness.domain.SysMessageType; +import com.muyu.openbusiness.mapper.SysMessageTypeMapper; +import com.muyu.openbusiness.service.ISysMessageTypeService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java similarity index 92% rename from cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java index a53838a..e5ac185 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/java/com/muyu/system/saas/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/SysUserServiceImpl.java @@ -1,25 +1,23 @@ -package com.muyu.system.saas.service.impl; +package com.muyu.openbusiness.service.impl; -import javax.annotation.Resource; - import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.muyu.common.core.constant.UserConstants; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.system.domain.SysUser; import com.muyu.common.system.domain.SysUserPost; import com.muyu.common.system.domain.SysUserRole; import com.muyu.common.system.remote.RemoteUserService; -import com.muyu.system.saas.mapper.SysUserPostMapper; -import com.muyu.system.saas.mapper.SysUserRoleMapper; + +import com.muyu.openbusiness.mapper.SysUserMapper; +import com.muyu.openbusiness.mapper.SysUserPostMapper; +import com.muyu.openbusiness.mapper.SysUserRoleMapper; +import com.muyu.openbusiness.service.SysUserService; +import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ObjectUtils; import org.springframework.stereotype.Service; -import lombok.extern.slf4j.Slf4j; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.system.saas.mapper.SysUserMapper; -import com.muyu.system.saas.service.SysUserService; -import org.springframework.transaction.annotation.Transactional; +import javax.annotation.Resource; import java.util.ArrayList; import java.util.List; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnLogsServiceImpl.java similarity index 93% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnLogsServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnLogsServiceImpl.java index 5604e55..968253e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnLogsServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnLogsServiceImpl.java @@ -1,12 +1,11 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.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.enterprise.domain.WarnLogs; -import com.muyu.enterprise.mapper.WarnLogsMapper; -import com.muyu.enterprise.service.IWarnLogsService; +import com.muyu.openbusiness.domain.WarnLogs; +import com.muyu.openbusiness.mapper.WarnLogsMapper; +import com.muyu.openbusiness.service.IWarnLogsService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRuleServiceImpl.java new file mode 100644 index 0000000..0956aa5 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRuleServiceImpl.java @@ -0,0 +1,106 @@ +package com.muyu.openbusiness.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.openbusiness.domain.WarnRuleDTO; +import com.muyu.openbusiness.mapper.WarnRuleMapper; +import com.muyu.openbusiness.service.IWarnRuleService; +import org.springframework.stereotype.Service; +import org.springframework.util.Assert; + +import java.util.List; + +/** + * 预警规则Service业务层处理 + * + * @author muyu + * @date 2024-09-20 + */ +@Service +public class WarnRuleServiceImpl + extends ServiceImpl + implements IWarnRuleService { + + + /** + * 精确查询预警规则 + * + * @param id 预警规则主键 + * @return 预警规则 + */ + @Override + public WarnRuleDTO selectWarnRuleById(Long id) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + Assert.notNull(id, "id不可为空"); + queryWrapper.eq(WarnRuleDTO::getId, id); + return this.getOne(queryWrapper); + } + + + /** + * 查询预警规则列表 + * + * @param warnRuleDTO 预警规则 + * @return 预警规则 + */ + @Override + public List selectWarnRuleList(WarnRuleDTO warnRuleDTO) { + +// MPJLambdaWrapper queryWrapper = new MPJLambdaWrapper() +// .selectAll(WarnRule.class) +// .select(WarnStrategy::getStrategyName) +// .selectAs(WarnStrategy::getStrategyName, WarnRule::getStrategyName); +// List list = warnRuleMapper.selectJoinList(WarnRule.class, queryWrapper); +// return list; +// MPJLambdaWrapper wrapper = JoinWrappers.lambda(WarnRule.class) +// .selectAll(WarnRule.class) +// .select(WarnStrategy::getStrategyName) +// .leftJoin(WarnStrategy.class, WarnStrategy::getId, WarnRule::getId); +// return warnRuleMapper.selectJoinList(WarnRule.class, wrapper); +// MPJQueryWrapper queryWrapper = new MPJQueryWrapper<>(); +// if (StringUtils.isNotEmpty(warnRule.getRuleName())) { +//// queryWrapper.like(WarnRule::getRuleName, warnRule.getRuleName()); +// queryWrapper.like("rule_name", warnRule.getRuleName()); +// } +// + + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if (StringUtils.isNotNull(warnRuleDTO.getStrategyId())) { + queryWrapper.eq(WarnRuleDTO::getStrategyId, warnRuleDTO.getStrategyId()); +// queryWrapper.eq("strategy_id", warnRule.getStrategyId()); + } + if (StringUtils.isNotNull(warnRuleDTO.getMsgTypeId())) { + queryWrapper.eq(WarnRuleDTO::getMsgTypeId, warnRuleDTO.getMsgTypeId()); + } + if (StringUtils.isNotNull(warnRuleDTO.getSlideTime())) { + queryWrapper.eq(WarnRuleDTO::getSlideTime, warnRuleDTO.getSlideTime()); + } + if (StringUtils.isNotNull(warnRuleDTO.getSlideFrequency())) { + queryWrapper.eq(WarnRuleDTO::getSlideFrequency, warnRuleDTO.getSlideFrequency()); + } + if (StringUtils.isNotNull(warnRuleDTO.getMaxValue())) { + queryWrapper.eq(WarnRuleDTO::getMaxValue, warnRuleDTO.getMaxValue()); + } + if (StringUtils.isNotNull(warnRuleDTO.getMinValue())) { + queryWrapper.eq(WarnRuleDTO::getMinValue, warnRuleDTO.getMinValue()); + } + return this.list(queryWrapper); + + + } + + /** + * 唯一 判断 + * + * @param warnRuleDTO 预警规则 + * @return 预警规则 + */ + @Override + public Boolean checkIdUnique(WarnRuleDTO warnRuleDTO) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(WarnRuleDTO::getId, warnRuleDTO.getId()); + return this.count(queryWrapper) > 0; + } + +} diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRulesServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRulesServiceImpl.java new file mode 100644 index 0000000..2811ae5 --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnRulesServiceImpl.java @@ -0,0 +1,47 @@ +package com.muyu.openbusiness.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.yulichang.wrapper.MPJLambdaWrapper; +import com.muyu.openbusiness.domain.WarnRule; +import com.muyu.openbusiness.domain.WarnRuleDTO; +import com.muyu.openbusiness.domain.WarnStrategy; +import com.muyu.openbusiness.mapper.WarnRulesMapper; +import com.muyu.openbusiness.service.IWarRulesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * @ClassName WarnRulesServiceImpl + * @Description 描述 + * @Author Chen + * @Date 2024/9/23 22:02 + */ +@Service +public class WarnRulesServiceImpl + extends ServiceImpl + implements IWarRulesService { + + @Autowired + private WarnRulesMapper warnRulesMapper; + + @Override + public List selectWarnRulesList() { + MPJLambdaWrapper wrapper = new MPJLambdaWrapper() + .selectAll(WarnRule.class) + .selectAs(WarnStrategy::getStrategyName, WarnRuleDTO::getStrategyName) + .leftJoin(WarnStrategy.class, WarnStrategy::getId, WarnRule::getStrategyId); + return this.list(wrapper); + } + + /** + * 双表查询 + * @return + */ + @Override + public List selectWarnRulesListAll(WarnRuleDTO warnRuleDTO) { + List list = warnRulesMapper.selectWarnRulesListAll(warnRuleDTO); + return list; + } +} diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnStrategyServiceImpl.java similarity index 91% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnStrategyServiceImpl.java index 40008c0..4798fed 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/service/impl/WarnStrategyServiceImpl.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/service/impl/WarnStrategyServiceImpl.java @@ -1,11 +1,11 @@ -package com.muyu.enterprise.service.impl; +package com.muyu.openbusiness.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.enterprise.domain.WarnStrategy; -import com.muyu.enterprise.mapper.WarnStrategyMapper; -import com.muyu.enterprise.service.IWarnStrategyService; +import com.muyu.openbusiness.domain.WarnStrategy; +import com.muyu.openbusiness.mapper.WarnStrategyMapper; +import com.muyu.openbusiness.service.IWarnStrategyService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; diff --git a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/OkHttpUtils.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/OkHttpUtils.java similarity index 96% rename from cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/OkHttpUtils.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/OkHttpUtils.java index 1683f1d..c2cd45e 100644 --- a/cloud-modules/cloud-modules-enterprise/cloud-modules-enterprise-server/src/main/java/com/muyu/enterprise/util/OkHttpUtils.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/OkHttpUtils.java @@ -1,4 +1,4 @@ -package com.muyu.enterprise.util; +package com.muyu.openbusiness.util; import okhttp3.*; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/TokenUtil.java similarity index 93% rename from cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/TokenUtil.java index 5587e4b..658bd5a 100644 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/TokenUtil.java +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/java/com/muyu/openbusiness/util/TokenUtil.java @@ -1,7 +1,7 @@ -package com.muyu.warning.util; +package com.muyu.openbusiness.util; import com.alibaba.fastjson2.JSON; -import com.muyu.warning.wx.AccessToken; +import com.muyu.openbusiness.wx.AccessToken; import org.springframework.stereotype.Component; /** diff --git a/cloud-data-processing/src/main/resources/banner.txt b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/banner.txt similarity index 100% rename from cloud-data-processing/src/main/resources/banner.txt rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/banner.txt diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml similarity index 100% rename from cloud-modules/cloud-modules-carmanage/src/main/resources/bootstrap.yml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/bootstrap.yml diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/dev.xml similarity index 100% rename from cloud-modules/cloud-modules-carmanage/src/main/resources/logback/dev.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/dev.xml diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/prod.xml similarity index 100% rename from cloud-modules/cloud-modules-carmanage/src/main/resources/logback/prod.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/prod.xml diff --git a/cloud-modules/cloud-modules-parsing/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/test.xml similarity index 99% rename from cloud-modules/cloud-modules-parsing/src/main/resources/logback/test.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/test.xml index 76a0d8f..2cd69e4 100644 --- a/cloud-modules/cloud-modules-parsing/src/main/resources/logback/test.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/logback/test.xml @@ -43,7 +43,7 @@ 60 - + ERROR diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMapper.xml similarity index 98% rename from cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMapper.xml index 5113cd6..da56aa0 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMessageMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMessageMapper.xml similarity index 82% rename from cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMessageMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMessageMapper.xml index c49f3d1..a9d0164 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysCarMessageMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysCarMessageMapper.xml @@ -2,7 +2,7 @@ - + @@ -27,17 +27,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - insert into sys_car_message diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysFenceMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysFenceMapper.xml new file mode 100644 index 0000000..241fdef --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysFenceMapper.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + select id, group_code, group_name, group_type, state, create_by, create_time, update_by, update_time, remark from sys_fence_group + + + + + + + + + + + delete from sys_fence_group where id = #{id} + + + + delete from sys_fence_group where id in + + #{id} + + + diff --git a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysMessageTypeMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysMessageTypeMapper.xml similarity index 97% rename from cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysMessageTypeMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysMessageTypeMapper.xml index 3d1d939..b03df06 100644 --- a/cloud-modules/cloud-modules-carmanage/src/main/resources/mapper/car/SysMessageTypeMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysMessageTypeMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml similarity index 98% rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml index 4a480ae..7bbe181 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml similarity index 94% rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml index f6bf547..b81edfe 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserPostMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserPostMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml similarity index 96% rename from cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml rename to cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml index b352741..69d20fb 100644 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/mapper/saas/SysUserRoleMapper.xml +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SysUserRoleMapper.xml @@ -2,7 +2,7 @@ - + diff --git a/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SyscarRailMapper.xml b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SyscarRailMapper.xml new file mode 100644 index 0000000..752c3cd --- /dev/null +++ b/cloud-modules/cloud-modules-openbusiness/cloud-modules-openbusiness-server/src/main/resources/mapper/openbusiness/SyscarRailMapper.xml @@ -0,0 +1,16 @@ + + + + + + insert into sys_corpuscle_fence(fence_code,fence_name,fence_type,fence_position,state) + values(#{fenceCode},#{fenceName},#{fenceType},#{fencePosition},#{state}) + + + + + diff --git a/cloud-modules/cloud-modules-enterprise/pom.xml b/cloud-modules/cloud-modules-openbusiness/pom.xml similarity index 77% rename from cloud-modules/cloud-modules-enterprise/pom.xml rename to cloud-modules/cloud-modules-openbusiness/pom.xml index 78e4f69..bae1e50 100644 --- a/cloud-modules/cloud-modules-enterprise/pom.xml +++ b/cloud-modules/cloud-modules-openbusiness/pom.xml @@ -8,16 +8,16 @@ cloud-modules 3.6.3 - - cloud-modules-enterprise - pom - cloud-modules-enterprise 企业 + cloud-modules-openbusiness企业运营 + cloud-modules-openbusiness + pom - cloud-modules-enterprise-common - cloud-modules-enterprise-server + cloud-modules-openbusiness-server + cloud-modules-openbusiness-common + 17 17 diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/CloudParsingApplication.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/CloudParsingApplication.java deleted file mode 100644 index 673e3c5..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/CloudParsingApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.parsing; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * 系统模块 - * - * @author muyu - */ -@EnableCustomConfig -//@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class CloudParsingApplication { - public static void main(String[] args) { - SpringApplication.run(CloudParsingApplication.class, args); - } - -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessageController.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessageController.java deleted file mode 100644 index 32b038c..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/controller/SysCarMessageController.java +++ /dev/null @@ -1,182 +0,0 @@ -package com.muyu.parsing.controller; - -import com.alibaba.fastjson2.JSONObject; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.kafka.constants.KafkaConstants; -import com.muyu.common.security.annotation.RequiresPermissions; -import com.muyu.parsing.domain.KafKaData; -import com.muyu.parsing.domain.SysCarMessage; -import com.muyu.parsing.domain.resp.SysMessageResp; -import com.muyu.parsing.service.ISysCarMessageService; -import jakarta.servlet.http.HttpServletResponse; -import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerConfig; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.apache.kafka.common.serialization.StringSerializer; -import org.eclipse.paho.client.mqttv3.*; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.*; - -import javax.annotation.Resource; -import java.util.*; -import java.util.concurrent.CompletableFuture; -import java.util.concurrent.ExecutionException; - -/** - * 车辆报文记录Controller - * - * @author muyu - * @date 2024-09-18 - */ -@Slf4j -@RestController -@RequestMapping("/messageInfo") -public class SysCarMessageController extends BaseController { - @Resource - private ISysCarMessageService sysCarMessageService; - @Resource - private KafkaProducer kafkaProducer; - static String TEST = "56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56 56"; - -// @Autowired -// private KafkaTemplate kafkaTemplate; - - - /** - * 查询车辆报文记录列表 - */ -// @RequiresPermissions("message:message:list") - @Transactional - @GetMapping("/list") - public Result> list(SysCarMessage sysCarMessage) throws ExecutionException, InterruptedException { - - List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); - if (list == null || list.isEmpty()) { - return Result.error(); //为空返回错误信息 - } - List kafKaDataList = new ArrayList<>(); - String[] test = TEST.split(" "); - String[] results = new String[list.size()]; -// HashMap> futures = new HashMap<>(); - for (SysCarMessage carMessage : list) { - int start = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; - int end = Integer.parseInt(carMessage.getMessageEndIndex()); - StringBuilder hexBuilder = new StringBuilder(); - for (int i = start; i < end; i++) { - hexBuilder.append(test[i]); - } - String hex = hexBuilder.toString(); - char[] result = new char[hex.length() / 2]; - for (int x = 0; x < hex.length(); x += 2) { - int high = Character.digit(hex.charAt(x), 16); - int low = Character.digit(hex.charAt(x + 1), 16); - result[x / 2] = (char) ((high << 4) + low); - } - String value = new String(result); - kafKaDataList.add(KafKaData.builder() - .key(carMessage.getMessageTypeCode()) - .label(carMessage.getMessageTypeCode()) - .value(value) - .type("String") - .build()); - } - -// String jsonString = """ -// [{ -// "key": "vin", -// "label": "VIN码", -// "type": "String", -// "value": "vin131413534474" -// },{ -// "key": "timestamp", -// "label": "时间戳", -// "type": "String", -// "value": "1727525252127" -// },{ -// "key": "latitude", -// "label": "纬度", -// "type": "String", -// "value": "66.898" -// },{ -// "key": "longitude", -// "label": "经度", -// "type": "String", -// "value": "99.124" -// }]"""; - String jsonString = JSONObject.toJSONString(kafKaDataList); - ProducerRecord producerRecord = new ProducerRecord<>(KafkaConstants.KafkaTopic, jsonString); - kafkaProducer.send(producerRecord); - log.info("消息发送成功：{}", jsonString); - return Result.success(list); - } - - - @RequiresPermissions("message:message:dobList") - @GetMapping("/dobList") - public Result> dobList(SysMessageResp sysMessageResp) { - List list = sysCarMessageService.dobList(sysMessageResp); - return Result.success(list); - } - - - /** - * 导出车辆报文记录列表 - */ - @RequiresPermissions("message:message:export") - @PostMapping("/export") - public void export(HttpServletResponse response, SysCarMessage sysCarMessage) { - List list = sysCarMessageService.selectSysCarMessageList(sysCarMessage); - ExcelUtil util = new ExcelUtil(SysCarMessage.class); - util.exportExcel(response, list, "车辆报文记录数据"); - } - - /** - * 获取车辆报文记录详细信息 - */ - @RequiresPermissions("message:message:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) { - return success(sysCarMessageService.selectSysCarMessageById(id)); - } - - /** - * 新增车辆报文记录 - */ - @RequiresPermissions("message:message:add") - @PostMapping - public Result add( - @Validated @RequestBody SysCarMessage sysCarMessage) { - if (sysCarMessageService.checkIdUnique(sysCarMessage)) { - return error("新增 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录已存在"); - } - return toAjax(sysCarMessageService.save(sysCarMessage)); - } - - /** - * 修改车辆报文记录 - */ - @RequiresPermissions("message:message:edit") - @PutMapping - public Result edit( - @Validated @RequestBody SysCarMessage sysCarMessage) { - if (!sysCarMessageService.checkIdUnique(sysCarMessage)) { - return error("修改 车辆报文记录 '" + sysCarMessage + "'失败，车辆报文记录不存在"); - } - return toAjax(sysCarMessageService.updateById(sysCarMessage)); - } - - /** - * 删除车辆报文记录 - */ - @RequiresPermissions("message:message:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) { - sysCarMessageService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } - -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/KafKaData.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/KafKaData.java deleted file mode 100644 index c188170..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/KafKaData.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.muyu.parsing.domain; - -import lombok.*; - -import java.io.Serializable; - -/** - * 报文消息 ktlv - * - * @ClassName KafKaData - * @Description 描述 - * @Author Chen - * @Date 2024/9/28 20:41 - */ - -@Data -@AllArgsConstructor -@NoArgsConstructor -@Builder -@ToString// -public class KafKaData implements Serializable { - private String key; - private String value; - private String type; - private String label; -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/SysCarMessage.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/SysCarMessage.java deleted file mode 100644 index 8683e7b..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/SysCarMessage.java +++ /dev/null @@ -1,67 +0,0 @@ -package com.muyu.parsing.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 lombok.*; -import lombok.experimental.SuperBuilder; -import org.apache.commons.lang3.builder.ToStringBuilder; -import org.apache.commons.lang3.builder.ToStringStyle; - -import java.io.Serializable; - -/** - * 车辆报文记录对象 sys_car_message - * - * @author muyu - * @date 2024-09-18 - */ - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("sys_car_message") -public class SysCarMessage implements Serializable { - private static final long serialVersionUID = 1L; - - /** 自增主键 */ - @TableId( type = IdType.AUTO) - private Long id; - - /** 车辆型号编码 */ - @Excel(name = "车辆型号编码") - private String modelCode; - - /** 车辆报文类型编码 */ - @Excel(name = "i") - private String messageTypeCode; - - /** 开始位下标 */ - @Excel(name = "开始位下标") - private String messageStartIndex; - - /** 结束位下标 */ - @Excel(name = "结束位下标") - private String messageEndIndex; - - /** 报文分类 */ - @Excel(name = "报文分类") - private String messageType; - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("modelCode", getModelCode()) - .append("messageTypeCode", getMessageTypeCode()) - .append("messageStartIndex", getMessageStartIndex()) - .append("messageEndIndex", getMessageEndIndex()) - .append("messageType", getMessageType()) - .toString(); - } -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/resp/SysMessageResp.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/resp/SysMessageResp.java deleted file mode 100644 index b218863..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/domain/resp/SysMessageResp.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.muyu.parsing.domain.resp; - -import lombok.Data; - -/** - * 车辆报文类型对象 sys_message_type - * - * @author muyu - * @date 2024-09-18 - */ - -@Data -public class SysMessageResp { - private static final long serialVersionUID = 1L; - private Long id; - private String modelCode; - private String messageTypeCode; - private String messageStartIndex; - private String messageEndIndex; - private String messageType; - private String messageName; -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mapper/SysCarMessageMapper.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mapper/SysCarMessageMapper.java deleted file mode 100644 index df2e16a..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mapper/SysCarMessageMapper.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.muyu.parsing.mapper; - -import com.baomidou.mybatisplus.core.mapper.BaseMapper; - -import com.muyu.parsing.domain.SysCarMessage; -import com.muyu.parsing.domain.resp.SysMessageResp; -import org.apache.ibatis.annotations.Mapper; - -import java.util.List; - -/** - * 车辆报文记录Mapper接口 - * - * @author muyu - * @date 2024-09-18 - */ -@Mapper -public interface SysCarMessageMapper extends BaseMapper{ - ListdobList(SysMessageResp sysMessageResp); -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/MqttTest.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/MqttTest.java deleted file mode 100644 index 43dd7d8..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/mqtt/MqttTest.java +++ /dev/null @@ -1,127 +0,0 @@ -package com.muyu.parsing.mqtt; - -import com.alibaba.fastjson2.JSONObject; -import com.muyu.common.kafka.constants.KafkaConstants; -import com.muyu.parsing.domain.KafKaData; -import com.muyu.parsing.domain.SysCarMessage; -import com.muyu.parsing.service.impl.SysCarMessageServiceImpl; -import lombok.extern.slf4j.Slf4j; -import org.apache.kafka.clients.producer.KafkaProducer; -import org.apache.kafka.clients.producer.ProducerRecord; -import org.eclipse.paho.client.mqttv3.*; -import org.springframework.stereotype.Component; - -import javax.annotation.PostConstruct; -import javax.annotation.Resource; -import java.util.ArrayList; -import java.util.List; - - -/** - * mqtt - * - * @ClassName MqttTest - * @Description 描述 - * @Author Chen - * @Date 2024/9/28 23:49 - */ -@Slf4j -@Component -public class MqttTest { - private static final Integer ID = 1; - private static final Integer CODE = 1; - - @Resource - private KafkaProducer kafkaProducer; - @Resource - private SysCarMessageServiceImpl sysCarMessageService; - - @PostConstruct - public void Test() { - String topic = "vehicle"; - String content = "Message from MqttPublishSample"; - int qos = 2; - String broker = "tcp://106.15.136.7:1883"; - String clientId = "JavaSample"; - - try { - // 第三个参数为空，默认持久化策略 - MqttClient sampleClient = new MqttClient(broker, clientId); - MqttConnectOptions connOpts = new MqttConnectOptions(); - connOpts.setCleanSession(true); - System.out.println("Connecting to broker: " + broker); - sampleClient.connect(connOpts); - sampleClient.subscribe(topic, 0); - sampleClient.setCallback(new MqttCallback() { - // 连接丢失 - @Override - public void connectionLost(Throwable throwable) { - - } - - // 连接成功 - @Override - public void messageArrived(String s, MqttMessage mqttMessage) throws Exception { - List list = sysCarMessageService.selectSysCarMessageLists(ID); - String string = new String(mqttMessage.getPayload()); - log.info(new String(mqttMessage.getPayload())); - List kafKaDataList = new ArrayList<>(); - String[] test = string.split(" "); -// String[] results = new String[list.size()]; - for (SysCarMessage carMessage : list) { - int start = Integer.parseInt(carMessage.getMessageStartIndex()) - 1; - int end = Integer.parseInt(carMessage.getMessageEndIndex()); - StringBuilder hexBuilder = new StringBuilder(); - for (int i = start; i < end; i++) { - hexBuilder.append(test[i]); - } - String hex = hexBuilder.toString(); - char[] result = new char[hex.length() / 2]; - for (int x = 0; x < hex.length(); x += 2) { - int high = Character.digit(hex.charAt(x), 16); - int low = Character.digit(hex.charAt(x + 1), 16); - result[x / 2] = (char) ((high << 4) + low); - } - String value = new String(result); - kafKaDataList.add(KafKaData.builder() - .key(carMessage.getMessageTypeCode()) - .label(carMessage.getMessageTypeCode()) - .value(value) - .type(carMessage.getMessageType()) - .build()); - } - kafKaDataList.add(KafKaData.builder() - .key("firmCode") - .label("企业编码") - .value("firm01") - .type("String") - .build()); - String jsonString = JSONObject.toJSONString(kafKaDataList); - - ProducerRecord producerRecord = new ProducerRecord<>(KafkaConstants.KafkaTopic, jsonString); - kafkaProducer.send(producerRecord); - log.info("kafka投产：{}", jsonString); -// HashMap stringStringHashMap = new HashMap<>(); -// kafKaDataList.forEach(data -> stringStringHashMap.put(data.getKey(), data.getValue())); -// jsonString = JSONObject.toJSONString(stringStringHashMap); -// System.out.println(jsonString); - } - - - // 接收信息 - @Override - public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) { - - } - - }); - } catch (MqttException me) { - System.out.println("reason " + me.getReasonCode()); - System.out.println("msg " + me.getMessage()); - System.out.println("loc " + me.getLocalizedMessage()); - System.out.println("cause " + me.getCause()); - System.out.println("excep " + me); - me.printStackTrace(); - } - } -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/service/ISysCarMessageService.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/service/ISysCarMessageService.java deleted file mode 100644 index 66338af..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/service/ISysCarMessageService.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.muyu.parsing.service; - -import com.baomidou.mybatisplus.extension.service.IService; -import com.muyu.parsing.domain.SysCarMessage; -import com.muyu.parsing.domain.resp.SysMessageResp; - - -import java.util.List; - -/** - * 车辆报文记录Service接口 - * - * @author muyu - * @date 2024-09-18 - */ -public interface ISysCarMessageService extends IService { - - ListdobList(SysMessageResp sysMessageResp); - /** - * 精确查询车辆报文记录 - * - * @param id 车辆报文记录主键 - * @return 车辆报文记录 - */ - public SysCarMessage selectSysCarMessageById(Long id); - - /** - * 查询车辆报文记录列表 - * - * @param sysCarMessage 车辆报文记录 - * @return 车辆报文记录集合 - */ - public List selectSysCarMessageList(SysCarMessage sysCarMessage); - - /** - * 判断 车辆报文记录 id是否唯一 - * @param sysCarMessage 车辆报文记录 - * @return 结果 - */ - Boolean checkIdUnique(SysCarMessage sysCarMessage); - -// Boolean checkById(SysCarMessage sysCarMessage); - -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/service/impl/SysCarMessageServiceImpl.java b/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/service/impl/SysCarMessageServiceImpl.java deleted file mode 100644 index 2b7bdc8..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/java/com/muyu/parsing/service/impl/SysCarMessageServiceImpl.java +++ /dev/null @@ -1,97 +0,0 @@ -package com.muyu.parsing.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.parsing.domain.SysCarMessage; -import com.muyu.parsing.domain.resp.SysMessageResp; -import com.muyu.parsing.mapper.SysCarMessageMapper; -import com.muyu.parsing.service.ISysCarMessageService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.List; - -/** - * 车辆报文记录Service业务层处理 - * - * @author muyu - * @date 2024-09-18 - */ -@Service -public class SysCarMessageServiceImpl - extends ServiceImpl - implements ISysCarMessageService { - @Autowired - private SysCarMessageMapper mapper; - - @Override - public List dobList(SysMessageResp sysMessageResp) { - return mapper.dobList(sysMessageResp); - } - - /** - * 精确查询车辆报文记录 - * - * @param id 车辆报文记录主键 - * @return 车辆报文记录 - */ - @Override - public SysCarMessage selectSysCarMessageById(Long id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(SysCarMessage::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询车辆报文记录列表 - * - * @param sysCarMessage 车辆报文记录 - * @return 车辆报文记录 - */ - @Override - public List selectSysCarMessageList(SysCarMessage sysCarMessage) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(sysCarMessage.getModelCode())) { - queryWrapper.eq(SysCarMessage::getModelCode, sysCarMessage.getModelCode()); - } - if (StringUtils.isNotEmpty(sysCarMessage.getMessageType())) { - queryWrapper.eq(SysCarMessage::getMessageType, sysCarMessage.getMessageType()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * - * @param sysCarMessage 车辆报文记录 - * @return 车辆报文记录 - */ - @Override - public Boolean checkIdUnique(SysCarMessage sysCarMessage) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarMessage::getId, sysCarMessage.getId()); - return this.count(queryWrapper) > 0; - } - - public List selectSysCarMessageLists(int id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysCarMessage::getModelCode, id); -// queryWrapper.eq(SysCarMessage::getMessageType, modelCode); - return this.list(queryWrapper); - } -// -// @Override -// public Boolean checkById(SysMessageType sysMessageType) { -// LambdaQueryWrapper sysCarMessageLambdaQueryWrapper = new LambdaQueryWrapper<>(); -// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); -//// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::getMessageType, sysMessageType); -// sysCarMessageLambdaQueryWrapper.eq(SysCarMessage::get, sysMessageType); -//// return this.count(sysCarMessageLambdaQueryWrapper) > 0; -// } - -} diff --git a/cloud-modules/cloud-modules-parsing/src/main/resources/banner.txt b/cloud-modules/cloud-modules-parsing/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-parsing/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-parsing/src/main/resources/bootstrap.yml deleted file mode 100644 index e940514..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,77 +0,0 @@ -# Tomcat -server: - port: 10010 - -# nacos线上地址 -nacos: - addr: 49.235.136.60:8848 - user-name: nacos - password: nacos - namespace: wyh -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-parsing - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # # nacos用户名 - # username: ${nacos.user-name} - # # nacos密码 - # password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # # nacos用户名 - # username: ${nacos.user-name} - # # nacos密码 - # password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # rabbit 配置文件 - - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG -#mqtt: -# host:tcp://172.0.0.1:1883 -# userName: root -# passWord: 11 -### MQTT## -mqtt: - host: tcp://192.168.10.198:1883 - userName: root - passWord: 123456 - qos: 1 - clientId: ClientId_local #ClientId_local必须唯一 比如你已经定了叫ABC 那你就一直叫ABC 其他地方就不要使用ABC了 - timeout: 10 - keepalive: 20 - topic1: A/pick/warn/# #符号是代表整个warn下面的全部子主题 没有理解的话 可以百度仔细理解一下 - topic2: A/cmd/resp - topic3: ABCF - topic4: ABCH diff --git a/cloud-modules/cloud-modules-parsing/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-parsing/src/main/resources/logback/dev.xml deleted file mode 100644 index d1b5629..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-parsing/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-parsing/src/main/resources/logback/prod.xml deleted file mode 100644 index 76a0d8f..0000000 --- a/cloud-modules/cloud-modules-parsing/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/pom.xml b/cloud-modules/cloud-modules-system-saas/pom.xml deleted file mode 100644 index f685a22..0000000 --- a/cloud-modules/cloud-modules-system-saas/pom.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-system-saas - - cloud-modules-system-saas saas - - - 17 - 17 - UTF-8 - - - - - com.muyu - cloud-common-saas - - - - com.muyu - cloud-common-system - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - - ${project.artifactId} - - - org.springframework.boot - spring-boot-maven-plugin - - - - repackage - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt b/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml deleted file mode 100644 index 220dec5..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,59 +0,0 @@ -# Tomcat -server: - port: 9704 - -# nacos线上地址 -nacos: - addr: 47.116.173.119:8848 - user-name: nacos - password: nacos - namespace: one-saas -# SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all -# Spring -spring: - amqp: - deserialization: - trust: - all: true - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-system-saas - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml deleted file mode 100644 index 44768a1..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml deleted file mode 100644 index 727021d..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml deleted file mode 100644 index 727021d..0000000 --- a/cloud-modules/cloud-modules-system-saas/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-system/pom.xml b/cloud-modules/cloud-modules-system/pom.xml index b362f24..0eb3e23 100644 --- a/cloud-modules/cloud-modules-system/pom.xml +++ b/cloud-modules/cloud-modules-system/pom.xml @@ -17,6 +17,11 @@ + + com.alibaba + druid-spring-boot-starter + 1.2.20 + diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index aad1892..5a21d9d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -72,8 +72,10 @@ public class SysDeptController extends BaseController { return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在"); } dept.setCreateBy(SecurityUtils.getUsername()); - SysDept sysDept = deptService.selectDeptById(dept.getParentId()); - dept.setFirmCode(sysDept.getFirmCode()); + if (StringUtils.isEmpty(dept.getFirmCode())){ + SysDept sysDept = deptService.selectDeptById(dept.getParentId()); + dept.setFirmCode(sysDept.getFirmCode()); + } return toAjax(deptService.insertDept(dept)); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java index e5fa720..11a1744 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysFirmController.java @@ -1,20 +1,38 @@ package com.muyu.system.controller; -import com.muyu.system.service.ISysFirmService; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysDept; +import com.muyu.common.system.domain.SysEnt; +import com.muyu.common.system.domain.SysRole; +import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysFirm; +import com.muyu.system.domain.SysMenu; +import com.muyu.system.domain.req.SysFirmReq; +import com.muyu.system.service.ISysFirmService; +import com.muyu.system.service.SysEntService; import jakarta.servlet.http.HttpServletResponse; +import org.springframework.core.io.ClassPathResource; +import org.springframework.core.io.support.EncodedResource; +import org.springframework.jdbc.datasource.init.ScriptUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.sql.Statement; import java.util.Arrays; import java.util.List; +import java.util.Objects; +import java.util.regex.Matcher; +import java.util.regex.Pattern; /** * 企业基础信息Controller @@ -28,8 +46,20 @@ public class SysFirmController extends BaseController { @Resource private ISysFirmService sysFirmService; + @Resource + private SysEntService sysEntService; + @Resource + private SysRoleController sysRoleController; + @Resource + private SysMenuController sysMenuController; + @Resource + private SysUserController sysUserController; + @Resource + private SysDeptController sysDeptController; + private static final String FIRM_CREDIT_CODE = "^[0-9A-HJ-NPQRTUWXY]{2}\\d{6}[0-9A-HJ-NPQRTUWXY]{10}$"; + /** * 查询企业基础信息列表 */ @@ -69,16 +99,141 @@ public class SysFirmController extends BaseController */ @RequiresPermissions("firm:firmInfo:add") @PostMapping - public Result add( - @Validated @RequestBody SysFirm sysFirm) - { + public Result add(@Validated @RequestBody SysFirmReq sysFirm) { + String firmName = sysFirm.getFirmName(); + String firmCode = sysFirm.getFirmCode(); + String firmCreditCode = sysFirm.getFirmCreditCode(); + + // 验证企业基础信息是否为空 + if (StringUtils.isAllBlank(firmName, firmCode, firmCreditCode)) { + return error("新增 企业基础信息 '" + sysFirm + "'失败，企业基础信息信息为空"); + } + + // 检查企业基础信息是否已存在 if (sysFirmService.checkIdUnique(sysFirm)) { return error("新增 企业基础信息 '" + sysFirm + "'失败，企业基础信息已存在"); } + + // 验证统一社会信用代码格式 + if (!isValidFirmCreditCode(firmCreditCode)) { + return error("新增 企业基础信息 '" + sysFirm + "'失败，统一社会信用代码格式不正确"); + } + + //添加角色与角色权限 + SysRole role = new SysRole(); + role.setFirmCode(firmCode); + role.setRoleName(firmName+"超级管理员"); + role.setRoleKey(firmCode+"_admin"); + role.setRoleSort(1); + role.setDataScope("1"); + role.setMenuCheckStrictly(true); + role.setDeptCheckStrictly(true); + role.setStatus("0"); + role.setDelFlag("0"); + SysMenu sysMenu = new SysMenu(); + Result> sysMenus = sysMenuController.list(sysMenu); + List menulist = sysMenus.getData(); + Long[] menuIds = menulist.stream() + .map(SysMenu::getMenuId) + .filter(Objects::nonNull) // 过滤掉 null 值 + .toArray(Long[]::new); + role.setCreateBy(SecurityUtils.getUsername()); + role.setMenuIds(menuIds); + + sysRoleController.add(role); + + //添加部门 + SysDept sysDept = new SysDept(); + Result list = sysDeptController.list(sysDept); + List depts = (List) list.getData(); + sysDept.setFirmCode(firmCode); + sysDept.setParentId(100L); + sysDept.setDeptName(firmName); + sysDept.setAncestors("0,100"); + sysDept.setOrderNum(3); + sysDept.setStatus("0"); + sysDept.setDelFlag("0"); + + sysDeptController.add(sysDept); + SysDept sysDepts = depts.get(depts.size() - 1); + + // 设置创建者和状态 sysFirm.setCreateBy(SecurityUtils.getUsername()); - return toAjax(sysFirmService.save(sysFirm)); + + //添加用户与用户角色 + SysUser sysUser = new SysUser(); + sysUser.setFirmCode(firmCode); + sysUser.setUserName(sysFirm.getUserName()); + sysUser.setNickName(sysFirm.getUserName()); + sysUser.setPassword(sysFirm.getPassword()); + sysUser.setDeptId(sysDept.getDeptId()); + sysUser.setDept(sysDepts); + Result> resultRole = sysRoleController.list(role); + List roleList = resultRole.getData().getRows(); + Long[] roleIds = roleList.stream() + .map(SysRole::getRoleId) + .filter(Objects::nonNull) // 过滤掉 null 值 + .toArray(Long[]::new); + sysUser.setRoleIds(new Long[]{roleIds[roleList.size() - 1]}); + sysUserController.add(sysUser); + + // 创建数据库和表 + try { + createDatabaseAndTables(firmCode); + } catch (SQLException e) { + return error("数据库操作失败: " + e.getMessage()); + } + + // 保存企业信息 + SysEnt sysEnt = new SysEnt(); + sysEnt.setUserName("root"); + sysEnt.setPassword("bawei2112A"); + sysEnt.setEntCode(firmCode); + sysEnt.setDbName(firmCode); + sysEnt.setIp("47.116.173.119"); + sysEnt.setPort(3306); + sysEntService.save(sysEnt); + + sysFirm.setMemberId(1L); + + return toAjax(sysFirmService.save((SysFirm) sysFirm)); } + // + private boolean isValidFirmCreditCode(String firmCreditCode) { + Pattern pattern = Pattern.compile(FIRM_CREDIT_CODE); + Matcher matcher = pattern.matcher(firmCreditCode); + return matcher.matches(); + } + + private void createDatabaseAndTables(String firmCode) throws SQLException { + String url = "jdbc:mysql://47.116.173.119:3306/?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; + try (Connection connection = DriverManager.getConnection(url, "root", "bawei2112A"); + Statement statement = connection.createStatement()) { + + // 创建数据库 + statement.executeUpdate("CREATE DATABASE IF NOT EXISTS " + firmCode); + } + + // 切换到新的数据库连接 + Connection connection = null; + try { + url = "jdbc:mysql://47.116.173.119:3306/" + firmCode + "?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8"; + String user = "root"; + String pwd = "bawei2112A"; + String driverClassName = "com.mysql.cj.jdbc.Driver"; + Class.forName(driverClassName); + connection = DriverManager.getConnection(url, user, pwd); + } catch (ClassNotFoundException e) { + throw new RuntimeException(e); + } + ClassPathResource rc = new ClassPathResource("static/saas_operation.sql"); + EncodedResource er = new EncodedResource(rc, "utf-8"); + ScriptUtils.executeSqlScript(connection, er); + + } + + /** * 修改企业基础信息 */ @@ -98,10 +253,11 @@ public class SysFirmController extends BaseController * 删除企业基础信息 */ @RequiresPermissions("firm:firmInfo:remove") - @DeleteMapping("/{ids}") + @DeleteMapping("/{ids}") public Result remove(@PathVariable("ids") Long[] ids) { sysFirmService.removeBatchByIds(Arrays.asList(ids)); return success(); } + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java new file mode 100644 index 0000000..2bd5c2c --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMemberController.java @@ -0,0 +1,28 @@ +package com.muyu.system.controller; + +import com.muyu.common.core.domain.Result; +import com.muyu.common.system.domain.SysMember; +import com.muyu.system.service.SysMemberService; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.annotation.Resource; +import java.util.List; +/* +会员等级 + */ +@RestController +@RequestMapping("/member") +public class SysMemberController { + @Resource + private SysMemberService service; + + /** + * 查询会员等级列表 + */ + @GetMapping("/list") + private Result> selectList(SysMember member) { + return Result.success(service.selectSysMemberList(member)); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index 2149ace..063ca65 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -33,7 +33,7 @@ public class SysMenuController extends BaseController { */ @RequiresPermissions("system:menu:list") @GetMapping("/list") - public Result list (SysMenu menu) { + public Result> list (SysMenu menu) { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuList(menu, userId); return success(menus); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java index bc5698b..204f886 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysFirm.java @@ -51,6 +51,9 @@ public class SysFirm extends BaseEntity{ @Excel(name = "启用状态(1.开业 2.停业 3.休业)") private String state; + @Excel(name = "会员等级") + private Long memberId; + @Override @@ -67,6 +70,7 @@ public class SysFirm extends BaseEntity{ .append("updateBy", getUpdateBy()) .append("updateTime", getUpdateTime()) .append("remark", getRemark()) + .append("memberId", getMemberId()) .toString(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java new file mode 100644 index 0000000..a7bd9aa --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/req/SysFirmReq.java @@ -0,0 +1,27 @@ +package com.muyu.system.domain.req; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.system.domain.SysFirm; +import lombok.*; +import lombok.experimental.SuperBuilder; + +@Data +@Setter +@Getter +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SysFirmReq extends SysFirm { + + /** + * 用户账号 + */ + @Excel(name = "登录名称") + private String userName; + /** + * 密码 + */ + private String password; + + +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java new file mode 100644 index 0000000..965670d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysMemberMapper.java @@ -0,0 +1,7 @@ +package com.muyu.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.muyu.common.system.domain.SysMember; + +public interface SysMemberMapper extends BaseMapper { +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java new file mode 100644 index 0000000..2c52ddb --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMemberService.java @@ -0,0 +1,10 @@ +package com.muyu.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.system.domain.SysMember; + +import java.util.List; + +public interface SysMemberService extends IService { + public List selectSysMemberList(SysMember sysMember); +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 29bfb07..2c4ab14 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -33,6 +33,7 @@ public interface SysMenuService extends IService { */ public List selectMenuList (SysMenu menu, Long userId); + /** * 根据用户ID查询权限 * diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java index fc88b1a..5e5ffcd 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysFirmServiceImpl.java @@ -2,11 +2,13 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.github.pagehelper.util.StringUtil; import com.muyu.system.domain.SysFirm; import com.muyu.system.mapper.SysFirmMapper; import com.muyu.system.service.ISysFirmService; import org.springframework.stereotype.Service; import org.springframework.util.Assert; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import java.util.List; @@ -49,7 +51,15 @@ public class SysFirmServiceImpl */ @Override public List selectSysFirmList(SysFirm sysFirm) { - return sysFirmMapper.selectSysFirmList(sysFirm); + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtil.isNotEmpty(sysFirm.getFirmCreditCode()), + SysFirm::getFirmCreditCode, sysFirm.getFirmCreditCode()); + queryWrapper.eq(StringUtil.isNotEmpty(sysFirm.getFirmCode()), + SysFirm::getFirmCode, sysFirm.getFirmCode()); + queryWrapper.like(StringUtil.isNotEmpty(sysFirm.getFirmName()), + SysFirm::getFirmName, sysFirm.getFirmName()); + List sysFirmList = sysFirmMapper.selectSysFirmList(sysFirm); + return sysFirmList; } /** @@ -60,7 +70,11 @@ public class SysFirmServiceImpl @Override public Boolean checkIdUnique(SysFirm sysFirm) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysFirm::getId, sysFirm.getId()); + queryWrapper.eq(SysFirm::getFirmCreditCode, sysFirm.getFirmCreditCode()) + .or() + .eq(SysFirm::getFirmCode, sysFirm.getFirmCode()) + .or() + .eq(SysFirm::getFirmName, sysFirm.getFirmName()); return this.count(queryWrapper) > 0; } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java new file mode 100644 index 0000000..a43ec93 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMemberServiceImpl.java @@ -0,0 +1,27 @@ +package com.muyu.system.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.common.system.domain.SysMember; +import com.muyu.system.mapper.SysMemberMapper; +import com.muyu.system.service.SysMemberService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class SysMemberServiceImpl extends + ServiceImpl + implements SysMemberService { + + + @Override + public List selectSysMemberList(SysMember sysMember) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + if(sysMember.getMemberId()!=null){ + queryWrapper.eq(SysMember::getMemberId, sysMember.getMemberId()); + } + return this.list(queryWrapper); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index 0a17000..f796cb2 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.UserConstants; @@ -71,6 +72,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl return menuList; } + /** * 根据用户ID查询权限 * diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index 2db1105..8d3a361 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -4,10 +4,10 @@ server: # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 49.235.136.60:8848 user-name: nacos password: nacos - namespace: one-saas + namespace: wyh # SPRING_AMQP_DESERIALIZATION_TRUST_ALL=true spring.amqp.deserialization.trust.all # Spring spring: @@ -29,18 +29,18 @@ spring: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} config: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} # 配置文件格式 diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml index f110ef9..3c02e7b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -182,7 +182,7 @@ update sys_dept - set firm_code = CONCAT(firm_code,'_',#{deptId}) + set firm_code = CONCAT(firm_code) where dept_id = #{deptId} diff --git a/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql b/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql new file mode 100644 index 0000000..542944d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/resources/static/saas_operation.sql @@ -0,0 +1,294 @@ +/* + Navicat Premium Data Transfer + + Source Server : 47.116.173.119 + Source Server Type : MySQL + Source Server Version : 80401 + Source Host : 47.116.173.119:3306 + Source Schema : saas_operation + + Target Server Type : MySQL + Target Server Version : 80401 + File Encoding : 65001 + + Date: 30/09/2024 10:21:52 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for sys_car +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car`; +CREATE TABLE `sys_car` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码', + `car_plate` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆车牌号', + `car_brand` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆品牌', + `car_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号', + `car_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆车型(如客车,卡车,公交车等)', + `car_last_join_time` datetime NULL DEFAULT NULL COMMENT '最后一次连线时间', + `car_last_offline_time` datetime NULL DEFAULT NULL COMMENT '最后一次离线时间', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '2' COMMENT '启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中', + `create_by` int NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` int NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆基础信息表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_car_details +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car_details`; +CREATE TABLE `sys_car_details` ( + `id` int NOT NULL COMMENT '车辆ID', + `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码', + `car_motor_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电机厂商', + `car_motor_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电机型号', + `car_battery_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电池厂商', + `car_battery_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电池型号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆详细信息表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_car_fault +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car_fault`; +CREATE TABLE `sys_car_fault` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `fault_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆故障编码', + `fault_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障类型', + `fault_label` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障标签', + `fault_bit` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障位', + `fault_value` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障值', + `fault_warn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '故障等级', + `fault_status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报警状态（Y.是，N.否）', + `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆故障表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_car_message +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car_message`; +CREATE TABLE `sys_car_message` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `model_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号编码', + `message_type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆报文类型编码', + `message_start_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开始位下标', + `message_end_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '结束位下标', + `message_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文记录表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_corpuscle_fence +-- ---------------------------- +DROP TABLE IF EXISTS `sys_corpuscle_fence`; +CREATE TABLE `sys_corpuscle_fence` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `fence_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏编码', + `fence_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏名称', + `fence_type` int NOT NULL DEFAULT 1 COMMENT '围栏类型(1.驶入 2.驶出)', + `fence_position` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏位置', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '1' COMMENT '启用状态(1.启用 2.停用)', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '电子围栏表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_ent +-- ---------------------------- +DROP TABLE IF EXISTS `sys_ent`; +CREATE TABLE `sys_ent` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `ent_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码', + `ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业数据库IP', + `port` int NULL DEFAULT NULL COMMENT '数据库端口', + `db_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '连接数据库名称', + `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户名', + `password` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '密码', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业数据库信息记录表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_fence_group +-- ---------------------------- +DROP TABLE IF EXISTS `sys_fence_group`; +CREATE TABLE `sys_fence_group` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `group_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组编码', + `group_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组名称', + `group_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组类型', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '启用状态', + `create_by` int NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` int NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_fence_group_mid +-- ---------------------------- +DROP TABLE IF EXISTS `sys_fence_group_mid`; +CREATE TABLE `sys_fence_group_mid` ( + `group_id` int NOT NULL COMMENT '围栏组id', + `fence_id` int NOT NULL COMMENT '围栏id', + `new_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`group_id`, `fence_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组连接表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_firm +-- ---------------------------- +DROP TABLE IF EXISTS `sys_firm`; +CREATE TABLE `sys_firm` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `firm_credit_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '统一社会信用代码', + `firm_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码', + `firm_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业名称', + `firm_logs` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业logs', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '启用状态(1.开业 2.停业 3.休业)', + `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业基础信息表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_message_type +-- ---------------------------- +DROP TABLE IF EXISTS `sys_message_type`; +CREATE TABLE `sys_message_type` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `message_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文编码', + `message_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文名称', + `message_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类', + `message_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文字段类型', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文类型表' ROW_FORMAT = Dynamic; +-- ---------------------------- +-- Records of sys_message_type +-- ---------------------------- +INSERT INTO `sys_message_type` VALUES (1, 'vin', 'VIN码', 'identification', 'String'); +INSERT INTO `sys_message_type` VALUES (2, 'timestamp', '时间戳', 'identification', 'String'); +INSERT INTO `sys_message_type` VALUES (3, 'longitude', '经度', 'identification', 'String'); +INSERT INTO `sys_message_type` VALUES (4, 'latitude', '纬度', 'identification', 'String'); +INSERT INTO `sys_message_type` VALUES (5, 'speed', '车速', 'identification', 'String'); +INSERT INTO `sys_message_type` VALUES (6, 'TM', '总里程', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (7, 'TV', '总电压', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (8, 'CC', '总电流', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (9, 'IR', '绝缘电阻', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (10, 'GP', '档位', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (11, 'APTV', '加速踏板行程值', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (12, 'BPTV', '制动踏板行程值', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (13, 'SFC', '燃料消耗率', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (14, 'MCT', '电机控制器温度', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (15, 'MS', '电机转速', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (16, 'MTO', '电机转矩', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (17, 'MTE', '电机温度', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (18, 'MV', '电机电压', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (19, 'MC', '电机电流', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (20, 'PBRSOC', '动力电池剩余电量SOC', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (21, 'MACSFP', '当前状态允许的最大反馈功率', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (22, 'CSATMDP', '当前状态允许最大放电功率', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (23, 'BMS', 'BMS自检计数器', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (24, 'CADC', '动力电池充放电电流', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (25, 'PBLETVV3', '动力电池负载端总电压V3', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (26, 'SMV', '单次最大电压', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (27, 'MVOAB', '单体电池最低电压', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (28, 'MAXBT', '单体电池最高温度', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (29, 'MINBT', '单体电池最低温度', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (30, 'PBAC', '动力电池可用容量', 'information', 'String'); +INSERT INTO `sys_message_type` VALUES (31, 'VS', '车辆状态', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (32, 'CS', '充电状态', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (33, 'RS', '运行状态', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (34, 'SOC', 'SOC', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (35, 'RESDWC', '可充电储能装置工作状态', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (36, 'EAS', 'EAS', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (37, 'PTC', 'PTC', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (38, 'EPS', 'EPS', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (39, 'ABS', 'ABS', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (40, 'MCU', 'MCU', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (41, 'PBHS', '动力电池加热状态', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (42, 'PBCS', '动力电池当前状态', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (43, 'PBIS', '动力电池保温状态', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (44, 'DCDC', 'DCDC', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (45, 'CHG', 'CHG', 'status', 'String'); +INSERT INTO `sys_message_type` VALUES (46, 'CHB', '校验位', NULL, 'String'); +INSERT INTO `sys_message_type` VALUES (47, 'CUB', '截止位', NULL, 'String'); + +SET FOREIGN_KEY_CHECKS = 1; + +-- ---------------------------- +-- Table structure for warn_logs +-- ---------------------------- +DROP TABLE IF EXISTS `warn_logs`; +CREATE TABLE `warn_logs` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '预警日志id', + `vin` varchar(58) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码', + `warn_rule_id` int NULL DEFAULT NULL COMMENT '规则id', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', + `max_value` int NULL DEFAULT NULL COMMENT '最大值', + `min_value` int NULL DEFAULT NULL COMMENT '最小值', + `avg_value` int NULL DEFAULT NULL COMMENT '平均值', + `median_value` int NULL DEFAULT NULL COMMENT '中位数', + `status` int NULL DEFAULT NULL COMMENT '是否发送预警', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for warn_rule +-- ---------------------------- +DROP TABLE IF EXISTS `warn_rule`; +CREATE TABLE `warn_rule` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '规则id', + `rule_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规则名称', + `strategy_id` int NULL DEFAULT NULL COMMENT '策略id', + `msg_type_id` int NULL DEFAULT NULL COMMENT '报文数据类型id', + `slide_time` int NULL DEFAULT NULL COMMENT '滑窗时间', + `slide_frequency` int NULL DEFAULT NULL COMMENT '滑窗频率', + `max_value` int NULL DEFAULT NULL COMMENT '最大值', + `min_value` int NULL DEFAULT NULL COMMENT '最小值', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for warn_slide_config +-- ---------------------------- +DROP TABLE IF EXISTS `warn_slide_config`; +CREATE TABLE `warn_slide_config` ( + `id` int NOT NULL COMMENT '滑窗id', + `vin` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码', + `slide_time` int NULL DEFAULT NULL COMMENT '滑动时间', + `created_by` int NULL DEFAULT NULL COMMENT '创建人', + `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `updated_by` int NULL DEFAULT NULL COMMENT '更新人', + `updated_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for warn_strategy +-- ---------------------------- +DROP TABLE IF EXISTS `warn_strategy`; +CREATE TABLE `warn_strategy` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '策略id', + `car_type_id` int NULL DEFAULT NULL COMMENT '车辆类型id', + `strategy_name` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '策略名称', + `msg_id` int NULL DEFAULT NULL COMMENT '报文模版id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml deleted file mode 100644 index 47ec49c..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-client/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-warn - 3.6.3 - - - cloud-warn-client - - - 17 - 17 - UTF-8 - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml deleted file mode 100644 index 7e828b6..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/pom.xml +++ /dev/null @@ -1,133 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-warn - 3.6.3 - - - cloud-warn-common - - - 17 - 17 - UTF-8 - - - - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-nacos-config - - - - - com.alibaba.cloud - spring-cloud-starter-alibaba-sentinel - - - - - org.springframework.boot - spring-boot-starter-actuator - - - - - com.mysql - mysql-connector-j - - - - - com.muyu - cloud-common-datasource - - - - - com.muyu - cloud-common-datascope - - - - - com.muyu - cloud-common-log - - - - - com.muyu - cloud-common-api-doc - - - - - com.muyu - cloud-common-xxl - - - - com.muyu - cloud-common-rabbit - - - - com.muyu - cloud-common-core - 3.6.3 - - - - - - com.squareup.okhttp3 - okhttp - 4.9.3 - - - com.thoughtworks.xstream - xstream - 1.4.20 - - - org.projectlombok - lombok - 1.18.34 - - - org.springframework.boot - spring-boot-starter - 3.3.2 - - - org.springframework.boot - spring-boot-starter-web - 3.3.2 - - - - org.dom4j - dom4j - 2.1.3 - - - com.alibaba.fastjson2 - fastjson2 - 2.0.43 - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java deleted file mode 100644 index 43250f3..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnLogs.java +++ /dev/null @@ -1,90 +0,0 @@ -package com.muyu.warning.domain; - -import java.util.Date; -import com.fasterxml.jackson.annotation.JsonFormat; -import com.muyu.common.core.annotation.Excel; -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; - -/** - * 预警日志对象 warn_logs - * - * @author muyu - * @date 2024-09-20 - */ - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("warn_logs") -public class WarnLogs { - private static final long serialVersionUID = 1L; - - /** 预警日志id */ - @TableId( type = IdType.AUTO) - private Long id; - - /** 车辆vin码 */ - @Excel(name = "车辆vin码") - private String vin; - - /** 规则id */ - @Excel(name = "规则id") - private Long warnRuleId; - - /** 开始时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "开始时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date startTime; - - /** 结束时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd") - private Date endTime; - - /** 最大值 */ - @Excel(name = "最大值") - private Long maxValue; - - /** 最小值 */ - @Excel(name = "最小值") - private Long minValue; - - /** 平均值 */ - @Excel(name = "平均值") - private Long avgValue; - - /** 中位数 */ - @Excel(name = "中位数") - private Long medianValue; - - /** 是否发送预警 */ - @Excel(name = "是否发送预警") - private Long status; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("vin", getVin()) - .append("warnRuleId", getWarnRuleId()) - .append("startTime", getStartTime()) - .append("endTime", getEndTime()) - .append("maxValue", getMaxValue()) - .append("minValue", getMinValue()) - .append("avgValue", getAvgValue()) - .append("medianValue", getMedianValue()) - .append("status", getStatus()) - .toString(); - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java deleted file mode 100644 index 7e82a98..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnRule.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.muyu.warning.domain; - -import com.muyu.common.core.annotation.Excel; -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; - -/** - * 预警规则对象 warn_rule - * - * @author muyu - * @date 2024-09-20 - */ - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("warn_rule") -public class WarnRule{ - private static final long serialVersionUID = 1L; - - /** 规则id */ - @TableId( type = IdType.AUTO) - private Long id; - - /** 规则名称 */ - @Excel(name = "规则名称") - private String ruleName; - - /** 策略id */ - @Excel(name = "策略id") - private Long strategyId; - - /** 报文数据类型id */ - @Excel(name = "报文数据类型id") - private Long msgTypeId; - - /** 滑窗时间 */ - @Excel(name = "滑窗时间") - private Long slideTime; - - /** 滑窗频率 */ - @Excel(name = "滑窗频率") - private Long slideFrequency; - - /** 最大值 */ - @Excel(name = "最大值") - private Long maxValue; - - /** 最小值 */ - @Excel(name = "最小值") - private Long minValue; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("ruleName", getRuleName()) - .append("strategyId", getStrategyId()) - .append("msgTypeId", getMsgTypeId()) - .append("slideTime", getSlideTime()) - .append("slideFrequency", getSlideFrequency()) - .append("maxValue", getMaxValue()) - .append("minValue", getMinValue()) - .toString(); - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java b/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java deleted file mode 100644 index 481e6fe..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-common/src/main/java/com/muyu/warning/domain/WarnStrategy.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.muyu.warning.domain; - -import com.muyu.common.core.annotation.Excel; -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; - -/** - * 预警策略对象 warn_strategy - * - * @author muyu - * @date 2024-09-20 - */ - -@Data -@Setter -@Getter -@SuperBuilder -@NoArgsConstructor -@AllArgsConstructor -@TableName("warn_strategy") -public class WarnStrategy{ - private static final long serialVersionUID = 1L; - - /** 策略id */ - @TableId( type = IdType.AUTO) - private Long id; - - /** 车辆类型id */ - @Excel(name = "车辆类型id") - private Long carTypeId; - - /** 策略名称 */ - @Excel(name = "策略名称") - private String strategyName; - - /** 报文模版id */ - @Excel(name = "报文模版id") - private Long msgId; - - - - @Override - public String toString() { - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) - .append("id", getId()) - .append("carTypeId", getCarTypeId()) - .append("strategyName", getStrategyName()) - .append("msgId", getMsgId()) - .toString(); - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml b/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml deleted file mode 100644 index dfaa873..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-remote/pom.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules-warn - 3.6.3 - - - cloud-warn-remote - - - 17 - 17 - UTF-8 - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java deleted file mode 100644 index 6e3ebeb..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/WarnApplication.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.muyu.warning; - -import com.muyu.common.security.annotation.EnableCustomConfig; -import com.muyu.common.security.annotation.EnableMyFeignClients; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.SpringBootApplication; - -/** - * @Author Chen - * @name：WxApplication - * @Date：2024/9/16 20:39 - */ -@EnableCustomConfig -//@EnableCustomSwagger2 -@EnableMyFeignClients -@SpringBootApplication -public class WarnApplication { - public static void main(String[] args) { - SpringApplication.run(WarnApplication.class); - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java deleted file mode 100644 index 3ce89ca..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnLogsController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.muyu.warning.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.warning.domain.WarnLogs; -import com.muyu.warning.service.IWarnLogsService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; - -/** - * 预警日志Controller - * - * @author muyu - * @date 2024-09-20 - */ -@RestController -@RequestMapping("/logs") -public class WarnLogsController extends BaseController -{ - @Resource - private IWarnLogsService warnLogsService; - - /** - * 查询预警日志列表 - */ - @RequiresPermissions("warning:logs:list") - @GetMapping("/list") - public Result> list(WarnLogs warnLogs) - { - startPage(); - List list = warnLogsService.selectWarnLogsList(warnLogs); - return getDataTable(list); - } - - /** - * 导出预警日志列表 - */ - @RequiresPermissions("warning:logs:export") - @PostMapping("/export") - public void export(HttpServletResponse response, WarnLogs warnLogs) - { - List list = warnLogsService.selectWarnLogsList(warnLogs); - ExcelUtil util = new ExcelUtil(WarnLogs.class); - util.exportExcel(response, list, "预警日志数据"); - } - - /** - * 获取预警日志详细信息 - */ - @RequiresPermissions("warning:logs:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { - return success(warnLogsService.selectWarnLogsById(id)); - } - - /** - * 新增预警日志 - */ - @RequiresPermissions("warning:logs:add") - @PostMapping - public Result add( - @Validated @RequestBody WarnLogs warnLogs) - { - if (warnLogsService.checkIdUnique(warnLogs)) { - return error("新增 预警日志 '" + warnLogs + "'失败，预警日志已存在"); - } - return toAjax(warnLogsService.save(warnLogs)); - } - - /** - * 修改预警日志 - */ - @RequiresPermissions("warning:logs:edit") - @PutMapping - public Result edit( - @Validated @RequestBody WarnLogs warnLogs) - { - if (!warnLogsService.checkIdUnique(warnLogs)) { - return error("修改 预警日志 '" + warnLogs + "'失败，预警日志不存在"); - } - return toAjax(warnLogsService.updateById(warnLogs)); - } - - /** - * 删除预警日志 - */ - @RequiresPermissions("warning:logs:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { - warnLogsService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java deleted file mode 100644 index db0f95a..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnRuleController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.muyu.warning.controller; - -import java.util.Arrays; -import java.util.List; - -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.github.yulichang.query.MPJLambdaQueryWrapper; -import com.muyu.warning.domain.WarnStrategy; -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.warning.domain.WarnRule; -import com.muyu.warning.service.IWarnRuleService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; - -/** - * 预警规则Controller - * - * @author muyu - * @date 2024-09-20 - */ -@RestController -@RequestMapping("/rule") -public class WarnRuleController extends BaseController { - @Resource - private IWarnRuleService warnRuleService; - - /** - * 查询预警规则列表 - */ - @RequiresPermissions("warning:list") - @GetMapping("/list") - public Result> list(WarnRule warnRule) { - startPage(); - List list = warnRuleService.selectWarnRuleList(warnRule); - return getDataTable(list); - } - - /** - * 导出预警规则列表 - */ - @RequiresPermissions("warning:export") - @PostMapping("/export") - public void export(HttpServletResponse response, WarnRule warnRule) { - List list = warnRuleService.selectWarnRuleList(warnRule); - ExcelUtil util = new ExcelUtil(WarnRule.class); - util.exportExcel(response, list, "预警规则数据"); - } - - /** - * 获取预警规则详细信息 - */ - @RequiresPermissions("warning:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) { - return success(warnRuleService.selectWarnRuleById(id)); - } - - /** - * 新增预警规则 - */ - @RequiresPermissions("warning:add") - @PostMapping - public Result add( - @Validated @RequestBody WarnRule warnRule) { - if (warnRuleService.checkIdUnique(warnRule)) { - return error("新增 预警规则 '" + warnRule + "'失败，预警规则已存在"); - } - return toAjax(warnRuleService.save(warnRule)); - } - - /** - * 修改预警规则 - */ - @RequiresPermissions("warning:edit") - @PutMapping - public Result edit( - @Validated @RequestBody WarnRule warnRule) { - if (!warnRuleService.checkIdUnique(warnRule)) { - return error("修改 预警规则 '" + warnRule + "'失败，预警规则不存在"); - } - return toAjax(warnRuleService.updateById(warnRule)); - } - - /** - * 删除预警规则 - */ - @RequiresPermissions("warning:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) { - warnRuleService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java deleted file mode 100644 index 9c29b1a..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WarnStrategyController.java +++ /dev/null @@ -1,109 +0,0 @@ -package com.muyu.warning.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.warning.domain.WarnStrategy; -import com.muyu.warning.service.IWarnStrategyService; -import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.domain.Result; -import com.muyu.common.core.utils.poi.ExcelUtil; -import org.springframework.validation.annotation.Validated; -import com.muyu.common.core.web.page.TableDataInfo; - -/** - * 预警策略Controller - * - * @author muyu - * @date 2024-09-20 - */ -@RestController -@RequestMapping("/strategy") -public class WarnStrategyController extends BaseController -{ - @Resource - private IWarnStrategyService warnStrategyService; - - /** - * 查询预警策略列表 - */ - @RequiresPermissions("warning:strategy:list") - @GetMapping("/list") - public Result> list(WarnStrategy warnStrategy) - { - startPage(); - List list = warnStrategyService.selectWarnStrategyList(warnStrategy); - return getDataTable(list); - } - - /** - * 导出预警策略列表 - */ - @RequiresPermissions("warning:strategy:export") - @PostMapping("/export") - public void export(HttpServletResponse response, WarnStrategy warnStrategy) - { - List list = warnStrategyService.selectWarnStrategyList(warnStrategy); - ExcelUtil util = new ExcelUtil(WarnStrategy.class); - util.exportExcel(response, list, "预警策略数据"); - } - - /** - * 获取预警策略详细信息 - */ - @RequiresPermissions("warning:strategy:query") - @GetMapping(value = "/{id}") - public Result> getInfo(@PathVariable("id") Long id) - { - return success(warnStrategyService.selectWarnStrategyById(id)); - } - - /** - * 新增预警策略 - */ - @RequiresPermissions("warning:strategy:add") - @PostMapping - public Result add( - @Validated @RequestBody WarnStrategy warnStrategy) - { - if (warnStrategyService.checkIdUnique(warnStrategy)) { - return error("新增 预警策略 '" + warnStrategy + "'失败，预警策略已存在"); - } - return toAjax(warnStrategyService.save(warnStrategy)); - } - - /** - * 修改预警策略 - */ - @RequiresPermissions("warning:strategy:edit") - @PutMapping - public Result edit( - @Validated @RequestBody WarnStrategy warnStrategy) - { - if (!warnStrategyService.checkIdUnique(warnStrategy)) { - return error("修改 预警策略 '" + warnStrategy + "'失败，预警策略不存在"); - } - return toAjax(warnStrategyService.updateById(warnStrategy)); - } - - /** - * 删除预警策略 - */ - @RequiresPermissions("warning:strategy:remove") - @DeleteMapping("/{ids}") - public Result remove(@PathVariable("ids") Long[] ids) - { - warnStrategyService.removeBatchByIds(Arrays.asList(ids)); - return success(); - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java deleted file mode 100644 index 5c53107..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/controller/WxTestController.java +++ /dev/null @@ -1,154 +0,0 @@ -package com.muyu.warning.controller; - - -import com.muyu.warning.wx.Message; -import com.muyu.warning.message.Article; -import com.muyu.warning.message.NewMessage; -import com.muyu.warning.util.TokenUtil; -import com.thoughtworks.xstream.XStream; -import io.micrometer.common.util.StringUtils; -import jakarta.servlet.ServletInputStream; -import jakarta.servlet.http.HttpServletRequest; -import org.dom4j.Document; -import org.dom4j.DocumentException; -import org.dom4j.Element; -import org.dom4j.io.SAXReader; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -import java.io.IOException; -import java.security.MessageDigest; -import java.security.NoSuchAlgorithmException; -import java.util.*; - -/** - * 微信公众号 - * @Author： Chen - * @name：GetWxController - */ -@RestController -public class WxTestController { - - - @PostMapping("/") - public String receiveMessage(HttpServletRequest request) { - ServletInputStream inputStream = null; - HashMap map = new HashMap<>(); - try { - inputStream = request.getInputStream(); - SAXReader saxReader = new SAXReader(); - //读取request输入流，获得Document对象 - Document document = saxReader.read(inputStream); - //获得root结点 - Element rootElement = document.getRootElement(); - //获取所有的子节点 - List elements = rootElement.elements(); - for (Element element : elements) { - map.put(element.getName(), element.getStringValue()); - } - - - } catch (IOException e) { - throw new RuntimeException(e); - } catch (DocumentException e) { - throw new RuntimeException(e); - } - System.out.println(map); - //回复消息 - String message = ""; - if ("图文".equals(map.get("Content"))) { - message = getReplyNewsMessage(map); - } else { - message = getReplyMessage(map); - - } - return message; - } - - /** - * 获得回复的消息内容 - * - * @param map - * @return - */ - private String getReplyMessage(HashMap map) { - Message message = new Message(); - message.setToUserName(map.get("FromUserName")); - message.setFromUserName(map.get("ToUserName")); -// message.setMsgType(map.get("MsgType")); - message.setMsgType("text"); - message.setCreateTime(System.currentTimeMillis() / 1000); - message.setContent("自动回复:您好"); - //XStream将java对象转换为xml字符串 - XStream xStream = new XStream(); - xStream.processAnnotations(Message.class); - String xml = xStream.toXML(message); - return xml; - } - - - @GetMapping("/") - public String check(@RequestParam("signature") String signature, @RequestParam("timestamp") String timestamp, - @RequestParam("nonce") String nonce, @RequestParam("echostr") String echostr) { - - //1.将token、timestamp、nonce三个参数进行字典排序 - String token = "asdasd"; - List list = Arrays.asList(token, timestamp, nonce); - //排序 - Collections.sort(list); - //2.将三个参数字符串拼接成一个字符串进行sha1加密 - StringBuilder stringBuilder = new StringBuilder(); - for (String s : list) { - stringBuilder.append(s); - } - //加密 - try { - MessageDigest instance = MessageDigest.getInstance("sha1"); - //使用sha1进行加密,获得byte数组 - byte[] digest = instance.digest(stringBuilder.toString().getBytes()); - StringBuilder sum = new StringBuilder(); - for (byte b : digest) { - sum.append(Integer.toHexString((b >> 4) & 15)); - sum.append(Integer.toHexString(b & 15)); - } - //3.开发者获得加密后的字符串可与signature对比，标识该请求来源于微信 - if (!StringUtils.isEmpty(signature) && signature.equals(sum.toString())) { - return echostr; - } - - } catch (NoSuchAlgorithmException e) { - throw new RuntimeException(e); - } - return null; - } - - @PostMapping("/test") - public void test() { - String accessToken = TokenUtil.getAccessToken(); - System.out.println(accessToken); - } - - private String getReplyNewsMessage(Map map) { - NewMessage newsMessage = new NewMessage(); - newsMessage.setToUserName(map.get("FromUserName")); - newsMessage.setFromUserName(map.get("ToUserName")); - newsMessage.setMsgType("news"); - newsMessage.setCreateTime(System.currentTimeMillis() / 1000); - newsMessage.setArticleCount(1); - List
articles = new ArrayList<>(); - Article article = new Article(); - article.setTitle("oneone哦恩恩"); - article.setDescription("详细描述--------------信息"); - article.setUrl("https://www.baidu.com"); - article.setPicUrl("http://mmbiz.qpic.cn/mmbiz_jpg/RiaWwmABEMmkFKQMeQZLLYaxknlzE9CxSozVSH42iaXiaQcia5hPPUicuNYbS8dG99zsMZ1ic266ialM42Mbn8SkN54kA/0"); - articles.add(article); - newsMessage.setArticles(articles); - //XStream将java对象转换为xml字符串 - XStream xStream = new XStream(); - xStream.processAnnotations(NewMessage.class); - String xml = xStream.toXML(newsMessage); - return xml; - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java deleted file mode 100644 index cf06901..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/mapper/WarnRuleMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.muyu.warning.mapper; - -import com.github.yulichang.base.MPJBaseMapper; -import com.muyu.warning.domain.WarnRule; -import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; - -/** - * 预警规则Mapper接口 - * - * @author muyu - * @date 2024-09-20 - */ -@Mapper -public interface WarnRuleMapper extends BaseMapper { - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java deleted file mode 100644 index 9c195ce..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/Article.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.muyu.warning.message; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -/** - * @ClassName Article - * @Description 描述 - * @Author Chen - * @Date 2024/9/18 19:13 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@XStreamAlias("item") -public class Article { - @XStreamAlias("Title") - private String title; - @XStreamAlias("Description") - private String description; - @XStreamAlias("PicUrl") - private String picUrl; - @XStreamAlias("Url") - private String url; - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java deleted file mode 100644 index a8b5dbf..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/message/NewMessage.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.muyu.warning.message; - -import com.thoughtworks.xstream.annotations.XStreamAlias; -import lombok.AllArgsConstructor; -import lombok.Data; -import lombok.NoArgsConstructor; - -import java.util.List; - -/** - * @ClassName NewMessage - * @Description 描述 - * @Author Chen - * @Date 2024/9/18 19:08 - */ -@Data -@AllArgsConstructor -@NoArgsConstructor -@XStreamAlias("xml") -public class NewMessage { - @XStreamAlias("ToUserName") - private String toUserName; - @XStreamAlias("FromUserName") - private String fromUserName; - @XStreamAlias("CreateTime") - private long createTime; - @XStreamAlias("MsgType") - private String msgType; - @XStreamAlias("ArticleCount") - private int articleCount; - @XStreamAlias("Articles") - private List
articles; - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java deleted file mode 100644 index 1f61aa4..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnLogsService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.warning.service; - -import java.util.List; -import com.muyu.warning.domain.WarnLogs; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 预警日志Service接口 - * - * @author muyu - * @date 2024-09-20 - */ -public interface IWarnLogsService extends IService { - /** - * 精确查询预警日志 - * - * @param id 预警日志主键 - * @return 预警日志 - */ - public WarnLogs selectWarnLogsById(Long id); - - /** - * 查询预警日志列表 - * - * @param warnLogs 预警日志 - * @return 预警日志集合 - */ - public List selectWarnLogsList(WarnLogs warnLogs); - - /** - * 判断 预警日志 id是否唯一 - * @param warnLogs 预警日志 - * @return 结果 - */ - Boolean checkIdUnique(WarnLogs warnLogs); - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java deleted file mode 100644 index b829f22..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnRuleService.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.muyu.warning.service; - -import java.util.List; - -import com.github.yulichang.base.MPJBaseService; -import com.muyu.warning.domain.WarnRule; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 预警规则Service接口 - * - * @author muyu - * @date 2024-09-20 - */ -public interface IWarnRuleService extends IService { - /** - * 精确查询预警规则 - * - * @param id 预警规则主键 - * @return 预警规则 - */ - public WarnRule selectWarnRuleById(Long id); - - /** - * 查询预警规则列表 - * - * @param warnRule 预警规则 - * @return 预警规则集合 - */ - public List selectWarnRuleList(WarnRule warnRule); - - /** - * 判断 预警规则 id是否唯一 - * @param warnRule 预警规则 - * @return 结果 - */ - Boolean checkIdUnique(WarnRule warnRule); - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java deleted file mode 100644 index d3fec08..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/IWarnStrategyService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.muyu.warning.service; - -import java.util.List; -import com.muyu.warning.domain.WarnStrategy; -import com.baomidou.mybatisplus.extension.service.IService; - -/** - * 预警策略Service接口 - * - * @author muyu - * @date 2024-09-20 - */ -public interface IWarnStrategyService extends IService { - /** - * 精确查询预警策略 - * - * @param id 预警策略主键 - * @return 预警策略 - */ - public WarnStrategy selectWarnStrategyById(Long id); - - /** - * 查询预警策略列表 - * - * @param warnStrategy 预警策略 - * @return 预警策略集合 - */ - public List selectWarnStrategyList(WarnStrategy warnStrategy); - - /** - * 判断 预警策略 id是否唯一 - * @param warnStrategy 预警策略 - * @return 结果 - */ - Boolean checkIdUnique(WarnStrategy warnStrategy); - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java deleted file mode 100644 index 2e25a7b..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnLogsServiceImpl.java +++ /dev/null @@ -1,92 +0,0 @@ -package com.muyu.warning.service.impl; - -import java.util.List; -import org.springframework.stereotype.Service; -import com.muyu.warning.mapper.WarnLogsMapper; -import com.muyu.warning.domain.WarnLogs; -import com.muyu.warning.service.IWarnLogsService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.util.Assert; - -/** - * 预警日志Service业务层处理 - * - * @author muyu - * @date 2024-09-20 - */ -@Service -public class WarnLogsServiceImpl - extends ServiceImpl - implements IWarnLogsService { - - /** - * 精确查询预警日志 - * - * @param id 预警日志主键 - * @return 预警日志 - */ - @Override - public WarnLogs selectWarnLogsById(Long id) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(WarnLogs::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询预警日志列表 - * - * @param warnLogs 预警日志 - * @return 预警日志 - */ - @Override - public List selectWarnLogsList(WarnLogs warnLogs) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(warnLogs.getVin())){ - queryWrapper.eq(WarnLogs::getVin, warnLogs.getVin()); - } - if (StringUtils.isNotNull(warnLogs.getWarnRuleId())){ - queryWrapper.eq(WarnLogs::getWarnRuleId, warnLogs.getWarnRuleId()); - } - if (StringUtils.isNotNull(warnLogs.getStartTime())){ - queryWrapper.eq(WarnLogs::getStartTime, warnLogs.getStartTime()); - } - if (StringUtils.isNotNull(warnLogs.getEndTime())){ - queryWrapper.eq(WarnLogs::getEndTime, warnLogs.getEndTime()); - } - if (StringUtils.isNotNull(warnLogs.getMaxValue())){ - queryWrapper.eq(WarnLogs::getMaxValue, warnLogs.getMaxValue()); - } - if (StringUtils.isNotNull(warnLogs.getMinValue())){ - queryWrapper.eq(WarnLogs::getMinValue, warnLogs.getMinValue()); - } - if (StringUtils.isNotNull(warnLogs.getAvgValue())){ - queryWrapper.eq(WarnLogs::getAvgValue, warnLogs.getAvgValue()); - } - if (StringUtils.isNotNull(warnLogs.getMedianValue())){ - queryWrapper.eq(WarnLogs::getMedianValue, warnLogs.getMedianValue()); - } - if (StringUtils.isNotNull(warnLogs.getStatus())){ - queryWrapper.eq(WarnLogs::getStatus, warnLogs.getStatus()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param warnLogs 预警日志 - * @return 预警日志 - */ - @Override - public Boolean checkIdUnique(WarnLogs warnLogs) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WarnLogs::getId, warnLogs.getId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java deleted file mode 100644 index 0a152d8..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnRuleServiceImpl.java +++ /dev/null @@ -1,87 +0,0 @@ -package com.muyu.warning.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.warning.domain.WarnRule; -import com.muyu.warning.mapper.WarnRuleMapper; -import com.muyu.warning.service.IWarnRuleService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.util.Assert; - -import java.util.List; - -/** - * 预警规则Service业务层处理 - * - * @author muyu - * @date 2024-09-20 - */ -@Service -public class WarnRuleServiceImpl - extends ServiceImpl - implements IWarnRuleService { - @Autowired - private WarnRuleMapper warnRuleMapper; - - /** - * 精确查询预警规则 - * - * @param id 预警规则主键 - * @return 预警规则 - */ - @Override - public WarnRule selectWarnRuleById(Long id) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(WarnRule::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询预警规则列表 - * - * @param warnRule 预警规则 - * @return 预警规则 - */ - @Override - public List selectWarnRuleList(WarnRule warnRule) { - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(warnRule.getRuleName())) { - queryWrapper.like(WarnRule::getRuleName, warnRule.getRuleName()); - } - if (StringUtils.isNotNull(warnRule.getMsgTypeId())) { - queryWrapper.eq(WarnRule::getMsgTypeId, warnRule.getMsgTypeId()); - } - if (StringUtils.isNotNull(warnRule.getSlideTime())) { - queryWrapper.eq(WarnRule::getSlideTime, warnRule.getSlideTime()); - } - if (StringUtils.isNotNull(warnRule.getSlideFrequency())) { - queryWrapper.eq(WarnRule::getSlideFrequency, warnRule.getSlideFrequency()); - } - if (StringUtils.isNotNull(warnRule.getMaxValue())) { - queryWrapper.eq(WarnRule::getMaxValue, warnRule.getMaxValue()); - } - if (StringUtils.isNotNull(warnRule.getMinValue())) { - queryWrapper.eq(WarnRule::getMinValue, warnRule.getMinValue()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * - * @param warnRule 预警规则 - * @return 预警规则 - */ - @Override - public Boolean checkIdUnique(WarnRule warnRule) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WarnRule::getId, warnRule.getId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java deleted file mode 100644 index 505a01e..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/service/impl/WarnStrategyServiceImpl.java +++ /dev/null @@ -1,74 +0,0 @@ -package com.muyu.warning.service.impl; - -import java.util.List; -import org.springframework.stereotype.Service; -import com.muyu.warning.mapper.WarnStrategyMapper; -import com.muyu.warning.domain.WarnStrategy; -import com.muyu.warning.service.IWarnStrategyService; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.muyu.common.core.utils.StringUtils; -import org.springframework.util.Assert; - -/** - * 预警策略Service业务层处理 - * - * @author muyu - * @date 2024-09-20 - */ -@Service -public class WarnStrategyServiceImpl - extends ServiceImpl - implements IWarnStrategyService { - - /** - * 精确查询预警策略 - * - * @param id 预警策略主键 - * @return 预警策略 - */ - @Override - public WarnStrategy selectWarnStrategyById(Long id) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - Assert.notNull(id, "id不可为空"); - queryWrapper.eq(WarnStrategy::getId, id); - return this.getOne(queryWrapper); - } - - - /** - * 查询预警策略列表 - * - * @param warnStrategy 预警策略 - * @return 预警策略 - */ - @Override - public List selectWarnStrategyList(WarnStrategy warnStrategy) - { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotNull(warnStrategy.getCarTypeId())){ - queryWrapper.eq(WarnStrategy::getCarTypeId, warnStrategy.getCarTypeId()); - } - if (StringUtils.isNotNull(warnStrategy.getStrategyName())){ - queryWrapper.like(WarnStrategy::getStrategyName, warnStrategy.getStrategyName()); - } - if (StringUtils.isNotNull(warnStrategy.getMsgId())){ - queryWrapper.eq(WarnStrategy::getMsgId, warnStrategy.getMsgId()); - } - return this.list(queryWrapper); - } - - /** - * 唯一 判断 - * @param warnStrategy 预警策略 - * @return 预警策略 - */ - @Override - public Boolean checkIdUnique(WarnStrategy warnStrategy) { - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(WarnStrategy::getId, warnStrategy.getId()); - return this.count(queryWrapper) > 0; - } - -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java deleted file mode 100644 index fc33154..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/java/com/muyu/warning/util/OkHttpUtils.java +++ /dev/null @@ -1,36 +0,0 @@ -package com.muyu.warning.util; - -import okhttp3.*; - -import java.io.IOException; - -public class OkHttpUtils { - - private static final OkHttpClient client = new OkHttpClient(); - - public static String sendGetRequest(String urlString) { - Request request = new Request.Builder() - .url(urlString) - .build(); - try (Response response = client.newCall(request).execute()) { - return response.body().string(); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } - - public static String sendPostRequest(String urlString, String params) { - RequestBody requestBody = RequestBody.create(params, MediaType.parse("application/json; charset=utf-8")); - Request request = new Request.Builder() - .url(urlString) - .post(requestBody) - .build(); - try (Response response = client.newCall(request).execute()) { - return response.body().string(); - } catch (IOException e) { - e.printStackTrace(); - return null; - } - } -} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/banner.txt b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/banner.txt deleted file mode 100644 index 0dd5eee..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/banner.txt +++ /dev/null @@ -1,2 +0,0 @@ -Spring Boot Version: ${spring-boot.version} -Spring Application Name: ${spring.application.name} diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml deleted file mode 100644 index ed94f02..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/bootstrap.yml +++ /dev/null @@ -1,48 +0,0 @@ -# Tomcat -server: - port: 10003 - -# nacos线上地址 -nacos: - addr: 47.116.173.119:8848 - user-name: nacos - password: nacos - namespace: one-saas - -# Spring -spring: - main: - allow-bean-definition-overriding: true - application: - # 应用名称 - name: cloud-warn - profiles: - # 环境配置 - active: dev - cloud: - nacos: - discovery: - # 服务注册地址 - server-addr: ${nacos.addr} - # 命名空间 - namespace: ${nacos.namespace} - config: - # 服务注册地址 - server-addr: ${nacos.addr} - # 命名空间 - namespace: ${nacos.namespace} - # 配置文件格式 - file-extension: yml - # 共享配置 - shared-configs: - # 系统共享配置 - - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # 系统环境Config共享配置 - - application-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # xxl-job 配置文件 - - application-xxl-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} - # engine配置 - - engine-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} -logging: - level: - com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/dev.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/dev.xml deleted file mode 100644 index 8b99495..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/dev.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - ${log.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - ${log.pattern} - - - - ERROR - - ACCEPT - - DENY - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/prod.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/prod.xml deleted file mode 100644 index 0fe8654..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/prod.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/test.xml b/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/test.xml deleted file mode 100644 index 0fe8654..0000000 --- a/cloud-modules/cloud-modules-warn/cloud-warn-server/src/main/resources/logback/test.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - ${log.sky.pattern} - - - - - - ${log.path}/info.log - - - - ${log.path}/info.%d{yyyy-MM-dd}.log - - 60 - - - - - INFO - - ACCEPT - - DENY - - - - - ${log.path}/error.log - - - - ${log.path}/error.%d{yyyy-MM-dd}.log - - 60 - - - - - ERROR - - ACCEPT - - DENY - - - - - - - - ${log.sky.pattern} - - - - - - - - - - - - - - - - - - - - diff --git a/cloud-modules/cloud-modules-warn/pom.xml b/cloud-modules/cloud-modules-warn/pom.xml deleted file mode 100644 index 40cd030..0000000 --- a/cloud-modules/cloud-modules-warn/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - - com.muyu - cloud-modules - 3.6.3 - - - cloud-modules-warn - - 预警 - - pom - - cloud-warn-common - cloud-warn-client - cloud-warn-remote - cloud-warn-server - - - - 17 - 17 - UTF-8 - - diff --git a/cloud-modules/pom.xml b/cloud-modules/pom.xml index 8fba134..34653b3 100644 --- a/cloud-modules/pom.xml +++ b/cloud-modules/pom.xml @@ -12,11 +12,7 @@ cloud-modules-system cloud-modules-gen cloud-modules-file - cloud-modules-system-saas - cloud-modules-warn - cloud-modules-carmanage - cloud-modules-parsing - cloud-modules-enterprise + cloud-modules-openbusiness cloud-modules diff --git a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml index e10b6f5..72bc5ea 100644 --- a/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml +++ b/cloud-visual/cloud-visual-monitor/src/main/resources/bootstrap.yml @@ -1,13 +1,13 @@ # Tomcat server: - port: 9100 + port: 9101 # nacos线上地址 nacos: - addr: 47.116.173.119:8848 + addr: 49.235.136.60:8848 user-name: nacos password: nacos - namespace: one-saas + namespace: wyh # Spring spring: @@ -23,18 +23,18 @@ spring: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} config: # 服务注册地址 server-addr: ${nacos.addr} # nacos用户名 - username: ${nacos.user-name} - # nacos密码 - password: ${nacos.password} +# username: ${nacos.user-name} +# # nacos密码 +# password: ${nacos.password} # 命名空间 namespace: ${nacos.namespace} # 配置文件格式 diff --git a/init-file/cloud-seata.sql b/init-file/cloud-seata.sql deleted file mode 100644 index 30fb7fa..0000000 --- a/init-file/cloud-seata.sql +++ /dev/null @@ -1,118 +0,0 @@ -/* - Navicat Premium Data Transfer - - Source Server : MySQL80-local - Source Server Type : MySQL - Source Server Version : 80401 (8.4.1) - Source Host : 10.100.1.2:3306 - Source Schema : cloud-seata - - Target Server Type : MySQL - Target Server Version : 80401 (8.4.1) - File Encoding : 65001 - - Date: 17/07/2024 09:02:12 -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for branch_table --- ---------------------------- -DROP TABLE IF EXISTS `branch_table`; -CREATE TABLE `branch_table` ( - `branch_id` bigint NOT NULL, - `xid` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, - `transaction_id` bigint DEFAULT NULL, - `resource_group_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `resource_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `branch_type` varchar(8) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `status` tinyint DEFAULT NULL, - `client_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `application_data` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `gmt_create` datetime(6) DEFAULT NULL, - `gmt_modified` datetime(6) DEFAULT NULL, - PRIMARY KEY (`branch_id`) USING BTREE, - KEY `idx_xid` (`xid`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC; - --- ---------------------------- --- Records of branch_table --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for global_table --- ---------------------------- -DROP TABLE IF EXISTS `global_table`; -CREATE TABLE `global_table` ( - `xid` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, - `transaction_id` bigint DEFAULT NULL, - `status` tinyint NOT NULL, - `application_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `transaction_service_group` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `transaction_name` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `timeout` int DEFAULT NULL, - `begin_time` bigint DEFAULT NULL, - `application_data` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `gmt_create` datetime DEFAULT NULL, - `gmt_modified` datetime DEFAULT NULL, - PRIMARY KEY (`xid`) USING BTREE, - KEY `idx_gmt_modified_status` (`gmt_modified`,`status`) USING BTREE, - KEY `idx_transaction_id` (`transaction_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC; - --- ---------------------------- --- Records of global_table --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for lock_table --- ---------------------------- -DROP TABLE IF EXISTS `lock_table`; -CREATE TABLE `lock_table` ( - `row_key` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL, - `xid` varchar(96) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `transaction_id` bigint DEFAULT NULL, - `branch_id` bigint NOT NULL, - `resource_id` varchar(256) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `table_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `pk` varchar(36) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL, - `gmt_create` datetime DEFAULT NULL, - `gmt_modified` datetime DEFAULT NULL, - PRIMARY KEY (`row_key`) USING BTREE, - KEY `idx_branch_id` (`branch_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC; - --- ---------------------------- --- Records of lock_table --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for undo_log --- ---------------------------- -DROP TABLE IF EXISTS `undo_log`; -CREATE TABLE `undo_log` ( - `branch_id` bigint NOT NULL COMMENT 'branch transaction id', - `xid` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'global transaction id', - `context` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT 'undo_log context,such as serialization', - `rollback_info` longblob NOT NULL COMMENT 'rollback info', - `log_status` int NOT NULL COMMENT '0:normal status,1:defense status', - `log_created` datetime(6) NOT NULL COMMENT 'create datetime', - `log_modified` datetime(6) NOT NULL COMMENT 'modify datetime', - UNIQUE KEY `ux_undo_log` (`xid`,`branch_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='AT transaction mode undo table'; - --- ---------------------------- --- Records of undo_log --- ---------------------------- -BEGIN; -COMMIT; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/init-file/cloud-system.sql b/init-file/cloud-system.sql deleted file mode 100644 index 3322763..0000000 --- a/init-file/cloud-system.sql +++ /dev/null @@ -1,682 +0,0 @@ -/* - Navicat Premium Data Transfer - - Source Server : MySQL80-local - Source Server Type : MySQL - Source Server Version : 80401 (8.4.1) - Source Host : 10.100.1.2:3306 - Source Schema : cloud-system - - Target Server Type : MySQL - Target Server Version : 80401 (8.4.1) - File Encoding : 65001 - - Date: 17/07/2024 09:01:52 -*/ - -SET NAMES utf8mb4; -SET FOREIGN_KEY_CHECKS = 0; - --- ---------------------------- --- Table structure for gen_table --- ---------------------------- -DROP TABLE IF EXISTS `gen_table`; -CREATE TABLE `gen_table` ( - `table_id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', - `table_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '表名称', - `table_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '表描述', - `sub_table_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '关联子表的表名', - `sub_table_fk_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '子表关联的外键名', - `class_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '实体类名称', - `tpl_category` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'crud' COMMENT '使用的模板（crud单表操作 tree树表操作）', - `package_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '生成包路径', - `module_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '生成模块名', - `business_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '生成业务名', - `function_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '生成功能名', - `function_author` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '生成功能作者', - `gen_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '生成代码方式（0zip压缩包 1自定义路径）', - `gen_path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '/' COMMENT '生成路径（不填默认项目路径）', - `options` varchar(1000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '其它生成选项', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`table_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='代码生成业务表'; - --- ---------------------------- --- Records of gen_table --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for gen_table_column --- ---------------------------- -DROP TABLE IF EXISTS `gen_table_column`; -CREATE TABLE `gen_table_column` ( - `column_id` bigint NOT NULL AUTO_INCREMENT COMMENT '编号', - `table_id` bigint DEFAULT NULL COMMENT '归属表编号', - `column_name` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '列名称', - `column_comment` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '列描述', - `column_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '列类型', - `java_type` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'JAVA类型', - `java_field` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'JAVA字段名', - `is_pk` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否主键（1是）', - `is_increment` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否自增（1是）', - `is_required` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否必填（1是）', - `is_insert` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否为插入字段（1是）', - `is_edit` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否编辑字段（1是）', - `is_list` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否列表字段（1是）', - `is_query` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '是否查询字段（1是）', - `query_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'EQ' COMMENT '查询方式（等于、不等于、大于、小于、范围）', - `html_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '显示类型（文本框、文本域、下拉框、复选框、单选框、日期控件）', - `dict_type` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '字典类型', - `sort` int DEFAULT NULL COMMENT '排序', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`column_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='代码生成业务表字段'; - --- ---------------------------- --- Records of gen_table_column --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for sys_config --- ---------------------------- -DROP TABLE IF EXISTS `sys_config`; -CREATE TABLE `sys_config` ( - `config_id` int NOT NULL AUTO_INCREMENT COMMENT '参数主键', - `config_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '参数名称', - `config_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '参数键名', - `config_value` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '参数键值', - `config_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'N' COMMENT '系统内置（Y是 N否）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`config_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='参数配置表'; - --- ---------------------------- --- Records of sys_config --- ---------------------------- -BEGIN; -INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '主框架页-默认皮肤样式名称', 'sys.index.skinName', 'skin-blue', 'Y', 'admin', '2024-05-23 15:08:18', '', NULL, '蓝色 skin-blue、绿色 skin-green、紫色 skin-purple、红色 skin-red、黄色 skin-yellow'); -INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '用户管理-账号初始密码', 'sys.user.initPassword', '123456', 'Y', 'admin', '2024-05-23 15:08:18', '', NULL, '初始化密码 123456'); -INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, '主框架页-侧边栏主题', 'sys.index.sideTheme', 'theme-dark', 'Y', 'admin', '2024-05-23 15:08:18', '', NULL, '深色主题theme-dark，浅色主题theme-light'); -INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (4, '账号自助-是否开启用户注册功能', 'sys.account.registerUser', 'false', 'Y', 'admin', '2024-05-23 15:08:18', '', NULL, '是否开启注册用户功能（true开启，false关闭）'); -INSERT INTO `sys_config` (`config_id`, `config_name`, `config_key`, `config_value`, `config_type`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (5, '用户登录-黑名单列表', 'sys.login.blackIPList', '', 'Y', 'admin', '2024-05-23 15:08:18', '', NULL, '设置登录IP黑名单限制，多个匹配项以;分隔，支持匹配（*通配、网段）'); -COMMIT; - --- ---------------------------- --- Table structure for sys_dept --- ---------------------------- -DROP TABLE IF EXISTS `sys_dept`; -CREATE TABLE `sys_dept` ( - `dept_id` bigint NOT NULL AUTO_INCREMENT COMMENT '部门id', - `parent_id` bigint DEFAULT '0' COMMENT '父部门id', - `ancestors` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '祖级列表', - `dept_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '部门名称', - `order_num` int DEFAULT '0' COMMENT '显示顺序', - `leader` varchar(20) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '负责人', - `phone` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '联系电话', - `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '邮箱', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '部门状态（0正常 1停用）', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - PRIMARY KEY (`dept_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=200 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='部门表'; - --- ---------------------------- --- Records of sys_dept --- ---------------------------- -BEGIN; -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (100, 0, '0', '若依科技', 0, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (101, 100, '0,100', '深圳总公司', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (102, 100, '0,100', '长沙分公司', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (103, 101, '0,100,101', '研发部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (104, 101, '0,100,101', '市场部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (105, 101, '0,100,101', '测试部门', 3, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (106, 101, '0,100,101', '财务部门', 4, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (107, 101, '0,100,101', '运维部门', 5, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (108, 102, '0,100,102', '市场部门', 1, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -INSERT INTO `sys_dept` (`dept_id`, `parent_id`, `ancestors`, `dept_name`, `order_num`, `leader`, `phone`, `email`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`) VALUES (109, 102, '0,100,102', '财务部门', 2, '若依', '15888888888', 'ry@qq.com', '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL); -COMMIT; - --- ---------------------------- --- Table structure for sys_dict_data --- ---------------------------- -DROP TABLE IF EXISTS `sys_dict_data`; -CREATE TABLE `sys_dict_data` ( - `dict_code` bigint NOT NULL AUTO_INCREMENT COMMENT '字典编码', - `dict_sort` int DEFAULT '0' COMMENT '字典排序', - `dict_label` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '字典标签', - `dict_value` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '字典键值', - `dict_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '字典类型', - `css_class` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '样式属性（其他样式扩展）', - `list_class` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '表格回显样式', - `is_default` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT 'N' COMMENT '是否默认（Y是 N否）', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '状态（0正常 1停用）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`dict_code`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='字典数据表'; - --- ---------------------------- --- Records of sys_dict_data --- ---------------------------- -BEGIN; -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, 1, '男', '0', 'sys_user_sex', '', '', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '性别男'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, 2, '女', '1', 'sys_user_sex', '', '', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '性别女'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, 3, '未知', '2', 'sys_user_sex', '', '', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '性别未知'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (4, 1, '显示', '0', 'sys_show_hide', '', 'primary', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '显示菜单'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (5, 2, '隐藏', '1', 'sys_show_hide', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '隐藏菜单'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (6, 1, '正常', '0', 'sys_normal_disable', '', 'primary', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '正常状态'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (7, 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '停用状态'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (8, 1, '正常', '0', 'sys_job_status', '', 'primary', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '正常状态'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (9, 2, '暂停', '1', 'sys_job_status', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '停用状态'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (10, 1, '默认', 'DEFAULT', 'sys_job_group', '', '', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '默认分组'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (11, 2, '系统', 'SYSTEM', 'sys_job_group', '', '', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '系统分组'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (12, 1, '是', 'Y', 'sys_yes_no', '', 'primary', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '系统默认是'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (13, 2, '否', 'N', 'sys_yes_no', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '系统默认否'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (14, 1, '通知', '1', 'sys_notice_type', '', 'warning', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '通知'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (15, 2, '公告', '2', 'sys_notice_type', '', 'success', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '公告'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (16, 1, '正常', '0', 'sys_notice_status', '', 'primary', 'Y', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '正常状态'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (17, 2, '关闭', '1', 'sys_notice_status', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '关闭状态'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (18, 99, '其他', '0', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '其他操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (19, 1, '新增', '1', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '新增操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (20, 2, '修改', '2', 'sys_oper_type', '', 'info', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '修改操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (21, 3, '删除', '3', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '删除操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (22, 4, '授权', '4', 'sys_oper_type', '', 'primary', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '授权操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (23, 5, '导出', '5', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '导出操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (24, 6, '导入', '6', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '导入操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (25, 7, '强退', '7', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '强退操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (26, 8, '生成代码', '8', 'sys_oper_type', '', 'warning', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '生成操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (27, 9, '清空数据', '9', 'sys_oper_type', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '清空操作'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (28, 1, '成功', '0', 'sys_common_status', '', 'primary', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '正常状态'); -INSERT INTO `sys_dict_data` (`dict_code`, `dict_sort`, `dict_label`, `dict_value`, `dict_type`, `css_class`, `list_class`, `is_default`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (29, 2, '失败', '1', 'sys_common_status', '', 'danger', 'N', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '停用状态'); -COMMIT; - --- ---------------------------- --- Table structure for sys_dict_type --- ---------------------------- -DROP TABLE IF EXISTS `sys_dict_type`; -CREATE TABLE `sys_dict_type` ( - `dict_id` bigint NOT NULL AUTO_INCREMENT COMMENT '字典主键', - `dict_name` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '字典名称', - `dict_type` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '字典类型', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '状态（0正常 1停用）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`dict_id`) USING BTREE, - UNIQUE KEY `dict_type` (`dict_type`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='字典类型表'; - --- ---------------------------- --- Records of sys_dict_type --- ---------------------------- -BEGIN; -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '用户性别', 'sys_user_sex', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '用户性别列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '菜单状态', 'sys_show_hide', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '菜单状态列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, '系统开关', 'sys_normal_disable', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '系统开关列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (4, '任务状态', 'sys_job_status', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '任务状态列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (5, '任务分组', 'sys_job_group', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '任务分组列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (6, '系统是否', 'sys_yes_no', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '系统是否列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (7, '通知类型', 'sys_notice_type', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '通知类型列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (8, '通知状态', 'sys_notice_status', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '通知状态列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (9, '操作类型', 'sys_oper_type', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '操作类型列表'); -INSERT INTO `sys_dict_type` (`dict_id`, `dict_name`, `dict_type`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (10, '系统状态', 'sys_common_status', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '登录状态列表'); -COMMIT; - --- ---------------------------- --- Table structure for sys_logininfor --- ---------------------------- -DROP TABLE IF EXISTS `sys_logininfor`; -CREATE TABLE `sys_logininfor` ( - `info_id` bigint NOT NULL AUTO_INCREMENT COMMENT '访问ID', - `user_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '用户账号', - `ipaddr` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '登录IP地址', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '登录状态（0成功 1失败）', - `msg` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '提示信息', - `access_time` datetime DEFAULT NULL COMMENT '访问时间', - PRIMARY KEY (`info_id`) USING BTREE, - KEY `idx_sys_logininfor_s` (`status`) USING BTREE, - KEY `idx_sys_logininfor_lt` (`access_time`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=102 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='系统访问记录'; - --- ---------------------------- --- Records of sys_logininfor --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for sys_menu --- ---------------------------- -DROP TABLE IF EXISTS `sys_menu`; -CREATE TABLE `sys_menu` ( - `menu_id` bigint NOT NULL AUTO_INCREMENT COMMENT '菜单ID', - `menu_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '菜单名称', - `parent_id` bigint DEFAULT '0' COMMENT '父菜单ID', - `order_num` int DEFAULT '0' COMMENT '显示顺序', - `path` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '路由地址', - `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '组件路径', - `query` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '路由参数', - `is_frame` int DEFAULT '1' COMMENT '是否为外链（0是 1否）', - `is_cache` int DEFAULT '0' COMMENT '是否缓存（0缓存 1不缓存）', - `menu_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '菜单类型（M目录 C菜单 F按钮）', - `visible` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '菜单状态（0显示 1隐藏）', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '菜单状态（0正常 1停用）', - `perms` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '权限标识', - `icon` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '#' COMMENT '菜单图标', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '备注', - PRIMARY KEY (`menu_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=2000 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='菜单权限表'; - --- ---------------------------- --- Records of sys_menu --- ---------------------------- -BEGIN; -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '系统管理', 0, 1, 'system', NULL, '', 1, 0, 'M', '0', '0', '', 'system', 'admin', '2024-05-23 15:08:18', '', NULL, '系统管理目录'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '系统监控', 0, 2, 'monitor', NULL, '', 1, 0, 'M', '0', '0', '', 'monitor', 'admin', '2024-05-23 15:08:18', '', NULL, '系统监控目录'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, '系统工具', 0, 3, 'tool', NULL, '', 1, 0, 'M', '0', '0', '', 'tool', 'admin', '2024-05-23 15:08:18', '', NULL, '系统工具目录'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (4, '若依官网', 0, 4, 'http://muyu.vip', NULL, '', 0, 0, 'M', '0', '0', '', 'guide', 'admin', '2024-05-23 15:08:18', '', NULL, '若依官网地址'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (100, '用户管理', 1, 1, 'user', 'system/user/index', '', 1, 0, 'C', '0', '0', 'system:user:list', 'user', 'admin', '2024-05-23 15:08:18', '', NULL, '用户管理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (101, '角色管理', 1, 2, 'role', 'system/role/index', '', 1, 0, 'C', '0', '0', 'system:role:list', 'peoples', 'admin', '2024-05-23 15:08:18', '', NULL, '角色管理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (102, '菜单管理', 1, 3, 'menu', 'system/menu/index', '', 1, 0, 'C', '0', '0', 'system:menu:list', 'tree-table', 'admin', '2024-05-23 15:08:18', '', NULL, '菜单管理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (103, '部门管理', 1, 4, 'dept', 'system/dept/index', '', 1, 0, 'C', '0', '0', 'system:dept:list', 'tree', 'admin', '2024-05-23 15:08:18', '', NULL, '部门管理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (104, '岗位管理', 1, 5, 'post', 'system/post/index', '', 1, 0, 'C', '0', '0', 'system:post:list', 'post', 'admin', '2024-05-23 15:08:18', '', NULL, '岗位管理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (105, '字典管理', 1, 6, 'dict', 'system/dict/index', '', 1, 0, 'C', '0', '0', 'system:dict:list', 'dict', 'admin', '2024-05-23 15:08:18', '', NULL, '字典管理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (106, '参数设置', 1, 7, 'config', 'system/config/index', '', 1, 0, 'C', '0', '0', 'system:config:list', 'edit', 'admin', '2024-05-23 15:08:18', '', NULL, '参数设置菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (107, '通知公告', 1, 8, 'notice', 'system/notice/index', '', 1, 0, 'C', '0', '0', 'system:notice:list', 'message', 'admin', '2024-05-23 15:08:18', '', NULL, '通知公告菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (108, '日志管理', 1, 9, 'log', '', '', 1, 0, 'M', '0', '0', '', 'log', 'admin', '2024-05-23 15:08:18', '', NULL, '日志管理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (109, '在线用户', 2, 1, 'online', 'monitor/online/index', '', 1, 0, 'C', '0', '0', 'monitor:online:list', 'online', 'admin', '2024-05-23 15:08:18', '', NULL, '在线用户菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (110, '定时任务', 2, 2, 'http://admin.xxl.muyu.icu/toLogin', 'monitor/job/index', '', 0, 0, 'M', '0', '0', 'monitor:job:list', 'job', 'admin', '2024-05-23 15:08:18', 'admin', '2024-07-15 12:50:44', '定时任务菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (111, 'Sentinel控制台', 2, 3, 'http://localhost:8718', '', '', 0, 0, 'C', '0', '0', 'monitor:sentinel:list', 'sentinel', 'admin', '2024-05-23 15:08:18', '', NULL, '流量控制菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (112, 'Nacos控制台', 2, 4, 'http://localhost:8848/nacos', '', '', 0, 0, 'C', '0', '0', 'monitor:nacos:list', 'nacos', 'admin', '2024-05-23 15:08:18', '', NULL, '服务治理菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (113, 'Admin控制台', 2, 5, 'http://localhost:9100/login', '', '', 0, 0, 'C', '0', '0', 'monitor:server:list', 'server', 'admin', '2024-05-23 15:08:18', '', NULL, '服务监控菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (114, '表单构建', 3, 1, 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0', 'tool:build:list', 'build', 'admin', '2024-05-23 15:08:18', '', NULL, '表单构建菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (115, '代码生成', 3, 2, 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen:list', 'code', 'admin', '2024-05-23 15:08:18', '', NULL, '代码生成菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (116, '系统接口', 3, 3, 'http://localhost:8080/doc.html', '', '', 0, 0, 'C', '0', '0', 'tool:swagger:list', 'swagger', 'admin', '2024-05-23 15:08:18', '', NULL, '系统接口菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (500, '操作日志', 108, 1, 'operlog', 'system/operlog/index', '', 1, 0, 'C', '0', '0', 'system:operlog:list', 'form', 'admin', '2024-05-23 15:08:18', '', NULL, '操作日志菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (501, '登录日志', 108, 2, 'logininfor', 'system/logininfor/index', '', 1, 0, 'C', '0', '0', 'system:logininfor:list', 'logininfor', 'admin', '2024-05-23 15:08:18', '', NULL, '登录日志菜单'); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1000, '用户查询', 100, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:user:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1001, '用户新增', 100, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:user:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1002, '用户修改', 100, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:user:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1003, '用户删除', 100, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:user:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1004, '用户导出', 100, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:user:export', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1005, '用户导入', 100, 6, '', '', '', 1, 0, 'F', '0', '0', 'system:user:import', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1006, '重置密码', 100, 7, '', '', '', 1, 0, 'F', '0', '0', 'system:user:resetPwd', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1007, '角色查询', 101, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:role:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1008, '角色新增', 101, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:role:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1009, '角色修改', 101, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:role:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1010, '角色删除', 101, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:role:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1011, '角色导出', 101, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:role:export', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1012, '菜单查询', 102, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1013, '菜单新增', 102, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1014, '菜单修改', 102, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1015, '菜单删除', 102, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:menu:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1016, '部门查询', 103, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1017, '部门新增', 103, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1018, '部门修改', 103, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1019, '部门删除', 103, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:dept:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1020, '岗位查询', 104, 1, '', '', '', 1, 0, 'F', '0', '0', 'system:post:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1021, '岗位新增', 104, 2, '', '', '', 1, 0, 'F', '0', '0', 'system:post:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1022, '岗位修改', 104, 3, '', '', '', 1, 0, 'F', '0', '0', 'system:post:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1023, '岗位删除', 104, 4, '', '', '', 1, 0, 'F', '0', '0', 'system:post:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1024, '岗位导出', 104, 5, '', '', '', 1, 0, 'F', '0', '0', 'system:post:export', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1025, '字典查询', 105, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1026, '字典新增', 105, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1027, '字典修改', 105, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1028, '字典删除', 105, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1029, '字典导出', 105, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:dict:export', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1030, '参数查询', 106, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1031, '参数新增', 106, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1032, '参数修改', 106, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1033, '参数删除', 106, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1034, '参数导出', 106, 5, '#', '', '', 1, 0, 'F', '0', '0', 'system:config:export', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1035, '公告查询', 107, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1036, '公告新增', 107, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:add', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1037, '公告修改', 107, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1038, '公告删除', 107, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:notice:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1039, '操作查询', 500, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1040, '操作删除', 500, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1041, '日志导出', 500, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:operlog:export', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1042, '登录查询', 501, 1, '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1043, '登录删除', 501, 2, '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1044, '日志导出', 501, 3, '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:export', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1045, '账户解锁', 501, 4, '#', '', '', 1, 0, 'F', '0', '0', 'system:logininfor:unlock', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1046, '在线查询', 109, 1, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1047, '批量强退', 109, 2, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:batchLogout', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1048, '单条强退', 109, 3, '#', '', '', 1, 0, 'F', '0', '0', 'monitor:online:forceLogout', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1055, '生成查询', 115, 1, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1056, '生成修改', 115, 2, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:edit', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1057, '生成删除', 115, 3, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:remove', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1058, '导入代码', 115, 2, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:import', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1059, '预览代码', 115, 4, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:preview', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_menu` (`menu_id`, `menu_name`, `parent_id`, `order_num`, `path`, `component`, `query`, `is_frame`, `is_cache`, `menu_type`, `visible`, `status`, `perms`, `icon`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1060, '生成代码', 115, 5, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:code', '#', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -COMMIT; - --- ---------------------------- --- Table structure for sys_notice --- ---------------------------- -DROP TABLE IF EXISTS `sys_notice`; -CREATE TABLE `sys_notice` ( - `notice_id` int NOT NULL AUTO_INCREMENT COMMENT '公告ID', - `notice_title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '公告标题', - `notice_type` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '公告类型（1通知 2公告）', - `notice_content` longblob COMMENT '公告内容', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '公告状态（0正常 1关闭）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`notice_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=10 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='通知公告表'; - --- ---------------------------- --- Records of sys_notice --- ---------------------------- -BEGIN; -INSERT INTO `sys_notice` (`notice_id`, `notice_title`, `notice_type`, `notice_content`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '温馨提醒：2018-07-01 若依新版本发布啦', '2', 0xE696B0E78988E69CACE58685E5AEB9, '0', 'admin', '2024-05-23 15:08:18', '', NULL, '管理员'); -INSERT INTO `sys_notice` (`notice_id`, `notice_title`, `notice_type`, `notice_content`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '维护通知：2018-07-01 若依系统凌晨维护', '1', 0xE7BBB4E68AA4E58685E5AEB9, '0', 'admin', '2024-05-23 15:08:18', '', NULL, '管理员'); -COMMIT; - --- ---------------------------- --- Table structure for sys_oper_log --- ---------------------------- -DROP TABLE IF EXISTS `sys_oper_log`; -CREATE TABLE `sys_oper_log` ( - `oper_id` bigint NOT NULL AUTO_INCREMENT COMMENT '日志主键', - `title` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '模块标题', - `business_type` int DEFAULT '0' COMMENT '业务类型（0其它 1新增 2修改 3删除）', - `method` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '方法名称', - `request_method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '请求方式', - `operator_type` int DEFAULT '0' COMMENT '操作类别（0其它 1后台用户 2手机端用户）', - `oper_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '操作人员', - `dept_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '部门名称', - `oper_url` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '请求URL', - `oper_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '主机地址', - `oper_location` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '操作地点', - `oper_param` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '请求参数', - `json_result` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '返回参数', - `status` int DEFAULT '0' COMMENT '操作状态（0正常 1异常）', - `error_msg` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '错误消息', - `oper_time` datetime DEFAULT NULL COMMENT '操作时间', - `cost_time` bigint DEFAULT '0' COMMENT '消耗时间', - PRIMARY KEY (`oper_id`) USING BTREE, - KEY `idx_sys_oper_log_bt` (`business_type`) USING BTREE, - KEY `idx_sys_oper_log_s` (`status`) USING BTREE, - KEY `idx_sys_oper_log_ot` (`oper_time`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=108 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='操作日志记录'; - --- ---------------------------- --- Records of sys_oper_log --- ---------------------------- -BEGIN; -COMMIT; - --- ---------------------------- --- Table structure for sys_post --- ---------------------------- -DROP TABLE IF EXISTS `sys_post`; -CREATE TABLE `sys_post` ( - `post_id` bigint NOT NULL AUTO_INCREMENT COMMENT '岗位ID', - `post_code` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '岗位编码', - `post_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '岗位名称', - `post_sort` int NOT NULL COMMENT '显示顺序', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '状态（0正常 1停用）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`post_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='岗位信息表'; - --- ---------------------------- --- Records of sys_post --- ---------------------------- -BEGIN; -INSERT INTO `sys_post` (`post_id`, `post_code`, `post_name`, `post_sort`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, 'ceo', '董事长', 1, '0', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_post` (`post_id`, `post_code`, `post_name`, `post_sort`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, 'se', '项目经理', 2, '0', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_post` (`post_id`, `post_code`, `post_name`, `post_sort`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (3, 'hr', '人力资源', 3, '0', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -INSERT INTO `sys_post` (`post_id`, `post_code`, `post_name`, `post_sort`, `status`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (4, 'user', '普通员工', 4, '0', 'admin', '2024-05-23 15:08:18', '', NULL, ''); -COMMIT; - --- ---------------------------- --- Table structure for sys_role --- ---------------------------- -DROP TABLE IF EXISTS `sys_role`; -CREATE TABLE `sys_role` ( - `role_id` bigint NOT NULL AUTO_INCREMENT COMMENT '角色ID', - `role_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色名称', - `role_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色权限字符串', - `role_sort` int NOT NULL COMMENT '显示顺序', - `data_scope` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '1' COMMENT '数据范围（1：全部数据权限 2：自定数据权限 3：本部门数据权限 4：本部门及以下数据权限）', - `menu_check_strictly` tinyint(1) DEFAULT '1' COMMENT '菜单树选择项是否关联显示', - `dept_check_strictly` tinyint(1) DEFAULT '1' COMMENT '部门树选择项是否关联显示', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '角色状态（0正常 1停用）', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`role_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='角色信息表'; - --- ---------------------------- --- Records of sys_role --- ---------------------------- -BEGIN; -INSERT INTO `sys_role` (`role_id`, `role_name`, `role_key`, `role_sort`, `data_scope`, `menu_check_strictly`, `dept_check_strictly`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, '超级管理员', 'admin', 1, '1', 1, 1, '0', '0', 'admin', '2024-05-23 15:08:18', '', NULL, '超级管理员'); -INSERT INTO `sys_role` (`role_id`, `role_name`, `role_key`, `role_sort`, `data_scope`, `menu_check_strictly`, `dept_check_strictly`, `status`, `del_flag`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, '普通角色', 'common', 2, '2', 1, 1, '0', '0', 'admin', '2024-05-23 15:08:18', 'admin', '2024-07-15 12:42:34', '普通角色'); -COMMIT; - --- ---------------------------- --- Table structure for sys_role_dept --- ---------------------------- -DROP TABLE IF EXISTS `sys_role_dept`; -CREATE TABLE `sys_role_dept` ( - `role_id` bigint NOT NULL COMMENT '角色ID', - `dept_id` bigint NOT NULL COMMENT '部门ID', - PRIMARY KEY (`role_id`,`dept_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='角色和部门关联表'; - --- ---------------------------- --- Records of sys_role_dept --- ---------------------------- -BEGIN; -INSERT INTO `sys_role_dept` (`role_id`, `dept_id`) VALUES (2, 100); -INSERT INTO `sys_role_dept` (`role_id`, `dept_id`) VALUES (2, 101); -INSERT INTO `sys_role_dept` (`role_id`, `dept_id`) VALUES (2, 105); -COMMIT; - --- ---------------------------- --- Table structure for sys_role_menu --- ---------------------------- -DROP TABLE IF EXISTS `sys_role_menu`; -CREATE TABLE `sys_role_menu` ( - `role_id` bigint NOT NULL COMMENT '角色ID', - `menu_id` bigint NOT NULL COMMENT '菜单ID', - PRIMARY KEY (`role_id`,`menu_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='角色和菜单关联表'; - --- ---------------------------- --- Records of sys_role_menu --- ---------------------------- -BEGIN; -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 3); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 4); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 100); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 101); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 102); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 103); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 104); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 105); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 106); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 107); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 108); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 109); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 111); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 112); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 113); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 114); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 115); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 116); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 500); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 501); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1000); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1001); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1002); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1003); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1004); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1005); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1006); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1007); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1008); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1009); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1010); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1011); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1012); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1013); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1014); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1015); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1016); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1017); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1018); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1019); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1020); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1021); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1022); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1023); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1024); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1025); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1026); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1027); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1028); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1029); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1030); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1031); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1032); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1033); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1034); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1035); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1036); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1037); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1038); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1039); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1040); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1041); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1042); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1043); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1044); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1045); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1046); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1047); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1048); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1055); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1056); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1057); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1058); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1059); -INSERT INTO `sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 1060); -COMMIT; - --- ---------------------------- --- Table structure for sys_user --- ---------------------------- -DROP TABLE IF EXISTS `sys_user`; -CREATE TABLE `sys_user` ( - `user_id` bigint NOT NULL AUTO_INCREMENT COMMENT '用户ID', - `dept_id` bigint DEFAULT NULL COMMENT '部门ID', - `user_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户账号', - `nick_name` varchar(30) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '用户昵称', - `user_type` varchar(2) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '00' COMMENT '用户类型（00系统用户）', - `email` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '用户邮箱', - `phonenumber` varchar(11) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '手机号码', - `sex` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '用户性别（0男 1女 2未知）', - `avatar` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '头像地址', - `password` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '密码', - `status` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '帐号状态（0正常 1停用）', - `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '0' COMMENT '删除标志（0代表存在 2代表删除）', - `login_ip` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '最后登录IP', - `login_date` datetime DEFAULT NULL COMMENT '最后登录时间', - `create_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '创建者', - `create_time` datetime DEFAULT NULL COMMENT '创建时间', - `update_by` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT '' COMMENT '更新者', - `update_time` datetime DEFAULT NULL COMMENT '更新时间', - `remark` varchar(500) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '备注', - PRIMARY KEY (`user_id`) USING BTREE -) ENGINE=InnoDB AUTO_INCREMENT=100 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='用户信息表'; - --- ---------------------------- --- Records of sys_user --- ---------------------------- -BEGIN; -INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (1, 103, 'admin', '若依', '00', 'ry@163.com', '15888888888', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-05-23 15:08:18', 'admin', '2024-05-23 15:08:18', '', NULL, '管理员'); -INSERT INTO `sys_user` (`user_id`, `dept_id`, `user_name`, `nick_name`, `user_type`, `email`, `phonenumber`, `sex`, `avatar`, `password`, `status`, `del_flag`, `login_ip`, `login_date`, `create_by`, `create_time`, `update_by`, `update_time`, `remark`) VALUES (2, 105, 'ry', '若依', '00', 'ry@qq.com', '15666666666', '1', '', '$2a$10$7JB720yubVSZvUI0rEqK/.VqGOZTH.ulu33dHOiBE8ByOhJIrdAu2', '0', '0', '127.0.0.1', '2024-05-23 15:08:18', 'admin', '2024-05-23 15:08:18', '', NULL, '测试员'); -COMMIT; - --- ---------------------------- --- Table structure for sys_user_post --- ---------------------------- -DROP TABLE IF EXISTS `sys_user_post`; -CREATE TABLE `sys_user_post` ( - `user_id` bigint NOT NULL COMMENT '用户ID', - `post_id` bigint NOT NULL COMMENT '岗位ID', - PRIMARY KEY (`user_id`,`post_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='用户与岗位关联表'; - --- ---------------------------- --- Records of sys_user_post --- ---------------------------- -BEGIN; -INSERT INTO `sys_user_post` (`user_id`, `post_id`) VALUES (1, 1); -INSERT INTO `sys_user_post` (`user_id`, `post_id`) VALUES (2, 2); -COMMIT; - --- ---------------------------- --- Table structure for sys_user_role --- ---------------------------- -DROP TABLE IF EXISTS `sys_user_role`; -CREATE TABLE `sys_user_role` ( - `user_id` bigint NOT NULL COMMENT '用户ID', - `role_id` bigint NOT NULL COMMENT '角色ID', - PRIMARY KEY (`user_id`,`role_id`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci ROW_FORMAT=DYNAMIC COMMENT='用户和角色关联表'; - --- ---------------------------- --- Records of sys_user_role --- ---------------------------- -BEGIN; -INSERT INTO `sys_user_role` (`user_id`, `role_id`) VALUES (1, 1); -INSERT INTO `sys_user_role` (`user_id`, `role_id`) VALUES (2, 2); -COMMIT; - -SET FOREIGN_KEY_CHECKS = 1; diff --git a/init-file/nacos_config.zip b/init-file/nacos_config.zip deleted file mode 100644 index a3e3c5b..0000000 Binary files a/init-file/nacos_config.zip and /dev/null differ diff --git a/init-file/saas_operation.sql b/init-file/saas_operation.sql new file mode 100644 index 0000000..97438ae --- /dev/null +++ b/init-file/saas_operation.sql @@ -0,0 +1,242 @@ +/* + Navicat Premium Data Transfer + + Source Server : 47.116.173.119 + Source Server Type : MySQL + Source Server Version : 80401 + Source Host : 47.116.173.119:3306 + Source Schema : saas_operation + + Target Server Type : MySQL + Target Server Version : 80401 + File Encoding : 65001 + + Date: 30/09/2024 10:21:52 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for sys_car +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car`; +CREATE TABLE `sys_car` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码', + `car_plate` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆车牌号', + `car_brand` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆品牌', + `car_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号', + `car_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆车型(如客车,卡车,公交车等)', + `car_last_join_time` datetime NULL DEFAULT NULL COMMENT '最后一次连线时间', + `car_last_offline_time` datetime NULL DEFAULT NULL COMMENT '最后一次离线时间', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '2' COMMENT '启用状态(1.在线 2.离线 3.已断开 4.待连接 5.维修中', + `create_by` int NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` int NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆基础信息表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_car_details +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car_details`; +CREATE TABLE `sys_car_details` ( + `id` int NOT NULL COMMENT '车辆ID', + `car_vin` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆VIN码', + `car_motor_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电机厂商', + `car_motor_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电机型号', + `car_battery_manufacturer` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆电池厂商', + `car_battery_model` varchar(120) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '电池型号', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆详细信息表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_car_fault +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car_fault`; +CREATE TABLE `sys_car_fault` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `fault_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '车辆故障编码', + `fault_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障类型', + `fault_label` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障标签', + `fault_bit` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障位', + `fault_value` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆故障值', + `fault_warn` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '故障等级', + `fault_status` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报警状态（Y.是，N.否）', + `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 5 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆故障表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_car_message +-- ---------------------------- +DROP TABLE IF EXISTS `sys_car_message`; +CREATE TABLE `sys_car_message` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `model_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆型号编码', + `message_type_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆报文类型编码', + `message_start_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '开始位下标', + `message_end_index` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '结束位下标', + `message_type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 61 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文记录表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_corpuscle_fence +-- ---------------------------- +DROP TABLE IF EXISTS `sys_corpuscle_fence`; +CREATE TABLE `sys_corpuscle_fence` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `fence_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏编码', + `fence_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏名称', + `fence_type` int NOT NULL DEFAULT 1 COMMENT '围栏类型(1.驶入 2.驶出)', + `fence_position` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '围栏位置', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL DEFAULT '1' COMMENT '启用状态(1.启用 2.停用)', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '电子围栏表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_ent +-- ---------------------------- +DROP TABLE IF EXISTS `sys_ent`; +CREATE TABLE `sys_ent` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT 'ID', + `ent_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码', + `ip` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业数据库IP', + `port` int NULL DEFAULT NULL COMMENT '数据库端口', + `db_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '连接数据库名称', + `user_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户名', + `password` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '密码', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业数据库信息记录表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_fence_group +-- ---------------------------- +DROP TABLE IF EXISTS `sys_fence_group`; +CREATE TABLE `sys_fence_group` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `group_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组编码', + `group_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组名称', + `group_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '围栏组类型', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '启用状态', + `create_by` int NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` int NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 4 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_fence_group_mid +-- ---------------------------- +DROP TABLE IF EXISTS `sys_fence_group_mid`; +CREATE TABLE `sys_fence_group_mid` ( + `group_id` int NOT NULL COMMENT '围栏组id', + `fence_id` int NOT NULL COMMENT '围栏id', + `new_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + PRIMARY KEY (`group_id`, `fence_id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '围栏组连接表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_firm +-- ---------------------------- +DROP TABLE IF EXISTS `sys_firm`; +CREATE TABLE `sys_firm` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `firm_credit_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '统一社会信用代码', + `firm_code` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业编码', + `firm_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业名称', + `firm_logs` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '企业logs', + `state` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT '1' COMMENT '启用状态(1.开业 2.停业 3.休业)', + `create_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '创建人', + `create_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `update_by` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '更新人', + `update_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + `remark` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '备注', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 3 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '企业基础信息表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for sys_message_type +-- ---------------------------- +DROP TABLE IF EXISTS `sys_message_type`; +CREATE TABLE `sys_message_type` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '自增主键', + `message_code` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文编码', + `message_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文名称', + `message_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文分类', + `message_class` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '报文字段类型', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 47 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '车辆报文类型表' ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Table structure for warn_logs +-- ---------------------------- +DROP TABLE IF EXISTS `warn_logs`; +CREATE TABLE `warn_logs` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '预警日志id', + `vin` varchar(58) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码', + `warn_rule_id` int NULL DEFAULT NULL COMMENT '规则id', + `start_time` datetime NULL DEFAULT NULL COMMENT '开始时间', + `end_time` datetime NULL DEFAULT NULL COMMENT '结束时间', + `max_value` int NULL DEFAULT NULL COMMENT '最大值', + `min_value` int NULL DEFAULT NULL COMMENT '最小值', + `avg_value` int NULL DEFAULT NULL COMMENT '平均值', + `median_value` int NULL DEFAULT NULL COMMENT '中位数', + `status` int NULL DEFAULT NULL COMMENT '是否发送预警', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for warn_rule +-- ---------------------------- +DROP TABLE IF EXISTS `warn_rule`; +CREATE TABLE `warn_rule` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '规则id', + `rule_name` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '规则名称', + `strategy_id` int NULL DEFAULT NULL COMMENT '策略id', + `msg_type_id` int NULL DEFAULT NULL COMMENT '报文数据类型id', + `slide_time` int NULL DEFAULT NULL COMMENT '滑窗时间', + `slide_frequency` int NULL DEFAULT NULL COMMENT '滑窗频率', + `max_value` int NULL DEFAULT NULL COMMENT '最大值', + `min_value` int NULL DEFAULT NULL COMMENT '最小值', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for warn_slide_config +-- ---------------------------- +DROP TABLE IF EXISTS `warn_slide_config`; +CREATE TABLE `warn_slide_config` ( + `id` int NOT NULL COMMENT '滑窗id', + `vin` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '车辆vin码', + `slide_time` int NULL DEFAULT NULL COMMENT '滑动时间', + `created_by` int NULL DEFAULT NULL COMMENT '创建人', + `created_time` datetime NULL DEFAULT NULL COMMENT '创建时间', + `updated_by` int NULL DEFAULT NULL COMMENT '更新人', + `updated_time` datetime NULL DEFAULT NULL COMMENT '更新时间', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +-- ---------------------------- +-- Table structure for warn_strategy +-- ---------------------------- +DROP TABLE IF EXISTS `warn_strategy`; +CREATE TABLE `warn_strategy` ( + `id` int NOT NULL AUTO_INCREMENT COMMENT '策略id', + `car_type_id` int NULL DEFAULT NULL COMMENT '车辆类型id', + `strategy_name` varchar(38) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '策略名称', + `msg_id` int NULL DEFAULT NULL COMMENT '报文模版id', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC; + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/init-file/xxl-init.sql b/init-file/xxl-init.sql deleted file mode 100644 index f7e9974..0000000 --- a/init-file/xxl-init.sql +++ /dev/null @@ -1,122 +0,0 @@ -# -# XXL-JOB v2.4.2-SNAPSHOT -# Copyright (c) 2015-present, xuxueli. - -CREATE database if NOT EXISTS `xxl_job` default character set utf8mb4; -use `xxl_job`; - -SET NAMES utf8mb4; - -CREATE TABLE `xxl_job_info` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `job_group` int(11) NOT NULL COMMENT '执行器主键ID', - `job_desc` varchar(255) NOT NULL, - `add_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, - `author` varchar(64) DEFAULT NULL COMMENT '作者', - `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮件', - `schedule_type` varchar(50) NOT NULL DEFAULT 'NONE' COMMENT '调度类型', - `schedule_conf` varchar(128) DEFAULT NULL COMMENT '调度配置，值含义取决于调度类型', - `misfire_strategy` varchar(50) NOT NULL DEFAULT 'DO_NOTHING' COMMENT '调度过期策略', - `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略', - `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler', - `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数', - `executor_block_strategy` varchar(50) DEFAULT NULL COMMENT '阻塞处理策略', - `executor_timeout` int(11) NOT NULL DEFAULT '0' COMMENT '任务执行超时时间，单位秒', - `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数', - `glue_type` varchar(50) NOT NULL COMMENT 'GLUE类型', - `glue_source` mediumtext COMMENT 'GLUE源代码', - `glue_remark` varchar(128) DEFAULT NULL COMMENT 'GLUE备注', - `glue_updatetime` datetime DEFAULT NULL COMMENT 'GLUE更新时间', - `child_jobid` varchar(255) DEFAULT NULL COMMENT '子任务ID，多个逗号分隔', - `trigger_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '调度状态：0-停止，1-运行', - `trigger_last_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '上次调度时间', - `trigger_next_time` bigint(13) NOT NULL DEFAULT '0' COMMENT '下次调度时间', - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `xxl_job_log` ( - `id` bigint(20) NOT NULL AUTO_INCREMENT, - `job_group` int(11) NOT NULL COMMENT '执行器主键ID', - `job_id` int(11) NOT NULL COMMENT '任务，主键ID', - `executor_address` varchar(255) DEFAULT NULL COMMENT '执行器地址，本次执行的地址', - `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler', - `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数', - `executor_sharding_param` varchar(20) DEFAULT NULL COMMENT '执行器任务分片参数，格式如 1/2', - `executor_fail_retry_count` int(11) NOT NULL DEFAULT '0' COMMENT '失败重试次数', - `trigger_time` datetime DEFAULT NULL COMMENT '调度-时间', - `trigger_code` int(11) NOT NULL COMMENT '调度-结果', - `trigger_msg` text COMMENT '调度-日志', - `handle_time` datetime DEFAULT NULL COMMENT '执行-时间', - `handle_code` int(11) NOT NULL COMMENT '执行-状态', - `handle_msg` text COMMENT '执行-日志', - `alarm_status` tinyint(4) NOT NULL DEFAULT '0' COMMENT '告警状态：0-默认、1-无需告警、2-告警成功、3-告警失败', - PRIMARY KEY (`id`), - KEY `I_trigger_time` (`trigger_time`), - KEY `I_handle_code` (`handle_code`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `xxl_job_log_report` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `trigger_day` datetime DEFAULT NULL COMMENT '调度-时间', - `running_count` int(11) NOT NULL DEFAULT '0' COMMENT '运行中-日志数量', - `suc_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行成功-日志数量', - `fail_count` int(11) NOT NULL DEFAULT '0' COMMENT '执行失败-日志数量', - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `i_trigger_day` (`trigger_day`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `xxl_job_logglue` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `job_id` int(11) NOT NULL COMMENT '任务，主键ID', - `glue_type` varchar(50) DEFAULT NULL COMMENT 'GLUE类型', - `glue_source` mediumtext COMMENT 'GLUE源代码', - `glue_remark` varchar(128) NOT NULL COMMENT 'GLUE备注', - `add_time` datetime DEFAULT NULL, - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `xxl_job_registry` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `registry_group` varchar(50) NOT NULL, - `registry_key` varchar(255) NOT NULL, - `registry_value` varchar(255) NOT NULL, - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`), - KEY `i_g_k_v` (`registry_group`,`registry_key`,`registry_value`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `xxl_job_group` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `app_name` varchar(64) NOT NULL COMMENT '执行器AppName', - `title` varchar(12) NOT NULL COMMENT '执行器名称', - `address_type` tinyint(4) NOT NULL DEFAULT '0' COMMENT '执行器地址类型：0=自动注册、1=手动录入', - `address_list` text COMMENT '执行器地址列表，多地址逗号分隔', - `update_time` datetime DEFAULT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `xxl_job_user` ( - `id` int(11) NOT NULL AUTO_INCREMENT, - `username` varchar(50) NOT NULL COMMENT '账号', - `password` varchar(50) NOT NULL COMMENT '密码', - `role` tinyint(4) NOT NULL COMMENT '角色：0-普通用户、1-管理员', - `permission` varchar(255) DEFAULT NULL COMMENT '权限：执行器ID列表，多个逗号分割', - PRIMARY KEY (`id`), - UNIQUE KEY `i_username` (`username`) USING BTREE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -CREATE TABLE `xxl_job_lock` ( - `lock_name` varchar(50) NOT NULL COMMENT '锁名称', - PRIMARY KEY (`lock_name`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; - -INSERT INTO `xxl_job_group`(`id`, `app_name`, `title`, `address_type`, `address_list`, `update_time`) VALUES (1, 'xxl-job-executor-sample', '示例执行器', 0, NULL, '2018-11-03 22:21:31' ); -INSERT INTO `xxl_job_info`(`id`, `job_group`, `job_desc`, `add_time`, `update_time`, `author`, `alarm_email`, `schedule_type`, `schedule_conf`, `misfire_strategy`, `executor_route_strategy`, `executor_handler`, `executor_param`, `executor_block_strategy`, `executor_timeout`, `executor_fail_retry_count`, `glue_type`, `glue_source`, `glue_remark`, `glue_updatetime`, `child_jobid`) VALUES (1, 1, '测试任务1', '2018-11-03 22:21:31', '2018-11-03 22:21:31', 'XXL', '', 'CRON', '0 0 0 * * ? *', 'DO_NOTHING', 'FIRST', 'demoJobHandler', '', 'SERIAL_EXECUTION', 0, 0, 'BEAN', '', 'GLUE代码初始化', '2018-11-03 22:21:31', ''); -INSERT INTO `xxl_job_user`(`id`, `username`, `password`, `role`, `permission`) VALUES (1, 'admin', 'e10adc3949ba59abbe56e057f20f883e', 1, NULL); -INSERT INTO `xxl_job_lock` ( `lock_name`) VALUES ( 'schedule_lock'); - -commit; - diff --git a/pom.xml b/pom.xml index 650f98f..f4a514b 100644 --- a/pom.xml +++ b/pom.xml @@ -305,7 +305,6 @@ cloud-visual cloud-modules cloud-common - cloud-data-processing pom