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);
+}

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);
+    }
+}