合并

.editorConfig

@@ -7,5 +7,5 @@ indent_style = space
 end_of_line = lf
 insert_final_newline = true
 
-[**.yml]
+[*.{yml,yaml}]
 indent_size = 2

.gitignore

@@ -36,3 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 node_modules
+
+logs/

README.md

@@ -5,8 +5,8 @@
 ## 开发环境
 
 <!-- prettier-ignore -->
-- JDK 1.8+ (推荐同时安装最新 LTS 版本) [下载](https://www.oracle.com/java/technologies/downloads/#jdk17-windows)
-- NodeJS [latest](https://nodejs.org/zh-cn/)
+- JDK 17 [版本管理工具](https://github.com/shyiko/jabba)
+- NodeJS [下载](https://nodejs.org/zh-cn/)
 - IDEA [下载](https://www.jetbrains.com/idea/)
 - Navicat Premium [下载](http://www.downcc.com/soft/430673.html)
 - RedisDesktopManager [下载](https://github.com/FuckDoctors/rdm-builder)
@@ -18,6 +18,7 @@
 <!-- prettier-ignore -->
 - [开发规范说明](./doc/workflow.md)
 - [技术栈说明](./doc/technique.md)
+- [实用技巧](./doc/skill.md)
 
 ---
 

app-push/build.gradle

+dependencies {
+	implementation project(':basic-common:core')
+	implementation project(':basic-common:util')
+	implementation project(':basic-common:redis')
+
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-amqp'
+
+	// 本地依赖
+	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
+
+	// hutool-core
+	implementation "cn.hutool:hutool-core:${hutoolVersion}"
+
+	// fastjson
+	implementation "com.alibaba:fastjson:${fastJsonVersion}"
+
+	// https://github.com/vladmihalcea/hibernate-types
+	// hibernate-types-55
+	implementation "com.vladmihalcea:hibernate-types-55:${hibernateTypesVersion}"
+
+}

app-push/src/main/java/com/yiring/app/package-info.java

+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/4/14 14:53
+ */
+package com.yiring.app;

app-push/src/main/java/com/yiring/app/push/domain/PushMessage.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.push.domain;
+
+import com.alibaba.fastjson.JSON;
+import com.vladmihalcea.hibernate.type.json.JsonType;
+import com.yiring.common.domain.BasicEntity;
+import java.io.Serial;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Objects;
+import javax.persistence.*;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Comment;
+import org.hibernate.annotations.TypeDef;
+
+/**
+ * 推送消息日志
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/14 14:55
+ */
+
+@Getter
+@Setter
+@ToString
+@SuperBuilder(toBuilder = true)
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Entity
+@TypeDef(name = "json", typeClass = JsonType.class)
+@Table(
+    name = "SYS_PUSH_MESSAGE",
+    indexes = {
+        @Index(columnList = "type"),
+        @Index(columnList = "status"),
+        @Index(columnList = "source"),
+        @Index(columnList = "sourceId"),
+        @Index(columnList = "target"),
+        @Index(columnList = "targetId"),
+        @Index(columnList = "pushTime"),
+    }
+)
+@Comment("推送消息日志")
+public class PushMessage extends BasicEntity implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1478640364892356248L;
+
+    @Comment("消息类型")
+    @Enumerated(EnumType.STRING)
+    Type type;
+
+    @Comment("消息来源")
+    String source;
+
+    @Comment("消息来源标识")
+    String sourceId;
+
+    @Comment("消息目标")
+    String target;
+
+    @Comment("消息目标标识")
+    String targetId;
+
+    @Comment("消息内容")
+    String content;
+
+    @Comment("扩展数据")
+    @org.hibernate.annotations.Type(type = "json")
+    @Column(columnDefinition = "json")
+    JSON extra;
+
+    @Comment("消息状态")
+    @Enumerated(EnumType.STRING)
+    Status status;
+
+    @Comment("推送反馈结果")
+    @org.hibernate.annotations.Type(type = "json")
+    @Column(columnDefinition = "json")
+    JSON result;
+
+    @Comment("重试次数")
+    Integer retryCount;
+
+    @Comment("推送时间")
+    LocalDateTime pushTime;
+
+    @SuppressWarnings({ "unused" })
+    public enum Type {
+        WS("STOMP WebSocket 消息"),
+        APP("APP 消息"),
+        SMS("短信消息"),
+        EMAIL("邮件消息"),
+        CALL_TTS("TTS 文本合成语音消息（电话）"),
+        CALL_AUDIO("自定义音频消息（电话）"),
+        DEVICE_TONE("自定义音频消息（音柱）");
+
+        final String text;
+
+        Type(String text) {
+            this.text = text;
+        }
+
+        public String text() {
+            return this.text;
+        }
+
+        public String queue() {
+            return String.format("push.%s.queue", this.name());
+        }
+    }
+
+    @SuppressWarnings({ "unused" })
+    public enum Status {
+        SUCCESS("成功"),
+        FAIL("失败");
+
+        final String text;
+
+        Status(String text) {
+            this.text = text;
+        }
+
+        public String text() {
+            return this.text;
+        }
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        PushMessage that = (PushMessage) o;
+        return getId() != null && Objects.equals(getId(), that.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+}

app-push/src/main/java/com/yiring/app/push/domain/PushMessageRepository.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.push.domain;
+
+import java.io.Serializable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/4/14 15:33
+ */
+
+@Repository
+public interface PushMessageRepository
+    extends JpaRepository<PushMessage, Serializable>, JpaSpecificationExecutor<PushMessage> {}

app-push/src/main/java/com/yiring/app/push/rabbitmq/PushRabbitConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.push.rabbitmq;
+
+import java.util.HashMap;
+import java.util.Map;
+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.beans.factory.annotation.Qualifier;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 推送 rabbitmq 配置
+ *
+ * @author ifzm
+ * 2019/8/21 15:44
+ */
+@Configuration
+public class PushRabbitConfig {
+
+    public static final String PUSH_TOPIC_EXCHANGE = "push.topic.exchange";
+
+    public static final String PUSH_APP_QUEUE = "push.app.queue";
+    public static final String PUSH_WS_QUEUE = "push.ws.queue";
+    public static final String PUSH_SMS_QUEUE = "push.sms.queue";
+    public static final String PUSH_EMAIL_QUEUE = "push.email.queue";
+    public static final String PUSH_CALL_TTS_QUEUE = "push.call.tts.queue";
+    public static final String PUSH_CALL_AUDIO_QUEUE = "push.call.audio.queue";
+    public static final String PUSH_DEVICE_TONE_QUEUE = "push.device.tone.queue";
+
+    /**
+     * 订阅模式
+     *
+     * @return TopicExchange
+     */
+    @Bean
+    TopicExchange exchange() {
+        return new TopicExchange(PUSH_TOPIC_EXCHANGE, true, false);
+    }
+
+    @Bean(PUSH_APP_QUEUE)
+    public Queue pushAppQueue() {
+        Map<String, Object> args = new HashMap<>(1);
+        args.put("x-message-ttl", 60 * 1000);
+        return new Queue(PUSH_APP_QUEUE, true, false, false, args);
+    }
+
+    @Bean
+    Binding bindingExchangeApp(@Qualifier(PUSH_APP_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_APP_QUEUE);
+    }
+
+    @Bean(PUSH_WS_QUEUE)
+    public Queue pushWebSocketQueue() {
+        Map<String, Object> args = new HashMap<>(1);
+        args.put("x-message-ttl", 30 * 1000);
+        return new Queue(PUSH_WS_QUEUE, true, false, false, args);
+    }
+
+    @Bean
+    Binding bindingExchangeWs(@Qualifier(PUSH_WS_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_WS_QUEUE);
+    }
+
+    @Bean(PUSH_SMS_QUEUE)
+    public Queue pushSmsQueue() {
+        Map<String, Object> args = new HashMap<>(1);
+        args.put("x-message-ttl", 30 * 1000);
+        return new Queue(PUSH_SMS_QUEUE, true, false, false, args);
+    }
+
+    @Bean
+    Binding bindingExchangeSms(@Qualifier(PUSH_SMS_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_SMS_QUEUE);
+    }
+
+    @Bean(PUSH_EMAIL_QUEUE)
+    public Queue pushEmailQueue() {
+        Map<String, Object> args = new HashMap<>(1);
+        args.put("x-message-ttl", 60 * 1000);
+        return new Queue(PUSH_EMAIL_QUEUE, true, false, false, args);
+    }
+
+    @Bean
+    Binding bindingExchangeEmail(@Qualifier(PUSH_EMAIL_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_EMAIL_QUEUE);
+    }
+
+    @Bean(PUSH_CALL_TTS_QUEUE)
+    public Queue pushCallTtsQueue() {
+        Map<String, Object> args = new HashMap<>(1);
+        args.put("x-message-ttl", 60 * 10 * 1000);
+        return new Queue(PUSH_CALL_TTS_QUEUE, true, false, false, args);
+    }
+
+    @Bean
+    Binding bindingExchangeCallTts(@Qualifier(PUSH_CALL_TTS_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_CALL_TTS_QUEUE);
+    }
+
+    @Bean(PUSH_CALL_AUDIO_QUEUE)
+    public Queue pushCallAudioQueue() {
+        Map<String, Object> args = new HashMap<>(1);
+        args.put("x-message-ttl", 60 * 10 * 1000);
+        return new Queue(PUSH_CALL_AUDIO_QUEUE, true, false, false, args);
+    }
+
+    @Bean
+    Binding bindingExchangeCallAudio(@Qualifier(PUSH_CALL_AUDIO_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_CALL_AUDIO_QUEUE);
+    }
+
+    @Bean(PUSH_DEVICE_TONE_QUEUE)
+    public Queue pushDeviceToneQueue() {
+        Map<String, Object> args = new HashMap<>(1);
+        args.put("x-message-ttl", 60 * 10 * 1000);
+        return new Queue(PUSH_DEVICE_TONE_QUEUE, true, false, false, args);
+    }
+
+    @Bean
+    Binding bindingExchangeDeviceTone(@Qualifier(PUSH_DEVICE_TONE_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_DEVICE_TONE_QUEUE);
+    }
+}

app-push/src/main/java/com/yiring/app/push/rabbitmq/PushRabbitReceiver.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.push.rabbitmq;
+
+import com.yiring.app.push.domain.PushMessageRepository;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * rabbitmq配置
+ *
+ * @author ifzm
+ * 2019/8/21 16:07
+ */
+
+@SuppressWarnings({ "unused" })
+@Slf4j
+@Component("PushRabbitReceiver")
+@Transactional(rollbackFor = Exception.class)
+public class PushRabbitReceiver {
+
+    @Resource
+    PushMessageRepository repository;
+
+    @RabbitHandler
+    @RabbitListener(queues = PushRabbitConfig.PUSH_WS_QUEUE)
+    public void receiverWebSocketMessage(Long id) {
+        log.info("接收到消息: " + id);
+
+        repository.findById(id).ifPresent(message -> log.info("{}", message));
+    }
+}

app-push/src/main/java/com/yiring/app/push/service/PushService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.push.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yiring.app.push.domain.PushMessage;
+
+/**
+ * 推送服务
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/14 16:01
+ */
+public interface PushService {
+    void push(PushMessage.Type type, JSONObject raw);
+}

app-push/src/main/java/com/yiring/app/push/service/impl/PushServiceImpl.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.push.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.yiring.app.push.domain.PushMessage;
+import com.yiring.app.push.domain.PushMessageRepository;
+import com.yiring.app.push.rabbitmq.PushRabbitConfig;
+import com.yiring.app.push.service.PushService;
+import javax.annotation.Resource;
+import javax.transaction.Transactional;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.stereotype.Service;
+
+/**
+ * 推送服务实现
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/14 16:08
+ */
+
+@Slf4j
+@Service
+@Transactional(rollbackOn = Exception.class)
+public class PushServiceImpl implements PushService {
+
+    @Resource
+    PushMessageRepository repository;
+
+    @Resource
+    AmqpTemplate amqpTemplate;
+
+    @Override
+    public void push(PushMessage.Type type, JSONObject raw) {
+        PushMessage message = new PushMessage();
+        message.setType(type);
+        message.setExtra(raw);
+        repository.saveAndFlush(message);
+        amqpTemplate.convertAndSend(PushRabbitConfig.PUSH_TOPIC_EXCHANGE, type.queue(), message.getId());
+    }
+}

app/build.gradle

@@ -7,10 +7,12 @@ bootJar {
 
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 	implementation 'org.springframework.boot:spring-boot-starter-amqp'
-	implementation 'org.springframework.boot:spring-boot-starter-validation'
-
+	implementation "org.springframework.boot:spring-boot-starter-websocket"
+	implementation "org.springframework.boot:spring-boot-starter-reactor-netty"
 	// 💬 Mock/Test Env
 	runtimeOnly 'com.h2database:h2'
 	// 💬 Prod/Dev Env
@@ -20,13 +22,19 @@ dependencies {
 	// 本地依赖
 	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
 
+	// 公共依赖
 	implementation project(":basic-common:core")
 	implementation project(":basic-common:util")
 
+	// 服务依赖
+	implementation project(":app-push")
+
+	// Optional: Redis
+	implementation project(":basic-common:redis")
+
 	// Optional: Doc
 	implementation project(":basic-common:doc")
 	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
-//	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
 	// Optional: Auth
 	implementation project(":basic-auth")
@@ -40,13 +48,28 @@ dependencies {
 	// fastjson
 	implementation "com.alibaba:fastjson:${fastJsonVersion}"
 
+	// hutool
+	implementation "cn.hutool:hutool-core:${hutoolVersion}"
+	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
+	implementation "cn.hutool:hutool-http:${hutoolVersion}"
+
 	// JPA 增加空间字段支持
 	// https://blog.wuwii.com/jpa-spatial.html
-	implementation "org.hibernate:hibernate-spatial:${hibernateSpatialVersion}"
+	implementation("org.hibernate:hibernate-spatial:${hibernateSpatialVersion}") {
+		exclude group: 'org.postgresql', module: 'postgresql'
+	}
+
 	// JTS 几何对象操作库
 	implementation "org.locationtech.jts:jts-core:${jtsVersion}"
 
-	// https://mvnrepository.com/artifact/com.graphhopper.external/jackson-datatype-jts
-	implementation 'com.graphhopper.external:jackson-datatype-jts:1.0-2.7'
+	// https://github.com/vladmihalcea/hibernate-types
+	// hibernate-types-55
+	implementation "com.vladmihalcea:hibernate-types-55:${hibernateTypesVersion}"
+
+	// myexcel
+	implementation "com.github.liaochong:myexcel:${myexcelVersion}"
+
+	// https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-openfeign
+	implementation "org.springframework.cloud:spring-cloud-starter-openfeign:${openfeignVersion}"
 
 }

app/src/main/java/com/yiring/app/Application.java

@@ -4,6 +4,7 @@ package com.yiring.app;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.data.jpa.convert.threeten.Jsr310JpaConverters;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
@@ -12,6 +13,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
     basePackageClasses = { Application.class, Jsr310JpaConverters.class },
     basePackages = Application.BASE_PACKAGES
 )
+@EnableFeignClients
 @SpringBootApplication(scanBasePackages = Application.BASE_PACKAGES)
 public class Application {
 

app/src/main/java/com/yiring/app/config/GlobalExceptionHandler.java

@@ -43,8 +43,7 @@ public class GlobalExceptionHandler {
         String error = "未知参数校验错误";
 
         if (e instanceof ConstraintViolationException) {
-            ConstraintViolationException ex = (ConstraintViolationException) e;
-            error = ex.getConstraintViolations().iterator().next().getMessage();
+            error = ((ConstraintViolationException) e).getConstraintViolations().iterator().next().getMessage();
         } else {
             BindingResult result = null;
             if (e instanceof MethodArgumentNotValidException) {
@@ -95,7 +94,7 @@ public class GlobalExceptionHandler {
      * 失败状态异常
      */
     @ExceptionHandler(value = FailStatusException.class)
-    public Result<String> customCodeExceptionHandler(FailStatusException e) {
+    public Result<String> failStatusExceptionHandler(FailStatusException e) {
         return Result.no(e.getStatus());
     }
 

app/src/main/java/com/yiring/app/config/JtsModuleConfig.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.app.config;
-
-import com.bedatadriven.jackson.datatype.jts.JtsModule;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-/**
- * @author Jim
- * @version 0.1
- * 2022/4/8 11:18
- */
-
-@Configuration
-public class JtsModuleConfig {
-
-    @Bean
-    public JtsModule jtsModule() {
-        return new JtsModule();
-    }
-}

app/src/main/java/com/yiring/app/config/converter/JSONArrayConverter.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.app.config.converter;
-
-import com.alibaba.fastjson.JSONArray;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-
-/**
- * JSONArray JPA 类型转换
- *
- * @author Jim
- * @version 0.1
- * 2022/4/7 18:03
- */
-
-@Converter
-public class JSONArrayConverter implements AttributeConverter<JSONArray, String> {
-
-    @Override
-    public String convertToDatabaseColumn(JSONArray json) {
-        return json.toJSONString();
-    }
-
-    @Override
-    public JSONArray convertToEntityAttribute(String s) {
-        return JSONArray.parseArray(s);
-    }
-}

app/src/main/java/com/yiring/app/config/converter/JSONObjectConverter.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.app.config.converter;
-
-import com.alibaba.fastjson.JSONObject;
-import javax.persistence.AttributeConverter;
-import javax.persistence.Converter;
-
-/**
- * JSONObject JPA 类型转换
- *
- * @author Jim
- * @version 0.1
- * 2022/4/7 18:03
- */
-
-@Converter
-public class JSONObjectConverter implements AttributeConverter<JSONObject, String> {
-
-    @Override
-    public String convertToDatabaseColumn(JSONObject json) {
-        return json.toJSONString();
-    }
-
-    @Override
-    public JSONObject convertToEntityAttribute(String s) {
-        return JSONObject.parseObject(s);
-    }
-}

app/src/main/java/com/yiring/app/config/dialect/PostgresDialect.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.config.dialect;
 
+import java.io.Serial;
 import org.hibernate.spatial.dialect.postgis.PostgisPG10Dialect;
 
 /**
@@ -15,6 +16,7 @@ import org.hibernate.spatial.dialect.postgis.PostgisPG10Dialect;
 @SuppressWarnings({ "unused" })
 public class PostgresDialect extends PostgisPG10Dialect {
 
+    @Serial
     private static final long serialVersionUID = 187383913873678550L;
 
     public PostgresDialect() {

app/src/main/java/com/yiring/app/config/zy/ZyConfigProperties.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.config.zy;
+
+import javax.annotation.Resource;
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * 真源配置想
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/9/25 21:31
+ */
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Component
+@ConfigurationProperties(prefix = "zy-config")
+public class ZyConfigProperties {
+
+    String host;
+
+    @Resource
+    ZyConfigRabbitmq rabbitmq;
+
+    @Resource
+    ZyConfigOpen open;
+
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    @Component
+    @ConfigurationProperties(prefix = "zy-config.rabbitmq")
+    public static class ZyConfigRabbitmq {
+
+        boolean enabled;
+        String host;
+        int port;
+        String username;
+        String password;
+        String virtualHost;
+        String queueName;
+    }
+
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    @Component
+    @ConfigurationProperties(prefix = "zy-config.open")
+    public static class ZyConfigOpen {
+
+        String api;
+        String clientId;
+        String grantType;
+        String clientSecret;
+        String tenant;
+    }
+
+    @Data
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    @Component
+    @ConfigurationProperties(prefix = "zy-config.proxy")
+    public static class ZyConfigProxy {
+
+        String api;
+        String tenant;
+
+        @Resource
+        ZyConfigProxyClient client;
+
+        @Resource
+        ZyConfigProxyManage manage;
+
+        @Data
+        @FieldDefaults(level = AccessLevel.PRIVATE)
+        @Component
+        @ConfigurationProperties(prefix = "zy-config.proxy.client")
+        public static class ZyConfigProxyClient {
+
+            String username;
+            String password;
+        }
+
+        @Data
+        @FieldDefaults(level = AccessLevel.PRIVATE)
+        @Component
+        @ConfigurationProperties(prefix = "zy-config.proxy.manage")
+        public static class ZyConfigProxyManage {
+
+            String username;
+            String password;
+        }
+    }
+}

app/src/main/java/com/yiring/app/config/zy/ZyRabbitConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.config.zy;
+
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.AcknowledgeMode;
+import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * 真源 RabbitMQ 订阅配置
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/13 17:05
+ */
+
+@Slf4j
+@Configuration
+@ConditionalOnProperty(prefix = "zy-config.rabbitmq", value = "enabled", havingValue = "true")
+public class ZyRabbitConfig {
+
+    @Resource
+    ZyConfigProperties.ZyConfigRabbitmq rabbitmq;
+
+    @Resource
+    ConfigurableApplicationContext context;
+
+    public static final String CONNECTION_FACTORY_NAME = "zyRabbitConnectionFactory";
+    public static final String LISTENER_FACTORY_NAME = "zyRabbitListenerFactory";
+
+    /**
+     * 消息队列名称（必须要与配置文件中的 queue-name 完全一致）
+     * 规则: tenant_msg_${open.client-secret}_${open.client-id}
+     * 参见文档: 定位平台接口规范V3.0.1 - 通用版.pdf #6
+     */
+    public static final String MESSAGE_QUEUES_NAME = "tenant_msg_12A14FDC_sc21080400";
+
+    @Bean(CONNECTION_FACTORY_NAME)
+    public CachingConnectionFactory zyConnectionFactory() {
+        return connectionFactory(
+            rabbitmq.getHost(),
+            rabbitmq.getPort(),
+            rabbitmq.getUsername(),
+            rabbitmq.getPassword(),
+            rabbitmq.getVirtualHost()
+        );
+    }
+
+    @Bean(LISTENER_FACTORY_NAME)
+    public SimpleRabbitListenerContainerFactory secondFactory(
+        SimpleRabbitListenerContainerFactoryConfigurer configurer,
+        @Qualifier(CONNECTION_FACTORY_NAME) CachingConnectionFactory connectionFactory
+    ) {
+        // 检查队列名称是否与配置文件一致，避免监听错误
+        if (!MESSAGE_QUEUES_NAME.equals(rabbitmq.getQueueName())) {
+            log.error("队列名称不一致，请检查配置文件");
+            context.close();
+            return null;
+        }
+
+        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+        // 最小消费者数量
+        factory.setConcurrentConsumers(1);
+        // 最大消费者数量
+        factory.setMaxConcurrentConsumers(1);
+        // 预读取一条消息
+        factory.setPrefetchCount(1);
+        // 手动确认消息模式
+        factory.setAcknowledgeMode(AcknowledgeMode.MANUAL);
+        configurer.configure(factory, connectionFactory);
+        return factory;
+    }
+
+    public CachingConnectionFactory connectionFactory(
+        String host,
+        int port,
+        String username,
+        String password,
+        String virtualHost
+    ) {
+        CachingConnectionFactory connectionFactory = new CachingConnectionFactory();
+        connectionFactory.setHost(host);
+        connectionFactory.setPort(port);
+        connectionFactory.setUsername(username);
+        connectionFactory.setPassword(password);
+        connectionFactory.setVirtualHost(virtualHost);
+        return connectionFactory;
+    }
+}

app/src/main/java/com/yiring/app/constant/RedisKey.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.constant;
+
+/**
+ * Redis Key 常量类
+ *
+ * @author fangzhimin
+ * 2018/9/4 15:51
+ */
+public interface RedisKey {
+    /**
+     * STOMP 在线用户关键数据
+     */
+    String STOMP_ONLINE_USERS = "STOMP_ONLINE_USERS";
+}

app/src/main/java/com/yiring/app/domain/car/Car.java

@@ -2,14 +2,17 @@
 package com.yiring.app.domain.car;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
-import com.yiring.common.annotation.Excel;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import javax.persistence.*;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 
@@ -30,6 +33,9 @@ import org.hibernate.snowflake.SnowflakeId;
 @Comment("车辆")
 public class Car implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 8775607064296075463L;
+
     @Id
     @Comment("主键id")
     @GeneratedValue(generator = SnowflakeId.GENERATOR)
@@ -37,48 +43,37 @@ public class Car implements Serializable {
     Long id;
 
     @Comment("车牌号")
-    @Excel(name = "车牌", sort = 1)
     String carNum;
 
     @Comment("车辆类型")
-    @Excel(name = "车辆类型", sort = 2, dictType = "car_type")
     String carType;
 
     @Comment("司机名称")
-    @Excel(name = "司机", sort = 3)
     String driverName;
 
     @Comment("司机电话")
-    @Excel(name = "联系电话", sort = 4)
     String driverMobile;
 
     @Comment("标签卡")
-    @Excel(name = "标签卡", sort = 9)
     String labelCard;
 
     @Comment("标签卡状态")
-    @Excel(name = "标签卡状态", sort = 10, dictType = "car_label_status")
     String labelCardStatus;
 
     @Comment("所属单位id")
-    @Excel(name = "所属单位", sort = 5)
     String orgId;
 
     @Comment("被访人id")
-    @Excel(name = "被访人", sort = 7)
     String intervieweeId;
 
     @Comment("来访原因")
-    @Excel(name = "来访原因", sort = 6)
     String reason;
 
     @Comment("收卡时间")
-    @Excel(name = "收卡时间", sort = 11, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     LocalDateTime cardRecTime;
 
     @Comment("创建时间")
-    @Excel(name = "到访时间", sort = 8, dateFormat = "yyyy-MM-dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     LocalDateTime createTime;
 

app/src/main/java/com/yiring/app/domain/location/LocationBeacon.java

@@ -2,6 +2,7 @@
 package com.yiring.app.domain.location;
 
 import com.yiring.common.annotation.FieldMapping;
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -11,16 +12,17 @@ import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
 import org.hibernate.Hibernate;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.hibernate.snowflake.SnowflakeId;
 import org.locationtech.jts.geom.Point;
 
 /**
  * 定位信标
  * 引用:
- *  1. 查询地图分区（定位系统）, https://nl.yz-cloud.com/position/area/list
- *  2. 查询信标点（定位系统）, https://nl.yz-cloud.com/position/config/point/list
+ *  1. 查询地图分区（定位系统）, <a href="https://nl.yz-cloud.com/position/area/list">https://nl.yz-cloud.com/position/area/list</a>
+ *  2. 查询信标点（定位系统）, <a href="https://nl.yz-cloud.com/position/config/point/list">https://nl.yz-cloud.com/position/config/point/list</a>
  *
  * @author Jim
  * @version 0.1
@@ -43,6 +45,7 @@ import org.locationtech.jts.geom.Point;
 @Comment("定位信标")
 public class LocationBeacon implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 5419734189897829250L;
 
     @Comment("主键")
@@ -84,6 +87,8 @@ public class LocationBeacon implements Serializable {
     Double distance;
 
     @Comment("坐标点信息")
+    @Type(type = "jts_geometry")
+    @Column(columnDefinition = "point")
     Point point;
 
     @FieldMapping

app/src/main/java/com/yiring/app/domain/location/LocationFence.java

@@ -2,6 +2,7 @@
 package com.yiring.app.domain.location;
 
 import com.yiring.common.annotation.FieldMapping;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.HashSet;
@@ -10,8 +11,9 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
 import org.hibernate.snowflake.SnowflakeId;
 import org.locationtech.jts.geom.Geometry;
 
@@ -37,6 +39,7 @@ import org.locationtech.jts.geom.Geometry;
 @Comment("围栏")
 public class LocationFence implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 4155868702188991300L;
 
     @Comment("主键")
@@ -69,6 +72,8 @@ public class LocationFence implements Serializable {
     String shapeType;
 
     @Comment("空间信息")
+    @Type(type = "jts_geometry")
+    @Column(columnDefinition = "geometry")
     Geometry geometry;
 
     @Comment("半径，米/单位（圆形围栏）")

app/src/main/java/com/yiring/app/domain/location/LocationFenceRule.java

@@ -3,6 +3,7 @@ package com.yiring.app.domain.location;
 
 import com.yiring.auth.domain.user.User;
 import com.yiring.common.annotation.FieldMapping;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalTime;
 import java.util.HashSet;
@@ -11,7 +12,7 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 
@@ -33,10 +34,11 @@ import org.hibernate.snowflake.SnowflakeId;
 @FieldNameConstants
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @Entity
-@Table(name = "BS_LOCATION_FENCE_RULE", indexes = {})
+@Table(name = "BS_LOCATION_FENCE_RULE")
 @Comment("围栏规则")
 public class LocationFenceRule implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -6683465582430417205L;
 
     @Comment("主键")

app/src/main/java/com/yiring/app/domain/location/LocationLog.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.domain.location;
 
-import com.alibaba.fastjson.JSONObject;
-import com.yiring.app.config.converter.JSONObjectConverter;
+import com.alibaba.fastjson.JSON;
+import com.vladmihalcea.hibernate.type.json.JsonType;
 import com.yiring.auth.domain.user.User;
+import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -15,8 +16,10 @@ import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
 import org.hibernate.Hibernate;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.Type;
+import org.hibernate.annotations.TypeDef;
 import org.hibernate.snowflake.SnowflakeId;
 import org.locationtech.jts.geom.Point;
 
@@ -38,10 +41,12 @@ import org.locationtech.jts.geom.Point;
 @FieldNameConstants
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @Entity
+@TypeDef(name = "json", typeClass = JsonType.class)
 @Table(name = "BS_LOCATION_LOG", indexes = { @Index(columnList = "time"), @Index(columnList = "silent") })
 @Comment("定位数据")
 public class LocationLog implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 3467455881020691989L;
 
     @Comment("主键")
@@ -83,7 +88,8 @@ public class LocationLog implements Serializable {
     BigDecimal altitude;
 
     @Comment("坐标点信息")
-    @Column(columnDefinition = "POINT")
+    @Type(type = "jts_geometry")
+    @Column(columnDefinition = "point")
     Point point;
 
     @Comment("信标集合")
@@ -108,12 +114,9 @@ public class LocationLog implements Serializable {
     String voltUnit;
 
     @Comment("原始数据")
-    @Convert(converter = JSONObjectConverter.class)
-    @Lob
-    @Basic(fetch = FetchType.LAZY)
-    @Column(columnDefinition = "JSON")
-    @ToString.Exclude
-    JSONObject raw;
+    @org.hibernate.annotations.Type(type = "json")
+    @Column(columnDefinition = "json")
+    JSON raw;
 
     @Comment("创建时间")
     LocalDateTime createTime;

app/src/main/java/com/yiring/app/domain/location/LocationTag.java

@@ -3,6 +3,7 @@ package com.yiring.app.domain.location;
 
 import com.yiring.auth.domain.user.User;
 import com.yiring.common.annotation.FieldMapping;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.Objects;
@@ -11,7 +12,7 @@ import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
 import org.hibernate.Hibernate;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 
@@ -48,6 +49,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Comment("定位标签")
 public class LocationTag implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 5419734189897829250L;
 
     @Comment("主键")

app/src/main/java/com/yiring/app/domain/location/LocationTagRepository.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.domain.location;
+
+import java.io.Serializable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * 定位标签JPA
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@Repository
+public interface LocationTagRepository
+    extends JpaRepository<LocationTag, Serializable>, JpaSpecificationExecutor<LocationTag> {}

app/src/main/java/com/yiring/app/domain/video/Video.java

@@ -7,7 +7,7 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 import org.locationtech.jts.geom.Point;

app/src/main/java/com/yiring/app/domain/visitor/Visitor.java

@@ -8,7 +8,7 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 

app/src/main/java/com/yiring/app/excel/car/CarExportExcel.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.excel.car;
+
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelModel;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/20 10:35
+ */
+@ExcelModel
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class CarExportExcel implements Serializable {
+
+    private static final long serialVersionUID = -4019303809667111441L;
+
+    @ExcelColumn(title = "车牌")
+    String carNum;
+
+    @ExcelColumn(title = "车辆类型")
+    String carType;
+
+    @ExcelColumn(title = "司机")
+    String driverName;
+
+    @ExcelColumn(title = "联系电话")
+    String driverMobile;
+
+    @ExcelColumn(title = "所属单位")
+    String orgId;
+
+    @ExcelColumn(title = "来访原因", width = 15)
+    String reason;
+
+    @ExcelColumn(title = "被访人")
+    String intervieweeId;
+
+    @ExcelColumn(title = "到访时间", format = "yyyy-MM-dd HH:mm:ss", width = 15)
+    LocalDateTime cardSendTime;
+
+    @ExcelColumn(title = "标签卡")
+    String labelCard;
+
+    @ExcelColumn(title = "标签卡状态", mapping = "1:未发卡,2:使用中,3:已收卡")
+    String labelCardStatus;
+
+    @ExcelColumn(title = "收卡时间", format = "yyyy-MM-dd HH:mm:ss", width = 15)
+    LocalDateTime cardRecTime;
+}

app/src/main/java/com/yiring/app/excel/location/LocationTagExportExcel.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.excel.location;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelModel;
+import com.yiring.app.domain.location.LocationTag;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 定位标签导出模型
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@ExcelModel
+@Data
+@Builder
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LocationTagExportExcel implements Serializable {
+
+    private static final long serialVersionUID = -4549580878785078998L;
+
+    @ExcelColumn(title = "主键")
+    @JsonSerialize(using = ToStringSerializer.class)
+    Long id;
+
+    @ExcelColumn(title = "编号")
+    String code;
+
+    @ExcelColumn(title = "标签类型")
+    LocationTag.Type type;
+
+    @ExcelColumn(title = "状态")
+    Boolean silent;
+
+    @ExcelColumn(title = "imei")
+    String imei;
+
+    @ExcelColumn(title = "电量")
+    Integer volt;
+
+    @ExcelColumn(title = "最近更新时间")
+    LocalDateTime updateTime;
+
+    public static List<LocationTagExportExcel> transforms(List<LocationTag> locationTags) {
+        return locationTags
+            .stream()
+            .map(locationTag ->
+                LocationTagExportExcel
+                    .builder()
+                    .id(locationTag.getId())
+                    .code(locationTag.getCode())
+                    .type(locationTag.getType())
+                    .silent(locationTag.getSilent())
+                    .imei(locationTag.getImei())
+                    .volt(locationTag.getVolt())
+                    .updateTime(locationTag.getUpdateTime())
+                    .build()
+            )
+            .collect(Collectors.toList());
+    }
+}

app/src/main/java/com/yiring/app/excel/location/LocationTagImportExcel.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.excel.location;
+
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.yiring.app.domain.location.LocationTag;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LocationTagImportExcel implements Serializable {
+
+    private static final long serialVersionUID = -8817732062049005201L;
+
+    // 编号
+    @ExcelColumn(index = 0)
+    String code;
+
+    // 标签型号
+    @ExcelColumn(index = 1)
+    String type;
+
+    // 设备编码
+    @ExcelColumn(index = 2)
+    String imei;
+
+    public LocationTag transform() {
+        return LocationTag.builder().code(this.code).type(LocationTag.Type.valueOf(this.type)).imei(this.imei).build();
+    }
+}

app/src/main/java/com/yiring/app/excel/video/VideoExportExcel.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.excel.video;
+
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelModel;
+import java.io.Serial;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * @author tzl
+ * 2022/4/20 16:21
+ */
+@ExcelModel
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class VideoExportExcel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 5422685189135254189L;
+
+    @ExcelColumn(title = "编号", width = 10)
+    String uuid;
+
+    @ExcelColumn(title = "摄像头名称", width = 10)
+    String videoName;
+
+    @ExcelColumn(title = "坐标点信息(经度,纬度)", width = 10)
+    Point point;
+
+    @ExcelColumn(title = "m3u8 地址", width = 10)
+    String m3u8;
+
+    @ExcelColumn(title = "备注", width = 15)
+    String remark;
+    //
+    //    String status;
+}

app/src/main/java/com/yiring/app/excel/video/VideoImportExcel.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.excel.video;
+
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelModel;
+import java.io.Serial;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/20 16:21
+ */
+@ExcelModel
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class VideoImportExcel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 5422685189135254189L;
+
+    @ExcelColumn(title = "编号")
+    String uuid;
+
+    @ExcelColumn(title = "摄像头名称")
+    String videoName;
+
+    @ExcelColumn(title = "m3u8 地址")
+    String m3u8;
+
+    @ExcelColumn(title = "备注")
+    String remark;
+
+    @ExcelColumn(title = "经度")
+    double lon;
+
+    @ExcelColumn(title = "纬度")
+    double lat;
+    //    String status;
+}

app/src/main/java/com/yiring/app/exception/CodeException.java

@@ -2,6 +2,7 @@
 package com.yiring.app.exception;
 
 import com.yiring.app.constant.Code;
+import java.io.Serial;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
@@ -19,6 +20,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class CodeException extends RuntimeException {
 
+    @Serial
     private static final long serialVersionUID = -4226669531686389671L;
 
     /**

app/src/main/java/com/yiring/app/feign/GbClient.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.yiring.app.param.video.StreamProxyItem;
 import feign.Response;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.scheduling.annotation.Async;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -14,18 +13,35 @@ import org.springframework.web.bind.annotation.*;
  */
 @FeignClient(url = "${env.host}:3008", name = "gb")
 public interface GbClient {
+    /**
+     * 国标登录接口
+     * @param username 用户名
+     * @param password 密码
+     * @return Response
+     */
     @RequestMapping(value = "/api/user/login", method = RequestMethod.GET)
     Response userLogin(
         @RequestParam(name = "username") String username,
         @RequestParam(name = "password") String password
     );
 
+    /**
+     * 拉流数据同步接口
+     * @param streamProxyItem 拉流对象
+     * @param cookie cookie
+     * @return 是否成功
+     */
     @RequestMapping(value = "/api/proxy/save", method = RequestMethod.POST)
-    @Async
     JSONObject proxySave(@RequestBody StreamProxyItem streamProxyItem, @RequestHeader("Cookie") String cookie);
 
+    /**
+     * 拉流删除接口
+     * @param app 流应用名
+     * @param stream 流编号
+     * @param cookie cookie
+     * @return 是否成功
+     */
     @RequestMapping(value = "/api/proxy/del", method = RequestMethod.DELETE)
-    @Async
     JSONObject proxyDel(
         @RequestParam(name = "app") String app,
         @RequestParam(name = "stream") String stream,

app/src/main/java/com/yiring/app/param/car/CarParam.java

@@ -4,6 +4,7 @@ package com.yiring.app.param.car;
 import com.yiring.common.constant.RegEx;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
@@ -20,7 +21,9 @@ import lombok.experimental.FieldDefaults;
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class CarParam {
+public class CarParam implements Serializable {
+
+    private static final long serialVersionUID = 521351582969232371L;
 
     @ApiModelProperty(value = "车牌号码", example = "湘A99999", required = true)
     @NotEmpty(message = "车牌号码不能为空")

app/src/main/java/com/yiring/app/param/car/CarQueryParam.java

@@ -3,6 +3,7 @@ package com.yiring.app.param.car;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -17,14 +18,14 @@ import lombok.experimental.FieldDefaults;
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class CarQueryParam {
+public class CarQueryParam implements Serializable {
+
+    private static final long serialVersionUID = -2107446950936463302L;
 
     @ApiModelProperty(value = "每页记录数", example = "10")
-    //    @DecimalMin(value = "1", message = "分页条数不能小于1")
     Integer pageSize;
 
     @ApiModelProperty(value = "页码", example = "1")
-    //    @DecimalMin(value = "1", message = "页码不能小于1")
     Integer pageNo;
 
     @ApiModelProperty(value = "车牌号码", example = "湘A12345")

app/src/main/java/com/yiring/app/param/dict/DictParam.java

@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -17,7 +18,9 @@ import lombok.experimental.FieldDefaults;
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class DictParam {
+public class DictParam implements Serializable {
+
+    private static final long serialVersionUID = -6297680882890239905L;
 
     @ApiModelProperty(value = "排序", example = "1", required = true)
     Integer dictSort;

app/src/main/java/com/yiring/app/param/dict/DictQueryParam.java

@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
@@ -16,7 +17,9 @@ import lombok.experimental.FieldDefaults;
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class DictQueryParam {
+public class DictQueryParam implements Serializable {
+
+    private static final long serialVersionUID = 558672306975530791L;
 
     @ApiModelProperty(value = "字典标签", example = "男")
     String dictLabel;

app/src/main/java/com/yiring/app/param/dict/DictTypeParam.java

@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -17,7 +18,9 @@ import lombok.experimental.FieldDefaults;
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class DictTypeParam {
+public class DictTypeParam implements Serializable {
+
+    private static final long serialVersionUID = -4725073029525910806L;
 
     @ApiModelProperty(value = "字典名称", example = "性别", required = true)
     @NotEmpty(message = "字典名称不能为空")

app/src/main/java/com/yiring/app/param/dict/DictTypeQueryParam.java

@@ -3,6 +3,7 @@ package com.yiring.app.param.dict;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
@@ -16,7 +17,9 @@ import lombok.experimental.FieldDefaults;
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class DictTypeQueryParam {
+public class DictTypeQueryParam implements Serializable {
+
+    private static final long serialVersionUID = -2940949823473695962L;
 
     @ApiModelProperty(value = "字典名称", example = "性别")
     String dictName;

app/src/main/java/com/yiring/app/param/location/LocationTagAddParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.location;
+
+import com.yiring.app.domain.location.LocationTag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 定位标签新增入参
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@ApiModel("LocationTagAddParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LocationTagAddParam implements Serializable {
+
+    private static final long serialVersionUID = -2942040230386389302L;
+
+    @ApiModelProperty(value = "编号", example = "BTT88888888", required = true)
+    String code;
+
+    @ApiModelProperty(value = "标签类型", example = "蓝牙人员定位卡", required = true)
+    LocationTag.Type type;
+
+    @ApiModelProperty(value = "imei 设备编码标识", example = "88888888")
+    String imei;
+
+    public LocationTag transform() {
+        return LocationTag.builder().code(this.code).type(this.type).imei(this.imei).build();
+    }
+}

app/src/main/java/com/yiring/app/param/location/LocationTagDeleteParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.location;
+
+import com.yiring.auth.domain.user.User;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import javax.validation.constraints.NotNull;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 定位标签销毁入参
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@ApiModel("LocationTagDeleteParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LocationTagDeleteParam implements Serializable {
+
+    private static final long serialVersionUID = 2404060244461070885L;
+
+    @ApiModelProperty(value = "id", example = "145235231", required = true)
+    @NotNull(message = "id 不能为空")
+    Long id;
+
+    @ApiModelProperty(value = "人员", example = "1")
+    User user;
+}

app/src/main/java/com/yiring/app/param/location/LocationTagFindParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.location;
+
+import com.yiring.app.domain.location.LocationTag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 定位标签分页入参
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@ApiModel("LocationTagFindParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LocationTagFindParam implements Serializable {
+
+    private static final long serialVersionUID = -5134311481372693111L;
+
+    @ApiModelProperty(value = "编号", example = "BTT88888888")
+    String code;
+
+    @ApiModelProperty(value = "标签类型", example = "蓝牙人员定位卡")
+    LocationTag.Type type;
+
+    @ApiModelProperty(value = "状态", example = "true")
+    Boolean silent;
+
+    @ApiModelProperty(value = "每页记录数", example = "10")
+    Integer pageSize;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    Integer pageNo;
+}

app/src/main/java/com/yiring/app/param/location/LocationTagModifyParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.location;
+
+import com.yiring.app.domain.location.LocationTag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 定位标签修改入参
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@ApiModel("LocationTagModifyParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LocationTagModifyParam implements Serializable {
+
+    private static final long serialVersionUID = 7711908393372149723L;
+
+    @ApiModelProperty(value = "编号", example = "BTT88888888", required = true)
+    String code;
+
+    @ApiModelProperty(value = "标签类型", example = "蓝牙人员定位卡", required = true)
+    LocationTag.Type type;
+
+    @ApiModelProperty(value = "imei 设备编码标识", example = "88888888")
+    String imei;
+
+    public LocationTag transform() {
+        return LocationTag.builder().code(this.code).type(this.type).imei(this.imei).build();
+    }
+}

app/src/main/java/com/yiring/app/param/location/zy/ZyLocationTagAddParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.location.zy;
+
+import cn.hutool.core.util.StrUtil;
+import com.yiring.app.domain.location.LocationTag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * zy定位标签新增入参
+ * @author LJ-2204
+ * @date 2022/4/15
+ */
+
+@ApiModel("ZyLocationTagAddParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class ZyLocationTagAddParam implements Serializable {
+
+    private static final long serialVersionUID = -8828137320896062620L;
+
+    @ApiModelProperty(value = "工厂", example = "100")
+    String orgId;
+
+    @ApiModelProperty(value = "标签类型", example = "蓝牙人员定位卡", required = true)
+    LocationTag.Type types;
+
+    @ApiModelProperty(value = "编号", example = "BTT88888888", required = true)
+    String tagId;
+
+    @ApiModelProperty(value = "实体类型", example = "car", required = true)
+    String entityType;
+
+    public static ZyLocationTagAddParam transform(LocationTag locationTag) {
+        String entityType = StrUtil.equals(locationTag.getType().name(), "BTT02") ? "car" : "staff";
+        return ZyLocationTagAddParam
+            .builder()
+            .orgId("100")
+            .tagId(locationTag.getCode())
+            .types(locationTag.getType())
+            .entityType(entityType)
+            .build();
+    }
+}

app/src/main/java/com/yiring/app/param/video/VideoParam.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -23,11 +24,13 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class VideoParam implements Serializable {
 
+    private static final long serialVersionUID = 6031274771790265507L;
+
     @ApiModelProperty(value = "编号", example = "88888888", required = true)
     @NotEmpty(message = "标识不能为空")
     String uuid;
 
-    @ApiModelProperty(value = "m3u8 媒体地址", example = "", required = true)
+    @ApiModelProperty(value = "m3u8 媒体地址", example = "m3u8 媒体地址", required = true)
     @NotEmpty(message = "m3u8 媒体地址不能为空")
     String m3u8;
 
@@ -35,12 +38,12 @@ public class VideoParam implements Serializable {
     @NotEmpty(message = "摄像头名称不能为空")
     String videoName;
 
-    @ApiModelProperty(value = "经度", example = "1", required = true)
-    @NotEmpty(message = "经度")
+    @ApiModelProperty(value = "经度", example = "1.00", required = true)
+    @NotNull(message = "经度")
     double lon;
 
-    @ApiModelProperty(value = "纬度", example = "1", required = true)
-    @NotEmpty(message = "纬度")
+    @ApiModelProperty(value = "纬度", example = "1.00", required = true)
+    @NotNull(message = "纬度")
     double lat;
 
     @ApiModelProperty(value = "备注", example = "厂区摄像头")

app/src/main/java/com/yiring/app/param/video/VideoQueryParam.java

@@ -21,6 +21,8 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class VideoQueryParam implements Serializable {
 
+    private static final long serialVersionUID = -330684070308585411L;
+
     @ApiModelProperty(value = "编号", example = "88888888")
     String uuid;
 
@@ -29,6 +31,12 @@ public class VideoQueryParam implements Serializable {
 
     @ApiModelProperty(value = "状态", example = "1")
     String status;
+
+    @ApiModelProperty(value = "分页条数", example = "10")
+    Integer pageSize;
+
+    @ApiModelProperty(value = "当前页数", example = "1")
+    Integer pageNo;
     //    @ApiModelProperty(value = "m3u8 地址", example = "")
     //    @NotEmpty(message = "m3u8 地址不能为空")
     //    String m3u8;

app/src/main/java/com/yiring/app/param/visitor/VisitorQueryParam.java

@@ -19,4 +19,6 @@ import lombok.experimental.FieldDefaults;
 public class VisitorQueryParam implements Serializable {
 
     private static final long serialVersionUID = -4314254785949101573L;
+
+    String id;
 }

app/src/main/java/com/yiring/app/rabbitmq/RabbitConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.rabbitmq;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * rabbitmq配置
+ *
+ * @author ifzm
+ * 2019/8/21 15:44
+ */
+@Configuration
+public class RabbitConfig {}

app/src/main/java/com/yiring/app/rabbitmq/RabbitReceiver.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.rabbitmq;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * rabbitmq配置
+ *
+ * @author ifzm
+ * 2019/8/21 16:07
+ */
+
+@SuppressWarnings({ "unused" })
+@Slf4j
+@Component
+@Transactional(rollbackFor = Exception.class)
+public class RabbitReceiver {}

app/src/main/java/com/yiring/app/rabbitmq/zy/GbRabbitmqReceiver.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.rabbitmq.zy;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.rabbitmq.client.Channel;
+import com.yiring.app.config.zy.ZyRabbitConfig;
+import com.yiring.app.push.domain.PushMessage;
+import com.yiring.app.push.service.PushService;
+import java.io.IOException;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 国标 RabbitMQ 消息监听（消息消费者）
+ *
+ * @author tzl
+ * @version 0.1
+ * 2022/4/13 17:13
+ */
+
+@Slf4j
+@Component
+@Configuration
+@ConditionalOnProperty(prefix = "zy-config.rabbitmq", value = "enabled", havingValue = "true")
+public class GbRabbitmqReceiver {
+
+    // TODO
+    // 1. 新增消息订阅定时任务，检查是否正常订阅了真源定位系统的消息
+    // 2. 如果没有所需的订阅记录，则发起消息订阅（见接口文档: 6.2）
+    // 3. 订阅 position（定位数据）、lowPower（低电量报警）、deviceStatus（设备状态）、keyWarning（按键报警）
+
+    @Resource
+    PushService pushService;
+
+    /**
+     * 订阅真源定位系统 RabbitMQ 推送过来的消息（主动订阅的一些消息类别）
+     * 参见: 定位平台接口规范V3.0.1 - 通用版.pdf #6
+     * @param msg 消息内容
+     * @param channel 消息通道
+     * @param message 消息主体
+     * @throws IOException 消息确认异常
+     */
+    @RabbitHandler
+    @RabbitListener(
+        queues = ZyRabbitConfig.MESSAGE_QUEUES_NAME,
+        containerFactory = ZyRabbitConfig.LISTENER_FACTORY_NAME
+    )
+    public void listen(String msg, Channel channel, Message message) throws IOException {
+        // 手动确认消息已收到
+        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+
+        try {
+            // 将消息转换成 JSON 格式
+            JSONObject info = JSON.parseObject(msg);
+            log.info("Receiver Message: {}", info);
+
+            // 解构消息内容
+            JSONObject data = info.getJSONObject("params");
+            String method = info.getString("method");
+            switch (method) {
+                // 实时定位
+                case "position" -> processPositionMessage(data);
+                // 设备低电量
+                case "lowPower" -> processLowPowerMessage(data);
+                // 设备状态变更
+                case "deviceStatus" -> processDeviceStatusMessage(data);
+                // 按键报警
+                case "keyWarning" -> processKeyWarningMessage(data);
+                default -> log.warn("Unknown Message Type: {}", info);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 处理定位消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processPositionMessage(JSONObject data) {
+        // TODO
+        log.info("Position Message: {}", data);
+
+        // 包装消息
+        // TODO
+        // 1. 解析消息内容，进行围栏、出入标识判断等处理，将定位记录录入数据库
+        // 2. 创建一条需要进行消息推送的记录
+        // 3. 将记录推送的消息推送模块
+
+        // WebSocket 消息推送
+        pushService.push(PushMessage.Type.WS, data);
+    }
+
+    /**
+     * 处理低电量报警消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processLowPowerMessage(JSONObject data) {
+        // TODO
+        log.info("LowPower Message: {}", data);
+    }
+
+    /**
+     * 处理设备状态更新消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processDeviceStatusMessage(JSONObject data) {
+        // TODO
+        log.info("DeviceStatus Message: {}", data);
+    }
+
+    /**
+     * 处理按键报警消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processKeyWarningMessage(JSONObject data) {
+        // TODO
+        log.info("KeyWarning Message: {}", data);
+    }
+}

app/src/main/java/com/yiring/app/rabbitmq/zy/ZyRabbitmqReceiver.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.rabbitmq.zy;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.rabbitmq.client.Channel;
+import com.yiring.app.config.zy.ZyRabbitConfig;
+import com.yiring.app.push.domain.PushMessage;
+import com.yiring.app.push.service.PushService;
+import java.io.IOException;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 真源 RabbitMQ 消息监听（消息消费者）
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/13 17:13
+ */
+
+@Slf4j
+@Component
+@Configuration
+@ConditionalOnProperty(prefix = "zy-config.rabbitmq", value = "enabled", havingValue = "true")
+public class ZyRabbitmqReceiver {
+
+    // TODO
+    // 1. 新增消息订阅定时任务，检查是否正常订阅了真源定位系统的消息
+    // 2. 如果没有所需的订阅记录，则发起消息订阅（见接口文档: 6.2）
+    // 3. 订阅 position（定位数据）、lowPower（低电量报警）、deviceStatus（设备状态）、keyWarning（按键报警）
+
+    @Resource
+    PushService pushService;
+
+    /**
+     * 订阅真源定位系统 RabbitMQ 推送过来的消息（主动订阅的一些消息类别）
+     * 参见: 定位平台接口规范V3.0.1 - 通用版.pdf #6
+     * @param msg 消息内容
+     * @param channel 消息通道
+     * @param message 消息主体
+     * @throws IOException 消息确认异常
+     */
+    @RabbitHandler
+    @RabbitListener(
+        queues = ZyRabbitConfig.MESSAGE_QUEUES_NAME,
+        containerFactory = ZyRabbitConfig.LISTENER_FACTORY_NAME
+    )
+    public void listen(String msg, Channel channel, Message message) throws IOException {
+        // 手动确认消息已收到
+        channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
+
+        try {
+            // 将消息转换成 JSON 格式
+            JSONObject info = JSON.parseObject(msg);
+            log.info("Receiver Message: {}", info);
+
+            // 解构消息内容
+            JSONObject data = info.getJSONObject("params");
+            String method = info.getString("method");
+            switch (method) {
+                // 实时定位
+                case "position" -> processPositionMessage(data);
+                // 设备低电量
+                case "lowPower" -> processLowPowerMessage(data);
+                // 设备状态变更
+                case "deviceStatus" -> processDeviceStatusMessage(data);
+                // 按键报警
+                case "keyWarning" -> processKeyWarningMessage(data);
+                default -> log.warn("Unknown Message Type: {}", info);
+            }
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+        }
+    }
+
+    /**
+     * 处理定位消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processPositionMessage(JSONObject data) {
+        // TODO
+        log.info("Position Message: {}", data);
+
+        // 包装消息
+        // TODO
+        // 1. 解析消息内容，进行围栏、出入标识判断等处理，将定位记录录入数据库
+        // 2. 创建一条需要进行消息推送的记录
+        // 3. 将记录推送的消息推送模块
+
+        // WebSocket 消息推送
+        pushService.push(PushMessage.Type.WS, data);
+    }
+
+    /**
+     * 处理低电量报警消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processLowPowerMessage(JSONObject data) {
+        // TODO
+        log.info("LowPower Message: {}", data);
+    }
+
+    /**
+     * 处理设备状态更新消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processDeviceStatusMessage(JSONObject data) {
+        // TODO
+        log.info("DeviceStatus Message: {}", data);
+    }
+
+    /**
+     * 处理按键报警消息
+     * @param data 消息内容
+     */
+    @Transactional(rollbackFor = Exception.class)
+    public void processKeyWarningMessage(JSONObject data) {
+        // TODO
+        log.info("KeyWarning Message: {}", data);
+    }
+}

app/src/main/java/com/yiring/app/service/car/CarService.java

@@ -8,7 +8,7 @@ import com.yiring.app.vo.car.CarVo;
 import com.yiring.common.core.Result;
 import com.yiring.common.param.IdParam;
 import com.yiring.common.vo.PageVo;
-import java.util.List;
+import javax.servlet.http.HttpServletResponse;
 import org.springframework.data.jpa.domain.Specification;
 
 /**
@@ -28,6 +28,7 @@ public interface CarService {
      * 修改车辆来访信息
      *
      * @param carParam CarParam
+     * @param idParam IdParam
      * @return 修改的车辆来访信息id
      */
     Result<Long> updateCarInfo(CarParam carParam, IdParam idParam);
@@ -44,6 +45,7 @@ public interface CarService {
      * 发卡
      *
      * @param idParam IdParam
+     * @param labelCard String
      * @return 发卡信息id
      */
     Result<Long> cardSend(IdParam idParam, String labelCard);
@@ -73,9 +75,11 @@ public interface CarService {
     Result<PageVo<CarVo>> pageCarInfo(CarQueryParam carParam);
 
     /**
-     * 导出excel
+     *  导出接口
+     * @param carParam CarQueryParam
+     * @param response HttpServletResponse
      */
-    List<Car> export(CarQueryParam carParam);
+    void export(CarQueryParam carParam, HttpServletResponse response);
 
     /**
      * 检查是否存在相同车牌号登记
@@ -94,6 +98,7 @@ public interface CarService {
     boolean hasCarInfoByMobile(String param);
 
     /**
+     * 筛选条件
      * @param carParam CarQueryParam
      * @return Specification
      */

app/src/main/java/com/yiring/app/service/car/impl/CarServiceImpl.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.service.car.impl;
 
+import cn.hutool.core.util.StrUtil;
+import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
 import com.yiring.app.domain.car.Car;
 import com.yiring.app.domain.car.CarRepository;
+import com.yiring.app.excel.car.CarExportExcel;
 import com.yiring.app.param.car.CarParam;
 import com.yiring.app.param.car.CarQueryParam;
 import com.yiring.app.service.car.CarService;
@@ -11,24 +14,34 @@ import com.yiring.auth.domain.role.Role;
 import com.yiring.common.core.Result;
 import com.yiring.common.core.Status;
 import com.yiring.common.param.IdParam;
-import com.yiring.common.util.StrUtils;
-import com.yiring.common.util.date.DateUtils;
 import com.yiring.common.vo.PageVo;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.Executors;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.persistence.criteria.Predicate;
-import org.apache.commons.lang3.StringUtils;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * @author tzl
  * 2022/4/11 13:58
  */
+@Slf4j
+@Transactional(rollbackFor = RuntimeException.class)
 @Service
 public class CarServiceImpl implements CarService {
 
@@ -69,7 +82,7 @@ public class CarServiceImpl implements CarService {
         }
         Car car = optional.get();
         //如果标签卡在使用中无法修改
-        if (StringUtils.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
+        if (StrUtil.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
             return Result.no(Status.BAD_REQUEST, "标签卡使用中,信息无法修改");
         }
         if (!car.getCarNum().equals(carParam.getCarNum())) {
@@ -147,7 +160,7 @@ public class CarServiceImpl implements CarService {
 
     @Override
     public Result<PageVo<CarVo>> pageCarInfo(CarQueryParam carParam) {
-        PageVo<CarVo> resultVo = null;
+        PageVo<CarVo> resultVo;
         //排序
         Sort sort = Sort.by(Sort.Order.desc(Car.Fields.createTime));
         //如果传分页参数则分页,否查全部数据
@@ -180,8 +193,45 @@ public class CarServiceImpl implements CarService {
     }
 
     @Override
-    public List<Car> export(CarQueryParam carParam) {
-        return carRepository.findAll(condition(carParam));
+    public void export(CarQueryParam carParam, HttpServletResponse response) {
+        Specification<Car> specification = condition(carParam);
+        List<Car> all = carRepository.findAll(specification);
+        List<CarExportExcel> data = all
+            .stream()
+            .map(car -> {
+                CarExportExcel carExportExcel = new CarExportExcel();
+                BeanUtils.copyProperties(car, carExportExcel);
+                return carExportExcel;
+            })
+            .collect(Collectors.toList());
+        try (
+            DefaultStreamExcelBuilder<CarExportExcel> streamExcelBuilder = DefaultStreamExcelBuilder
+                .of(CarExportExcel.class)
+                .threadPool(Executors.newFixedThreadPool(2))
+                .rowHeight(14)
+                .titleRowHeight(14)
+                .style(
+                    "cell->vertical-align:center;text-align:center",
+                    "title->vertical-align:center;text-align:center;font-weight:bold;font-family:等线"
+                )
+                .start()
+        ) {
+            streamExcelBuilder.append(data);
+
+            String fileName = URLEncoder.encode("车辆来访信息.xlsx", StandardCharsets.UTF_8);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            OutputStream out = response.getOutputStream();
+
+            Workbook workbook = streamExcelBuilder.fixedTitles().build();
+            workbook.write(out);
+            workbook.close();
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("导出车辆来访信息失败: " + e.getMessage());
+        }
     }
 
     @Override
@@ -207,24 +257,24 @@ public class CarServiceImpl implements CarService {
         return (root, query, criteriaBuilder) -> {
             List<Predicate> list = new ArrayList<>();
             //查询条件
-            if (StrUtils.isNotBlank(carParam.getCarNum())) {
+            if (StrUtil.isNotBlank(carParam.getCarNum())) {
                 //车牌号码查询
-                list.add(criteriaBuilder.like(root.get("carNum").as(String.class), "%" + carParam.getCarNum() + "%"));
+                list.add(criteriaBuilder.like(root.get(Car.Fields.carNum), "%" + carParam.getCarNum() + "%"));
             }
 
-            if (StrUtils.isNotBlank(carParam.getCarType())) {
+            if (StrUtil.isNotBlank(carParam.getCarType())) {
                 //车辆类型查询
                 list.add(criteriaBuilder.like(root.get("carType").as(String.class), "%" + carParam.getCarType() + "%"));
             }
 
-            if (StrUtils.isNotBlank(carParam.getDriverName())) {
+            if (StrUtil.isNotBlank(carParam.getDriverName())) {
                 //司机名称查询
                 list.add(
                     criteriaBuilder.like(root.get("driverName").as(String.class), "%" + carParam.getDriverName() + "%")
                 );
             }
 
-            if (StrUtils.isNotBlank(carParam.getDriverMobile())) {
+            if (StrUtil.isNotBlank(carParam.getDriverMobile())) {
                 //司机电话号码查询
                 list.add(
                     criteriaBuilder.like(
@@ -234,50 +284,48 @@ public class CarServiceImpl implements CarService {
                 );
             }
 
-            if (StrUtils.isNotBlank(carParam.getOrgId())) {
+            if (StrUtil.isNotBlank(carParam.getOrgId())) {
                 //所属单位查询
                 list.add(criteriaBuilder.like(root.get("orgId").as(String.class), "%" + carParam.getOrgId() + "%"));
             }
 
-            if (StrUtils.isNotBlank(carParam.getReason())) {
+            if (StrUtil.isNotBlank(carParam.getReason())) {
                 //来访原因查询
                 list.add(criteriaBuilder.like(root.get("reason").as(String.class), "%" + carParam.getReason() + "%"));
             }
 
-            if (StrUtils.isNotNull(carParam.getCreateTimeStart()) && StrUtils.isNotNull(carParam.getCreateTimeEnd())) {
+            if (Objects.nonNull(carParam.getCreateTimeStart()) && Objects.nonNull(carParam.getCreateTimeEnd())) {
                 //来访时间区间段查询
                 list.add(
                     criteriaBuilder.between(
-                        root.get("createTime").as(Date.class),
-                        DateUtils.toDate(carParam.getCreateTimeStart()),
-                        DateUtils.toDate(carParam.getCreateTimeEnd())
+                        root.get(Car.Fields.createTime),
+                        carParam.getCreateTimeStart(),
+                        carParam.getCreateTimeEnd()
                     )
                 );
             }
 
-            if (StrUtils.isNotBlank(carParam.getLabelCard())) {
+            if (StrUtil.isNotBlank(carParam.getLabelCard())) {
                 //标签卡号查询
                 list.add(
                     criteriaBuilder.like(root.get("labelCard").as(String.class), "%" + carParam.getLabelCard() + "%")
                 );
             }
 
-            if (StrUtils.isNotBlank(carParam.getLabelCardStatus())) {
+            if (StrUtil.isNotBlank(carParam.getLabelCardStatus())) {
                 //标签卡状态查询
                 list.add(
                     criteriaBuilder.equal(root.get("labelCardStatus").as(String.class), carParam.getLabelCardStatus())
                 );
             }
 
-            if (
-                StrUtils.isNotNull(carParam.getCardRecTimeStart()) && StrUtils.isNotNull(carParam.getCardRecTimeEnd())
-            ) {
+            if (Objects.nonNull(carParam.getCardRecTimeStart()) && Objects.nonNull(carParam.getCardRecTimeEnd())) {
                 //来访时间区间段查询
                 list.add(
                     criteriaBuilder.between(
-                        root.get("cardRecTime").as(Date.class),
-                        DateUtils.toDate(carParam.getCardRecTimeStart()),
-                        DateUtils.toDate(carParam.getCardRecTimeEnd())
+                        root.get(Car.Fields.cardRecTime),
+                        carParam.getCardRecTimeStart(),
+                        carParam.getCardRecTimeEnd()
                     )
                 );
             }

app/src/main/java/com/yiring/app/service/dict/impl/DictServiceImpl.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.service.dict.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.yiring.app.param.dict.DictParam;
 import com.yiring.app.param.dict.DictQueryParam;
 import com.yiring.app.service.dict.DictService;
@@ -11,7 +12,6 @@ import com.yiring.common.dict.DictRepository;
 import com.yiring.common.param.IdParam;
 import com.yiring.common.param.PageParam;
 import com.yiring.common.util.DictUtils;
-import com.yiring.common.util.StrUtils;
 import com.yiring.common.vo.PageVo;
 import java.time.LocalDateTime;
 import java.util.*;
@@ -31,6 +31,7 @@ import org.springframework.stereotype.Service;
  * @author tzl
  * 2022/4/13 15:37
  */
+
 @Service
 public class DictServiceImpl implements DictService {
 
@@ -162,7 +163,7 @@ public class DictServiceImpl implements DictService {
     public Specification<Dict> condition(DictQueryParam dictQueryParam) {
         return (root, query, criteriaBuilder) -> {
             List<Predicate> list = new ArrayList<>();
-            if (StrUtils.isNotBlank(dictQueryParam.getDictType())) {
+            if (StrUtil.isNotBlank(dictQueryParam.getDictType())) {
                 list.add(
                     criteriaBuilder.like(
                         root.get("dictType").as(String.class),
@@ -171,7 +172,7 @@ public class DictServiceImpl implements DictService {
                 );
             }
 
-            if (StrUtils.isNotBlank(dictQueryParam.getDictLabel())) {
+            if (StrUtil.isNotBlank(dictQueryParam.getDictLabel())) {
                 list.add(
                     criteriaBuilder.like(
                         root.get("dictLabel").as(String.class),

app/src/main/java/com/yiring/app/service/location/LocationTagService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.location;
+
+import com.yiring.app.param.location.LocationTagAddParam;
+import com.yiring.app.param.location.LocationTagDeleteParam;
+import com.yiring.app.param.location.LocationTagFindParam;
+import com.yiring.app.param.location.LocationTagModifyParam;
+import com.yiring.app.vo.location.LocationTagVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.vo.PageVo;
+import javax.servlet.http.HttpServletResponse;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 定位标签
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+public interface LocationTagService {
+    /**
+     * 新增定位标签
+     * @param param 入参
+     * @return Result<String>
+     */
+    Result<String> addLocationTag(LocationTagAddParam param);
+
+    /**
+     * 分页查询
+     * @param param 入参
+     * @return Result<PageVo<LocationTagVo>>
+     */
+    Result<PageVo<LocationTagVo>> findLocationTagPage(LocationTagFindParam param);
+
+    /**
+     * 销毁定位标签
+     * @param param 入参
+     * @return Result<String>
+     */
+    Result<String> deleteLocationTag(LocationTagDeleteParam param);
+
+    /**
+     * 导出定位标签
+     * @param param 入参
+     * @param response 响应信息
+     */
+    void exportLocationTagInfo(LocationTagFindParam param, HttpServletResponse response);
+
+    /**
+     * 导入定位标签
+     * @param file 文件
+     * @return Result<String>
+     */
+    Result<String> importLocationTagInfo(MultipartFile file);
+
+    /**
+     * 修改定位标签
+     * @param param 入参
+     * @return Result<String>
+     */
+    Result<String> modifyLocationTag(LocationTagModifyParam param, IdParam idParam);
+}

app/src/main/java/com/yiring/app/service/location/impl/LocationTagServiceImpl.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.location.impl;
+
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
+import com.github.liaochong.myexcel.core.SaxExcelReader;
+import com.yiring.app.domain.location.LocationTag;
+import com.yiring.app.domain.location.LocationTagRepository;
+import com.yiring.app.excel.location.LocationTagExportExcel;
+import com.yiring.app.excel.location.LocationTagImportExcel;
+import com.yiring.app.param.location.LocationTagAddParam;
+import com.yiring.app.param.location.LocationTagDeleteParam;
+import com.yiring.app.param.location.LocationTagFindParam;
+import com.yiring.app.param.location.LocationTagModifyParam;
+import com.yiring.app.param.location.zy.ZyLocationTagAddParam;
+import com.yiring.app.service.location.LocationTagService;
+import com.yiring.app.vo.location.LocationTagVo;
+import com.yiring.auth.util.ZyUtil;
+import com.yiring.common.core.Result;
+import com.yiring.common.core.Status;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.vo.PageVo;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.Serializable;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.persistence.criteria.Order;
+import javax.persistence.criteria.Predicate;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.jetbrains.annotations.NotNull;
+import org.springframework.data.domain.*;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 定位标签
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@Transactional(rollbackFor = RuntimeException.class)
+@Service
+@Slf4j
+public class LocationTagServiceImpl implements LocationTagService {
+
+    final Integer FACTORY_ID = 100;
+
+    @Resource
+    LocationTagRepository locationTagRepository;
+
+    @Override
+    public Result<String> addLocationTag(LocationTagAddParam param) {
+        if (hasLocationTagInfoByCode(param.getCode())) return Result.no(Status.BAD_REQUEST, "编号已存在");
+        LocationTag locationTag = param.transform();
+        locationTagRepository.save(locationTag);
+        ZyLocationTagAddParam zyLocationTagAddParam = ZyLocationTagAddParam.transform(locationTag);
+        List<ZyLocationTagAddParam> of = ListUtil.of(zyLocationTagAddParam);
+        new Thread(() -> {
+            Result<Serializable> result = ZyUtil.post("/positionApi/api/tag/saveTag", of, 3000);
+            if (result.getCode() != 200) throw new RuntimeException(result.getMessage());
+        })
+            .start();
+
+        return Result.ok();
+    }
+
+    @Override
+    public Result<PageVo<LocationTagVo>> findLocationTagPage(LocationTagFindParam param) {
+        Specification<LocationTag> specification = getLocationTagPageSpecification(param);
+
+        Sort sort = Sort.by(Sort.Order.desc(LocationTag.Fields.createTime));
+
+        if (Objects.nonNull(param.getPageNo()) && Objects.nonNull(param.getPageSize())) {
+            //分页
+            Pageable pageable = PageRequest.of(param.getPageNo() - 1, param.getPageSize());
+            Page<LocationTag> locationTags = locationTagRepository.findAll(specification, pageable);
+            List<LocationTagVo> locationTagVos = LocationTagVo.transforms(locationTags.getContent());
+            PageVo<LocationTagVo> page = PageVo.build(locationTagVos, locationTagVos.size());
+            return Result.ok(page);
+        } else {
+            List<LocationTag> locationTags = locationTagRepository.findAll(specification, sort);
+            List<LocationTagVo> locationTagVos = LocationTagVo.transforms(locationTags);
+            PageVo<LocationTagVo> page = PageVo.build(locationTagVos, locationTagVos.size());
+            return Result.ok(page);
+        }
+    }
+
+    @Override
+    public Result<String> deleteLocationTag(LocationTagDeleteParam param) {
+        if (ObjectUtil.isNotEmpty(param.getUser())) return Result.no(Status.BAD_REQUEST, "请先解绑人员");
+        locationTagRepository.deleteById(param.getId());
+        return Result.ok();
+    }
+
+    @Override
+    public void exportLocationTagInfo(LocationTagFindParam param, HttpServletResponse response) {
+        Specification<LocationTag> specification = getLocationTagPageSpecification(param);
+        List<LocationTag> locationTags = locationTagRepository.findAll(specification);
+        List<LocationTagExportExcel> locationTagExportExcels = LocationTagExportExcel.transforms(locationTags);
+        try (
+            DefaultStreamExcelBuilder<LocationTagExportExcel> streamExcelBuilder = DefaultStreamExcelBuilder
+                .of(LocationTagExportExcel.class)
+                .threadPool(Executors.newFixedThreadPool(2))
+                .rowHeight(14)
+                .titleRowHeight(14)
+                .style(
+                    "cell->vertical-align:center;text-align:center",
+                    "title->vertical-align:center;text-align:center;font-weight:bold;font-family:等线"
+                )
+                .start()
+        ) {
+            streamExcelBuilder.append(locationTagExportExcels);
+
+            String fileName = URLEncoder.encode("定位标签信息.xlsx", StandardCharsets.UTF_8);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            OutputStream out = response.getOutputStream();
+
+            Workbook workbook = streamExcelBuilder.fixedTitles().build();
+            workbook.write(out);
+            workbook.close();
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("导出岗位信息失败: " + e.getMessage());
+        }
+    }
+
+    @Override
+    public Result<String> importLocationTagInfo(MultipartFile file) {
+        if (file.isEmpty()) throw new RuntimeException("请选择文件");
+        List<LocationTagImportExcel> locationTagImportExcels;
+        try (InputStream inputStream = file.getInputStream()) {
+            locationTagImportExcels =
+                SaxExcelReader
+                    .of(LocationTagImportExcel.class)
+                    .rowFilter(row -> row.getRowNum() > 0)
+                    .ignoreBlankRow()
+                    .read(inputStream);
+        } catch (IOException e) {
+            log.info(e.getMessage());
+            throw new RuntimeException("文件导入异常");
+        }
+
+        List<LocationTag> locationTags = locationTagImportExcels
+            .stream()
+            .map(LocationTagImportExcel::transform)
+            .collect(Collectors.toList());
+
+        locationTags.forEach(locationTag -> {
+            locationTagRepository
+                .findOne((root, cq, cb) -> {
+                    List<Predicate> predicates = new ArrayList<>();
+
+                    if (StrUtil.isNotEmpty(locationTag.getCode())) {
+                        predicates.add(cb.equal(root.get(LocationTag.Fields.code), locationTag.getCode()));
+                    }
+
+                    return cq.where(predicates.toArray(new Predicate[0])).getRestriction();
+                })
+                .ifPresent(temp -> locationTag.setId(temp.getId()));
+            locationTagRepository.save(locationTag);
+        });
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> modifyLocationTag(LocationTagModifyParam param, IdParam idParam) {
+        Optional<LocationTag> locationTagOptional = locationTagRepository.findById(idParam.getId());
+        if (locationTagOptional.isEmpty()) return Result.no(Status.BAD_REQUEST, "被修改的数据不存在");
+
+        LocationTag locationTag = locationTagOptional.get();
+
+        if (!StrUtil.equals(locationTag.getCode(), param.getCode())) {
+            if (hasLocationTagInfoByCode(param.getCode())) return Result.no(Status.BAD_REQUEST, "编号已存在");
+        }
+
+        locationTag = param.transform();
+        locationTag.setId(idParam.getId());
+        locationTagRepository.save(locationTag);
+
+        return Result.ok();
+    }
+
+    private boolean hasLocationTagInfoByCode(String code) {
+        LocationTag locationTag = LocationTag.builder().code(code).build();
+        return locationTagRepository.count(Example.of(locationTag)) > 0;
+    }
+
+    @NotNull
+    private Specification<LocationTag> getLocationTagPageSpecification(LocationTagFindParam param) {
+        return (root, cq, cb) -> {
+            List<Predicate> predicates = ListUtil.toList();
+
+            if (StrUtil.isNotEmpty(param.getCode())) {
+                cb.equal(root.get(LocationTag.Fields.code), param.getCode());
+            }
+
+            if (ObjectUtil.isNotEmpty(param.getType())) {
+                cb.equal(root.get(LocationTag.Fields.type), param.getType());
+            }
+
+            if (ObjectUtil.isNotEmpty(param.getSilent())) {
+                cb.equal(root.get(LocationTag.Fields.silent), param.getSilent());
+            }
+
+            Order order = cb.desc(root.get(LocationTag.Fields.createTime));
+
+            return cq.orderBy(order).where(predicates.toArray(new Predicate[0])).getRestriction();
+        };
+    }
+}

app/src/main/java/com/yiring/app/service/video/VideoService.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.service.video;
 
+import com.yiring.app.domain.video.Video;
 import com.yiring.app.param.video.VideoParam;
 import com.yiring.app.param.video.VideoQueryParam;
 import com.yiring.app.vo.video.VideoVo;
 import com.yiring.common.core.Result;
 import com.yiring.common.param.IdParam;
-import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import java.awt.*;
+import javax.servlet.http.HttpServletResponse;
 import org.locationtech.jts.geom.Point;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @author tzl
@@ -57,10 +60,32 @@ public interface VideoService {
     /**
      * 分页查询
      * @param videoQueryParam 筛选条件
-     * @param param  分页参数
      * @return Result<PageVo<VideoVo>> 分页结果集
      * @author tzl
      * @date 2022/4/15 14:35
      */
-    Result<PageVo<VideoVo>> pageVideo(VideoQueryParam videoQueryParam, PageParam param);
+    Result<PageVo<VideoVo>> pageVideo(VideoQueryParam videoQueryParam);
+
+    /**
+     * 查询条件
+     * @param videoQueryParam 查询条件
+     * @return Specification<Video>
+     * @author tzl
+     * @date 2022/4/15 14:57
+     */
+    Specification<Video> condition(VideoQueryParam videoQueryParam);
+
+    /**
+     *  条件查询数据导出
+     * @param videoQueryParam 查询条件
+     * @param response HttpServletResponse
+     */
+    void exportVideo(VideoQueryParam videoQueryParam, HttpServletResponse response);
+
+    /**
+     * 导入视频监控点位信息
+     * @param file  上传的excel文件
+     * @return 是否成功
+     */
+    Result<String> importVideo(MultipartFile file);
 }

app/src/main/java/com/yiring/app/service/video/impl/VideoServiceImpl.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.service.video.impl;
 
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
+import com.github.liaochong.myexcel.core.SaxExcelReader;
 import com.yiring.app.domain.video.Video;
 import com.yiring.app.domain.video.VideoRepository;
+import com.yiring.app.excel.video.VideoExportExcel;
+import com.yiring.app.excel.video.VideoImportExcel;
+import com.yiring.app.feign.GbClient;
+import com.yiring.app.param.video.StreamProxyItem;
 import com.yiring.app.param.video.VideoParam;
 import com.yiring.app.param.video.VideoQueryParam;
 import com.yiring.app.service.video.VideoService;
@@ -12,31 +21,49 @@ import com.yiring.common.core.Result;
 import com.yiring.common.core.Status;
 import com.yiring.common.param.IdParam;
 import com.yiring.common.vo.PageVo;
+import feign.Response;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import javax.persistence.criteria.Predicate;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
 import org.locationtech.jts.geom.Point;
 import org.springframework.beans.BeanUtils;
 import org.springframework.data.domain.*;
 import org.springframework.data.jpa.domain.Specification;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
 
 /**
  * @author tzl
  * 2022/4/8 15:28
  */
+@Slf4j
+@Transactional(rollbackFor = RuntimeException.class)
 @Service
 public class VideoServiceImpl implements VideoService {
 
     @Resource
     VideoRepository videoRepository;
 
+    @Resource
+    GbClient gbClient;
+
+    @Resource
+    RedisTemplate<String, Object> redisTemplate;
+
     @Override
     public Result<String> saveVideo(VideoParam videoParam) {
         if (has(videoParam.getUuid())) {
@@ -62,7 +89,25 @@ public class VideoServiceImpl implements VideoService {
         videoRepository.saveAndFlush(video);
         //还需要同步添加国标28181中对应的摄像头信息
         //标识uuid对应流id,m3u8对应拉流地址,如m3u8中有标注 则将类型切换为FFmpeg,摄像头名称videoName对应名称,流名称默认"stream",超时时间默认60
-
+        new Thread(() -> {
+            StreamProxyItem streamProxyItem = StreamProxyItem
+                .builder()
+                .name(video.getVideoName())
+                .app("stream")
+                .stream(video.getUuid())
+                .url(video.getM3u8())
+                .mediaServerId("ZbnQN5csqxrPix7a")
+                .enable(true)
+                .enable_hls(true)
+                .type(video.getM3u8().contains("sss") ? "ffmpeg" : "default")
+                .timeout_ms(video.getM3u8().contains("sss") ? 60 : null)
+                .build();
+            JSONObject jsonObject = gbClient.proxySave(streamProxyItem, gbCookie());
+            if (!jsonObject.get("code").equals(0)) {
+                throw new RuntimeException(jsonObject.get("msg").toString());
+            }
+        })
+            .start();
         return Result.ok();
     }
 
@@ -73,8 +118,15 @@ public class VideoServiceImpl implements VideoService {
             return Result.no(Status.NOT_FOUND);
         }
         Video video = optional.get();
-        videoRepository.delete(video);
         //还需要同步删除国标28181中对应的摄像头信息
+        new Thread(() -> {
+            JSONObject jsonObject = gbClient.proxyDel("stream", video.getUuid(), gbCookie());
+            if (!jsonObject.get("code").equals(0)) {
+                throw new RuntimeException(jsonObject.get("msg").toString());
+            }
+        })
+            .start();
+        videoRepository.delete(video);
 
         return Result.ok();
     }
@@ -92,29 +144,40 @@ public class VideoServiceImpl implements VideoService {
                 return Result.no(Status.BAD_REQUEST, "您输入的编号已存在");
             }
             //当修改跟国标相关联的信息时同步更新国标数据
-            //            if (
-            //                !video.getVideoName().equals(videoParam.getVideoName()) && !video.getM3u8().equals(videoParam.getM3u8())
-            //            ) {
-            //                gbClient.proxyDel("stream", video.getUuid(), gbCookie());
-            //            }
+            if (
+                !video.getVideoName().equals(videoParam.getVideoName()) && !video.getM3u8().equals(videoParam.getM3u8())
+            ) {
+                new Thread(() -> {
+                    JSONObject jsonObject = gbClient.proxyDel("stream", video.getUuid(), gbCookie());
+                    if (!jsonObject.get("code").equals(0)) {
+                        throw new RuntimeException(jsonObject.get("msg").toString());
+                    }
+                })
+                    .start();
+            }
         }
         BeanUtils.copyProperties(videoParam, video);
         videoRepository.saveAndFlush(video);
         //将信息发送到队列,等待同步至国标
-        //        StreamProxyItem streamProxyItem = StreamProxyItem
-        //            .builder()
-        //            .name(video.getVideoName())
-        //            .app("stream")
-        //            .stream(video.getUuid())
-        //            .url(video.getM3u8())
-        //            .mediaServerId("ZbnQN5csqxrPix7a")
-        //            .enable(true)
-        //            .enable_hls(true)
-        //            .type(video.getM3u8().contains("sss") ? "ffmpeg" : "default")
-        //            .timeout_ms(video.getM3u8().contains("sss") ? 60 : null)
-        //            .build();
-        //        JSONObject jsonObject = gbClient.proxySave(streamProxyItem, gbCookie());
-        //        System.out.println(jsonObject);
+        new Thread(() -> {
+            StreamProxyItem streamProxyItem = StreamProxyItem
+                .builder()
+                .name(video.getVideoName())
+                .app("stream")
+                .stream(video.getUuid())
+                .url(video.getM3u8())
+                .mediaServerId("ZbnQN5csqxrPix7a")
+                .enable(true)
+                .enable_hls(true)
+                .type(video.getM3u8().contains("sss") ? "ffmpeg" : "default")
+                .timeout_ms(video.getM3u8().contains("sss") ? 60 : null)
+                .build();
+            JSONObject jsonObject = gbClient.proxySave(streamProxyItem, gbCookie());
+            if (!jsonObject.get("code").equals(0)) {
+                throw new RuntimeException(jsonObject.get("msg").toString());
+            }
+        })
+            .start();
         return Result.ok();
     }
 
@@ -130,7 +193,7 @@ public class VideoServiceImpl implements VideoService {
 
     @Override
     public Result<PageVo<VideoVo>> pageVideo(VideoQueryParam videoQueryParam) {
-        PageVo<VideoVo> resultVo = null;
+        PageVo<VideoVo> resultVo;
         //排序
         Sort sort = Sort.by(Sort.Order.desc(Video.Fields.createTime));
         //如果传分页参数则分页,否查全部数据
@@ -172,24 +235,24 @@ public class VideoServiceImpl implements VideoService {
     public Specification<Video> condition(VideoQueryParam videoQueryParam) {
         return (root, query, criteriaBuilder) -> {
             List<Predicate> list = new ArrayList<>();
-            //            if (StrUtils.isNotBlank(videoQueryParam.getVideoName())) {
-            //                list.add(
-            //                    criteriaBuilder.like(
-            //                        root.get("videoName").as(String.class),
-            //                        "%" + videoQueryParam.getVideoName() + "%"
-            //                    )
-            //                );
-            //            }
-            //
-            //            if (StrUtils.isNotBlank(videoQueryParam.getUuid())) {
-            //                list.add(
-            //                    criteriaBuilder.like(root.get("uuid").as(String.class), "%" + videoQueryParam.getUuid() + "%")
-            //                );
-            //            }
-            //
-            //            if (StrUtils.isNotBlank(videoQueryParam.getStatus())) {
-            //                list.add(criteriaBuilder.equal(root.get("status").as(String.class), videoQueryParam.getStatus()));
-            //            }
+            if (StrUtil.isNotBlank(videoQueryParam.getVideoName())) {
+                list.add(
+                    criteriaBuilder.like(
+                        root.get("videoName").as(String.class),
+                        "%" + videoQueryParam.getVideoName() + "%"
+                    )
+                );
+            }
+
+            if (StrUtil.isNotBlank(videoQueryParam.getUuid())) {
+                list.add(
+                    criteriaBuilder.like(root.get("uuid").as(String.class), "%" + videoQueryParam.getUuid() + "%")
+                );
+            }
+
+            if (StrUtil.isNotBlank(videoQueryParam.getStatus())) {
+                list.add(criteriaBuilder.equal(root.get("uuid").as(String.class), videoQueryParam.getStatus()));
+            }
             Predicate[] predicates = new Predicate[list.size()];
             query.where(list.toArray(predicates));
             return criteriaBuilder.and(list.toArray(predicates));
@@ -197,75 +260,130 @@ public class VideoServiceImpl implements VideoService {
     }
 
     @Override
-    public List<Video> exportVideo(VideoQueryParam videoQueryParam) {
-        return videoRepository.findAll(condition(videoQueryParam));
+    public void exportVideo(VideoQueryParam videoQueryParam, HttpServletResponse response) {
+        Specification<Video> specification = condition(videoQueryParam);
+        List<Video> all = videoRepository.findAll(specification);
+        List<VideoExportExcel> data = all
+            .stream()
+            .map(video -> {
+                VideoExportExcel videoExportExcel = new VideoExportExcel();
+                BeanUtils.copyProperties(video, videoExportExcel);
+                return videoExportExcel;
+            })
+            .collect(Collectors.toList());
+        try (
+            DefaultStreamExcelBuilder<VideoExportExcel> streamExcelBuilder = DefaultStreamExcelBuilder
+                .of(VideoExportExcel.class)
+                .threadPool(Executors.newFixedThreadPool(2))
+                .rowHeight(14)
+                .titleRowHeight(14)
+                .style(
+                    "cell->vertical-align:center;text-align:center",
+                    "title->vertical-align:center;text-align:center;font-weight:bold;font-family:等线"
+                )
+                .start()
+        ) {
+            streamExcelBuilder.append(data);
+
+            String fileName = URLEncoder.encode("监控点位来访信息.xlsx", StandardCharsets.UTF_8);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            OutputStream out = response.getOutputStream();
+
+            Workbook workbook = streamExcelBuilder.fixedTitles().build();
+            workbook.write(out);
+            workbook.close();
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("导出监控点位来访信息失败: " + e.getMessage());
+        }
     }
 
     @Override
-    public Result<String> importVideo(String sheet, MultipartFile file, Integer titleRow) {
-        return null;
+    public Result<String> importVideo(MultipartFile file) {
+        if (file.isEmpty()) {
+            throw new RuntimeException("请选择文件");
         }
+        List<VideoImportExcel> videoImportExcels;
+        try (InputStream inputStream = file.getInputStream()) {
+            videoImportExcels =
+                SaxExcelReader
+                    .of(VideoImportExcel.class)
+                    .rowFilter(row -> row.getRowNum() > 0)
+                    .ignoreBlankRow()
+                    .read(inputStream);
+        } catch (IOException e) {
+            log.info(e.getMessage());
+            throw new RuntimeException("文件导入异常");
+        }
+
+        List<Video> videos = videoImportExcels
+            .stream()
+            .map(videoImportExcel -> {
+                Video video = new Video();
+                BeanUtils.copyProperties(videoImportExcel, video);
+                return video;
+            })
+            .toList();
+
+        if (videos != null) {
+            videos.forEach(video -> {
+                videoRepository
+                    .findOne((root, cq, cb) -> {
+                        List<Predicate> predicates = new ArrayList<>();
 
-    //    @Override
-    //    public Result<String> importVideo(String sheet, MultipartFile file, Integer titleRow) {
-    ////        String s = gbCookie();
-    //        ExcelUtils<Video> util = new ExcelUtils<>(Video.class);
-    //        List<Video> videos = null;
-    //        try {
-    //            InputStream inputStream = file.getInputStream();
-    //            if(titleRow==null){
-    //                titleRow=0;
-    //            }
-    //            videos = util.importExcel(sheet, inputStream,titleRow);
-    //        } catch (Exception e) {
-    //            e.printStackTrace();
-    //        }
-    //        if (videos != null) {
-    //            videos.forEach(video -> {
-    //                videoRepository
-    //                    .findOne((root, cq, cb) -> {
-    //                        List<Predicate> predicates = new ArrayList<>();
-    //
-    //                        if (StringUtils.isNotBlank(video.getUuid())) {
-    //                            predicates.add(cb.equal(root.get("uuid").as(String.class), video.getUuid()));
-    //                        }
-    //                        return cq.where(predicates.toArray(new Predicate[0])).getRestriction();
-    //                    })
-    //                    .ifPresent(one -> {
-    //                        //如果存在则操作修改
-    //                        video.setId(one.getId());
-    //                        //删除国标关联监控信息
-    ////                        gbClient.proxyDel("stream", video.getUuid(),s);
-    //                    });
-    //                videoRepository.saveAndFlush(video);
-    //                //导入监控点位后,还需要同步数据到国标28181
-    ////                StreamProxyItem streamProxyItem = StreamProxyItem
-    ////                    .builder()
-    ////                    .name(video.getVideoName())
-    ////                    .app("stream")
-    ////                    .stream(video.getUuid())
-    ////                    .url(video.getM3u8())
-    ////                    .mediaServerId("ZbnQN5csqxrPix7a")
-    ////                    .enable(true)
-    ////                    .enable_hls(true)
-    ////                    .type(video.getM3u8().contains("sss") ? "default" : "ffmpeg")
-    ////                    .timeout_ms(video.getM3u8().contains("sss") ? 60 : null)
-    ////                    .build();
-    ////                JSONObject jsonObject = gbClient.proxySave(streamProxyItem, gbCookie());
-    ////                System.out.println(jsonObject);
-    //            });
-    //        }
-    //        return Result.ok();
-    //    }
+                        if (StrUtil.isNotBlank(video.getUuid())) {
+                            predicates.add(cb.equal(root.get("uuid").as(String.class), video.getUuid()));
+                        }
+                        return cq.where(predicates.toArray(new Predicate[0])).getRestriction();
+                    })
+                    .ifPresent(one -> {
+                        //如果存在则操作修改
+                        video.setId(one.getId());
+                        //删除国标关联监控信息
+                        //                        gbClient.proxyDel("stream", video.getUuid(),s);
+                    });
+                videoRepository.saveAndFlush(video);
+                //导入监控点位后,还需要同步数据到国标28181
+                //                StreamProxyItem streamProxyItem = StreamProxyItem
+                //                    .builder()
+                //                    .name(video.getVideoName())
+                //                    .app("stream")
+                //                    .stream(video.getUuid())
+                //                    .url(video.getM3u8())
+                //                    .mediaServerId("ZbnQN5csqxrPix7a")
+                //                    .enable(true)
+                //                    .enable_hls(true)
+                //                    .type(video.getM3u8().contains("sss") ? "default" : "ffmpeg")
+                //                    .timeout_ms(video.getM3u8().contains("sss") ? 60 : null)
+                //                    .build();
+                //                JSONObject jsonObject = gbClient.proxySave(streamProxyItem, gbCookie());
+                //                System.out.println(jsonObject);
+            });
+        }
+        return Result.ok();
+    }
 
     boolean has(String uuid) {
         Video video = Video.builder().uuid(uuid).build();
         return videoRepository.count(Example.of(video)) > 0;
     }
-    //    //登录国标28181获取cookie
-    //    String gbCookie() {
-    //        Response response = gbClient.userLogin("admin", "21232f297a57a5a743894a0e4a801fc3");
-    //        Collection<String> strings = response.headers().get("Set-Cookie");
-    //        return strings.stream().filter(a -> a.contains("JSESSIONID")).collect(Collectors.joining(", "));
-    //    }
+
+    /**
+     * 获取国标系统登录cookie
+     * @return cookie
+     */
+    String gbCookie() {
+        Object gbCookie = redisTemplate.opsForValue().get("gb_cookie");
+        if (ObjectUtil.isNotEmpty(gbCookie)) {
+            return String.valueOf(gbCookie);
+        }
+        Response response = gbClient.userLogin("admin", "21232f297a57a5a743894a0e4a801fc3");
+        Collection<String> strings = response.headers().get("Set-Cookie");
+        String jsessionid = strings.stream().filter(a -> a.contains("JSESSIONID")).collect(Collectors.joining(", "));
+        redisTemplate.opsForValue().set("gb_cookie", jsessionid, 30, TimeUnit.MINUTES);
+        return jsessionid;
+    }
 }

app/src/main/java/com/yiring/app/stomp/ClientInboundChannelInterceptor.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import com.yiring.app.constant.RedisKey;
+import com.yiring.auth.domain.user.User;
+import com.yiring.auth.util.Auths;
+import com.yiring.common.core.Redis;
+import java.util.LinkedList;
+import java.util.Map;
+import javax.annotation.Resource;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
+import org.springframework.messaging.simp.stomp.StompCommand;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.messaging.support.NativeMessageHeaderAccessor;
+import org.springframework.stereotype.Component;
+
+/**
+ * ClientInboundChannelInterceptor
+ * 接收客户端消息的拦截器
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/9/28 20:58
+ */
+
+@Slf4j
+@Component
+public class ClientInboundChannelInterceptor implements ChannelInterceptor {
+
+    @Resource
+    Redis redis;
+
+    @Resource
+    Auths auths;
+
+    @Override
+    public Message<?> preSend(@NonNull Message<?> message, @NonNull MessageChannel channel) {
+        StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
+        assert accessor != null;
+        if (StompCommand.CONNECT.equals(accessor.getCommand())) {
+            Object raw = message.getHeaders().get(NativeMessageHeaderAccessor.NATIVE_HEADERS);
+            if (raw instanceof Map) {
+                StompPrincipal principal = new StompPrincipal();
+                principal.setSession(accessor.getSessionId());
+
+                Object tokens = ((Map<?, ?>) raw).get("token");
+                if (tokens instanceof LinkedList) {
+                    String token = ((LinkedList<?>) tokens).getFirst().toString();
+                    User user = auths.getUserByToken(token);
+                    principal.setUser(user.getUsername());
+                    principal.setType(StompPrincipal.Type.LOGIN_USER);
+                } else {
+                    principal.setUser("Guest." + principal.getSession());
+                    principal.setType(StompPrincipal.Type.GUEST_USER);
+                }
+
+                accessor.setUser(principal);
+                redis.hset(RedisKey.STOMP_ONLINE_USERS, principal.getSession(), principal);
+                log.info(
+                    "STOMP Online Users: {} (incr: +1, session: {}, user: `{}`)",
+                    redis.hsize(RedisKey.STOMP_ONLINE_USERS),
+                    principal.getSession(),
+                    principal.getUser()
+                );
+            }
+        } else if (StompCommand.DISCONNECT.equals(accessor.getCommand())) {
+            StompPrincipal principal = (StompPrincipal) accessor.getUser();
+            assert principal != null;
+            if (
+                !message.getHeaders().containsKey(SimpMessageHeaderAccessor.HEART_BEAT_HEADER) &&
+                principal.getSession() != null
+            ) {
+                redis.hdel(RedisKey.STOMP_ONLINE_USERS, principal.getSession());
+                log.info(
+                    "STOMP Online Users: {} (incr: -1, session: {}, user: `{}`)",
+                    redis.hsize(RedisKey.STOMP_ONLINE_USERS),
+                    principal.getSession(),
+                    principal.getUser()
+                );
+            }
+        }
+
+        return message;
+    }
+}

app/src/main/java/com/yiring/app/stomp/ClientOutboundChannelInterceptor.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import com.alibaba.fastjson.JSON;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.simp.stomp.StompCommand;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.support.ChannelInterceptor;
+import org.springframework.messaging.support.MessageBuilder;
+import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.stereotype.Component;
+
+/**
+ * ClientOutboundChannelInterceptor
+ * 向客户端输出消息的拦截器
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/10/12 11:05
+ */
+
+@Slf4j
+@Component
+public class ClientOutboundChannelInterceptor implements ChannelInterceptor {
+
+    @Override
+    public Message<?> preSend(@NonNull Message<?> message, @NonNull MessageChannel channel) {
+        StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
+        assert accessor != null;
+        if (StompCommand.CONNECTED.equals(accessor.getCommand())) {
+            StompPrincipal principal = (StompPrincipal) accessor.getUser();
+            return MessageBuilder.createMessage(JSON.toJSONBytes(principal), message.getHeaders());
+        }
+
+        return message;
+    }
+}

app/src/main/java/com/yiring/app/stomp/CustomStompUserRegistry.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import lombok.NonNull;
+import org.springframework.context.ApplicationEvent;
+import org.springframework.context.event.SmartApplicationListener;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.simp.SimpMessageHeaderAccessor;
+import org.springframework.messaging.support.MessageHeaderAccessor;
+import org.springframework.stereotype.Component;
+import org.springframework.util.Assert;
+import org.springframework.web.socket.messaging.AbstractSubProtocolEvent;
+import org.springframework.web.socket.messaging.SessionConnectedEvent;
+import org.springframework.web.socket.messaging.SessionDisconnectEvent;
+
+/**
+ * 自定义STOMP在线用户信息统计与操作
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/10/10 21:19
+ */
+
+@Component
+public class CustomStompUserRegistry implements StompUserRegistry, SmartApplicationListener {
+
+    /**
+     * sessionId, Principal
+     */
+    private final Map<String, StompPrincipal> users = new ConcurrentHashMap<>();
+
+    private final Object userLock = new Object();
+
+    @Override
+    public boolean supportsEventType(@NonNull Class<? extends ApplicationEvent> eventType) {
+        return AbstractSubProtocolEvent.class.isAssignableFrom(eventType);
+    }
+
+    @Override
+    public void onApplicationEvent(@NonNull ApplicationEvent event) {
+        AbstractSubProtocolEvent subProtocolEvent = (AbstractSubProtocolEvent) event;
+        Message<?> message = subProtocolEvent.getMessage();
+
+        SimpMessageHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(
+            message,
+            SimpMessageHeaderAccessor.class
+        );
+        Assert.state(accessor != null, "No SimpMessageHeaderAccessor");
+
+        String sessionId = accessor.getSessionId();
+        Assert.state(sessionId != null, "No session id");
+
+        if (event instanceof SessionConnectedEvent) {
+            Principal user = subProtocolEvent.getUser();
+            synchronized (this.userLock) {
+                this.users.put(sessionId, (StompPrincipal) user);
+            }
+        } else if (event instanceof SessionDisconnectEvent) {
+            synchronized (this.userLock) {
+                this.users.remove(sessionId);
+            }
+        }
+    }
+
+    @Override
+    public Set<StompPrincipal> getUsers() {
+        return new HashSet<>(this.users.values());
+    }
+
+    @Override
+    public int getUserCount() {
+        return this.users.size();
+    }
+
+    @Override
+    public StompPrincipal getUser(String sessionId) {
+        return this.users.get(sessionId);
+    }
+
+    @Override
+    public void updateUser(String sessionId, StompPrincipal principal) {
+        synchronized (this.userLock) {
+            if (this.users.containsKey(sessionId)) {
+                this.users.put(sessionId, principal);
+            }
+        }
+    }
+}

app/src/main/java/com/yiring/app/stomp/RabbitmqProperties.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import lombok.AccessLevel;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+/**
+ * RabbitmqProperties
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/9/25 21:31
+ */
+
+@Data
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Component
+@ConfigurationProperties(prefix = "spring.rabbitmq")
+public class RabbitmqProperties {
+
+    int port;
+    String host;
+    String username;
+    String password;
+}

app/src/main/java/com/yiring/app/stomp/StompPrincipal.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import com.alibaba.fastjson.JSONObject;
+import java.io.Serializable;
+import java.security.Principal;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+
+/**
+ * StompPrincipal
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/9/28 21:28
+ */
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class StompPrincipal implements Principal, Serializable {
+
+    private static final long serialVersionUID = 5351052642945180737L;
+
+    Type type;
+    String user;
+    String session;
+    JSONObject options;
+
+    @Override
+    public String getName() {
+        return this.session;
+    }
+
+    public enum Type {
+        /**
+         * 游客用户
+         */
+        GUEST_USER,
+        /**
+         * 登录用户
+         */
+        LOGIN_USER,
+    }
+}

app/src/main/java/com/yiring/app/stomp/StompReceiver.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import com.alibaba.fastjson.JSON;
+import com.yiring.auth.domain.user.User;
+import com.yiring.auth.util.Auths;
+import com.yiring.common.core.Result;
+import com.yiring.common.core.Status;
+import com.yiring.common.util.Commons;
+import java.util.Objects;
+import java.util.Set;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.handler.annotation.MessageMapping;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.messaging.simp.stomp.StompHeaderAccessor;
+import org.springframework.messaging.simp.user.SimpUser;
+import org.springframework.messaging.simp.user.SimpUserRegistry;
+import org.springframework.stereotype.Controller;
+
+/**
+ * STOMP Receiver Controller
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/9/28 23:13
+ */
+
+@Slf4j
+@Controller
+public class StompReceiver {
+
+    @Resource
+    Auths auths;
+
+    @Resource
+    SimpMessagingTemplate simpMessagingTemplate;
+
+    @Resource
+    SimpUserRegistry simpUserRegistry;
+
+    @Resource
+    StompUserRegistry stompUserRegistry;
+
+    /**
+     * 登录
+     *
+     * @param accessor StompHeaderAccessor
+     */
+    @MessageMapping("/login")
+    public void login(StompHeaderAccessor accessor, String token) {
+        try {
+            User user = auths.getUserByToken(token);
+            StompPrincipal principal = (StompPrincipal) accessor.getUser();
+            assert principal != null;
+            principal.setType(StompPrincipal.Type.LOGIN_USER);
+            principal.setUser(user.getUsername());
+            accessor.setUser(principal);
+            stompUserRegistry.updateUser(accessor.getSessionId(), principal);
+            log.info("STOMP user `{}` login success.", principal.getUser());
+        } catch (Exception e) {
+            simpMessagingTemplate.convertAndSendToUser(
+                Objects.requireNonNull(accessor.getSessionId()),
+                "/topic/notice",
+                Result.no(Status.UNAUTHORIZED, "token 无效，登录失败！")
+            );
+        }
+    }
+
+    /**
+     * 更新用户状态
+     *
+     * @param accessor 访问器
+     */
+    @MessageMapping("/state")
+    public void state(StompHeaderAccessor accessor, String message) {
+        log.info("收到来自 STOMP Client `/app/state` 消息：{}", message);
+
+        StompPrincipal principal = (StompPrincipal) accessor.getUser();
+        assert principal != null;
+        principal.setOptions(JSON.parseObject(message));
+        accessor.setUser(principal);
+        log.info("principal info: {}", principal);
+
+        stompUserRegistry.updateUser(accessor.getSessionId(), principal);
+    }
+
+    @MessageMapping("/test")
+    public void test(StompHeaderAccessor accessor, String message) {
+        log.info("收到来自 STOMP Client `/app/test` 消息：{}", message);
+
+        Set<SimpUser> users = simpUserRegistry.getUsers();
+        log.info("{}", users);
+
+        simpMessagingTemplate.convertAndSendToUser(
+            Objects.requireNonNull(accessor.getSessionId()),
+            "/topic/reply",
+            Result.ok(Commons.uuid())
+        );
+    }
+}

app/src/main/java/com/yiring/app/stomp/StompUserRegistry.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import java.util.Set;
+
+/**
+ * STOMP 用户注册器
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/10/10 21:57
+ */
+
+public interface StompUserRegistry {
+    /**
+     * 获取所有在线的用户信息
+     *
+     * @return 用户信息集合
+     */
+    Set<StompPrincipal> getUsers();
+
+    /**
+     * 获取所有在线用户的数量
+     *
+     * @return 在线用户的数量
+     */
+    int getUserCount();
+
+    /**
+     * 根据SessionId获取用户信息
+     *
+     * @param sessionId sessionId
+     * @return StompPrincipal
+     */
+    StompPrincipal getUser(String sessionId);
+
+    /**
+     * 更新用户信息
+     *
+     * @param sessionId sessionId
+     * @param principal StompPrincipal
+     */
+    void updateUser(String sessionId, StompPrincipal principal);
+}

app/src/main/java/com/yiring/app/stomp/WebSocketStompConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.stomp;
+
+import com.yiring.app.constant.RedisKey;
+import com.yiring.common.core.Redis;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.messaging.simp.config.ChannelRegistration;
+import org.springframework.messaging.simp.config.MessageBrokerRegistry;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.socket.config.annotation.EnableWebSocketMessageBroker;
+import org.springframework.web.socket.config.annotation.StompEndpointRegistry;
+import org.springframework.web.socket.config.annotation.WebSocketMessageBrokerConfigurer;
+import org.springframework.web.socket.server.support.HttpSessionHandshakeInterceptor;
+
+/**
+ * WebSocketStompConfig
+ *
+ * @author ifzm
+ * @version 0.1
+ * 2019/9/25 20:12
+ */
+
+@Slf4j
+@Configuration
+@EnableScheduling
+@EnableWebSocketMessageBroker
+public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
+
+    @Resource
+    Redis redis;
+
+    @Resource
+    RabbitmqProperties rabbitmqProperties;
+
+    @Resource
+    ClientInboundChannelInterceptor clientInboundChannelInterceptor;
+
+    @Resource
+    ClientOutboundChannelInterceptor clientOutboundChannelInterceptor;
+
+    @Override
+    public void registerStompEndpoints(StompEndpointRegistry registry) {
+        registry
+            .addEndpoint("/stomp/ws")
+            .setAllowedOriginPatterns("*")
+            .addInterceptors(new HttpSessionHandshakeInterceptor())
+            .withSockJS();
+        log.info("Init STOMP Endpoints Success.");
+    }
+
+    @Override
+    public void configureMessageBroker(MessageBrokerRegistry registry) {
+        // 启动前先删除掉可能存在的残留STOMP连接缓存数据
+        redis.del(RedisKey.STOMP_ONLINE_USERS);
+        log.info("Clear STOMP online user info cache of redis.");
+
+        registry.setPreservePublishOrder(true);
+        registry.setUserDestinationPrefix("/user");
+        registry.setApplicationDestinationPrefixes("/app");
+        registry
+            .enableStompBrokerRelay("/topic", "/queue")
+            .setRelayHost(rabbitmqProperties.getHost())
+            .setClientLogin(rabbitmqProperties.getUsername())
+            .setClientPasscode(rabbitmqProperties.getPassword())
+            .setSystemLogin(rabbitmqProperties.getUsername())
+            .setSystemPasscode(rabbitmqProperties.getPassword());
+        log.info("Init RabbitMQ STOMP MessageBroker Success.");
+    }
+
+    @Override
+    public void configureClientInboundChannel(ChannelRegistration registration) {
+        registration.interceptors(clientInboundChannelInterceptor);
+    }
+
+    @Override
+    public void configureClientOutboundChannel(ChannelRegistration registration) {
+        registration.interceptors(clientOutboundChannelInterceptor);
+    }
+}

app/src/main/java/com/yiring/app/vo/car/CarVo.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.vo.car;
 
+import cn.hutool.core.util.StrUtil;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.common.util.DictUtils;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
-import org.apache.commons.lang3.StringUtils;
 
 /**
  * @author tzl
@@ -25,6 +26,9 @@ import org.apache.commons.lang3.StringUtils;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class CarVo implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -1778680629828674385L;
+
     @JsonSerialize(using = ToStringSerializer.class)
     @ApiModelProperty(value = "主键id", example = "1458555485552")
     Long id;
@@ -42,7 +46,7 @@ public class CarVo implements Serializable {
     String carTypeName;
 
     public String getCarTypeName() {
-        if (StringUtils.isNotBlank(carType)) {
+        if (StrUtil.isNotBlank(carType)) {
             return DictUtils.getDictLabel("car_type", carType);
         }
         return null;
@@ -67,7 +71,7 @@ public class CarVo implements Serializable {
     String labelCardStatusName;
 
     public String getLabelCardStatusName() {
-        if (StringUtils.isNotBlank(carType)) {
+        if (StrUtil.isNotBlank(carType)) {
             return DictUtils.getDictLabel("car_label_status", labelCardStatus);
         }
         return null;

app/src/main/java/com/yiring/app/vo/location/LocationTagVo.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.vo.location;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yiring.app.domain.location.LocationTag;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 定位标签视图
+ * @author LJ-2204
+ * @date 2022/4/14
+ */
+
+@ApiModel("LocationTagVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class LocationTagVo implements Serializable {
+
+    private static final long serialVersionUID = -7884163207638158359L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键", example = "188354391834")
+    Long id;
+
+    @ApiModelProperty(value = "编号", example = "BTT88888888")
+    String code;
+
+    @ApiModelProperty(value = "标签型号", example = "BTT01")
+    LocationTag.Type type;
+
+    @ApiModelProperty(value = "状态", example = "静止")
+    Boolean silent;
+
+    @ApiModelProperty(value = "电量", example = "1")
+    Integer volt;
+
+    @ApiModelProperty(value = "imei 设备编码", example = "88888888")
+    String imei;
+
+    @ApiModelProperty(value = "最近更新时间", example = "2022-01-01 00:00:00")
+    LocalDateTime updateTime;
+
+    public static List<LocationTagVo> transforms(List<LocationTag> locationTags) {
+        return locationTags
+            .stream()
+            .map(locationTag ->
+                LocationTagVo
+                    .builder()
+                    .id(locationTag.getId())
+                    .code(locationTag.getCode())
+                    .type(locationTag.getType())
+                    .silent(locationTag.getSilent())
+                    .volt(locationTag.getVolt())
+                    .build()
+            )
+            .collect(Collectors.toList());
+    }
+}

app/src/main/java/com/yiring/app/vo/video/VideoVo.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.vo.video;
 
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.awt.*;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
-import org.locationtech.jts.geom.Point;
 
 /**
  * @author tzl
@@ -20,13 +22,19 @@ import org.locationtech.jts.geom.Point;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class VideoVo implements Serializable {
 
-    @ApiModelProperty(value = "坐标点信息", example = "")
+    private static final long serialVersionUID = 3968078657827350557L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "id", example = "1548548545755")
+    Long id;
+
+    @ApiModelProperty(value = "坐标点", example = "坐标点", required = true)
     Point point;
 
     @ApiModelProperty(value = "编号", example = "88888888")
     String uuid;
 
-    @ApiModelProperty(value = "m3u8地址", example = "")
+    @ApiModelProperty(value = "m3u8地址", example = "m3u8地址")
     String m3u8;
 
     @ApiModelProperty(value = "备注", example = "摄像头")

app/src/main/java/com/yiring/app/web/HelloController.java

 /* (C) 2021 YiRing, Inc. */
 package com.yiring.app.web;
 
+import cn.hutool.extra.spring.SpringUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.yiring.app.constant.Code;
 import com.yiring.app.exception.CodeException;
+import com.yiring.app.push.domain.PushMessage;
+import com.yiring.app.push.service.PushService;
+import com.yiring.app.util.GeoUtils;
 import com.yiring.common.core.Result;
 import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
@@ -11,6 +16,7 @@ import java.util.Arrays;
 import java.util.List;
 import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.locationtech.jts.geom.Point;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -46,4 +52,12 @@ public class HelloController {
         PageVo<String> vo = PageVo.build(data, data.size());
         return Result.ok(vo);
     }
+
+    @GetMapping("test")
+    public Result<Point> test() {
+        PushService service = SpringUtil.getBean(PushService.class);
+        service.push(PushMessage.Type.WS, new JSONObject().fluentPut("msg", "hello"));
+        Point point = GeoUtils.createPoint(112.1, 23.56);
+        return Result.ok(point);
+    }
 }

app/src/main/java/com/yiring/app/web/LocationTagController.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web;
+
+import com.yiring.app.param.location.LocationTagAddParam;
+import com.yiring.app.param.location.LocationTagDeleteParam;
+import com.yiring.app.param.location.LocationTagFindParam;
+import com.yiring.app.param.location.LocationTagModifyParam;
+import com.yiring.app.service.location.LocationTagService;
+import com.yiring.app.vo.location.LocationTagVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.vo.PageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 定位标签
+ * @author LJ-2204
+ * @date 2022/4/13
+ */
+
+@Slf4j
+@Validated
+@Api(tags = "定位标签")
+@RestController
+@RequestMapping("/location/tag/")
+public class LocationTagController {
+
+    @Resource
+    LocationTagService locationTagService;
+
+    @ApiOperation("新增定位标签")
+    @PostMapping("addLocationTag")
+    public Result<String> addLocationTag(@Valid LocationTagAddParam param) {
+        return locationTagService.addLocationTag(param);
+    }
+
+    @ApiOperation("分页查询")
+    @GetMapping("findLocationTagPage")
+    public Result<PageVo<LocationTagVo>> findLocationTagPage(@Valid LocationTagFindParam param) {
+        return locationTagService.findLocationTagPage(param);
+    }
+
+    @ApiOperation("销毁定位标签")
+    @DeleteMapping("deleteLocationTag")
+    public Result<String> deleteLocationTag(@Valid LocationTagDeleteParam param) {
+        return locationTagService.deleteLocationTag(param);
+    }
+
+    @ApiOperation("导出定位标签")
+    @GetMapping("exportLocationTagInfo")
+    public void exportLocationTagInfo(@Valid LocationTagFindParam param, HttpServletResponse response) {
+        locationTagService.exportLocationTagInfo(param, response);
+    }
+
+    @ApiOperation("导入定位标签")
+    @PostMapping("importLocationTagInfo")
+    public Result<String> importLocationTagInfo(@RequestParam("file") MultipartFile file) {
+        return locationTagService.importLocationTagInfo(file);
+    }
+
+    @ApiOperation("修改定位标签")
+    @PutMapping("modifyLocationTag")
+    public Result<String> modifyLocationTag(@Valid LocationTagModifyParam param, IdParam idParam) {
+        return locationTagService.modifyLocationTag(param, idParam);
+    }
+}

app/src/main/java/com/yiring/app/web/car/CarController.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.web.car;
 
-import com.yiring.app.domain.car.Car;
 import com.yiring.app.param.car.CarParam;
 import com.yiring.app.param.car.CarQueryParam;
 import com.yiring.app.service.car.CarService;
 import com.yiring.app.vo.car.CarVo;
 import com.yiring.common.core.Result;
 import com.yiring.common.param.IdParam;
-import com.yiring.common.util.poi.ExcelUtils;
 import com.yiring.common.vo.PageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
-import java.util.List;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+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;
 
 /**
  * 车辆来访信息控制器
@@ -80,15 +81,9 @@ public class CarController {
         return carService.pageCarInfo(carParam);
     }
 
-    @ApiOperation(value = "导出车辆来访信息")
+    @ApiOperation(value = "导出车辆来访信息", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
     @PostMapping("exportCarInfo")
     public void exportCarInfo(HttpServletResponse response, @Valid CarQueryParam carParam) {
-        List<Car> export = carService.export(carParam);
-        ExcelUtils<Car> util = new ExcelUtils<>(Car.class);
-        //        String fileName = URLEncoder.encode("车辆来访信息.xlsx", StandardCharsets.UTF_8);
-        response.setContentType("application/octet-stream");
-        //        response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
-        //        response.setCharacterEncoding("utf-8");
-        util.exportExcel(response, export, "车辆来访信息");
+        carService.export(carParam, response);
     }
 }

app/src/main/java/com/yiring/app/web/video/VideoController.java

@@ -7,21 +7,27 @@ import com.yiring.app.service.video.VideoService;
 import com.yiring.app.vo.video.VideoVo;
 import com.yiring.common.core.Result;
 import com.yiring.common.param.IdParam;
-import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
 import lombok.extern.slf4j.Slf4j;
 import org.locationtech.jts.geom.Point;
+import org.springframework.http.MediaType;
 import org.springframework.validation.annotation.Validated;
+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 org.springframework.web.multipart.MultipartFile;
 
 /**
  * 监控点位控制器
+ *
  * @author tzl
  * 2022/4/8 16:51
  */
@@ -54,14 +60,27 @@ public class VideoController {
     }
 
     @ApiOperation(value = "查看监控点位位置")
-    @PostMapping("selectPoint")
+    @GetMapping("selectPoint")
     public Result<Point> selectPoint(@Valid IdParam idParam) {
         return videoService.selectPoint(idParam);
     }
 
     @ApiOperation(value = "分页查询监控点位信息")
-    @PostMapping("pageVideo")
-    public Result<PageVo<VideoVo>> pageVideo(@Valid VideoQueryParam videoQueryParam, @Valid PageParam param) {
-        return videoService.pageVideo(videoQueryParam, param);
+    @GetMapping("pageVideo")
+    public Result<PageVo<VideoVo>> pageVideo(@Valid VideoQueryParam videoQueryParam) {
+        return videoService.pageVideo(videoQueryParam);
+    }
+
+    @ApiOperation(value = "导出", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+    @PostMapping("exportVideo")
+    public void exportVideo(HttpServletResponse response, @Valid VideoQueryParam videoQueryParam) {
+        videoService.exportVideo(videoQueryParam, response);
+    }
+
+    @ApiOperation(value = "导入")
+    @ApiImplicitParams({ @ApiImplicitParam(value = "文件", required = true, name = "file") })
+    @PostMapping("importVideo")
+    public Result<String> importVideo(MultipartFile file) {
+        return videoService.importVideo(file);
     }
 }

app/src/main/resources/application-conf-patch.yml

+spring:
+  mvc:
+    pathmatch:
+      # 修复 swagger 插件在 2.6.x 接口路径匹配问题
+      matching-strategy: ant_path_matcher
+
+logging:
+  level:
+    # 关闭接口扫描 CachingOperationNameGenerator 日志
+    springfox.documentation.spring.web.readers.operation.CachingOperationNameGenerator: WARN

app/src/main/resources/application-dev.yml

@@ -16,6 +16,7 @@ spring:
     properties:
       hibernate:
         format_sql: true
+        types.print.banner: false
   redis:
     database: 5
     host: ${env.host}
@@ -24,7 +25,7 @@ spring:
     port: 5672
     username: admin
     password: 123456
-
+    virtual-host: /
 
 # knife4j
 knife4j:
@@ -49,3 +50,35 @@ logging:
   level:
     # sql bind parameter
     org.hibernate.type.descriptor.sql.BasicBinder: trace
+
+# 真源定位系统相关配置
+zy-config:
+  host: project.yz-online.com
+  # RabbitMQ 订阅配置
+  rabbitmq:
+    enabled: false
+    host: ${zy-config.host}
+    port: 672
+    username: admin
+    password: admin
+    virtual-host: /
+    queue-name: tenant_msg_${zy-config.open.client-secret}_${zy-config.open.client-id}
+  # 开放接口信息配置
+  open:
+    api: http://${zy-config.host}:789/positionApi
+    client-id: sc21080400
+    grant-type: client_credentials
+    client-secret: 12A14FDC
+    tenant: sc21080400
+  # 代理接口信息配置
+  proxy:
+    api: https://nl.yz-cloud.com
+    tenant: ts00000006
+    # 应用平台账户信息
+    client:
+      username: test1234
+      password: 123456
+    # 管理后台账户信息
+    manage:
+      username: test123
+      password: test123

app/src/main/resources/application-mock.yml

@@ -16,6 +16,7 @@ spring:
     properties:
       hibernate:
         format_sql: true
+        types.print.banner: false
   h2:
     console:
       enabled: true

app/src/main/resources/application.yml

@@ -7,7 +7,7 @@ spring:
   application:
     name: "kshg-api"
   profiles:
-    include: auth
+    include: auth, conf-patch
     active: dev
 
 # DEBUG

basic-auth/build.gradle

 dependencies {
 	implementation project(':basic-common:core')
 	implementation project(':basic-common:util')
+	implementation project(':basic-common:redis')
 
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
 	// 本地依赖
 	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
 
 	// swagger annotations
 	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
-	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
 	// sa-token
 	implementation "cn.dev33:sa-token-spring-boot-starter:${saTokenVersion}"
 	implementation "cn.dev33:sa-token-dao-redis-jackson:${saTokenVersion}"
 
-	// hutool-core
+	// hutool
 	implementation "cn.hutool:hutool-core:${hutoolVersion}"
+	implementation "cn.hutool:hutool-json:${hutoolVersion}"
+	implementation "cn.hutool:hutool-http:${hutoolVersion}"
+	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
 
 	// fastjson
 	implementation "com.alibaba:fastjson:${fastJsonVersion}"
+
+	// myexcel
+	implementation "com.github.liaochong:myexcel:${myexcelVersion}"
+
+
 }

basic-auth/src/main/java/com/yiring/auth/domain/dept/Department.java

@@ -4,6 +4,7 @@ package com.yiring.auth.domain.dept;
 import com.yiring.auth.domain.post.Post;
 import com.yiring.auth.domain.user.User;
 import com.yiring.common.annotation.FieldMapping;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Objects;
@@ -13,7 +14,7 @@ import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
 import org.hibernate.Hibernate;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 
@@ -37,6 +38,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Table(name = "SYS_DEPARTMENT", indexes = { @Index(columnList = "pid"), @Index(columnList = "tree") })
 public class Department implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5402731145404250150L;
 
     @Comment("主键")

basic-auth/src/main/java/com/yiring/auth/domain/permission/Permission.java

@@ -3,16 +3,17 @@ package com.yiring.auth.domain.permission;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.yiring.common.domain.BasicEntity;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;
 import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.Hibernate;
-import org.hibernate.annotaions.Comment;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.snowflake.SnowflakeId;
+import org.hibernate.annotations.Comment;
 
 /**
  * 权限
@@ -24,7 +25,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants
@@ -40,16 +41,11 @@ import org.hibernate.snowflake.SnowflakeId;
         @Index(columnList = "uid", unique = true),
     }
 )
-public class Permission implements Serializable {
+public class Permission extends BasicEntity implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -2001221843529000953L;
 
-    @Comment("主键")
-    @Id
-    @GeneratedValue(generator = SnowflakeId.GENERATOR)
-    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
-    Long id;
-
     @Comment("类型(MENU: 菜单, BUTTON: 按钮)")
     @Enumerated(EnumType.STRING)
     Type type;
@@ -138,7 +134,7 @@ public class Permission implements Serializable {
         if (this == o) return true;
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Permission that = (Permission) o;
-        return id != null && Objects.equals(id, that.id);
+        return this.getId() != null && Objects.equals(this.getId(), that.getId());
     }
 
     @Override

basic-auth/src/main/java/com/yiring/auth/domain/post/Post.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.auth.domain.post;
 
+import java.io.Serial;
 import java.io.Serializable;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -9,7 +10,7 @@ import javax.persistence.Table;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 
@@ -33,6 +34,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Table(name = "SYS_POST")
 public class Post implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 3744892781714515997L;
 
     @Comment("主键")

basic-auth/src/main/java/com/yiring/auth/domain/post/PostRepository.java

@@ -3,6 +3,7 @@ package com.yiring.auth.domain.post;
 
 import java.io.Serializable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
 /**
@@ -12,4 +13,4 @@ import org.springframework.stereotype.Repository;
  */
 
 @Repository
-public interface PostRepository extends JpaRepository<Post, Serializable> {}
+public interface PostRepository extends JpaRepository<Post, Serializable>, JpaSpecificationExecutor<Post> {}

basic-auth/src/main/java/com/yiring/auth/domain/role/Role.java

@@ -4,6 +4,8 @@ package com.yiring.auth.domain.role;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yiring.auth.domain.permission.Permission;
 import com.yiring.auth.domain.user.User;
+import com.yiring.common.domain.BasicEntity;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.HashSet;
 import java.util.Objects;
@@ -12,10 +14,9 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.Hibernate;
-import org.hibernate.annotaions.Comment;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.snowflake.SnowflakeId;
+import org.hibernate.annotations.Comment;
 
 /**
  * 角色
@@ -27,7 +28,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants
@@ -35,16 +36,11 @@ import org.hibernate.snowflake.SnowflakeId;
 @Entity
 @Comment("系统角色")
 @Table(name = "SYS_ROLE", indexes = { @Index(columnList = "uid", unique = true) })
-public class Role implements Serializable {
+public class Role extends BasicEntity implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 910404402503275957L;
 
-    @Comment("主键")
-    @Id
-    @GeneratedValue(generator = SnowflakeId.GENERATOR)
-    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
-    Long id;
-
     @Comment("标识")
     @Column(unique = true, nullable = false)
     String uid;
@@ -57,7 +53,7 @@ public class Role implements Serializable {
     @Comment("权限集合")
     @ManyToMany
     @ToString.Exclude
-    private Set<Permission> permissions = new HashSet<>();
+    Set<Permission> permissions = new HashSet<>();
 
     @JsonIgnore
     @EqualsAndHashCode.Exclude
@@ -70,14 +66,14 @@ public class Role implements Serializable {
         joinColumns = { @JoinColumn(name = "role_id") },
         inverseJoinColumns = { @JoinColumn(name = "user_id") }
     )
-    private Set<User> users = new HashSet<>();
+    Set<User> users = new HashSet<>();
 
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         Role role = (Role) o;
-        return id != null && Objects.equals(id, role.id);
+        return this.getId() != null && Objects.equals(this.getId(), role.getId());
     }
 
     @Override

basic-auth/src/main/java/com/yiring/auth/domain/user/User.java

@@ -3,9 +3,10 @@ package com.yiring.auth.domain.user;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.yiring.auth.domain.dept.Department;
-import com.yiring.auth.domain.post.Post;
 import com.yiring.auth.domain.role.Role;
 import com.yiring.common.annotation.FieldMapping;
+import com.yiring.common.domain.BasicEntity;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.HashSet;
@@ -16,9 +17,7 @@ import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
 import org.hibernate.Hibernate;
-import org.hibernate.annotaions.Comment;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.snowflake.SnowflakeId;
+import org.hibernate.annotations.Comment;
 
 /**
  * 用户
@@ -39,7 +38,6 @@ import org.hibernate.snowflake.SnowflakeId;
 @Table(
     name = "SYS_USER",
     indexes = {
-        @Index(columnList = "uuid", unique = true),
         @Index(columnList = "mobile", unique = true),
         @Index(columnList = "username", unique = true),
         @Index(columnList = "email", unique = true),
@@ -48,16 +46,11 @@ import org.hibernate.snowflake.SnowflakeId;
     }
 )
 @Comment("系统用户")
-public class User implements Serializable {
+public class User extends BasicEntity implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5787847701210907511L;
 
-    @Comment("主键")
-    @Id
-    @GeneratedValue(generator = SnowflakeId.GENERATOR)
-    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
-    Long id;
-
     /**
      * 数据来源于【真源人员定位系统 - 定位信标】
      * 作用: 用于双向联动进行数据同步
@@ -97,17 +90,6 @@ public class User implements Serializable {
     @Comment("头像")
     String avatar;
 
-    @Comment("职称")
-    String title;
-
-    @Comment("岗位")
-    @ManyToOne
-    @JoinColumn(name = "post_id")
-    Post post;
-
-    @Comment("性别（1: 男, 2: 女）")
-    Integer gender;
-
     @Comment("是否启用")
     Boolean enabled;
 
@@ -148,12 +130,6 @@ public class User implements Serializable {
     @Comment("最后登录时间")
     LocalDateTime lastLoginTime;
 
-    @Comment("更新时间")
-    LocalDateTime updateTime;
-
-    @Comment("创建时间")
-    LocalDateTime createTime;
-
     @SuppressWarnings({ "unused" })
     public enum Type {
         EMPLOYEES("员工"),
@@ -194,7 +170,7 @@ public class User implements Serializable {
         if (this == o) return true;
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         User user = (User) o;
-        return id != null && Objects.equals(id, user.id);
+        return getId() != null && Objects.equals(getId(), user.getId());
     }
 
     @Override

basic-auth/src/main/java/com/yiring/auth/excel/post/PostExcel.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.excel.post;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelModel;
+import com.yiring.auth.domain.post.Post;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 职位信息导出模型
+ * @author LJ-2204
+ * @date 2022/4/13
+ */
+
+@ExcelModel
+@Data
+@Builder
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PostExcel {
+
+    @ExcelColumn(title = "编号")
+    @JsonSerialize(using = ToStringSerializer.class)
+    Long id;
+
+    @ExcelColumn(title = "职位名称")
+    String name;
+
+    @ExcelColumn(title = "职位描述")
+    String describe;
+
+    @ExcelColumn(title = "是否启用")
+    @JsonSerialize(using = ToStringSerializer.class)
+    Boolean enable;
+
+    public static List<PostExcel> transforms(List<Post> posts) {
+        return posts
+            .stream()
+            .map(post ->
+                PostExcel
+                    .builder()
+                    .id(post.getId())
+                    .name(post.getName())
+                    .describe(post.getDescribe())
+                    .enable(post.getEnable())
+                    .build()
+            )
+            .collect(Collectors.toList());
+    }
+}

basic-auth/src/main/java/com/yiring/auth/param/IdsParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Arrays;
 import java.util.Set;
@@ -28,6 +29,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class IdsParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8379896695668632733L;
 
     @ApiModelProperty(value = "ids 多个以逗号分割", example = "1,2", required = true)

basic-auth/src/main/java/com/yiring/auth/param/auth/LoginParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param.auth;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import lombok.*;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LoginParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456895L;
 
     @ApiModelProperty(value = "账号(支持用户名/手机号/邮箱)", example = "admin", required = true)

basic-auth/src/main/java/com/yiring/auth/param/auth/RegisterParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param.auth;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
@@ -24,6 +25,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class RegisterParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456895L;
 
     @ApiModelProperty(value = "用户名", example = "admin", required = true)

basic-auth/src/main/java/com/yiring/auth/param/permission/PermissionParam.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.annotation.JsonInclude;
 import com.yiring.auth.domain.permission.Permission;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
@@ -27,6 +28,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PermissionParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -6781934969837655538L;
 
     @ApiModelProperty(value = "权限类型", example = "MENU", required = true)

basic-auth/src/main/java/com/yiring/auth/param/post/PostFindParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.param.post;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 职位分页入参
+ * @author LJ-2204
+ * @date 2022/4/13
+ */
+
+@ApiModel("PostFindParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PostFindParam implements Serializable {
+
+    private static final long serialVersionUID = 1926710333813935577L;
+
+    @ApiModelProperty(value = "名称", example = "Java")
+    String name;
+
+    @ApiModelProperty(value = "是否启用", example = "true")
+    Boolean enable;
+
+    @ApiModelProperty(value = "每页记录数", example = "10")
+    Integer pageSize;
+
+    @ApiModelProperty(value = "页码", example = "1")
+    Integer pageNo;
+}

basic-auth/src/main/java/com/yiring/auth/param/post/PostParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.param.post;
+
+import com.yiring.auth.domain.post.Post;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 职位信息入参类
+ * @author LJ-2204
+ * @date 2022/4/12
+ */
+
+@ApiModel("PostParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PostParam implements Serializable {
+
+    private static final long serialVersionUID = 5247408856592333466L;
+
+    @ApiModelProperty(value = "名称", example = "Java", required = true)
+    String name;
+
+    @ApiModelProperty(value = "描述", example = "描述", required = true)
+    String describe;
+
+    @ApiModelProperty(value = "是否启用", example = "true", required = true)
+    Boolean enable;
+
+    public Post transform() {
+        return Post.builder().name(this.name).describe(this.describe).enable(this.enable).build();
+    }
+}

basic-auth/src/main/java/com/yiring/auth/param/role/RoleParam.java

@@ -3,6 +3,7 @@ package com.yiring.auth.param.role;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotEmpty;
 import lombok.*;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class RoleParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 6572751635422870217L;
 
     @ApiModelProperty(value = "标识", example = "admin", required = true)

basic-auth/src/main/java/com/yiring/auth/service/post/PostService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.service.post;
+
+import com.yiring.auth.param.post.PostFindParam;
+import com.yiring.auth.param.post.PostParam;
+import com.yiring.auth.vo.post.PostVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.vo.PageVo;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 职位信息
+ * @author LJ-2204
+ * @date 2022/4/13
+ */
+public interface PostService {
+    /**
+     * 新增职位信息
+     * @param postParam 入参
+     * @return Result<String>
+     */
+    Result<String> addPost(PostParam postParam);
+
+    /**
+     * 修改职位信息
+     * @param postParam 入参
+     * @param idParam id
+     * @return Result<String>
+     */
+    Result<String> modifyPost(PostParam postParam, IdParam idParam);
+
+    /**
+     * 销毁职位信息
+     * @param idParam id
+     * @return Result<String>
+     */
+    Result<String> deletePost(IdParam idParam);
+
+    /**
+     * 职位信息分页
+     * @param param 入参
+     * @return Result<PageVo<PostVo>>
+     */
+    Result<PageVo<PostVo>> findPostPage(PostFindParam param);
+
+    /**
+     * 详细信息查询
+     * @param idParam id
+     * @return Result<PostVo>
+     */
+    Result<PostVo> findPostById(IdParam idParam);
+
+    /**
+     * 根据名称判断是否存在职业信息
+     * @param name 职业名称
+     * @return T/F
+     */
+    boolean hasPostInfo(String name);
+
+    /**
+     * 导出职位信息
+     * @param param 入参
+     * @param response 响应信息
+     */
+    void exportPostInfo(PostFindParam param, HttpServletResponse response);
+}

basic-auth/src/main/java/com/yiring/auth/service/post/impl/PostServiceImpl.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.service.post.impl;
+
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
+import com.yiring.auth.domain.post.Post;
+import com.yiring.auth.domain.post.PostRepository;
+import com.yiring.auth.excel.post.PostExcel;
+import com.yiring.auth.param.post.PostFindParam;
+import com.yiring.auth.param.post.PostParam;
+import com.yiring.auth.service.post.PostService;
+import com.yiring.auth.vo.post.PostVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.core.Status;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.vo.PageVo;
+import java.io.OutputStream;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.Executors;
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 职位信息
+ * @author LJ-2204
+ * @date 2022/4/13
+ */
+@Transactional(rollbackFor = RuntimeException.class)
+@Service
+@Slf4j
+public class PostServiceImpl implements PostService {
+
+    @Resource
+    PostRepository postRepository;
+
+    @Override
+    public Result<String> addPost(PostParam postParam) {
+        if (hasPostInfo(postParam.getName())) return Result.no(Status.BAD_REQUEST, "职位已存在");
+        Post post = postParam.transform();
+        postRepository.save(post);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> modifyPost(PostParam postParam, IdParam idParam) {
+        Optional<Post> postOptional = postRepository.findById(idParam.getId());
+        if (postOptional.isEmpty()) return Result.no(Status.BAD_REQUEST, "被修改的数据不存在");
+
+        Post post = postOptional.get();
+
+        if (!StrUtil.equals(post.getName(), postParam.getName())) {
+            if (hasPostInfo(postParam.getName())) return Result.no(Status.BAD_REQUEST, "职位已存在");
+        }
+
+        post = postParam.transform();
+        post.setId(idParam.getId());
+        postRepository.save(post);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> deletePost(IdParam idParam) {
+        Post post = Post.builder().id(idParam.getId()).build();
+        postRepository.delete(post);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<PageVo<PostVo>> findPostPage(PostFindParam param) {
+        Specification<Post> specification = getPostPageSpecification(param);
+
+        if (ObjectUtil.isEmpty(param.getPageSize()) && ObjectUtil.isEmpty(param.getPageNo())) {
+            //分页
+            Pageable pageable = PageRequest.of(param.getPageNo() - 1, param.getPageSize());
+            Page<Post> page = postRepository.findAll(specification, pageable);
+            List<PostVo> postVos = PostVo.transforms(page.getContent());
+            PageVo<PostVo> pageVo = PageVo.build(postVos, postVos.size());
+            return Result.ok(pageVo);
+        } else {
+            List<Post> posts = postRepository.findAll(specification);
+            List<PostVo> postVos = PostVo.transforms(posts);
+            PageVo<PostVo> pageVo = PageVo.build(postVos, postVos.size());
+            return Result.ok(pageVo);
+        }
+    }
+
+    @Override
+    public Result<PostVo> findPostById(IdParam idParam) {
+        Post post = postRepository.getById(idParam.getId());
+        PostVo postVo = PostVo.transform(post);
+        return Result.ok(postVo);
+    }
+
+    @Override
+    public boolean hasPostInfo(String name) {
+        Post post = Post.builder().name(name).build();
+        return postRepository.count(Example.of(post)) > 0;
+    }
+
+    @Override
+    public void exportPostInfo(PostFindParam param, HttpServletResponse response) {
+        Specification<Post> specification = getPostPageSpecification(param);
+        List<Post> postList = postRepository.findAll(specification);
+        List<PostExcel> postExcels = PostExcel.transforms(postList);
+        try (
+            DefaultStreamExcelBuilder<PostExcel> streamExcelBuilder = DefaultStreamExcelBuilder
+                .of(PostExcel.class)
+                .threadPool(Executors.newFixedThreadPool(2))
+                .rowHeight(14)
+                .titleRowHeight(14)
+                .style(
+                    "cell->vertical-align:center;text-align:center",
+                    "title->vertical-align:center;text-align:center;font-weight:bold;font-family:等线"
+                )
+                .start()
+        ) {
+            streamExcelBuilder.append(postExcels);
+
+            String fileName = URLEncoder.encode("职位信息.xlsx", StandardCharsets.UTF_8);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
+            OutputStream out = response.getOutputStream();
+
+            Workbook workbook = streamExcelBuilder.fixedTitles().build();
+            workbook.write(out);
+            workbook.close();
+            out.flush();
+            out.close();
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            throw new RuntimeException("导出岗位信息失败: " + e.getMessage());
+        }
+    }
+
+    private Specification<Post> getPostPageSpecification(PostFindParam param) {
+        return (root, cq, cb) -> {
+            List<Predicate> predicates = ListUtil.toList();
+
+            if (StrUtil.isNotEmpty(param.getName())) {
+                predicates.add(cb.equal(root.get(Post.Fields.name), param.getName()));
+            }
+
+            if (ObjectUtil.isNotEmpty(param.getEnable())) {
+                predicates.add(cb.equal(root.get(Post.Fields.enable), param.getEnable()));
+            }
+
+            return cq.where(predicates.toArray(new Predicate[0])).getRestriction();
+        };
+    }
+}

basic-auth/src/main/java/com/yiring/auth/util/Auths.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.util;
+
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
+import com.yiring.auth.domain.user.User;
+import com.yiring.auth.domain.user.UserRepository;
+import com.yiring.common.core.Status;
+import java.util.Objects;
+import java.util.Optional;
+import javax.annotation.Resource;
+import lombok.NonNull;
+import org.springframework.stereotype.Component;
+
+/**
+ * 认证工具类
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/8 17:34
+ */
+
+@SuppressWarnings("unused")
+@Component
+public class Auths {
+
+    @Resource
+    UserRepository userRepository;
+
+    /**
+     * 根据 Token 获取用户信息
+     * 如果用户未登录或校验失败会抛出 NotLoginException {@link Status#UNAUTHORIZED}
+     * @param token token
+     * @return 用户信息
+     */
+    public User getUserByToken(@NonNull String token) {
+        Object id = StpUtil.getLoginIdByToken(token);
+        if (id == null) {
+            StpUtil.logoutByTokenValue(token);
+            throw NotLoginException.newInstance(StpUtil.TYPE, null);
+        }
+
+        Optional<User> optional = userRepository.findById(Long.valueOf(Objects.toString(id)));
+        if (optional.isEmpty()) {
+            StpUtil.logout(id);
+            throw NotLoginException.newInstance(StpUtil.TYPE, NotLoginException.INVALID_TOKEN);
+        }
+
+        return optional.get();
+    }
+
+    /**
+     * 获取当前登录用户
+     * 如果用户未登录会抛出 NotLoginException {@link Status#UNAUTHORIZED}
+     */
+    public User getLoginUser() {
+        String token = StpUtil.getTokenValue();
+        if (token == null) {
+            throw NotLoginException.newInstance(StpUtil.TYPE, null);
+        }
+
+        return getUserByToken(token);
+    }
+}

basic-auth/src/main/java/com/yiring/auth/util/ZyUtil.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.util;
+
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import cn.hutool.http.Header;
+import cn.hutool.http.HttpRequest;
+import cn.hutool.http.HttpUtil;
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSON;
+import com.yiring.common.core.Result;
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import lombok.experimental.UtilityClass;
+import org.springframework.data.redis.core.RedisTemplate;
+
+/**
+ * 真源授权工具
+ * @author LJ-2204
+ * @date 2022/4/15
+ */
+
+@UtilityClass
+public class ZyUtil {
+
+    RedisTemplate<String, Object> redisTemplate;
+
+    static {
+        redisTemplate = SpringUtil.getBean("redisTemplate");
+    }
+
+    public final String CLIENT_ID = "sc21080400";
+
+    public final String CLIENT_SECRET = "12A14FDC";
+
+    public final String GRANT_TYPE = "client_credentials";
+
+    public final String KEY = "zy_token";
+
+    public final String TOKEN_TYPE = "bearer ";
+
+    public final String URL_PREFIX = "http://project.yz-online.com:789";
+
+    /**
+     * 获取token
+     * @return token
+     */
+    public static String login() {
+        Object obj = redisTemplate.opsForValue().get(KEY);
+        if (ObjectUtil.isNotEmpty(obj)) {
+            return String.valueOf(obj);
+        }
+        Map<String, Object> map = MapUtil.createMap(HashMap.class);
+        map.put("client_id", CLIENT_ID);
+        map.put("client_secret", CLIENT_SECRET);
+        map.put("grant_type", GRANT_TYPE);
+        String json = HttpUtil.get("http://project.yz-online.com:789/positionApi/oauth/token", map);
+        Map result = JSON.parseObject(json, Map.class);
+        String access_token = result.get("access_token").toString();
+        redisTemplate.opsForValue().set(KEY, access_token, 1200, TimeUnit.SECONDS);
+        return access_token;
+    }
+
+    /**
+     * 判断token是否有效
+     * @return T/F
+     */
+    public static boolean getToken() {
+        return ObjectUtil.isNotEmpty(redisTemplate.opsForValue().get(KEY));
+    }
+
+    /**
+     * get请求
+     * @param urlString 路径
+     * @param obj 参数
+     * @param timeout 请求时长
+     * @return json
+     */
+    public static Result get(String urlString, Object obj, int timeout) {
+        String json = JSONUtil.toJsonStr(obj);
+        String token = login();
+        String body = HttpRequest
+            .get(URL_PREFIX + urlString)
+            .header(Header.AUTHORIZATION, TOKEN_TYPE + token)
+            .header(Header.CONTENT_TYPE, "application/json")
+            .body(json)
+            .timeout(timeout)
+            .execute()
+            .body();
+        return getResult(body);
+    }
+
+    /**
+     * post请求
+     * @param urlString 路径
+     * @param obj 参数
+     * @param timeout 请求时长
+     * @return json
+     */
+    public static Result<Serializable> post(String urlString, Object obj, int timeout) {
+        String json = JSONUtil.toJsonStr(obj);
+        String token = login();
+        String body = HttpRequest
+            .post(URL_PREFIX + urlString)
+            .header(Header.AUTHORIZATION, TOKEN_TYPE + token)
+            .header(Header.CONTENT_TYPE, "application/json")
+            .body(json)
+            .timeout(timeout)
+            .execute()
+            .body();
+        return getResult(body);
+    }
+
+    /**
+     * put请求
+     * @param urlString 路径
+     * @param obj 参数
+     * @param timeout 请求时长
+     * @return json
+     */
+    public static Result<Serializable> put(String urlString, Object obj, int timeout) {
+        String json = JSONUtil.toJsonStr(obj);
+        String token = login();
+        String body = HttpRequest
+            .put(URL_PREFIX + urlString)
+            .header(Header.AUTHORIZATION, TOKEN_TYPE + token)
+            .header(Header.CONTENT_TYPE, "application/json")
+            .body(json)
+            .timeout(timeout)
+            .execute()
+            .body();
+        return getResult(body);
+    }
+
+    /**
+     * delete请求
+     * @param urlString 路径
+     * @param obj 参数
+     * @param timeout 请求时长
+     * @return json
+     */
+    public static Result<Serializable> delete(String urlString, Object obj, int timeout) {
+        String json = JSONUtil.toJsonStr(obj);
+        String token = login();
+        String body = HttpRequest
+            .delete(URL_PREFIX + urlString)
+            .header(Header.AUTHORIZATION, TOKEN_TYPE + token)
+            .header(Header.CONTENT_TYPE, "application/json")
+            .body(json)
+            .timeout(timeout)
+            .execute()
+            .body();
+        return getResult(body);
+    }
+
+    /**
+     * 返回类型转换
+     * @param body json
+     * @return Result
+     */
+    private static Result<Serializable> getResult(String body) {
+        Map map = JSONUtil.toBean(body, Map.class);
+        Integer code = Convert.toInt(map.get("code"));
+        String msg = Convert.toStr(map.get("msg"));
+        return Result.builder().code(code).message(msg).build();
+    }
+}

basic-auth/src/main/java/com/yiring/auth/vo/auth/LoginVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -25,6 +26,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LoginVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456896L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/permission/MenuVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 import lombok.*;
@@ -27,6 +28,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class MenuVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9139328772148985141L;
 
     @JsonIgnore

basic-auth/src/main/java/com/yiring/auth/vo/permission/PermissionVo.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.domain.permission.Permission;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 import lombok.*;
@@ -29,6 +30,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PermissionVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9139328772148985141L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/post/PostVo.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.vo.post;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yiring.auth.domain.post.Post;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 职位信息视图
+ * @author LJ-2204
+ * @date 2022/4/13
+ */
+
+@ApiModel("PostVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PostVo implements Serializable {
+
+    private static final long serialVersionUID = 1011259844584399825L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键", example = "1")
+    Long id;
+
+    @ApiModelProperty(value = "名称", example = "Java")
+    String name;
+
+    @ApiModelProperty(value = "描述", example = "描述")
+    String describe;
+
+    @ApiModelProperty(value = "是否启用", example = "true")
+    Boolean enable;
+
+    public static PostVo transform(Post post) {
+        return PostVo
+            .builder()
+            .id(post.getId())
+            .name(post.getName())
+            .describe(post.getDescribe())
+            .enable(post.getEnable())
+            .build();
+    }
+
+    public static List<PostVo> transforms(List<Post> posts) {
+        return posts
+            .stream()
+            .map(post ->
+                PostVo
+                    .builder()
+                    .id(post.getId())
+                    .name(post.getName())
+                    .describe(post.getDescribe())
+                    .enable(post.getEnable())
+                    .build()
+            )
+            .collect(Collectors.toList());
+    }
+}

basic-auth/src/main/java/com/yiring/auth/vo/role/RoleVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.vo.permission.PermissionVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.List;
 import lombok.*;
@@ -26,6 +27,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class RoleVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9154497137563970840L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/user/UserInfoVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.vo.role.RoleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +27,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class UserInfoVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5319037883240327088L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/user/UserMenuListVo.java

@@ -6,6 +6,7 @@ import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.yiring.auth.vo.role.RoleVo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
@@ -26,6 +27,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class UserMenuListVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5319037883240327088L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/vo/user/UserVo.java

@@ -5,6 +5,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
@@ -24,6 +25,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class UserVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -2184378273450466835L;
 
     @JsonSerialize(using = ToStringSerializer.class)

basic-auth/src/main/java/com/yiring/auth/web/auth/AuthController.java

@@ -78,7 +78,6 @@ public class AuthController {
             .password(SaSecureUtil.sha256(param.getPassword()))
             .enabled(param.getEnable())
             .deleted(Boolean.FALSE)
-            .createTime(LocalDateTime.now())
             .build();
         userRepository.saveAndFlush(user);
         return Result.ok();

basic-auth/src/main/java/com/yiring/auth/web/post/PostController.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.auth.web.post;
+
+import com.yiring.auth.param.post.PostFindParam;
+import com.yiring.auth.param.post.PostParam;
+import com.yiring.auth.service.post.PostService;
+import com.yiring.auth.vo.post.PostVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.vo.PageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 职位信息控制器
+ * @author LJ-2204
+ * @date 2022/4/12
+ */
+
+@Slf4j
+@Validated
+@Api(tags = "职位信息")
+@RestController
+@RequestMapping("/post/")
+public class PostController {
+
+    @Resource
+    PostService postService;
+
+    @ApiOperation(value = "新增职位")
+    @PostMapping("addPost")
+    public Result<String> addPost(@Valid PostParam postParam) {
+        return postService.addPost(postParam);
+    }
+
+    @ApiOperation(value = "修改职位")
+    @PutMapping("modifyPost")
+    public Result<String> modifyPost(@Valid PostParam postParam, @Valid IdParam idParam) {
+        return postService.modifyPost(postParam, idParam);
+    }
+
+    @ApiOperation(value = "销毁职位")
+    @DeleteMapping("deletePost")
+    public Result<String> deletePost(@Valid IdParam idParam) {
+        return postService.deletePost(idParam);
+    }
+
+    @ApiOperation(value = "分页查询")
+    @GetMapping("findPostPage")
+    public Result<PageVo<PostVo>> findPostPage(@Valid PostFindParam param) {
+        return postService.findPostPage(param);
+    }
+
+    @ApiOperation(value = "详细信息查询")
+    @GetMapping("findPostById")
+    public Result<PostVo> findPostById(@Valid IdParam idParam) {
+        return postService.findPostById(idParam);
+    }
+
+    @ApiOperation(value = "导出职位信息")
+    @GetMapping("exportPostInfo")
+    public void exportPostInfo(@Valid PostFindParam param, HttpServletResponse response) {
+        postService.exportPostInfo(param, response);
+    }
+}

basic-auth/src/main/java/com/yiring/auth/web/user/UserController.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.auth.web.user;
 
-import cn.dev33.satoken.stp.StpUtil;
 import com.yiring.auth.domain.permission.Permission;
 import com.yiring.auth.domain.role.Role;
 import com.yiring.auth.domain.role.RoleRepository;
 import com.yiring.auth.domain.user.User;
 import com.yiring.auth.domain.user.UserRepository;
 import com.yiring.auth.param.IdsParam;
+import com.yiring.auth.util.Auths;
 import com.yiring.auth.util.Permissions;
 import com.yiring.auth.vo.permission.MenuVo;
 import com.yiring.auth.vo.user.UserInfoVo;
 import com.yiring.auth.vo.user.UserVo;
 import com.yiring.common.core.Result;
 import com.yiring.common.core.Status;
-import com.yiring.common.exception.FailStatusException;
 import com.yiring.common.param.IdParam;
 import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
@@ -52,6 +51,9 @@ import org.springframework.web.bind.annotation.RestController;
 public class UserController {
 
     @Resource
+    Auths auths;
+
+    @Resource
     UserRepository userRepository;
 
     @Resource
@@ -60,7 +62,7 @@ public class UserController {
     @ApiOperation(value = "获取登录用户信息")
     @GetMapping("getUserInfo")
     public Result<UserInfoVo> getUserInfo() {
-        User user = getLoginUser();
+        User user = auths.getLoginUser();
         UserInfoVo userInfoVo = UserInfoVo
             .builder()
             .userId(user.getId())
@@ -76,7 +78,7 @@ public class UserController {
     @ApiOperation(value = "获取用户菜单")
     @GetMapping("getMenuList")
     public Result<ArrayList<MenuVo>> getMenuList() {
-        User user = getLoginUser();
+        User user = auths.getLoginUser();
         List<Permission> permissions = Permissions
             .toPermissions(user.getRoles())
             .stream()
@@ -89,7 +91,7 @@ public class UserController {
     @ApiOperation(value = "获取用户权限")
     @GetMapping("getPermCode")
     public Result<ArrayList<String>> getPermCode() {
-        User user = getLoginUser();
+        User user = auths.getLoginUser();
         List<Permission> permissions = Permissions.toPermissions(user.getRoles());
         List<String> codes = permissions.stream().map(Permission::getUid).collect(Collectors.toList());
         return Result.ok((ArrayList<String>) codes);
@@ -132,19 +134,4 @@ public class UserController {
         PageVo<UserVo> vo = PageVo.build(data, page.getTotalElements());
         return Result.ok(vo);
     }
-
-    /**
-     * 获取登录用户信息
-     * @return 用户信息
-     */
-    private User getLoginUser() {
-        Long id = StpUtil.getLoginIdAsLong();
-        Optional<User> optional = userRepository.findById(id);
-        if (optional.isPresent()) {
-            return optional.get();
-        }
-
-        StpUtil.logout(id);
-        throw new FailStatusException(Status.UNAUTHORIZED);
-    }
 }

basic-auth/src/main/resources/init-test-mysql.sql

@@ -11,7 +11,7 @@
  Target Server Version : 80025
  File Encoding         : 65001
 
- Date: 30/03/2022 17:11:44
+ Date: 17/04/2022 18:00:26
 */
 
 SET NAMES utf8mb4;
@@ -22,53 +22,57 @@ SET FOREIGN_KEY_CHECKS = 0;
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_permission`;
 CREATE TABLE `sys_permission`  (
-  `id` bigint NOT NULL,
-  `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `enable` bit(1) NULL DEFAULT NULL,
-  `hidden` bit(1) NULL DEFAULT NULL,
-  `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `meta` json NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `pid` bigint NULL DEFAULT NULL,
-  `serial` int NULL DEFAULT NULL,
-  `tree` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
-  `redirect` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `id` bigint NOT NULL COMMENT '主键',
+  `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间',
+  `component` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '组件',
+  `enable` bit(1) NULL DEFAULT NULL COMMENT '是否启用',
+  `hidden` bit(1) NULL DEFAULT NULL COMMENT '是否隐藏',
+  `icon` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '图标',
+  `meta` json NULL COMMENT '扩展元数据信息',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '名称',
+  `path` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '路径',
+  `pid` bigint NULL DEFAULT NULL COMMENT '权限父级ID',
+  `redirect` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '重定向',
+  `serial` int NULL DEFAULT NULL COMMENT '序号',
+  `tree` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '树节点标识',
+  `type` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '类型(MENU: 菜单, BUTTON: 按钮)',
+  `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '标识',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `UK_n5idwm5pmlgfwvau5vrwf65ai`(`uid`) USING BTREE,
-  UNIQUE INDEX `UKn5idwm5pmlgfwvau5vrwf65ai`(`uid`) USING BTREE,
   INDEX `IDXfgtwjg4pmylcko0v6ate29j2x`(`type`) USING BTREE,
   INDEX `IDXcj5qpen847f3vkcgy7lsmqyug`(`pid`) USING BTREE,
-  INDEX `IDXckpwmqmt2tsu8fyefxpgwypmr`(`tree`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+  INDEX `IDXckpwmqmt2tsu8fyefxpgwypmr`(`tree`) USING BTREE,
+  UNIQUE INDEX `UKn5idwm5pmlgfwvau5vrwf65ai`(`uid`) USING BTREE
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '系统权限' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_permission
 -- ----------------------------
-INSERT INTO `sys_permission` VALUES (1509081714683547648, 'LAYOUT', b'1', NULL, 'ion:grid-outline', '{\"title\": \"routes.dashboard.dashboard\", \"hideChildrenInMenu\": true}', 'Dashboard', '/dashboard', 0, 1, '0', 'MENU', 'Dashboard', '/dashboard/workbench');
-INSERT INTO `sys_permission` VALUES (1509082383666647040, '/dashboard/workbench/index', b'1', b'1', NULL, '{\"title\": \"routes.dashboard.workbench\", \"hideBreadcrumb\": true, \"currentActiveMenu\": \"/dashboard\"}', 'Workbench', 'workbench', 1509081714683547648, NULL, '0.1509081714683547648', 'MENU', 'Workbench', NULL);
-INSERT INTO `sys_permission` VALUES (1509082892188258304, 'LAYOUT', b'1', NULL, 'simple-icons:about-dot-me', '{\"title\": \"routes.dashboard.about\", \"hideChildrenInMenu\": true}', 'About', '/about', 0, 100000, '0', 'MENU', 'About', '/about/index');
-INSERT INTO `sys_permission` VALUES (1509083350738931712, '/sys/about/index', b'1', NULL, 'simple-icons:about-dot-me', '{\"title\": \"routes.dashboard.about\", \"hideMenu\": true}', 'AboutPage', 'index', 1509082892188258304, NULL, '0.1509082892188258304', 'MENU', 'AboutPage', NULL);
+INSERT INTO `sys_permission` VALUES (1515550180340928512, '2022-04-17 12:38:15.212000', '2022-04-17 12:38:15.212000', 'LAYOUT', b'1', NULL, 'ion:grid-outline', '{\"title\": \"routes.dashboard.dashboard\", \"hideChildrenInMenu\": true}', 'Dashboard', '/dashboard', 0, '/dashboard/workbench', 1, '0', 'MENU', 'Dashboard');
+INSERT INTO `sys_permission` VALUES (1515627442394370048, '2022-04-17 17:45:15.941000', '2022-04-17 17:45:15.941000', '/dashboard/workbench/index', b'1', b'1', NULL, '{\"title\": \"routes.dashboard.workbench\", \"hideBreadcrumb\": true, \"currentActiveMenu\": \"/dashboard\", \"hideChildrenInMenu\": true}', 'Workbench', 'workbench', 1515550180340928512, NULL, 1, '0.1515550180340928512', 'MENU', 'Workbench');
+INSERT INTO `sys_permission` VALUES (1515627944716800000, '2022-04-17 17:47:15.683000', '2022-04-17 17:47:15.683000', 'LAYOUT', b'1', NULL, 'simple-icons:about-dot-me', '{\"title\": \"routes.dashboard.about\", \"hideChildrenInMenu\": true}', 'About', '/about', 0, '/about/index', 100000, '0', 'MENU', 'About');
+INSERT INTO `sys_permission` VALUES (1515628470086930432, '2022-04-17 17:49:20.941000', '2022-04-17 17:49:20.942000', '/sys/about/index', b'1', NULL, 'simple-icons:about-dot-me', '{\"title\": \"routes.dashboard.about\", \"hideMenu\": true}', 'AboutPage', 'index', 1515627944716800000, NULL, NULL, '0.1515627944716800000', 'MENU', 'AboutPage');
 
 -- ----------------------------
 -- Table structure for sys_role
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_role`;
 CREATE TABLE `sys_role`  (
-  `id` bigint NOT NULL,
-  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL,
+  `id` bigint NOT NULL COMMENT '主键',
+  `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间',
+  `name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '名称',
+  `uid` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '标识',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `UK_o928jdlxprqf5qyw6rvor4lse`(`uid`) USING BTREE,
   UNIQUE INDEX `UKo928jdlxprqf5qyw6rvor4lse`(`uid`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '系统角色' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_role
 -- ----------------------------
-INSERT INTO `sys_role` VALUES (1509083443323998208, '管理员', 'admin');
+INSERT INTO `sys_role` VALUES (1515628618854699008, '2022-04-17 17:49:56.420000', '2022-04-17 17:51:12.854000', '超级管理员', 'admin');
 
 -- ----------------------------
 -- Table structure for sys_role_permissions
@@ -86,29 +90,30 @@ CREATE TABLE `sys_role_permissions`  (
 -- ----------------------------
 -- Records of sys_role_permissions
 -- ----------------------------
-INSERT INTO `sys_role_permissions` VALUES (1509083443323998208, 1509081714683547648);
-INSERT INTO `sys_role_permissions` VALUES (1509083443323998208, 1509082383666647040);
-INSERT INTO `sys_role_permissions` VALUES (1509083443323998208, 1509082892188258304);
-INSERT INTO `sys_role_permissions` VALUES (1509083443323998208, 1509083350738931712);
+INSERT INTO `sys_role_permissions` VALUES (1515628618854699008, 1515550180340928512);
+INSERT INTO `sys_role_permissions` VALUES (1515628618854699008, 1515627442394370048);
+INSERT INTO `sys_role_permissions` VALUES (1515628618854699008, 1515627944716800000);
+INSERT INTO `sys_role_permissions` VALUES (1515628618854699008, 1515628470086930432);
 
 -- ----------------------------
 -- Table structure for sys_user
 -- ----------------------------
 DROP TABLE IF EXISTS `sys_user`;
 CREATE TABLE `sys_user`  (
-  `id` bigint NOT NULL,
-  `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `create_time` datetime NULL DEFAULT NULL,
-  `deleted` bit(1) NULL DEFAULT NULL,
-  `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `enabled` bit(1) NULL DEFAULT NULL,
-  `introduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `last_login_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `last_login_time` datetime NULL DEFAULT NULL,
-  `mobile` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `real_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
-  `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL,
+  `id` bigint NOT NULL COMMENT '主键',
+  `create_time` datetime(6) NULL DEFAULT NULL COMMENT '创建时间',
+  `update_time` datetime(6) NULL DEFAULT NULL COMMENT '最后修改时间',
+  `avatar` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '头像',
+  `deleted` bit(1) NULL DEFAULT NULL COMMENT '是否删除',
+  `email` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '邮箱',
+  `enabled` bit(1) NULL DEFAULT NULL COMMENT '是否启用',
+  `introduction` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '简介',
+  `last_login_ip` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最后登录IP地址',
+  `last_login_time` datetime(6) NULL DEFAULT NULL COMMENT '最后登录时间',
+  `mobile` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '手机号',
+  `password` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '密码',
+  `real_name` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '真实姓名',
+  `username` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '用户名',
   PRIMARY KEY (`id`) USING BTREE,
   UNIQUE INDEX `UK_ahtq5ew3v0kt1n7hf1sgp7p8l`(`email`) USING BTREE,
   UNIQUE INDEX `UK_cvv4commjv5h4bai0h4vuqvkd`(`mobile`) USING BTREE,
@@ -118,12 +123,12 @@ CREATE TABLE `sys_user`  (
   UNIQUE INDEX `UKahtq5ew3v0kt1n7hf1sgp7p8l`(`email`) USING BTREE,
   INDEX `IDXeyi36w6acltgl5j4ujw0wlsyt`(`enabled`) USING BTREE,
   INDEX `IDXner7sjf2kjerehlptwipdlst9`(`deleted`) USING BTREE
-) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = Dynamic;
+) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '系统用户' ROW_FORMAT = Dynamic;
 
 -- ----------------------------
 -- Records of sys_user
 -- ----------------------------
-INSERT INTO `sys_user` VALUES (1509080860341571584, 'https://s1.ax1x.com/2022/03/30/qggJH0.jpg', '2022-03-30 16:11:29', b'0', NULL, b'1', '平台管理员', '0:0:0:0:0:0:0:1', '2022-03-30 16:55:40', '13012345678', '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92', '管理员', 'admin');
+INSERT INTO `sys_user` VALUES (1515549486414303232, '2022-04-17 12:35:29.860000', '2022-04-17 17:55:47.785000', 'https://s1.ax1x.com/2022/03/30/qggJH0.jpg', b'0', NULL, b'1', '平台管理员', '0:0:0:0:0:0:0:1', '2022-04-17 17:55:47.784000', '13012345678', '8d969eef6ecad3c29a3a629280e686cf0c3f5d5a86aff3ca12020c923adc6c92', '管理员', 'admin');
 
 -- ----------------------------
 -- Table structure for sys_user_roles
@@ -141,6 +146,22 @@ CREATE TABLE `sys_user_roles`  (
 -- ----------------------------
 -- Records of sys_user_roles
 -- ----------------------------
-INSERT INTO `sys_user_roles` VALUES (1509080860341571584, 1509083443323998208);
+INSERT INTO `sys_user_roles` VALUES (1515549486414303232, 1515628618854699008);
+
+-- ----------------------------
+-- Table structure for test_table
+-- ----------------------------
+DROP TABLE IF EXISTS `test_table`;
+CREATE TABLE `test_table`  (
+  `id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NOT NULL COMMENT '主键',
+  `age` int NULL DEFAULT NULL COMMENT '年龄',
+  `name` varchar(255) 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;
+
+-- ----------------------------
+-- Records of test_table
+-- ----------------------------
+INSERT INTO `test_table` VALUES ('1', 18, 'yiring.com');
 
 SET FOREIGN_KEY_CHECKS = 1;

basic-common/core/build.gradle

 dependencies {
-//	implementation project(":basic-common:util")
-
 	implementation 'org.springframework.boot:spring-boot-starter-aop'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
+	// 本地依赖
+	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
+
 	// swagger annotations
 	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
-	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
 
 	implementation "cn.dev33:sa-token-dao-redis-jackson:${saTokenVersion}"
 
 	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
 
+	// JTS 几何对象操作库
+	implementation "org.locationtech.jts:jts-core:${jtsVersion}"
+
+	// https://mvnrepository.com/artifact/com.graphhopper.external/jackson-datatype-jts
+	implementation("com.graphhopper.external:jackson-datatype-jts:1.0-2.7") {
+		exclude group: 'com.fasterxml.jackson.core', module: 'jackson-databind'
+		exclude group: 'org.locationtech.jts', module: 'jts-core'
+	}
+
 }

basic-common/core/src/main/java/com/yiring/common/config/DateTimeConfig.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.common.config;
 
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateDeserializer;
 import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
@@ -28,8 +26,8 @@ import org.springframework.core.convert.converter.Converter;
 @Configuration
 public class DateTimeConfig {
 
-    @Bean(name = "mapperObject")
-    public ObjectMapper getObjectMapper() {
+    @Bean
+    public JavaTimeModule javaTimeModule() {
         JavaTimeModule timeModule = new JavaTimeModule();
         timeModule.addSerializer(LocalDateTime.class, new LocalDateTimeSerializer(DateFormatter.DATE_TIME));
         timeModule.addSerializer(LocalDate.class, new LocalDateSerializer(DateFormatter.DATE));
@@ -37,9 +35,7 @@ public class DateTimeConfig {
         timeModule.addDeserializer(LocalDateTime.class, new LocalDateTimeDeserializer(DateFormatter.DATE_TIME));
         timeModule.addDeserializer(LocalDate.class, new LocalDateDeserializer(DateFormatter.DATE));
         timeModule.addDeserializer(LocalTime.class, new LocalTimeDeserializer(DateFormatter.TIME));
-        // feat: add AdminServerModule
-        // .setSerializationInclusion(JsonInclude.Include.NON_NULL)
-        return new ObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL).registerModules(timeModule);
+        return timeModule;
     }
 
     @Bean

basic-common/core/src/main/java/com/yiring/common/config/EnvConfig.java

@@ -25,4 +25,12 @@ public class EnvConfig {
      * host，用来共享一些资源（如：数据库、文件存储等相关的依赖源）
      */
     String host;
+    /**
+     * 国标平台账号
+     */
+    String gbUsername;
+    /**
+     * 国标平台密码
+     */
+    String gbPassword;
 }

basic-common/core/src/main/java/com/yiring/common/config/JacksonConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.config;
+
+import com.bedatadriven.jackson.datatype.jts.JtsModule;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import javax.annotation.Resource;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
+
+/**
+ * Jackson Config
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/17 16:54
+ */
+
+@Order(Ordered.HIGHEST_PRECEDENCE)
+@Configuration
+public class JacksonConfig {
+
+    @Resource
+    JavaTimeModule javaTimeModule;
+
+    @Bean
+    public ObjectMapper objectMapper() {
+        ObjectMapper mapper = new ObjectMapper();
+        // 忽略空值
+        mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+        // Java 8 Date/Time support
+        mapper.registerModule(javaTimeModule);
+        // JTS Geometry support
+        mapper.registerModule(new JtsModule());
+        // feat: add AdminServerModule
+        return mapper;
+    }
+}

basic-common/core/src/main/java/com/yiring/common/core/redis/RedisCache.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.core.redis;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.BoundSetOperations;
-import org.springframework.data.redis.core.HashOperations;
-import org.springframework.data.redis.core.RedisTemplate;
-import org.springframework.data.redis.core.ValueOperations;
-import org.springframework.stereotype.Component;
-
-/**
- * redis缓存 工具类
- *
- * @author tzl
- * 2022/4/13 15:36
- */
-@Component
-public class RedisCache {
-
-    @Autowired
-    public RedisTemplate redisTemplate;
-
-    /**
-     * 缓存基本的对象，Integer、String、实体类等
-     *
-     * @param key   缓存的键值
-     * @param value 缓存的值
-     */
-    public <T> void setCacheObject(final String key, final T value) {
-        redisTemplate.opsForValue().set(key, value);
-    }
-
-    /**
-     * 缓存基本的对象，Integer、String、实体类等
-     *
-     * @param key      缓存的键值
-     * @param value    缓存的值
-     * @param timeout  时间
-     * @param timeUnit 时间颗粒度
-     */
-    public <T> void setCacheObject(final String key, final T value, final Integer timeout, final TimeUnit timeUnit) {
-        redisTemplate.opsForValue().set(key, value, timeout, timeUnit);
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key     Redis键
-     * @param timeout 超时时间
-     * @return true=设置成功；false=设置失败
-     */
-    public boolean expire(final String key, final long timeout) {
-        return expire(key, timeout, TimeUnit.SECONDS);
-    }
-
-    /**
-     * 设置有效时间
-     *
-     * @param key     Redis键
-     * @param timeout 超时时间
-     * @param unit    时间单位
-     * @return true=设置成功；false=设置失败
-     */
-    public boolean expire(final String key, final long timeout, final TimeUnit unit) {
-        return Boolean.TRUE.equals(redisTemplate.expire(key, timeout, unit));
-    }
-
-    /**
-     * 获得缓存的基本对象。
-     *
-     * @param key 缓存键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> T getCacheObject(final String key) {
-        ValueOperations<String, T> operation = redisTemplate.opsForValue();
-        return operation.get(key);
-    }
-
-    /**
-     * 删除单个对象
-     *
-     * @param key
-     */
-    public boolean deleteObject(final String key) {
-        return Boolean.TRUE.equals(redisTemplate.delete(key));
-    }
-
-    /**
-     * 删除集合对象
-     *
-     * @param collection 多个对象
-     * @return
-     */
-    public long deleteObject(final Collection collection) {
-        return redisTemplate.delete(collection);
-    }
-
-    /**
-     * 缓存List数据
-     *
-     * @param key      缓存的键值
-     * @param dataList 待缓存的List数据
-     * @return 缓存的对象
-     */
-    public <T> long setCacheList(final String key, final List<T> dataList) {
-        Long count = redisTemplate.opsForList().rightPushAll(key, dataList);
-        return count == null ? 0 : count;
-    }
-
-    /**
-     * 获得缓存的list对象
-     *
-     * @param key 缓存的键值
-     * @return 缓存键值对应的数据
-     */
-    public <T> List<T> getCacheList(final String key) {
-        return redisTemplate.opsForList().range(key, 0, -1);
-    }
-
-    /**
-     * 缓存Set
-     *
-     * @param key     缓存键值
-     * @param dataSet 缓存的数据
-     * @return 缓存数据的对象
-     */
-    public <T> BoundSetOperations<String, T> setCacheSet(final String key, final Set<T> dataSet) {
-        BoundSetOperations<String, T> setOperation = redisTemplate.boundSetOps(key);
-        for (T t : dataSet) {
-            setOperation.add(t);
-        }
-        return setOperation;
-    }
-
-    /**
-     * 获得缓存的set
-     *
-     * @param key String
-     * @return
-     */
-    public <T> Set<T> getCacheSet(final String key) {
-        return redisTemplate.opsForSet().members(key);
-    }
-
-    /**
-     * 缓存Map
-     *
-     * @param key
-     * @param dataMap
-     */
-    public <T> void setCacheMap(final String key, final Map<String, T> dataMap) {
-        if (dataMap != null) {
-            redisTemplate.opsForHash().putAll(key, dataMap);
-        }
-    }
-
-    /**
-     * 获得缓存的Map
-     *
-     * @param key
-     * @return
-     */
-    public <T> Map<String, T> getCacheMap(final String key) {
-        return redisTemplate.opsForHash().entries(key);
-    }
-
-    /**
-     * 往Hash中存入数据
-     *
-     * @param key   Redis键
-     * @param hKey  Hash键
-     * @param value 值
-     */
-    public <T> void setCacheMapValue(final String key, final String hKey, final T value) {
-        redisTemplate.opsForHash().put(key, hKey, value);
-    }
-
-    /**
-     * 获取Hash中的数据
-     *
-     * @param key  Redis键
-     * @param hKey Hash键
-     * @return Hash中的对象
-     */
-    public <T> T getCacheMapValue(final String key, final String hKey) {
-        HashOperations<String, String, T> opsForHash = redisTemplate.opsForHash();
-        return opsForHash.get(key, hKey);
-    }
-
-    /**
-     * 删除Hash中的数据
-     *
-     * @param key
-     * @param hKey
-     */
-    public void delCacheMapValue(final String key, final String hKey) {
-        HashOperations hashOperations = redisTemplate.opsForHash();
-        hashOperations.delete(key, hKey);
-    }
-
-    /**
-     * 获取多个Hash中的数据
-     *
-     * @param key   Redis键
-     * @param hKeys Hash键集合
-     * @return Hash对象集合
-     */
-    public <T> List<T> getMultiCacheMapValue(final String key, final Collection<Object> hKeys) {
-        return redisTemplate.opsForHash().multiGet(key, hKeys);
-    }
-
-    /**
-     * 获得缓存的基本对象列表
-     *
-     * @param pattern 字符串前缀
-     * @return 对象列表
-     */
-    public Collection<String> keys(final String pattern) {
-        return redisTemplate.keys(pattern);
-    }
-}

basic-common/core/src/main/java/com/yiring/common/dict/Dict.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.common.dict;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import javax.persistence.Table;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 
@@ -33,6 +34,9 @@ import org.hibernate.snowflake.SnowflakeId;
 @Comment("字典")
 public class Dict implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = 2124350188949761567L;
+
     @Id
     @Comment("主键id")
     @GeneratedValue(generator = SnowflakeId.GENERATOR)

basic-common/core/src/main/java/com/yiring/common/dict/DictType.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.common.dict;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.persistence.Entity;
@@ -10,7 +11,7 @@ import javax.persistence.Table;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
-import org.hibernate.annotaions.Comment;
+import org.hibernate.annotations.Comment;
 import org.hibernate.annotations.GenericGenerator;
 import org.hibernate.snowflake.SnowflakeId;
 
@@ -31,6 +32,9 @@ import org.hibernate.snowflake.SnowflakeId;
 @Comment("字典类型")
 public class DictType implements Serializable {
 
+    @Serial
+    private static final long serialVersionUID = -6302980159147541047L;
+
     @Id
     @Comment("主键id")
     @GeneratedValue(generator = SnowflakeId.GENERATOR)

basic-common/core/src/main/java/com/yiring/common/domain/BasicEntity.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.domain;
+
+import java.time.LocalDateTime;
+import java.util.Objects;
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.MappedSuperclass;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
+import org.hibernate.Hibernate;
+import org.hibernate.annotations.Comment;
+import org.hibernate.annotations.CreationTimestamp;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.annotations.UpdateTimestamp;
+import org.hibernate.snowflake.SnowflakeId;
+
+/**
+ * 基础表抽象类
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/17 12:11
+ */
+
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@SuperBuilder(toBuilder = true)
+@MappedSuperclass
+public abstract class BasicEntity {
+
+    @Comment("主键")
+    @Id
+    @GeneratedValue(generator = SnowflakeId.GENERATOR)
+    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
+    Long id;
+
+    @Comment("创建时间")
+    @Column(nullable = false)
+    @CreationTimestamp
+    LocalDateTime createTime;
+
+    @Comment("最后修改时间")
+    @Column(nullable = false)
+    @UpdateTimestamp
+    LocalDateTime updateTime;
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
+        BasicEntity that = (BasicEntity) o;
+        return id != null && Objects.equals(id, that.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return getClass().hashCode();
+    }
+}

basic-common/core/src/main/java/com/yiring/common/exception/FailStatusException.java

@@ -2,6 +2,7 @@
 package com.yiring.common.exception;
 
 import com.yiring.common.core.Status;
+import java.io.Serial;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class FailStatusException extends RuntimeException {
 
+    @Serial
     private static final long serialVersionUID = -4226669531686389671L;
 
     /**

basic-common/core/src/main/java/com/yiring/common/param/IdParam.java

@@ -3,6 +3,7 @@ package com.yiring.common.param;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
@@ -25,6 +26,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class IdParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -8690942241103456893L;
 
     @ApiModelProperty(value = "id", example = "1", required = true)

basic-common/core/src/main/java/com/yiring/common/param/PageParam.java

@@ -3,6 +3,7 @@ package com.yiring.common.param;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.util.Objects;
 import javax.validation.constraints.DecimalMin;
@@ -32,6 +33,7 @@ import org.springframework.data.domain.Sort;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PageParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 6103761701912769946L;
 
     @ApiModelProperty(value = "分页条数", example = "10", required = true)

basic-common/core/src/main/java/com/yiring/common/vo/DataVo.java

@@ -3,6 +3,7 @@ package com.yiring.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class DataVo<T extends Serializable> implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 2472779197432240431L;
 
     @ApiModelProperty(value = "数据")

basic-common/core/src/main/java/com/yiring/common/vo/KeyValueVo.java

@@ -3,6 +3,7 @@ package com.yiring.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class KeyValueVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5238793972067296346L;
 
     @ApiModelProperty(value = "key", example = "key")

basic-common/core/src/main/java/com/yiring/common/vo/PageVo.java

@@ -3,6 +3,7 @@ package com.yiring.common.vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PageVo<T extends Serializable> implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 6103761701912769946L;
 
     @ApiModelProperty(value = "数据")

basic-common/doc/build.gradle

@@ -2,9 +2,12 @@ dependencies {
 	implementation project(":basic-common:core")
 
 	implementation 'org.springframework.boot:spring-boot-starter-web'
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
 	// swagger(knife4j)
 	implementation "com.github.xiaoymin:knife4j-spring-boot-starter:${knife4jVersion}"
-	implementation "org.hibernate.validator:hibernate-validator:${hibernateValidatorVersion}"
+
+	// hutool-core
+	implementation "cn.hutool:hutool-core:${hutoolVersion}"
 
 }

basic-common/doc/src/main/java/com/yiring/common/swagger/SwaggerConfig.java

 /* (C) 2021 YiRing, Inc. */
 package com.yiring.common.swagger;
 
+import cn.hutool.core.lang.Console;
+import cn.hutool.core.net.NetUtil;
 import com.github.xiaoymin.knife4j.spring.extension.OpenApiExtensionResolver;
 import com.yiring.common.core.Status;
 import io.swagger.annotations.Api;
@@ -11,6 +13,7 @@ import java.util.stream.Collectors;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.CommandLineRunner;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
@@ -41,7 +44,7 @@ import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 @EnableSwagger2WebMvc
 @Configuration
 @Import(BeanValidatorPluginsConfiguration.class)
-public class SwaggerConfig {
+public class SwaggerConfig implements CommandLineRunner {
 
     @Value("${spring.application.name}")
     String applicationName;
@@ -61,8 +64,6 @@ public class SwaggerConfig {
     }
 
     private Docket api(Predicate<String> paths) {
-        log.info("API Doc: http://localhost:{}{}/doc.html", port, path);
-
         String group = "default";
         return new Docket(DocumentationType.SWAGGER_2)
             .groupName(group)
@@ -99,4 +100,14 @@ public class SwaggerConfig {
             .map(status -> new ResponseMessageBuilder().code(status.value()).message(status.getReasonPhrase()).build())
             .collect(Collectors.toList());
     }
+
+    @Override
+    public void run(String... args) {
+        String link = NetUtil
+            .localIpv4s()
+            .stream()
+            .map(host -> "> http://" + host + ":" + port + path + "/doc.html")
+            .collect(Collectors.joining("\n\t\t"));
+        Console.log("\n\t📖 API Doc (Swagger2): \n\t\t{}\n", link);
+    }
 }

basic-common/redis/build.gradle

+dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+
+	// jackson-databind ( io.spring.dependency-management )
+	implementation "com.fasterxml.jackson.core:jackson-databind"
+
+	// hutool-crypto
+	implementation "cn.hutool:hutool-crypto:${hutoolVersion}"
+
+}

basic-common/redis/src/main/java/com/yiring/common/config/CacheKeyGenerator.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.config;
+
+import cn.hutool.crypto.digest.DigestUtil;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import lombok.NonNull;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.cache.interceptor.KeyGenerator;
+import org.springframework.stereotype.Component;
+
+/**
+ * Cache KeyGenerator
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/19 15:36
+ */
+
+@Slf4j
+@Component
+public class CacheKeyGenerator implements KeyGenerator {
+
+    @Override
+    @NonNull
+    public Object generate(Object target, Method method, Object... params) {
+        int len = params.length;
+
+        Map<String, Object> map = new HashMap<>(2 + len);
+        map.put("target", target.getClass().toGenericString());
+        map.put("method", method.getName());
+        for (int i = 0; i < len; i++) {
+            map.put("params-" + i, Objects.toString(params[i]));
+        }
+
+        return DigestUtil.sha256(map.toString());
+    }
+}

basic-common/redis/src/main/java/com/yiring/common/config/RedisConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.time.Duration;
+import javax.annotation.Resource;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.cache.RedisCacheConfiguration;
+import org.springframework.data.redis.cache.RedisCacheManager;
+import org.springframework.data.redis.connection.RedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.RedisSerializationContext;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+/**
+ * Redis Config
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/19 15:27
+ */
+
+@EnableCaching
+@Configuration
+public class RedisConfig {
+
+    @Resource
+    ObjectMapper objectMapper;
+
+    @Bean
+    public RedisTemplate<String, Object> redisTemplate(RedisConnectionFactory factory) {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        StringRedisSerializer stringRedisSerializer = new StringRedisSerializer();
+        redisTemplate.setKeySerializer(stringRedisSerializer);
+        redisTemplate.setHashKeySerializer(stringRedisSerializer);
+        redisTemplate.setDefaultSerializer(new GenericJackson2JsonRedisSerializer(objectMapper));
+        redisTemplate.setEnableTransactionSupport(false);
+        redisTemplate.setConnectionFactory(factory);
+        redisTemplate.afterPropertiesSet();
+        return redisTemplate;
+    }
+
+    @Bean
+    public RedisCacheManager cacheManager(RedisConnectionFactory connectionFactory) {
+        RedisCacheConfiguration config = RedisCacheConfiguration
+            .defaultCacheConfig()
+            .entryTtl(Duration.ofMinutes(5))
+            .serializeKeysWith(RedisSerializationContext.SerializationPair.fromSerializer(new StringRedisSerializer()))
+            .serializeValuesWith(
+                RedisSerializationContext.SerializationPair.fromSerializer(new GenericJackson2JsonRedisSerializer())
+            )
+            .disableCachingNullValues();
+
+        return RedisCacheManager.builder(connectionFactory).cacheDefaults(config).transactionAware().build();
+    }
+}

basic-common/redis/src/main/java/com/yiring/common/core/Redis.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.core;
+
+import java.util.*;
+import java.util.concurrent.TimeUnit;
+import javax.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.stereotype.Component;
+
+/**
+ * Redis Component
+ *
+ * @author fangzhimin
+ * 2018/8/15 17:32
+ */
+
+@SuppressWarnings({ "unused" })
+@Slf4j
+@Component
+public final class Redis {
+
+    @Resource
+    RedisTemplate<String, Object> redisTemplate;
+
+    /**
+     * 指定缓存失效时间
+     *
+     * @param key  键
+     * @param time 时间(秒)
+     */
+    public void expire(String key, long time) {
+        if (time > 0) {
+            redisTemplate.expire(key, time, TimeUnit.SECONDS);
+        }
+    }
+
+    /**
+     * 根据key 获取过期时间
+     *
+     * @param key 键 不能为null
+     * @return 时间(秒) 返回0代表为永久有效
+     */
+    public Long getExpire(String key) {
+        return redisTemplate.getExpire(key, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 判断key是否存在
+     *
+     * @param key 键
+     * @return true 存在 false不存在
+     */
+    public Boolean hasKey(String key) {
+        return redisTemplate.hasKey(key);
+    }
+
+    /**
+     * 删除缓存
+     *
+     * @param key 可以传一个值 或多个
+     */
+    public void del(String... key) {
+        if (key != null && key.length > 0) {
+            if (key.length == 1) {
+                redisTemplate.delete(key[0]);
+            } else {
+                redisTemplate.delete(Arrays.asList(key));
+            }
+        }
+    }
+
+    /**
+     * 普通缓存获取
+     *
+     * @param key 键
+     * @return 值
+     */
+    public Object get(String key) {
+        return key == null ? null : redisTemplate.opsForValue().get(key);
+    }
+
+    /**
+     * 普通缓存获取
+     *
+     * @param key 键
+     * @return 值
+     */
+    public String getString(String key) {
+        if (key == null) {
+            return null;
+        }
+
+        Object value = redisTemplate.opsForValue().get(key);
+        return value == null ? null : String.valueOf(value);
+    }
+
+    /**
+     * 普通缓存放入
+     *
+     * @param key   键
+     * @param value 值
+     */
+    public void set(String key, Object value) {
+        redisTemplate.opsForValue().set(key, value);
+    }
+
+    /**
+     * 普通缓存放入并设置时间
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒) time要大于0 如果time小于等于0 将设置无限期
+     */
+    public void set(String key, Object value, long time) {
+        if (time > 0) {
+            redisTemplate.opsForValue().set(key, value, time, TimeUnit.SECONDS);
+        } else {
+            set(key, value);
+        }
+    }
+
+    /**
+     * 递增
+     *
+     * @param key   键
+     * @param delta 要增加几(大于0)
+     * @return 结果
+     */
+    public Long incr(String key, long delta) {
+        return redisTemplate.opsForValue().increment(key, delta);
+    }
+
+    /**
+     * 递减
+     *
+     * @param key   键
+     * @param delta 要减少几(小于0)
+     * @return 结果
+     */
+    public Long decr(String key, long delta) {
+        return redisTemplate.opsForValue().increment(key, -delta);
+    }
+
+    /**
+     * HashGet
+     *
+     * @param key  键 不能为null
+     * @param item 项 不能为null
+     * @return 值
+     */
+    public Object hget(String key, String item) {
+        return redisTemplate.opsForHash().get(key, item);
+    }
+
+    /**
+     * 获取hashKey对应的所有键值
+     *
+     * @param key 键
+     * @return 对应的多个键值
+     */
+    public Map<Object, Object> hmget(String key) {
+        return redisTemplate.opsForHash().entries(key);
+    }
+
+    /**
+     * HashSet
+     *
+     * @param key 键
+     * @param map 对应多个键值
+     */
+    public void hmset(String key, Map<String, Object> map) {
+        redisTemplate.opsForHash().putAll(key, map);
+    }
+
+    /**
+     * HashSet 并设置时间
+     *
+     * @param key  键
+     * @param map  对应多个键值
+     * @param time 时间(秒)
+     */
+    public void hmset(String key, Map<String, Object> map, long time) {
+        redisTemplate.opsForHash().putAll(key, map);
+        if (time > 0) {
+            expire(key, time);
+        }
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     *
+     * @param key   键
+     * @param item  项
+     * @param value 值
+     */
+    public void hset(String key, String item, Object value) {
+        redisTemplate.opsForHash().put(key, item, value);
+    }
+
+    /**
+     * 向一张hash表中放入数据,如果不存在将创建
+     *
+     * @param key   键
+     * @param item  项
+     * @param value 值
+     * @param time  时间(秒) 注意:如果已存在的hash表有时间,这里将会替换原有的时间
+     */
+    public void hset(String key, String item, Object value, long time) {
+        redisTemplate.opsForHash().put(key, item, value);
+        if (time > 0) {
+            expire(key, time);
+        }
+    }
+
+    /**
+     * 删除hash表中的值
+     *
+     * @param key  键 不能为null
+     * @param item 项 可以使多个 不能为null
+     */
+    public void hdel(String key, Object... item) {
+        redisTemplate.opsForHash().delete(key, item);
+    }
+
+    /**
+     * 判断hash表中是否有该项的值
+     *
+     * @param key  键 不能为null
+     * @param item 项 不能为null
+     * @return true 存在 false不存在
+     */
+    public boolean hHasKey(String key, String item) {
+        return redisTemplate.opsForHash().hasKey(key, item);
+    }
+
+    /**
+     * hash递增 如果不存在,就会创建一个 并把新增后的值返回
+     *
+     * @param key  键
+     * @param item 项
+     * @param by   要增加几(大于0)
+     * @return 结果
+     */
+    public double hincr(String key, String item, double by) {
+        return redisTemplate.opsForHash().increment(key, item, by);
+    }
+
+    /**
+     * hash递减
+     *
+     * @param key  键
+     * @param item 项
+     * @param by   要减少记(小于0)
+     * @return 结果
+     */
+    public double hdecr(String key, String item, double by) {
+        return redisTemplate.opsForHash().increment(key, item, -by);
+    }
+
+    /**
+     * 根据key获取Set中的所有值
+     *
+     * @param key 键
+     * @return 结果
+     */
+    public Set<Object> smembers(String key) {
+        return redisTemplate.opsForSet().members(key);
+    }
+
+    /**
+     * 根据value从一个set中查询,是否存在
+     *
+     * @param key   键
+     * @param value 值
+     * @return true 存在 false不存在
+     */
+    public Boolean sismember(String key, Object value) {
+        return redisTemplate.opsForSet().isMember(key, value);
+    }
+
+    /**
+     * 将数据放入set缓存
+     *
+     * @param key    键
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public Long sadd(String key, Object... values) {
+        return redisTemplate.opsForSet().add(key, values);
+    }
+
+    /**
+     * 将set数据放入缓存
+     *
+     * @param key    键
+     * @param time   时间(秒)
+     * @param values 值 可以是多个
+     * @return 成功个数
+     */
+    public Long sadd(String key, long time, Object... values) {
+        Long count = redisTemplate.opsForSet().add(key, values);
+        if (time > 0) {
+            expire(key, time);
+        }
+        return count;
+    }
+
+    /**
+     * 获取set缓存的长度
+     *
+     * @param key 键
+     * @return set缓存的长度
+     */
+    public Long scard(String key) {
+        return redisTemplate.opsForSet().size(key);
+    }
+
+    /**
+     * 移除值为value的
+     *
+     * @param key    键
+     * @param values 值 可以是多个
+     * @return 移除的个数
+     */
+    public Long srem(String key, Object... values) {
+        return redisTemplate.opsForSet().remove(key, values);
+    }
+
+    /**
+     * 获取list缓存的内容
+     *
+     * @param key   键
+     * @param start 开始
+     * @param end   结束 0 到 -1代表所有值
+     */
+    public List<Object> lrange(String key, long start, long end) {
+        return redisTemplate.opsForList().range(key, start, end);
+    }
+
+    /**
+     * 获取list缓存的长度
+     *
+     * @param key 键
+     * @return size
+     */
+    public Long llen(String key) {
+        return redisTemplate.opsForList().size(key);
+    }
+
+    /**
+     * 通过索引 获取list中的值
+     *
+     * @param key   键
+     * @param index 索引 index>=0时， 0 表头，1 第二个元素，依次类推；index<0时，-1，表尾，-2倒数第二个元素，依次类推
+     * @return 结果
+     */
+    public Object lindex(String key, long index) {
+        return redisTemplate.opsForList().index(key, index);
+    }
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     */
+    public void rpush(String key, Object value) {
+        redisTemplate.opsForList().rightPush(key, value);
+    }
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒)
+     */
+    public void rpush(String key, Object value, long time) {
+        redisTemplate.opsForList().rightPush(key, value);
+        if (time > 0) {
+            expire(key, time);
+        }
+    }
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     */
+    public void rpush(String key, List<Object> value) {
+        redisTemplate.opsForList().rightPushAll(key, value);
+    }
+
+    /**
+     * 将list放入缓存
+     *
+     * @param key   键
+     * @param value 值
+     * @param time  时间(秒)
+     */
+    public void rpush(String key, List<Object> value, long time) {
+        redisTemplate.opsForList().rightPushAll(key, value);
+        if (time > 0) {
+            expire(key, time);
+        }
+    }
+
+    /**
+     * 根据索引修改list中的某条数据
+     *
+     * @param key   键
+     * @param index 索引
+     * @param value 值
+     */
+    public void lset(String key, long index, Object value) {
+        redisTemplate.opsForList().set(key, index, value);
+    }
+
+    /**
+     * 移除N个值为value
+     *
+     * @param key   键
+     * @param count 移除多少个
+     * @param value 值
+     * @return 移除的个数
+     */
+    public Long lrem(String key, long count, Object value) {
+        return redisTemplate.opsForList().remove(key, count, value);
+    }
+
+    /**
+     * 获取当前 Hash Key 有多少个值
+     *
+     * @param key key
+     * @return Long
+     */
+    public Long hsize(String key) {
+        return redisTemplate.opsForHash().size(key);
+    }
+
+    /**
+     * 获取所有 key
+     * @param pattern 查询规则
+     * @return 所有匹配的 Key 集合
+     */
+    public Set<String> keys(String pattern) {
+        return redisTemplate.keys(pattern);
+    }
+
+    /**
+     * 返回最新的redis状态信息
+     *
+     * @return 信息
+     */
+    public String info() {
+        return redisTemplate.execute(connection -> Objects.requireNonNull(connection.info()).toString(), false);
+    }
+}

basic-common/redis/src/main/java/com/yiring/common/package-info.java

+/**
+ * @author Jim
+ * @version 0.1
+ * 2022/3/26 10:36
+ */
+package com.yiring.common;

basic-common/util/build.gradle

 dependencies {
 	implementation project(":basic-common:core")
+	implementation project(":basic-common:redis")
+
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-aop'
 	// hutool-extra

basic-common/util/src/main/java/com/yiring/common/annotation/Excel.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.annotation;
-
-import com.yiring.common.util.poi.ExcelHandlerAdapter;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-import java.math.BigDecimal;
-
-/**
- * 自定义导出Excel数据注解
- *
-
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.FIELD)
-public @interface Excel {
-    /**
-     * 导出时在excel中排序
-     */
-    int sort() default Integer.MAX_VALUE;
-
-    /**
-     * 导出到Excel中的名字.
-     */
-    String name() default "";
-
-    /**
-     * 日期格式, 如: yyyy-MM-dd
-     */
-    String dateFormat() default "";
-
-    /**
-     * 如果是字典类型，请设置字典的type值 (如: user_sex)
-     */
-    String dictType() default "";
-
-    /**
-     * 读取内容转表达式 (如: 0=男,1=女,2=未知)
-     */
-    String readConverterExp() default "";
-
-    /**
-     * 分隔符，读取字符串组内容
-     */
-    String separator() default ",";
-
-    /**
-     * BigDecimal 精度 默认:-1(默认不开启BigDecimal格式化)
-     */
-    int scale() default -1;
-
-    /**
-     * BigDecimal 舍入规则 默认:BigDecimal.ROUND_HALF_EVEN
-     */
-    int roundingMode() default BigDecimal.ROUND_HALF_EVEN;
-
-    /**
-     * 导出类型（0数字 1字符串）
-     */
-    ColumnType cellType() default ColumnType.STRING;
-
-    /**
-     * 导出时在excel中每个列的高度 单位为字符
-     */
-    double height() default 14;
-
-    /**
-     * 导出时在excel中每个列的宽 单位为字符
-     */
-    double width() default 16;
-
-    /**
-     * 文字后缀,如% 90 变成90%
-     */
-    String suffix() default "";
-
-    /**
-     * 当值为空时,字段的默认值
-     */
-    String defaultValue() default "";
-
-    /**
-     * 提示信息
-     */
-    String prompt() default "";
-
-    /**
-     * 设置只能选择不能输入的列内容.
-     */
-    String[] combo() default {};
-
-    /**
-     * 是否导出数据,应对需求:有时我们需要导出一份模板,这是标题需要但内容需要用户手工填写.
-     */
-    boolean isExport() default true;
-
-    /**
-     * 另一个类中的属性名称,支持多级获取,以小数点隔开
-     */
-    String targetAttr() default "";
-
-    /**
-     * 是否自动统计数据,在最后追加一行统计数据总和
-     */
-    boolean isStatistics() default false;
-
-    /**
-     * 导出字段对齐方式（0：默认；1：靠左；2：居中；3：靠右）
-     */
-    Align align() default Align.AUTO;
-
-    /**
-     * 自定义数据处理器
-     */
-    Class<?> handler() default ExcelHandlerAdapter.class;
-
-    /**
-     * 自定义数据处理器参数
-     */
-    String[] args() default {};
-
-    enum Align {
-        AUTO(0),
-        LEFT(1),
-        CENTER(2),
-        RIGHT(3);
-
-        private final int value;
-
-        Align(int value) {
-            this.value = value;
-        }
-
-        public int value() {
-            return this.value;
-        }
-    }
-
-    /**
-     * 字段类型（0：导出导入；1：仅导出；2：仅导入）
-     */
-    Type type() default Type.ALL;
-
-    enum Type {
-        ALL(0),
-        EXPORT(1),
-        IMPORT(2);
-
-        private final int value;
-
-        Type(int value) {
-            this.value = value;
-        }
-
-        int value() {
-            return this.value;
-        }
-    }
-
-    enum ColumnType {
-        NUMERIC(0),
-        STRING(1),
-        IMAGE(2);
-
-        private final int value;
-
-        ColumnType(int value) {
-            this.value = value;
-        }
-
-        int value() {
-            return this.value;
-        }
-    }
-}

basic-common/util/src/main/java/com/yiring/common/annotation/Excels.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Excel注解集
- */
-@Target(ElementType.FIELD)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Excels {
-    Excel[] value();
-}

basic-common/util/src/main/java/com/yiring/common/jackson/ObjectMappingSerializer.java

@@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.SerializerProvider;
 import com.fasterxml.jackson.databind.ser.ContextualSerializer;
 import com.fasterxml.jackson.databind.ser.std.StdSerializer;
 import java.io.IOException;
+import java.io.Serial;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Objects;
@@ -21,6 +22,7 @@ import java.util.Objects;
  */
 public class ObjectMappingSerializer extends StdSerializer<Object> implements ContextualSerializer {
 
+    @Serial
     private static final long serialVersionUID = -1924851196524453827L;
 
     protected ObjectMappingSerializer() {

basic-common/util/src/main/java/com/yiring/common/text/Convert.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.text;
-
-import com.yiring.common.util.StrUtils;
-import java.math.BigDecimal;
-import java.math.BigInteger;
-import java.nio.ByteBuffer;
-import java.nio.charset.Charset;
-import java.text.NumberFormat;
-import java.util.Set;
-
-/**
- * 类型转换器
- */
-public class Convert {
-
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为null，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static String toStr(Object value, String defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof String) {
-            return (String) value;
-        }
-        return value.toString();
-    }
-
-    /**
-     * 转换为字符串<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static String toStr(Object value) {
-        return toStr(value, null);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为null，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Character toChar(Object value, Character defaultValue) {
-        if (null == value) {
-            return defaultValue;
-        }
-        if (value instanceof Character) {
-            return (Character) value;
-        }
-
-        final String valueStr = toStr(value, null);
-        return StrUtils.isEmpty(valueStr) ? defaultValue : valueStr.charAt(0);
-    }
-
-    /**
-     * 转换为字符<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Character toChar(Object value) {
-        return toChar(value, null);
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Byte toByte(Object value, Byte defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Byte) {
-            return (Byte) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).byteValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Byte.parseByte(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为byte<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Byte toByte(Object value) {
-        return toByte(value, null);
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Short toShort(Object value, Short defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Short) {
-            return (Short) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).shortValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Short.parseShort(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Short<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Short toShort(Object value) {
-        return toShort(value, null);
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Number toNumber(Object value, Number defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Number) {
-            return (Number) value;
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return NumberFormat.getInstance().parse(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Number<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Number toNumber(Object value) {
-        return toNumber(value, null);
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Integer toInt(Object value, Integer defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Integer) {
-            return (Integer) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).intValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Integer.parseInt(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为int<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Integer toInt(Object value) {
-        return toInt(value, null);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static Integer[] toIntArray(String str) {
-        return toIntArray(",", str);
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static Long[] toLongArray(String str) {
-        return toLongArray(",", str);
-    }
-
-    /**
-     * 转换为Integer数组<br>
-     *
-     * @param split 分隔符
-     * @param split 被转换的值
-     * @return 结果
-     */
-    public static Integer[] toIntArray(String split, String str) {
-        if (StrUtils.isEmpty(str)) {
-            return new Integer[] {};
-        }
-        String[] arr = str.split(split);
-        final Integer[] ints = new Integer[arr.length];
-        for (int i = 0; i < arr.length; i++) {
-            final Integer v = toInt(arr[i], 0);
-            ints[i] = v;
-        }
-        return ints;
-    }
-
-    /**
-     * 转换为Long数组<br>
-     *
-     * @param split 分隔符
-     * @param str   被转换的值
-     * @return 结果
-     */
-    public static Long[] toLongArray(String split, String str) {
-        if (StrUtils.isEmpty(str)) {
-            return new Long[] {};
-        }
-        String[] arr = str.split(split);
-        final Long[] longs = new Long[arr.length];
-        for (int i = 0; i < arr.length; i++) {
-            final Long v = toLong(arr[i], null);
-            longs[i] = v;
-        }
-        return longs;
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param str 被转换的值
-     * @return 结果
-     */
-    public static String[] toStrArray(String str) {
-        return toStrArray(",", str);
-    }
-
-    /**
-     * 转换为String数组<br>
-     *
-     * @param split 分隔符
-     * @param split 被转换的值
-     * @return 结果
-     */
-    public static String[] toStrArray(String split, String str) {
-        return str.split(split);
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Long toLong(Object value, Long defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Long) {
-            return (Long) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).longValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).longValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为long<br>
-     * 如果给定的值为<code>null</code>，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Long toLong(Object value) {
-        return toLong(value, null);
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Double toDouble(Object value, Double defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Double) {
-            return (Double) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).doubleValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            // 支持科学计数法
-            return new BigDecimal(valueStr.trim()).doubleValue();
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为double<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Double toDouble(Object value) {
-        return toDouble(value, null);
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Float toFloat(Object value, Float defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Float) {
-            return (Float) value;
-        }
-        if (value instanceof Number) {
-            return ((Number) value).floatValue();
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Float.parseFloat(valueStr.trim());
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Float<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Float toFloat(Object value) {
-        return toFloat(value, null);
-    }
-
-    /**
-     * 转换为boolean<br>
-     * String支持的值为：true、false、yes、ok、no，1,0 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static Boolean toBool(Object value, Boolean defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof Boolean) {
-            return (Boolean) value;
-        }
-        String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        valueStr = valueStr.trim().toLowerCase();
-        switch (valueStr) {
-            case "true":
-                return true;
-            case "false":
-                return false;
-            case "yes":
-                return true;
-            case "ok":
-                return true;
-            case "no":
-                return false;
-            case "1":
-                return true;
-            case "0":
-                return false;
-            default:
-                return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为boolean<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static Boolean toBool(Object value) {
-        return toBool(value, null);
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     *
-     * @param clazz        Enum的Class
-     * @param value        值
-     * @param defaultValue 默认值
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value, E defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (clazz.isAssignableFrom(value.getClass())) {
-            @SuppressWarnings("unchecked")
-            E myE = (E) value;
-            return myE;
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return Enum.valueOf(clazz, valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为Enum对象<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     *
-     * @param clazz Enum的Class
-     * @param value 值
-     * @return Enum
-     */
-    public static <E extends Enum<E>> E toEnum(Class<E> clazz, Object value) {
-        return toEnum(clazz, value, null);
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static BigInteger toBigInteger(Object value, BigInteger defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigInteger) {
-            return (BigInteger) value;
-        }
-        if (value instanceof Long) {
-            return BigInteger.valueOf((Long) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigInteger(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigInteger<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<code>null</code><br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static BigInteger toBigInteger(Object value) {
-        return toBigInteger(value, null);
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value        被转换的值
-     * @param defaultValue 转换错误时的默认值
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal(Object value, BigDecimal defaultValue) {
-        if (value == null) {
-            return defaultValue;
-        }
-        if (value instanceof BigDecimal) {
-            return (BigDecimal) value;
-        }
-        if (value instanceof Long) {
-            return new BigDecimal((Long) value);
-        }
-        if (value instanceof Double) {
-            return new BigDecimal((Double) value);
-        }
-        if (value instanceof Integer) {
-            return new BigDecimal((Integer) value);
-        }
-        final String valueStr = toStr(value, null);
-        if (StrUtils.isEmpty(valueStr)) {
-            return defaultValue;
-        }
-        try {
-            return new BigDecimal(valueStr);
-        } catch (Exception e) {
-            return defaultValue;
-        }
-    }
-
-    /**
-     * 转换为BigDecimal<br>
-     * 如果给定的值为空，或者转换失败，返回默认值<br>
-     * 转换失败不会报错
-     *
-     * @param value 被转换的值
-     * @return 结果
-     */
-    public static BigDecimal toBigDecimal(Object value) {
-        return toBigDecimal(value, null);
-    }
-
-    //    /**
-    //     * 将对象转为字符串<br>
-    //     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-    //     *
-    //     * @param obj 对象
-    //     * @return 字符串
-    //     */
-    //    public static String utf8Str(Object obj)
-    //    {
-    //        return str(obj, CharsetKit.CHARSET_UTF_8);
-    //    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj         对象
-     * @param charsetName 字符集
-     * @return 字符串
-     */
-    public static String str(Object obj, String charsetName) {
-        return str(obj, Charset.forName(charsetName));
-    }
-
-    /**
-     * 将对象转为字符串<br>
-     * 1、Byte数组和ByteBuffer会被转换为对应字符串的数组 2、对象数组会调用Arrays.toString方法
-     *
-     * @param obj     对象
-     * @param charset 字符集
-     * @return 字符串
-     */
-    public static String str(Object obj, Charset charset) {
-        if (null == obj) {
-            return null;
-        }
-
-        if (obj instanceof String) {
-            return (String) obj;
-        } else if (obj instanceof byte[] || obj instanceof Byte[]) {
-            if (obj instanceof byte[]) {
-                return str((byte[]) obj, charset);
-            } else {
-                Byte[] bytes = (Byte[]) obj;
-                int length = bytes.length;
-                byte[] dest = new byte[length];
-                for (int i = 0; i < length; i++) {
-                    dest[i] = bytes[i];
-                }
-                return str(dest, charset);
-            }
-        } else if (obj instanceof ByteBuffer) {
-            return str((ByteBuffer) obj, charset);
-        }
-        return obj.toString();
-    }
-
-    /**
-     * 将byte数组转为字符串
-     *
-     * @param bytes   byte数组
-     * @param charset 字符集
-     * @return 字符串
-     */
-    public static String str(byte[] bytes, String charset) {
-        return str(bytes, StrUtils.isEmpty(charset) ? Charset.defaultCharset() : Charset.forName(charset));
-    }
-
-    /**
-     * 解码字节码
-     *
-     * @param data    字符串
-     * @param charset 字符集，如果此字段为空，则解码的结果取决于平台
-     * @return 解码后的字符串
-     */
-    public static String str(byte[] data, Charset charset) {
-        if (data == null) {
-            return null;
-        }
-
-        if (null == charset) {
-            return new String(data);
-        }
-        return new String(data, charset);
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集，如果为空使用当前系统字符集
-     * @return 字符串
-     */
-    public static String str(ByteBuffer data, String charset) {
-        if (data == null) {
-            return null;
-        }
-
-        return str(data, Charset.forName(charset));
-    }
-
-    /**
-     * 将编码的byteBuffer数据转换为字符串
-     *
-     * @param data    数据
-     * @param charset 字符集，如果为空使用当前系统字符集
-     * @return 字符串
-     */
-    public static String str(ByteBuffer data, Charset charset) {
-        if (null == charset) {
-            charset = Charset.defaultCharset();
-        }
-        return charset.decode(data).toString();
-    }
-
-    // ----------------------------------------------------------------------- 全角半角转换
-
-    /**
-     * 半角转全角
-     *
-     * @param input String.
-     * @return 全角字符串.
-     */
-    public static String toSBC(String input) {
-        return toSBC(input, null);
-    }
-
-    /**
-     * 半角转全角
-     *
-     * @param input         String
-     * @param notConvertSet 不替换的字符集合
-     * @return 全角字符串.
-     */
-    public static String toSBC(String input, Set<Character> notConvertSet) {
-        char c[] = input.toCharArray();
-        for (int i = 0; i < c.length; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == ' ') {
-                c[i] = '\u3000';
-            } else if (c[i] < '\177') {
-                c[i] = (char) (c[i] + 65248);
-            }
-        }
-        return new String(c);
-    }
-
-    /**
-     * 全角转半角
-     *
-     * @param input String.
-     * @return 半角字符串
-     */
-    public static String toDBC(String input) {
-        return toDBC(input, null);
-    }
-
-    /**
-     * 替换全角为半角
-     *
-     * @param text          文本
-     * @param notConvertSet 不替换的字符集合
-     * @return 替换后的字符
-     */
-    public static String toDBC(String text, Set<Character> notConvertSet) {
-        char c[] = text.toCharArray();
-        for (int i = 0; i < c.length; i++) {
-            if (null != notConvertSet && notConvertSet.contains(c[i])) {
-                // 跳过不替换的字符
-                continue;
-            }
-
-            if (c[i] == '\u3000') {
-                c[i] = ' ';
-            } else if (c[i] > '\uFF00' && c[i] < '\uFF5F') {
-                c[i] = (char) (c[i] - 65248);
-            }
-        }
-        String returnString = new String(c);
-
-        return returnString;
-    }
-
-    /**
-     * 数字金额大写转换 先写个完整的然后将如零拾替换成零
-     *
-     * @param n 数字
-     * @return 中文大写数字
-     */
-    public static String digitUppercase(double n) {
-        String[] fraction = { "角", "分" };
-        String[] digit = { "零", "壹", "贰", "叁", "肆", "伍", "陆", "柒", "捌", "玖" };
-        String[][] unit = { { "元", "万", "亿" }, { "", "拾", "佰", "仟" } };
-
-        String head = n < 0 ? "负" : "";
-        n = Math.abs(n);
-
-        String s = "";
-        for (int i = 0; i < fraction.length; i++) {
-            s += (digit[(int) (Math.floor(n * 10 * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "");
-        }
-        if (s.length() < 1) {
-            s = "整";
-        }
-        int integerPart = (int) Math.floor(n);
-
-        for (int i = 0; i < unit[0].length && integerPart > 0; i++) {
-            String p = "";
-            for (int j = 0; j < unit[1].length && n > 0; j++) {
-                p = digit[integerPart % 10] + unit[1][j] + p;
-                integerPart = integerPart / 10;
-            }
-            s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s;
-        }
-        return (
-            head +
-            s
-                .replaceAll("(零.)*零元", "元")
-                .replaceFirst("(零.)+", "")
-                .replaceAll("(零.)+", "零")
-                .replaceAll("^整$", "零元整")
-        );
-    }
-}

basic-common/util/src/main/java/com/yiring/common/util/DictUtils.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.common.util;
 
-import com.yiring.common.core.redis.RedisCache;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.hutool.extra.spring.SpringUtil;
+import com.yiring.common.core.Redis;
 import com.yiring.common.dict.Dict;
-import com.yiring.common.util.spring.SpringUtil;
 import java.util.Collection;
 import java.util.List;
 
@@ -26,7 +28,7 @@ public class DictUtils {
      * @param dictDatas 字典数据列表
      */
     public static void setDictCache(String key, List<Dict> dictDatas) {
-        SpringUtil.getBean(RedisCache.class).setCacheObject(getCacheKey(key), dictDatas);
+        SpringUtil.getBean(Redis.class).set(getCacheKey(key), dictDatas);
     }
 
     /**
@@ -36,13 +38,18 @@ public class DictUtils {
      * @return dictDatas 字典数据列表
      */
     public static List<Dict> getDictCache(String key) {
-        Object cacheObj = SpringUtil.getBean(RedisCache.class).getCacheObject(getCacheKey(key));
-        if (StrUtils.isNotNull(cacheObj)) {
-            return StrUtils.cast(cacheObj);
+        Object cacheObj = SpringUtil.getBean(Redis.class).get(getCacheKey(key));
+        if (ObjectUtil.isNotNull(cacheObj)) {
+            return cast(cacheObj);
         }
         return null;
     }
 
+    @SuppressWarnings("unchecked")
+    public static <T> T cast(Object obj) {
+        return (T) obj;
+    }
+
     /**
      * 根据字典类型和字典值获取字典标签
      *
@@ -77,8 +84,7 @@ public class DictUtils {
         StringBuilder propertyString = new StringBuilder();
         List<Dict> datas = getDictCache(dictType);
 
-        if (StrUtils.containsAny(separator, dictValue) && StrUtils.isNotEmpty(datas)) {
-            if (datas != null) {
+        if (StrUtil.containsAny(separator, dictValue) && datas != null) {
             for (Dict dict : datas) {
                 for (String value : dictValue.split(separator)) {
                     if (value.equals(dict.getDictValue())) {
@@ -87,7 +93,6 @@ public class DictUtils {
                     }
                 }
             }
-            }
         } else {
             if (datas != null) {
                 for (Dict dict : datas) {
@@ -97,7 +102,8 @@ public class DictUtils {
                 }
             }
         }
-        return StrUtils.stripEnd(propertyString.toString(), separator);
+        //        StrUtil.stripEnd(propertyString.toString(), separator);
+        return null;
     }
 
     /**
@@ -112,8 +118,7 @@ public class DictUtils {
         StringBuilder propertyString = new StringBuilder();
         List<Dict> datas = getDictCache(dictType);
 
-        if (StrUtils.containsAny(separator, dictLabel) && StrUtils.isNotEmpty(datas)) {
-            if (datas != null) {
+        if (StrUtil.containsAny(separator, dictLabel) && datas != null) {
             for (Dict dict : datas) {
                 for (String label : dictLabel.split(separator)) {
                     if (label.equals(dict.getDictLabel())) {
@@ -122,7 +127,6 @@ public class DictUtils {
                     }
                 }
             }
-            }
         } else {
             if (datas != null) {
                 for (Dict dict : datas) {
@@ -132,7 +136,8 @@ public class DictUtils {
                 }
             }
         }
-        return StrUtils.stripEnd(propertyString.toString(), separator);
+        //        StrUtils.stripEnd(propertyString.toString(), separator)
+        return null;
     }
 
     /**
@@ -141,15 +146,15 @@ public class DictUtils {
      * @param key 字典键
      */
     public static void removeDictCache(String key) {
-        SpringUtil.getBean(RedisCache.class).deleteObject(getCacheKey(key));
+        SpringUtil.getBean(Redis.class).del(getCacheKey(key));
     }
 
     /**
      * 清空字典缓存
      */
     public static void clearDictCache() {
-        Collection<String> keys = SpringUtil.getBean(RedisCache.class).keys("sys_dict:*");
-        SpringUtil.getBean(RedisCache.class).deleteObject(keys);
+        Collection<String> keys = SpringUtil.getBean(Redis.class).keys("sys_dict:*");
+        SpringUtil.getBean(Redis.class).del(keys.toArray(new String[0]));
     }
 
     /**

basic-common/util/src/main/java/com/yiring/common/util/StrUtils.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.util;
-
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import org.springframework.util.AntPathMatcher;
-
-/**
- * 字符串工具类
- */
-public class StrUtils extends org.apache.commons.lang3.StringUtils {
-
-    /**
-     * 空字符串
-     */
-    private static final String NULLSTR = "";
-
-    /**
-     * 下划线
-     */
-    private static final char SEPARATOR = '_';
-
-    /**
-     * 获取参数不为空值
-     *
-     * @param value defaultValue 要判断的value
-     * @return value 返回值
-     */
-    public static <T> T nvl(T value, T defaultValue) {
-        return value != null ? value : defaultValue;
-    }
-
-    /**
-     * * 判断一个Collection是否为空， 包含List，Set，Queue
-     *
-     * @param coll 要判断的Collection
-     * @return true：为空 false：非空
-     */
-    public static boolean isEmpty(Collection<?> coll) {
-        return isNull(coll) || coll.isEmpty();
-    }
-
-    /**
-     * * 判断一个Collection是否非空，包含List，Set，Queue
-     *
-     * @param coll 要判断的Collection
-     * @return true：非空 false：空
-     */
-    public static boolean isNotEmpty(Collection<?> coll) {
-        return !isEmpty(coll);
-    }
-
-    /**
-     * * 判断一个对象数组是否为空
-     *
-     * @param objects 要判断的对象数组
-     *                * @return true：为空 false：非空
-     */
-    public static boolean isEmpty(Object[] objects) {
-        return isNull(objects) || (objects.length == 0);
-    }
-
-    /**
-     * * 判断一个对象数组是否非空
-     *
-     * @param objects 要判断的对象数组
-     * @return true：非空 false：空
-     */
-    public static boolean isNotEmpty(Object[] objects) {
-        return !isEmpty(objects);
-    }
-
-    /**
-     * * 判断一个Map是否为空
-     *
-     * @param map 要判断的Map
-     * @return true：为空 false：非空
-     */
-    public static boolean isEmpty(Map<?, ?> map) {
-        return isNull(map) || map.isEmpty();
-    }
-
-    /**
-     * * 判断一个Map是否为空
-     *
-     * @param map 要判断的Map
-     * @return true：非空 false：空
-     */
-    public static boolean isNotEmpty(Map<?, ?> map) {
-        return !isEmpty(map);
-    }
-
-    /**
-     * * 判断一个字符串是否为空串
-     *
-     * @param str String
-     * @return true：为空 false：非空
-     */
-    public static boolean isEmpty(String str) {
-        return isNull(str) || NULLSTR.equals(str.trim());
-    }
-
-    /**
-     * * 判断一个字符串是否为非空串
-     *
-     * @param str String
-     * @return true：非空串 false：空串
-     */
-    public static boolean isNotEmpty(String str) {
-        return !isEmpty(str);
-    }
-
-    /**
-     * * 判断一个对象是否为空
-     *
-     * @param object Object
-     * @return true：为空 false：非空
-     */
-    public static boolean isNull(Object object) {
-        return object == null;
-    }
-
-    /**
-     * * 判断一个对象是否非空
-     *
-     * @param object Object
-     * @return true：非空 false：空
-     */
-    public static boolean isNotNull(Object object) {
-        return !isNull(object);
-    }
-
-    /**
-     * * 判断一个对象是否是数组类型（Java基本型别的数组）
-     *
-     * @param object 对象
-     * @return true：是数组 false：不是数组
-     */
-    public static boolean isArray(Object object) {
-        return isNotNull(object) && object.getClass().isArray();
-    }
-
-    /**
-     * 去空格
-     */
-    public static String trim(String str) {
-        return (str == null ? "" : str.trim());
-    }
-
-    /**
-     * 截取字符串
-     *
-     * @param str   字符串
-     * @param start 开始
-     * @return 结果
-     */
-    public static String substring(final String str, int start) {
-        if (str == null) {
-            return NULLSTR;
-        }
-
-        if (start < 0) {
-            start = str.length() + start;
-        }
-
-        if (start < 0) {
-            start = 0;
-        }
-        if (start > str.length()) {
-            return NULLSTR;
-        }
-
-        return str.substring(start);
-    }
-
-    /**
-     * 截取字符串
-     *
-     * @param str   字符串
-     * @param start 开始
-     * @param end   结束
-     * @return 结果
-     */
-    public static String substring(final String str, int start, int end) {
-        if (str == null) {
-            return NULLSTR;
-        }
-
-        if (end < 0) {
-            end = str.length() + end;
-        }
-        if (start < 0) {
-            start = str.length() + start;
-        }
-
-        if (end > str.length()) {
-            end = str.length();
-        }
-
-        if (start > end) {
-            return NULLSTR;
-        }
-
-        if (start < 0) {
-            start = 0;
-        }
-        if (end < 0) {
-            end = 0;
-        }
-
-        return str.substring(start, end);
-    }
-
-    /**
-     * 判断是否为空，并且不是空白字符
-     *
-     * @param str 要判断的value
-     * @return 结果
-     */
-    public static boolean hasText(String str) {
-        return (str != null && !str.isEmpty() && containsText(str));
-    }
-
-    private static boolean containsText(CharSequence str) {
-        int strLen = str.length();
-        for (int i = 0; i < strLen; i++) {
-            if (!Character.isWhitespace(str.charAt(i))) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 驼峰转下划线命名
-     */
-    public static String toUnderScoreCase(String str) {
-        if (str == null) {
-            return null;
-        }
-        StringBuilder sb = new StringBuilder();
-        // 前置字符是否大写
-        boolean preCharIsUpperCase = true;
-        // 当前字符是否大写
-        boolean curreCharIsUpperCase = true;
-        // 下一字符是否大写
-        boolean nexteCharIsUpperCase = true;
-        for (int i = 0; i < str.length(); i++) {
-            char c = str.charAt(i);
-            if (i > 0) {
-                preCharIsUpperCase = Character.isUpperCase(str.charAt(i - 1));
-            } else {
-                preCharIsUpperCase = false;
-            }
-
-            curreCharIsUpperCase = Character.isUpperCase(c);
-
-            if (i < (str.length() - 1)) {
-                nexteCharIsUpperCase = Character.isUpperCase(str.charAt(i + 1));
-            }
-
-            if (preCharIsUpperCase && curreCharIsUpperCase && !nexteCharIsUpperCase) {
-                sb.append(SEPARATOR);
-            } else if ((i != 0 && !preCharIsUpperCase) && curreCharIsUpperCase) {
-                sb.append(SEPARATOR);
-            }
-            sb.append(Character.toLowerCase(c));
-        }
-
-        return sb.toString();
-    }
-
-    /**
-     * 是否包含字符串
-     *
-     * @param str  验证字符串
-     * @param strs 字符串组
-     * @return 包含返回true
-     */
-    public static boolean inStringIgnoreCase(String str, String... strs) {
-        if (str != null && strs != null) {
-            for (String s : strs) {
-                if (str.equalsIgnoreCase(trim(s))) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 将下划线大写方式命名的字符串转换为驼峰式。如果转换前的下划线大写方式命名的字符串为空，则返回空字符串。 例如：HELLO_WORLD->HelloWorld
-     *
-     * @param name 转换前的下划线大写方式命名的字符串
-     * @return 转换后的驼峰式命名的字符串
-     */
-    public static String convertToCamelCase(String name) {
-        StringBuilder result = new StringBuilder();
-        // 快速检查
-        if (name == null || name.isEmpty()) {
-            // 没必要转换
-            return "";
-        } else if (!name.contains("_")) {
-            // 不含下划线，仅将首字母大写
-            return name.substring(0, 1).toUpperCase() + name.substring(1);
-        }
-        // 用下划线将原始字符串分割
-        String[] camels = name.split("_");
-        for (String camel : camels) {
-            // 跳过原始字符串中开头、结尾的下换线或双重下划线
-            if (camel.isEmpty()) {
-                continue;
-            }
-            // 首字母大写
-            result.append(camel.substring(0, 1).toUpperCase());
-            result.append(camel.substring(1).toLowerCase());
-        }
-        return result.toString();
-    }
-
-    /**
-     * 驼峰式命名法 例如：user_name->userName
-     */
-    public static String toCamelCase(String s) {
-        if (s == null) {
-            return null;
-        }
-        s = s.toLowerCase();
-        StringBuilder sb = new StringBuilder(s.length());
-        boolean upperCase = false;
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-
-            if (c == SEPARATOR) {
-                upperCase = true;
-            } else if (upperCase) {
-                sb.append(Character.toUpperCase(c));
-                upperCase = false;
-            } else {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 查找指定字符串是否匹配指定字符串列表中的任意一个字符串
-     *
-     * @param str  指定字符串
-     * @param strs 需要检查的字符串数组
-     * @return 是否匹配
-     */
-    public static boolean matches(String str, List<String> strs) {
-        if (isEmpty(str) || isEmpty(strs)) {
-            return false;
-        }
-        for (String pattern : strs) {
-            if (isMatch(pattern, str)) {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    /**
-     * 判断url是否与规则配置:
-     * ? 表示单个字符;
-     * * 表示一层路径内的任意字符串，不可跨层级;
-     * ** 表示任意层路径;
-     *
-     * @param pattern 匹配规则
-     * @param url     需要匹配的url
-     * @return
-     */
-    public static boolean isMatch(String pattern, String url) {
-        AntPathMatcher matcher = new AntPathMatcher();
-        return matcher.match(pattern, url);
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T> T cast(Object obj) {
-        return (T) obj;
-    }
-
-    /**
-     * 数字左边补齐0，使之达到指定长度。注意，如果数字转换为字符串后，长度大于size，则只保留 最后size个字符。
-     *
-     * @param num  数字对象
-     * @param size 字符串指定长度
-     * @return 返回数字的字符串格式，该字符串为指定长度。
-     */
-    public static final String padl(final Number num, final int size) {
-        return padl(num.toString(), size, '0');
-    }
-
-    /**
-     * 字符串左补齐。如果原始字符串s长度大于size，则只保留最后size个字符。
-     *
-     * @param s    原始字符串
-     * @param size 字符串指定长度
-     * @param c    用于补齐的字符
-     * @return 返回指定长度的字符串，由原字符串左补齐或截取得到。
-     */
-    public static final String padl(final String s, final int size, final char c) {
-        final StringBuilder sb = new StringBuilder(size);
-        if (s != null) {
-            final int len = s.length();
-            if (s.length() <= size) {
-                for (int i = size - len; i > 0; i--) {
-                    sb.append(c);
-                }
-                sb.append(s);
-            } else {
-                return s.substring(len - size, len);
-            }
-        } else {
-            for (int i = size; i > 0; i--) {
-                sb.append(c);
-            }
-        }
-        return sb.toString();
-    }
-}

basic-common/util/src/main/java/com/yiring/common/util/date/DateUtils.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.util.date;
-
-import java.lang.management.ManagementFactory;
-import java.text.ParseException;
-import java.text.SimpleDateFormat;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
-import java.time.LocalTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
-import java.util.Date;
-import org.apache.commons.lang3.time.DateFormatUtils;
-
-/**
- * 时间工具类
- */
-public class DateUtils extends org.apache.commons.lang3.time.DateUtils {
-
-    public static String YYYY = "yyyy";
-
-    public static String YYYY_MM = "yyyy-MM";
-
-    public static String YYYY_MM_DD = "yyyy-MM-dd";
-
-    public static String YYYYMMDDHHMMSS = "yyyyMMddHHmmss";
-
-    public static String YYYY_MM_DD_HH_MM_SS = "yyyy-MM-dd HH:mm:ss";
-
-    private static final String[] parsePatterns = {
-        "yyyy-MM-dd",
-        "yyyy-MM-dd HH:mm:ss",
-        "yyyy-MM-dd HH:mm",
-        "yyyy-MM",
-        "yyyy/MM/dd",
-        "yyyy/MM/dd HH:mm:ss",
-        "yyyy/MM/dd HH:mm",
-        "yyyy/MM",
-        "yyyy.MM.dd",
-        "yyyy.MM.dd HH:mm:ss",
-        "yyyy.MM.dd HH:mm",
-        "yyyy.MM",
-    };
-
-    /**
-     * 获取当前Date型日期
-     *
-     * @return Date() 当前日期
-     */
-    public static Date getNowDate() {
-        return new Date();
-    }
-
-    /**
-     * 获取当前日期, 默认格式为yyyy-MM-dd
-     *
-     * @return String
-     */
-    public static String getDate() {
-        return dateTimeNow(YYYY_MM_DD);
-    }
-
-    public static String getTime() {
-        return dateTimeNow(YYYY_MM_DD_HH_MM_SS);
-    }
-
-    public static String dateTimeNow() {
-        return dateTimeNow(YYYYMMDDHHMMSS);
-    }
-
-    public static String dateTimeNow(final String format) {
-        return parseDateToStr(format, new Date());
-    }
-
-    public static String dateTime(final Date date) {
-        return parseDateToStr(YYYY_MM_DD, date);
-    }
-
-    public static String parseDateToStr(final String format, final Date date) {
-        return new SimpleDateFormat(format).format(date);
-    }
-
-    public static Date dateTime(final String format, final String ts) {
-        try {
-            return new SimpleDateFormat(format).parse(ts);
-        } catch (ParseException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    /**
-     * 日期路径 即年/月/日 如2018/08/08
-     */
-    public static String datePath() {
-        Date now = new Date();
-        return DateFormatUtils.format(now, "yyyy/MM/dd");
-    }
-
-    /**
-     * 日期路径 即年/月/日 如20180808
-     */
-    public static String dateTime() {
-        Date now = new Date();
-        return DateFormatUtils.format(now, "yyyyMMdd");
-    }
-
-    /**
-     * 日期型字符串转化为日期 格式
-     */
-    public static Date parseDate(Object str) {
-        if (str == null) {
-            return null;
-        }
-        try {
-            return parseDate(str.toString(), parsePatterns);
-        } catch (ParseException e) {
-            return null;
-        }
-    }
-
-    /**
-     * 获取服务器启动时间
-     */
-    public static Date getServerStartDate() {
-        long time = ManagementFactory.getRuntimeMXBean().getStartTime();
-        return new Date(time);
-    }
-
-    /**
-     * 计算两个时间差
-     */
-    public static String getDatePoor(Date endDate, Date nowDate) {
-        long nd = 1000 * 24 * 60 * 60;
-        long nh = 1000 * 60 * 60;
-        long nm = 1000 * 60;
-        // long ns = 1000;
-        // 获得两个时间的毫秒时间差异
-        long diff = endDate.getTime() - nowDate.getTime();
-        // 计算差多少天
-        long day = diff / nd;
-        // 计算差多少小时
-        long hour = diff % nd / nh;
-        // 计算差多少分钟
-        long min = diff % nd % nh / nm;
-        // 计算差多少秒//输出结果
-        // long sec = diff % nd % nh % nm / ns;
-        return day + "天" + hour + "小时" + min + "分钟";
-    }
-
-    /**
-     * 增加 LocalDateTime ==> Date
-     */
-    public static Date toDate(LocalDateTime temporalAccessor) {
-        ZonedDateTime zdt = temporalAccessor.atZone(ZoneId.systemDefault());
-        return Date.from(zdt.toInstant());
-    }
-
-    /**
-     * 增加 LocalDate ==> Date
-     */
-    public static Date toDate(LocalDate temporalAccessor) {
-        LocalDateTime localDateTime = LocalDateTime.of(temporalAccessor, LocalTime.of(0, 0, 0));
-        ZonedDateTime zdt = localDateTime.atZone(ZoneId.systemDefault());
-        return Date.from(zdt.toInstant());
-    }
-}

basic-common/util/src/main/java/com/yiring/common/util/spring/SpringUtil.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.util.spring;
-
-import org.springframework.beans.BeansException;
-import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
-import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-/**
- * spring工具类 方便在非spring管理环境中获取bean
- *
- * @author ruoyi
- */
-@Component
-public final class SpringUtil implements BeanFactoryPostProcessor, ApplicationContextAware {
-
-    /** Spring应用上下文环境 */
-    private static ConfigurableListableBeanFactory beanFactory;
-
-    private static ApplicationContext applicationContext;
-
-    @Override
-    public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) throws BeansException {
-        SpringUtil.beanFactory = beanFactory;
-    }
-
-    @Override
-    public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
-        SpringUtil.applicationContext = applicationContext;
-    }
-
-    /**
-     * 获取类型为requiredType的对象
-     *
-     * @param clz Class
-     * @return T
-     *
-     */
-    public static <T> T getBean(Class<T> clz) throws BeansException {
-        return (T) beanFactory.getBean(clz);
-    }
-}

build.gradle

@@ -6,15 +6,11 @@ buildscript {
         // https://mvnrepository.com/artifact/com.github.xiaoymin/knife4j-spring-boot-starter
         knife4jVersion = '2.0.9'
         // https://mvnrepository.com/artifact/io.swagger/swagger-annotations
-        swaggerAnnotationsVersion = '1.6.5'
-        // https://mvnrepository.com/artifact/org.hibernate.validator/hibernate-validator
-        hibernateValidatorVersion = '7.0.4.Final'
-        // https://mvnrepository.com/artifact/org.hibernate.orm/hibernate-spatial
-        hibernateSpatialVersion = '5.4.33.Final'
+        swaggerAnnotationsVersion = '1.6.6'
         // https://mvnrepository.com/artifact/cn.dev33/sa-token-spring-boot-starter
         saTokenVersion = '1.29.1.trial'
         // https://mvnrepository.com/artifact/cn.hutool/hutool-all
-        hutoolVersion = '5.7.22'
+        hutoolVersion = '5.8.0.M3'
         // https://mvnrepository.com/artifact/com.alibaba/fastjson
         fastJsonVersion = '1.2.80'
         // https://mvnrepository.com/artifact/com.xuxueli/xxl-job-core
@@ -22,25 +18,33 @@ buildscript {
         // https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp
         okhttpVersion = '4.9.3'
         // https://mvnrepository.com/artifact/io.minio/minio
-        minioVersion = '8.3.7'
+        minioVersion = '8.3.8'
+        // https://mvnrepository.com/artifact/com.baomidou/mybatis-plus-boot-starter
+        mybatisPlusVersion = '3.5.1'
+        // https://mvnrepository.com/artifact/org.hibernate/hibernate-spatial
+        hibernateSpatialVersion = '5.6.8.Final'
         // https://mvnrepository.com/artifact/org.locationtech.jts/jts-core
         jtsVersion = '1.18.2'
+        // https://mvnrepository.com/artifact/com.vladmihalcea/hibernate-types-55
+        hibernateTypesVersion = '2.16.1'
+        // https://mvnrepository.com/artifact/com.github.liaochong/myexcel
+        myexcelVersion = '4.1.1'
+        // https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-openfeign
+        openfeignVersion = '3.1.1'
     }
 }
 
 plugins {
     id 'java'
-    id 'org.springframework.boot' version '2.5.12'
+    id 'org.springframework.boot' version '2.6.6'
     // https://plugins.gradle.org/plugin/io.spring.dependency-management
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
     // https://plugins.gradle.org/plugin/com.diffplug.spotless
-    id "com.diffplug.spotless" version "6.3.0"
+    id "com.diffplug.spotless" version "6.4.2"
     // https://plugins.gradle.org/plugin/com.github.spotbugs
-    // id "com.github.spotbugs" version "4.7.10"
+    // id "com.github.spotbugs" version "5.0.6"
 }
 
-sourceCompatibility = '1.8'
-
 allprojects {
     repositories {
         mavenLocal()
@@ -49,12 +53,15 @@ allprojects {
         maven { url 'https://maven.aliyun.com/repository/public' }
         mavenCentral()
     }
+
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
 }
 
 subprojects {
+    apply plugin: 'java'
     apply plugin: 'org.springframework.boot'
     apply plugin: 'io.spring.dependency-management'
-    apply plugin: 'java'
     apply plugin: "com.diffplug.spotless"
     // apply plugin: "com.github.spotbugs"
 
@@ -70,12 +77,9 @@ subprojects {
         compileOnly 'org.projectlombok:lombok'
         annotationProcessor 'org.projectlombok:lombok'
         annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
-        implementation group: 'org.apache.poi', name: 'poi', version: '5.0.0'
-        implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.0.0'
-        implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
     }
 
-    [compileJava,compileTestJava,javadoc]*.options*.encoding ='UTF-8'
+    [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 
     tasks.withType(JavaCompile) {
         options.encoding = 'UTF-8'
@@ -111,7 +115,7 @@ subprojects {
             licenseHeader '/* (C) $YEAR YiRing, Inc. */'
             // https://www.npmjs.com/package/prettier
             // https://www.npmjs.com/package/prettier-plugin-java
-            prettier(['prettier': '2.6.0', 'prettier-plugin-java': '1.6.1']).config([
+            prettier(['prettier': '2.6.2', 'prettier-plugin-java': '1.6.1']).config([
                 'parser'    : 'java',
                 'tabWidth'  : 4,
                 'printWidth': 120,
@@ -121,9 +125,6 @@ subprojects {
     }
 }
 
-// format
-spotlessApply
-
 // GitHook pre-commit (spotless, spotbugs)
 def hook = new File("$rootProject.projectDir/.git/hooks/pre-commit")
 hook.text = """#!/bin/bash

doc/skill.md

+## 实用技巧
+
+> Swagger 文档进行文件下载
+```diff
+# 将下载接口上的 @ApiOperation 注解中的 produces 属性值改为 application/octet-stream
+- @ApiOperation(value = "文件下载")
++ @ApiOperation(value = "文件下载", produces = MediaType.APPLICATION_OCTET_STREAM_VALUE)
+```
+
+> Redis 使用
+```diff
++ @Resource
++ Redis redis;
+
++ Object value = redis.get(key);
+```
+
+> Excel 导入/导出，使用 [MyExcel](https://github.com/liaochong/myexcel) 工具库

doc/technique.md

@@ -3,10 +3,11 @@
 ### 基础
 
 <!-- prettier-ignore -->
-- [SpringBoot v2.5.x](https://spring.io/projects/spring-boot)
+- [SpringBoot v2.6.x](https://spring.io/projects/spring-boot)
 - [Lombok](https://projectlombok.org/)
 - [Spring Web](https://docs.spring.io/spring-framework/docs/current/reference/html/web.html)
 - [Spring Data Jpa](https://spring.io/projects/spring-data-jpa)
+- [Spring Data Redis](https://spring.io/projects/spring-data-redis)
 
 ### SQL
 
@@ -42,6 +43,7 @@
 
 <!-- prettier-ignore -->
 - [Hutool](https://www.hutool.cn/) 工具包
+- [FastJson](https://github.com/alibaba/fastjson) JSON 工具包
 
 ### Doc
 
@@ -52,7 +54,12 @@
 
 <!-- prettier-ignore -->
 - [sa-token](https://sa-token.dev33.cn/) 权限认证框架
-- [MinIO](https://docs.min.io/) MinIO S3 文件存储
+- [MinIO](https://docs.min.io/) 文件存储
+
+### 可选
+
+<!-- prettier-ignore -->
+- [MyBatis Plus](https://baomidou.com/) MyBatis 增强包（允许与 JPA 混合使用）
 
 ### 构建工具
 

gradle.properties

+# https://github.com/diffplug/spotless/issues/834
+# fix: jdk16+
+org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
+  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED

gradle/wrapper/gradle-wrapper.properties

 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

@@ -6,9 +6,11 @@ pluginManagement {
 }
 rootProject.name = 'kshg-api'
 include 'app'
+include 'app-push'
 include 'basic-auth'
 include 'basic-common:core'
 include 'basic-common:util'
 include 'basic-common:doc'
 include 'basic-common:minio'
+include 'basic-common:redis'