feat：

1、部门相关查询、导出
2、用户相关查询、发卡、收卡

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,8 +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-websocket"
+	implementation "org.springframework.boot:spring-boot-starter-reactor-netty"
 	// 💬 Mock/Test Env
 	runtimeOnly 'com.h2database:h2'
 	// 💬 Prod/Dev Env
@@ -18,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")
@@ -38,20 +48,23 @@ 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}"
+	implementation "cn.hutool:hutool-json:${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'
-
-	// hutool-core
-	implementation "cn.hutool:hutool-core:${hutoolVersion}"
-
-	// hutool-http
-	implementation "cn.hutool:hutool-http:${hutoolVersion}"
+	// https://github.com/vladmihalcea/hibernate-types
+	// hibernate-types-55
+	implementation "com.vladmihalcea:hibernate-types-55:${hibernateTypesVersion}"
 
 	// myexcel
 	implementation "com.github.liaochong:myexcel:${myexcelVersion}"

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.domain.car;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yiring.common.annotation.Excel;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import javax.persistence.*;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import lombok.experimental.FieldNameConstants;
+import org.hibernate.annotations.Comment;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.snowflake.SnowflakeId;
+
+/**
+ * @author tzl
+ * 2022/4/11 13:38
+ */
+@Getter
+@Setter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Entity
+@Table(name = "BS_CAR")
+@Comment("车辆")
+public class Car implements Serializable {
+
+    @Id
+    @Comment("主键id")
+    @GeneratedValue(generator = SnowflakeId.GENERATOR)
+    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
+    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;
+
+    @Comment("发卡时间")
+    LocalDateTime cardSendTime;
+
+    @Comment("备用字段")
+    String reserve4;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.domain.car;
+
+import java.io.Serializable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.stereotype.Repository;
+
+/**
+ * @author tzl
+ * 2022/4/11 13:42
+ */
+@Repository
+public interface CarRepository extends JpaRepository<Car, Serializable>, JpaSpecificationExecutor<Car> {
+    //    /**
+    //     * 检查是否存在相同车牌号登记
+    //     *
+    //     * @param param String 车牌号码
+    //     * @return 是否存在
+    //     */
+    //    @Query("SELECT COUNT(c.id) FROM bs_car c where car_num=?1 and label_card_status <>'已收卡'")
+    //    boolean hasCarInfoByCarNum(String param);
+    //
+    //    /**
+    //     *  检查是否存在相同手机号码登记
+    //     *
+    //     * @param param String 手机号码
+    //     * @return 是否存在
+    //     */
+    //    @Query("SELECT COUNT(c.id) FROM bs_car c where driver_mobile=?1 and label_card_status <>'已收卡'")
+    //    boolean hasCarInfoByMobile(String param);
+}

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/video/Video.java

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.app.domain.video;
 
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 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;
@@ -33,6 +34,7 @@ import org.locationtech.jts.geom.Point;
 @Comment("监控视频")
 public class Video implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -4382898847143469396L;
 
     @Comment("主键")
@@ -44,27 +46,33 @@ public class Video implements Serializable {
     @Comment("坐标点信息")
     Point point;
 
-    @Comment("分类")
-    String type;
-
     @Comment("标识")
     String uuid;
 
-    /**
-     * rtsp 地址
-     */
-    @Comment("rtsp 媒体地址")
-    String rtsp;
-
     @Comment("m3u8 地址")
     String m3u8;
 
+    @Comment("备注")
+    String remark;
+
+    @Comment("创建时间")
+    LocalDateTime createTime;
+
+    @Comment("状态")
+    String status;
+
+    @Comment("摄像头名称")
+    String videoName;
+
+    @Comment("分类")
+    String type;
+
+    @Comment("rtsp 媒体地址")
+    String rtsp;
+
     @Comment("是否在线")
     Boolean online;
 
     @Comment("是否启用")
     Boolean enable;
-
-    @Comment("创建时间")
-    LocalDateTime createTime;
 }

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

@@ -3,6 +3,7 @@ package com.yiring.app.domain.video;
 
 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 VideoRepository extends JpaRepository<Video, Serializable> {}
+public interface VideoRepository extends JpaRepository<Video, Serializable>, JpaSpecificationExecutor<Video> {}

app/src/main/java/com/yiring/app/excel/dept/DepartmentExportExcel.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.excel.dept;
+
+import cn.hutool.core.date.LocalDateTimeUtil;
+import com.github.liaochong.myexcel.core.annotation.ExcelColumn;
+import com.github.liaochong.myexcel.core.annotation.ExcelModel;
+import com.yiring.auth.domain.dept.Department;
+import java.io.Serial;
+import java.io.Serializable;
+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/22
+ */
+
+@ExcelModel
+@Data
+@Builder
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DepartmentExportExcel implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 6268534775569565860L;
+
+    @ExcelColumn(title = "部门名称")
+    String name;
+
+    @ExcelColumn(title = "创建时间")
+    String createTime;
+
+    public static List<DepartmentExportExcel> transforms(List<Department> departments) {
+        return departments
+            .stream()
+            .map(department ->
+                DepartmentExportExcel
+                    .builder()
+                    .name(department.getName())
+                    .createTime(LocalDateTimeUtil.format(department.getCreateTime(), "yyyy-MM-dd HH:mm:ss"))
+                    .build()
+            )
+            .collect(Collectors.toList());
+    }
+}

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 cn.hutool.core.date.LocalDateTimeUtil;
 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;
@@ -29,9 +27,9 @@ public class LocationTagExportExcel implements Serializable {
 
     private static final long serialVersionUID = -4549580878785078998L;
 
-    @ExcelColumn(title = "主键")
+    /*    @ExcelColumn(title = "主键")
     @JsonSerialize(using = ToStringSerializer.class)
-    Long id;
+    Long id;*/
 
     @ExcelColumn(title = "编号")
     String code;
@@ -49,7 +47,7 @@ public class LocationTagExportExcel implements Serializable {
     Integer volt;
 
     @ExcelColumn(title = "最近更新时间")
-    LocalDateTime updateTime;
+    String updateTime;
 
     public static List<LocationTagExportExcel> transforms(List<LocationTag> locationTags) {
         return locationTags
@@ -57,13 +55,12 @@ public class LocationTagExportExcel implements Serializable {
             .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())
+                    .updateTime(LocalDateTimeUtil.format(locationTag.getUpdateTime(), "yyyy-MM-dd HH:mm:ss"))
                     .build()
             )
             .collect(Collectors.toList());

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/param/car/CarParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.car;
+
+import com.yiring.common.constant.RegEx;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/11 14:00
+ */
+@ApiModel("CarParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class CarParam {
+
+    @ApiModelProperty(value = "车牌号码", example = "湘A99999", required = true)
+    @NotEmpty(message = "车牌号码不能为空")
+    @Pattern(regexp = RegEx.CARNUM, message = "车牌号码格式不正确")
+    String carNum;
+
+    @ApiModelProperty(value = "车辆类型", example = "1")
+    String carType;
+
+    @ApiModelProperty(value = "司机名称", example = "张三", required = true)
+    @NotEmpty(message = "司机名称不能为空")
+    String driverName;
+
+    @ApiModelProperty(value = "司机电话", example = "17688888888", required = true)
+    @NotEmpty(message = "司机电话不能为空")
+    @Pattern(regexp = RegEx.MOBILE, message = "手机号码格式不正确")
+    String driverMobile;
+
+    //    @ApiModelProperty(value = "标签卡", example = "DW24515512")
+    //    String labelCard;
+    //
+    //    @ApiModelProperty(value = "标签卡状态", example = "使用中")
+    //    String labelCardStatus;
+
+    @ApiModelProperty(value = "所属单位id", example = "1", required = true)
+    @NotEmpty(message = "所属单位id不能为空")
+    String orgId;
+
+    @ApiModelProperty(value = "被访人id", example = "1", required = true)
+    @NotEmpty(message = "被访人id不能为空")
+    String intervieweeId;
+
+    @ApiModelProperty(value = "来访原因", example = "视察", required = true)
+    @NotEmpty(message = "来访原因不能为空")
+    @Size(min = 1, max = 20, message = "来访原因超出范围")
+    String reason;
+    //    @ApiModelProperty(value = "收卡时间", example = "2022-04-11 17:25:33")
+    //    LocalDateTime cardRecTime;
+    //
+    //    @ApiModelProperty(value = "发卡时间", example = "2022-04-11 17:25:33")
+    //    LocalDateTime cardSendTime;
+    //    @ApiModelProperty(value = "创建时间", example = "")
+    //    LocalDateTime createTime;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.car;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.LocalDateTime;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/12 11:11
+ */
+@ApiModel("CarQueryParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class CarQueryParam {
+
+    @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")
+    String carNum;
+
+    @ApiModelProperty(value = "车辆类型", example = "轿车")
+    String carType;
+
+    @ApiModelProperty(value = "司机名称", example = "张三")
+    String driverName;
+
+    @ApiModelProperty(value = "司机电话", example = "17688888888")
+    String driverMobile;
+
+    @ApiModelProperty(value = "标签卡", example = "DW24515512")
+    String labelCard;
+
+    @ApiModelProperty(value = "标签卡状态", example = "2")
+    String labelCardStatus;
+
+    @ApiModelProperty(value = "所属单位id", example = "1")
+    String orgId;
+
+    @ApiModelProperty(value = "被访人id", example = "1")
+    String intervieweeId;
+
+    @ApiModelProperty(value = "来访原因", example = "视察")
+    String reason;
+
+    @ApiModelProperty(value = "收卡时间(开始)", example = "2022-04-11 17:25:33")
+    LocalDateTime cardRecTimeStart;
+
+    @ApiModelProperty(value = "收卡时间(结束)", example = "2022-04-11 17:26:33")
+    LocalDateTime cardRecTimeEnd;
+
+    @ApiModelProperty(value = "来访时间(开始)", example = "2022-04-11 17:25:33")
+    LocalDateTime createTimeStart;
+
+    @ApiModelProperty(value = "来访时间(结束)", example = "2022-04-11 17:26:33")
+    LocalDateTime createTimeEnd;
+}

basic-auth/src/main/java/com/yiring/auth/param/dept/DepartmentAddParam.java → app/src/main/java/com/yiring/app/param/dept/DepartmentAddParam.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.param.dept;
+package com.yiring.app.param.dept;
 
 import com.yiring.auth.domain.dept.Department;
 import com.yiring.auth.domain.user.User;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import javax.validation.constraints.NotNull;
@@ -25,6 +26,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class DepartmentAddParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -9143398676976586072L;
 
     @ApiModelProperty(value = "上级部门", example = "1")

basic-auth/src/main/java/com/yiring/auth/param/user/UserByNameParam.java → app/src/main/java/com/yiring/app/param/dept/DepartmentFindParam.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.param.user;
+package com.yiring.app.param.dept;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 
 /**
- * 用户名称联想
+ * 部门信息入参
+ *
  * @author LJ-2204
  * @date 2022/4/20
  */
 
-@ApiModel("UserByNameParam")
+@ApiModel("DepartmentFindParam")
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class UserByNameParam implements Serializable {
+public class DepartmentFindParam implements Serializable {
 
-    private static final long serialVersionUID = -8021455509303095719L;
+    @Serial
+    private static final long serialVersionUID = 4878741822740170271L;
 
-    @ApiModelProperty(value = "真实姓名", example = "刘浪")
-    String name;
+    @ApiModelProperty(value = "部门状态", example = "启用/禁用")
+    Boolean enable;
 }

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.dict;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/13 15:51
+ */
+@ApiModel("DictParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DictParam {
+
+    @ApiModelProperty(value = "排序", example = "1", required = true)
+    Integer dictSort;
+
+    @ApiModelProperty(value = "字典标签", example = "男", required = true)
+    @NotEmpty(message = "字典标签不能为空")
+    String dictLabel;
+
+    @ApiModelProperty(value = "字典值", example = "1", required = true)
+    @NotEmpty(message = "字典值不能为空")
+    String dictValue;
+
+    @ApiModelProperty(value = "字典类型", example = "user_sex", required = true)
+    @NotEmpty(message = "字典类型不能为空")
+    String dictType;
+
+    @ApiModelProperty(value = "是否启用", example = "1", required = true)
+    @NotEmpty(message = "是否启用必填")
+    String status;
+
+    @ApiModelProperty(value = "备注", example = "性别")
+    String remark;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.dict;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/13 16:06
+ */
+@ApiModel("DictQueryParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DictQueryParam {
+
+    @ApiModelProperty(value = "字典标签", example = "男")
+    String dictLabel;
+
+    @ApiModelProperty(value = "字典类型", example = "user_sex")
+    String dictType;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.dict;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.validation.constraints.NotEmpty;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/13 15:51
+ */
+@ApiModel("DictParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DictTypeParam {
+
+    @ApiModelProperty(value = "字典名称", example = "性别", required = true)
+    @NotEmpty(message = "字典名称不能为空")
+    String dictName;
+
+    @ApiModelProperty(value = "字典类型", example = "user_sex", required = true)
+    @NotEmpty(message = "字典类型不能为空")
+    String dictType;
+
+    @ApiModelProperty(value = "是否启用", example = "1", required = true)
+    @NotEmpty(message = "是否启用必填")
+    String status;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.dict;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/13 16:06
+ */
+@ApiModel("DictQueryParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DictTypeQueryParam {
+
+    @ApiModelProperty(value = "字典名称", example = "性别")
+    String dictName;
+}

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

@@ -4,6 +4,7 @@ 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.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import lombok.*;
@@ -23,6 +24,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LocationTagAddParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -2942040230386389302L;
 
     @ApiModelProperty(value = "编号", example = "BTT88888888", required = true)

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

@@ -3,6 +3,7 @@ package com.yiring.app.param.location;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import javax.validation.constraints.NotNull;
 import lombok.*;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LocationTagDeleteParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 2404060244461070885L;
 
     @ApiModelProperty(value = "ids", example = "145235231,145235232", required = true)

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

@@ -4,6 +4,7 @@ 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.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LocationTagFindParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -5134311481372693111L;
 
     @ApiModelProperty(value = "编号", example = "BTT88888888")
@@ -32,10 +34,4 @@ public class LocationTagFindParam implements Serializable {
 
     @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

@@ -4,6 +4,7 @@ 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.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LocationTagModifyParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 7711908393372149723L;
 
     @ApiModelProperty(value = "编号", example = "BTT88888888", required = true)

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

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.param.post;
+package com.yiring.app.param.post;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -21,6 +22,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PostFindParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1926710333813935577L;
 
     @ApiModelProperty(value = "名称", example = "Java")
@@ -28,10 +30,4 @@ public class PostFindParam implements Serializable {
 
     @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 → app/src/main/java/com/yiring/app/param/post/PostParam.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.param.post;
+package com.yiring.app.param.post;
 
 import com.yiring.auth.domain.post.Post;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
 import java.io.Serializable;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
@@ -22,6 +23,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PostParam implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 5247408856592333466L;
 
     @ApiModelProperty(value = "名称", example = "Java", required = true)

basic-auth/src/main/java/com/yiring/auth/vo/user/UserAutoVo.java → app/src/main/java/com/yiring/app/param/user/UserBingTagParam.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.vo.user;
+package com.yiring.app.param.user;
 
-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;
 
 /**
- * 用户联想模型
+ *
+ *
  * @author LJ-2204
- * @date 2022/4/20
+ * @date 2022/4/22
  */
 
-@ApiModel("UserAutoVo")
+@ApiModel("UserByNameParam")
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class UserAutoVo implements Serializable {
+public class UserBingTagParam implements Serializable {
 
-    private static final long serialVersionUID = -8767805224176648753L;
+    @Serial
+    private static final long serialVersionUID = -3659387184911379861L;
 
-    @JsonSerialize(using = ToStringSerializer.class)
-    @ApiModelProperty(value = "主键", example = "1")
+    @ApiModelProperty(value = "用户id", example = "8888888")
     Long id;
 
-    @ApiModelProperty(value = "真实姓名", example = "超级用户")
-    String realName;
+    @ApiModelProperty(value = "标签编号", example = "BTT88888888")
+    String code;
 }

app/src/main/java/com/yiring/app/param/user/UserFindParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.user;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serial;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 用户表格查询
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+
+@ApiModel("UserFindParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class UserFindParam implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -8021455509303095719L;
+
+    @ApiModelProperty(value = "真实姓名", example = "张三")
+    String realName;
+
+    @ApiModelProperty(value = "工号", example = "3306")
+    String uuid;
+
+    @ApiModelProperty(value = "标签卡", example = "BTT33333333")
+    String code;
+
+    @ApiModelProperty(value = "电话", example = "19999999999")
+    String mobile;
+
+    @ApiModelProperty(value = "部门编号", example = "0")
+    Long deptId;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.video;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Size;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 监控视频入参类
+ *
+ * @author tzl
+ * 2022/4/8 16:07
+ */
+@ApiModel("VideoParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class VideoParam implements Serializable {
+
+    @ApiModelProperty(value = "编号", example = "88888888", required = true)
+    @NotEmpty(message = "标识不能为空")
+    String uuid;
+
+    @ApiModelProperty(value = "m3u8 媒体地址", example = "", required = true)
+    @NotEmpty(message = "m3u8 媒体地址不能为空")
+    String m3u8;
+
+    @ApiModelProperty(value = "摄像头名称", example = "摄像头1", required = true)
+    @NotEmpty(message = "摄像头名称不能为空")
+    String videoName;
+
+    @ApiModelProperty(value = "经度", example = "1", required = true)
+    @NotEmpty(message = "经度")
+    double lon;
+
+    @ApiModelProperty(value = "纬度", example = "1", required = true)
+    @NotEmpty(message = "纬度")
+    double lat;
+
+    @ApiModelProperty(value = "备注", example = "厂区摄像头")
+    @Size(max = 100, message = "备注不能超过100字")
+    String remark;
+    //    @ApiModelProperty(value = "m3u8 地址", example = "")
+    //    @NotEmpty(message = "m3u8 地址不能为空")
+    //    String m3u8;
+
+    //    Point point;
+
+    //    @ApiModelProperty(value = "分类", example = "")
+    //    String type;
+
+    //    @ApiModelProperty(value = "是否在线", example = "")
+    //    Boolean online;
+
+    //    @ApiModelProperty(value = "是否启用", example = "")
+    //    Boolean enable;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.param.video;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 监控视频入参类
+ *
+ * @author tzl
+ * 2022/4/8 16:07
+ */
+@ApiModel("VideoQueryParam")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class VideoQueryParam implements Serializable {
+
+    @ApiModelProperty(value = "编号", example = "88888888")
+    String uuid;
+
+    @ApiModelProperty(value = "摄像头名称", example = "摄像头1")
+    String videoName;
+
+    @ApiModelProperty(value = "状态", example = "1")
+    String status;
+    //    @ApiModelProperty(value = "m3u8 地址", example = "")
+    //    @NotEmpty(message = "m3u8 地址不能为空")
+    //    String m3u8;
+
+    //    Point point;
+
+    //    @ApiModelProperty(value = "分类", example = "")
+    //    String type;
+
+    //    @ApiModelProperty(value = "是否在线", example = "")
+    //    Boolean online;
+
+    //    @ApiModelProperty(value = "是否启用", example = "")
+    //    Boolean enable;
+}

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/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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.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.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 org.springframework.data.jpa.domain.Specification;
+
+/**
+ * @author tzl
+ * 2022/4/11 13:57
+ */
+public interface CarService {
+    /**
+     * 添加车辆来访信息
+     *
+     * @param carParam CarParam
+     * @return 车辆来访信息id
+     */
+    Result<Long> saveCarInfo(CarParam carParam);
+
+    /**
+     * 修改车辆来访信息
+     *
+     * @param carParam CarParam
+     * @return 修改的车辆来访信息id
+     */
+    Result<Long> updateCarInfo(CarParam carParam, IdParam idParam);
+
+    /**
+     * 收卡
+     *
+     * @param idParam IdParam
+     * @return 收卡信息id
+     */
+    Result<Long> cardRec(IdParam idParam);
+
+    /**
+     * 发卡
+     *
+     * @param idParam IdParam
+     * @return 发卡信息id
+     */
+    Result<Long> cardSend(IdParam idParam, String labelCard);
+
+    /**
+     * 删除车辆来访信息
+     *
+     * @param idParam IdParam
+     * @return String
+     */
+    Result<String> deleteCarInfo(IdParam idParam);
+
+    /**
+     * 查询车辆来访信息详情
+     *
+     * @param idParam IdParam
+     * @return 车辆来访信息
+     */
+    Result<CarVo> getCarInfo(IdParam idParam);
+
+    /**
+     * 查询车辆来访信息(分页)
+     *
+     * @param carParam CarParam
+     * @return 车辆来访信息分页数据
+     */
+    Result<PageVo<CarVo>> pageCarInfo(CarQueryParam carParam);
+
+    /**
+     * 导出excel
+     */
+    List<Car> export(CarQueryParam carParam);
+
+    /**
+     * 检查是否存在相同车牌号登记
+     *
+     * @param param String 车牌号码
+     * @return 是否存在
+     */
+    boolean hasCarInfoByCarNum(String param);
+
+    /**
+     *  检查是否存在相同手机号码登记
+     *
+     * @param param String 手机号码
+     * @return 是否存在
+     */
+    boolean hasCarInfoByMobile(String param);
+
+    /**
+     * @param carParam CarQueryParam
+     * @return Specification
+     */
+    Specification<Car> condition(CarQueryParam carParam);
+}

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.yiring.app.domain.car.Car;
+import com.yiring.app.domain.car.CarRepository;
+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.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.vo.PageVo;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.*;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author tzl
+ * 2022/4/11 13:58
+ */
+@Service
+public class CarServiceImpl implements CarService {
+
+    @Resource
+    CarRepository carRepository;
+
+    @Override
+    public Result<Long> saveCarInfo(CarParam carParam) {
+        // 检查车牌号是否已存在
+        if (hasCarInfoByCarNum(carParam.getCarNum())) {
+            return Result.no(Status.BAD_REQUEST, "您的车牌号已预约登记");
+        }
+        // 检查司机手机号码号是否已存在
+        if (hasCarInfoByMobile(carParam.getDriverMobile())) {
+            return Result.no(Status.BAD_REQUEST, "您的联系方式已预约登记");
+        }
+        Car car = Car
+            .builder()
+            .labelCardStatus("1")
+            .carNum(carParam.getCarNum())
+            .carType(carParam.getCarType())
+            .driverMobile(carParam.getDriverMobile())
+            .driverName(carParam.getDriverName())
+            .intervieweeId(carParam.getIntervieweeId())
+            .orgId(carParam.getOrgId())
+            .reason(carParam.getReason())
+            .createTime(LocalDateTime.now())
+            .build();
+        Car carReuslt = carRepository.saveAndFlush(car);
+        return Result.ok(carReuslt.getId());
+    }
+
+    @Override
+    public Result<Long> updateCarInfo(CarParam carParam, IdParam idParam) {
+        Optional<Car> optional = carRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Car car = optional.get();
+        //如果标签卡在使用中无法修改
+        if (StrUtil.isNotBlank(car.getLabelCardStatus()) && "2".equals(car.getLabelCardStatus())) {
+            return Result.no(Status.BAD_REQUEST, "标签卡使用中,信息无法修改");
+        }
+        if (!car.getCarNum().equals(carParam.getCarNum())) {
+            // 当修改车牌号时才检查重复
+            if (hasCarInfoByCarNum(carParam.getCarNum())) {
+                return Result.no(Status.BAD_REQUEST, "您的车牌号已预约登记");
+            }
+        }
+        if (!car.getDriverMobile().equals(carParam.getDriverMobile())) {
+            // 当修改联系方式时才检查重复
+            if (hasCarInfoByMobile(carParam.getDriverMobile())) {
+                return Result.no(Status.BAD_REQUEST, "您的联系方式已预约登记");
+            }
+        }
+        BeanUtils.copyProperties(carParam, car);
+        Car carReuslt = carRepository.saveAndFlush(car);
+        return Result.ok(carReuslt.getId());
+    }
+
+    @Override
+    public Result<Long> cardRec(IdParam idParam) {
+        Optional<Car> optional = carRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Car car = optional.get();
+        car.setLabelCardStatus("3");
+        car.setCardRecTime(LocalDateTime.now());
+        Car carReuslt = carRepository.saveAndFlush(car);
+        return Result.ok(carReuslt.getId());
+    }
+
+    @Override
+    public Result<Long> cardSend(IdParam idParam, String labelCard) {
+        Optional<Car> optional = carRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Car car = optional.get();
+        car.setLabelCardStatus("2");
+        car.setCardSendTime(LocalDateTime.now());
+        car.setLabelCard(labelCard);
+        Car carReuslt = carRepository.saveAndFlush(car);
+        return Result.ok(carReuslt.getId());
+    }
+
+    @Override
+    public Result<String> deleteCarInfo(IdParam idParam) {
+        Optional<Car> optional = carRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+
+        //正在使用中的信息无法删除
+        Car entity = optional.get();
+        if ("2".equals(entity.getLabelCardStatus())) {
+            return Result.no(Status.BAD_REQUEST, "标签卡使用中,信息无法删除");
+        }
+        carRepository.delete(entity);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<CarVo> getCarInfo(IdParam idParam) {
+        Optional<Car> optional = carRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+
+        Car entity = optional.get();
+        CarVo vo = new CarVo();
+        BeanUtils.copyProperties(entity, vo, Role.Fields.permissions);
+        return Result.ok(vo);
+    }
+
+    @Override
+    public Result<PageVo<CarVo>> pageCarInfo(CarQueryParam carParam) {
+        PageVo<CarVo> resultVo = null;
+        //排序
+        Sort sort = Sort.by(Sort.Order.desc(Car.Fields.createTime));
+        //如果传分页参数则分页,否查全部数据
+        if (Objects.nonNull(carParam.getPageNo()) && Objects.nonNull(carParam.getPageSize())) {
+            //分页
+            Pageable pageable = PageRequest.of(carParam.getPageNo() - 1, carParam.getPageSize());
+            Page<Car> all = carRepository.findAll(condition(carParam), pageable);
+            List<CarVo> data = all
+                .get()
+                .map(car -> {
+                    CarVo vo = new CarVo();
+                    BeanUtils.copyProperties(car, vo);
+                    return vo;
+                })
+                .collect(Collectors.toList());
+            resultVo = PageVo.build(data, all.getTotalElements());
+        } else {
+            List<Car> all = carRepository.findAll(condition(carParam), sort);
+            List<CarVo> data = all
+                .stream()
+                .map(car -> {
+                    CarVo vo = new CarVo();
+                    BeanUtils.copyProperties(car, vo);
+                    return vo;
+                })
+                .collect(Collectors.toList());
+            resultVo = PageVo.build(data, data.size());
+        }
+        return Result.ok(resultVo);
+    }
+
+    @Override
+    public List<Car> export(CarQueryParam carParam) {
+        return carRepository.findAll(condition(carParam));
+    }
+
+    @Override
+    public boolean hasCarInfoByCarNum(String param) {
+        Car entity = Car.builder().carNum(param).labelCardStatus("1").build();
+        long count = carRepository.count(Example.of(entity));
+        entity = Car.builder().carNum(param).labelCardStatus("2").build();
+        long count1 = carRepository.count(Example.of(entity));
+        return count + count1 > 0;
+    }
+
+    @Override
+    public boolean hasCarInfoByMobile(String param) {
+        Car entity = Car.builder().driverMobile(param).labelCardStatus("1").build();
+        long count = carRepository.count(Example.of(entity));
+        entity = Car.builder().driverMobile(param).labelCardStatus("2").build();
+        long count1 = carRepository.count(Example.of(entity));
+        return count + count1 > 0;
+    }
+
+    @Override
+    public Specification<Car> condition(CarQueryParam carParam) {
+        return (root, query, criteriaBuilder) -> {
+            List<Predicate> list = new ArrayList<>();
+            //查询条件
+            if (StrUtil.isNotBlank(carParam.getCarNum())) {
+                //车牌号码查询
+                list.add(criteriaBuilder.like(root.get(Car.Fields.carNum), "%" + carParam.getCarNum() + "%"));
+            }
+
+            if (StrUtil.isNotBlank(carParam.getCarType())) {
+                //车辆类型查询
+                list.add(criteriaBuilder.like(root.get("carType").as(String.class), "%" + carParam.getCarType() + "%"));
+            }
+
+            if (StrUtil.isNotBlank(carParam.getDriverName())) {
+                //司机名称查询
+                list.add(
+                    criteriaBuilder.like(root.get("driverName").as(String.class), "%" + carParam.getDriverName() + "%")
+                );
+            }
+
+            if (StrUtil.isNotBlank(carParam.getDriverMobile())) {
+                //司机电话号码查询
+                list.add(
+                    criteriaBuilder.like(
+                        root.get("driverMobile").as(String.class),
+                        "%" + carParam.getDriverMobile() + "%"
+                    )
+                );
+            }
+
+            if (StrUtil.isNotBlank(carParam.getOrgId())) {
+                //所属单位查询
+                list.add(criteriaBuilder.like(root.get("orgId").as(String.class), "%" + carParam.getOrgId() + "%"));
+            }
+
+            if (StrUtil.isNotBlank(carParam.getReason())) {
+                //来访原因查询
+                list.add(criteriaBuilder.like(root.get("reason").as(String.class), "%" + carParam.getReason() + "%"));
+            }
+
+            if (Objects.nonNull(carParam.getCreateTimeStart()) && Objects.nonNull(carParam.getCreateTimeEnd())) {
+                //来访时间区间段查询
+                list.add(
+                    criteriaBuilder.between(
+                        root.get(Car.Fields.createTime),
+                        carParam.getCreateTimeStart(),
+                        carParam.getCreateTimeEnd()
+                    )
+                );
+            }
+
+            if (StrUtil.isNotBlank(carParam.getLabelCard())) {
+                //标签卡号查询
+                list.add(
+                    criteriaBuilder.like(root.get("labelCard").as(String.class), "%" + carParam.getLabelCard() + "%")
+                );
+            }
+
+            if (StrUtil.isNotBlank(carParam.getLabelCardStatus())) {
+                //标签卡状态查询
+                list.add(
+                    criteriaBuilder.equal(root.get("labelCardStatus").as(String.class), carParam.getLabelCardStatus())
+                );
+            }
+
+            if (Objects.nonNull(carParam.getCardRecTimeStart()) && Objects.nonNull(carParam.getCardRecTimeEnd())) {
+                //来访时间区间段查询
+                list.add(
+                    criteriaBuilder.between(
+                        root.get(Car.Fields.cardRecTime),
+                        carParam.getCardRecTimeStart(),
+                        carParam.getCardRecTimeEnd()
+                    )
+                );
+            }
+
+            Predicate[] predicates = new Predicate[list.size()];
+            query.where(list.toArray(predicates));
+            return criteriaBuilder.and(list.toArray(predicates));
+        };
+    }
+}

basic-auth/src/main/java/com/yiring/auth/service/dept/DepartmentService.java → app/src/main/java/com/yiring/app/service/dept/DepartmentService.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.dept;
+package com.yiring.app.service.dept;
 
-import com.yiring.auth.param.dept.DepartmentAddParam;
+import com.yiring.app.param.dept.DepartmentAddParam;
+import com.yiring.app.param.dept.DepartmentFindParam;
+import com.yiring.app.vo.dept.DepartmentInfoVo;
+import com.yiring.app.vo.dept.DepartmentVo;
 import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.vo.PageVo;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  * 部门管理
@@ -16,4 +22,25 @@ public interface DepartmentService {
      * @return Result<String>
      */
     Result<String> addDepartment(DepartmentAddParam param);
+
+    /**
+     * 查询树状图
+     * @param param DepartmentFindParam
+     * @return Result<PageVo<DepartmentVo>>
+     */
+    Result<PageVo<DepartmentVo>> findDepartmentTree(DepartmentFindParam param);
+
+    /**
+     * 根据id查询详细信息
+     * @param idParam IdParam
+     * @return Result<DepartmentInfoVo>
+     */
+    Result<DepartmentInfoVo> findDepartmentInfo(IdParam idParam);
+
+    /**
+     * 导出部门
+     * @param param DepartmentFindParam
+     * @param response HttpServletResponse
+     */
+    void exportDepartment(DepartmentFindParam param, HttpServletResponse response);
 }

app/src/main/java/com/yiring/app/service/dept/impl/DepartmentServiceImpl.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.dept.impl;
+
+import cn.hutool.core.util.ObjectUtil;
+import com.github.liaochong.myexcel.core.DefaultStreamExcelBuilder;
+import com.yiring.app.excel.dept.DepartmentExportExcel;
+import com.yiring.app.param.dept.DepartmentAddParam;
+import com.yiring.app.param.dept.DepartmentFindParam;
+import com.yiring.app.service.dept.DepartmentService;
+import com.yiring.app.service.zy.ZyHttpService;
+import com.yiring.app.vo.dept.DepartmentInfoVo;
+import com.yiring.app.vo.dept.DepartmentVo;
+import com.yiring.auth.domain.dept.Department;
+import com.yiring.auth.domain.dept.DepartmentRepository;
+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 java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.springframework.data.domain.*;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 部门管理
+ * @author LJ-2204
+ * @date 2022/4/19
+ */
+
+@Transactional(rollbackFor = RuntimeException.class)
+@Service
+@Slf4j
+public class DepartmentServiceImpl implements DepartmentService {
+
+    @Resource
+    DepartmentRepository departmentRepository;
+
+    @Resource
+    ZyHttpService zyHttpService;
+
+    @Override
+    public Result<String> addDepartment(DepartmentAddParam param) {
+        // todo
+        Department department = param.transform();
+        departmentRepository.save(department);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<PageVo<DepartmentVo>> findDepartmentTree(DepartmentFindParam param) {
+        Department department = Department.builder().enable(param.getEnable()).build();
+        List<Department> departments = departmentRepository.findAll(Example.of(department));
+        List<DepartmentVo> departmentVos = DepartmentVo.transforms(departments);
+        List<DepartmentVo> departmentVoList = getChildrenList(0L, null, departmentVos);
+        PageVo<DepartmentVo> pageVo = PageVo.build(departmentVoList, departmentVoList.size());
+        return Result.ok(pageVo);
+    }
+
+    @Override
+    public Result<DepartmentInfoVo> findDepartmentInfo(IdParam idParam) {
+        Optional<Department> department = departmentRepository.findOne(
+            Example.of(Department.builder().id(idParam.getId()).build())
+        );
+        if (department.isEmpty()) return Result.no(Status.BAD_REQUEST);
+        String pName = null;
+        if (!ObjectUtil.equals(department.get().getPid(), 0L)) {
+            Optional<Department> department_pid = departmentRepository.findOne(
+                Example.of(Department.builder().id(department.get().getPid()).build())
+            );
+            if (department_pid.isEmpty()) return Result.no(Status.BAD_REQUEST);
+            pName = department_pid.get().getName();
+        }
+        DepartmentInfoVo departmentInfoVo = DepartmentInfoVo.transform(department.get());
+        departmentInfoVo.setPName(pName);
+        return Result.ok(departmentInfoVo);
+    }
+
+    @Override
+    public void exportDepartment(DepartmentFindParam param, HttpServletResponse response) {
+        List<Department> departments = departmentRepository.findAll(
+            Example.of(Department.builder().enable(param.getEnable()).build())
+        );
+        List<DepartmentExportExcel> departmentExportExcels = DepartmentExportExcel.transforms(departments);
+        try (
+            DefaultStreamExcelBuilder<DepartmentExportExcel> streamExcelBuilder = DefaultStreamExcelBuilder
+                .of(DepartmentExportExcel.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(departmentExportExcels);
+
+            String fileName = URLEncoder.encode("部门信息.xlsx", StandardCharsets.UTF_8);
+            response.setContentType("application/octet-stream");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
+            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());
+        }
+    }
+
+    public List<DepartmentVo> getChildrenList(Long pid, String pName, List<DepartmentVo> departmentVos) {
+        return departmentVos
+            .stream()
+            .filter(departmentVo -> pid.equals(departmentVo.getPid()))
+            .peek(departmentVo -> {
+                departmentVo.setPName(pName);
+                departmentVo.setChildList(getChildrenList(departmentVo.getId(), departmentVo.getName(), departmentVos));
+            })
+            .collect(Collectors.toList());
+    }
+}

app/src/main/java/com/yiring/app/service/dict/DictService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.dict;
+
+import com.yiring.app.param.dict.DictParam;
+import com.yiring.app.param.dict.DictQueryParam;
+import com.yiring.common.core.Result;
+import com.yiring.common.dict.Dict;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.param.PageParam;
+import com.yiring.common.vo.PageVo;
+import java.util.ArrayList;
+
+/**
+ * 字典
+ *
+ * @author tzl
+ * 2022/4/13 15:36
+ */
+public interface DictService {
+    /**
+     * 根据条件分页查询字典数据
+     *
+     * @param dictQueryParam DictQueryParam
+     * @return 字典数据集合信息
+     */
+    Result<PageVo<Dict>> pageDictInfo(DictQueryParam dictQueryParam, PageParam param);
+
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType  String
+     * @param dictValue String
+     * @return 字典标签
+     */
+    Result<String> selectDictLabel(String dictType, String dictValue);
+
+    /**
+     * 从缓存中获取字典
+     *
+     * @param dictType 字典类型
+     * @return 字典数据集合
+     */
+    Result<ArrayList<Dict>> selectDict(String dictType);
+
+    /**
+     * 根据字典数据ID查询信息
+     *
+     * @param id Long
+     * @return 字典数据
+     */
+    Result<Dict> getDictInfo(Long id);
+
+    /**
+     * 删除字典数据信息
+     *
+     * @param idParam 主键id
+     */
+    Result<String> deleteDictById(IdParam idParam);
+
+    /**
+     * 新增字典数据信息
+     *
+     * @param dictParam 字典数据信息入参
+     * @return 结果
+     */
+    Result<String> saveDictInfo(DictParam dictParam);
+
+    /**
+     * 修改字典数据信息
+     *
+     * @param idParam   主键id
+     * @param dictParam 字典数据信息入参
+     * @return 结果
+     */
+    Result<String> updateDictInfo(DictParam dictParam, IdParam idParam);
+
+    /**
+     * 是否已有该字典标签
+     *
+     * @param param String
+     * @return 是否存在
+     */
+    boolean has(String param);
+
+    /**
+     * 是否该类型字典已有该字典值
+     *
+     * @param dictType  String
+     * @param dictValue String
+     * @return 是否存在
+     */
+    boolean hasValue(String dictType, String dictValue);
+
+    /**
+     * 加载字典缓存
+     */
+    void loadingDictCache();
+}

app/src/main/java/com/yiring/app/service/dict/DictTypeService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.dict;
+
+/**
+ * @author tzl
+ * 2022/4/14 14:10
+ */
+public interface DictTypeService {
+    //    /**
+    //     * 根据条件分页查询字典类型
+    //     *
+    //     * @param dictTypeQueryParam DictTypeQueryParam
+    //     * @return 字典类型分页信息
+    //     */
+    //    Result<PageVo<DictType>> pageDictTypeInfo(DictTypeQueryParam dictTypeQueryParam, PageParam param);
+    //
+    //    Result<DictType> getDictTypeInfo(Long id);
+    //
+    //    Result<String> delecteById(Long id);
+    //
+    //    Result<String> saveDictTypeInfo(DictTypeParam dictTypeParam);
+    //
+    //    Result<String> updateDictTypeInfo(DictTypeParam dictTypeParam, IdParam idParam);
+    //
+    //    boolean has(String param);
+}

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;
+import com.yiring.common.core.Result;
+import com.yiring.common.core.Status;
+import com.yiring.common.dict.Dict;
+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.vo.PageVo;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+/**
+ * 字典
+ *
+ * @author tzl
+ * 2022/4/13 15:37
+ */
+
+@Service
+public class DictServiceImpl implements DictService {
+
+    @Resource
+    DictRepository dictRepository;
+
+    /**
+     * 项目启动时，初始化字典到缓存
+     */
+    @PostConstruct
+    public void init() {
+        loadingDictCache();
+    }
+
+    /**
+     * 加载字典缓存数据
+     */
+    @Override
+    public void loadingDictCache() {
+        Dict dict = Dict.builder().status("1").build();
+        Map<String, List<Dict>> dictDataMap = dictRepository
+            .findAll(Example.of(dict))
+            .stream()
+            .collect(Collectors.groupingBy(Dict::getDictType));
+        for (Map.Entry<String, List<Dict>> entry : dictDataMap.entrySet()) {
+            DictUtils.setDictCache(
+                entry.getKey(),
+                entry.getValue().stream().sorted(Comparator.comparing(Dict::getDictSort)).collect(Collectors.toList())
+            );
+        }
+    }
+
+    @Override
+    public Result<PageVo<Dict>> pageDictInfo(DictQueryParam dictQueryParam, PageParam param) {
+        Page<Dict> all = dictRepository.findAll(condition(dictQueryParam), PageParam.toPageable(param));
+        List<Dict> data = all
+            .get()
+            .map(car -> {
+                Dict vo = new Dict();
+                BeanUtils.copyProperties(car, vo);
+                return vo;
+            })
+            .collect(Collectors.toList());
+        PageVo<Dict> vo = PageVo.build(data, all.getTotalElements());
+        return Result.ok(vo);
+    }
+
+    @Override
+    public Result<String> selectDictLabel(String dictType, String dictValue) {
+        return Result.ok(dictRepository.findDictLabel(dictType, dictValue));
+    }
+
+    @Override
+    public Result<ArrayList<Dict>> selectDict(String dictType) {
+        List<Dict> dictCache1 = DictUtils.getDictCache(dictType);
+        ArrayList<Dict> dictCache = new ArrayList<>();
+        if (dictCache1 != null) {
+            dictCache = new ArrayList<>(dictCache1);
+        }
+        return Result.ok(dictCache);
+    }
+
+    @Override
+    public Result<Dict> getDictInfo(Long dictCode) {
+        return Result.ok(dictRepository.getById(dictCode));
+    }
+
+    @Override
+    public Result<String> deleteDictById(IdParam idParam) {
+        Optional<Dict> optional = dictRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Dict entity = optional.get();
+        dictRepository.delete(entity);
+        //刷新缓存
+        List<Dict> byDictType = dictRepository.findByDictType(entity.getDictType());
+        DictUtils.setDictCache(entity.getDictType(), byDictType);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> saveDictInfo(DictParam dictParam) {
+        if (has(dictParam.getDictLabel())) {
+            return Result.no(Status.BAD_REQUEST, "标签已存在");
+        }
+        if (hasValue(dictParam.getDictType(), dictParam.getDictValue())) {
+            return Result.no(Status.BAD_REQUEST, "该类型,字典值已存在");
+        }
+        Dict dict = new Dict();
+        dict.setCreateTime(LocalDateTime.now());
+        BeanUtils.copyProperties(dictParam, dict);
+        dictRepository.saveAndFlush(dict);
+        //刷新缓存
+        List<Dict> byDictType = dictRepository.findByDictType(dict.getDictType());
+        DictUtils.setDictCache(dict.getDictType(), byDictType);
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> updateDictInfo(DictParam dictParam, IdParam idParam) {
+        Optional<Dict> optional = dictRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Dict entity = optional.get();
+        if (!entity.getDictLabel().equals(dictParam.getDictLabel())) {
+            if (has(dictParam.getDictLabel())) {
+                //当修改了字典标签时
+                return Result.no(Status.BAD_REQUEST, "标签已存在");
+            }
+        }
+        if (
+            !entity.getDictValue().equals(dictParam.getDictValue()) ||
+            !entity.getDictType().equals(dictParam.getDictType())
+        ) {
+            //当修改了字典类型或字典值时
+            if (hasValue(dictParam.getDictType(), dictParam.getDictValue())) {
+                return Result.no(Status.BAD_REQUEST, "该类型,字典值已存在");
+            }
+        }
+        BeanUtils.copyProperties(dictParam, entity);
+        Dict dict = dictRepository.saveAndFlush(entity);
+        List<Dict> byDictType = dictRepository.findByDictType(dict.getDictType());
+        DictUtils.setDictCache(dict.getDictType(), byDictType);
+        return Result.ok();
+    }
+
+    public Specification<Dict> condition(DictQueryParam dictQueryParam) {
+        return (root, query, criteriaBuilder) -> {
+            List<Predicate> list = new ArrayList<>();
+            if (StrUtil.isNotBlank(dictQueryParam.getDictType())) {
+                list.add(
+                    criteriaBuilder.like(
+                        root.get("dictType").as(String.class),
+                        "%" + dictQueryParam.getDictType() + "%"
+                    )
+                );
+            }
+
+            if (StrUtil.isNotBlank(dictQueryParam.getDictLabel())) {
+                list.add(
+                    criteriaBuilder.like(
+                        root.get("dictLabel").as(String.class),
+                        "%" + dictQueryParam.getDictLabel() + "%"
+                    )
+                );
+            }
+            Predicate[] predicates = new Predicate[list.size()];
+            query.where(list.toArray(predicates));
+            return criteriaBuilder.and(list.toArray(predicates));
+        };
+    }
+
+    @Override
+    public boolean has(String param) {
+        Dict entity = Dict.builder().dictLabel(param).build();
+        long count = dictRepository.count(Example.of(entity));
+        return count > 0;
+    }
+
+    @Override
+    public boolean hasValue(String dictType, String dictValue) {
+        Dict entity = Dict.builder().dictType(dictType).dictValue(dictValue).build();
+        long count = dictRepository.count(Example.of(entity));
+        return count > 0;
+    }
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.dict.impl;
+
+import com.yiring.app.service.dict.DictTypeService;
+import java.util.*;
+import org.springframework.stereotype.Service;
+
+/**
+ * 字典类型
+ *
+ * @author tzl
+ * 2022/4/14 14:23
+ */
+@Service
+public class DictTypeServiceImpl implements DictTypeService {
+    //
+    //    @Resource
+    //    DictTypeRepository dictTypeRepository;
+    //
+    //    @Resource
+    //    DictRepository dictRepository;
+    //
+    //    @Override
+    //    public Result<PageVo<DictType>> pageDictTypeInfo(DictTypeQueryParam dictTypeQueryParam, PageParam param) {
+    //        Page<DictType> all = dictTypeRepository.findAll(condition(dictTypeQueryParam), PageParam.toPageable(param));
+    //        List<DictType> data = all
+    //            .get()
+    //            .map(car -> {
+    //                DictType vo = new DictType();
+    //                BeanUtils.copyProperties(car, vo);
+    //                return vo;
+    //            })
+    //            .collect(Collectors.toList());
+    //        PageVo<DictType> vo = PageVo.build(data, all.getTotalElements());
+    //        return Result.ok(vo);
+    //    }
+    //
+    //    @Override
+    //    public Result<DictType> getDictTypeInfo(Long id) {
+    //        return Result.ok(dictTypeRepository.getById(id));
+    //    }
+    //
+    //    @Override
+    //    public Result<String> delecteById(Long id) {
+    //        Optional<DictType> optional = dictTypeRepository.findById(id);
+    //        if (optional.isEmpty()) {
+    //            return Result.no(Status.NOT_FOUND);
+    //        }
+    //        DictType entity = optional.get();
+    //        List<Dict> byDictType1 = dictRepository.findByDictType(entity.getDictType());
+    //        if (byDictType1.size() > 0) {
+    //            return Result.no(Status.BAD_REQUEST, "该类型下有字典数据,无法删除");
+    //        }
+    //
+    //        dictTypeRepository.delete(entity);
+    //        //移除该类型缓存
+    //        DictUtils.removeDictCache(entity.getDictType());
+    //        return Result.ok();
+    //    }
+    //
+    //    @Override
+    //    public Result<String> saveDictTypeInfo(DictTypeParam dictTypeParam) {
+    //        if (has(dictTypeParam.getDictType())) {
+    //            return Result.no(Status.BAD_REQUEST, "字典类型已存在");
+    //        }
+    //        DictType dictType = DictType.builder().createTime(LocalDateTime.now()).build();
+    //        BeanUtils.copyProperties(dictTypeParam, dictType);
+    //        dictTypeRepository.saveAndFlush(dictType);
+    //        //添加空缓存
+    //        DictUtils.setDictCache(dictType.getDictType(), null);
+    //        return Result.ok();
+    //    }
+    //
+    //    @Override
+    //    public Result<String> updateDictTypeInfo(DictTypeParam dictTypeParam, IdParam idParam) {
+    //        Optional<DictType> optional = dictTypeRepository.findById(idParam.getId());
+    //        if (optional.isEmpty()) {
+    //            return Result.no(Status.NOT_FOUND);
+    //        }
+    //        DictType dictType = optional.get();
+    //        if (!dictType.getDictType().equals(dictTypeParam.getDictType())) {
+    //            //在修改字典类型时
+    //            if (has(dictTypeParam.getDictType())) {
+    //                return Result.no(Status.BAD_REQUEST, "字典类型已存在");
+    //            }
+    //            //将该字典类型下的字典数据一并修改
+    //            dictRepository.updateDictType(dictTypeParam.getDictType(), dictType.getDictType());
+    //            //移除之前的缓存
+    //            DictUtils.removeDictCache(dictType.getDictType());
+    //        }
+    //        BeanUtils.copyProperties(dictTypeParam, dictType);
+    //        dictTypeRepository.saveAndFlush(dictType);
+    //        //查询该字典类型下的字典值数据
+    //        List<Dict> byDictType = dictRepository.findByDictType(dictType.getDictType());
+    //        //添加新缓存
+    //        DictUtils.setDictCache(dictType.getDictType(), byDictType);
+    //        return Result.ok();
+    //    }
+    //
+    //    @Override
+    //    public boolean has(String param) {
+    //        DictType dictType = DictType.builder().dictType(param).build();
+    //        return dictTypeRepository.count(Example.of(dictType)) > 0;
+    //    }
+    //
+    //    public Specification<DictType> condition(DictTypeQueryParam dictTypeQueryParam) {
+    //        return (root, query, criteriaBuilder) -> {
+    //            List<Predicate> list = new ArrayList<>();
+    //            if (StrUtils.isNotBlank(dictTypeQueryParam.getDictName())) {
+    //                list.add(
+    //                    criteriaBuilder.like(
+    //                        root.get("dictType").as(String.class),
+    //                        "%" + dictTypeQueryParam.getDictName() + "%"
+    //                    )
+    //                );
+    //            }
+    //            Predicate[] predicates = new Predicate[list.size()];
+    //            query.where(list.toArray(predicates));
+    //            return criteriaBuilder.and(list.toArray(predicates));
+    //        };
+    //    }
+}

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

@@ -6,6 +6,7 @@ import com.yiring.app.param.location.LocationTagDeleteParam;
 import com.yiring.app.param.location.LocationTagFindParam;
 import com.yiring.app.vo.location.LocationTagVo;
 import com.yiring.common.core.Result;
+import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.web.multipart.MultipartFile;
@@ -28,7 +29,7 @@ public interface LocationTagService {
      * @param param 入参
      * @return Result<PageVo<LocationTagVo>>
      */
-    Result<PageVo<LocationTagVo>> findLocationTagPage(LocationTagFindParam param);
+    Result<PageVo<LocationTagVo>> findLocationTagPage(LocationTagFindParam param, PageParam pageParam);
 
     /**
      * 销毁定位标签

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

@@ -16,10 +16,11 @@ import com.yiring.app.param.location.LocationTagDeleteParam;
 import com.yiring.app.param.location.LocationTagFindParam;
 import com.yiring.app.param.location.zy.ZyLocationTagAddParam;
 import com.yiring.app.service.location.LocationTagService;
+import com.yiring.app.service.zy.ZyHttpService;
 import com.yiring.app.vo.location.LocationTagVo;
-import com.yiring.auth.service.zy.ZyHttpService;
 import com.yiring.common.core.Result;
 import com.yiring.common.core.Status;
+import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import java.io.IOException;
 import java.io.InputStream;
@@ -73,14 +74,14 @@ public class LocationTagServiceImpl implements LocationTagService {
     }
 
     @Override
-    public Result<PageVo<LocationTagVo>> findLocationTagPage(LocationTagFindParam param) {
+    public Result<PageVo<LocationTagVo>> findLocationTagPage(LocationTagFindParam param, PageParam pageParam) {
         Specification<LocationTag> specification = getLocationTagPageSpecification(param);
 
         Sort sort = Sort.by(Sort.Order.desc(LocationTag.Fields.createTime));
 
-        if (ObjectUtil.isNotEmpty(param.getPageNo()) && ObjectUtil.isNotEmpty(param.getPageSize())) {
+        if (ObjectUtil.isNotEmpty(pageParam.getPageNo()) && ObjectUtil.isNotEmpty(pageParam.getPageSize())) {
             //分页
-            Pageable pageable = PageRequest.of(param.getPageNo() - 1, param.getPageSize());
+            Pageable pageable = PageRequest.of(pageParam.getPageNo() - 1, pageParam.getPageSize());
             Page<LocationTag> locationTags = locationTagRepository.findAll(specification, pageable);
             List<LocationTagVo> locationTagVos = LocationTagVo.transforms(locationTags.getContent());
             PageVo<LocationTagVo> page = PageVo.build(locationTagVos, locationTagVos.size());
@@ -125,6 +126,7 @@ public class LocationTagServiceImpl implements LocationTagService {
 
             String fileName = URLEncoder.encode("定位标签信息.xlsx", StandardCharsets.UTF_8);
             response.setContentType("application/octet-stream");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
             response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
             OutputStream out = response.getOutputStream();
 
@@ -154,12 +156,14 @@ public class LocationTagServiceImpl implements LocationTagService {
             log.info(e.getMessage());
             throw new RuntimeException("文件导入异常");
         }
-
-        List<LocationTag> locationTags = locationTagImportExcels
-            .stream()
-            .filter(locationTagImportExcel -> !hasLocationTagInfoByCode(locationTagImportExcel.getCode()))
-            .map(LocationTagImportExcel::transform)
-            .collect(Collectors.toList());
+        List<LocationTag> locationTags;
+
+        locationTags =
+            locationTagImportExcels
+                .stream()
+                .filter(locationTagImportExcel -> !hasLocationTagInfoByCode(locationTagImportExcel.getCode()))
+                .map(LocationTagImportExcel::transform)
+                .collect(Collectors.toList());
 
         List<ZyLocationTagAddParam> zyLocationTagAddParams = ZyLocationTagAddParam.transforms(
             locationTagImportExcels,

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

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.post;
+package com.yiring.app.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.app.param.post.PostFindParam;
+import com.yiring.app.param.post.PostParam;
+import com.yiring.app.vo.post.PostVo;
 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 javax.servlet.http.HttpServletResponse;
 
@@ -42,7 +43,7 @@ public interface PostService {
      * @param param 入参
      * @return Result<PageVo<PostVo>>
      */
-    Result<PageVo<PostVo>> findPostPage(PostFindParam param);
+    Result<PageVo<PostVo>> findPostPage(PostFindParam param, PageParam pageParam);
 
     /**
      * 详细信息查询

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

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.post.impl;
+package com.yiring.app.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.app.param.post.PostFindParam;
+import com.yiring.app.param.post.PostParam;
+import com.yiring.app.service.post.PostService;
+import com.yiring.app.vo.post.PostVo;
 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.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import java.io.OutputStream;
 import java.net.URLEncoder;
@@ -83,14 +84,14 @@ public class PostServiceImpl implements PostService {
     }
 
     @Override
-    public Result<PageVo<PostVo>> findPostPage(PostFindParam param) {
+    public Result<PageVo<PostVo>> findPostPage(PostFindParam param, PageParam pageParam) {
         Specification<Post> specification = getPostPageSpecification(param);
 
         Sort sort = Sort.by(Sort.Order.desc(Post.Fields.createTime));
 
-        if (ObjectUtil.isNotEmpty(param.getPageSize()) && ObjectUtil.isNotEmpty(param.getPageNo())) {
+        if (ObjectUtil.isNotEmpty(pageParam.getPageSize()) && ObjectUtil.isNotEmpty(pageParam.getPageNo())) {
             //分页
-            Pageable pageable = PageRequest.of(param.getPageNo() - 1, param.getPageSize());
+            Pageable pageable = PageRequest.of(pageParam.getPageNo() - 1, pageParam.getPageSize());
             Page<Post> page = postRepository.findAll(specification, pageable);
             List<PostVo> postVos = PostVo.transforms(page.getContent());
             PageVo<PostVo> pageVo = PageVo.build(postVos, postVos.size());
@@ -137,6 +138,7 @@ public class PostServiceImpl implements PostService {
 
             String fileName = URLEncoder.encode("职位信息.xlsx", StandardCharsets.UTF_8);
             response.setContentType("application/octet-stream");
+            response.setHeader("Access-Control-Expose-Headers", "Content-Disposition");
             response.setHeader("Content-Disposition", "attachment;filename=" + fileName);
             OutputStream out = response.getOutputStream();
 
@@ -165,7 +167,7 @@ public class PostServiceImpl implements PostService {
 
             Order order = cb.desc(root.get(Post.Fields.createTime));
 
-            return cq.where(predicates.toArray(new Predicate[0])).getRestriction();
+            return cq.orderBy(order).where(predicates.toArray(new Predicate[0])).getRestriction();
         };
     }
 }

app/src/main/java/com/yiring/app/service/user/UserService.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.user;
+
+import com.yiring.app.param.user.UserBingTagParam;
+import com.yiring.app.param.user.UserFindParam;
+import com.yiring.app.vo.user.UserVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.param.PageParam;
+import com.yiring.common.vo.PageVo;
+
+/**
+ * 用户
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+public interface UserService {
+    /**
+     * 表格查询
+     * @param param UserByNameParam
+     * @param pageParam PageParam
+     * @return Result<PageVo<UserAutoVo>>
+     */
+    Result<PageVo<UserVo>> findUserPage(UserFindParam param, PageParam pageParam);
+
+    /**
+     * 用户详细信息
+     * @param idParam IdParam
+     * @return Result<UserVo>
+     */
+    Result<UserVo> findUserById(IdParam idParam);
+
+    /**
+     * 用户绑定标签
+     * @param param UserBingTagParam
+     * @return Result<String>
+     */
+    Result<String> userBingTag(UserBingTagParam param);
+
+    /**
+     * 收卡
+     * @param idParam IdParam
+     * @return Result<String>
+     */
+    Result<String> userUnBingTag(IdParam idParam);
+
+    /**
+     * 删除用户
+     * @param idParam
+     * @return
+     */
+    Result<String> deleteUser(IdParam idParam);
+}

app/src/main/java/com/yiring/app/service/user/impl/UserServiceImpl.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.user.impl;
+
+import cn.hutool.core.collection.ListUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.yiring.app.domain.location.LocationTag;
+import com.yiring.app.domain.location.LocationTagRepository;
+import com.yiring.app.param.user.UserBingTagParam;
+import com.yiring.app.param.user.UserFindParam;
+import com.yiring.app.service.user.UserService;
+import com.yiring.app.vo.user.UserVo;
+import com.yiring.auth.domain.dept.Department;
+import com.yiring.auth.domain.dept.DepartmentRepository;
+import com.yiring.auth.domain.post.Post;
+import com.yiring.auth.domain.user.User;
+import com.yiring.auth.domain.user.UserRepository;
+import com.yiring.common.core.Result;
+import com.yiring.common.core.Status;
+import com.yiring.common.domain.BasicEntity;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.param.PageParam;
+import com.yiring.common.vo.PageVo;
+import java.util.List;
+import java.util.Optional;
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.domain.Example;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 用户
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+
+@Transactional(rollbackFor = RuntimeException.class)
+@Service
+@Slf4j
+public class UserServiceImpl implements UserService {
+
+    @Resource
+    EntityManager em;
+
+    @Resource
+    UserRepository userRepository;
+
+    @Resource
+    LocationTagRepository locationTagRepository;
+
+    @Resource
+    DepartmentRepository departmentRepository;
+
+    @Override
+    public Result<PageVo<UserVo>> findUserPage(UserFindParam param, PageParam pageParam) {
+        CriteriaBuilder cb = em.getCriteriaBuilder();
+        CriteriaQuery<UserVo> cq = cb.createQuery(UserVo.class);
+        Root<User> root = cq.from(User.class);
+        Expression<String> realName = root.get(User.Fields.realName);
+        Expression<String> uuid = root.get(User.Fields.uuid);
+        Expression<User.Type> type = root.get(User.Fields.type);
+        Expression<Department> department = root.get(User.Fields.department).get("name");
+        Expression<String> mobile = root.get(User.Fields.mobile);
+        Expression<Post> post = root.get(User.Fields.post).get("name");
+
+        Subquery<String> query = cq.subquery(String.class);
+        Root<LocationTag> tagRoot = query.from(LocationTag.class);
+        query.select(tagRoot.get(LocationTag.Fields.code));
+        query.where(cb.equal(tagRoot.get(LocationTag.Fields.user), root));
+
+        cq.multiselect(realName, uuid, type, department, mobile, post, query);
+
+        List<Predicate> predicates = ListUtil.toList();
+
+        if (StrUtil.isNotEmpty(param.getRealName())) {
+            predicates.add(cb.like(root.get(User.Fields.realName), "%" + param.getRealName() + "%"));
+        }
+
+        if (StrUtil.isNotEmpty(param.getCode())) {
+            predicates.add(cb.like(root.get(LocationTag.Fields.code), "%" + param.getCode() + "%"));
+        }
+
+        if (StrUtil.isNotEmpty(param.getUuid())) {
+            predicates.add(cb.like(root.get(User.Fields.uuid), "%" + param.getUuid() + "%"));
+        }
+
+        if (StrUtil.isNotEmpty(param.getMobile())) {
+            predicates.add(cb.like(root.get(User.Fields.mobile), "%" + param.getMobile() + "%"));
+        }
+
+        if (ObjectUtil.isNotEmpty(param.getDeptId())) {
+            predicates.add(cb.equal(root.get(User.Fields.department).get("id"), param.getDeptId()));
+        }
+
+        Order order = cb.desc(root.get(BasicEntity.Fields.createTime));
+
+        cq.orderBy(order).where(predicates.toArray(new Predicate[0])).getRestriction();
+
+        if (ObjectUtil.isNotEmpty(pageParam.getPageNo()) || ObjectUtil.isNotEmpty(pageParam.getPageSize())) {
+            List<UserVo> userVos = em
+                .createQuery(cq)
+                .setFirstResult(pageParam.getPageNo())
+                .setMaxResults(pageParam.getPageSize())
+                .getResultList();
+            PageVo<UserVo> page = PageVo.build(userVos, userVos.size());
+            return Result.ok(page);
+        } else {
+            List<UserVo> userVos = em.createQuery(cq).getResultList();
+            PageVo<UserVo> page = PageVo.build(userVos, userVos.size());
+            return Result.ok(page);
+        }
+    }
+
+    @Override
+    public Result<UserVo> findUserById(IdParam idParam) {
+        Optional<User> userOptional = userRepository.findOne(Example.of(User.builder().id(idParam.getId()).build()));
+        if (userOptional.isPresent()) {
+            UserVo userVo = UserVo.transformUserInfo(userOptional.get());
+            return Result.ok(userVo);
+        }
+        return Result.no(Status.BAD_REQUEST);
+    }
+
+    @Override
+    public Result<String> userBingTag(UserBingTagParam param) {
+        Optional<LocationTag> locationTagOptional = locationTagRepository.findOne(
+            Example.of(LocationTag.builder().code(param.getCode()).build())
+        );
+        if (locationTagOptional.isEmpty()) throw new RuntimeException("标签卡不存在");
+        LocationTag locationTag = locationTagOptional.get();
+        if (!ObjectUtil.isNotEmpty(locationTag.getUser())) {
+            throw new RuntimeException("已绑定其他用户 : " + locationTag.getUser().getRealName());
+        }
+
+        locationTag.setUser(User.builder().id(param.getId()).build());
+        locationTag.setUsed(true);
+        locationTagRepository.save(locationTag);
+
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> userUnBingTag(IdParam idParam) {
+        LocationTag build = LocationTag.builder().user(User.builder().id(idParam.getId()).build()).build();
+        Optional<LocationTag> locationTagOptional = locationTagRepository.findOne(Example.of(build));
+        if (locationTagOptional.isEmpty()) return Result.no(Status.BAD_REQUEST);
+        LocationTag locationTag = locationTagOptional.get();
+        locationTag.setUser(null);
+        locationTag.setUsed(false);
+        locationTagRepository.save(locationTag);
+
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> deleteUser(IdParam idParam) {
+        LocationTag locationTagBuild = LocationTag.builder().user(User.builder().id(idParam.getId()).build()).build();
+        long locationTagCount = locationTagRepository.count(Example.of(locationTagBuild));
+        if (locationTagCount > 0) return Result.no(Status.BAD_REQUEST, "已发卡，不可删除");
+
+        Department departmentBuild = Department.builder().leader(User.builder().id(idParam.getId()).build()).build();
+        long departmentCount = departmentRepository.count(Example.of(departmentBuild));
+        if (departmentCount > 0) return Result.no(Status.BAD_REQUEST, "部门负责人，请先解绑");
+
+        userRepository.deleteById(idParam.getId());
+        return Result.ok();
+    }
+}

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.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 org.locationtech.jts.geom.Point;
+
+/**
+ * @author tzl
+ * 2022/4/8 15:28
+ */
+public interface VideoService {
+    /**
+     * 监控视频点位添加
+     *
+     * @param videoParam VideoParam
+     * @return Result<String>
+     * @author tzl
+     * @date 2022/4/8 16:23
+     */
+    Result<String> saveVideo(VideoParam videoParam);
+
+    /**
+     * 删除监控点位信息
+     * @param idParam 主键id
+     * @return Result<String>
+     * @author tzl
+     * @date 2022/4/15 10:16
+     */
+    Result<String> deleteVideo(IdParam idParam);
+
+    /**
+     * 修改监控点位信息
+     * @param videoParam 修改的参数
+     * @param idParam    主键id
+     * @return Result<String>
+     * @author tzl
+     * @date 2022/4/15 10:19
+     */
+    Result<String> updateVideo(VideoParam videoParam, IdParam idParam);
+
+    /**
+     * 查询监控点坐标
+     * @param idParam 主键id
+     * @return Result<Point> 坐标信息
+     * @author tzl
+     * @date 2022/4/15 14:15
+     */
+    Result<Point> selectPoint(IdParam idParam);
+
+    /**
+     * 分页查询
+     * @param videoQueryParam 筛选条件
+     * @param param  分页参数
+     * @return Result<PageVo<VideoVo>> 分页结果集
+     * @author tzl
+     * @date 2022/4/15 14:35
+     */
+    Result<PageVo<VideoVo>> pageVideo(VideoQueryParam videoQueryParam, PageParam param);
+}

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.StrUtil;
+import com.yiring.app.domain.video.Video;
+import com.yiring.app.domain.video.VideoRepository;
+import com.yiring.app.param.video.VideoParam;
+import com.yiring.app.param.video.VideoQueryParam;
+import com.yiring.app.service.video.VideoService;
+import com.yiring.app.util.GeoUtils;
+import com.yiring.app.vo.video.VideoVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.core.Status;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.param.PageParam;
+import com.yiring.common.vo.PageVo;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
+import javax.annotation.Resource;
+import javax.persistence.criteria.Predicate;
+import org.locationtech.jts.geom.Point;
+import org.springframework.beans.BeanUtils;
+import org.springframework.data.domain.Example;
+import org.springframework.data.domain.Page;
+import org.springframework.data.jpa.domain.Specification;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author tzl
+ * 2022/4/8 15:28
+ */
+@Service
+public class VideoServiceImpl implements VideoService {
+
+    @Resource
+    VideoRepository videoRepository;
+
+    @Override
+    public Result<String> saveVideo(VideoParam videoParam) {
+        if (has(videoParam.getUuid())) {
+            return Result.no(Status.BAD_REQUEST, "您输入的编号已存在");
+        }
+
+        Video video = Video
+            .builder()
+            .createTime(LocalDateTime.now())
+            //            .enable(videoParam.getEnable())
+            //            .m3u8(videoParam.getM3u8())
+            //            .point(videoParam.getPoint())
+            .m3u8(videoParam.getM3u8())
+            .point(GeoUtils.createPoint(videoParam.getLon(), videoParam.getLat()))
+            //            .online(videoParam.getOnline())
+            //            .type(videoParam.getType())
+            //默认正常
+            .videoName(videoParam.getVideoName())
+            .status("1")
+            .remark(videoParam.getRemark())
+            .uuid(videoParam.getUuid())
+            .build();
+        videoRepository.saveAndFlush(video);
+        //还需要同步添加国标28181中对应的摄像头信息
+        //标识uuid对应流id,m3u8对应拉流地址,如m3u8中有标注 则将类型切换为FFmpeg,摄像头名称videoName对应名称,流名称默认"stream",超时时间默认60
+
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> deleteVideo(IdParam idParam) {
+        Optional<Video> optional = videoRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Video video = optional.get();
+        videoRepository.delete(video);
+        //还需要同步删除国标28181中对应的摄像头信息
+
+        return Result.ok();
+    }
+
+    @Override
+    public Result<String> updateVideo(VideoParam videoParam, IdParam idParam) {
+        Optional<Video> optional = videoRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Video video = optional.get();
+        if (!video.getUuid().equals(videoParam.getUuid())) {
+            //当修改编号时
+            if (has(videoParam.getUuid())) {
+                return Result.no(Status.BAD_REQUEST, "您输入的编号已存在");
+            }
+        }
+        BeanUtils.copyProperties(videoParam, video);
+        videoRepository.saveAndFlush(video);
+        //还需要同步修改国标28181中对应的摄像头信息
+
+        return Result.ok();
+    }
+
+    @Override
+    public Result<Point> selectPoint(IdParam idParam) {
+        Optional<Video> optional = videoRepository.findById(idParam.getId());
+        if (optional.isEmpty()) {
+            return Result.no(Status.NOT_FOUND);
+        }
+        Video video = optional.get();
+        return Result.ok(video.getPoint());
+    }
+
+    @Override
+    public Result<PageVo<VideoVo>> pageVideo(VideoQueryParam videoQueryParam, PageParam param) {
+        Page<Video> all = videoRepository.findAll(condition(videoQueryParam), PageParam.toPageable(param));
+        List<VideoVo> data = all
+            .get()
+            .map(video -> {
+                VideoVo vo = new VideoVo();
+                BeanUtils.copyProperties(video, vo);
+                return vo;
+            })
+            .collect(Collectors.toList());
+        PageVo<VideoVo> vo = PageVo.build(data, all.getTotalElements());
+        return Result.ok(vo);
+    }
+
+    /**
+     * 条件查询
+     * @param videoQueryParam 筛选条件
+     * @return Specification
+     */
+    public Specification<Video> condition(VideoQueryParam videoQueryParam) {
+        return (root, query, criteriaBuilder) -> {
+            List<Predicate> list = new ArrayList<>();
+            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));
+        };
+    }
+
+    boolean has(String uuid) {
+        Video video = Video.builder().uuid(uuid).build();
+        return videoRepository.count(Example.of(video)) > 0;
+    }
+}

basic-auth/src/main/java/com/yiring/auth/service/zy/ZyHttpService.java → app/src/main/java/com/yiring/app/service/zy/ZyHttpService.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.zy;
+package com.yiring.app.service.zy;
 
 import com.yiring.common.core.Result;
 import java.io.Serializable;

basic-auth/src/main/java/com/yiring/auth/service/zy/impl/ZyHttpServiceImpl.java → app/src/main/java/com/yiring/app/service/zy/impl/ZyHttpServiceImpl.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.zy.impl;
+package com.yiring.app.service.zy.impl;
 
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.http.Header;
 import cn.hutool.http.HttpRequest;
 import cn.hutool.json.JSONUtil;
-import com.yiring.auth.service.zy.ZyHttpService;
+import com.yiring.app.service.zy.ZyHttpService;
 import com.yiring.auth.util.ZyUtil;
 import com.yiring.common.core.Result;
 import java.io.Serializable;

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/util/GeoUtils.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.util;
+
+import lombok.experimental.UtilityClass;
+import org.locationtech.jts.geom.Coordinate;
+import org.locationtech.jts.geom.GeometryFactory;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * 空间函数工具类
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/15 9:52
+ */
+
+@SuppressWarnings({ "unused" })
+@UtilityClass
+public class GeoUtils {
+
+    private final GeometryFactory factory = new GeometryFactory();
+
+    /**
+     * 创建点
+     *
+     * @param lon 经度
+     * @param lat 纬度
+     * @return 点
+     */
+    public Point createPoint(double lon, double lat) {
+        return factory.createPoint(new Coordinate(lon, lat));
+    }
+}

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.Serializable;
+import java.time.LocalDateTime;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * @author tzl
+ * 2022/4/11 14:52
+ */
+@ApiModel("CarVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class CarVo implements Serializable {
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键id", example = "1458555485552")
+    Long id;
+
+    @ApiModelProperty(value = "车牌号码", example = "湘A99999")
+    String carNum;
+
+    @ApiModelProperty(value = "车辆类型", example = "1")
+    String carType;
+
+    /**
+     * 车辆类型翻译
+     */
+    @ApiModelProperty(value = "车辆类型(字典翻译)", example = "货车")
+    String carTypeName;
+
+    public String getCarTypeName() {
+        if (StrUtil.isNotBlank(carType)) {
+            return DictUtils.getDictLabel("car_type", carType);
+        }
+        return null;
+    }
+
+    @ApiModelProperty(value = "司机名称", example = "张三")
+    String driverName;
+
+    @ApiModelProperty(value = "司机电话", example = "17688888888")
+    String driverMobile;
+
+    @ApiModelProperty(value = "标签卡", example = "DT8875666")
+    String labelCard;
+
+    @ApiModelProperty(value = "标签卡状态", example = "1")
+    String labelCardStatus;
+
+    /**
+     * 车辆类型翻译
+     */
+    @ApiModelProperty(value = "标签卡状态", example = "未发卡")
+    String labelCardStatusName;
+
+    public String getLabelCardStatusName() {
+        if (StrUtil.isNotBlank(carType)) {
+            return DictUtils.getDictLabel("car_label_status", labelCardStatus);
+        }
+        return null;
+    }
+
+    @ApiModelProperty(value = "单位id", example = "湖南壹润科技")
+    String orgId;
+
+    @ApiModelProperty(value = "被访人id", example = "1")
+    String intervieweeId;
+
+    @ApiModelProperty(value = "来访原因", example = "装货")
+    String reason;
+
+    @ApiModelProperty(value = "收卡时间", example = "2022-04-11 17:25:33")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    LocalDateTime cardRecTime;
+
+    @ApiModelProperty(value = "创建时间", example = "2022-04-11 17:25:33")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    LocalDateTime createTime;
+
+    @ApiModelProperty(value = "发卡时间", example = "2022-04-11 17:25:33")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    LocalDateTime cardSendTime;
+}

app/src/main/java/com/yiring/app/vo/dept/DepartmentInfoVo.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.vo.dept;
+
+import com.yiring.app.vo.user.UserVo;
+import com.yiring.auth.domain.dept.Department;
+import com.yiring.auth.domain.post.Post;
+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.HashSet;
+import java.util.Set;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 部门详细信息视图
+ *
+ * @author LJ-2204
+ * @date 2022/4/21
+ */
+
+@ApiModel("DepartmentInfoVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DepartmentInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -1765633704385903288L;
+
+    @ApiModelProperty(value = "部门名称", example = "研发部")
+    String name;
+
+    @ApiModelProperty(value = "负责人", example = "张三")
+    UserVo userVo;
+
+    @ApiModelProperty(value = "是否启用", example = "T/F")
+    Boolean enable;
+
+    @ApiModelProperty(value = "上级部门", example = "0根目录")
+    Long pid;
+
+    @ApiModelProperty(value = "上级部门名称", example = "前端")
+    String pName;
+
+    @ApiModelProperty(value = "岗位", example = "岗位")
+    @Builder.Default
+    Set<Post> posts = new HashSet<>(0);
+
+    @ApiModelProperty(value = "更新时间", example = "2022-02-02 11:11:11")
+    LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建时间", example = "2022-02-02 11:11:11")
+    LocalDateTime createTime;
+
+    public static DepartmentInfoVo transform(Department department) {
+        return DepartmentInfoVo
+            .builder()
+            .name(department.getName())
+            .userVo(UserVo.transform(department.getLeader()))
+            .enable(department.getEnable())
+            .posts(department.getPosts())
+            .pid(department.getPid())
+            .createTime(department.getCreateTime())
+            .updateTime(department.getUpdateTime())
+            .build();
+    }
+}

app/src/main/java/com/yiring/app/vo/dept/DepartmentVo.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.vo.dept;
+
+import com.yiring.app.vo.user.UserVo;
+import com.yiring.auth.domain.dept.Department;
+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;
+import java.util.stream.Collectors;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 部门树型视图
+ *
+ * @author LJ-2204
+ * @date 2022/4/20
+ */
+
+@ApiModel("DepartmentVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class DepartmentVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -8193039102015929156L;
+
+    @ApiModelProperty(value = "主键", example = "111")
+    Long id;
+
+    @ApiModelProperty(value = "部门名称", example = "研发部")
+    String name;
+
+    @ApiModelProperty(value = "负责人", example = "张三")
+    UserVo leader;
+
+    @ApiModelProperty(value = "是否启用", example = "T/F")
+    Boolean enable;
+
+    @ApiModelProperty(value = "上级部门", example = "0根目录")
+    Long pid;
+
+    @ApiModelProperty(value = "上级部门名称", example = "前端")
+    String pName;
+
+    @ApiModelProperty(value = "更新时间", example = "2022-02-02 11:11:11")
+    LocalDateTime updateTime;
+
+    @ApiModelProperty(value = "创建时间", example = "2022-02-02 11:11:11")
+    LocalDateTime createTime;
+
+    @ApiModelProperty(value = "子节点")
+    List<DepartmentVo> childList;
+
+    public static List<DepartmentVo> transforms(List<Department> departments) {
+        return departments
+            .stream()
+            .map(department ->
+                DepartmentVo
+                    .builder()
+                    .id(department.getId())
+                    .name(department.getName())
+                    .leader(UserVo.transform(department.getLeader()))
+                    .enable(department.getEnable())
+                    .pid(department.getPid())
+                    .updateTime(department.getUpdateTime())
+                    .createTime(department.getCreateTime())
+                    .build()
+            )
+            .collect(Collectors.toList());
+    }
+}

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

@@ -6,6 +6,7 @@ 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.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -27,6 +28,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class LocationTagVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -7884163207638158359L;
 
     @JsonSerialize(using = ToStringSerializer.class)
@@ -62,6 +64,7 @@ public class LocationTagVo implements Serializable {
                     .type(locationTag.getType())
                     .silent(locationTag.getSilent())
                     .volt(locationTag.getVolt())
+                    .imei(locationTag.getImei())
                     .updateTime(locationTag.getUpdateTime())
                     .build()
             )

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

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.vo.post;
+package com.yiring.app.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.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
 import java.util.List;
@@ -27,6 +28,7 @@ import lombok.experimental.FieldDefaults;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class PostVo implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = 1011259844584399825L;
 
     @JsonSerialize(using = ToStringSerializer.class)

app/src/main/java/com/yiring/app/vo/user/UserVo.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.vo.user;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yiring.auth.domain.user.User;
+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;
+import java.util.stream.Collectors;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * 用户信息
+ * @author ifzm
+ * 2022/03/03 10:35
+ **/
+
+@ApiModel("UserVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class UserVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = -2184378273450466835L;
+
+    @JsonSerialize(using = ToStringSerializer.class)
+    @ApiModelProperty(value = "主键", example = "1")
+    Long id;
+
+    @ApiModelProperty(value = "真实姓名", example = "超级用户")
+    String realName;
+
+    @ApiModelProperty(value = "工号", example = "8888888")
+    String uuid;
+
+    @ApiModelProperty(value = "类型", example = "员工")
+    User.Type type;
+
+    @ApiModelProperty(value = "部门", example = "系统管理员")
+    String department;
+
+    @ApiModelProperty(value = "手机号", example = "13012345678")
+    String mobile;
+
+    @ApiModelProperty(value = "职位", example = "系统管理员")
+    String post;
+
+    @ApiModelProperty(value = "标签编号", example = "BTT88888888")
+    String code;
+
+    @ApiModelProperty(value = "用户名", example = "admin")
+    String username;
+
+    @ApiModelProperty(value = "邮箱", example = "developer@yiring.com")
+    String email;
+
+    @ApiModelProperty(value = "头像", example = "https://s1.ax1x.com/2022/03/30/qggJH0.jpg")
+    String avatar;
+
+    @ApiModelProperty(value = "是否启用", example = "true")
+    Boolean enabled;
+
+    @ApiModelProperty(value = "是否删除", example = "false")
+    Boolean deleted;
+
+    @ApiModelProperty(value = "最后登录IP地址", example = "127.0.0.1")
+    String lastLoginIp;
+
+    @ApiModelProperty(value = "最后登录时间", example = "2022-10-24 10:24:00")
+    LocalDateTime lastLoginTime;
+
+    @ApiModelProperty(value = "创建时间", example = "2022-01-01 00:00:00")
+    LocalDateTime createTime;
+
+    public static UserVo transform(User user) {
+        return UserVo
+            .builder()
+            .id(user.getId())
+            .realName(user.getRealName())
+            .username(user.getUsername())
+            .mobile(user.getMobile())
+            .email(user.getEmail())
+            .enabled(user.getEnabled())
+            .deleted(user.getDeleted())
+            .lastLoginIp(user.getLastLoginIp())
+            .lastLoginTime(user.getLastLoginTime())
+            .createTime(user.getCreateTime())
+            .build();
+    }
+
+    public static List<UserVo> transforms(List<User> users) {
+        return users
+            .stream()
+            .map(user ->
+                UserVo
+                    .builder()
+                    .id(user.getId())
+                    .realName(user.getRealName())
+                    .username(user.getUsername())
+                    .mobile(user.getMobile())
+                    .email(user.getEmail())
+                    .avatar(user.getAvatar())
+                    .enabled(user.getEnabled())
+                    .deleted(user.getDeleted())
+                    .lastLoginIp(user.getLastLoginIp())
+                    .lastLoginTime(user.getLastLoginTime())
+                    .createTime(user.getCreateTime())
+                    .build()
+            )
+            .collect(Collectors.toList());
+    }
+
+    public UserVo(
+        String realName,
+        String uuid,
+        User.Type type,
+        String department,
+        String mobile,
+        String post,
+        String code
+    ) {
+        this.realName = realName;
+        this.uuid = uuid;
+        this.type = type;
+        this.department = department;
+        this.mobile = mobile;
+        this.post = post;
+        this.code = code;
+    }
+
+    public static UserVo transformUserInfo(User user) {
+        return UserVo
+            .builder()
+            .id(user.getId())
+            .realName(user.getRealName())
+            .username(user.getUsername())
+            .mobile(user.getMobile())
+            .email(user.getEmail())
+            .avatar(user.getAvatar())
+            .enabled(user.getEnabled())
+            .deleted(user.getDeleted())
+            .lastLoginIp(user.getLastLoginIp())
+            .lastLoginTime(user.getLastLoginTime())
+            .createTime(user.getCreateTime())
+            .build();
+    }
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.vo.video;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+import org.locationtech.jts.geom.Point;
+
+/**
+ * @author tzl
+ * 2022/4/15 10:48
+ */
+@ApiModel("VideoVo")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class VideoVo implements Serializable {
+
+    @ApiModelProperty(value = "坐标点信息", example = "")
+    Point point;
+
+    @ApiModelProperty(value = "编号", example = "88888888")
+    String uuid;
+
+    @ApiModelProperty(value = "m3u8地址", example = "")
+    String m3u8;
+
+    @ApiModelProperty(value = "备注", example = "摄像头")
+    String remark;
+
+    @ApiModelProperty(value = "摄像头名称", example = "摄像头1")
+    String videoName;
+
+    @ApiModelProperty(value = "状态", example = "正常")
+    String status;
+}

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/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.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 车辆来访信息控制器
+ *
+ * @author tzl
+ * 2022/4/11 17:02
+ */
+@Slf4j
+@Api(tags = "Car")
+@Validated
+@RestController
+@RequestMapping("/Car/")
+public class CarController {
+
+    @Resource
+    CarService carService;
+
+    @ApiOperation(value = "新增车辆来访信息")
+    @PostMapping("saveCarInfo")
+    public Result<Long> saveCarInfo(@Valid CarParam carParam) {
+        return carService.saveCarInfo(carParam);
+    }
+
+    @ApiOperation(value = "修改车辆来访信息")
+    @PostMapping("updateCarInfo")
+    public Result<Long> updateCarInfo(@Valid CarParam carParam, @Valid IdParam idParam) {
+        return carService.updateCarInfo(carParam, idParam);
+    }
+
+    @ApiOperation(value = "收卡")
+    @PostMapping("cardRec")
+    public Result<Long> cardRec(@Valid IdParam idParam) {
+        return carService.cardRec(idParam);
+    }
+
+    @ApiOperation(value = "发卡")
+    @ApiImplicitParam(value = "标签卡", example = "DW8544568", required = true, name = "labelCard")
+    @PostMapping("cardSend")
+    public Result<Long> cardSend(@Valid IdParam idParam, String labelCard) {
+        return carService.cardSend(idParam, labelCard);
+    }
+
+    @ApiOperation(value = "删除车辆来访信息")
+    @PostMapping("deleteCarInfo")
+    public Result<String> deleteCarInfo(@Valid IdParam idParam) {
+        return carService.deleteCarInfo(idParam);
+    }
+
+    @ApiOperation(value = "查看车辆来访信息详情")
+    @GetMapping("getCarInfo")
+    public Result<CarVo> getCarInfo(@Valid IdParam idParam) {
+        return carService.getCarInfo(idParam);
+    }
+
+    @ApiOperation(value = "查看车辆来访信息(分页)")
+    @GetMapping("pageCarInfo")
+    public Result<PageVo<CarVo>> pageCarInfo(@Valid CarQueryParam carParam) {
+        return carService.pageCarInfo(carParam);
+    }
+
+    @ApiOperation(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, "车辆来访信息");
+    }
+}

basic-auth/src/main/java/com/yiring/auth/web/dept/DepartmentController.java → app/src/main/java/com/yiring/app/web/dept/DepartmentController.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.web.dept;
+package com.yiring.app.web.dept;
 
-import com.yiring.auth.param.dept.DepartmentAddParam;
-import com.yiring.auth.service.dept.DepartmentService;
+import com.yiring.app.param.dept.DepartmentAddParam;
+import com.yiring.app.param.dept.DepartmentFindParam;
+import com.yiring.app.service.dept.DepartmentService;
+import com.yiring.app.vo.dept.DepartmentInfoVo;
+import com.yiring.app.vo.dept.DepartmentVo;
 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.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -35,4 +42,22 @@ public class DepartmentController {
     public Result<String> addDepartment(@Valid DepartmentAddParam param) {
         return departmentService.addDepartment(param);
     }
+
+    @ApiOperation("树形表格")
+    @GetMapping("findDepartmentTree")
+    public Result<PageVo<DepartmentVo>> findDepartmentTree(@Valid DepartmentFindParam param) {
+        return departmentService.findDepartmentTree(param);
+    }
+
+    @ApiOperation("部门详细信息")
+    @GetMapping("findDepartmentInfo")
+    public Result<DepartmentInfoVo> findDepartmentInfo(@Valid IdParam idParam) {
+        return departmentService.findDepartmentInfo(idParam);
+    }
+
+    @ApiOperation("部门导出")
+    @GetMapping("exportDepartment")
+    public void exportDepartment(@Valid DepartmentFindParam param, HttpServletResponse response) {
+        departmentService.exportDepartment(param, response);
+    }
 }

app/src/main/java/com/yiring/app/web/dict/DictController.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web.dict;
+
+import com.yiring.app.param.dict.DictParam;
+import com.yiring.app.param.dict.DictQueryParam;
+import com.yiring.app.service.dict.DictService;
+import com.yiring.common.core.Result;
+import com.yiring.common.dict.Dict;
+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.ApiOperation;
+import java.util.ArrayList;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+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;
+
+/**
+ * 字典数据控制器
+ *
+ * @author tzl
+ * 2022/4/13 17:10
+ */
+@Slf4j
+@Validated
+@Api(tags = "Dict")
+@RestController
+@RequestMapping("/Dict/")
+public class DictController {
+
+    @Resource
+    DictService dictService;
+
+    @ApiOperation(value = "新增字典信息")
+    @PostMapping("saveDictInfo")
+    public Result<String> saveDictInfo(@Valid DictParam dictParam) {
+        return dictService.saveDictInfo(dictParam);
+    }
+
+    @ApiOperation(value = "修改字典信息")
+    @PostMapping("updateDictInfo")
+    public Result<String> updateDictInfo(@Valid DictParam dictParam, @Valid IdParam idParam) {
+        return dictService.updateDictInfo(dictParam, idParam);
+    }
+
+    @ApiOperation(value = "删除字典信息")
+    @PostMapping("deleteDictById")
+    public Result<String> deleteDictById(@Valid IdParam idParam) {
+        return dictService.deleteDictById(idParam);
+    }
+
+    @ApiOperation(value = "查看字典信息(分页)")
+    @GetMapping("pageDictInfo")
+    public Result<PageVo<Dict>> pageDictInfo(@Valid DictQueryParam queryParam, @Valid PageParam param) {
+        return dictService.pageDictInfo(queryParam, param);
+    }
+
+    @ApiOperation(value = "查看字典信息详情")
+    @GetMapping("getDictInfo")
+    public Result<Dict> getDictInfo(@Valid IdParam idParam) {
+        return dictService.getDictInfo(idParam.getId());
+    }
+
+    @ApiOperation(value = "根据类型获取字典信息详情")
+    @ApiImplicitParam(value = "字典类型", example = "user_sex", required = true, name = "dictType")
+    @GetMapping("selectDict")
+    public Result<ArrayList<Dict>> selectDict(String dictType) {
+        return dictService.selectDict(dictType);
+    }
+}

app/src/main/java/com/yiring/app/web/dict/DictTypeController.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web.dict;
+
+import io.swagger.annotations.Api;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 字典类型控制器
+ *
+ * @author tzl
+ * 2022/4/14 15:14
+ */
+
+@Slf4j
+@Validated
+@Api(tags = "DictType")
+@RestController
+@RequestMapping("/DictType/")
+public class DictTypeController {
+    //
+    //    @Resource
+    //    DictTypeService dictTypeService;
+    //
+    //    @ApiOperation(value = "新增字典类型信息")
+    //    @PostMapping("saveDictTypeInfo")
+    //    public Result<String> saveDictTypeInfo(@Valid DictTypeParam dictTypeParam) {
+    //        return dictTypeService.saveDictTypeInfo(dictTypeParam);
+    //    }
+    //
+    //    @ApiOperation(value = "修改字典类型信息")
+    //    @PostMapping("updateDictTypeInfo")
+    //    public Result<String> updateDictTypeInfo(@Valid DictTypeParam dictTypeParam, @Valid IdParam idParam) {
+    //        return dictTypeService.updateDictTypeInfo(dictTypeParam, idParam);
+    //    }
+    //
+    //    @ApiOperation(value = "删除字典类型信息")
+    //    @PostMapping("delecteById")
+    //    public Result<String> delecteById(@Valid IdParam idParam) {
+    //        return dictTypeService.delecteById(idParam.getId());
+    //    }
+    //
+    //    @ApiOperation(value = "查看字典类型信息(分页)")
+    //    @GetMapping("pageDictTypeInfo")
+    //    public Result<PageVo<DictType>> pageDictInfo(@Valid DictTypeQueryParam queryParam, @Valid PageParam param) {
+    //        return dictTypeService.pageDictTypeInfo(queryParam, param);
+    //    }
+    //
+    //    @ApiOperation(value = "查看字典类型信息详情")
+    //    @GetMapping("getDictTypeInfo")
+    //    public Result<DictType> getDictTypeInfo(@Valid IdParam idParam) {
+    //        return dictTypeService.getDictTypeInfo(idParam.getId());
+    //    }
+}

app/src/main/java/com/yiring/app/web/LocationTagController.java → app/src/main/java/com/yiring/app/web/location/tag/LocationTagController.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.app.web;
+package com.yiring.app.web.location.tag;
 
 import com.yiring.app.param.location.LocationTagAddParam;
 import com.yiring.app.param.location.LocationTagDeleteParam;
@@ -7,6 +7,7 @@ import com.yiring.app.param.location.LocationTagFindParam;
 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.PageParam;
 import com.yiring.common.vo.PageVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -42,8 +43,8 @@ public class LocationTagController {
 
     @ApiOperation("分页查询")
     @GetMapping("findLocationTagPage")
-    public Result<PageVo<LocationTagVo>> findLocationTagPage(@Valid LocationTagFindParam param) {
-        return locationTagService.findLocationTagPage(param);
+    public Result<PageVo<LocationTagVo>> findLocationTagPage(@Valid LocationTagFindParam param, PageParam pageParam) {
+        return locationTagService.findLocationTagPage(param, pageParam);
     }
 
     @ApiOperation("销毁定位标签")

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

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.web.post;
+package com.yiring.app.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.app.param.post.PostFindParam;
+import com.yiring.app.param.post.PostParam;
+import com.yiring.app.service.post.PostService;
+import com.yiring.app.vo.post.PostVo;
 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.ApiOperation;
@@ -53,8 +54,8 @@ public class PostController {
 
     @ApiOperation(value = "分页查询")
     @GetMapping("findPostPage")
-    public Result<PageVo<PostVo>> findPostPage(@Valid PostFindParam param) {
-        return postService.findPostPage(param);
+    public Result<PageVo<PostVo>> findPostPage(@Valid PostFindParam param, @Valid PageParam pageParam) {
+        return postService.findPostPage(param, pageParam);
     }
 
     @ApiOperation(value = "详细信息查询")

app/src/main/java/com/yiring/app/web/user/UserAppController.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web.user;
+
+import com.yiring.app.param.user.UserBingTagParam;
+import com.yiring.app.param.user.UserFindParam;
+import com.yiring.app.service.user.UserService;
+import com.yiring.app.vo.user.UserVo;
+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.ApiOperation;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 用户信息
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/1/24 14:13
+ */
+
+@Slf4j
+@Validated
+@Api(tags = "User")
+@RestController
+@RequestMapping("/user/")
+public class UserAppController {
+
+    @Resource
+    UserService userService;
+
+    @ApiOperation("表格查询")
+    @GetMapping("findUserPage")
+    public Result<PageVo<UserVo>> findUserPage(@Valid UserFindParam param, @Valid PageParam pageParam) {
+        return userService.findUserPage(param, pageParam);
+    }
+
+    @ApiOperation("用户详细信息查询")
+    @GetMapping("findUserById")
+    public Result<UserVo> findUserById(@Valid IdParam idParam) {
+        return userService.findUserById(idParam);
+    }
+
+    @ApiOperation("给用户分配标签卡")
+    @PutMapping("userBingTag")
+    public Result<String> userBingTag(@Valid UserBingTagParam param) {
+        return userService.userBingTag(param);
+    }
+
+    @ApiOperation("收卡")
+    @PutMapping("userUnBingTag")
+    public Result<String> userUnBingTag(@Valid IdParam idParam) {
+        return userService.userUnBingTag(idParam);
+    }
+
+    @ApiOperation("逻辑删除用户")
+    @DeleteMapping("deleteUser")
+    public Result<String> deleteUser(@Valid IdParam idParam) {
+        return userService.deleteUser(idParam);
+    }
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web.video;
+
+import com.yiring.app.param.video.VideoParam;
+import com.yiring.app.param.video.VideoQueryParam;
+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.ApiOperation;
+import javax.annotation.Resource;
+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.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 监控点位控制器
+ * @author tzl
+ * 2022/4/8 16:51
+ */
+@Slf4j
+@Validated
+@Api(tags = "Video")
+@RestController
+@RequestMapping("/video/")
+public class VideoController {
+
+    @Resource
+    VideoService videoService;
+
+    @ApiOperation(value = "新增监控点位信息")
+    @PostMapping("saveVideo")
+    public Result<String> findLatest(@Valid VideoParam videoParam) {
+        return videoService.saveVideo(videoParam);
+    }
+
+    @ApiOperation(value = "删除监控点位信息")
+    @PostMapping("deleteVideo")
+    public Result<String> deleteVideo(@Valid IdParam idParam) {
+        return videoService.deleteVideo(idParam);
+    }
+
+    @ApiOperation(value = "修改监控点位信息")
+    @PostMapping("updateVideo")
+    public Result<String> updateVideo(@Valid VideoParam videoParam, @Valid IdParam idParam) {
+        return videoService.updateVideo(videoParam, idParam);
+    }
+
+    @ApiOperation(value = "查看监控点位位置")
+    @PostMapping("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);
+    }
+}

basic-auth/build.gradle

@@ -3,26 +3,22 @@ dependencies {
 	implementation project(':basic-common:util')
 
 	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}"
-
-	// hutool-json
-	implementation "cn.hutool:hutool-json:${hutoolVersion}"
-
-	// hutool-http
 	implementation "cn.hutool:hutool-http:${hutoolVersion}"
+	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
 
 	// fastjson
 	implementation "com.alibaba:fastjson:${fastJsonVersion}"

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

 /* (C) 2022 YiRing, Inc. */
 package com.yiring.auth.domain.dept;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 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.time.LocalDateTime;
 import java.util.HashSet;
@@ -14,7 +16,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;
 
@@ -38,6 +40,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("主键")
@@ -62,6 +65,7 @@ public class Department implements Serializable {
 
     @ManyToOne
     @JoinColumn(name = "leader_id")
+    @JsonIgnore
     @Comment("负责人")
     User leader;
 

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

@@ -3,6 +3,7 @@ package com.yiring.auth.domain.dept;
 
 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,5 @@ import org.springframework.stereotype.Repository;
  */
 
 @Repository
-public interface DepartmentRepository extends JpaRepository<Department, Serializable> {}
+public interface DepartmentRepository
+    extends JpaRepository<Department, Serializable>, JpaSpecificationExecutor<Department> {}

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 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;
 
@@ -34,6 +35,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/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

@@ -6,6 +6,8 @@ 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;
@@ -15,10 +17,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;
 
 /**
  * 用户
@@ -30,7 +31,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants
@@ -39,7 +40,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 +48,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 +92,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;
 
@@ -127,9 +111,15 @@ public class User implements Serializable {
 
     @Comment("所属部门")
     @ManyToOne
+    @JsonIgnore
     @JoinColumn(name = "department_id")
     Department department;
 
+    @Comment("所属职称")
+    @ManyToOne
+    @JoinColumn(name = "post_id")
+    Post post;
+
     @Comment("用户类型")
     @Enumerated(EnumType.STRING)
     Type type;
@@ -148,12 +138,6 @@ public class User implements Serializable {
     @Comment("最后登录时间")
     LocalDateTime lastLoginTime;
 
-    @Comment("更新时间")
-    LocalDateTime updateTime;
-
-    @Comment("创建时间")
-    LocalDateTime createTime;
-
     @SuppressWarnings({ "unused" })
     public enum Type {
         EMPLOYEES("员工"),
@@ -194,7 +178,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/domain/user/UserRepository.java

@@ -3,6 +3,7 @@ package com.yiring.auth.domain.user;
 
 import java.io.Serializable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
@@ -14,7 +15,7 @@ import org.springframework.stereotype.Repository;
  */
 
 @Repository
-public interface UserRepository extends JpaRepository<User, Serializable> {
+public interface UserRepository extends JpaRepository<User, Serializable>, JpaSpecificationExecutor<User> {
     /**
      * 根据用户名称查询用户信息
      *

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/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/dept/impl/DepartmentServiceImpl.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.dept.impl;
-
-import com.yiring.auth.domain.dept.Department;
-import com.yiring.auth.domain.dept.DepartmentRepository;
-import com.yiring.auth.param.dept.DepartmentAddParam;
-import com.yiring.auth.service.dept.DepartmentService;
-import com.yiring.auth.service.zy.ZyHttpService;
-import com.yiring.common.core.Result;
-import javax.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 部门管理
- * @author LJ-2204
- * @date 2022/4/19
- */
-
-@Transactional(rollbackFor = RuntimeException.class)
-@Service
-@Slf4j
-public class DepartmentServiceImpl implements DepartmentService {
-
-    @Resource
-    DepartmentRepository departmentRepository;
-
-    @Resource
-    ZyHttpService zyHttpService;
-
-    @Override
-    public Result<String> addDepartment(DepartmentAddParam param) {
-        Department department = param.transform();
-        departmentRepository.save(department);
-        return Result.ok();
-    }
-}

basic-auth/src/main/java/com/yiring/auth/service/user/UserService.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.user;
-
-import com.yiring.auth.param.user.UserByNameParam;
-import com.yiring.auth.vo.user.UserAutoVo;
-import com.yiring.common.core.Result;
-import com.yiring.common.vo.PageVo;
-
-/**
- * 用户
- * @author LJ-2204
- * @date 2022/4/20
- */
-public interface UserService {
-    /**
-     * 通过用户名查询
-     * @param param UserByNameParam
-     * @return Result<PageVo<UserAutoVo>>
-     */
-    Result<PageVo<UserAutoVo>> findUserByName(UserByNameParam param);
-}

basic-auth/src/main/java/com/yiring/auth/service/user/impl/UserServiceImpl.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.service.user.impl;
-
-import com.yiring.auth.domain.user.UserRepository;
-import com.yiring.auth.param.user.UserByNameParam;
-import com.yiring.auth.service.user.UserService;
-import com.yiring.auth.vo.user.UserAutoVo;
-import com.yiring.common.core.Result;
-import com.yiring.common.vo.PageVo;
-import javax.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 用户
- * @author LJ-2204
- * @date 2022/4/20
- */
-
-@Transactional(rollbackFor = RuntimeException.class)
-@Service
-@Slf4j
-public class UserServiceImpl implements UserService {
-
-    @Resource
-    UserRepository userRepository;
-
-    @Override
-    public Result<PageVo<UserAutoVo>> findUserByName(UserByNameParam param) {
-        return null;
-    }
-}

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

@@ -4,9 +4,9 @@ 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.HttpUtil;
 import com.alibaba.fastjson.JSON;
-import com.yiring.common.util.BeanUtils;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
@@ -25,7 +25,7 @@ public class ZyUtil {
     RedisTemplate<String, Object> redisTemplate;
 
     static {
-        redisTemplate = BeanUtils.getBean("redisTemplate");
+        redisTemplate = SpringUtil.getBean("redisTemplate");
     }
 
     public final String CLIENT_ID = "sc21080400";

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/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/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.param.user.UserByNameParam;
-import com.yiring.auth.service.user.UserService;
+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.UserAutoVo;
 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;
@@ -55,18 +51,18 @@ import org.springframework.web.bind.annotation.RestController;
 public class UserController {
 
     @Resource
-    UserRepository userRepository;
+    Auths auths;
 
     @Resource
-    RoleRepository roleRepository;
+    UserRepository userRepository;
 
     @Resource
-    UserService userService;
+    RoleRepository roleRepository;
 
     @ApiOperation(value = "获取登录用户信息")
     @GetMapping("getUserInfo")
     public Result<UserInfoVo> getUserInfo() {
-        User user = getLoginUser();
+        User user = auths.getLoginUser();
         UserInfoVo userInfoVo = UserInfoVo
             .builder()
             .userId(user.getId())
@@ -82,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()
@@ -95,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);
@@ -138,25 +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);
-    }
-
-    @ApiOperation("联想查询(名称)")
-    @GetMapping
-    public Result<PageVo<UserAutoVo>> findUserByName(@Valid UserByNameParam param) {
-        return userService.findUserByName(param);
-    }
 }

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}"
 
-	// hutool-extra
-	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
+	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}"
 
-	// fastjson
-	implementation "com.alibaba:fastjson:${fastJsonVersion}"
+	// 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/CorsConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * 跨域设置
+ * @author tzl
+ * 2022/4/18 10:29
+ */
+
+@Configuration
+public class CorsConfig {
+
+    @Bean
+    public CorsFilter corsFilter() {
+        final UrlBasedCorsConfigurationSource urlBasedCorsConfigurationSource = new UrlBasedCorsConfigurationSource();
+        final CorsConfiguration corsConfiguration = new CorsConfiguration();
+        //        corsConfiguration.setAllowCredentials(true);
+        corsConfiguration.addAllowedOrigin("*");
+        corsConfiguration.addAllowedHeader("*");
+        corsConfiguration.addAllowedMethod("*");
+        urlBasedCorsConfigurationSource.registerCorsConfiguration("/**", corsConfiguration);
+        return new CorsFilter(urlBasedCorsConfigurationSource);
+    }
+}

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/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/constant/RegEx.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.constant;
+
+/**
+ * 常用相关验证正则表达式
+ * @author tzl
+ * 2022/4/12 12:00
+ */
+public class RegEx {
+
+    //车牌号码验证
+    public static final String CARNUM =
+        "([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼]" +
+        "{1}(([A-HJ-Z]{1}[A-HJ-NP-Z0-9]{5})|([A-HJ-Z]{1}(([DF]{1}[A-HJ-NP-Z0-9]{1}[0-9]{4})|([0-9]{5}[DF]" +
+        "{1})))|([A-HJ-Z]{1}[A-D0-9]{1}[0-9]{3}警)))|([0-9]{6}使)|((([沪粤川云桂鄂陕蒙藏黑辽渝]{1}A)|鲁B|闽D|蒙E|蒙H)[0-9]{4}领)" +
+        "|(WJ[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼·•]{1}[0-9]{4}[TDSHBXJ0-9]{1})" +
+        "|([VKHBSLJNGCE]{1}[A-DJ-PR-TVY]{1}[0-9]{5})";
+
+    //手机号码验证
+    public static final String MOBILE =
+        "^((13[0-9])|(14[5,7,9])|(15([0-3]|[5-9]))|(16[5,6])|(17[0-8])|(18[0-9])|(19[1、5、8、9]))\\d{8}$";
+}

basic-common/core/src/main/java/com/yiring/common/core/Result.java

@@ -4,6 +4,7 @@ package com.yiring.common.core;
 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 lombok.AccessLevel;
 import lombok.Builder;
@@ -28,6 +29,7 @@ import lombok.extern.slf4j.Slf4j;
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public class Result<T extends Serializable> implements Serializable {
 
+    @Serial
     private static final long serialVersionUID = -4802543396830024571L;
 
     /**

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.Serializable;
+import java.time.LocalDateTime;
+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.annotations.Comment;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.snowflake.SnowflakeId;
+
+/**
+ * 字典表
+ *
+ * @author tzl
+ * 2022/4/13 15:36
+ */
+@Getter
+@Setter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Entity
+@Table(name = "SYS_DICT")
+@Comment("字典")
+public class Dict implements Serializable {
+
+    @Id
+    @Comment("主键id")
+    @GeneratedValue(generator = SnowflakeId.GENERATOR)
+    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
+    Long id;
+
+    @Comment("字典排序")
+    Integer dictSort;
+
+    @Comment("字典标签")
+    String dictLabel;
+
+    @Comment("字典键值")
+    String dictValue;
+
+    @Comment("字典类型")
+    String dictType;
+
+    @Comment("状态（0正常 1停用）")
+    String status;
+
+    @Comment("备注")
+    String remark;
+
+    @Comment("创建时间")
+    LocalDateTime createTime;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.dict;
+
+import java.io.Serializable;
+import java.util.List;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * @author tzl
+ * 2022/4/13 15:32
+ */
+public interface DictRepository extends JpaRepository<Dict, Serializable>, JpaSpecificationExecutor<Dict> {
+    /**
+     * 根据字典类型和字典键值查询字典数据信息
+     *
+     * @param dictType  String
+     * @param dictValue String
+     * @return 字典标签
+     */
+    @Query("select dictLabel from Dict where dictType = ?1 and dictValue = ?2")
+    String findDictLabel(String dictType, String dictValue);
+
+    /**
+     * 根据字典类型查询所有启用的字典数据
+     *
+     * @param dictType 字典类型
+     * @return 字典数据集合
+     */
+    @Query("select d from Dict d where d.dictType = ?1")
+    List<Dict> findByDictType(String dictType);
+
+    @Modifying
+    @Transactional
+    @Query("update Dict set dictType=?1 where dictType=?2")
+    boolean updateDictType(String param, String dictType);
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.dict;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+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.annotations.Comment;
+import org.hibernate.annotations.GenericGenerator;
+import org.hibernate.snowflake.SnowflakeId;
+
+/**
+ * @author tzl
+ * 2022/4/14 14:07
+ */
+@Getter
+@Setter
+@ToString
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldNameConstants
+@FieldDefaults(level = AccessLevel.PRIVATE)
+@Entity
+@Table(name = "SYS_DICT_TYPE")
+@Comment("字典类型")
+public class DictType implements Serializable {
+
+    @Id
+    @Comment("主键id")
+    @GeneratedValue(generator = SnowflakeId.GENERATOR)
+    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
+    Long id;
+
+    @Comment("字典名称")
+    String dictName;
+
+    @Comment("字典类型")
+    String dictType;
+
+    @Comment("状态（0正常 1停用）")
+    String status;
+
+    @Comment("创建时间")
+    LocalDateTime createTime;
+}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.dict;
+
+import java.io.Serializable;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+/**
+ * @author tzl
+ * 2022/4/13 15:32
+ */
+public interface DictTypeRepository extends JpaRepository<DictType, Serializable>, JpaSpecificationExecutor<DictType> {}

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;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.function.Predicate;
@@ -12,17 +13,19 @@ 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;
 import org.springframework.context.annotation.Profile;
 import org.springframework.web.bind.annotation.RequestMethod;
 import springfox.bean.validators.configuration.BeanValidatorPluginsConfiguration;
-import springfox.documentation.builders.*;
-import springfox.documentation.schema.ModelRef;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.builders.ResponseMessageBuilder;
 import springfox.documentation.service.ApiInfo;
 import springfox.documentation.service.Contact;
-import springfox.documentation.service.Parameter;
 import springfox.documentation.service.ResponseMessage;
 import springfox.documentation.spi.DocumentationType;
 import springfox.documentation.spring.web.plugins.Docket;
@@ -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,14 +64,11 @@ 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)
             .apiInfo(apiInfo())
             .useDefaultResponseMessages(false)
-            .globalOperationParameters(buildGlobalRequestParameters())
             .globalResponseMessage(RequestMethod.GET, buildGlobalResponseMessage())
             .globalResponseMessage(RequestMethod.POST, buildGlobalResponseMessage())
             .globalResponseMessage(RequestMethod.DELETE, buildGlobalResponseMessage())
@@ -101,22 +101,13 @@ public class SwaggerConfig {
             .collect(Collectors.toList());
     }
 
-    /**
-     * 构建全局请求参数
-     *
-     * @return Token 等自定义全局参数/Header
-     */
-    private List<Parameter> buildGlobalRequestParameters() {
-        List<Parameter> parameters = new ArrayList<>();
-        parameters.add(
-            new ParameterBuilder()
-                .name("Authorization")
-                .description("认证token")
-                .modelRef(new ModelRef("string"))
-                .parameterType("header")
-                .required(false)
-                .build()
-        );
-        return parameters;
+    @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-auth/src/main/java/com/yiring/auth/config/RedisConfig.java → basic-common/redis/src/main/java/com/yiring/common/config/RedisConfig.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.auth.config;
+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;
@@ -9,29 +11,33 @@ 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.listener.RedisMessageListenerContainer;
 import org.springframework.data.redis.serializer.GenericJackson2JsonRedisSerializer;
 import org.springframework.data.redis.serializer.RedisSerializationContext;
 import org.springframework.data.redis.serializer.StringRedisSerializer;
 
 /**
  * Redis Config
- * @author LJ-2204
- * @date 2022/4/15
+ *
+ * @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());
-        redisTemplate.setEnableTransactionSupport(true);
+        redisTemplate.setDefaultSerializer(new GenericJackson2JsonRedisSerializer(objectMapper));
+        redisTemplate.setEnableTransactionSupport(false);
         redisTemplate.setConnectionFactory(factory);
         redisTemplate.afterPropertiesSet();
         return redisTemplate;
@@ -50,11 +56,4 @@ public class RedisConfig {
 
         return RedisCacheManager.builder(connectionFactory).cacheDefaults(config).transactionAware().build();
     }
-
-    @Bean
-    public RedisMessageListenerContainer redisMessageListenerContainer(RedisConnectionFactory redisConnectionFactory) {
-        RedisMessageListenerContainer redisMessageListenerContainer = new RedisMessageListenerContainer();
-        redisMessageListenerContainer.setConnectionFactory(redisConnectionFactory);
-        return redisMessageListenerContainer;
-    }
 }

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
+	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
+	// fastjson
+	implementation "com.alibaba:fastjson:${fastJsonVersion}"
+
+	implementation group: 'org.apache.poi', name: 'poi', version: '5.2.2'
+	implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.2'
+	implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.12.0'
 }

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/BeanUtils.java

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.util;
-
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BeanUtils implements ApplicationContextAware {
-
-    /**
-     * 以静态变量保存ApplicationContext,可在任意代码中取出ApplicaitonContext.
-     */
-    private static ApplicationContext context;
-
-    /**
-     * 实现ApplicationContextAware接口的context注入函数, 将其存入静态变量.
-     */
-    @Override
-    public void setApplicationContext(ApplicationContext context) {
-        BeanUtils.context = context;
-    }
-
-    public static ApplicationContext getApplicationContext() {
-        return context;
-    }
-
-    /**
-     * 从静态变量ApplicationContext中取得Bean, 自动转型为所赋值对象的类型.  方法返回值的类型由调用者决定
-     */
-    public static <T> T getBean(String name) {
-        return (T) context.getBean(name);
-    }
-
-    /// 获取当前环境
-    public String getActiveProfile() {
-        return context.getEnvironment().getActiveProfiles()[0];
-    }
-}

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.util;
+
+import cn.hutool.extra.spring.SpringUtil;
+import com.yiring.common.core.Redis;
+import com.yiring.common.dict.Dict;
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 字典工具类
+ *
+ * @author tzl
+ */
+public class DictUtils {
+
+    /**
+     * 分隔符
+     */
+    public static final String SEPARATOR = ",";
+
+    /**
+     * 设置字典缓存
+     *
+     * @param key       参数键
+     * @param dictDatas 字典数据列表
+     */
+    public static void setDictCache(String key, List<Dict> dictDatas) {
+        SpringUtil.getBean(Redis.class).set(getCacheKey(key), dictDatas);
+    }
+
+    /**
+     * 获取字典缓存
+     *
+     * @param key 参数键
+     * @return dictDatas 字典数据列表
+     */
+    public static List<Dict> getDictCache(String key) {
+        Object cacheObj = SpringUtil.getBean(Redis.class).get(getCacheKey(key));
+        if (StrUtils.isNotNull(cacheObj)) {
+            return StrUtils.cast(cacheObj);
+        }
+        return null;
+    }
+
+    /**
+     * 根据字典类型和字典值获取字典标签
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典值
+     * @return 字典标签
+     */
+    public static String getDictLabel(String dictType, String dictValue) {
+        return getDictLabel(dictType, dictValue, SEPARATOR);
+    }
+
+    /**
+     * 根据字典类型和字典标签获取字典值
+     *
+     * @param dictType  字典类型
+     * @param dictLabel 字典标签
+     * @return 字典值
+     */
+    public static String getDictValue(String dictType, String dictLabel) {
+        return getDictValue(dictType, dictLabel, SEPARATOR);
+    }
+
+    /**
+     * 根据字典类型和字典值获取字典标签
+     *
+     * @param dictType  字典类型
+     * @param dictValue 字典值
+     * @param separator 分隔符
+     * @return 字典标签
+     */
+    public static String getDictLabel(String dictType, String dictValue, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        List<Dict> datas = getDictCache(dictType);
+
+        if (StrUtils.containsAny(separator, dictValue) && StrUtils.isNotEmpty(datas)) {
+            if (datas != null) {
+                for (Dict dict : datas) {
+                    for (String value : dictValue.split(separator)) {
+                        if (value.equals(dict.getDictValue())) {
+                            propertyString.append(dict.getDictLabel()).append(separator);
+                            break;
+                        }
+                    }
+                }
+            }
+        } else {
+            if (datas != null) {
+                for (Dict dict : datas) {
+                    if (dictValue.equals(dict.getDictValue())) {
+                        return dict.getDictLabel();
+                    }
+                }
+            }
+        }
+        return StrUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 根据字典类型和字典标签获取字典值
+     *
+     * @param dictType  字典类型
+     * @param dictLabel 字典标签
+     * @param separator 分隔符
+     * @return 字典值
+     */
+    public static String getDictValue(String dictType, String dictLabel, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        List<Dict> datas = getDictCache(dictType);
+
+        if (StrUtils.containsAny(separator, dictLabel) && StrUtils.isNotEmpty(datas)) {
+            if (datas != null) {
+                for (Dict dict : datas) {
+                    for (String label : dictLabel.split(separator)) {
+                        if (label.equals(dict.getDictLabel())) {
+                            propertyString.append(dict.getDictValue()).append(separator);
+                            break;
+                        }
+                    }
+                }
+            }
+        } else {
+            if (datas != null) {
+                for (Dict dict : datas) {
+                    if (dictLabel.equals(dict.getDictLabel())) {
+                        return dict.getDictValue();
+                    }
+                }
+            }
+        }
+        return StrUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 删除指定字典缓存
+     *
+     * @param key 字典键
+     */
+    public static void removeDictCache(String key) {
+        SpringUtil.getBean(Redis.class).del(getCacheKey(key));
+    }
+
+    /**
+     * 清空字典缓存
+     */
+    public static void clearDictCache() {
+        Collection<String> keys = SpringUtil.getBean(Redis.class).keys("sys_dict:*");
+        SpringUtil.getBean(Redis.class).del(keys.toArray(new String[0]));
+    }
+
+    /**
+     * 设置cache key
+     *
+     * @param configKey 参数键
+     * @return 缓存键key
+     */
+    public static String getCacheKey(String configKey) {
+        return "sys_dict:" + configKey;
+    }
+}

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/file/FileTypeUtils.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.util.file;
+
+import java.io.File;
+import org.apache.commons.lang3.StringUtils;
+
+/**
+ * 文件类型工具类
+ */
+public class FileTypeUtils {
+
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     *
+     * @param file 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(File file) {
+        if (null == file) {
+            return StringUtils.EMPTY;
+        }
+        return getFileType(file.getName());
+    }
+
+    /**
+     * 获取文件类型
+     * <p>
+     * 例如: ruoyi.txt, 返回: txt
+     *
+     * @param fileName 文件名
+     * @return 后缀（不含".")
+     */
+    public static String getFileType(String fileName) {
+        int separatorIndex = fileName.lastIndexOf(".");
+        if (separatorIndex < 0) {
+            return "";
+        }
+        return fileName.substring(separatorIndex + 1).toLowerCase();
+    }
+
+    /**
+     * 获取文件类型
+     *
+     * @param photoByte 文件字节码
+     * @return 后缀（不含".")
+     */
+    public static String getFileExtendName(byte[] photoByte) {
+        String strFileExtendName = "JPG";
+        if (
+            (photoByte[0] == 71) &&
+            (photoByte[1] == 73) &&
+            (photoByte[2] == 70) &&
+            (photoByte[3] == 56) &&
+            ((photoByte[4] == 55) || (photoByte[4] == 57)) &&
+            (photoByte[5] == 97)
+        ) {
+            strFileExtendName = "GIF";
+        } else if ((photoByte[6] == 74) && (photoByte[7] == 70) && (photoByte[8] == 73) && (photoByte[9] == 70)) {
+            strFileExtendName = "JPG";
+        } else if ((photoByte[0] == 66) && (photoByte[1] == 77)) {
+            strFileExtendName = "BMP";
+        } else if ((photoByte[1] == 80) && (photoByte[2] == 78) && (photoByte[3] == 71)) {
+            strFileExtendName = "PNG";
+        }
+        return strFileExtendName;
+    }
+}

basic-common/util/src/main/java/com/yiring/common/util/file/ImageUtils.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.util.file;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.net.URLConnection;
+import java.util.Arrays;
+import org.apache.poi.util.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 图片处理工具类
+ */
+public class ImageUtils {
+
+    private static final Logger log = LoggerFactory.getLogger(ImageUtils.class);
+
+    public static byte[] getImage(String imagePath) {
+        InputStream is = getFile(imagePath);
+        try {
+            return IOUtils.toByteArray(is);
+        } catch (Exception e) {
+            log.error("图片加载异常 {}", e);
+            return null;
+        } finally {
+            IOUtils.closeQuietly(is);
+        }
+    }
+
+    public static InputStream getFile(String imagePath) {
+        try {
+            byte[] result = readFile(imagePath);
+            result = Arrays.copyOf(result, result.length);
+            return new ByteArrayInputStream(result);
+        } catch (Exception e) {
+            log.error("获取图片异常 {}", e);
+        }
+        return null;
+    }
+
+    /**
+     * 读取文件为字节数据
+     *
+     * @param url 地址
+     * @return 字节数据
+     */
+    public static byte[] readFile(String url) {
+        InputStream in = null;
+        try {
+            // 网络地址
+            URL urlObj = new URL(url);
+            URLConnection urlConnection = urlObj.openConnection();
+            urlConnection.setConnectTimeout(30 * 1000);
+            urlConnection.setReadTimeout(60 * 1000);
+            urlConnection.setDoInput(true);
+            in = urlConnection.getInputStream();
+            return IOUtils.toByteArray(in);
+        } catch (Exception e) {
+            log.error("访问文件异常 {}", e);
+            return null;
+        } finally {
+            IOUtils.closeQuietly(in);
+        }
+    }
+}

basic-common/util/src/main/java/com/yiring/common/util/poi/ExcelHandlerAdapter.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.util.poi;
+
+/**
+ * Excel数据格式处理适配器
+ */
+public interface ExcelHandlerAdapter {
+    /**
+     * 格式化
+     *
+     * @param value 单元格数据值
+     * @param args  excel注解args参数组
+     * @return 处理后的值
+     */
+    Object format(Object value, String[] args);
+}

basic-common/util/src/main/java/com/yiring/common/util/poi/ExcelUtils.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.util.poi;
+
+import com.yiring.common.annotation.Excel;
+import com.yiring.common.annotation.Excel.ColumnType;
+import com.yiring.common.annotation.Excel.Type;
+import com.yiring.common.annotation.Excels;
+import com.yiring.common.text.Convert;
+import com.yiring.common.util.DictUtils;
+import com.yiring.common.util.StrUtils;
+import com.yiring.common.util.date.DateUtils;
+import com.yiring.common.util.file.FileTypeUtils;
+import com.yiring.common.util.file.ImageUtils;
+import com.yiring.common.util.reflect.ReflectUtils;
+import java.io.IOException;
+import java.io.InputStream;
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.*;
+import java.util.stream.Collectors;
+import javax.servlet.http.HttpServletResponse;
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.poi.ss.usermodel.*;
+import org.apache.poi.ss.util.CellRangeAddress;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.util.IOUtils;
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
+import org.apache.poi.xssf.usermodel.XSSFClientAnchor;
+import org.apache.poi.xssf.usermodel.XSSFDataValidation;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Excel相关处理
+ *
+ * @author ruoyi
+ */
+public class ExcelUtils<T> {
+
+    private static final Logger log = LoggerFactory.getLogger(ExcelUtils.class);
+
+    public static final String FORMULA_REGEX_STR = "=|-|\\+|@";
+
+    public static final String[] FORMULA_STR = { "=", "-", "+", "@" };
+
+    /**
+     * Excel sheet最大行数，默认65536
+     */
+    public static final int sheetSize = 65536;
+
+    /**
+     * 工作表名称
+     */
+    private String sheetName;
+
+    /**
+     * 导出类型（EXPORT:导出数据；IMPORT：导入模板）
+     */
+    private Type type;
+
+    /**
+     * 工作薄对象
+     */
+    private Workbook wb;
+
+    /**
+     * 工作表对象
+     */
+    private Sheet sheet;
+
+    /**
+     * 样式列表
+     */
+    private Map<String, CellStyle> styles;
+
+    /**
+     * 导入导出数据列表
+     */
+    private List<T> list;
+
+    /**
+     * 注解列表
+     */
+    private List<Object[]> fields;
+
+    /**
+     * 当前行号
+     */
+    private int rownum;
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 最大高度
+     */
+    private short maxHeight;
+
+    /**
+     * 统计列表
+     */
+    private Map<Integer, Double> statistics = new HashMap<Integer, Double>();
+
+    /**
+     * 数字格式
+     */
+    private static final DecimalFormat DOUBLE_FORMAT = new DecimalFormat("######0.00");
+
+    /**
+     * 实体对象
+     */
+    public Class<T> clazz;
+
+    public ExcelUtils(Class<T> clazz) {
+        this.clazz = clazz;
+    }
+
+    public void init(List<T> list, String sheetName, String title, Type type) {
+        if (list == null) {
+            list = new ArrayList<T>();
+        }
+        this.list = list;
+        this.sheetName = sheetName;
+        this.type = type;
+        this.title = title;
+        createExcelField();
+        createWorkbook();
+        createTitle();
+    }
+
+    /**
+     * 创建excel第一行标题
+     */
+    public void createTitle() {
+        if (StrUtils.isNotEmpty(title)) {
+            Row titleRow = sheet.createRow(rownum == 0 ? rownum++ : 0);
+            titleRow.setHeightInPoints(30);
+            Cell titleCell = titleRow.createCell(0);
+            titleCell.setCellStyle(styles.get("title"));
+            titleCell.setCellValue(title);
+            sheet.addMergedRegion(
+                new CellRangeAddress(
+                    titleRow.getRowNum(),
+                    titleRow.getRowNum(),
+                    titleRow.getRowNum(),
+                    this.fields.size() - 1
+                )
+            );
+        }
+    }
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     *
+     * @param is 输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is) throws Exception {
+        return importExcel(is, 0);
+    }
+
+    /**
+     * 对excel表单默认第一个索引名转换成list
+     *
+     * @param is       输入流
+     * @param titleNum 标题占用行数
+     * @return 转换后集合
+     */
+    public List<T> importExcel(InputStream is, int titleNum) throws Exception {
+        return importExcel(StrUtils.EMPTY, is, titleNum);
+    }
+
+    /**
+     * 对excel表单指定表格索引名转换成list
+     *
+     * @param sheetName 表格索引名
+     * @param titleNum  标题占用第几行数
+     * @param is        输入流
+     * @return 转换后集合
+     */
+    public List<T> importExcel(String sheetName, InputStream is, int titleNum) throws Exception {
+        this.type = Type.IMPORT;
+        this.wb = WorkbookFactory.create(is);
+        List<T> list = new ArrayList<T>();
+        // 如果指定sheet名,则取指定sheet中的内容 否则默认指向第1个sheet
+        Sheet sheet = StrUtils.isNotEmpty(sheetName) ? wb.getSheet(sheetName) : wb.getSheetAt(0);
+        if (sheet == null) {
+            throw new IOException("文件sheet不存在");
+        }
+
+        // 获取最后一个非空行的行下标，比如总行数为n，则返回的为n-1
+        int rows = sheet.getLastRowNum();
+
+        if (rows > 0) {
+            // 定义一个map用于存放excel列的序号和field.
+            Map<String, Integer> cellMap = new HashMap<String, Integer>();
+            // 获取表头
+            Row heard = sheet.getRow(titleNum);
+            for (int i = 0; i < heard.getPhysicalNumberOfCells(); i++) {
+                Cell cell = heard.getCell(i);
+                if (StrUtils.isNotNull(cell)) {
+                    String value = this.getCellValue(heard, i).toString();
+                    cellMap.put(value, i);
+                } else {
+                    cellMap.put(null, i);
+                }
+            }
+            // 有数据时才处理 得到类的所有field.
+            List<Object[]> fields = this.getFields();
+            Map<Integer, Object[]> fieldsMap = new HashMap<Integer, Object[]>();
+            for (Object[] objects : fields) {
+                Excel attr = (Excel) objects[1];
+                Integer column = cellMap.get(attr.name());
+                if (column != null) {
+                    fieldsMap.put(column, objects);
+                }
+            }
+            for (int i = titleNum + 1; i <= rows; i++) {
+                // 从第2行开始取数据,默认第一行是表头.
+                Row row = sheet.getRow(i);
+                // 判断当前行是否是空行
+                if (isRowEmpty(row)) {
+                    continue;
+                }
+                T entity = null;
+                for (Map.Entry<Integer, Object[]> entry : fieldsMap.entrySet()) {
+                    Object val = this.getCellValue(row, entry.getKey());
+
+                    // 如果不存在实例则新建.
+                    entity = (entity == null ? clazz.newInstance() : entity);
+                    // 从map中得到对应列的field.
+                    Field field = (Field) entry.getValue()[0];
+                    Excel attr = (Excel) entry.getValue()[1];
+                    // 取得类型,并根据对象类型设置值.
+                    Class<?> fieldType = field.getType();
+                    if (String.class == fieldType) {
+                        String s = Convert.toStr(val);
+                        if (StrUtils.endsWith(s, ".0")) {
+                            val = StrUtils.substringBefore(s, ".0");
+                        } else {
+                            String dateFormat = field.getAnnotation(Excel.class).dateFormat();
+                            if (StrUtils.isNotEmpty(dateFormat)) {
+                                val = parseDateToStr(dateFormat, val);
+                            } else {
+                                val = Convert.toStr(val);
+                            }
+                        }
+                    } else if (
+                        (Integer.TYPE == fieldType || Integer.class == fieldType) &&
+                        StrUtils.isNumeric(Convert.toStr(val))
+                    ) {
+                        val = Convert.toInt(val);
+                    } else if (
+                        (Long.TYPE == fieldType || Long.class == fieldType) && StrUtils.isNumeric(Convert.toStr(val))
+                    ) {
+                        val = Convert.toLong(val);
+                    } else if (Double.TYPE == fieldType || Double.class == fieldType) {
+                        val = Convert.toDouble(val);
+                    } else if (Float.TYPE == fieldType || Float.class == fieldType) {
+                        val = Convert.toFloat(val);
+                    } else if (BigDecimal.class == fieldType) {
+                        val = Convert.toBigDecimal(val);
+                    } else if (Date.class == fieldType) {
+                        if (val instanceof String) {
+                            val = DateUtils.parseDate(val);
+                        } else if (val instanceof Double) {
+                            val = DateUtil.getJavaDate((Double) val);
+                        }
+                    } else if (Boolean.TYPE == fieldType || Boolean.class == fieldType) {
+                        val = Convert.toBool(val, false);
+                    }
+                    if (StrUtils.isNotNull(fieldType)) {
+                        String propertyName = field.getName();
+                        if (StrUtils.isNotEmpty(attr.targetAttr())) {
+                            propertyName = field.getName() + "." + attr.targetAttr();
+                        } else if (StrUtils.isNotEmpty(attr.readConverterExp())) {
+                            val = reverseByExp(Convert.toStr(val), attr.readConverterExp(), attr.separator());
+                        } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
+                            val = dataFormatHandlerAdapter(val, attr);
+                        }
+                        ReflectUtils.invokeSetter(entity, propertyName, val);
+                    }
+                }
+                list.add(entity);
+            }
+        }
+        return list;
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param response  返回数据
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @return 结果
+     * @throws IOException
+     */
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName) {
+        exportExcel(response, list, sheetName, StrUtils.EMPTY);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param response  返回数据
+     * @param list      导出数据集合
+     * @param sheetName 工作表的名称
+     * @param title     标题
+     * @return 结果
+     * @throws IOException
+     */
+    public void exportExcel(HttpServletResponse response, List<T> list, String sheetName, String title) {
+        //        response.setContentType("application/octet-stream");
+        //        response.setCharacterEncoding("utf-8");
+        this.init(list, sheetName, title, Type.EXPORT);
+        exportExcel(response);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param sheetName 工作表的名称
+     * @return 结果
+     */
+    public void importTemplateExcel(HttpServletResponse response, String sheetName) {
+        importTemplateExcel(response, sheetName, StrUtils.EMPTY);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @param sheetName 工作表的名称
+     * @param title     标题
+     * @return 结果
+     */
+    public void importTemplateExcel(HttpServletResponse response, String sheetName, String title) {
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        this.init(null, sheetName, title, Type.IMPORT);
+        exportExcel(response);
+    }
+
+    /**
+     * 对list数据源将其里面的数据导入到excel表单
+     *
+     * @return 结果
+     */
+    public void exportExcel(HttpServletResponse response) {
+        try {
+            writeSheet();
+            wb.write(response.getOutputStream());
+            //            FileOutputStream fos = new FileOutputStream("D:/a.xls");
+            //            wb.write(fos);
+            //            fos.close();
+        } catch (Exception e) {
+            log.error("导出Excel异常{}", e.getMessage());
+        } finally {
+            IOUtils.closeQuietly(wb);
+        }
+    }
+
+    /**
+     * 创建写入数据到Sheet
+     */
+    public void writeSheet() {
+        // 取出一共有多少个sheet.
+        int sheetNo = Math.max(1, (int) Math.ceil(list.size() * 1.0 / sheetSize));
+        for (int index = 0; index < sheetNo; index++) {
+            createSheet(sheetNo, index);
+
+            // 产生一行
+            Row row = sheet.createRow(rownum);
+            int column = 0;
+            // 写入各个字段的列头名称
+            for (Object[] os : fields) {
+                Excel excel = (Excel) os[1];
+                this.createCell(excel, row, column++);
+            }
+            if (Type.EXPORT.equals(type)) {
+                fillExcelData(index, row);
+                addStatisticsRow();
+            }
+        }
+    }
+
+    /**
+     * 填充excel数据
+     *
+     * @param index 序号
+     * @param row   单元格行
+     */
+    public void fillExcelData(int index, Row row) {
+        int startNo = index * sheetSize;
+        int endNo = Math.min(startNo + sheetSize, list.size());
+        for (int i = startNo; i < endNo; i++) {
+            row = sheet.createRow(i + 1 + rownum - startNo);
+            // 得到导出对象.
+            T vo = (T) list.get(i);
+            int column = 0;
+            for (Object[] os : fields) {
+                Field field = (Field) os[0];
+                Excel excel = (Excel) os[1];
+                this.addCell(excel, row, vo, field, column++);
+            }
+        }
+    }
+
+    /**
+     * 创建表格样式
+     *
+     * @param wb 工作薄对象
+     * @return 样式列表
+     */
+    private Map<String, CellStyle> createStyles(Workbook wb) {
+        // 写入各条记录,每条记录对应excel表中的一行
+        Map<String, CellStyle> styles = new HashMap<String, CellStyle>();
+        CellStyle style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font titleFont = wb.createFont();
+        titleFont.setFontName("Arial");
+        titleFont.setFontHeightInPoints((short) 16);
+        titleFont.setBold(true);
+        style.setFont(titleFont);
+        styles.put("title", style);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setBorderRight(BorderStyle.THIN);
+        style.setRightBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderLeft(BorderStyle.THIN);
+        style.setLeftBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderTop(BorderStyle.THIN);
+        style.setTopBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setBorderBottom(BorderStyle.THIN);
+        style.setBottomBorderColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        Font dataFont = wb.createFont();
+        dataFont.setFontName("Arial");
+        dataFont.setFontHeightInPoints((short) 10);
+        style.setFont(dataFont);
+        styles.put("data", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        style.setFillForegroundColor(IndexedColors.GREY_50_PERCENT.getIndex());
+        style.setFillPattern(FillPatternType.SOLID_FOREGROUND);
+        Font headerFont = wb.createFont();
+        headerFont.setFontName("Arial");
+        headerFont.setFontHeightInPoints((short) 10);
+        headerFont.setBold(true);
+        headerFont.setColor(IndexedColors.WHITE.getIndex());
+        style.setFont(headerFont);
+        styles.put("header", style);
+
+        style = wb.createCellStyle();
+        style.setAlignment(HorizontalAlignment.CENTER);
+        style.setVerticalAlignment(VerticalAlignment.CENTER);
+        Font totalFont = wb.createFont();
+        totalFont.setFontName("Arial");
+        totalFont.setFontHeightInPoints((short) 10);
+        style.setFont(totalFont);
+        styles.put("total", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.LEFT);
+        styles.put("data1", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.CENTER);
+        styles.put("data2", style);
+
+        style = wb.createCellStyle();
+        style.cloneStyleFrom(styles.get("data"));
+        style.setAlignment(HorizontalAlignment.RIGHT);
+        styles.put("data3", style);
+
+        return styles;
+    }
+
+    /**
+     * 创建单元格
+     */
+    public Cell createCell(Excel attr, Row row, int column) {
+        // 创建列
+        Cell cell = row.createCell(column);
+        // 写入列信息
+        cell.setCellValue(attr.name());
+        setDataValidation(attr, row, column);
+        cell.setCellStyle(styles.get("header"));
+        return cell;
+    }
+
+    /**
+     * 设置单元格信息
+     *
+     * @param value 单元格值
+     * @param attr  注解相关
+     * @param cell  单元格信息
+     */
+    public void setCellVo(Object value, Excel attr, Cell cell) {
+        if (ColumnType.STRING == attr.cellType()) {
+            String cellValue = Convert.toStr(value);
+            // 对于任何以表达式触发字符 =-+@开头的单元格，直接使用tab字符作为前缀，防止CSV注入。
+            if (StrUtils.startsWithAny(cellValue, FORMULA_STR)) {
+                cellValue = RegExUtils.replaceFirst(cellValue, FORMULA_REGEX_STR, "\t$0");
+            }
+            cell.setCellValue(StrUtils.isNull(cellValue) ? attr.defaultValue() : cellValue + attr.suffix());
+        } else if (ColumnType.NUMERIC == attr.cellType()) {
+            if (StrUtils.isNotNull(value)) {
+                cell.setCellValue(
+                    StrUtils.contains(Convert.toStr(value), ".") ? Convert.toDouble(value) : Convert.toInt(value)
+                );
+            }
+        } else if (ColumnType.IMAGE == attr.cellType()) {
+            ClientAnchor anchor = new XSSFClientAnchor(
+                0,
+                0,
+                0,
+                0,
+                (short) cell.getColumnIndex(),
+                cell.getRow().getRowNum(),
+                (short) (cell.getColumnIndex() + 1),
+                cell.getRow().getRowNum() + 1
+            );
+            String imagePath = Convert.toStr(value);
+            if (StrUtils.isNotEmpty(imagePath)) {
+                byte[] data = ImageUtils.getImage(imagePath);
+                getDrawingPatriarch(cell.getSheet())
+                    .createPicture(anchor, cell.getSheet().getWorkbook().addPicture(data, getImageType(data)));
+            }
+        }
+    }
+
+    /**
+     * 获取画布
+     */
+    public static Drawing<?> getDrawingPatriarch(Sheet sheet) {
+        if (sheet.getDrawingPatriarch() == null) {
+            sheet.createDrawingPatriarch();
+        }
+        return sheet.getDrawingPatriarch();
+    }
+
+    /**
+     * 获取图片类型,设置图片插入类型
+     */
+    public int getImageType(byte[] value) {
+        String type = FileTypeUtils.getFileExtendName(value);
+        if ("JPG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_JPEG;
+        } else if ("PNG".equalsIgnoreCase(type)) {
+            return Workbook.PICTURE_TYPE_PNG;
+        }
+        return Workbook.PICTURE_TYPE_JPEG;
+    }
+
+    /**
+     * 创建表格样式
+     */
+    public void setDataValidation(Excel attr, Row row, int column) {
+        if (attr.name().indexOf("注：") >= 0) {
+            sheet.setColumnWidth(column, 6000);
+        } else {
+            // 设置列宽
+            sheet.setColumnWidth(column, (int) ((attr.width() + 0.72) * 256));
+        }
+        if (StrUtils.isNotEmpty(attr.prompt()) || attr.combo().length > 0) {
+            // 提示信息或只能选择不能输入的列内容.
+            setPromptOrValidation(sheet, attr.combo(), attr.prompt(), 1, 100, column, column);
+        }
+    }
+
+    /**
+     * 添加单元格
+     */
+    public Cell addCell(Excel attr, Row row, T vo, Field field, int column) {
+        Cell cell = null;
+        try {
+            // 设置行高
+            row.setHeight(maxHeight);
+            // 根据Excel中设置情况决定是否导出,有些情况需要保持为空,希望用户填写这一列.
+            if (attr.isExport()) {
+                // 创建cell
+                cell = row.createCell(column);
+                int align = attr.align().value();
+                cell.setCellStyle(styles.get("data" + (align >= 1 && align <= 3 ? align : "")));
+
+                // 用于读取对象中的属性
+                Object value = getTargetValue(vo, field, attr);
+                String dateFormat = attr.dateFormat();
+                String readConverterExp = attr.readConverterExp();
+                String separator = attr.separator();
+                String dictType = attr.dictType();
+                if (StrUtils.isNotEmpty(dateFormat) && StrUtils.isNotNull(value)) {
+                    cell.setCellValue(parseDateToStr(dateFormat, value));
+                } else if (StrUtils.isNotEmpty(readConverterExp) && StrUtils.isNotNull(value)) {
+                    cell.setCellValue(convertByExp(Convert.toStr(value), readConverterExp, separator));
+                } else if (StrUtils.isNotEmpty(dictType) && StrUtils.isNotNull(value)) {
+                    cell.setCellValue(convertDictByExp(Convert.toStr(value), dictType, separator));
+                } else if (value instanceof BigDecimal && -1 != attr.scale()) {
+                    cell.setCellValue((((BigDecimal) value).setScale(attr.scale(), attr.roundingMode())).toString());
+                } else if (!attr.handler().equals(ExcelHandlerAdapter.class)) {
+                    cell.setCellValue(dataFormatHandlerAdapter(value, attr));
+                } else {
+                    // 设置列类型
+                    setCellVo(value, attr, cell);
+                }
+                addStatisticsData(column, Convert.toStr(value), attr);
+            }
+        } catch (Exception e) {
+            log.error("导出Excel失败{}", e);
+        }
+        return cell;
+    }
+
+    /**
+     * 设置 POI XSSFSheet 单元格提示或选择框
+     *
+     * @param sheet         表单
+     * @param textlist      下拉框显示的内容
+     * @param promptContent 提示内容
+     * @param firstRow      开始行
+     * @param endRow        结束行
+     * @param firstCol      开始列
+     * @param endCol        结束列
+     */
+    public void setPromptOrValidation(
+        Sheet sheet,
+        String[] textlist,
+        String promptContent,
+        int firstRow,
+        int endRow,
+        int firstCol,
+        int endCol
+    ) {
+        DataValidationHelper helper = sheet.getDataValidationHelper();
+        DataValidationConstraint constraint = textlist.length > 0
+            ? helper.createExplicitListConstraint(textlist)
+            : helper.createCustomConstraint("DD1");
+        CellRangeAddressList regions = new CellRangeAddressList(firstRow, endRow, firstCol, endCol);
+        DataValidation dataValidation = helper.createValidation(constraint, regions);
+        if (StrUtils.isNotEmpty(promptContent)) {
+            // 如果设置了提示信息则鼠标放上去提示
+            dataValidation.createPromptBox("", promptContent);
+            dataValidation.setShowPromptBox(true);
+        }
+        // 处理Excel兼容性问题
+        if (dataValidation instanceof XSSFDataValidation) {
+            dataValidation.setSuppressDropDownArrow(true);
+            dataValidation.setShowErrorBox(true);
+        } else {
+            dataValidation.setSuppressDropDownArrow(false);
+        }
+        sheet.addValidationData(dataValidation);
+    }
+
+    /**
+     * 解析导出值 0=男,1=女,2=未知
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String convertByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StrUtils.containsAny(separator, propertyValue)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[0].equals(value)) {
+                        propertyString.append(itemArray[1] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[0].equals(propertyValue)) {
+                    return itemArray[1];
+                }
+            }
+        }
+        return StrUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 反向解析值 男=0,女=1,未知=2
+     *
+     * @param propertyValue 参数值
+     * @param converterExp  翻译注解
+     * @param separator     分隔符
+     * @return 解析后值
+     */
+    public static String reverseByExp(String propertyValue, String converterExp, String separator) {
+        StringBuilder propertyString = new StringBuilder();
+        String[] convertSource = converterExp.split(",");
+        for (String item : convertSource) {
+            String[] itemArray = item.split("=");
+            if (StrUtils.containsAny(separator, propertyValue)) {
+                for (String value : propertyValue.split(separator)) {
+                    if (itemArray[1].equals(value)) {
+                        propertyString.append(itemArray[0] + separator);
+                        break;
+                    }
+                }
+            } else {
+                if (itemArray[1].equals(propertyValue)) {
+                    return itemArray[0];
+                }
+            }
+        }
+        return StrUtils.stripEnd(propertyString.toString(), separator);
+    }
+
+    /**
+     * 解析字典值
+     *
+     * @param dictValue 字典值
+     * @param dictType  字典类型
+     * @param separator 分隔符
+     * @return 字典标签
+     */
+    public static String convertDictByExp(String dictValue, String dictType, String separator) {
+        return DictUtils.getDictLabel(dictType, dictValue, separator);
+    }
+
+    /**
+     * 反向解析值字典值
+     *
+     * @param dictLabel 字典标签
+     * @param dictType  字典类型
+     * @param separator 分隔符
+     * @return 字典值
+     */
+    public static String reverseDictByExp(String dictLabel, String dictType, String separator) {
+        return DictUtils.getDictValue(dictType, dictLabel, separator);
+    }
+
+    /**
+     * 数据处理器
+     *
+     * @param value 数据值
+     * @param excel 数据注解
+     * @return
+     */
+    public String dataFormatHandlerAdapter(Object value, Excel excel) {
+        try {
+            Object instance = excel.handler().newInstance();
+            Method formatMethod = excel.handler().getMethod("format", new Class[] { Object.class, String[].class });
+            value = formatMethod.invoke(instance, value, excel.args());
+        } catch (Exception e) {
+            log.error("不能格式化数据 " + excel.handler(), e.getMessage());
+        }
+        return Convert.toStr(value);
+    }
+
+    /**
+     * 合计统计信息
+     */
+    private void addStatisticsData(Integer index, String text, Excel entity) {
+        if (entity != null && entity.isStatistics()) {
+            Double temp = 0D;
+            if (!statistics.containsKey(index)) {
+                statistics.put(index, temp);
+            }
+            try {
+                temp = Double.valueOf(text);
+            } catch (NumberFormatException e) {}
+            statistics.put(index, statistics.get(index) + temp);
+        }
+    }
+
+    /**
+     * 创建统计行
+     */
+    public void addStatisticsRow() {
+        if (statistics.size() > 0) {
+            Row row = sheet.createRow(sheet.getLastRowNum() + 1);
+            Set<Integer> keys = statistics.keySet();
+            Cell cell = row.createCell(0);
+            cell.setCellStyle(styles.get("total"));
+            cell.setCellValue("合计");
+
+            for (Integer key : keys) {
+                cell = row.createCell(key);
+                cell.setCellStyle(styles.get("total"));
+                cell.setCellValue(DOUBLE_FORMAT.format(statistics.get(key)));
+            }
+            statistics.clear();
+        }
+    }
+
+    /**
+     * 获取bean中的属性值
+     *
+     * @param vo    实体对象
+     * @param field 字段
+     * @param excel 注解
+     * @return 最终的属性值
+     * @throws Exception
+     */
+    private Object getTargetValue(T vo, Field field, Excel excel) throws Exception {
+        Object o = field.get(vo);
+        if (StrUtils.isNotEmpty(excel.targetAttr())) {
+            String target = excel.targetAttr();
+            if (target.contains(".")) {
+                String[] targets = target.split("[.]");
+                for (String name : targets) {
+                    o = getValue(o, name);
+                }
+            } else {
+                o = getValue(o, target);
+            }
+        }
+        return o;
+    }
+
+    /**
+     * 以类的属性的get方法方法形式获取值
+     *
+     * @param o
+     * @param name
+     * @return value
+     * @throws Exception
+     */
+    private Object getValue(Object o, String name) throws Exception {
+        if (StrUtils.isNotNull(o) && StrUtils.isNotEmpty(name)) {
+            Class<?> clazz = o.getClass();
+            Field field = clazz.getDeclaredField(name);
+            field.setAccessible(true);
+            o = field.get(o);
+        }
+        return o;
+    }
+
+    /**
+     * 得到所有定义字段
+     */
+    private void createExcelField() {
+        this.fields = getFields();
+        this.fields =
+            this.fields.stream()
+                .sorted(Comparator.comparing(objects -> ((Excel) objects[1]).sort()))
+                .collect(Collectors.toList());
+        this.maxHeight = getRowHeight();
+    }
+
+    /**
+     * 获取字段注解信息
+     */
+    public List<Object[]> getFields() {
+        List<Object[]> fields = new ArrayList<Object[]>();
+        List<Field> tempFields = new ArrayList<>();
+        tempFields.addAll(Arrays.asList(clazz.getSuperclass().getDeclaredFields()));
+        tempFields.addAll(Arrays.asList(clazz.getDeclaredFields()));
+        for (Field field : tempFields) {
+            // 单注解
+            if (field.isAnnotationPresent(Excel.class)) {
+                Excel attr = field.getAnnotation(Excel.class);
+                if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
+                    field.setAccessible(true);
+                    fields.add(new Object[] { field, attr });
+                }
+            }
+
+            // 多注解
+            if (field.isAnnotationPresent(Excels.class)) {
+                Excels attrs = field.getAnnotation(Excels.class);
+                Excel[] excels = attrs.value();
+                for (Excel attr : excels) {
+                    if (attr != null && (attr.type() == Type.ALL || attr.type() == type)) {
+                        field.setAccessible(true);
+                        fields.add(new Object[] { field, attr });
+                    }
+                }
+            }
+        }
+        return fields;
+    }
+
+    /**
+     * 根据注解获取最大行高
+     */
+    public short getRowHeight() {
+        double maxHeight = 0;
+        for (Object[] os : this.fields) {
+            Excel excel = (Excel) os[1];
+            maxHeight = Math.max(maxHeight, excel.height());
+        }
+        return (short) (maxHeight * 20);
+    }
+
+    /**
+     * 创建一个工作簿
+     */
+    public void createWorkbook() {
+        this.wb = new SXSSFWorkbook(500);
+        this.sheet = wb.createSheet();
+        wb.setSheetName(0, sheetName);
+        this.styles = createStyles(wb);
+    }
+
+    /**
+     * 创建工作表
+     *
+     * @param sheetNo sheet数量
+     * @param index   序号
+     */
+    public void createSheet(int sheetNo, int index) {
+        // 设置工作表的名称.
+        if (sheetNo > 1 && index > 0) {
+            this.sheet = wb.createSheet();
+            this.createTitle();
+            wb.setSheetName(index, sheetName + index);
+        }
+    }
+
+    /**
+     * 获取单元格值
+     *
+     * @param row    获取的行
+     * @param column 获取单元格列号
+     * @return 单元格值
+     */
+    public Object getCellValue(Row row, int column) {
+        if (row == null) {
+            return row;
+        }
+        Object val = "";
+        try {
+            Cell cell = row.getCell(column);
+            if (StrUtils.isNotNull(cell)) {
+                if (cell.getCellType() == CellType.NUMERIC || cell.getCellType() == CellType.FORMULA) {
+                    val = cell.getNumericCellValue();
+                    if (DateUtil.isCellDateFormatted(cell)) {
+                        val = DateUtil.getJavaDate((Double) val); // POI Excel 日期格式转换
+                    } else {
+                        if ((Double) val % 1 != 0) {
+                            val = new BigDecimal(val.toString());
+                        } else {
+                            val = new DecimalFormat("0").format(val);
+                        }
+                    }
+                } else if (cell.getCellType() == CellType.STRING) {
+                    val = cell.getStringCellValue();
+                } else if (cell.getCellType() == CellType.BOOLEAN) {
+                    val = cell.getBooleanCellValue();
+                } else if (cell.getCellType() == CellType.ERROR) {
+                    val = cell.getErrorCellValue();
+                }
+            }
+        } catch (Exception e) {
+            return val;
+        }
+        return val;
+    }
+
+    /**
+     * 判断是否是空行
+     *
+     * @param row 判断的行
+     * @return
+     */
+    private boolean isRowEmpty(Row row) {
+        if (row == null) {
+            return true;
+        }
+        for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++) {
+            Cell cell = row.getCell(i);
+            if (cell != null && cell.getCellType() != CellType.BLANK) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 格式化不同类型的日期对象
+     *
+     * @param dateFormat 日期格式
+     * @param val        被格式化的日期对象
+     * @return 格式化后的日期字符
+     */
+    public String parseDateToStr(String dateFormat, Object val) {
+        if (val == null) {
+            return "";
+        }
+        String str;
+        if (val instanceof Date) {
+            str = DateUtils.parseDateToStr(dateFormat, (Date) val);
+        } else if (val instanceof LocalDateTime) {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDateTime) val));
+        } else if (val instanceof LocalDate) {
+            str = DateUtils.parseDateToStr(dateFormat, DateUtils.toDate((LocalDate) val));
+        } else {
+            str = val.toString();
+        }
+        return str;
+    }
+}

basic-common/util/src/main/java/com/yiring/common/util/reflect/ReflectUtils.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.common.util.reflect;
+
+import com.yiring.common.text.Convert;
+import com.yiring.common.util.date.DateUtils;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.Date;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.Validate;
+import org.apache.poi.ss.usermodel.DateUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 反射工具类. 提供调用getter/setter方法, 访问私有变量, 调用私有方法, 获取泛型类型Class, 被AOP过的真实类等工具函数.
+ */
+@SuppressWarnings("rawtypes")
+public class ReflectUtils {
+
+    private static final String SETTER_PREFIX = "set";
+
+    private static final String GETTER_PREFIX = "get";
+
+    private static final String CGLIB_CLASS_SEPARATOR = "$$";
+
+    private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class);
+
+    /**
+     * 调用Getter方法.
+     * 支持多级，如：对象名.对象名.方法
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeGetter(Object obj, String propertyName) {
+        Object object = obj;
+        for (String name : StringUtils.split(propertyName, ".")) {
+            String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(name);
+            object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+        }
+        return (E) object;
+    }
+
+    /**
+     * 调用Setter方法, 仅匹配方法名。
+     * 支持多级，如：对象名.对象名.方法
+     */
+    public static <E> void invokeSetter(Object obj, String propertyName, E value) {
+        Object object = obj;
+        String[] names = StringUtils.split(propertyName, ".");
+        for (int i = 0; i < names.length; i++) {
+            if (i < names.length - 1) {
+                String getterMethodName = GETTER_PREFIX + StringUtils.capitalize(names[i]);
+                object = invokeMethod(object, getterMethodName, new Class[] {}, new Object[] {});
+            } else {
+                String setterMethodName = SETTER_PREFIX + StringUtils.capitalize(names[i]);
+                invokeMethodByName(object, setterMethodName, new Object[] { value });
+            }
+        }
+    }
+
+    /**
+     * 直接读取对象属性值, 无视private/protected修饰符, 不经过getter函数.
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E getFieldValue(final Object obj, final String fieldName) {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null) {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return null;
+        }
+        E result = null;
+        try {
+            result = (E) field.get(obj);
+        } catch (IllegalAccessException e) {
+            logger.error("不可能抛出的异常{}", e.getMessage());
+        }
+        return result;
+    }
+
+    /**
+     * 直接设置对象属性值, 无视private/protected修饰符, 不经过setter函数.
+     */
+    public static <E> void setFieldValue(final Object obj, final String fieldName, final E value) {
+        Field field = getAccessibleField(obj, fieldName);
+        if (field == null) {
+            // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 ");
+            return;
+        }
+        try {
+            field.set(obj, value);
+        } catch (IllegalAccessException e) {
+            logger.error("不可能抛出的异常: {}", e.getMessage());
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符.
+     * 用于一次性调用的情况，否则应使用getAccessibleMethod()函数获得Method后反复调用.
+     * 同时匹配方法名+参数类型，
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethod(
+        final Object obj,
+        final String methodName,
+        final Class<?>[] parameterTypes,
+        final Object[] args
+    ) {
+        if (obj == null || methodName == null) {
+            return null;
+        }
+        Method method = getAccessibleMethod(obj, methodName, parameterTypes);
+        if (method == null) {
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try {
+            return (E) method.invoke(obj, args);
+        } catch (Exception e) {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 直接调用对象方法, 无视private/protected修饰符，
+     * 用于一次性调用的情况，否则应使用getAccessibleMethodByName()函数获得Method后反复调用.
+     * 只匹配函数名，如果有多个同名函数调用第一个。
+     */
+    @SuppressWarnings("unchecked")
+    public static <E> E invokeMethodByName(final Object obj, final String methodName, final Object[] args) {
+        Method method = getAccessibleMethodByName(obj, methodName, args.length);
+        if (method == null) {
+            // 如果为空不报错，直接返回空。
+            logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 ");
+            return null;
+        }
+        try {
+            // 类型转换（将参数数据类型转换为目标方法参数类型）
+            Class<?>[] cs = method.getParameterTypes();
+            for (int i = 0; i < cs.length; i++) {
+                if (args[i] != null && !args[i].getClass().equals(cs[i])) {
+                    if (cs[i] == String.class) {
+                        args[i] = Convert.toStr(args[i]);
+                        if (StringUtils.endsWith((String) args[i], ".0")) {
+                            args[i] = StringUtils.substringBefore((String) args[i], ".0");
+                        }
+                    } else if (cs[i] == Integer.class) {
+                        args[i] = Convert.toInt(args[i]);
+                    } else if (cs[i] == Long.class) {
+                        args[i] = Convert.toLong(args[i]);
+                    } else if (cs[i] == Double.class) {
+                        args[i] = Convert.toDouble(args[i]);
+                    } else if (cs[i] == Float.class) {
+                        args[i] = Convert.toFloat(args[i]);
+                    } else if (cs[i] == Date.class) {
+                        if (args[i] instanceof String) {
+                            args[i] = DateUtils.parseDate(args[i]);
+                        } else {
+                            args[i] = DateUtil.getJavaDate((Double) args[i]);
+                        }
+                    } else if (cs[i] == boolean.class || cs[i] == Boolean.class) {
+                        args[i] = Convert.toBool(args[i]);
+                    }
+                }
+            }
+            return (E) method.invoke(obj, args);
+        } catch (Exception e) {
+            String msg = "method: " + method + ", obj: " + obj + ", args: " + args + "";
+            throw convertReflectionExceptionToUnchecked(msg, e);
+        }
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredField, 并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     */
+    public static Field getAccessibleField(final Object obj, final String fieldName) {
+        // 为空不报错。直接返回 null
+        if (obj == null) {
+            return null;
+        }
+        Validate.notBlank(fieldName, "fieldName can't be blank");
+        for (
+            Class<?> superClass = obj.getClass();
+            superClass != Object.class;
+            superClass = superClass.getSuperclass()
+        ) {
+            try {
+                Field field = superClass.getDeclaredField(fieldName);
+                makeAccessible(field);
+                return field;
+            } catch (NoSuchFieldException e) {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 匹配函数名+参数类型。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethod(
+        final Object obj,
+        final String methodName,
+        final Class<?>... parameterTypes
+    ) {
+        // 为空不报错。直接返回 null
+        if (obj == null) {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (
+            Class<?> searchType = obj.getClass();
+            searchType != Object.class;
+            searchType = searchType.getSuperclass()
+        ) {
+            try {
+                Method method = searchType.getDeclaredMethod(methodName, parameterTypes);
+                makeAccessible(method);
+                return method;
+            } catch (NoSuchMethodException e) {
+                continue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 循环向上转型, 获取对象的DeclaredMethod,并强制设置为可访问.
+     * 如向上转型到Object仍无法找到, 返回null.
+     * 只匹配函数名。
+     * 用于方法需要被多次调用的情况. 先使用本函数先取得Method,然后调用Method.invoke(Object obj, Object... args)
+     */
+    public static Method getAccessibleMethodByName(final Object obj, final String methodName, int argsNum) {
+        // 为空不报错。直接返回 null
+        if (obj == null) {
+            return null;
+        }
+        Validate.notBlank(methodName, "methodName can't be blank");
+        for (
+            Class<?> searchType = obj.getClass();
+            searchType != Object.class;
+            searchType = searchType.getSuperclass()
+        ) {
+            Method[] methods = searchType.getDeclaredMethods();
+            for (Method method : methods) {
+                if (method.getName().equals(methodName) && method.getParameterTypes().length == argsNum) {
+                    makeAccessible(method);
+                    return method;
+                }
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 改变private/protected的方法为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Method method) {
+        if (
+            (
+                !Modifier.isPublic(method.getModifiers()) ||
+                !Modifier.isPublic(method.getDeclaringClass().getModifiers())
+            ) &&
+            !method.isAccessible()
+        ) {
+            method.setAccessible(true);
+        }
+    }
+
+    /**
+     * 改变private/protected的成员变量为public，尽量不调用实际改动的语句，避免JDK的SecurityManager抱怨。
+     */
+    public static void makeAccessible(Field field) {
+        if (
+            (
+                !Modifier.isPublic(field.getModifiers()) ||
+                !Modifier.isPublic(field.getDeclaringClass().getModifiers()) ||
+                Modifier.isFinal(field.getModifiers())
+            ) &&
+            !field.isAccessible()
+        ) {
+            field.setAccessible(true);
+        }
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的泛型参数的类型, 注意泛型必须定义在父类处
+     * 如无法找到, 返回Object.class.
+     */
+    @SuppressWarnings("unchecked")
+    public static <T> Class<T> getClassGenricType(final Class clazz) {
+        return getClassGenricType(clazz, 0);
+    }
+
+    /**
+     * 通过反射, 获得Class定义中声明的父类的泛型参数的类型.
+     * 如无法找到, 返回Object.class.
+     */
+    public static Class getClassGenricType(final Class clazz, final int index) {
+        Type genType = clazz.getGenericSuperclass();
+
+        if (!(genType instanceof ParameterizedType)) {
+            logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType");
+            return Object.class;
+        }
+
+        Type[] params = ((ParameterizedType) genType).getActualTypeArguments();
+
+        if (index >= params.length || index < 0) {
+            logger.debug(
+                "Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " + params.length
+            );
+            return Object.class;
+        }
+        if (!(params[index] instanceof Class)) {
+            logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter");
+            return Object.class;
+        }
+
+        return (Class) params[index];
+    }
+
+    public static Class<?> getUserClass(Object instance) {
+        if (instance == null) {
+            throw new RuntimeException("Instance must not be null");
+        }
+        Class clazz = instance.getClass();
+        if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) {
+            Class<?> superClass = clazz.getSuperclass();
+            if (superClass != null && !Object.class.equals(superClass)) {
+                return superClass;
+            }
+        }
+        return clazz;
+    }
+
+    /**
+     * 将反射时的checked exception转换为unchecked exception.
+     */
+    public static RuntimeException convertReflectionExceptionToUnchecked(String msg, Exception e) {
+        if (
+            e instanceof IllegalAccessException ||
+            e instanceof IllegalArgumentException ||
+            e instanceof NoSuchMethodException
+        ) {
+            return new IllegalArgumentException(msg, e);
+        } else if (e instanceof InvocationTargetException) {
+            return new RuntimeException(msg, ((InvocationTargetException) e).getTargetException());
+        }
+        return new RuntimeException(msg, e);
+    }
+}

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,27 +18,31 @@ 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.0'
+        myexcelVersion = '4.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()
@@ -51,12 +51,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"
 
@@ -110,7 +113,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,
@@ -120,9 +123,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'