合并分支 'merge_dev' 到 'dev_fzm'

Merge dev

查看合并请求 chemical-kesai/kshg-api!15

README.md

@@ -18,6 +18,7 @@
 <!-- prettier-ignore -->
 - [开发规范说明](./doc/workflow.md)
 - [技术栈说明](./doc/technique.md)
+- [实用技巧](./doc/skill.md)
 
 ---
 

app-push/build.gradle

@@ -9,8 +9,13 @@ dependencies {
 	// 本地依赖
 	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
 
+	// 文档及参数校验
+	implementation 'org.springframework.boot:spring-boot-starter-validation'
+	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
+
 	// hutool-core
 	implementation "cn.hutool:hutool-core:${hutoolVersion}"
+	implementation "cn.hutool:hutool-http:${hutoolVersion}"
 
 	// fastjson
 	implementation "com.alibaba:fastjson:${fastJsonVersion}"
@@ -19,4 +24,15 @@ dependencies {
 	// hibernate-types-55
 	implementation "com.vladmihalcea:hibernate-types-55:${hibernateTypesVersion}"
 
+	// ======================= 推送相关 =======================
+	// 个推 SDK（App 推送）
+	// https://mvnrepository.com/artifact/com.getui.push/restful-sdk
+	implementation 'com.getui.push:restful-sdk:1.0.0.6'
+	// 阿里云短信 SDK（SMS 推送）
+	// https://mvnrepository.com/artifact/com.aliyun/dysmsapi20170525
+	implementation 'com.aliyun:dysmsapi20170525:2.0.9'
+	// 邮件 SDK（EMAIL 推送）
+	implementation 'org.springframework.boot:spring-boot-starter-mail'
+	// ======================================================
+
 }

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.alibaba.fastjson.JSONObject;
+import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import com.yiring.common.domain.BasicEntity;
 import java.io.Serial;
 import java.io.Serializable;
@@ -34,7 +34,7 @@ import org.hibernate.annotations.TypeDef;
 @FieldNameConstants
 @FieldDefaults(level = AccessLevel.PRIVATE)
 @Entity
-@TypeDef(name = "json", typeClass = JsonType.class)
+@TypeDef(name = "jsonb", typeClass = JsonBinaryType.class)
 @Table(
     name = "SYS_PUSH_MESSAGE",
     indexes = {
@@ -73,18 +73,18 @@ public class PushMessage extends BasicEntity implements Serializable {
     String content;
 
     @Comment("扩展数据")
-    @org.hibernate.annotations.Type(type = "json")
-    @Column(columnDefinition = "json")
-    JSON extra;
+    @org.hibernate.annotations.Type(type = "jsonb")
+    @Column(columnDefinition = "jsonb")
+    JSONObject extra;
 
     @Comment("消息状态")
     @Enumerated(EnumType.STRING)
     Status status;
 
     @Comment("推送反馈结果")
-    @org.hibernate.annotations.Type(type = "json")
-    @Column(columnDefinition = "json")
-    JSON result;
+    @org.hibernate.annotations.Type(type = "jsonb")
+    @Column(columnDefinition = "jsonb")
+    JSONObject result;
 
     @Comment("重试次数")
     Integer retryCount;
@@ -94,7 +94,7 @@ public class PushMessage extends BasicEntity implements Serializable {
 
     @SuppressWarnings({ "unused" })
     public enum Type {
-        WS("STOMP WebSocket 消息"),
+        WEBHOOK("webhook"),
         APP("APP 消息"),
         SMS("短信消息"),
         EMAIL("邮件消息"),
@@ -113,7 +113,7 @@ public class PushMessage extends BasicEntity implements Serializable {
         }
 
         public String queue() {
-            return String.format("push.%s.queue", this.name());
+            return String.format("push.%s.queue", this.name().toLowerCase());
         }
     }
 

app-push/src/main/java/com/yiring/app/push/param/PushAppParam.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.push.param;
+
+import io.swagger.annotations.ApiModel;
+import lombok.*;
+import lombok.experimental.FieldDefaults;
+
+/**
+ * App 推送参数
+ *
+ * @author Jim
+ * @version 0.1
+ * 2022/4/21 10:27
+ */
+
+@ApiModel("A")
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@FieldDefaults(level = AccessLevel.PRIVATE)
+public class PushAppParam {
+
+    String webhook;
+}

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

@@ -20,14 +20,37 @@ import org.springframework.context.annotation.Configuration;
 @Configuration
 public class PushRabbitConfig {
 
+    /**
+     * 消息交换机
+     */
     public static final String PUSH_TOPIC_EXCHANGE = "push.topic.exchange";
-
+    /**
+     * WebHook 推送队列
+     */
+    public static final String PUSH_WEBHOOK_QUEUE = "push.webhook.queue";
+    /**
+     * App 消息推送队列
+     */
     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_MAIL_QUEUE = "push.mail.queue";
+    /**
+     * TTS 语音电话队列
+     */
     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";
 
     /**
@@ -52,16 +75,16 @@ public class PushRabbitConfig {
         return BindingBuilder.bind(queue).to(exchange).with(PUSH_APP_QUEUE);
     }
 
-    @Bean(PUSH_WS_QUEUE)
-    public Queue pushWebSocketQueue() {
+    @Bean(PUSH_WEBHOOK_QUEUE)
+    public Queue pushWebHookQueue() {
         Map<String, Object> args = new HashMap<>(1);
         args.put("x-message-ttl", 30 * 1000);
-        return new Queue(PUSH_WS_QUEUE, true, false, false, args);
+        return new Queue(PUSH_WEBHOOK_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);
+    Binding bindingExchangeWebHook(@Qualifier(PUSH_WEBHOOK_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_WEBHOOK_QUEUE);
     }
 
     @Bean(PUSH_SMS_QUEUE)
@@ -76,16 +99,16 @@ public class PushRabbitConfig {
         return BindingBuilder.bind(queue).to(exchange).with(PUSH_SMS_QUEUE);
     }
 
-    @Bean(PUSH_EMAIL_QUEUE)
-    public Queue pushEmailQueue() {
+    @Bean(PUSH_MAIL_QUEUE)
+    public Queue pushMailQueue() {
         Map<String, Object> args = new HashMap<>(1);
         args.put("x-message-ttl", 60 * 1000);
-        return new Queue(PUSH_EMAIL_QUEUE, true, false, false, args);
+        return new Queue(PUSH_MAIL_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);
+    Binding bindingExchangeMail(@Qualifier(PUSH_MAIL_QUEUE) Queue queue, TopicExchange exchange) {
+        return BindingBuilder.bind(queue).to(exchange).with(PUSH_MAIL_QUEUE);
     }
 
     @Bean(PUSH_CALL_TTS_QUEUE)

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

@@ -26,10 +26,61 @@ public class PushRabbitReceiver {
     PushMessageRepository repository;
 
     @RabbitHandler
-    @RabbitListener(queues = PushRabbitConfig.PUSH_WS_QUEUE)
-    public void receiverWebSocketMessage(Long id) {
-        log.info("接收到消息: " + id);
-
+    @RabbitListener(queues = PushRabbitConfig.PUSH_WEBHOOK_QUEUE)
+    public void receiverWebHookMessage(Long id) {
+        log.info("[WebHook] Message: " + id);
         repository.findById(id).ifPresent(message -> log.info("{}", message));
+        // TODO
+        // 实现调用 WebHook，基于 WebHook API 发起 HTTPs 请求
+    }
+
+    @RabbitHandler
+    @RabbitListener(queues = PushRabbitConfig.PUSH_APP_QUEUE)
+    public void receiverAppMessage(Long id) {
+        log.info("[App] Message: " + id);
+        // TODO
+        // 实现推送消息到 App，基于个推 API
+        // https://github.com/GetuiLaboratory/getui-pushapi-java-client-v2
+    }
+
+    @RabbitHandler
+    @RabbitListener(queues = PushRabbitConfig.PUSH_SMS_QUEUE)
+    public void receiverSmsMessage(Long id) {
+        log.info("[SMS] Message: " + id);
+        // TODO
+        // 实现发送短信，基于阿里云短信平台 API
+    }
+
+    @RabbitHandler
+    @RabbitListener(queues = PushRabbitConfig.PUSH_MAIL_QUEUE)
+    public void receiverMailMessage(Long id) {
+        log.info("[Mail] Message: " + id);
+        // TODO
+        // 实现发送邮件，基于邮件配置
+    }
+
+    @RabbitHandler
+    @RabbitListener(queues = PushRabbitConfig.PUSH_CALL_TTS_QUEUE)
+    public void receiverTtsMessage(Long id) {
+        log.info("[Phone TTS] Message: " + id);
+        // TODO
+        // 实现拨打电话播放 TTS 转语音，基于壹润外呼系统 API
+    }
+
+    @RabbitHandler
+    @RabbitListener(queues = PushRabbitConfig.PUSH_CALL_AUDIO_QUEUE)
+    public void receiverAudioMessage(Long id) {
+        log.info("[Phone Audio] Message: " + id);
+        // TODO
+        // 实现拨打电话播放音频文件，基于壹润外呼系统 API
+    }
+
+    @RabbitHandler
+    @RabbitListener(queues = PushRabbitConfig.PUSH_DEVICE_TONE_QUEUE)
+    public void receiverToneMessage(Long id) {
+        log.info("[Device Tone] Message: " + id);
+        // TODO
+        // 实现播放设备铃声，基于音柱广播设备 API
+        // SDK 暂未拿到，设备未采购，未进行联调
     }
 }

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

@@ -3,6 +3,7 @@ package com.yiring.app.push.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.yiring.app.push.domain.PushMessage;
+import com.yiring.app.push.param.PushAppParam;
 
 /**
  * 推送服务
@@ -13,4 +14,10 @@ import com.yiring.app.push.domain.PushMessage;
  */
 public interface PushService {
     void push(PushMessage.Type type, JSONObject raw);
+
+    /**
+     * 推送到 App
+     * @param param 参数
+     */
+    void app(PushAppParam param);
 }

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

@@ -4,13 +4,13 @@ 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.param.PushAppParam;
 import com.yiring.app.push.rabbitmq.PushRabbitConfig;
 import com.yiring.app.push.service.PushService;
-import java.time.LocalDateTime;
 import javax.annotation.Resource;
 import javax.transaction.Transactional;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.AmqpTemplate;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.stereotype.Service;
 
 /**
@@ -30,15 +30,18 @@ public class PushServiceImpl implements PushService {
     PushMessageRepository repository;
 
     @Resource
-    AmqpTemplate amqpTemplate;
+    RabbitTemplate rabbitTemplate;
 
     @Override
     public void push(PushMessage.Type type, JSONObject raw) {
         PushMessage message = new PushMessage();
         message.setType(type);
         message.setExtra(raw);
-        message.setCreateTime(LocalDateTime.now());
         repository.saveAndFlush(message);
-        amqpTemplate.convertAndSend(PushRabbitConfig.PUSH_TOPIC_EXCHANGE, type.queue(), message.getId());
+
+        rabbitTemplate.convertAndSend(PushRabbitConfig.PUSH_TOPIC_EXCHANGE, type.queue(), message.getId());
     }
+
+    @Override
+    public void app(PushAppParam param) {}
 }

app/build.gradle

@@ -22,9 +22,11 @@ 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
@@ -49,6 +51,7 @@ dependencies {
 	// hutool
 	implementation "cn.hutool:hutool-core:${hutoolVersion}"
 	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
+	implementation "cn.hutool:hutool-http:${hutoolVersion}"
 
 	// JPA 增加空间字段支持
 	// https://blog.wuwii.com/jpa-spatial.html
@@ -59,4 +62,11 @@ dependencies {
 	// JTS 几何对象操作库
 	implementation "org.locationtech.jts:jts-core:${jtsVersion}"
 
+	// 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/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

@@ -14,6 +14,7 @@ import lombok.experimental.FieldNameConstants;
 import org.hibernate.Hibernate;
 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;
 
@@ -86,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

@@ -13,6 +13,7 @@ import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
 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;
 
@@ -71,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/LocationLog.java

@@ -2,8 +2,8 @@
 package com.yiring.app.domain.location;
 
 import com.alibaba.fastjson.JSONObject;
+import com.vladmihalcea.hibernate.type.json.JsonType;
 import com.yiring.auth.domain.user.User;
-import com.yiring.common.config.converter.JSONObjectConverter;
 import java.io.Serial;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -18,6 +18,8 @@ import lombok.experimental.FieldNameConstants;
 import org.hibernate.Hibernate;
 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;
 
@@ -39,6 +41,7 @@ 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 {
@@ -85,7 +88,8 @@ public class LocationLog implements Serializable {
     BigDecimal altitude;
 
     @Comment("坐标点信息")
-    @Column(columnDefinition = "POINT")
+    @Type(type = "jts_geometry")
+    @Column(columnDefinition = "point")
     Point point;
 
     @Comment("信标集合")
@@ -110,11 +114,8 @@ public class LocationLog implements Serializable {
     String voltUnit;
 
     @Comment("原始数据")
-    @Convert(converter = JSONObjectConverter.class)
-    @Lob
-    @Basic(fetch = FetchType.LAZY)
-    @Column(columnDefinition = "JSON")
-    @ToString.Exclude
+    @org.hibernate.annotations.Type(type = "json")
+    @Column(columnDefinition = "json")
     JSONObject raw;
 
     @Comment("创建时间")

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 com.yiring.common.domain.BasicEntity;
 import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -11,10 +12,9 @@ import javax.persistence.*;
 import lombok.*;
 import lombok.experimental.FieldDefaults;
 import lombok.experimental.FieldNameConstants;
+import lombok.experimental.SuperBuilder;
 import org.hibernate.Hibernate;
 import org.hibernate.annotations.Comment;
-import org.hibernate.annotations.GenericGenerator;
-import org.hibernate.snowflake.SnowflakeId;
 
 /**
  * 定位标签
@@ -30,7 +30,7 @@ import org.hibernate.snowflake.SnowflakeId;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants
@@ -47,17 +47,11 @@ import org.hibernate.snowflake.SnowflakeId;
     }
 )
 @Comment("定位标签")
-public class LocationTag implements Serializable {
+public class LocationTag extends BasicEntity implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 5419734189897829250L;
 
-    @Comment("主键")
-    @Id
-    @GeneratedValue(generator = SnowflakeId.GENERATOR)
-    @GenericGenerator(name = SnowflakeId.GENERATOR, strategy = SnowflakeId.Strategy.LONG)
-    Long id;
-
     /**
      * 数据来源于【真源人员定位系统 - 定位标签】
      * 作用: 用于双向联动进行数据同步
@@ -134,7 +128,7 @@ public class LocationTag implements Serializable {
         if (this == o) return true;
         if (o == null || Hibernate.getClass(this) != Hibernate.getClass(o)) return false;
         LocationTag that = (LocationTag) o;
-        return id != null && Objects.equals(id, that.id);
+        return getId() != null && Objects.equals(getId(), that.getId());
     }
 
     @Override

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

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

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

@@ -46,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/location/LocationTagExportExcel.java

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

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

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

app/src/main/java/com/yiring/app/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;
+}

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

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

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

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

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

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

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

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

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

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

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

+/* (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/rabbit/config/RabbitConfig.java

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.rabbit.config;
+
+import javax.annotation.Resource;
+import org.springframework.amqp.rabbit.config.SimpleRabbitListenerContainerFactory;
+import org.springframework.amqp.rabbit.connection.CachingConnectionFactory;
+import org.springframework.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.core.RabbitTemplate;
+import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.boot.autoconfigure.amqp.RabbitProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+
+/**
+ * rabbitmq配置
+ *
+ * @author ifzm
+ * 2019/8/21 15:44
+ */
+@Configuration
+public class RabbitConfig {
+
+    @Resource
+    RabbitProperties rabbitProperties;
+
+    private static final String CONNECTION_FACTORY_NAME = "rabbitConnectionFactory";
+
+    @Bean(CONNECTION_FACTORY_NAME)
+    @Primary
+    public ConnectionFactory connectionFactory() {
+        return RabbitConfig.connectionFactory(
+            rabbitProperties.getHost(),
+            rabbitProperties.getPort(),
+            rabbitProperties.getUsername(),
+            rabbitProperties.getPassword(),
+            rabbitProperties.getVirtualHost()
+        );
+    }
+
+    @Bean
+    @Primary
+    public RabbitListenerContainerFactory<?> rabbitListenerContainerFactory(
+        @Qualifier(CONNECTION_FACTORY_NAME) ConnectionFactory connectionFactory
+    ) {
+        SimpleRabbitListenerContainerFactory factory = new SimpleRabbitListenerContainerFactory();
+        factory.setConnectionFactory(connectionFactory);
+        return factory;
+    }
+
+    @Bean
+    @Primary
+    public RabbitTemplate rabbitTemplate(@Qualifier(CONNECTION_FACTORY_NAME) ConnectionFactory connectionFactory) {
+        return new RabbitTemplate(connectionFactory);
+    }
+
+    /**
+     * 创建连接工厂
+     *
+     * @param host 主机
+     * @param port 端口
+     * @param username 用户名
+     * @param password 密码
+     * @param virtualHost 虚拟主机
+     * @return 连接工厂
+     */
+    public static 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/config/zy/ZyConfigProperties.java → app/src/main/java/com/yiring/app/rabbit/config/ZyConfigProperties.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.app.config.zy;
+package com.yiring.app.rabbit.config;
 
 import javax.annotation.Resource;
 import lombok.AccessLevel;

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

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.app.config.zy;
+package com.yiring.app.rabbit.config;
 
 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.amqp.rabbit.connection.ConnectionFactory;
+import org.springframework.amqp.rabbit.listener.RabbitListenerContainerFactory;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.amqp.SimpleRabbitListenerContainerFactoryConfigurer;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -43,8 +44,8 @@ public class ZyRabbitConfig {
     public static final String MESSAGE_QUEUES_NAME = "tenant_msg_12A14FDC_sc21080400";
 
     @Bean(CONNECTION_FACTORY_NAME)
-    public CachingConnectionFactory zyConnectionFactory() {
-        return connectionFactory(
+    public ConnectionFactory zyConnectionFactory() {
+        return RabbitConfig.connectionFactory(
             rabbitmq.getHost(),
             rabbitmq.getPort(),
             rabbitmq.getUsername(),
@@ -54,9 +55,9 @@ public class ZyRabbitConfig {
     }
 
     @Bean(LISTENER_FACTORY_NAME)
-    public SimpleRabbitListenerContainerFactory secondFactory(
+    public RabbitListenerContainerFactory<?> rabbitListenerContainerFactory(
         SimpleRabbitListenerContainerFactoryConfigurer configurer,
-        @Qualifier(CONNECTION_FACTORY_NAME) CachingConnectionFactory connectionFactory
+        @Qualifier(CONNECTION_FACTORY_NAME) ConnectionFactory connectionFactory
     ) {
         // 检查队列名称是否与配置文件一致，避免监听错误
         if (!MESSAGE_QUEUES_NAME.equals(rabbitmq.getQueueName())) {
@@ -66,31 +67,9 @@ public class ZyRabbitConfig {
         }
 
         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/rabbitmq/RabbitReceiver.java → app/src/main/java/com/yiring/app/rabbit/receiver/RabbitReceiver.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.app.rabbitmq;
+package com.yiring.app.rabbit.receiver;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;

app/src/main/java/com/yiring/app/rabbitmq/zy/ZyRabbitmqReceiver.java → app/src/main/java/com/yiring/app/rabbit/receiver/ZyRabbitReceiver.java

 /* (C) 2022 YiRing, Inc. */
-package com.yiring.app.rabbitmq.zy;
+package com.yiring.app.rabbit.receiver;
 
 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 com.yiring.app.rabbit.config.ZyRabbitConfig;
 import java.io.IOException;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -15,6 +14,7 @@ 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.messaging.simp.SimpMessagingTemplate;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -30,7 +30,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Component
 @Configuration
 @ConditionalOnProperty(prefix = "zy-config.rabbitmq", value = "enabled", havingValue = "true")
-public class ZyRabbitmqReceiver {
+public class ZyRabbitReceiver {
 
     // TODO
     // 1. 新增消息订阅定时任务，检查是否正常订阅了真源定位系统的消息
@@ -40,6 +40,9 @@ public class ZyRabbitmqReceiver {
     @Resource
     PushService pushService;
 
+    @Resource
+    SimpMessagingTemplate simpMessagingTemplate;
+
     /**
      * 订阅真源定位系统 RabbitMQ 推送过来的消息（主动订阅的一些消息类别）
      * 参见: 定位平台接口规范V3.0.1 - 通用版.pdf #6
@@ -74,6 +77,8 @@ public class ZyRabbitmqReceiver {
                 case "deviceStatus" -> processDeviceStatusMessage(data);
                 // 按键报警
                 case "keyWarning" -> processKeyWarningMessage(data);
+                // 围栏报警
+                case "enclosure" -> log.warn("Ignore Message Type [enclosure]: {}", info);
                 default -> log.warn("Unknown Message Type: {}", info);
             }
         } catch (Exception e) {
@@ -95,9 +100,10 @@ public class ZyRabbitmqReceiver {
         // 1. 解析消息内容，进行围栏、出入标识判断等处理，将定位记录录入数据库
         // 2. 创建一条需要进行消息推送的记录
         // 3. 将记录推送的消息推送模块
+        // 4. 坚持是否触发围栏告警，记录告警数据，并推送消息
 
         // WebSocket 消息推送
-        pushService.push(PushMessage.Type.WS, data);
+        simpMessagingTemplate.convertAndSend("/topic/position", data);
     }
 
     /**

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/service/car/CarService.java

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

app/src/main/java/com/yiring/app/service/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

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

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

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

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.service.video;
+
+import com.yiring.app.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;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.yiring.app.constant.RedisKey;
 import com.yiring.common.core.Redis;
 import javax.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.amqp.RabbitProperties;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.messaging.simp.config.ChannelRegistration;
 import org.springframework.messaging.simp.config.MessageBrokerRegistry;
@@ -32,7 +33,7 @@ public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
     Redis redis;
 
     @Resource
-    RabbitmqProperties rabbitmqProperties;
+    RabbitProperties rabbitProperties;
 
     @Resource
     ClientInboundChannelInterceptor clientInboundChannelInterceptor;
@@ -61,11 +62,11 @@ public class WebSocketStompConfig implements WebSocketMessageBrokerConfigurer {
         registry.setApplicationDestinationPrefixes("/app");
         registry
             .enableStompBrokerRelay("/topic", "/queue")
-            .setRelayHost(rabbitmqProperties.getHost())
-            .setClientLogin(rabbitmqProperties.getUsername())
-            .setClientPasscode(rabbitmqProperties.getPassword())
-            .setSystemLogin(rabbitmqProperties.getUsername())
-            .setSystemPasscode(rabbitmqProperties.getPassword());
+            .setRelayHost(rabbitProperties.getHost())
+            .setClientLogin(rabbitProperties.getUsername())
+            .setClientPasscode(rabbitProperties.getPassword())
+            .setSystemLogin(rabbitProperties.getUsername())
+            .setSystemPasscode(rabbitProperties.getPassword());
         log.info("Init RabbitMQ STOMP MessageBroker Success.");
     }
 

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/location/LocationTagVo.java

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

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.vo.video;
+
+import 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.domain.location.LocationTag;
 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.auth.domain.user.User;
 import com.yiring.common.core.Result;
+import com.yiring.common.domain.BasicEntity;
 import com.yiring.common.param.PageParam;
 import com.yiring.common.vo.PageVo;
 import io.swagger.annotations.Api;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import javax.annotation.Resource;
+import javax.persistence.EntityManager;
+import javax.persistence.criteria.*;
 import javax.validation.Valid;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.experimental.FieldDefaults;
 import lombok.extern.slf4j.Slf4j;
+import org.locationtech.jts.geom.Point;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -51,10 +61,55 @@ public class HelloController {
         return Result.ok(vo);
     }
 
+    @Resource
+    SimpMessagingTemplate simpMessagingTemplate;
+
     @GetMapping("test")
-    public Result<String> test() {
-        PushService service = SpringUtil.getBean(PushService.class);
-        service.push(PushMessage.Type.WS, new JSONObject().fluentPut("msg", "hello"));
-        return Result.ok();
+    public Result<Point> test() {
+        Point point = GeoUtils.createPoint(112.1, 23.56);
+        simpMessagingTemplate.convertAndSend("/topic/position", point);
+        return Result.ok(point);
+    }
+
+    @Resource
+    EntityManager em;
+
+    @Data
+    @AllArgsConstructor
+    @FieldDefaults(level = AccessLevel.PRIVATE)
+    public static class UserVo {
+
+        Long id;
+        String avatar;
+        String code;
+    }
+
+    @GetMapping("test2")
+    public Result<ArrayList<UserVo>> query() {
+        CriteriaBuilder cb = em.getCriteriaBuilder();
+        CriteriaQuery<UserVo> cq = cb.createQuery(UserVo.class);
+
+        Root<User> root = cq.from(User.class);
+        Expression<Long> id = root.get(BasicEntity.Fields.id);
+        Expression<String> avatar = root.get(User.Fields.avatar);
+
+        // 子查询
+        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(id, avatar, query);
+
+        // 查询条件
+        List<Predicate> predicates = new ArrayList<>();
+        // 可根据入参判断是否需要查询指定字段
+        predicates.add(cb.isNotNull(root.get(User.Fields.avatar)));
+        predicates.add(cb.equal(query, "BTT22222222"));
+        cq.where(predicates.toArray(new Predicate[0]));
+
+        List<UserVo> users = em.createQuery(cq).getResultList();
+        return Result.ok(new ArrayList<>(users));
     }
 }

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

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

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web.car;
+
+import com.yiring.app.domain.car.Car;
+import com.yiring.app.param.car.CarParam;
+import com.yiring.app.param.car.CarQueryParam;
+import com.yiring.app.service.car.CarService;
+import com.yiring.app.vo.car.CarVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.util.poi.ExcelUtils;
+import com.yiring.common.vo.PageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import java.util.List;
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.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, "车辆来访信息");
+    }
+}

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

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

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

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

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

+/* (C) 2022 YiRing, Inc. */
+package com.yiring.app.web.video;
+
+import com.yiring.app.param.video.VideoParam;
+import com.yiring.app.param.video.VideoQueryParam;
+import com.yiring.app.service.video.VideoService;
+import com.yiring.app.vo.video.VideoVo;
+import com.yiring.common.core.Result;
+import com.yiring.common.param.IdParam;
+import com.yiring.common.param.PageParam;
+import com.yiring.common.vo.PageVo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+import javax.validation.Valid;
+import lombok.extern.slf4j.Slf4j;
+import org.locationtech.jts.geom.Point;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 监控点位控制器
+ * @author tzl
+ * 2022/4/8 16:51
+ */
+@Slf4j
+@Validated
+@Api(tags = "Video")
+@RestController
+@RequestMapping("/video/")
+public class VideoController {
+
+    @Resource
+    VideoService videoService;
+
+    @ApiOperation(value = "新增监控点位信息")
+    @PostMapping("saveVideo")
+    public Result<String> findLatest(@Valid VideoParam videoParam) {
+        return videoService.saveVideo(videoParam);
+    }
+
+    @ApiOperation(value = "删除监控点位信息")
+    @PostMapping("deleteVideo")
+    public Result<String> deleteVideo(@Valid IdParam idParam) {
+        return videoService.deleteVideo(idParam);
+    }
+
+    @ApiOperation(value = "修改监控点位信息")
+    @PostMapping("updateVideo")
+    public Result<String> updateVideo(@Valid VideoParam videoParam, @Valid IdParam idParam) {
+        return videoService.updateVideo(videoParam, idParam);
+    }
+
+    @ApiOperation(value = "查看监控点位位置")
+    @PostMapping("selectPoint")
+    public Result<Point> selectPoint(@Valid IdParam idParam) {
+        return videoService.selectPoint(idParam);
+    }
+
+    @ApiOperation(value = "分页查询监控点位信息")
+    @PostMapping("pageVideo")
+    public Result<PageVo<VideoVo>> pageVideo(@Valid VideoQueryParam videoQueryParam, @Valid PageParam param) {
+        return videoService.pageVideo(videoQueryParam, param);
+    }
+}

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

@@ -26,6 +26,17 @@ spring:
     username: admin
     password: 123456
     virtual-host: /
+    # 开启发送端确认
+    publisher-confirm-type: correlated
+    # 开启接收端确认
+    publisher-returns: true
+    template:
+      # 消息抵达队列，异步回调 confirm
+      mandatory: true
+    listener:
+      simple:
+        # 手动确认消息
+        acknowledge-mode: manual
 
 # knife4j
 knife4j:
@@ -56,7 +67,7 @@ zy-config:
   host: project.yz-online.com
   # RabbitMQ 订阅配置
   rabbitmq:
-    enabled: false
+    enabled: true
     host: ${zy-config.host}
     port: 672
     username: admin

basic-auth/build.gradle

@@ -15,9 +15,16 @@ dependencies {
 	implementation "cn.dev33:sa-token-spring-boot-starter:${saTokenVersion}"
 	implementation "cn.dev33:sa-token-dao-redis-jackson:${saTokenVersion}"
 
-	// hutool-core
+	// hutool
 	implementation "cn.hutool:hutool-core:${hutoolVersion}"
+	implementation "cn.hutool:hutool-json:${hutoolVersion}"
+	implementation "cn.hutool:hutool-http:${hutoolVersion}"
+	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
 
 	// fastjson
 	implementation "com.alibaba:fastjson:${fastJsonVersion}"
+
+	// myexcel
+	implementation "com.github.liaochong:myexcel:${myexcelVersion}"
+
 }

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

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

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

@@ -16,6 +16,7 @@ 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;
 
@@ -29,7 +30,7 @@ import org.hibernate.annotations.Comment;
 @Getter
 @Setter
 @ToString
-@Builder
+@SuperBuilder(toBuilder = true)
 @NoArgsConstructor
 @AllArgsConstructor
 @FieldNameConstants

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

basic-common/core/build.gradle

 dependencies {
-	implementation project(":basic-common:util")
-
 	implementation 'org.springframework.boot:spring-boot-starter-aop'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
@@ -12,11 +10,9 @@ dependencies {
 	// swagger annotations
 	implementation "io.swagger:swagger-annotations:${swaggerAnnotationsVersion}"
 
-	// hutool-extra
-	implementation "cn.hutool:hutool-extra:${hutoolVersion}"
+	implementation "cn.dev33:sa-token-dao-redis-jackson:${saTokenVersion}"
 
-	// fastjson
-	implementation "com.alibaba:fastjson:${fastJsonVersion}"
+	implementation fileTree(dir: project.rootDir.getPath() + '\\libs', includes: ['*jar'])
 
 	// JTS 几何对象操作库
 	implementation "org.locationtech.jts:jts-core:${jtsVersion}"

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

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

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

@@ -8,6 +8,8 @@ import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import javax.annotation.Resource;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.Ordered;
+import org.springframework.core.annotation.Order;
 
 /**
  * Jackson Config
@@ -17,6 +19,7 @@ import org.springframework.context.annotation.Configuration;
  * 2022/4/17 16:54
  */
 
+@Order(Ordered.HIGHEST_PRECEDENCE)
 @Configuration
 public class JacksonConfig {
 

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

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.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);
-    }
-}

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

-/* (C) 2022 YiRing, Inc. */
-package com.yiring.common.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);
-    }
-}

basic-common/core/src/main/java/com/yiring/common/constant/RegEx.java

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

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

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

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

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

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

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

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

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

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

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

basic-common/redis/build.gradle

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

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

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

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

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